[legacy-framework] Fix possible race condition during blitz new

packages/cli/src/generators/app.ts

@@ -3,7 +3,7 @@ import readDirRecursive from 'fs-readdir-recursive'
 import spawn from 'cross-spawn'
 import chalk from 'chalk'
 import username from 'username'
-import {readJSONSync} from 'fs-extra'
+import {readJSONSync, writeJson} from 'fs-extra'
 import {join} from 'path'
 import {replaceDependencies} from '../utils/replace-dependencies'
 import {replaceBlitzDependency} from '../utils/replace-blitz-dependency'
@@ -42,16 +42,23 @@ class AppGenerator extends Generator<AppGeneratorOptions> {
   }
 
   async postWrite() {
-    const pkg = readJSONSync(join(this.destinationPath(), 'package.json'))
+    const pkgJsonLocation = join(this.destinationPath(), 'package.json')
+    const pkg = readJSONSync(pkgJsonLocation)
     const pkgDependencies = Object.keys(pkg.dependencies)
     const pkgDevDependencies = Object.keys(pkg.devDependencies)
 
-    await Promise.all([
-      replaceDependencies(pkg, this.destinationPath(), pkgDependencies, 'dependencies'),
-      replaceDependencies(pkg, this.destinationPath(), pkgDevDependencies, 'devDependencies'),
-      replaceBlitzDependency(pkg, this.destinationPath(), this.options.version),
+    const dependenciesArray = await Promise.all([
+      replaceDependencies(pkg, pkgDependencies, 'dependencies'),
+      replaceDependencies(pkg, pkgDevDependencies, 'devDependencies'),
     ])
 
+    const dependencies = dependenciesArray.reduce((prev, {key, dependencies}) => {
+      prev[key] = replaceBlitzDependency(dependencies, this.options.version)
+      return prev
+    }, {} as Record<string, Record<string, string>>)
+
+    await writeJson(pkgJsonLocation, {...pkg, ...dependencies}, {spaces: 2})
+
     console.log(chalk.hex(themeColor).bold('\nInstalling dependencies...'))
     console.log('Scary warning messages during this part are unfortunately normal.\n')
 

packages/cli/src/utils/replace-blitz-dependency.ts

@@ -1,9 +1,7 @@
-import {writeJSONSync} from 'fs-extra'
-import {join} from 'path'
+export const replaceBlitzDependency = (depends: Record<string, string>, cliVersion: string) => {
+  if (depends.blitz) {
+    depends.blitz = cliVersion.includes('canary') ? 'canary' : 'latest'
+  }
 
-export const replaceBlitzDependency = async (pkg: any, desinationPath: string, cliVersion: string) => {
-  const newVersion = cliVersion.includes('canary') ? 'canary' : 'latest'
-
-  pkg.dependencies.blitz = newVersion
-  writeJSONSync(join(desinationPath, 'package.json'), pkg, {spaces: 2})
+  return depends
 }

packages/cli/src/utils/replace-dependencies.ts

@@ -1,13 +1,6 @@
-import {writeJSONSync} from 'fs-extra'
-import {join} from 'path'
 import {getLatestVersion} from '../utils/get-latest-version'
 
-export const replaceDependencies = async (
-  pkg: any,
-  desinationPath: string,
-  dependencies: string[],
-  key: string,
-) => {
+export const replaceDependencies = async (pkg: any, dependencies: string[], key: string) => {
   const latestVersions = await Promise.all(
     dependencies.map(async (dependency) => {
       const templateVersion = pkg[key][dependency]
@@ -19,6 +12,5 @@ export const replaceDependencies = async (
     }),
   )
 
-  pkg[key] = dependencies.reduce((o, k, i) => ({...o, [k]: latestVersions[i]}), {})
-  writeJSONSync(join(desinationPath, 'package.json'), pkg, {spaces: 2})
+  return {key, dependencies: dependencies.reduce((o, k, i) => ({...o, [k]: latestVersions[i]}), {})}
 }