@nrwl/workspace 13.1.3 → 13.2.0-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.d.ts +1 -1
- package/index.js +5 -4
- package/index.js.map +1 -1
- package/package.json +6 -6
- package/src/command-line/affected.js +12 -12
- package/src/command-line/affected.js.map +1 -1
- package/src/command-line/connect-to-nx-cloud.js +11 -11
- package/src/command-line/connect-to-nx-cloud.js.map +1 -1
- package/src/command-line/daemon.js +1 -1
- package/src/command-line/dep-graph.js +37 -37
- package/src/command-line/dep-graph.js.map +1 -1
- package/src/command-line/format.js +28 -28
- package/src/command-line/format.js.map +1 -1
- package/src/command-line/lint.js +4 -4
- package/src/command-line/lint.js.map +1 -1
- package/src/command-line/list.js +8 -8
- package/src/command-line/list.js.map +1 -1
- package/src/command-line/nx-commands.js +27 -27
- package/src/command-line/nx-commands.js.map +1 -1
- package/src/command-line/print-affected.js +5 -5
- package/src/command-line/print-affected.js.map +1 -1
- package/src/command-line/report.js +3 -3
- package/src/command-line/report.js.map +1 -1
- package/src/command-line/reset.js +3 -3
- package/src/command-line/reset.js.map +1 -1
- package/src/command-line/run-many.js +7 -7
- package/src/command-line/run-many.js.map +1 -1
- package/src/command-line/run-one.js +6 -6
- package/src/command-line/run-one.js.map +1 -1
- package/src/command-line/shared.js +4 -4
- package/src/command-line/shared.js.map +1 -1
- package/src/command-line/utils.js +2 -2
- package/src/command-line/utils.js.map +1 -1
- package/src/command-line/workspace-generators.js +17 -17
- package/src/command-line/workspace-generators.js.map +1 -1
- package/src/command-line/workspace-integrity-checks.js +1 -1
- package/src/command-line/workspace-integrity-checks.js.map +1 -1
- package/src/command-line/workspace-results.js +8 -8
- package/src/command-line/workspace-results.js.map +1 -1
- package/src/core/affected-project-graph/affected-project-graph.js +3 -3
- package/src/core/affected-project-graph/affected-project-graph.js.map +1 -1
- package/src/core/affected-project-graph/index.js +2 -2
- package/src/core/affected-project-graph/index.js.map +1 -1
- package/src/core/affected-project-graph/locators/implicit-json-changes.js +3 -3
- package/src/core/affected-project-graph/locators/implicit-json-changes.js.map +1 -1
- package/src/core/affected-project-graph/locators/npm-packages.js +2 -2
- package/src/core/affected-project-graph/locators/npm-packages.js.map +1 -1
- package/src/core/affected-project-graph/locators/tsconfig-json-changes.js +3 -3
- package/src/core/affected-project-graph/locators/tsconfig-json-changes.js.map +1 -1
- package/src/core/affected-project-graph/locators/workspace-json-changes.js +4 -4
- package/src/core/affected-project-graph/locators/workspace-json-changes.js.map +1 -1
- package/src/core/dep-graph/3rdpartylicenses.txt +11 -36
- package/src/core/dep-graph/index.html +1 -1
- package/src/core/dep-graph/main.esm.js +1 -1
- package/src/core/dep-graph/polyfills.esm.js +1 -1
- package/src/core/dep-graph/styles.css +1 -1
- package/src/core/file-utils.js +23 -23
- package/src/core/file-utils.js.map +1 -1
- package/src/core/hasher/file-hasher.js +1 -1
- package/src/core/hasher/file-hasher.js.map +1 -1
- package/src/core/hasher/git-hasher.js +6 -6
- package/src/core/hasher/git-hasher.js.map +1 -1
- package/src/core/hasher/hasher.js +24 -24
- package/src/core/hasher/hasher.js.map +1 -1
- package/src/core/hasher/hashing-impl.js +3 -3
- package/src/core/hasher/hashing-impl.js.map +1 -1
- package/src/core/hasher/spawn-process.js +1 -1
- package/src/core/hasher/spawn-process.js.map +1 -1
- package/src/core/nx-deps/nx-deps-cache.js +8 -8
- package/src/core/nx-deps/nx-deps-cache.js.map +1 -1
- package/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.js +2 -2
- package/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.js.map +1 -1
- package/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.js +2 -2
- package/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.js.map +1 -1
- package/src/core/project-graph/build-dependencies/index.js +3 -3
- package/src/core/project-graph/build-dependencies/index.js.map +1 -1
- package/src/core/project-graph/build-dependencies/typescript-import-locator.js +3 -3
- package/src/core/project-graph/build-dependencies/typescript-import-locator.js.map +1 -1
- package/src/core/project-graph/build-nodes/index.js +2 -2
- package/src/core/project-graph/build-nodes/index.js.map +1 -1
- package/src/core/project-graph/build-nodes/npm-packages.js +1 -1
- package/src/core/project-graph/build-nodes/npm-packages.js.map +1 -1
- package/src/core/project-graph/build-nodes/workspace-projects.js +1 -1
- package/src/core/project-graph/build-nodes/workspace-projects.js.map +1 -1
- package/src/core/project-graph/build-project-graph.js +33 -33
- package/src/core/project-graph/build-project-graph.js.map +1 -1
- package/src/core/project-graph/daemon/cache.js +9 -9
- package/src/core/project-graph/daemon/cache.js.map +1 -1
- package/src/core/project-graph/daemon/client/client.js +16 -16
- package/src/core/project-graph/daemon/client/client.js.map +1 -1
- package/src/core/project-graph/daemon/client/exec-is-server-available.js +2 -2
- package/src/core/project-graph/daemon/client/exec-is-server-available.js.map +1 -1
- package/src/core/project-graph/daemon/client/generate-help-output.js +2 -2
- package/src/core/project-graph/daemon/client/generate-help-output.js.map +1 -1
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js +10 -10
- package/src/core/project-graph/daemon/server/project-graph-incremental-recomputation.js.map +1 -1
- package/src/core/project-graph/daemon/server/server.js +26 -26
- package/src/core/project-graph/daemon/server/server.js.map +1 -1
- package/src/core/project-graph/daemon/server/shutdown-utils.js +1 -1
- package/src/core/project-graph/daemon/server/start.js +2 -2
- package/src/core/project-graph/daemon/server/start.js.map +1 -1
- package/src/core/project-graph/daemon/server/stop.js +3 -3
- package/src/core/project-graph/daemon/server/stop.js.map +1 -1
- package/src/core/project-graph/daemon/server/watcher.js +8 -8
- package/src/core/project-graph/daemon/server/watcher.js.map +1 -1
- package/src/core/project-graph/daemon/socket-utils.js +4 -4
- package/src/core/project-graph/daemon/socket-utils.js.map +1 -1
- package/src/core/project-graph/daemon/tmp-dir.js +7 -7
- package/src/core/project-graph/daemon/tmp-dir.js.map +1 -1
- package/src/core/project-graph/index.js +2 -2
- package/src/core/project-graph/index.js.map +1 -1
- package/src/core/project-graph/project-graph-worker.js +1 -1
- package/src/core/project-graph/project-graph-worker.js.map +1 -1
- package/src/core/project-graph/project-graph.js +7 -7
- package/src/core/project-graph/project-graph.js.map +1 -1
- package/src/core/target-project-locator.js +9 -9
- package/src/core/target-project-locator.js.map +1 -1
- package/src/devkit-reexport.js +3 -3
- package/src/devkit-reexport.js.map +1 -1
- package/src/executors/counter/counter.impl.js +7 -7
- package/src/executors/counter/counter.impl.js.map +1 -1
- package/src/executors/run-commands/compat.js +1 -1
- package/src/executors/run-commands/compat.js.map +1 -1
- package/src/executors/run-commands/run-commands.impl.js +7 -7
- package/src/executors/run-commands/run-commands.impl.js.map +1 -1
- package/src/executors/run-script/compat.js +1 -1
- package/src/executors/run-script/compat.js.map +1 -1
- package/src/executors/run-script/run-script.impl.js +3 -3
- package/src/executors/run-script/run-script.impl.js.map +1 -1
- package/src/executors/tsc/compat.js +1 -1
- package/src/executors/tsc/compat.js.map +1 -1
- package/src/executors/tsc/tsc.impl.js +14 -14
- package/src/executors/tsc/tsc.impl.js.map +1 -1
- package/src/generators/convert-to-nx-project/convert-to-nx-project.js +13 -13
- package/src/generators/convert-to-nx-project/convert-to-nx-project.js.map +1 -1
- package/src/generators/convert-to-nx-project/utils/get-project-configuration-path.js +1 -1
- package/src/generators/convert-to-nx-project/utils/get-project-configuration-path.js.map +1 -1
- package/src/generators/init/init.js +61 -61
- package/src/generators/init/init.js.map +1 -1
- package/src/generators/library/library.js +24 -24
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/schema.json +1 -1
- package/src/generators/move/lib/check-destination.js +1 -1
- package/src/generators/move/lib/check-destination.js.map +1 -1
- package/src/generators/move/lib/move-project-configuration.js +3 -3
- package/src/generators/move/lib/move-project-configuration.js.map +1 -1
- package/src/generators/move/lib/move-project.js +3 -3
- package/src/generators/move/lib/move-project.js.map +1 -1
- package/src/generators/move/lib/normalize-schema.js +4 -4
- package/src/generators/move/lib/normalize-schema.js.map +1 -1
- package/src/generators/move/lib/update-build-targets.js +1 -1
- package/src/generators/move/lib/update-build-targets.js.map +1 -1
- package/src/generators/move/lib/update-default-project.js +2 -2
- package/src/generators/move/lib/update-default-project.js.map +1 -1
- package/src/generators/move/lib/update-eslintrc-json.js +5 -5
- package/src/generators/move/lib/update-eslintrc-json.js.map +1 -1
- package/src/generators/move/lib/update-implicit-dependencies.js +2 -2
- package/src/generators/move/lib/update-implicit-dependencies.js.map +1 -1
- package/src/generators/move/lib/update-imports.js +9 -8
- package/src/generators/move/lib/update-imports.js.map +1 -1
- package/src/generators/move/lib/update-package-json.js +1 -1
- package/src/generators/move/lib/update-package-json.js.map +1 -1
- package/src/generators/move/lib/update-project-root-files.js +3 -3
- package/src/generators/move/lib/update-project-root-files.js.map +1 -1
- package/src/generators/move/lib/update-readme.js +1 -1
- package/src/generators/move/lib/update-readme.js.map +1 -1
- package/src/generators/move/lib/update-storybook-config.js +2 -2
- package/src/generators/move/lib/update-storybook-config.js.map +1 -1
- package/src/generators/move/lib/utils.js +2 -2
- package/src/generators/move/lib/utils.js.map +1 -1
- package/src/generators/move/move.js +19 -19
- package/src/generators/move/move.js.map +1 -1
- package/src/generators/new/new.js +23 -23
- package/src/generators/new/new.js.map +1 -1
- package/src/generators/npm-package/npm-package.js +12 -12
- package/src/generators/npm-package/npm-package.js.map +1 -1
- package/src/generators/preset/preset.js +17 -17
- package/src/generators/preset/preset.js.map +1 -1
- package/src/generators/remove/lib/check-dependencies.js +3 -3
- package/src/generators/remove/lib/check-dependencies.js.map +1 -1
- package/src/generators/remove/lib/check-targets.js +1 -1
- package/src/generators/remove/lib/check-targets.js.map +1 -1
- package/src/generators/remove/lib/remove-project-config.js +6 -6
- package/src/generators/remove/lib/remove-project-config.js.map +1 -1
- package/src/generators/remove/lib/remove-project.js +1 -1
- package/src/generators/remove/lib/remove-project.js.map +1 -1
- package/src/generators/remove/lib/update-jest-config.js +7 -7
- package/src/generators/remove/lib/update-jest-config.js.map +1 -1
- package/src/generators/remove/lib/update-tsconfig.js +2 -2
- package/src/generators/remove/lib/update-tsconfig.js.map +1 -1
- package/src/generators/remove/remove.js +10 -10
- package/src/generators/remove/remove.js.map +1 -1
- package/src/generators/run-commands/run-commands.js +5 -5
- package/src/generators/run-commands/run-commands.js.map +1 -1
- package/src/generators/utils/insert-import.js +5 -5
- package/src/generators/utils/insert-import.js.map +1 -1
- package/src/generators/utils/insert-statement.js +2 -2
- package/src/generators/utils/insert-statement.js.map +1 -1
- package/src/generators/workspace/workspace.js +18 -18
- package/src/generators/workspace/workspace.js.map +1 -1
- package/src/generators/workspace-generator/workspace-generator.js +5 -5
- package/src/generators/workspace-generator/workspace-generator.js.map +1 -1
- package/src/migrations/update-10-0-0/solution-tsconfigs.js +18 -18
- package/src/migrations/update-10-0-0/solution-tsconfigs.js.map +1 -1
- package/src/migrations/update-10-0-0/update-10-0-0.js +3 -3
- package/src/migrations/update-10-0-0/update-10-0-0.js.map +1 -1
- package/src/migrations/update-10-0-1/migrate-eslintrc.js +6 -6
- package/src/migrations/update-10-0-1/migrate-eslintrc.js.map +1 -1
- package/src/migrations/update-10-1-0/migrate-eslintrc-tsconfig-wildcard.js +4 -4
- package/src/migrations/update-10-1-0/migrate-eslintrc-tsconfig-wildcard.js.map +1 -1
- package/src/migrations/update-10-3-0/add-buildable-project-deps-in-package-json-type.js +3 -3
- package/src/migrations/update-10-3-0/add-buildable-project-deps-in-package-json-type.js.map +1 -1
- package/src/migrations/update-10-3-0/add-cli-dependency.js +5 -5
- package/src/migrations/update-10-3-0/add-cli-dependency.js.map +1 -1
- package/src/migrations/update-10-3-0/add-vscode-extensions.js +3 -3
- package/src/migrations/update-10-3-0/add-vscode-extensions.js.map +1 -1
- package/src/migrations/update-10-3-0/update-typescript.js +2 -2
- package/src/migrations/update-10-3-0/update-typescript.js.map +1 -1
- package/src/migrations/update-10-4-0/add-explicit-dep-on-tao.js +5 -5
- package/src/migrations/update-10-4-0/add-explicit-dep-on-tao.js.map +1 -1
- package/src/migrations/update-10-4-0/update-script-to-invoke-nx-migrate.js +1 -1
- package/src/migrations/update-10-4-0/update-script-to-invoke-nx-migrate.js.map +1 -1
- package/src/migrations/update-11-0-0/add-outputs-in-workspace.js +2 -2
- package/src/migrations/update-11-0-0/add-outputs-in-workspace.js.map +1 -1
- package/src/migrations/update-11-0-0/rename-workspace-schematic-script.js +1 -1
- package/src/migrations/update-11-0-0/rename-workspace-schematic-script.js.map +1 -1
- package/src/migrations/update-11-0-0/rename-workspace-schematics.js +2 -2
- package/src/migrations/update-11-0-0/rename-workspace-schematics.js.map +1 -1
- package/src/migrations/update-11-0-0/update-decorate-angular-cli.js +1 -1
- package/src/migrations/update-11-0-0/update-decorate-angular-cli.js.map +1 -1
- package/src/migrations/update-11-0-0/update-node-types.js +2 -2
- package/src/migrations/update-11-0-0/update-node-types.js.map +1 -1
- package/src/migrations/update-11-1-2/update-11-1-2.js +2 -2
- package/src/migrations/update-11-1-2/update-11-1-2.js.map +1 -1
- package/src/migrations/update-12-5-0/add-target-dependencies.js +4 -4
- package/src/migrations/update-12-5-0/add-target-dependencies.js.map +1 -1
- package/src/migrations/update-13-0-0/config-locations/config-locations.js +6 -6
- package/src/migrations/update-13-0-0/config-locations/config-locations.js.map +1 -1
- package/src/migrations/update-13-0-0/set-default-base-if-not-set.js +4 -4
- package/src/migrations/update-13-0-0/set-default-base-if-not-set.js.map +1 -1
- package/src/migrations/update-8-10-0/fix-tslint-json.js +8 -8
- package/src/migrations/update-8-10-0/fix-tslint-json.js.map +1 -1
- package/src/migrations/update-8-12-0/add-implicit-e2e-deps.js +3 -3
- package/src/migrations/update-8-12-0/add-implicit-e2e-deps.js.map +1 -1
- package/src/migrations/update-8-12-0/update-enforce-boundary-lint-rule.js +3 -3
- package/src/migrations/update-8-12-0/update-enforce-boundary-lint-rule.js.map +1 -1
- package/src/migrations/update-8-12-0/update-package-json-deps.js +3 -3
- package/src/migrations/update-8-12-0/update-package-json-deps.js.map +1 -1
- package/src/migrations/update-8-2-0/update-8-2-0.js +3 -3
- package/src/migrations/update-8-2-0/update-8-2-0.js.map +1 -1
- package/src/migrations/update-8-3-0/rename-lint.js +2 -2
- package/src/migrations/update-8-3-0/rename-lint.js.map +1 -1
- package/src/migrations/update-8-3-0/update-cypress-to-34.js +2 -2
- package/src/migrations/update-8-3-0/update-cypress-to-34.js.map +1 -1
- package/src/migrations/update-8-3-0/update-ng-cli-8-1.js +4 -4
- package/src/migrations/update-8-3-0/update-ng-cli-8-1.js.map +1 -1
- package/src/migrations/update-8-4-0/add-nx-script.js +2 -2
- package/src/migrations/update-8-4-0/add-nx-script.js.map +1 -1
- package/src/migrations/update-8-5-0/fix-tsconfig-lib-json.js +4 -4
- package/src/migrations/update-8-5-0/fix-tsconfig-lib-json.js.map +1 -1
- package/src/migrations/update-9-0-0/update-9-0-0.js +2 -2
- package/src/migrations/update-9-0-0/update-9-0-0.js.map +1 -1
- package/src/migrations/update-9-1-0/update-9-1-0.js +2 -2
- package/src/migrations/update-9-1-0/update-9-1-0.js.map +1 -1
- package/src/migrations/update-9-1-0/update-lint-config.js +3 -3
- package/src/migrations/update-9-1-0/update-lint-config.js.map +1 -1
- package/src/migrations/update-9-2-0/update-9-2-0.js +3 -3
- package/src/migrations/update-9-2-0/update-9-2-0.js.map +1 -1
- package/src/migrations/update-9-3-0/update-9-3-0.js +2 -2
- package/src/migrations/update-9-3-0/update-9-3-0.js.map +1 -1
- package/src/migrations/update-9-4-0/add-decorate-cli.js +3 -3
- package/src/migrations/update-9-4-0/add-decorate-cli.js.map +1 -1
- package/src/migrations/update-9-4-0/update-eslint-config.js +2 -2
- package/src/migrations/update-9-4-0/update-eslint-config.js.map +1 -1
- package/src/migrations/update-9-4-0/update-linters-exclude.js +2 -2
- package/src/migrations/update-9-4-0/update-linters-exclude.js.map +1 -1
- package/src/tasks-runner/batch/run-batch.js +3 -3
- package/src/tasks-runner/batch/run-batch.js.map +1 -1
- package/src/tasks-runner/cache.js +57 -57
- package/src/tasks-runner/cache.js.map +1 -1
- package/src/tasks-runner/default-tasks-runner.js +1 -1
- package/src/tasks-runner/forked-process-task-runner.js +10 -10
- package/src/tasks-runner/forked-process-task-runner.js.map +1 -1
- package/src/tasks-runner/remove-old-cache-records.js +7 -7
- package/src/tasks-runner/remove-old-cache-records.js.map +1 -1
- package/src/tasks-runner/run-command.js +8 -8
- package/src/tasks-runner/run-command.js.map +1 -1
- package/src/tasks-runner/task-graph-creator.js +1 -1
- package/src/tasks-runner/task-graph-creator.js.map +1 -1
- package/src/tasks-runner/task-orchestrator.js +22 -22
- package/src/tasks-runner/task-orchestrator.js.map +1 -1
- package/src/tasks-runner/tasks-schedule.js +7 -7
- package/src/tasks-runner/tasks-schedule.js.map +1 -1
- package/src/tasks-runner/utils.js +3 -3
- package/src/tasks-runner/utils.js.map +1 -1
- package/src/tslint/nxEnforceModuleBoundariesRule.js +16 -16
- package/src/tslint/nxEnforceModuleBoundariesRule.js.map +1 -1
- package/src/utilities/app-root.js +2 -2
- package/src/utilities/app-root.js.map +1 -1
- package/src/utilities/assets.js +7 -7
- package/src/utilities/assets.js.map +1 -1
- package/src/utilities/ast-utils.js +10 -10
- package/src/utilities/ast-utils.js.map +1 -1
- package/src/utilities/buildable-libs-utils.js +19 -19
- package/src/utilities/buildable-libs-utils.js.map +1 -1
- package/src/utilities/cache-directory.js +3 -3
- package/src/utilities/cache-directory.js.map +1 -1
- package/src/utilities/create-package-json.js +2 -2
- package/src/utilities/create-package-json.js.map +1 -1
- package/src/utilities/default-base.js +2 -2
- package/src/utilities/default-base.js.map +1 -1
- package/src/utilities/executor-options-utils.js +1 -1
- package/src/utilities/executor-options-utils.js.map +1 -1
- package/src/utilities/fileutils.js +15 -15
- package/src/utilities/fileutils.js.map +1 -1
- package/src/utilities/generate-globs.js +5 -5
- package/src/utilities/generate-globs.js.map +1 -1
- package/src/utilities/plugins/community-plugins.js +2 -2
- package/src/utilities/plugins/community-plugins.js.map +1 -1
- package/src/utilities/plugins/installed-plugins.js +4 -4
- package/src/utilities/plugins/installed-plugins.js.map +1 -1
- package/src/utilities/plugins/plugin-capabilities.js +5 -5
- package/src/utilities/plugins/plugin-capabilities.js.map +1 -1
- package/src/utilities/prettier.js +1 -1
- package/src/utilities/project-graph-utils.js +6 -6
- package/src/utilities/project-graph-utils.js.map +1 -1
- package/src/utilities/project-type.js +2 -2
- package/src/utilities/project-type.js.map +1 -1
- package/src/utilities/run-tasks-in-serial.js +1 -1
- package/src/utilities/set-default-collection.js +2 -2
- package/src/utilities/set-default-collection.js.map +1 -1
- package/src/utilities/typescript/compilation.js +4 -4
- package/src/utilities/typescript/compilation.js.map +1 -1
- package/src/utilities/typescript.js +2 -2
- package/src/utilities/typescript.js.map +1 -1
- package/src/utilities/version-utils.js +2 -2
- package/src/utilities/version-utils.js.map +1 -1
- package/src/utils/ast-utils.js +28 -28
- package/src/utils/ast-utils.js.map +1 -1
- package/src/utils/cli-config-utils.js +1 -1
- package/src/utils/cli-config-utils.js.map +1 -1
- package/src/utils/fileutils.js +15 -15
- package/src/utils/fileutils.js.map +1 -1
- package/src/utils/lint.js +9 -9
- package/src/utils/lint.js.map +1 -1
- package/src/utils/project-type.js +2 -2
- package/src/utils/project-type.js.map +1 -1
- package/src/utils/rules/check-project-exists.js +1 -1
- package/src/utils/rules/check-project-exists.js.map +1 -1
- package/src/utils/rules/format-files.js +6 -6
- package/src/utils/rules/format-files.js.map +1 -1
- package/src/utils/rules/move-npm-packages.js +6 -6
- package/src/utils/rules/move-npm-packages.js.map +1 -1
- package/src/utils/rules/ng-add.js +1 -1
- package/src/utils/rules/ng-add.js.map +1 -1
- package/src/utils/rules/rename-npm-packages.js +7 -7
- package/src/utils/rules/rename-npm-packages.js.map +1 -1
- package/src/utils/rules/rename-package-imports.js +7 -7
- package/src/utils/rules/rename-package-imports.js.map +1 -1
- package/src/utils/rules/to-js.js +10 -10
- package/src/utils/rules/to-js.js.map +1 -1
- package/src/utils/rules/update-karma-conf.js +4 -4
- package/src/utils/rules/update-karma-conf.js.map +1 -1
- package/src/utils/rules/visit-not-ignored-files.js +6 -6
- package/src/utils/rules/visit-not-ignored-files.js.map +1 -1
- package/src/utils/rules/workspace.js +1 -1
- package/src/utils/rules/workspace.js.map +1 -1
- package/src/utils/runtime-lint-utils.js +14 -5
- package/src/utils/runtime-lint-utils.js.map +1 -1
- package/src/utils/testing-utils.d.ts +1 -1
- package/src/utils/testing-utils.js +4 -4
- package/src/utils/testing-utils.js.map +1 -1
- package/src/utils/testing.js +17 -17
- package/src/utils/testing.js.map +1 -1
- package/src/utils/update-packages-in-package-json.js +11 -11
- package/src/utils/update-packages-in-package-json.js.map +1 -1
- package/src/utils/update-task.js +3 -3
- package/src/utils/update-task.js.map +1 -1
- package/src/utils/version-utils.js +1 -1
- package/src/utils/version-utils.js.map +1 -1
- package/src/utils/versions.d.ts +2 -2
- package/src/utils/versions.js +3 -3
- package/src/utils/workspace.js +6 -6
- package/src/core/dep-graph/main.es5.js +0 -2
- package/src/core/dep-graph/main.es5.js.LICENSE.txt +0 -9
- package/src/core/dep-graph/polyfills.es5.js +0 -1
- package/src/core/dep-graph/runtime.es5.js +0 -1
|
@@ -9,12 +9,12 @@ const output_1 = require("../utilities/output");
|
|
|
9
9
|
const utils_1 = require("./utils");
|
|
10
10
|
const path_1 = require("path");
|
|
11
11
|
const batch_messages_1 = require("./batch/batch-messages");
|
|
12
|
-
const workerPath = path_1.join(__dirname, './batch/run-batch.js');
|
|
12
|
+
const workerPath = (0, path_1.join)(__dirname, './batch/run-batch.js');
|
|
13
13
|
class ForkedProcessTaskRunner {
|
|
14
14
|
constructor(options) {
|
|
15
15
|
this.options = options;
|
|
16
16
|
this.workspaceRoot = app_root_1.appRootPath;
|
|
17
|
-
this.cliPath = utils_1.getCliPath(this.workspaceRoot);
|
|
17
|
+
this.cliPath = (0, utils_1.getCliPath)(this.workspaceRoot);
|
|
18
18
|
this.processes = new Set();
|
|
19
19
|
this.setupOnProcessExitListener();
|
|
20
20
|
}
|
|
@@ -26,11 +26,11 @@ class ForkedProcessTaskRunner {
|
|
|
26
26
|
output_1.output.logSingleLine(`Running ${output_1.output.bold(count)} ${output_1.output.bold('tasks')} with ${output_1.output.bold(executorName)}`);
|
|
27
27
|
}
|
|
28
28
|
else {
|
|
29
|
-
const args = utils_1.getCommandArgsForTask(Object.values(taskGraph.tasks)[0]);
|
|
29
|
+
const args = (0, utils_1.getCommandArgsForTask)(Object.values(taskGraph.tasks)[0]);
|
|
30
30
|
const commandLine = `nx ${args.join(' ')}`;
|
|
31
31
|
output_1.output.logCommand(commandLine);
|
|
32
32
|
}
|
|
33
|
-
const p = child_process_1.fork(workerPath, {
|
|
33
|
+
const p = (0, child_process_1.fork)(workerPath, {
|
|
34
34
|
stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
|
|
35
35
|
env: this.getEnvVariablesForProcess(),
|
|
36
36
|
});
|
|
@@ -70,12 +70,12 @@ class ForkedProcessTaskRunner {
|
|
|
70
70
|
forkProcessPipeOutputCapture(task, { forwardOutput }) {
|
|
71
71
|
return new Promise((res, rej) => {
|
|
72
72
|
try {
|
|
73
|
-
const args = utils_1.getCommandArgsForTask(task);
|
|
73
|
+
const args = (0, utils_1.getCommandArgsForTask)(task);
|
|
74
74
|
const commandLine = `nx ${args.join(' ')}`;
|
|
75
75
|
if (forwardOutput) {
|
|
76
76
|
output_1.output.logCommand(commandLine);
|
|
77
77
|
}
|
|
78
|
-
const p = child_process_1.fork(this.cliPath, args, {
|
|
78
|
+
const p = (0, child_process_1.fork)(this.cliPath, args, {
|
|
79
79
|
stdio: ['inherit', 'pipe', 'pipe', 'ipc'],
|
|
80
80
|
env: this.getEnvVariablesForTask(task, process.env.FORCE_COLOR === undefined
|
|
81
81
|
? 'true'
|
|
@@ -119,12 +119,12 @@ class ForkedProcessTaskRunner {
|
|
|
119
119
|
forkProcessDirectOutputCapture(task, { forwardOutput, temporaryOutputPath, }) {
|
|
120
120
|
return new Promise((res, rej) => {
|
|
121
121
|
try {
|
|
122
|
-
const args = utils_1.getCommandArgsForTask(task);
|
|
122
|
+
const args = (0, utils_1.getCommandArgsForTask)(task);
|
|
123
123
|
const commandLine = `nx ${args.join(' ')}`;
|
|
124
124
|
if (forwardOutput) {
|
|
125
125
|
output_1.output.logCommand(commandLine);
|
|
126
126
|
}
|
|
127
|
-
const p = child_process_1.fork(this.cliPath, args, {
|
|
127
|
+
const p = (0, child_process_1.fork)(this.cliPath, args, {
|
|
128
128
|
stdio: ['inherit', 'inherit', 'inherit', 'ipc'],
|
|
129
129
|
env: this.getEnvVariablesForTask(task, undefined, temporaryOutputPath, forwardOutput),
|
|
130
130
|
});
|
|
@@ -158,7 +158,7 @@ class ForkedProcessTaskRunner {
|
|
|
158
158
|
}
|
|
159
159
|
readTerminalOutput(outputPath) {
|
|
160
160
|
try {
|
|
161
|
-
return fs_1.readFileSync(outputPath).toString();
|
|
161
|
+
return (0, fs_1.readFileSync)(outputPath).toString();
|
|
162
162
|
}
|
|
163
163
|
catch (e) {
|
|
164
164
|
return null;
|
|
@@ -242,7 +242,7 @@ class ForkedProcessTaskRunner {
|
|
|
242
242
|
exports.ForkedProcessTaskRunner = ForkedProcessTaskRunner;
|
|
243
243
|
function parseEnv(path) {
|
|
244
244
|
try {
|
|
245
|
-
const envContents = fs_1.readFileSync(path);
|
|
245
|
+
const envContents = (0, fs_1.readFileSync)(path);
|
|
246
246
|
return dotenv.parse(envContents);
|
|
247
247
|
}
|
|
248
248
|
catch (e) { }
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"forked-process-task-runner.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/forked-process-task-runner.ts"],"names":[],"mappings":";;;AAAA,2BAAkC;AAClC,iCAAiC;AACjC,iDAAmD;AACnD,2DAA2D;AAG3D,gDAA6C;AAC7C,mCAA4D;AAE5D,+BAA4B;AAC5B,2DAIgC;AAEhC,MAAM,UAAU,GAAG,WAAI,
|
|
1
|
+
{"version":3,"file":"forked-process-task-runner.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/forked-process-task-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ removeOld(terminalOutputs());
|
|
|
9
9
|
removeOld(cachedFiles());
|
|
10
10
|
function terminalOutputs() {
|
|
11
11
|
try {
|
|
12
|
-
return fs_1.readdirSync(path_1.join(folder, 'terminalOutputs')).map((f) => path_1.join(folder, 'terminalOutputs', f));
|
|
12
|
+
return (0, fs_1.readdirSync)((0, path_1.join)(folder, 'terminalOutputs')).map((f) => (0, path_1.join)(folder, 'terminalOutputs', f));
|
|
13
13
|
}
|
|
14
14
|
catch (e) {
|
|
15
15
|
return [];
|
|
@@ -17,9 +17,9 @@ function terminalOutputs() {
|
|
|
17
17
|
}
|
|
18
18
|
function cachedFiles() {
|
|
19
19
|
try {
|
|
20
|
-
return fs_1.readdirSync(folder)
|
|
20
|
+
return (0, fs_1.readdirSync)(folder)
|
|
21
21
|
.filter((f) => !f.endsWith('terminalOutputs'))
|
|
22
|
-
.map((f) => path_1.join(folder, f));
|
|
22
|
+
.map((f) => (0, path_1.join)(folder, f));
|
|
23
23
|
}
|
|
24
24
|
catch (e) {
|
|
25
25
|
return [];
|
|
@@ -30,15 +30,15 @@ function removeOld(records) {
|
|
|
30
30
|
const time = mostRecentMTime(records);
|
|
31
31
|
records.forEach((r) => {
|
|
32
32
|
try {
|
|
33
|
-
const s = fs_1.statSync(r);
|
|
33
|
+
const s = (0, fs_1.statSync)(r);
|
|
34
34
|
if (time - s.mtimeMs > WEEK_IN_MS) {
|
|
35
35
|
if (s.isDirectory()) {
|
|
36
36
|
try {
|
|
37
|
-
fs_extra_1.removeSync(`${r}.commit`);
|
|
37
|
+
(0, fs_extra_1.removeSync)(`${r}.commit`);
|
|
38
38
|
}
|
|
39
39
|
catch (e) { }
|
|
40
40
|
}
|
|
41
|
-
fs_extra_1.removeSync(r);
|
|
41
|
+
(0, fs_extra_1.removeSync)(r);
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
44
|
catch (e) { }
|
|
@@ -50,7 +50,7 @@ function mostRecentMTime(records) {
|
|
|
50
50
|
let mostRecentTime = 0;
|
|
51
51
|
records.forEach((r) => {
|
|
52
52
|
try {
|
|
53
|
-
const s = fs_1.statSync(r);
|
|
53
|
+
const s = (0, fs_1.statSync)(r);
|
|
54
54
|
if (s.mtimeMs > mostRecentTime) {
|
|
55
55
|
mostRecentTime = s.mtimeMs;
|
|
56
56
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove-old-cache-records.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/remove-old-cache-records.ts"],"names":[],"mappings":";;AAAA,2BAA2C;AAC3C,uCAAsC;AACtC,+BAA4B;AAE5B,MAAM,UAAU,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AAE3C,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAE/B,SAAS,CAAC,eAAe,EAAE,CAAC,CAAC;AAC7B,SAAS,CAAC,WAAW,EAAE,CAAC,CAAC;AAEzB,SAAS,eAAe;IACtB,IAAI;QACF,OAAO,gBAAW,
|
|
1
|
+
{"version":3,"file":"remove-old-cache-records.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/remove-old-cache-records.ts"],"names":[],"mappings":";;AAAA,2BAA2C;AAC3C,uCAAsC;AACtC,+BAA4B;AAE5B,MAAM,UAAU,GAAG,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;AAE3C,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAE/B,SAAS,CAAC,eAAe,EAAE,CAAC,CAAC;AAC7B,SAAS,CAAC,WAAW,EAAE,CAAC,CAAC;AAEzB,SAAS,eAAe;IACtB,IAAI;QACF,OAAO,IAAA,gBAAW,EAAC,IAAA,WAAI,EAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC5D,IAAA,WAAI,EAAC,MAAM,EAAE,iBAAiB,EAAE,CAAC,CAAC,CACnC,CAAC;KACH;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AAED,SAAS,WAAW;IAClB,IAAI;QACF,OAAO,IAAA,gBAAW,EAAC,MAAM,CAAC;aACvB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;aAC7C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,WAAI,EAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;KAChC;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,EAAE,CAAC;KACX;AACH,CAAC;AAED,SAAS,SAAS,CAAC,OAAiB;IAClC,IAAI;QACF,MAAM,IAAI,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;QAEtC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACpB,IAAI;gBACF,MAAM,CAAC,GAAG,IAAA,aAAQ,EAAC,CAAC,CAAC,CAAC;gBACtB,IAAI,IAAI,GAAG,CAAC,CAAC,OAAO,GAAG,UAAU,EAAE;oBACjC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE;wBACnB,IAAI;4BACF,IAAA,qBAAU,EAAC,GAAG,CAAC,SAAS,CAAC,CAAC;yBAC3B;wBAAC,OAAO,CAAC,EAAE,GAAE;qBACf;oBACD,IAAA,qBAAU,EAAC,CAAC,CAAC,CAAC;iBACf;aACF;YAAC,OAAO,CAAC,EAAE,GAAE;QAChB,CAAC,CAAC,CAAC;KACJ;IAAC,OAAO,CAAC,EAAE,GAAE;AAChB,CAAC;AAED,SAAS,eAAe,CAAC,OAAiB;IACxC,IAAI,cAAc,GAAG,CAAC,CAAC;IACvB,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACpB,IAAI;YACF,MAAM,CAAC,GAAG,IAAA,aAAQ,EAAC,CAAC,CAAC,CAAC;YACtB,IAAI,CAAC,CAAC,OAAO,GAAG,cAAc,EAAE;gBAC9B,cAAc,GAAG,CAAC,CAAC,OAAO,CAAC;aAC5B;SACF;QAAC,OAAO,CAAC,EAAE,GAAE;IAChB,CAAC,CAAC,CAAC;IACH,OAAO,cAAc,CAAC;AACxB,CAAC"}
|
|
@@ -13,7 +13,7 @@ const output_1 = require("../utilities/output");
|
|
|
13
13
|
const utils_1 = require("./utils");
|
|
14
14
|
const hasher_1 = require("../core/hasher/hasher");
|
|
15
15
|
function runCommand(projectsToRun, projectGraph, { nxJson, workspaceResults }, nxArgs, overrides, reporter, initiatingProject) {
|
|
16
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
16
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
17
17
|
const { tasksRunner, runnerOptions } = getRunner(nxArgs, nxJson);
|
|
18
18
|
// Doing this for backwards compatibility, should be removed in v14
|
|
19
19
|
ensureTargetDependenciesBackwardCompatibility(nxJson, nxArgs);
|
|
@@ -100,7 +100,7 @@ function addTasksForProjectTarget({ project, target, configuration, overrides, e
|
|
|
100
100
|
overrides,
|
|
101
101
|
errorIfCannotFindConfiguration,
|
|
102
102
|
});
|
|
103
|
-
const dependencyConfigs = utils_1.getDependencyConfigs({ project: project.name, target }, defaultDependencyConfigs, projectGraph);
|
|
103
|
+
const dependencyConfigs = (0, utils_1.getDependencyConfigs)({ project: project.name, target }, defaultDependencyConfigs, projectGraph);
|
|
104
104
|
if (dependencyConfigs) {
|
|
105
105
|
for (const dependencyConfig of dependencyConfigs) {
|
|
106
106
|
addTasksForProjectDependencyConfig(project, {
|
|
@@ -113,14 +113,14 @@ function addTasksForProjectTarget({ project, target, configuration, overrides, e
|
|
|
113
113
|
}
|
|
114
114
|
function createTask({ project, target, configuration, overrides, errorIfCannotFindConfiguration, }) {
|
|
115
115
|
var _a, _b;
|
|
116
|
-
if (!project_graph_utils_1.projectHasTarget(project, target)) {
|
|
116
|
+
if (!(0, project_graph_utils_1.projectHasTarget)(project, target)) {
|
|
117
117
|
output_1.output.error({
|
|
118
118
|
title: `Cannot find target '${target}' for project '${project.name}'`,
|
|
119
119
|
});
|
|
120
120
|
process.exit(1);
|
|
121
121
|
}
|
|
122
122
|
configuration !== null && configuration !== void 0 ? configuration : (configuration = (_b = (_a = project.data.targets) === null || _a === void 0 ? void 0 : _a[target]) === null || _b === void 0 ? void 0 : _b.defaultConfiguration);
|
|
123
|
-
const config = project_graph_utils_1.projectHasTargetAndConfiguration(project, target, configuration)
|
|
123
|
+
const config = (0, project_graph_utils_1.projectHasTargetAndConfiguration)(project, target, configuration)
|
|
124
124
|
? configuration
|
|
125
125
|
: undefined;
|
|
126
126
|
if (errorIfCannotFindConfiguration && configuration && !config) {
|
|
@@ -165,7 +165,7 @@ function addTasksForProjectDependencyConfig(project, { target, configuration },
|
|
|
165
165
|
for (const dep of dependencies) {
|
|
166
166
|
const depProject = projectGraph.nodes[dep.target] ||
|
|
167
167
|
projectGraph.externalNodes[dep.target];
|
|
168
|
-
if (project_graph_utils_1.projectHasTarget(depProject, dependencyConfig.target)) {
|
|
168
|
+
if ((0, project_graph_utils_1.projectHasTarget)(depProject, dependencyConfig.target)) {
|
|
169
169
|
addTasksForProjectTarget({
|
|
170
170
|
project: depProject,
|
|
171
171
|
target: dependencyConfig.target,
|
|
@@ -223,8 +223,8 @@ function getRunner(nxArgs, nxJson) {
|
|
|
223
223
|
let modulePath = nxJson.tasksRunnerOptions[runner].runner;
|
|
224
224
|
let tasksRunner;
|
|
225
225
|
if (modulePath) {
|
|
226
|
-
if (fileutils_1.isRelativePath(modulePath)) {
|
|
227
|
-
modulePath = path_1.join(app_root_1.appRootPath, modulePath);
|
|
226
|
+
if ((0, fileutils_1.isRelativePath)(modulePath)) {
|
|
227
|
+
modulePath = (0, path_1.join)(app_root_1.appRootPath, modulePath);
|
|
228
228
|
}
|
|
229
229
|
tasksRunner = require(modulePath);
|
|
230
230
|
// to support both babel and ts formats
|
|
@@ -270,7 +270,7 @@ function ensureTargetDependenciesBackwardCompatibility(nxJson, nxArgs) {
|
|
|
270
270
|
var _a;
|
|
271
271
|
(_a = nxJson.targetDependencies) !== null && _a !== void 0 ? _a : (nxJson.targetDependencies = {});
|
|
272
272
|
if (nxArgs.withDeps) {
|
|
273
|
-
devkit_1.logger.warn(logger_1.stripIndent(`
|
|
273
|
+
devkit_1.logger.warn((0, logger_1.stripIndent)(`
|
|
274
274
|
DEPRECATION WARNING: --with-deps is deprecated and it will be removed in v14.
|
|
275
275
|
Configure target dependencies instead: https://nx.dev/latest/angular/core-concepts/configuration#target-dependencies.
|
|
276
276
|
`));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/run-command.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"run-command.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/run-command.ts"],"names":[],"mappings":";;;;AAAA,iDAAgE;AAChE,+BAA4B;AAC5B,2DAA2D;AAU3D,yCAAsC;AACtC,wDAA0D;AAG1D,sDAAwD;AACxD,0EAG0C;AAC1C,gDAA6C;AAC7C,mCAA+C;AAC/C,kDAA+C;AAI/C,SAAsB,UAAU,CAC9B,aAAiC,EACjC,YAA0B,EAC1B,EAAE,MAAM,EAAE,gBAAgB,EAAe,EACzC,MAAc,EACd,SAAc,EACd,QAAkB,EAClB,iBAAgC;;QAEhC,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAEjE,mEAAmE;QACnE,6CAA6C,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAE9D,MAAM,wBAAwB,GAAG,MAAM,CAAC,kBAAkB,CAAC;QAC3D,MAAM,KAAK,GAAG,0BAA0B,CACtC,aAAa,EACb;YACE,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,aAAa,EAAE,MAAM,CAAC,aAAa;YACnC,SAAS;SACV,EACD,YAAY,EACZ,iBAAiB,EACjB,wBAAwB,CACzB,CAAC;QAEF,QAAQ,CAAC,SAAS,CAChB,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAChC,KAAK,EACL,MAAM,EACN,SAAS,CACV,CAAC;QAEF,2CAA2C;QAC3C,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,YAAY,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QAC/D,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAC3B,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,CACvD,CAAC;QACF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;YACnC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YAC7B,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;SACvC;QAED,MAAM,WAAW,GAAW,EAAE,CAAC;QAC/B,MAAM,WAAW,GAAW,EAAE,CAAC;QAC/B,MAAM,2BAA2B,GAAW,EAAE,CAAC;QAC/C,WAAW,CAAC,KAAK,EAAE,aAAa,EAAE;YAChC,iBAAiB;YACjB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,YAAY;YACZ,MAAM;YACN,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;SAC1C,CAAC,CAAC,SAAS,CAAC;YACX,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE;gBACd,IACE,aAAa;qBACV,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;qBAC9B,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC;oBACtC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,MAAM,EAC1C;oBACA,gBAAgB,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;iBACtE;gBACD,QAAQ,KAAK,CAAC,IAAI,EAAE;oBAClB,KAAK,gCAAiB,CAAC,YAAY,CAAC,CAAC;wBACnC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;4BAClB,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;yBAC9B;wBACD,MAAM;qBACP;oBACD,KAAK,gCAAiB,CAAC,oBAAoB,CAAC,CAAC;wBAC3C,2BAA2B,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;wBAC7C,MAAM;qBACP;oBACD,KAAK,gCAAiB,CAAC,aAAa,CAAC,CAAC;wBACpC,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;wBAC7B,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;4BAClB,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;yBAC9B;wBACD,MAAM;qBACP;iBACF;YACH,CAAC;YACD,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,QAAQ,EAAE,GAAG,EAAE;gBACb,iDAAiD;gBACjD,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;oBAAG,OAAO,CAAC,KAAa,CAAC,KAAK,EAAE,CAAC;gBAE3D,gBAAgB,CAAC,WAAW,EAAE,CAAC;gBAC/B,QAAQ,CAAC,YAAY,CACnB,MAAM,EACN,gBAAgB,CAAC,yBAAyB,EAC1C,KAAK,EACL,WAAW,EACX,2BAA2B,EAC3B,WAAW,CACZ,CAAC;gBAEF,IAAI,gBAAgB,CAAC,UAAU,EAAE;oBAC/B,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;iBACjB;YACH,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CAAA;AAvGD,gCAuGC;AAUD,SAAgB,0BAA0B,CACxC,aAAiC,EACjC,MAAsE,EACtE,YAA0B,EAC1B,iBAAgC,EAChC,2BAAqE,EAAE;IAEvE,MAAM,QAAQ,GAAsB,IAAI,GAAG,EAAgB,CAAC;IAC5D,MAAM,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;IAElC,KAAK,MAAM,OAAO,IAAI,aAAa,EAAE;QACnC,wBAAwB,+BAEpB,OAAO,IACJ,MAAM,KACT,8BAA8B,EAAE,OAAO,CAAC,IAAI,KAAK,iBAAiB,KAEpE,wBAAwB,EACxB,YAAY,EACZ,QAAQ,EACR,EAAE,EACF,OAAO,CACR,CAAC;KACH;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;AACvC,CAAC;AAzBD,gEAyBC;AAED,SAAS,wBAAwB,CAC/B,EACE,OAAO,EACP,MAAM,EACN,aAAa,EACb,SAAS,EACT,8BAA8B,GACnB,EACb,2BAAqE,EAAE,EACvE,YAA0B,EAC1B,QAA2B,EAC3B,IAAc,EACd,OAAoB;IAEpB,MAAM,IAAI,GAAG,UAAU,CAAC;QACtB,OAAO;QACP,MAAM;QACN,aAAa;QACb,SAAS;QACT,8BAA8B;KAC/B,CAAC,CAAC;IAEH,MAAM,iBAAiB,GAAG,IAAA,4BAAoB,EAC5C,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,EACjC,wBAAwB,EACxB,YAAY,CACb,CAAC;IAEF,IAAI,iBAAiB,EAAE;QACrB,KAAK,MAAM,gBAAgB,IAAI,iBAAiB,EAAE;YAChD,kCAAkC,CAChC,OAAO,EACP;gBACE,MAAM;gBACN,aAAa;aACd,EACD,gBAAgB,EAChB,wBAAwB,EACxB,YAAY,EACZ,QAAQ,EACR,IAAI,EACJ,OAAO,CACR,CAAC;SACH;KACF;IACD,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;AAC9B,CAAC;AAED,SAAgB,UAAU,CAAC,EACzB,OAAO,EACP,MAAM,EACN,aAAa,EACb,SAAS,EACT,8BAA8B,GACnB;;IACX,IAAI,CAAC,IAAA,sCAAgB,EAAC,OAAO,EAAE,MAAM,CAAC,EAAE;QACtC,eAAM,CAAC,KAAK,CAAC;YACX,KAAK,EAAE,uBAAuB,MAAM,kBAAkB,OAAO,CAAC,IAAI,GAAG;SACtE,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,aAAa,aAAb,aAAa,cAAb,aAAa,IAAb,aAAa,GAAK,MAAA,MAAA,OAAO,CAAC,IAAI,CAAC,OAAO,0CAAG,MAAM,CAAC,0CAAE,oBAAoB,EAAC;IAEvE,MAAM,MAAM,GAAG,IAAA,sDAAgC,EAC7C,OAAO,EACP,MAAM,EACN,aAAa,CACd;QACC,CAAC,CAAC,aAAa;QACf,CAAC,CAAC,SAAS,CAAC;IAEd,IAAI,8BAA8B,IAAI,aAAa,IAAI,CAAC,MAAM,EAAE;QAC9D,eAAM,CAAC,KAAK,CAAC;YACX,KAAK,EAAE,8BAA8B,aAAa,kBAAkB,OAAO,CAAC,IAAI,IAAI,MAAM,GAAG;SAC9F,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,MAAM,eAAe,GAAG;QACtB,OAAO,EAAE,OAAO,CAAC,IAAI;QACrB,MAAM;QACN,aAAa,EAAE,MAAM;KACtB,CAAC;IACF,OAAO;QACL,EAAE,EAAE,KAAK,CAAC,eAAe,CAAC;QAC1B,MAAM,EAAE,eAAe;QACvB,WAAW,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI;QAC9B,SAAS,EAAE,oBAAoB,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC;KACvE,CAAC;AACJ,CAAC;AA1CD,gCA0CC;AAED,SAAS,kCAAkC,CACzC,OAAyB,EACzB,EAAE,MAAM,EAAE,aAAa,EAAgD,EACvE,gBAAwC,EACxC,wBAAkE,EAClE,YAA0B,EAC1B,QAA2B,EAC3B,IAAc,EACd,OAAoB;IAEpB,MAAM,gBAAgB,GAAG,KAAK,CAAC;QAC7B,OAAO,EAAE,OAAO,CAAC,IAAI;QACrB,MAAM;QACN,aAAa;KACd,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1B,IAAI,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE;QACnC,eAAM,CAAC,KAAK,CAAC;YACX,KAAK,EAAE,qBAAqB,IAAI,CAAC,CAAC,CAAC,uCAAuC;YAC1E,SAAS,EAAE,CAAC,GAAG,CAAC,GAAG,IAAI,EAAE,gBAAgB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;SAC5D,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;IAED,IAAI,QAAQ,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE;QAClC,OAAO;KACR;IAED,IAAI,gBAAgB,CAAC,QAAQ,KAAK,cAAc,EAAE;QAChD,MAAM,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC7D,IAAI,YAAY,EAAE;YAChB,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE;gBAC9B,MAAM,UAAU,GACd,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC;oBAC9B,YAAY,CAAC,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBACzC,IAAI,IAAA,sCAAgB,EAAC,UAAU,EAAE,gBAAgB,CAAC,MAAM,CAAC,EAAE;oBACzD,wBAAwB,CACtB;wBACE,OAAO,EAAE,UAAU;wBACnB,MAAM,EAAE,gBAAgB,CAAC,MAAM;wBAC/B,aAAa;wBACb,SAAS,EAAE,EAAE;wBACb,8BAA8B,EAAE,KAAK;qBACtC,EACD,wBAAwB,EACxB,YAAY,EACZ,QAAQ,EACR,CAAC,GAAG,IAAI,EAAE,gBAAgB,CAAC,EAC3B,OAAO,CACR,CAAC;iBACH;qBAAM;oBACL,IAAI,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;wBAC3B,SAAS;qBACV;oBAED,kCAAkC,CAChC,UAAU,EACV,EAAE,MAAM,EAAE,aAAa,EAAE,EACzB,gBAAgB,EAChB,wBAAwB,EACxB,YAAY,EACZ,QAAQ,EACR,IAAI,EACJ,OAAO,CACR,CAAC;iBACH;aACF;SACF;KACF;SAAM;QACL,wBAAwB,CACtB;YACE,OAAO;YACP,MAAM,EAAE,gBAAgB,CAAC,MAAM;YAC/B,aAAa;YACb,SAAS,EAAE,EAAE;YACb,8BAA8B,EAAE,IAAI;SACrC,EACD,wBAAwB,EACxB,YAAY,EACZ,QAAQ,EACR,CAAC,GAAG,IAAI,EAAE,gBAAgB,CAAC,EAC3B,OAAO,CACR,CAAC;KACH;AACH,CAAC;AAED,SAAS,KAAK,CAAC,EACb,OAAO,EACP,MAAM,EACN,aAAa,GAKd;IACC,IAAI,EAAE,GAAG,GAAG,OAAO,IAAI,MAAM,EAAE,CAAC;IAChC,IAAI,aAAa,EAAE;QACjB,EAAE,IAAI,IAAI,aAAa,EAAE,CAAC;KAC3B;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,SAAgB,SAAS,CACvB,MAAc,EACd,MAA2B;IAK3B,IAAI,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAE3B,+BAA+B;IAC/B,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE;QAC9B,MAAM,CAAC,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;QAC5C,OAAO;YACL,WAAW,EAAE,CAAC,CAAC,kBAAkB;YACjC,aAAa,EAAE,MAAM;SACtB,CAAC;KACH;IAED,+BAA+B;IAC/B,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,OAAO,EAAE;QACjD,MAAM,CAAC,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;QAC5C,OAAO;YACL,WAAW,EAAE,CAAC,CAAC,kBAAkB;YACjC,aAAa,EAAE,MAAM;SACtB,CAAC;KACH;IAED,MAAM,GAAG,MAAM,IAAI,SAAS,CAAC;IAE7B,IAAI,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE;QACrC,IAAI,UAAU,GAAW,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC;QAElE,IAAI,WAAW,CAAC;QAChB,IAAI,UAAU,EAAE;YACd,IAAI,IAAA,0BAAc,EAAC,UAAU,CAAC,EAAE;gBAC9B,UAAU,GAAG,IAAA,WAAI,EAAC,sBAAW,EAAE,UAAU,CAAC,CAAC;aAC5C;YAED,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;YAClC,uCAAuC;YACvC,IAAI,WAAW,CAAC,OAAO,EAAE;gBACvB,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC;aACnC;SACF;aAAM;YACL,WAAW,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC,kBAAkB,CAAC;SACpE;QAED,OAAO;YACL,WAAW;YACX,aAAa,kCACR,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,OAAO,GACzC,MAAM,CACV;SACF,CAAC;KACH;SAAM;QACL,eAAM,CAAC,KAAK,CAAC;YACX,KAAK,EAAE,2CAA2C,MAAM,EAAE;SAC3D,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACjB;AACH,CAAC;AA5DD,8BA4DC;AAED,SAAS,oBAAoB,CAC3B,IAAO,EACP,WAAmB,EACnB,eAAoB;IAEpB,MAAM,gBAAgB,qBAAW,IAAI,CAAE,CAAC;IACxC,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE;QACzD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,MAAM,KAAK,GAAG,qBAAqB,CAAC;YACpC,gBAAgB,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,KAAa,EAAE,EAAE;gBACjE,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;oBACvB,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;iBAClE;gBAED,IAAI,KAAK,KAAK,MAAM,EAAE;oBACpB,OAAO,WAAW,CAAC;iBACpB;gBACD,OAAO,eAAe,CAAC,KAAK,CAAC,CAAC;YAChC,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CAAC;IACH,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAED,SAAS,6CAA6C,CACpD,MAA2B,EAC3B,MAAc;;IAEd,MAAA,MAAM,CAAC,kBAAkB,oCAAzB,MAAM,CAAC,kBAAkB,GAAK,EAAE,EAAC;IACjC,IAAI,MAAM,CAAC,QAAQ,EAAE;QACnB,eAAM,CAAC,IAAI,CACT,IAAA,oBAAW,EAAC;;;OAGX,CAAC,CACH,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE;YAC7C,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG;gBACzC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE;aACpD,CAAC;SACH;KACF;AACH,CAAC"}
|
|
@@ -15,7 +15,7 @@ class TaskGraphCreator {
|
|
|
15
15
|
};
|
|
16
16
|
for (const task of tasks) {
|
|
17
17
|
this.addTaskToGraph(task, graph);
|
|
18
|
-
const dependencyConfigs = utils_1.getDependencyConfigs(task.target, this.defaultTargetDependencies, this.projectGraph);
|
|
18
|
+
const dependencyConfigs = (0, utils_1.getDependencyConfigs)(task.target, this.defaultTargetDependencies, this.projectGraph);
|
|
19
19
|
if (!dependencyConfigs) {
|
|
20
20
|
continue;
|
|
21
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-graph-creator.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/task-graph-creator.ts"],"names":[],"mappings":";;;AAMA,mCAA+C;AAE/C,MAAa,gBAAgB;IAC3B,YACmB,YAA0B,EAC1B,yBAGhB;QAJgB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,8BAAyB,GAAzB,yBAAyB,CAGzC;IACA,CAAC;IAEJ,eAAe,CAAC,KAAa;QAC3B,MAAM,KAAK,GAAc;YACvB,KAAK,EAAE,EAAE;YACT,KAAK,EAAE,EAAE;YACT,YAAY,EAAE,EAAE;SACjB,CAAC;QACF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAEjC,MAAM,iBAAiB,GAAG,4BAAoB,
|
|
1
|
+
{"version":3,"file":"task-graph-creator.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/task-graph-creator.ts"],"names":[],"mappings":";;;AAMA,mCAA+C;AAE/C,MAAa,gBAAgB;IAC3B,YACmB,YAA0B,EAC1B,yBAGhB;QAJgB,iBAAY,GAAZ,YAAY,CAAc;QAC1B,8BAAyB,GAAzB,yBAAyB,CAGzC;IACA,CAAC;IAEJ,eAAe,CAAC,KAAa;QAC3B,MAAM,KAAK,GAAc;YACvB,KAAK,EAAE,EAAE;YACT,KAAK,EAAE,EAAE;YACT,YAAY,EAAE,EAAE;SACjB,CAAC;QACF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACxB,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAEjC,MAAM,iBAAiB,GAAG,IAAA,4BAAoB,EAC5C,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,yBAAyB,EAC9B,IAAI,CAAC,YAAY,CAClB,CAAC;YAEF,IAAI,CAAC,iBAAiB,EAAE;gBACtB,SAAS;aACV;YAED,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;SACjE;QAED,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,MAAM,CAClD,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAC1C,CAAC;QAEF,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,mBAAmB,CACzB,IAAU,EACV,iBAA2C,EAC3C,KAAa,EACb,KAAgB;QAEhB,KAAK,MAAM,gBAAgB,IAAI,iBAAiB,EAAE;YAChD,IAAI,gBAAgB,CAAC,QAAQ,KAAK,MAAM,EAAE;gBACxC,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;oBACrB,IACE,CAAC,CAAC,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC,MAAM,CAAC,OAAO;wBACxC,CAAC,CAAC,MAAM,CAAC,MAAM,KAAK,gBAAgB,CAAC,MAAM,EAC3C;wBACA,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;qBACxC;iBACF;aACF;iBAAM,IAAI,gBAAgB,CAAC,QAAQ,KAAK,cAAc,EAAE;gBACvD,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;gBAE/B,IAAI,CAAC,eAAe,CAClB,IAAI,CAAC,MAAM,CAAC,OAAO,EACnB,gBAAgB,CAAC,MAAM,EACvB,KAAK,EACL,KAAK,EACL,IAAI,CAAC,EAAE,EACP,IAAI,CACL,CAAC;aACH;SACF;IACH,CAAC;IAEO,eAAe,CACrB,OAAe,EACf,MAAc,EACd,KAAa,EACb,KAAgB,EAChB,MAAc,EACd,IAAiB;QAEjB,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAClB,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAC7D,IAAI,YAAY,EAAE;YAChB,MAAM,mBAAmB,GAAG,YAAY,CAAC,GAAG,CAC1C,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAClC,CAAC;YACF,KAAK,MAAM,iBAAiB,IAAI,mBAAmB,EAAE;gBACnD,IAAI,IAAI,CAAC,GAAG,CAAC,iBAAiB,CAAC,EAAE;oBAC/B,SAAS;iBACV;gBACD,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAC9B,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,EAAE,EACtC,KAAK,CACN,CAAC;gBACF,IAAI,UAAU,EAAE;oBACd,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;iBAChD;qBAAM;oBACL,IAAI,CAAC,eAAe,CAClB,iBAAiB,EACjB,MAAM,EACN,KAAK,EACL,KAAK,EACL,MAAM,EACN,IAAI,CACL,CAAC;iBACH;aACF;SACF;IACH,CAAC;IAEO,QAAQ,CACd,EAAE,OAAO,EAAE,MAAM,EAAuC,EACxD,KAAa;QAEb,OAAO,KAAK,CAAC,IAAI,CACf,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,KAAK,OAAO,IAAI,CAAC,CAAC,MAAM,CAAC,MAAM,KAAK,MAAM,CAClE,CAAC;IACJ,CAAC;IAEO,cAAc,CAAC,IAAU,EAAE,KAAgB;QACjD,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;QAC5B,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC;IACnC,CAAC;CACF;AAxHD,4CAwHC"}
|
|
@@ -25,14 +25,14 @@ class TaskOrchestrator {
|
|
|
25
25
|
this.forkedProcessTaskRunner = new forked_process_task_runner_1.ForkedProcessTaskRunner(this.options);
|
|
26
26
|
this.tasksSchedule = new tasks_schedule_1.TasksSchedule(this.taskGraph, this.workspace, this.options);
|
|
27
27
|
// region internal state
|
|
28
|
-
this.reverseTaskDeps = utils_1.calculateReverseDeps(this.taskGraph);
|
|
28
|
+
this.reverseTaskDeps = (0, utils_1.calculateReverseDeps)(this.taskGraph);
|
|
29
29
|
this.timings = {};
|
|
30
30
|
this.completedTasks = {};
|
|
31
31
|
this.startedTasks = new Set();
|
|
32
32
|
this.waitingForTasks = [];
|
|
33
33
|
}
|
|
34
34
|
run() {
|
|
35
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
35
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
36
36
|
// initial scheduling
|
|
37
37
|
this.tasksSchedule.scheduleNextTasks();
|
|
38
38
|
perf_hooks_1.performance.mark('task-execution-begins');
|
|
@@ -52,7 +52,7 @@ class TaskOrchestrator {
|
|
|
52
52
|
});
|
|
53
53
|
}
|
|
54
54
|
executeNextBatchOfTasksUsingTaskSchedule() {
|
|
55
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
55
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
56
56
|
// completed all the tasks
|
|
57
57
|
if (!this.tasksSchedule.hasTasks()) {
|
|
58
58
|
return null;
|
|
@@ -75,7 +75,7 @@ class TaskOrchestrator {
|
|
|
75
75
|
}
|
|
76
76
|
// region Applying Cache
|
|
77
77
|
applyCachedResults(tasks) {
|
|
78
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
78
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
79
79
|
const cacheableTasks = tasks.filter((t) => this.isCacheableTask(t));
|
|
80
80
|
const res = yield Promise.all(cacheableTasks.map((t) => this.applyCachedResult(t)));
|
|
81
81
|
return res
|
|
@@ -84,11 +84,11 @@ class TaskOrchestrator {
|
|
|
84
84
|
});
|
|
85
85
|
}
|
|
86
86
|
applyCachedResult(task) {
|
|
87
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
87
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
88
88
|
const cachedResult = yield this.cache.get(task);
|
|
89
89
|
if (!cachedResult || cachedResult.code !== 0)
|
|
90
90
|
return null;
|
|
91
|
-
const outputs = utils_1.getOutputs(this.projectGraph.nodes, task);
|
|
91
|
+
const outputs = (0, utils_1.getOutputs)(this.projectGraph.nodes, task);
|
|
92
92
|
const shouldCopyOutputsFromCache = !!outputs.length &&
|
|
93
93
|
(yield this.cache.shouldCopyOutputsFromCache({ task, cachedResult }, outputs));
|
|
94
94
|
if (shouldCopyOutputsFromCache) {
|
|
@@ -97,7 +97,7 @@ class TaskOrchestrator {
|
|
|
97
97
|
if ((!this.initiatingProject ||
|
|
98
98
|
this.initiatingProject === task.target.project) &&
|
|
99
99
|
!this.hideCachedOutput) {
|
|
100
|
-
const args = utils_1.getCommandArgsForTask(task);
|
|
100
|
+
const args = (0, utils_1.getCommandArgsForTask)(task);
|
|
101
101
|
output_1.output.logCommand(`nx ${args.join(' ')}`, shouldCopyOutputsFromCache
|
|
102
102
|
? output_1.TaskCacheStatus.RetrievedFromCache
|
|
103
103
|
: output_1.TaskCacheStatus.MatchedExistingOutput);
|
|
@@ -109,17 +109,17 @@ class TaskOrchestrator {
|
|
|
109
109
|
// endregion Applying Cache
|
|
110
110
|
// region Batch
|
|
111
111
|
applyFromCacheOrRunBatch(doNotSkipCache, batch) {
|
|
112
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
112
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
113
113
|
const taskEntries = Object.entries(batch.taskGraph.tasks);
|
|
114
114
|
const tasks = taskEntries.map(([, task]) => task);
|
|
115
115
|
yield this.preRunSteps(tasks);
|
|
116
116
|
let results = doNotSkipCache ? yield this.applyCachedResults(tasks) : [];
|
|
117
117
|
// Run tasks that were not cached
|
|
118
118
|
if (results.length !== taskEntries.length) {
|
|
119
|
-
const unrunTaskGraph = utils_1.removeTasksFromTaskGraph(batch.taskGraph, results.map(({ task }) => task.id));
|
|
119
|
+
const unrunTaskGraph = (0, utils_1.removeTasksFromTaskGraph)(batch.taskGraph, results.map(({ task }) => task.id));
|
|
120
120
|
// cache prep
|
|
121
121
|
for (const task of Object.values(unrunTaskGraph.tasks)) {
|
|
122
|
-
const taskOutputs = utils_1.getOutputs(this.projectGraph.nodes, task);
|
|
122
|
+
const taskOutputs = (0, utils_1.getOutputs)(this.projectGraph.nodes, task);
|
|
123
123
|
yield this.cache.removeRecordedOutputsHashes(taskOutputs);
|
|
124
124
|
}
|
|
125
125
|
const batchResults = yield this.runBatch({
|
|
@@ -134,13 +134,13 @@ class TaskOrchestrator {
|
|
|
134
134
|
if (tasksCompleted.length !== taskEntries.length) {
|
|
135
135
|
yield this.applyFromCacheOrRunBatch(doNotSkipCache, {
|
|
136
136
|
executorName: batch.executorName,
|
|
137
|
-
taskGraph: utils_1.removeTasksFromTaskGraph(batch.taskGraph, tasksCompleted.map(([taskId]) => taskId)),
|
|
137
|
+
taskGraph: (0, utils_1.removeTasksFromTaskGraph)(batch.taskGraph, tasksCompleted.map(([taskId]) => taskId)),
|
|
138
138
|
});
|
|
139
139
|
}
|
|
140
140
|
});
|
|
141
141
|
}
|
|
142
142
|
runBatch(batch) {
|
|
143
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
143
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
144
144
|
try {
|
|
145
145
|
const results = yield this.forkedProcessTaskRunner.forkProcessForBatch(batch);
|
|
146
146
|
const batchResultEntries = Object.entries(results);
|
|
@@ -164,14 +164,14 @@ class TaskOrchestrator {
|
|
|
164
164
|
// endregion Batch
|
|
165
165
|
// region Single Task
|
|
166
166
|
applyFromCacheOrRunTask(doNotSkipCache, task) {
|
|
167
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
167
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
168
168
|
yield this.preRunSteps([task]);
|
|
169
169
|
// hash the task here
|
|
170
170
|
let results = doNotSkipCache ? yield this.applyCachedResults([task]) : [];
|
|
171
171
|
// the task wasn't cached
|
|
172
172
|
if (results.length === 0) {
|
|
173
173
|
// cache prep
|
|
174
|
-
const taskOutputs = utils_1.getOutputs(this.projectGraph.nodes, task);
|
|
174
|
+
const taskOutputs = (0, utils_1.getOutputs)(this.projectGraph.nodes, task);
|
|
175
175
|
yield this.cache.removeRecordedOutputsHashes(taskOutputs);
|
|
176
176
|
const { code, terminalOutput } = yield this.runTaskInForkedProcess(task);
|
|
177
177
|
results.push({
|
|
@@ -184,7 +184,7 @@ class TaskOrchestrator {
|
|
|
184
184
|
});
|
|
185
185
|
}
|
|
186
186
|
runTaskInForkedProcess(task) {
|
|
187
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
187
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
188
188
|
try {
|
|
189
189
|
// obtain metadata
|
|
190
190
|
const outputPath = this.cache.temporaryOutputPath(task);
|
|
@@ -214,7 +214,7 @@ class TaskOrchestrator {
|
|
|
214
214
|
// endregion Single Task
|
|
215
215
|
// region Lifecycle
|
|
216
216
|
preRunSteps(tasks) {
|
|
217
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
217
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
218
218
|
// Hash the task before it is run
|
|
219
219
|
yield Promise.all(tasks.map((task) => this.hashTask(task)));
|
|
220
220
|
// timings
|
|
@@ -241,7 +241,7 @@ class TaskOrchestrator {
|
|
|
241
241
|
};
|
|
242
242
|
}
|
|
243
243
|
postRunSteps(results) {
|
|
244
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
244
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
245
245
|
// post-run steps
|
|
246
246
|
for (const { task } of results) {
|
|
247
247
|
this.storeEndTime(task);
|
|
@@ -249,10 +249,10 @@ class TaskOrchestrator {
|
|
|
249
249
|
// cache the results
|
|
250
250
|
yield Promise.all(results
|
|
251
251
|
.filter(({ status }) => status !== 'cache' && status !== 'skipped')
|
|
252
|
-
.map((result) => (Object.assign(Object.assign({}, result), { code: result.status === 'cache' || result.status === 'success' ? 0 : 1, outputs: utils_1.getOutputs(this.projectGraph.nodes, result.task) })))
|
|
252
|
+
.map((result) => (Object.assign(Object.assign({}, result), { code: result.status === 'cache' || result.status === 'success' ? 0 : 1, outputs: (0, utils_1.getOutputs)(this.projectGraph.nodes, result.task) })))
|
|
253
253
|
.filter(({ task, code }) => this.shouldCacheTaskResult(task, code))
|
|
254
254
|
.filter(({ terminalOutput, outputs }) => terminalOutput || outputs)
|
|
255
|
-
.map(({ task, code, terminalOutput, outputs }) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
255
|
+
.map(({ task, code, terminalOutput, outputs }) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
256
256
|
yield this.cache.put(task, terminalOutput, outputs, code);
|
|
257
257
|
})));
|
|
258
258
|
if ('endTasks' in this.options.lifeCycle) {
|
|
@@ -303,8 +303,8 @@ class TaskOrchestrator {
|
|
|
303
303
|
//endregion Lifecycle
|
|
304
304
|
// region utils
|
|
305
305
|
hashTask(task) {
|
|
306
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
307
|
-
const customHasher = utils_1.getCustomHasher(task, this.workspace);
|
|
306
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
307
|
+
const customHasher = (0, utils_1.getCustomHasher)(task, this.workspace);
|
|
308
308
|
const { value, details } = yield (customHasher
|
|
309
309
|
? customHasher(task, this.taskGraph, this.hasher)
|
|
310
310
|
: this.hasher.hashTaskWithDepsAndContext(task));
|
|
@@ -314,7 +314,7 @@ class TaskOrchestrator {
|
|
|
314
314
|
}
|
|
315
315
|
pipeOutputCapture(task) {
|
|
316
316
|
try {
|
|
317
|
-
return (utils_1.getExecutorForTask(task, this.workspace).schema.outputCapture === 'pipe');
|
|
317
|
+
return ((0, utils_1.getExecutorForTask)(task, this.workspace).schema.outputCapture === 'pipe');
|
|
318
318
|
}
|
|
319
319
|
catch (e) {
|
|
320
320
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-orchestrator.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/task-orchestrator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"task-orchestrator.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/task-orchestrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ class TasksSchedule {
|
|
|
8
8
|
this.workspace = workspace;
|
|
9
9
|
this.options = options;
|
|
10
10
|
this.notScheduledTaskGraph = this.taskGraph;
|
|
11
|
-
this.reverseTaskDeps = utils_1.calculateReverseDeps(this.taskGraph);
|
|
11
|
+
this.reverseTaskDeps = (0, utils_1.calculateReverseDeps)(this.taskGraph);
|
|
12
12
|
this.scheduledBatches = [];
|
|
13
13
|
this.scheduledTasks = [];
|
|
14
14
|
this.completedTasks = new Set();
|
|
@@ -33,7 +33,7 @@ class TasksSchedule {
|
|
|
33
33
|
for (const taskId of taskIds) {
|
|
34
34
|
this.completedTasks.add(taskId);
|
|
35
35
|
}
|
|
36
|
-
this.notScheduledTaskGraph = utils_1.removeTasksFromTaskGraph(this.notScheduledTaskGraph, taskIds);
|
|
36
|
+
this.notScheduledTaskGraph = (0, utils_1.removeTasksFromTaskGraph)(this.notScheduledTaskGraph, taskIds);
|
|
37
37
|
}
|
|
38
38
|
nextTask() {
|
|
39
39
|
if (this.scheduledTasks.length > 0) {
|
|
@@ -50,7 +50,7 @@ class TasksSchedule {
|
|
|
50
50
|
}
|
|
51
51
|
scheduleTask(taskId) {
|
|
52
52
|
const task = this.taskGraph.tasks[taskId];
|
|
53
|
-
this.notScheduledTaskGraph = utils_1.removeTasksFromTaskGraph(this.notScheduledTaskGraph, [taskId]);
|
|
53
|
+
this.notScheduledTaskGraph = (0, utils_1.removeTasksFromTaskGraph)(this.notScheduledTaskGraph, [taskId]);
|
|
54
54
|
this.scheduledTasks.push(taskId);
|
|
55
55
|
// TODO vsavkin: remove the if statement after Nx 14 is out
|
|
56
56
|
if (this.options.lifeCycle.scheduleTask) {
|
|
@@ -61,7 +61,7 @@ class TasksSchedule {
|
|
|
61
61
|
const batchMap = {};
|
|
62
62
|
for (const root of this.notScheduledTaskGraph.roots) {
|
|
63
63
|
const rootTask = this.notScheduledTaskGraph.tasks[root];
|
|
64
|
-
const executorName = utils_1.getExecutorNameForTask(rootTask, this.workspace);
|
|
64
|
+
const executorName = (0, utils_1.getExecutorNameForTask)(rootTask, this.workspace);
|
|
65
65
|
this.processTaskForBatches(batchMap, rootTask, executorName, true);
|
|
66
66
|
}
|
|
67
67
|
for (const [executorName, taskGraph] of Object.entries(batchMap)) {
|
|
@@ -70,13 +70,13 @@ class TasksSchedule {
|
|
|
70
70
|
}
|
|
71
71
|
scheduleBatch({ executorName, taskGraph }) {
|
|
72
72
|
// Create a new task graph without the tasks that are being scheduled as part of this batch
|
|
73
|
-
this.notScheduledTaskGraph = utils_1.removeTasksFromTaskGraph(this.notScheduledTaskGraph, Object.keys(taskGraph.tasks));
|
|
73
|
+
this.notScheduledTaskGraph = (0, utils_1.removeTasksFromTaskGraph)(this.notScheduledTaskGraph, Object.keys(taskGraph.tasks));
|
|
74
74
|
this.scheduledBatches.push({ executorName, taskGraph });
|
|
75
75
|
}
|
|
76
76
|
processTaskForBatches(batches, task, rootExecutorName, isRoot) {
|
|
77
77
|
var _a;
|
|
78
|
-
const { batchImplementationFactory } = utils_1.getExecutorForTask(task, this.workspace);
|
|
79
|
-
const executorName = utils_1.getExecutorNameForTask(task, this.workspace);
|
|
78
|
+
const { batchImplementationFactory } = (0, utils_1.getExecutorForTask)(task, this.workspace);
|
|
79
|
+
const executorName = (0, utils_1.getExecutorNameForTask)(task, this.workspace);
|
|
80
80
|
if (rootExecutorName !== executorName) {
|
|
81
81
|
return;
|
|
82
82
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tasks-schedule.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/tasks-schedule.ts"],"names":[],"mappings":";;;AAIA,mCAKiB;AAQjB,MAAa,aAAa;IAUxB,YACU,SAAoB,EACpB,SAAqB,EACrB,OAAkC;QAFlC,cAAS,GAAT,SAAS,CAAW;QACpB,cAAS,GAAT,SAAS,CAAY;QACrB,YAAO,GAAP,OAAO,CAA2B;QAZpC,0BAAqB,GAAG,IAAI,CAAC,SAAS,CAAC;QACvC,oBAAe,GAAG,4BAAoB,
|
|
1
|
+
{"version":3,"file":"tasks-schedule.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/tasks-schedule.ts"],"names":[],"mappings":"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"}
|