diff --git a/packages/cypress/src/generators/cypress-project/cypress-project.ts b/packages/cypress/src/generators/cypress-project/cypress-project.ts index 6875e8f7f1..989e855122 100644 --- a/packages/cypress/src/generators/cypress-project/cypress-project.ts +++ b/packages/cypress/src/generators/cypress-project/cypress-project.ts @@ -13,7 +13,7 @@ import { updateJson, } from '@nrwl/devkit'; import { Linter, lintProjectGenerator } from '@nrwl/linter'; -import { parallelizeTasks } from '@nrwl/workspace/src/utilities/parallelize-tasks'; +import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial'; import { join } from 'path'; // app @@ -102,7 +102,7 @@ async function addLinter(host: Tree, options: CypressProjectSchema) { return json; }); - return parallelizeTasks(installTask, installTask2); + return runTasksInSerial(installTask, installTask2); } export async function cypressProjectGenerator(host: Tree, schema: Schema) { diff --git a/packages/gatsby/src/generators/application/application.ts b/packages/gatsby/src/generators/application/application.ts index 95e306de5f..4e7e360379 100644 --- a/packages/gatsby/src/generators/application/application.ts +++ b/packages/gatsby/src/generators/application/application.ts @@ -4,7 +4,7 @@ import { GeneratorCallback, Tree, } from '@nrwl/devkit'; -import { parallelizeTasks } from '@nrwl/workspace/src/utilities/parallelize-tasks'; +import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial'; import { gatsbyInitGenerator } from '../init/init'; import { Schema } from './schema'; @@ -39,7 +39,7 @@ export async function applicationGenerator(host: Tree, schema: Schema) { addGitIgnoreEntry(host, options); await formatFiles(host); - return parallelizeTasks( + return runTasksInSerial( initTask, styledTask, lintTask, diff --git a/packages/gatsby/src/generators/application/lib/add-linting.ts b/packages/gatsby/src/generators/application/lib/add-linting.ts index 55b5b3f376..9dfb900112 100644 --- a/packages/gatsby/src/generators/application/lib/add-linting.ts +++ b/packages/gatsby/src/generators/application/lib/add-linting.ts @@ -1,5 +1,5 @@ import { Tree } from '@nrwl/tao/src/shared/tree'; -import { parallelizeTasks } from '@nrwl/workspace/src/utilities/parallelize-tasks'; +import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial'; import { Linter, lintProjectGenerator } from '@nrwl/linter'; import { addDependenciesToPackageJson, @@ -43,5 +43,5 @@ export async function addLinting(host: Tree, options: NormalizedSchema) { extraEslintDependencies.devDependencies ); - return parallelizeTasks(lintTask, installTask); + return runTasksInSerial(lintTask, installTask); } diff --git a/packages/gatsby/src/generators/component/component.ts b/packages/gatsby/src/generators/component/component.ts index cd73bd3e53..1d8938c3da 100644 --- a/packages/gatsby/src/generators/component/component.ts +++ b/packages/gatsby/src/generators/component/component.ts @@ -2,7 +2,7 @@ import type { SupportedStyles } from '@nrwl/react'; import { componentGenerator as reactComponentGenerator } from '@nrwl/react'; import { convertNxGenerator, Tree } from '@nrwl/devkit'; import { addStyleDependencies } from '../../utils/styles'; -import { parallelizeTasks } from '@nrwl/workspace/src/utilities/parallelize-tasks'; +import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial'; interface Schema { name: string; @@ -29,7 +29,7 @@ export async function componentGenerator(host: Tree, options: Schema) { const styledTask = addStyleDependencies(host, options.style); - return parallelizeTasks(componentTask, styledTask); + return runTasksInSerial(componentTask, styledTask); } export default componentGenerator; diff --git a/packages/gatsby/src/generators/init/init.ts b/packages/gatsby/src/generators/init/init.ts index 207df4347b..40554c0f55 100644 --- a/packages/gatsby/src/generators/init/init.ts +++ b/packages/gatsby/src/generators/init/init.ts @@ -30,7 +30,7 @@ import { } from '../../utils/versions'; import { InitSchema } from './schema'; -import { parallelizeTasks } from '@nrwl/workspace/src/utilities/parallelize-tasks'; +import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial'; function updateDependencies(host: Tree) { const isPnpm = host.exists('pnpm-lock.yaml'); @@ -81,7 +81,7 @@ export async function gatsbyInitGenerator(host: Tree, schema: InitSchema) { const installTask = updateDependencies(host); tasks.push(installTask); - return parallelizeTasks(...tasks); + return runTasksInSerial(...tasks); } export default gatsbyInitGenerator; diff --git a/packages/gatsby/src/generators/page/page.ts b/packages/gatsby/src/generators/page/page.ts index 5c92893136..64454649ee 100644 --- a/packages/gatsby/src/generators/page/page.ts +++ b/packages/gatsby/src/generators/page/page.ts @@ -5,7 +5,7 @@ import { import { convertNxGenerator, Tree } from '@nrwl/devkit'; import { addStyleDependencies } from '../../utils/styles'; -import { parallelizeTasks } from '@nrwl/workspace/src/utilities/parallelize-tasks'; +import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial'; interface Schema { name: string; @@ -33,7 +33,7 @@ export async function pageGenerator(host: Tree, options: Schema) { const styledTask = addStyleDependencies(host, options.style); - return parallelizeTasks(componentTask, styledTask); + return runTasksInSerial(componentTask, styledTask); } export default pageGenerator; diff --git a/packages/next/src/generators/application/application.ts b/packages/next/src/generators/application/application.ts index f0bb1466bb..dad3169ac1 100644 --- a/packages/next/src/generators/application/application.ts +++ b/packages/next/src/generators/application/application.ts @@ -12,7 +12,7 @@ import { updateJestConfig } from './lib/update-jest-config'; import { nextInitGenerator } from '../init/init'; import { addStyleDependencies } from '../../utils/styles'; import { addLinting } from './lib/add-linting'; -import { parallelizeTasks } from '@nrwl/workspace/src/utilities/parallelize-tasks'; +import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial'; export async function applicationGenerator(host: Tree, schema: Schema) { const options = normalizeOptions(host, schema); @@ -35,7 +35,7 @@ export async function applicationGenerator(host: Tree, schema: Schema) { await formatFiles(host); } - return parallelizeTasks( + return runTasksInSerial( nextTask, cypressTask, jestTask, diff --git a/packages/next/src/generators/application/lib/add-linting.ts b/packages/next/src/generators/application/lib/add-linting.ts index 322d4819f1..d63c56ea7f 100644 --- a/packages/next/src/generators/application/lib/add-linting.ts +++ b/packages/next/src/generators/application/lib/add-linting.ts @@ -8,7 +8,7 @@ import { } from '@nrwl/devkit'; import { extraEslintDependencies, reactEslintJson } from '@nrwl/react'; import { NormalizedSchema } from './normalize-options'; -import { parallelizeTasks } from '@nrwl/workspace/src/utilities/parallelize-tasks'; +import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial'; export async function addLinting( host: Tree, @@ -41,5 +41,5 @@ export async function addLinting( extraEslintDependencies.devDependencies ); - return parallelizeTasks(lintTask, installTask); + return runTasksInSerial(lintTask, installTask); } diff --git a/packages/next/src/generators/component/component.ts b/packages/next/src/generators/component/component.ts index aa8e3ecace..792a1b854e 100644 --- a/packages/next/src/generators/component/component.ts +++ b/packages/next/src/generators/component/component.ts @@ -2,7 +2,7 @@ import { addStyleDependencies } from '../../utils/styles'; import type { SupportedStyles } from '@nrwl/react'; import { componentGenerator as reactComponentGenerator } from '@nrwl/react'; import { convertNxGenerator, Tree } from '@nrwl/devkit'; -import { parallelizeTasks } from '@nrwl/workspace/src/utilities/parallelize-tasks'; +import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial'; interface Schema { name: string; @@ -28,7 +28,7 @@ export async function componentGenerator(host: Tree, options: Schema) { const styledInstall = addStyleDependencies(host, options.style); - return parallelizeTasks(styledInstall, componentInstall); + return runTasksInSerial(styledInstall, componentInstall); } export default componentGenerator; diff --git a/packages/next/src/generators/init/init.ts b/packages/next/src/generators/init/init.ts index f571c8e8c7..dcc190f56a 100644 --- a/packages/next/src/generators/init/init.ts +++ b/packages/next/src/generators/init/init.ts @@ -5,7 +5,7 @@ import { Tree, } from '@nrwl/devkit'; import { setDefaultCollection } from '@nrwl/workspace/src/utilities/set-default-collection'; -import { parallelizeTasks } from '@nrwl/workspace/src/utilities/parallelize-tasks'; +import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial'; import { jestInitGenerator } from '@nrwl/jest'; import { cypressInitGenerator } from '@nrwl/cypress'; import { reactDomVersion, reactInitGenerator, reactVersion } from '@nrwl/react'; @@ -46,7 +46,7 @@ export async function nextInitGenerator(host: Tree, schema: InitSchema) { const installTask = updateDependencies(host); tasks.push(installTask); - return parallelizeTasks(...tasks); + return runTasksInSerial(...tasks); } export default nextInitGenerator; diff --git a/packages/next/src/generators/page/page.ts b/packages/next/src/generators/page/page.ts index 50a0298e2c..e686fac995 100644 --- a/packages/next/src/generators/page/page.ts +++ b/packages/next/src/generators/page/page.ts @@ -3,7 +3,7 @@ import { convertNxGenerator, Tree } from '@nrwl/devkit'; import { addStyleDependencies } from '../../utils/styles'; import { Schema } from './schema'; -import { parallelizeTasks } from '@nrwl/workspace/src/utilities/parallelize-tasks'; +import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial'; /* * This schematic is basically the React component one, but for Next we need @@ -24,7 +24,7 @@ export async function pageGenerator(host: Tree, options: Schema) { const styledTask = addStyleDependencies(host, options.style); - return parallelizeTasks(componentTask, styledTask); + return runTasksInSerial(componentTask, styledTask); } export default pageGenerator; diff --git a/packages/react/src/generators/application/application.ts b/packages/react/src/generators/application/application.ts index 56f69ca7f6..25449d15fb 100644 --- a/packages/react/src/generators/application/application.ts +++ b/packages/react/src/generators/application/application.ts @@ -18,7 +18,7 @@ import { Tree, updateJson, } from '@nrwl/devkit'; -import { parallelizeTasks } from '@nrwl/workspace/src/utilities/parallelize-tasks'; +import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial'; import reactInitGenerator from '../init/init'; import { lintProjectGenerator } from '@nrwl/linter'; @@ -51,7 +51,7 @@ async function addLinting(host: Tree, options: NormalizedSchema) { ); tasks.push(installTask); - return parallelizeTasks(...tasks); + return runTasksInSerial(...tasks); } export async function applicationGenerator(host: Tree, schema: Schema) { @@ -76,7 +76,7 @@ export async function applicationGenerator(host: Tree, schema: Schema) { await formatFiles(host); } - return parallelizeTasks( + return runTasksInSerial( initTask, lintTask, cypressTask, diff --git a/packages/react/src/generators/component/component.ts b/packages/react/src/generators/component/component.ts index d61797ee9a..49dd2038d6 100644 --- a/packages/react/src/generators/component/component.ts +++ b/packages/react/src/generators/component/component.ts @@ -20,7 +20,7 @@ import { toJS, Tree, } from '@nrwl/devkit'; -import { parallelizeTasks } from '@nrwl/workspace/src/utilities/parallelize-tasks'; +import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial'; import { addImport } from '../../utils/ast-utils'; interface NormalizedSchema extends Schema { @@ -53,7 +53,7 @@ export async function componentGenerator(host: Tree, schema: Schema) { await formatFiles(host); - return parallelizeTasks(...tasks); + return runTasksInSerial(...tasks); } function createComponentFiles(host: Tree, options: NormalizedSchema) { diff --git a/packages/react/src/generators/init/init.ts b/packages/react/src/generators/init/init.ts index f92b11d18b..569fc499b3 100644 --- a/packages/react/src/generators/init/init.ts +++ b/packages/react/src/generators/init/init.ts @@ -11,7 +11,7 @@ import { jestInitGenerator } from '@nrwl/jest'; import { cypressInitGenerator } from '@nrwl/cypress'; import { webInitGenerator } from '@nrwl/web'; import { setDefaultCollection } from '@nrwl/workspace/src/utilities/set-default-collection'; -import { parallelizeTasks } from '@nrwl/workspace/src/utilities/parallelize-tasks'; +import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial'; import { nxVersion, reactDomVersion, @@ -74,7 +74,7 @@ export async function reactInitGenerator(host: Tree, schema: InitSchema) { ); tasks.push(installTask); - return parallelizeTasks(...tasks); + return runTasksInSerial(...tasks); } export default reactInitGenerator; diff --git a/packages/react/src/generators/library/library.ts b/packages/react/src/generators/library/library.ts index 72e870b814..5a39f66ece 100644 --- a/packages/react/src/generators/library/library.ts +++ b/packages/react/src/generators/library/library.ts @@ -35,7 +35,7 @@ import { Tree, updateJson, } from '@nrwl/devkit'; -import { parallelizeTasks } from '@nrwl/workspace/src/utilities/parallelize-tasks'; +import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial'; import init from '../init/init'; import { Linter, lintProjectGenerator } from '@nrwl/linter'; import { jestProjectGenerator } from '@nrwl/jest'; @@ -137,7 +137,7 @@ export async function libraryGenerator(host: Tree, schema: Schema) { await formatFiles(host); } - return parallelizeTasks(...tasks); + return runTasksInSerial(...tasks); } async function addLinting(host: Tree, options: NormalizedSchema) { @@ -170,7 +170,7 @@ async function addLinting(host: Tree, options: NormalizedSchema) { extraEslintDependencies.devDependencies ); - return parallelizeTasks(lintTask, installTask); + return runTasksInSerial(lintTask, installTask); } function addProject(host: Tree, options: NormalizedSchema) { diff --git a/packages/storybook/src/generators/configuration/configuration.ts b/packages/storybook/src/generators/configuration/configuration.ts index fee9c7bcae..3a0b3f1bb6 100644 --- a/packages/storybook/src/generators/configuration/configuration.ts +++ b/packages/storybook/src/generators/configuration/configuration.ts @@ -14,7 +14,7 @@ import { updateProjectConfiguration, writeJson, } from '@nrwl/devkit'; -import { parallelizeTasks } from '@nrwl/workspace/src/utilities/parallelize-tasks'; +import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial'; import { Linter } from '@nrwl/linter'; import { join } from 'path'; @@ -72,7 +72,7 @@ export async function configurationGenerator( await formatFiles(tree); - return parallelizeTasks(...tasks); + return runTasksInSerial(...tasks); } function normalizeSchema(schema: StorybookConfigureSchema) { diff --git a/packages/web/src/generators/application/application.ts b/packages/web/src/generators/application/application.ts index efc5f1526f..0f3b2bb9f6 100644 --- a/packages/web/src/generators/application/application.ts +++ b/packages/web/src/generators/application/application.ts @@ -15,7 +15,7 @@ import { Tree, updateWorkspaceConfiguration, } from '@nrwl/devkit'; -import { parallelizeTasks } from '@nrwl/workspace/src/utilities/parallelize-tasks'; +import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial'; import { join } from 'path'; @@ -228,7 +228,7 @@ export async function applicationGenerator(host: Tree, schema: Schema) { if (!schema.skipFormat) { await formatFiles(host); } - return parallelizeTasks(...tasks); + return runTasksInSerial(...tasks); } function normalizeOptions(host: Tree, options: Schema): NormalizedSchema { diff --git a/packages/web/src/generators/init/init.ts b/packages/web/src/generators/init/init.ts index d51aa9a1d9..62f1b039be 100644 --- a/packages/web/src/generators/init/init.ts +++ b/packages/web/src/generators/init/init.ts @@ -8,7 +8,7 @@ import { writeJson, } from '@nrwl/devkit'; import { setDefaultCollection } from '@nrwl/workspace/src/utilities/set-default-collection'; -import { parallelizeTasks } from '@nrwl/workspace/src/utilities/parallelize-tasks'; +import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial'; import { Schema } from './schema'; import { documentRegisterElementVersion, @@ -65,7 +65,7 @@ export async function webInitGenerator(tree: Tree, schema: Schema) { if (!schema.skipFormat) { await formatFiles(tree); } - return parallelizeTasks(...tasks); + return runTasksInSerial(...tasks); } export default webInitGenerator; diff --git a/packages/workspace/src/generators/library/library.ts b/packages/workspace/src/generators/library/library.ts index 1edcc319e0..9331e04965 100644 --- a/packages/workspace/src/generators/library/library.ts +++ b/packages/workspace/src/generators/library/library.ts @@ -12,7 +12,7 @@ import { GeneratorCallback, joinPathFragments, } from '@nrwl/devkit'; -import { parallelizeTasks } from '@nrwl/workspace/src/utilities/parallelize-tasks'; +import { runTasksInSerial } from '@nrwl/workspace/src/utilities/run-tasks-in-serial'; import { join } from 'path'; import { Schema } from './schema'; @@ -164,7 +164,7 @@ export async function libraryGenerator(tree: Tree, schema: Schema) { await formatFiles(tree); } - return parallelizeTasks(...tasks); + return runTasksInSerial(...tasks); } export default libraryGenerator; diff --git a/packages/workspace/src/utilities/parallelize-tasks.ts b/packages/workspace/src/utilities/run-tasks-in-serial.ts similarity index 59% rename from packages/workspace/src/utilities/parallelize-tasks.ts rename to packages/workspace/src/utilities/run-tasks-in-serial.ts index 91f9aeab90..bd2b34ddaa 100644 --- a/packages/workspace/src/utilities/parallelize-tasks.ts +++ b/packages/workspace/src/utilities/run-tasks-in-serial.ts @@ -1,9 +1,11 @@ import { GeneratorCallback } from '@nrwl/devkit'; -export function parallelizeTasks( +export function runTasksInSerial( ...tasks: GeneratorCallback[] ): GeneratorCallback { return async () => { - await Promise.all(tasks.map((task) => task())); + for (const task of tasks) { + await task(); + } }; }