rip out rsvp

Author: runspired

lib/add-inherited-items.js

@@ -1,5 +1,4 @@
 import _ from 'lodash'
-import RSVP from 'rsvp'
 
 export default function addInheritedItems(docSets) {
 	docSets.forEach(versionData => {
@@ -29,7 +28,7 @@ export default function addInheritedItems(docSets) {
 		})
 	})
 
-	return RSVP.resolve(docSets)
+	return Promise.resolve(docSets)
 }
 
 function getParents(klass, classes) {

lib/add-since-tags.js

@@ -1,5 +1,4 @@
 import _ from 'lodash'
-import RSVP from 'rsvp'
 
 export default function addSinceTags(docSets) {
 	let versionIndex = Object.create(null)
@@ -44,7 +43,7 @@ export default function addSinceTags(docSets) {
 
 	classes.forEach(klass => (klass.since = versionIndex['class'][klass.name][0]))
 
-	return RSVP.resolve(docSets)
+	return Promise.resolve(docSets)
 }
 
 function sortVersionIndex(versionIndex) {

lib/create-classes.js

@@ -1,10 +1,9 @@
-import RSVP from 'rsvp'
 import saveDoc from './save-document'
 
-export default (document, projectName, projectVersion) => {
+export default async function (document, projectName, projectVersion) {
 	let things = document.data
 
-	return RSVP.map(things, klass => {
+	for (const klass of things) {
 		if (!klass.id) {
 			console.log(klass)
 			console.log(new Error('WHAT').stack)
@@ -15,6 +14,8 @@ export default (document, projectName, projectVersion) => {
 		}
 
 		console.log(`Creating ${klass.id} in ${projectName}-${projectVersion}`)
-		return saveDoc(document, projectName, projectVersion)
-	}).then(() => document)
+		await saveDoc(document, projectName, projectVersion)
+	}
+
+	return document
 }

lib/create-project-versions.js

@@ -1,10 +1,10 @@
 import tojsonapi from 'yuidoc-to-jsonapi/lib/converter'
-import RSVP from 'rsvp'
 import saveDoc from './save-document'
 import updateIDs from './update-with-versions-and-project'
 
-export default function createProjectVersions(versions, projectName) {
-	return RSVP.map(versions, version => {
+export default async function createProjectVersions(versions, projectName) {
+	const results = []
+	for (const version of versions) {
 		let jsonapidoc = updateIDs(tojsonapi(version.data), version.version)
 
 		let projectData = {
@@ -50,6 +50,8 @@ export default function createProjectVersions(versions, projectName) {
 			included: [projectData],
 		}
 
-		return saveDoc(versionDocument, projectName, version.version)
-	})
+		const result = await saveDoc(versionDocument, projectName, version.version)
+		results.push(result)
+	}
+	return results
 }

lib/fetch-yui-docs.js

@@ -1,10 +1,8 @@
-import compareVersions from 'compare-versions'
 import download from 'download'
 import fs from 'fs-extra'
 import { isEmpty, trim } from 'lodash'
 import mkdirp from 'mkdirp'
 import pkgVersions from 'pkg-versions'
-import { all, resolve } from 'rsvp'
 
 let filterValidVersions = (specificDocsVersion, ignorePreviouslyIndexedDoc) => version => {
 	let isCompatibleVersion =
@@ -20,7 +18,7 @@ let filterValidVersions = (specificDocsVersion, ignorePreviouslyIndexedDoc) => v
 
 async function fetchYuiDocsFromNpm(projects, projectName, filterValidVersionsForRequestedDocs) {
 	if (!projects.includes(projectName)) {
-		return resolve()
+		return Promise.resolve()
 	}
 
 	let projectPkgMap = {
@@ -38,7 +36,7 @@ async function fetchYuiDocsFromNpm(projects, projectName, filterValidVersionsFor
 		getProjectFileUrl = v => `https://unpkg.com/ember-data@${v}/dist/docs/data.json`
 	}
 
-	return await all(
+	return await Promise.all(
 		versionsToProcess.map(async v => {
 			let url = getProjectFileUrl(v)
 			let targetDir = `tmp/s3-docs/v${v}`

lib/markup.js

@@ -16,7 +16,6 @@ export default function (doc) {
 			const description = attributes.description
 
 			if (description) {
-				// eslint-disable-next-line require-atomic-updates
 				attributes.description = highlight(description)
 			}
 
@@ -39,10 +38,9 @@ export default function (doc) {
 
 function replaceDescriptionFor(items) {
 	if (items) {
-		items.map(item => {
+		items.forEach(item => {
 			let itemDescription = item.description
 			if (itemDescription) {
-				// eslint-disable-next-line require-atomic-updates
 				item.description = highlight(itemDescription)
 			}
 		})

lib/modules-transform.js

@@ -1,5 +1,4 @@
 import _ from 'lodash'
-import RSVP from 'rsvp'
 
 function addSubModulesParentAttribute(moduleObj) {
 	moduleObj.parent = moduleObj.is_submodule ? moduleObj.module : null
@@ -78,8 +77,8 @@ export default function transformModules(docSets) {
 			})
 		})
 	} catch (e) {
-		return RSVP.reject(e)
+		return Promise.reject(e)
 	}
 
-	return RSVP.resolve(docSets)
+	return Promise.resolve(docSets)
 }

lib/normalize-ember-dependencies.js

@@ -1,5 +1,4 @@
 import _ from 'lodash'
-import { Promise } from 'rsvp'
 import { byType } from './filter-jsonapi-doc'
 
 const missingDoc = ({ id, version }) => {

lib/normalize-ids.js

@@ -1,5 +1,4 @@
 import _ from 'lodash'
-import RSVP from 'rsvp'
 import saveDoc from './save-document'
 import tojsonapi from 'yuidoc-to-jsonapi/lib/converter'
 import updateIDs from './update-with-versions-and-project'
@@ -38,7 +37,7 @@ function filter176(project, version, { attributes }) {
 	return project !== 'ember' || parseInt(version.split('.')[1]) < 16 || attributes.name !== 'ember'
 }
 
-function normalizeIDs(pVersions, projectName) {
+async function normalizeIDs(pVersions, projectName) {
 	let jsonapidocs = pVersions.map(({ data, version }) => {
 		Object.keys(data.modules).forEach(k => {
 			let modWithVer = data.modules[k]
@@ -115,16 +114,15 @@ function normalizeIDs(pVersions, projectName) {
 		}
 	})
 
-	let versionDocs = RSVP.map(projectVersions, projectVersion => {
+	for (const projectVersion of projectVersions) {
 		let doc = { data: projectVersion }
 
 		let version = projectVersion.attributes.version
 
-		return saveDoc(doc, projectName, version)
-	})
+		await saveDoc(doc, projectName, version)
+	}
 
-	let doc = { data: jsonapidoc.data.concat(projectVersions) }
-	return versionDocs.then(() => doc)
+	return { data: jsonapidoc.data.concat(projectVersions) }
 }
 
 export default normalizeIDs

lib/rev-docs.js

@@ -1,7 +1,6 @@
 import revFile from 'rev-file'
 import fs from 'fs-extra'
 import ora from 'ora'
-import { Promise } from 'rsvp'
 import { basename as getFileName } from 'path'
 import { isArray } from 'lodash/lang'
 import { singularize } from 'inflected'
@@ -60,7 +59,6 @@ function revProjVersionFiles(project, ver) {
 
 	fs.writeJsonSync(projVerRevFile, projVerRevContent)
 	opProgress.succeed('Revving done!')
-	Promise.resolve()
 }
 
 export default revProjVersionFiles

lib/save-document.js

@@ -1,5 +1,4 @@
 import fs from 'fs-extra'
-import RSVP from 'rsvp'
 import path from 'path'
 import mkdirp from 'mkdirp'
 import { pluralize } from 'inflected'
@@ -17,7 +16,7 @@ export default function saveDoc(document, projectName, version = '') {
 
 	let json = JSON.stringify(document, null, 2)
 
-	return new RSVP.Promise((resolve, reject) => {
+	return new Promise((resolve, reject) => {
 		if (document.data.id.length > 50) {
 			// wtf ember 1.0 docs??
 			return resolve()

main.js

@@ -1,4 +1,3 @@
-import RSVP from 'rsvp'
 import fs from 'fs-extra'
 import rimraf from 'rimraf'
 
@@ -33,7 +32,8 @@ async function transformObject(doc, projectName, docVersion) {
 }
 
 async function transformProject(project, projectName) {
-	const docs = await RSVP.map(project, doc => {
+	const docs = []
+	for (const doc of project) {
 		let docVersion = doc.version
 		console.log(`Starting to process ${projectName}-${docVersion}`)
 
@@ -42,16 +42,14 @@ async function transformProject(project, projectName) {
 			rimraf.sync(existingFolder)
 		}
 
-		return transformObject(doc, projectName, docVersion)
-	}).catch((e) => {
-		console.log(e)
-		console.error('wat')
-	})
+		const transformed = await transformObject(doc, projectName, docVersion)
+		docs.push(transformed)
+	}
 
 	let [docToSave, ...remainingDocs] = docs.filter(({ data }) => data.id === projectName)
 
 	if (!docToSave) {
-		return Promise.resolve()
+		return void 0
 	}
 
 	let existingDoc = `tmp/json-docs/${projectName}/projects/${projectName}.json`
@@ -67,13 +65,17 @@ async function transformProject(project, projectName) {
 			'project-versions'
 		].data.concat(data.relationships['project-versions'].data)
 	})
-	return saveDoc(docToSave, projectName).then(() => projectName)
+	await saveDoc(docToSave, projectName)
+	return projectName
 }
 
-function transformProjectsDeep(projects, docs) {
-	return RSVP.map(projects, projectName => {
-		return transformProject(docs[projectName], projectName)
-	})
+async function transformProjectsDeep(projects, docs) {
+	const built = []
+	for (const projectName of projects) {
+		const transformed = await transformProject(docs[projectName], projectName)
+		built.push(transformed)
+	}
+	return built
 }
 
 export async function apiDocsProcessor(
@@ -83,19 +85,14 @@ export async function apiDocsProcessor(
 	runClean,
 	noSync
 ) {
-	RSVP.on('error', reason => {
-		console.log(reason)
-		process.exit(1)
-	})
-
 	if (!noSync) {
 		let docsVersionMsg = specificDocsVersion !== '' ? `. For version ${specificDocsVersion}` : ''
 		console.log(`Downloading docs for ${projects.join(' & ')}${docsVersionMsg}`)
 
 		await downloadExistingDocsToLocal()
 		let filesToProcess = await fetchYuiDocs(projects, specificDocsVersion, runClean)
 		await fs.mkdirp('tmp/s3-original-docs')
-		await RSVP.Promise.all(filesToProcess.map(fixBorkedYuidocFiles))
+		await Promise.all(filesToProcess.map(fixBorkedYuidocFiles))
 	} else {
 		console.log('Skipping downloading docs')
 	}

package.json

@@ -53,7 +53,6 @@
 		"pkg-versions": "^2.1.0",
 		"rev-file": "^3.0.0",
 		"rimraf": "^2.6.3",
-		"rsvp": "^4.8.5",
 		"semver-compare": "^1.0.0",
 		"semver-extra": "^3.0.0",
 		"semver-utils": "^1.1.4",

yarn.lock

@@ -2534,11 +2534,6 @@ rimraf@^2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rsvp@^4.8.5:
-  version "4.8.5"
-  resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
-  integrity sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==
-
 run-async@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"