@nrwl/workspace 13.1.0 → 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 +34 -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 +16 -11
- 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/files/nx.json__tmpl__ +2 -7
- 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
|
@@ -5,8 +5,8 @@ const explicit_project_dependencies_1 = require("./explicit-project-dependencies
|
|
|
5
5
|
const explicit_package_json_dependencies_1 = require("./explicit-package-json-dependencies");
|
|
6
6
|
function buildExplicitTypescriptAndPackageJsonDependencies(workspace, projectGraph, filesToProcess) {
|
|
7
7
|
return []
|
|
8
|
-
.concat(explicit_project_dependencies_1.buildExplicitTypeScriptDependencies(workspace, projectGraph, filesToProcess))
|
|
9
|
-
.concat(explicit_package_json_dependencies_1.buildExplicitPackageJsonDependencies(workspace, projectGraph, filesToProcess));
|
|
8
|
+
.concat((0, explicit_project_dependencies_1.buildExplicitTypeScriptDependencies)(workspace, projectGraph, filesToProcess))
|
|
9
|
+
.concat((0, explicit_package_json_dependencies_1.buildExplicitPackageJsonDependencies)(workspace, projectGraph, filesToProcess));
|
|
10
10
|
}
|
|
11
11
|
exports.buildExplicitTypescriptAndPackageJsonDependencies = buildExplicitTypescriptAndPackageJsonDependencies;
|
|
12
12
|
//# sourceMappingURL=build-explicit-typescript-and-package-json-dependencies.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-explicit-typescript-and-package-json-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.ts"],"names":[],"mappings":";;;AACA,mFAAsF;AACtF,6FAA4F;AAE5F,SAAgB,iDAAiD,CAC/D,SAAoB,EACpB,YAA0B,EAC1B,cAA8B;IAE9B,OAAO,EAAE;SACN,MAAM,CACL,mEAAmC,
|
|
1
|
+
{"version":3,"file":"build-explicit-typescript-and-package-json-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/build-dependencies/build-explicit-typescript-and-package-json-dependencies.ts"],"names":[],"mappings":";;;AACA,mFAAsF;AACtF,6FAA4F;AAE5F,SAAgB,iDAAiD,CAC/D,SAAoB,EACpB,YAA0B,EAC1B,cAA8B;IAE9B,OAAO,EAAE;SACN,MAAM,CACL,IAAA,mEAAmC,EACjC,SAAS,EACT,YAAY,EACZ,cAAc,CACf,CACF;SACA,MAAM,CACL,IAAA,yEAAoC,EAClC,SAAS,EACT,YAAY,EACZ,cAAc,CACf,CACF,CAAC;AACN,CAAC;AApBD,8GAoBC"}
|
|
@@ -17,11 +17,11 @@ function buildExplicitPackageJsonDependencies(workspace, graph, filesToProcess)
|
|
|
17
17
|
exports.buildExplicitPackageJsonDependencies = buildExplicitPackageJsonDependencies;
|
|
18
18
|
function isPackageJsonAtProjectRoot(nodes, fileName) {
|
|
19
19
|
return Object.values(nodes).find((projectNode) => (projectNode.type === 'lib' || projectNode.type === 'app') &&
|
|
20
|
-
devkit_1.joinPathFragments(projectNode.data.root, 'package.json') === fileName);
|
|
20
|
+
(0, devkit_1.joinPathFragments)(projectNode.data.root, 'package.json') === fileName);
|
|
21
21
|
}
|
|
22
22
|
function processPackageJson(sourceProject, fileName, graph, collectedDeps) {
|
|
23
23
|
try {
|
|
24
|
-
const deps = readDeps(devkit_1.parseJson(file_utils_1.defaultFileRead(fileName)));
|
|
24
|
+
const deps = readDeps((0, devkit_1.parseJson)((0, file_utils_1.defaultFileRead)(fileName)));
|
|
25
25
|
deps.forEach((d) => {
|
|
26
26
|
// package.json refers to another project in the monorepo
|
|
27
27
|
if (graph.nodes[d]) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"explicit-package-json-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.ts"],"names":[],"mappings":";;;AACA,iDAAmD;AACnD,yCAKsB;AAEtB,SAAgB,oCAAoC,CAClD,SAAoB,EACpB,KAAmB,EACnB,cAA8B;IAE9B,MAAM,GAAG,GAAG,EAAS,CAAC;IACtB,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QAC7C,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAClD,IAAI,0BAA0B,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE;gBACnD,kBAAkB,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;aAChD;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACb,CAAC;AAdD,oFAcC;AAED,SAAS,0BAA0B,CACjC,KAA8B,EAC9B,QAAgB;IAEhB,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAC9B,CAAC,WAAW,EAAE,EAAE,CACd,CAAC,WAAW,CAAC,IAAI,KAAK,KAAK,IAAI,WAAW,CAAC,IAAI,KAAK,KAAK,CAAC;QAC1D,0BAAiB,
|
|
1
|
+
{"version":3,"file":"explicit-package-json-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/build-dependencies/explicit-package-json-dependencies.ts"],"names":[],"mappings":";;;AACA,iDAAmD;AACnD,yCAKsB;AAEtB,SAAgB,oCAAoC,CAClD,SAAoB,EACpB,KAAmB,EACnB,cAA8B;IAE9B,MAAM,GAAG,GAAG,EAAS,CAAC;IACtB,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QAC7C,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAClD,IAAI,0BAA0B,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE;gBACnD,kBAAkB,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;aAChD;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACb,CAAC;AAdD,oFAcC;AAED,SAAS,0BAA0B,CACjC,KAA8B,EAC9B,QAAgB;IAEhB,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAC9B,CAAC,WAAW,EAAE,EAAE,CACd,CAAC,WAAW,CAAC,IAAI,KAAK,KAAK,IAAI,WAAW,CAAC,IAAI,KAAK,KAAK,CAAC;QAC1D,IAAA,0BAAiB,EAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,KAAK,QAAQ,CACxE,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CACzB,aAAqB,EACrB,QAAgB,EAChB,KAAmB,EACnB,aAAoB;IAEpB,IAAI;QACF,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAA,kBAAS,EAAC,IAAA,4BAAe,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC5D,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACjB,yDAAyD;YACzD,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;gBAClB,aAAa,CAAC,IAAI,CAAC;oBACjB,iBAAiB,EAAE,aAAa;oBAChC,iBAAiB,EAAE,CAAC;oBACpB,iBAAiB,EAAE,QAAQ;iBAC5B,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;KACJ;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,KAAK,MAAM,EAAE;YAC7C,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SAChB;KACF;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,eAAoB;;IACpC,OAAO;QACL,GAAG,MAAM,CAAC,IAAI,CAAC,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,YAAY,mCAAI,EAAE,CAAC;QACnD,GAAG,MAAM,CAAC,IAAI,CAAC,MAAA,eAAe,aAAf,eAAe,uBAAf,eAAe,CAAE,eAAe,mCAAI,EAAE,CAAC;KACvD,CAAC;AACJ,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
tslib_1.__exportStar(require("./implicit-project-dependencies"), exports);
|
|
5
|
-
tslib_1.__exportStar(require("./explicit-project-dependencies"), exports);
|
|
6
|
-
tslib_1.__exportStar(require("./explicit-package-json-dependencies"), exports);
|
|
4
|
+
(0, tslib_1.__exportStar)(require("./implicit-project-dependencies"), exports);
|
|
5
|
+
(0, tslib_1.__exportStar)(require("./explicit-project-dependencies"), exports);
|
|
6
|
+
(0, tslib_1.__exportStar)(require("./explicit-package-json-dependencies"), exports);
|
|
7
7
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/build-dependencies/index.ts"],"names":[],"mappings":";;;AAAA
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/build-dependencies/index.ts"],"names":[],"mappings":";;;AAAA,+EAAgD;AAChD,+EAAgD;AAChD,oFAAqD"}
|
|
@@ -19,8 +19,8 @@ class TypeScriptImportLocator {
|
|
|
19
19
|
extension !== '.jsx') {
|
|
20
20
|
return;
|
|
21
21
|
}
|
|
22
|
-
const content = file_utils_1.defaultFileRead(filePath);
|
|
23
|
-
const strippedContent = strip_source_code_1.stripSourceCode(this.scanner, content);
|
|
22
|
+
const content = (0, file_utils_1.defaultFileRead)(filePath);
|
|
23
|
+
const strippedContent = (0, strip_source_code_1.stripSourceCode)(this.scanner, content);
|
|
24
24
|
if (strippedContent !== '') {
|
|
25
25
|
const tsFile = tsModule.createSourceFile(filePath, strippedContent, tsModule.ScriptTarget.Latest, true);
|
|
26
26
|
this.fromNode(filePath, tsFile, visitor);
|
|
@@ -73,7 +73,7 @@ class TypeScriptImportLocator {
|
|
|
73
73
|
tsModule.forEachChild(node, (child) => this.fromNode(filePath, child, visitor));
|
|
74
74
|
}
|
|
75
75
|
ignoreStatement(node) {
|
|
76
|
-
return strip_source_code_1.stripSourceCode(this.scanner, node.getFullText()) === '';
|
|
76
|
+
return (0, strip_source_code_1.stripSourceCode)(this.scanner, node.getFullText()) === '';
|
|
77
77
|
}
|
|
78
78
|
ignoreLoadChildrenDependency(contents) {
|
|
79
79
|
this.scanner.setText(contents);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescript-import-locator.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/build-dependencies/typescript-import-locator.ts"],"names":[],"mappings":";;;AACA,6BAA6B;AAC7B,yCAA8C;AAC9C,4EAAuE;AACvE,iDAAmD;AAEnD,IAAI,QAAa,CAAC;AAElB,MAAa,uBAAuB;IAGlC;QACE,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;QACjC,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC7E,CAAC;IAED,QAAQ,CACN,QAAgB,EAChB,OAIS;QAET,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACzC,IACE,SAAS,KAAK,KAAK;YACnB,SAAS,KAAK,MAAM;YACpB,SAAS,KAAK,KAAK;YACnB,SAAS,KAAK,MAAM,EACpB;YACA,OAAO;SACR;QACD,MAAM,OAAO,GAAG,4BAAe,
|
|
1
|
+
{"version":3,"file":"typescript-import-locator.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/build-dependencies/typescript-import-locator.ts"],"names":[],"mappings":";;;AACA,6BAA6B;AAC7B,yCAA8C;AAC9C,4EAAuE;AACvE,iDAAmD;AAEnD,IAAI,QAAa,CAAC;AAElB,MAAa,uBAAuB;IAGlC;QACE,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC;QACjC,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC7E,CAAC;IAED,QAAQ,CACN,QAAgB,EAChB,OAIS;QAET,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACzC,IACE,SAAS,KAAK,KAAK;YACnB,SAAS,KAAK,MAAM;YACpB,SAAS,KAAK,KAAK;YACnB,SAAS,KAAK,MAAM,EACpB;YACA,OAAO;SACR;QACD,MAAM,OAAO,GAAG,IAAA,4BAAe,EAAC,QAAQ,CAAC,CAAC;QAC1C,MAAM,eAAe,GAAG,IAAA,mCAAe,EAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAC/D,IAAI,eAAe,KAAK,EAAE,EAAE;YAC1B,MAAM,MAAM,GAAG,QAAQ,CAAC,gBAAgB,CACtC,QAAQ,EACR,eAAe,EACf,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;YACF,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;SAC1C;IACH,CAAC;IAED,QAAQ,CACN,QAAgB,EAChB,IAAS,EACT,OAIS;QAET,IACE,QAAQ,CAAC,mBAAmB,CAAC,IAAI,CAAC;YAClC,CAAC,QAAQ,CAAC,mBAAmB,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,eAAe,CAAC,EAC5D;YACA,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE;gBAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;gBAC7D,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,uBAAc,CAAC,MAAM,CAAC,CAAC;aAC/C;YACD,OAAO,CAAC,4BAA4B;SACrC;QAED,IACE,QAAQ,CAAC,gBAAgB,CAAC,IAAI,CAAC;YAC/B,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,QAAQ,CAAC,UAAU,CAAC,aAAa;YAC1D,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;YAC3B,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAC3C;YACA,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE;gBAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC1D,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,uBAAc,CAAC,OAAO,CAAC,CAAC;aAChD;YACD,OAAO;SACR;QAED,IACE,QAAQ,CAAC,gBAAgB,CAAC,IAAI,CAAC;YAC/B,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,SAAS;YACvC,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;YAC3B,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAC3C;YACA,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE;gBAC/B,MAAM,GAAG,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC1D,OAAO,CAAC,GAAG,EAAE,QAAQ,EAAE,uBAAc,CAAC,MAAM,CAAC,CAAC;aAC/C;YACD,OAAO;SACR;QAED,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,UAAU,CAAC,kBAAkB,EAAE;YACxD,MAAM,IAAI,GAAG,IAAI,CAAC,yBAAyB,CACxC,IAA8B,CAAC,IAAI,CACrC,CAAC;YACF,IAAI,IAAI,KAAK,cAAc,EAAE;gBAC3B,MAAM,IAAI,GAAI,IAA8B,CAAC,WAAW,CAAC;gBACzD,IACE,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,UAAU,CAAC,aAAa;oBAC/C,CAAC,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,EACtD;oBACA,MAAM,YAAY,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;oBACtD,OAAO,CAAC,YAAY,EAAE,QAAQ,EAAE,uBAAc,CAAC,OAAO,CAAC,CAAC;oBACxD,OAAO,CAAC,4BAA4B;iBACrC;aACF;SACF;QAED;;WAEG;QACH,QAAQ,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE,CACpC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,EAAE,OAAO,CAAC,CACxC,CAAC;IACJ,CAAC;IAEO,eAAe,CAAC,IAAa;QACnC,OAAO,IAAA,mCAAe,EAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,CAAC;IAClE,CAAC;IAEO,4BAA4B,CAAC,QAAgB;QACnD,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC/B,IAAI,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAChC,OAAO,KAAK,KAAK,QAAQ,CAAC,UAAU,CAAC,cAAc,EAAE;YACnD,IACE,KAAK,KAAK,QAAQ,CAAC,UAAU,CAAC,uBAAuB;gBACrD,KAAK,KAAK,QAAQ,CAAC,UAAU,CAAC,sBAAsB,EACpD;gBACA,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;gBAC7C,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;gBAC5B,MAAM,wBAAwB,GAC5B,KAAK,KAAK,QAAQ,CAAC,UAAU,CAAC,sBAAsB,CAAC;gBACvD,MAAM,GAAG,GACP,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,GAAG,CAAC,wBAAwB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAClE,MAAM,OAAO,GAAG,QAAQ,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;gBACtD,IAAI,OAAO,KAAK,qBAAqB,EAAE;oBACrC,OAAO,IAAI,CAAC;iBACb;aACF;iBAAM;gBACL,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;aAC7B;SACF;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,yBAAyB,CAAC,QAAyB;QACzD,QAAQ,QAAQ,CAAC,IAAI,EAAE;YACrB,KAAK,QAAQ,CAAC,UAAU,CAAC,UAAU;gBACjC,OAAQ,QAA0B,CAAC,OAAO,EAAE,CAAC;YAC/C,KAAK,QAAQ,CAAC,UAAU,CAAC,aAAa;gBACpC,OAAQ,QAA6B,CAAC,IAAI,CAAC;YAC7C;gBACE,OAAO,IAAI,CAAC;SACf;IACH,CAAC;IAEO,qBAAqB,CAAC,IAAa;QACzC,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC7D,CAAC;CACF;AAxJD,0DAwJC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
|
-
tslib_1.__exportStar(require("./workspace-projects"), exports);
|
|
5
|
-
tslib_1.__exportStar(require("./npm-packages"), exports);
|
|
4
|
+
(0, tslib_1.__exportStar)(require("./workspace-projects"), exports);
|
|
5
|
+
(0, tslib_1.__exportStar)(require("./npm-packages"), exports);
|
|
6
6
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/build-nodes/index.ts"],"names":[],"mappings":";;;AAAA
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/build-nodes/index.ts"],"names":[],"mappings":";;;AAAA,oEAAqC;AACrC,8DAA+B"}
|
|
@@ -5,7 +5,7 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
const app_root_1 = require("@nrwl/tao/src/utils/app-root");
|
|
7
7
|
function buildNpmPackageNodes(builder) {
|
|
8
|
-
const packageJson = devkit_1.readJsonFile(path_1.join(app_root_1.appRootPath, 'package.json'));
|
|
8
|
+
const packageJson = (0, devkit_1.readJsonFile)((0, path_1.join)(app_root_1.appRootPath, 'package.json'));
|
|
9
9
|
const deps = Object.assign(Object.assign({}, packageJson.dependencies), packageJson.devDependencies);
|
|
10
10
|
Object.keys(deps).forEach((d) => {
|
|
11
11
|
builder.addExternalNode({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm-packages.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/build-nodes/npm-packages.ts"],"names":[],"mappings":";;;AAAA,yCAAiE;AACjE,+BAA4B;AAC5B,2DAA2D;AAE3D,SAAgB,oBAAoB,CAAC,OAA4B;IAC/D,MAAM,WAAW,GAAG,qBAAY,
|
|
1
|
+
{"version":3,"file":"npm-packages.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/build-nodes/npm-packages.ts"],"names":[],"mappings":";;;AAAA,yCAAiE;AACjE,+BAA4B;AAC5B,2DAA2D;AAE3D,SAAgB,oBAAoB,CAAC,OAA4B;IAC/D,MAAM,WAAW,GAAG,IAAA,qBAAY,EAAC,IAAA,WAAI,EAAC,sBAAW,EAAE,cAAc,CAAC,CAAC,CAAC;IACpE,MAAM,IAAI,mCACL,WAAW,CAAC,YAAY,GACxB,WAAW,CAAC,eAAe,CAC/B,CAAC;IACF,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC9B,OAAO,CAAC,eAAe,CAAC;YACtB,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,OAAO,CAAC,EAAE;YAChB,IAAI,EAAE;gBACJ,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;gBAChB,WAAW,EAAE,CAAC;aACf;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAhBD,oDAgBC"}
|
|
@@ -4,7 +4,7 @@ exports.buildWorkspaceProjectNodes = exports.convertNpmScriptsToTargets = void 0
|
|
|
4
4
|
const file_utils_1 = require("../../file-utils");
|
|
5
5
|
function convertNpmScriptsToTargets(projectRoot) {
|
|
6
6
|
try {
|
|
7
|
-
const packageJsonString = file_utils_1.defaultFileRead(`${projectRoot}/package.json`).toString();
|
|
7
|
+
const packageJsonString = (0, file_utils_1.defaultFileRead)(`${projectRoot}/package.json`).toString();
|
|
8
8
|
const parsedPackagedJson = JSON.parse(packageJsonString);
|
|
9
9
|
const res = {};
|
|
10
10
|
// handle no scripts
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-projects.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/build-nodes/workspace-projects.ts"],"names":[],"mappings":";;;AAAA,iDAAmD;AAMnD,SAAgB,0BAA0B,CAAC,WAAmB;IAC5D,IAAI;QACF,MAAM,iBAAiB,GAAG,4BAAe,
|
|
1
|
+
{"version":3,"file":"workspace-projects.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/build-nodes/workspace-projects.ts"],"names":[],"mappings":";;;AAAA,iDAAmD;AAMnD,SAAgB,0BAA0B,CAAC,WAAmB;IAC5D,IAAI;QACF,MAAM,iBAAiB,GAAG,IAAA,4BAAe,EACvC,GAAG,WAAW,eAAe,CAC9B,CAAC,QAAQ,EAAE,CAAC;QACb,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACzD,MAAM,GAAG,GAAG,EAAE,CAAC;QACf,oBAAoB;QACpB,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YAC/D,GAAG,CAAC,MAAM,CAAC,GAAG;gBACZ,QAAQ,EAAE,4BAA4B;gBACtC,OAAO,EAAE;oBACP,MAAM;iBACP;aACF,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,OAAO,GAAG,CAAC;KACZ;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AApBD,gEAoBC;AAED,SAAgB,0BAA0B,CACxC,GAAiC,EACjC,OAA4B;IAE5B,MAAM,KAAK,GAAG,EAAE,CAAC;IACjB,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAClD,MAAM,CAAC,GAAG,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACtC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE;YACd,CAAC,CAAC,OAAO,GAAG,0BAA0B,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SAChD;QACD,MAAM,WAAW,GACf,CAAC,CAAC,WAAW,KAAK,aAAa;YAC7B,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC;gBACpB,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,KAAK;YACT,CAAC,CAAC,KAAK,CAAC;QACZ,MAAM,IAAI,GACR,GAAG,CAAC,SAAS,CAAC,QAAQ,IAAI,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC;YACnD,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,EAAE;YACxC,CAAC,CAAC,EAAE,CAAC;QAET,KAAK,CAAC,IAAI,CAAC;YACT,IAAI,EAAE,GAAG;YACT,IAAI,EAAE,WAAW;YACjB,IAAI,kCACC,CAAC,KACJ,IAAI,EACJ,KAAK,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GACxB;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,mDAAmD;IACnD,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAClB,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,CAAC,CAAC;QAC5B,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI;YAAE,OAAO,CAAC,CAAC,CAAC;QAC5B,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAClB,OAAO,CAAC,OAAO,CAAC;YACd,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,IAAI,EAAE,CAAC,CAAC,IAAI;SACb,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AA9CD,gEA8CC"}
|
|
@@ -16,36 +16,37 @@ const fs_1 = require("fs");
|
|
|
16
16
|
const os = require("os");
|
|
17
17
|
const build_explicit_typescript_and_package_json_dependencies_1 = require("./build-dependencies/build-explicit-typescript-and-package-json-dependencies");
|
|
18
18
|
function buildProjectGraph() {
|
|
19
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
20
|
-
const workspaceJson = file_utils_1.readWorkspaceJson();
|
|
21
|
-
const { projectFileMap, allWorkspaceFiles } = file_utils_1.createProjectFileMap(workspaceJson);
|
|
19
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
20
|
+
const workspaceJson = (0, file_utils_1.readWorkspaceJson)();
|
|
21
|
+
const { projectFileMap, allWorkspaceFiles } = (0, file_utils_1.createProjectFileMap)(workspaceJson);
|
|
22
22
|
const cacheEnabled = process.env.NX_CACHE_PROJECT_GRAPH !== 'false';
|
|
23
|
-
let cache = cacheEnabled ? nx_deps_cache_1.readCache() : null;
|
|
23
|
+
let cache = cacheEnabled ? (0, nx_deps_cache_1.readCache)() : null;
|
|
24
24
|
return (yield buildProjectGraphUsingProjectFileMap(workspaceJson, projectFileMap, allWorkspaceFiles, cache, cacheEnabled)).projectGraph;
|
|
25
25
|
});
|
|
26
26
|
}
|
|
27
27
|
exports.buildProjectGraph = buildProjectGraph;
|
|
28
28
|
function buildProjectGraphUsingProjectFileMap(workspaceJson, projectFileMap, allWorkspaceFiles, cache, shouldWriteCache) {
|
|
29
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
30
|
-
const nxJson = file_utils_1.readNxJson();
|
|
29
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
30
|
+
const nxJson = (0, file_utils_1.readNxJson)();
|
|
31
31
|
const projectGraphVersion = '5.0';
|
|
32
|
-
assert_workspace_validity_1.assertWorkspaceValidity(workspaceJson, nxJson);
|
|
33
|
-
const normalizedNxJson = normalize_nx_json_1.normalizeNxJson(nxJson, Object.keys(workspaceJson.projects));
|
|
32
|
+
(0, assert_workspace_validity_1.assertWorkspaceValidity)(workspaceJson, nxJson);
|
|
33
|
+
const normalizedNxJson = (0, normalize_nx_json_1.normalizeNxJson)(nxJson, Object.keys(workspaceJson.projects));
|
|
34
34
|
const packageJsonDeps = readCombinedDeps();
|
|
35
35
|
const rootTsConfig = readRootTsConfig();
|
|
36
36
|
let filesToProcess = projectFileMap;
|
|
37
37
|
let cachedFileData = {};
|
|
38
38
|
if (cache &&
|
|
39
|
-
|
|
40
|
-
|
|
39
|
+
cache.version === '5.0' &&
|
|
40
|
+
!(0, nx_deps_cache_1.shouldRecomputeWholeGraph)(cache, packageJsonDeps, workspaceJson, normalizedNxJson, rootTsConfig)) {
|
|
41
|
+
const fromCache = (0, nx_deps_cache_1.extractCachedFileData)(projectFileMap, cache);
|
|
41
42
|
filesToProcess = fromCache.filesToProcess;
|
|
42
43
|
cachedFileData = fromCache.cachedFileData;
|
|
43
44
|
}
|
|
44
45
|
const context = createContext(workspaceJson, normalizedNxJson, projectFileMap, filesToProcess);
|
|
45
46
|
let projectGraph = yield buildProjectGraphUsingContext(context, cachedFileData, projectGraphVersion);
|
|
46
|
-
const projectGraphCache = nx_deps_cache_1.createCache(nxJson, packageJsonDeps, projectGraph, rootTsConfig);
|
|
47
|
+
const projectGraphCache = (0, nx_deps_cache_1.createCache)(nxJson, packageJsonDeps, projectGraph, rootTsConfig);
|
|
47
48
|
if (shouldWriteCache) {
|
|
48
|
-
nx_deps_cache_1.writeCache(projectGraphCache);
|
|
49
|
+
(0, nx_deps_cache_1.writeCache)(projectGraphCache);
|
|
49
50
|
}
|
|
50
51
|
projectGraph.allWorkspaceFiles = allWorkspaceFiles;
|
|
51
52
|
return {
|
|
@@ -56,15 +57,15 @@ function buildProjectGraphUsingProjectFileMap(workspaceJson, projectFileMap, all
|
|
|
56
57
|
}
|
|
57
58
|
exports.buildProjectGraphUsingProjectFileMap = buildProjectGraphUsingProjectFileMap;
|
|
58
59
|
function readCombinedDeps() {
|
|
59
|
-
const json = devkit_1.readJsonFile(path_1.join(app_root_1.appRootPath, 'package.json'));
|
|
60
|
+
const json = (0, devkit_1.readJsonFile)((0, path_1.join)(app_root_1.appRootPath, 'package.json'));
|
|
60
61
|
return Object.assign(Object.assign({}, json.dependencies), json.devDependencies);
|
|
61
62
|
}
|
|
62
63
|
function buildProjectGraphUsingContext(ctx, cachedFileData, projectGraphVersion) {
|
|
63
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
64
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
64
65
|
perf_hooks_1.performance.mark('build project graph:start');
|
|
65
66
|
const builder = new devkit_1.ProjectGraphBuilder();
|
|
66
|
-
build_nodes_1.buildWorkspaceProjectNodes(ctx, builder);
|
|
67
|
-
build_nodes_1.buildNpmPackageNodes(builder);
|
|
67
|
+
(0, build_nodes_1.buildWorkspaceProjectNodes)(ctx, builder);
|
|
68
|
+
(0, build_nodes_1.buildNpmPackageNodes)(builder);
|
|
68
69
|
for (const proj of Object.keys(cachedFileData)) {
|
|
69
70
|
for (const f of builder.graph.nodes[proj].data.files) {
|
|
70
71
|
const cached = cachedFileData[proj][f.file];
|
|
@@ -74,7 +75,7 @@ function buildProjectGraphUsingContext(ctx, cachedFileData, projectGraphVersion)
|
|
|
74
75
|
}
|
|
75
76
|
}
|
|
76
77
|
yield buildExplicitDependencies(ctx, builder);
|
|
77
|
-
build_dependencies_1.buildImplicitProjectDependencies(ctx, builder);
|
|
78
|
+
(0, build_dependencies_1.buildImplicitProjectDependencies)(ctx, builder);
|
|
78
79
|
builder.setVersion(projectGraphVersion);
|
|
79
80
|
const initProjectGraph = builder.getUpdatedProjectGraph();
|
|
80
81
|
const r = updateProjectGraphWithPlugins(ctx, initProjectGraph);
|
|
@@ -84,17 +85,17 @@ function buildProjectGraphUsingContext(ctx, cachedFileData, projectGraphVersion)
|
|
|
84
85
|
});
|
|
85
86
|
}
|
|
86
87
|
function buildExplicitDependencies(ctx, builder) {
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
}
|
|
88
|
+
let totalNumOfFilesToProcess = totalNumberOfFilesToProcess(ctx);
|
|
89
|
+
// using workers has an overhead, so we only do it when the number of
|
|
90
|
+
// files we need to process is >= 100 and there are more than 2 CPUs
|
|
91
|
+
// to be able to use at least 2 workers (1 worker per CPU and
|
|
92
|
+
// 1 CPU for the main thread)
|
|
93
|
+
if (totalNumOfFilesToProcess < 100 || os.cpus().length < 3) {
|
|
94
|
+
return buildExplicitDependenciesWithoutWorkers(ctx, builder);
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
return buildExplicitDependenciesUsingWorkers(ctx, totalNumOfFilesToProcess, builder);
|
|
98
|
+
}
|
|
98
99
|
}
|
|
99
100
|
function totalNumberOfFilesToProcess(ctx) {
|
|
100
101
|
let totalNumOfFilesToProcess = 0;
|
|
@@ -126,14 +127,14 @@ function splitFilesIntoBins(ctx, totalNumOfFilesToProcess, numberOfWorkers) {
|
|
|
126
127
|
function createWorkerPool(numberOfWorkers) {
|
|
127
128
|
const res = [];
|
|
128
129
|
for (let i = 0; i < numberOfWorkers; ++i) {
|
|
129
|
-
res.push(new (require('worker_threads').Worker)(path_1.join(__dirname, './project-graph-worker.js'), {
|
|
130
|
+
res.push(new (require('worker_threads').Worker)((0, path_1.join)(__dirname, './project-graph-worker.js'), {
|
|
130
131
|
env: process.env,
|
|
131
132
|
}));
|
|
132
133
|
}
|
|
133
134
|
return res;
|
|
134
135
|
}
|
|
135
136
|
function buildExplicitDependenciesWithoutWorkers(ctx, builder) {
|
|
136
|
-
build_explicit_typescript_and_package_json_dependencies_1.buildExplicitTypescriptAndPackageJsonDependencies(ctx.workspace, builder.graph, ctx.filesToProcess).forEach((r) => {
|
|
137
|
+
(0, build_explicit_typescript_and_package_json_dependencies_1.buildExplicitTypescriptAndPackageJsonDependencies)(ctx.workspace, builder.graph, ctx.filesToProcess).forEach((r) => {
|
|
137
138
|
builder.addExplicitDependency(r.sourceProjectName, r.sourceProjectFile, r.targetProjectName);
|
|
138
139
|
});
|
|
139
140
|
}
|
|
@@ -213,9 +214,9 @@ function updateProjectGraphWithPlugins(context, initProjectGraph) {
|
|
|
213
214
|
}
|
|
214
215
|
function readRootTsConfig() {
|
|
215
216
|
for (const tsConfigName of ['tsconfig.base.json', 'tsconfig.json']) {
|
|
216
|
-
const tsConfigPath = path_1.join(app_root_1.appRootPath, tsConfigName);
|
|
217
|
-
if (fs_1.existsSync(tsConfigPath)) {
|
|
218
|
-
return devkit_1.readJsonFile(tsConfigPath);
|
|
217
|
+
const tsConfigPath = (0, path_1.join)(app_root_1.appRootPath, tsConfigName);
|
|
218
|
+
if ((0, fs_1.existsSync)(tsConfigPath)) {
|
|
219
|
+
return (0, devkit_1.readJsonFile)(tsConfigPath);
|
|
219
220
|
}
|
|
220
221
|
}
|
|
221
222
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-project-graph.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/build-project-graph.ts"],"names":[],"mappings":";;;;AAAA,yCAasB;AACtB,2DAA2D;AAC3D,+BAA4B;AAC5B,2CAAyC;AACzC,4EAAuE;AACvE,8CAIuB;AACvB,4DAAuD;AACvD,4DAOkC;AAClC,6DAAwE;AACxE,+CAGuB;AACvB,2BAAgC;AAChC,yBAAyB;AACzB,0JAAiJ;AAEjJ,SAAsB,iBAAiB;;QACrC,MAAM,aAAa,GAAG,8BAAiB,
|
|
1
|
+
{"version":3,"file":"build-project-graph.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/core/project-graph/build-project-graph.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,29 +5,29 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const fs_extra_1 = require("fs-extra");
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
const tmp_dir_1 = require("./tmp-dir");
|
|
8
|
-
const serverProcessJsonPath = path_1.join(tmp_dir_1.DAEMON_DIR_FOR_CURRENT_WORKSPACE, 'server-process.json');
|
|
8
|
+
const serverProcessJsonPath = (0, path_1.join)(tmp_dir_1.DAEMON_DIR_FOR_CURRENT_WORKSPACE, 'server-process.json');
|
|
9
9
|
function readDaemonProcessJsonCache() {
|
|
10
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
|
-
if (!fs_extra_1.existsSync(serverProcessJsonPath)) {
|
|
10
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
11
|
+
if (!(0, fs_extra_1.existsSync)(serverProcessJsonPath)) {
|
|
12
12
|
return null;
|
|
13
13
|
}
|
|
14
|
-
return yield fs_extra_1.readJson(serverProcessJsonPath);
|
|
14
|
+
return yield (0, fs_extra_1.readJson)(serverProcessJsonPath);
|
|
15
15
|
});
|
|
16
16
|
}
|
|
17
17
|
function deleteDaemonJsonProcessCache() {
|
|
18
18
|
try {
|
|
19
|
-
fs_extra_1.unlinkSync(serverProcessJsonPath);
|
|
19
|
+
(0, fs_extra_1.unlinkSync)(serverProcessJsonPath);
|
|
20
20
|
}
|
|
21
21
|
catch (_a) { }
|
|
22
22
|
}
|
|
23
23
|
function writeDaemonJsonProcessCache(daemonJson) {
|
|
24
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
25
|
-
yield fs_extra_1.writeJson(serverProcessJsonPath, daemonJson);
|
|
24
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
25
|
+
yield (0, fs_extra_1.writeJson)(serverProcessJsonPath, daemonJson);
|
|
26
26
|
});
|
|
27
27
|
}
|
|
28
28
|
exports.writeDaemonJsonProcessCache = writeDaemonJsonProcessCache;
|
|
29
29
|
function safelyCleanUpExistingProcess() {
|
|
30
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
30
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
31
31
|
const daemonProcessJson = yield readDaemonProcessJsonCache();
|
|
32
32
|
if (daemonProcessJson && daemonProcessJson.processId) {
|
|
33
33
|
try {
|
|
@@ -41,7 +41,7 @@ function safelyCleanUpExistingProcess() {
|
|
|
41
41
|
exports.safelyCleanUpExistingProcess = safelyCleanUpExistingProcess;
|
|
42
42
|
// Must be sync for the help output use case
|
|
43
43
|
function getDaemonProcessId() {
|
|
44
|
-
if (!fs_extra_1.existsSync(serverProcessJsonPath)) {
|
|
44
|
+
if (!(0, fs_extra_1.existsSync)(serverProcessJsonPath)) {
|
|
45
45
|
return null;
|
|
46
46
|
}
|
|
47
47
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/daemon/cache.ts"],"names":[],"mappings":";;;;AAAA,uCAAuE;AACvE,+BAA4B;AAC5B,uCAA6D;AAM7D,MAAM,qBAAqB,GAAG,WAAI,
|
|
1
|
+
{"version":3,"file":"cache.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/core/project-graph/daemon/cache.ts"],"names":[],"mappings":";;;;AAAA,uCAAuE;AACvE,+BAA4B;AAC5B,uCAA6D;AAM7D,MAAM,qBAAqB,GAAG,IAAA,WAAI,EAChC,0CAAgC,EAChC,qBAAqB,CACtB,CAAC;AAEF,SAAe,0BAA0B;;QACvC,IAAI,CAAC,IAAA,qBAAU,EAAC,qBAAqB,CAAC,EAAE;YACtC,OAAO,IAAI,CAAC;SACb;QACD,OAAO,MAAM,IAAA,mBAAQ,EAAC,qBAAqB,CAAC,CAAC;IAC/C,CAAC;CAAA;AAED,SAAS,4BAA4B;IACnC,IAAI;QACF,IAAA,qBAAU,EAAC,qBAAqB,CAAC,CAAC;KACnC;IAAC,WAAM,GAAE;AACZ,CAAC;AAED,SAAsB,2BAA2B,CAC/C,UAA6B;;QAE7B,MAAM,IAAA,oBAAS,EAAC,qBAAqB,EAAE,UAAU,CAAC,CAAC;IACrD,CAAC;CAAA;AAJD,kEAIC;AAED,SAAsB,4BAA4B;;QAChD,MAAM,iBAAiB,GAAG,MAAM,0BAA0B,EAAE,CAAC;QAC7D,IAAI,iBAAiB,IAAI,iBAAiB,CAAC,SAAS,EAAE;YACpD,IAAI;gBACF,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;aAC3C;YAAC,WAAM,GAAE;SACX;QACD,4BAA4B,EAAE,CAAC;IACjC,CAAC;CAAA;AARD,oEAQC;AAED,4CAA4C;AAC5C,SAAgB,kBAAkB;IAChC,IAAI,CAAC,IAAA,qBAAU,EAAC,qBAAqB,CAAC,EAAE;QACtC,OAAO,IAAI,CAAC;KACb;IACD,IAAI;QACF,MAAM,iBAAiB,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;QACzD,OAAO,iBAAiB,CAAC,SAAS,CAAC;KACpC;IAAC,WAAM;QACN,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AAVD,gDAUC"}
|
|
@@ -11,12 +11,12 @@ const cache_1 = require("../cache");
|
|
|
11
11
|
const socket_utils_1 = require("../socket-utils");
|
|
12
12
|
const tmp_dir_1 = require("../tmp-dir");
|
|
13
13
|
function startInBackground() {
|
|
14
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
15
|
-
yield cache_1.safelyCleanUpExistingProcess();
|
|
14
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
15
|
+
yield (0, cache_1.safelyCleanUpExistingProcess)();
|
|
16
16
|
try {
|
|
17
|
-
const out = fs_1.openSync(tmp_dir_1.DAEMON_OUTPUT_LOG_FILE, 'a');
|
|
18
|
-
const err = fs_1.openSync(tmp_dir_1.DAEMON_OUTPUT_LOG_FILE, 'a');
|
|
19
|
-
const backgroundProcess = child_process_1.spawn(process.execPath, ['../server/start.js'], {
|
|
17
|
+
const out = (0, fs_1.openSync)(tmp_dir_1.DAEMON_OUTPUT_LOG_FILE, 'a');
|
|
18
|
+
const err = (0, fs_1.openSync)(tmp_dir_1.DAEMON_OUTPUT_LOG_FILE, 'a');
|
|
19
|
+
const backgroundProcess = (0, child_process_1.spawn)(process.execPath, ['../server/start.js'], {
|
|
20
20
|
cwd: __dirname,
|
|
21
21
|
stdio: ['ignore', out, err],
|
|
22
22
|
detached: true,
|
|
@@ -25,14 +25,14 @@ function startInBackground() {
|
|
|
25
25
|
});
|
|
26
26
|
backgroundProcess.unref();
|
|
27
27
|
// Persist metadata about the background process so that it can be cleaned up later if needed
|
|
28
|
-
yield cache_1.writeDaemonJsonProcessCache({
|
|
28
|
+
yield (0, cache_1.writeDaemonJsonProcessCache)({
|
|
29
29
|
processId: backgroundProcess.pid,
|
|
30
30
|
});
|
|
31
31
|
/**
|
|
32
32
|
* Ensure the server is actually available to connect to via IPC before resolving
|
|
33
33
|
*/
|
|
34
34
|
return new Promise((resolve) => {
|
|
35
|
-
const id = setInterval(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
35
|
+
const id = setInterval(() => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
36
36
|
if (yield isServerAvailable()) {
|
|
37
37
|
clearInterval(id);
|
|
38
38
|
resolve(backgroundProcess.pid);
|
|
@@ -49,14 +49,14 @@ function startInBackground() {
|
|
|
49
49
|
exports.startInBackground = startInBackground;
|
|
50
50
|
function startInCurrentProcess() {
|
|
51
51
|
devkit_1.logger.info(`NX Daemon Server - Starting in the current process...`);
|
|
52
|
-
child_process_1.spawnSync(process.execPath, ['../server/start.js'], {
|
|
52
|
+
(0, child_process_1.spawnSync)(process.execPath, ['../server/start.js'], {
|
|
53
53
|
cwd: __dirname,
|
|
54
54
|
stdio: 'inherit',
|
|
55
55
|
});
|
|
56
56
|
}
|
|
57
57
|
exports.startInCurrentProcess = startInCurrentProcess;
|
|
58
58
|
function stop() {
|
|
59
|
-
child_process_1.spawnSync(process.execPath, ['../server/stop.js'], {
|
|
59
|
+
(0, child_process_1.spawnSync)(process.execPath, ['../server/stop.js'], {
|
|
60
60
|
cwd: __dirname,
|
|
61
61
|
stdio: 'inherit',
|
|
62
62
|
});
|
|
@@ -72,10 +72,10 @@ exports.stop = stop;
|
|
|
72
72
|
* check for their existence on disk (unlike with Unix Sockets).
|
|
73
73
|
*/
|
|
74
74
|
function isServerAvailable() {
|
|
75
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
75
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
76
76
|
return new Promise((resolve) => {
|
|
77
77
|
try {
|
|
78
|
-
const socket = net_1.connect(socket_utils_1.FULL_OS_SOCKET_PATH, () => {
|
|
78
|
+
const socket = (0, net_1.connect)(socket_utils_1.FULL_OS_SOCKET_PATH, () => {
|
|
79
79
|
socket.destroy();
|
|
80
80
|
resolve(true);
|
|
81
81
|
});
|
|
@@ -101,10 +101,10 @@ exports.isServerAvailable = isServerAvailable;
|
|
|
101
101
|
* is connecting and querying it.
|
|
102
102
|
*/
|
|
103
103
|
function getProjectGraphFromServer() {
|
|
104
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
104
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
105
105
|
return new Promise((resolve, reject) => {
|
|
106
106
|
perf_hooks_1.performance.mark('getProjectGraphFromServer-start');
|
|
107
|
-
const socket = net_1.connect(socket_utils_1.FULL_OS_SOCKET_PATH);
|
|
107
|
+
const socket = (0, net_1.connect)(socket_utils_1.FULL_OS_SOCKET_PATH);
|
|
108
108
|
socket.on('error', (err) => {
|
|
109
109
|
let errorMessage;
|
|
110
110
|
if (err.message.startsWith('connect ENOENT')) {
|
|
@@ -112,9 +112,9 @@ function getProjectGraphFromServer() {
|
|
|
112
112
|
}
|
|
113
113
|
if (err.message.startsWith('connect ECONNREFUSED')) {
|
|
114
114
|
// If somehow the file descriptor had not been released during a previous shut down.
|
|
115
|
-
if (fs_1.existsSync(socket_utils_1.FULL_OS_SOCKET_PATH)) {
|
|
115
|
+
if ((0, fs_1.existsSync)(socket_utils_1.FULL_OS_SOCKET_PATH)) {
|
|
116
116
|
errorMessage = `Error: A server instance had not been fully shut down. Please try running the command again.`;
|
|
117
|
-
socket_utils_1.killSocketOrPath();
|
|
117
|
+
(0, socket_utils_1.killSocketOrPath)();
|
|
118
118
|
}
|
|
119
119
|
}
|
|
120
120
|
devkit_1.logger.error(`NX Daemon Client - ${errorMessage || err}`);
|
|
@@ -134,7 +134,7 @@ function getProjectGraphFromServer() {
|
|
|
134
134
|
socket.on('end', () => {
|
|
135
135
|
try {
|
|
136
136
|
perf_hooks_1.performance.mark('json-parse-start');
|
|
137
|
-
const projectGraphResult = socket_utils_1.deserializeResult(serializedProjectGraphResult);
|
|
137
|
+
const projectGraphResult = (0, socket_utils_1.deserializeResult)(serializedProjectGraphResult);
|
|
138
138
|
perf_hooks_1.performance.mark('json-parse-end');
|
|
139
139
|
perf_hooks_1.performance.measure('deserialize graph result on the client', 'json-parse-start', 'json-parse-end');
|
|
140
140
|
if (projectGraphResult.error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/client/client.ts"],"names":[],"mappings":";;;;AAAA,yCAAoD;AACpD,iDAA+D;AAC/D,2BAA0C;AAC1C,6BAA8B;AAC9B,2CAAyC;AACzC,oCAGkB;AAClB,kDAIyB;AACzB,wCAAoD;AAEpD,SAAsB,iBAAiB;;QACrC,MAAM,oCAA4B,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/client/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const client_1 = require("./client");
|
|
5
|
-
(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
5
|
+
(() => (0, tslib_1.__awaiter)(void 0, void 0, void 0, function* () {
|
|
6
6
|
try {
|
|
7
|
-
console.log(yield client_1.isServerAvailable());
|
|
7
|
+
console.log(yield (0, client_1.isServerAvailable)());
|
|
8
8
|
}
|
|
9
9
|
catch (_a) {
|
|
10
10
|
console.log(false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"exec-is-server-available.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/client/exec-is-server-available.ts"],"names":[],"mappings":";;;AAAA,qCAA6C;AAE7C,CAAC,GAAS,EAAE;IACV,IAAI;QACF,OAAO,CAAC,GAAG,CAAC,MAAM,0BAAiB,
|
|
1
|
+
{"version":3,"file":"exec-is-server-available.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/client/exec-is-server-available.ts"],"names":[],"mappings":";;;AAAA,qCAA6C;AAE7C,CAAC,GAAS,EAAE;IACV,IAAI;QACF,OAAO,CAAC,GAAG,CAAC,MAAM,IAAA,0BAAiB,GAAE,CAAC,CAAC;KACxC;IAAC,WAAM;QACN,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;KACpB;AACH,CAAC,CAAA,CAAC,EAAE,CAAC"}
|
|
@@ -13,14 +13,14 @@ function generateDaemonHelpOutput(isGenerateDocsProcess = false) {
|
|
|
13
13
|
* A workaround for cases such as yargs output where we need to synchronously
|
|
14
14
|
* get the value of this async operation.
|
|
15
15
|
*/
|
|
16
|
-
const res = child_process_1.spawnSync(process.execPath, ['./exec-is-server-available.js'], {
|
|
16
|
+
const res = (0, child_process_1.spawnSync)(process.execPath, ['./exec-is-server-available.js'], {
|
|
17
17
|
cwd: __dirname,
|
|
18
18
|
});
|
|
19
19
|
const isServerAvailable = ((_a = res === null || res === void 0 ? void 0 : res.stdout) === null || _a === void 0 ? void 0 : _a.toString().trim()) === 'true';
|
|
20
20
|
if (!isServerAvailable) {
|
|
21
21
|
return '';
|
|
22
22
|
}
|
|
23
|
-
const pid = cache_1.getDaemonProcessId();
|
|
23
|
+
const pid = (0, cache_1.getDaemonProcessId)();
|
|
24
24
|
return `Nx Daemon is currently running:
|
|
25
25
|
- Logs: ${tmp_dir_1.DAEMON_OUTPUT_LOG_FILE}${pid
|
|
26
26
|
? `
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-help-output.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/client/generate-help-output.ts"],"names":[],"mappings":";;;AAAA,iDAA0C;AAC1C,oCAA8C;AAC9C,wCAAoD;AAEpD,SAAgB,wBAAwB,CACtC,qBAAqB,GAAG,KAAK;;IAE7B,IAAI,qBAAqB,EAAE;QACzB,OAAO,+IAA+I,CAAC;KACxJ;IAED;;;OAGG;IACH,MAAM,GAAG,GAAG,yBAAS,
|
|
1
|
+
{"version":3,"file":"generate-help-output.js","sourceRoot":"","sources":["../../../../../../../../packages/workspace/src/core/project-graph/daemon/client/generate-help-output.ts"],"names":[],"mappings":";;;AAAA,iDAA0C;AAC1C,oCAA8C;AAC9C,wCAAoD;AAEpD,SAAgB,wBAAwB,CACtC,qBAAqB,GAAG,KAAK;;IAE7B,IAAI,qBAAqB,EAAE;QACzB,OAAO,+IAA+I,CAAC;KACxJ;IAED;;;OAGG;IACH,MAAM,GAAG,GAAG,IAAA,yBAAS,EAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,+BAA+B,CAAC,EAAE;QACzE,GAAG,EAAE,SAAS;KACf,CAAC,CAAC;IAEH,MAAM,iBAAiB,GAAG,CAAA,MAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,MAAM,0CAAE,QAAQ,GAAG,IAAI,EAAE,MAAK,MAAM,CAAC;IACpE,IAAI,CAAC,iBAAiB,EAAE;QACtB,OAAO,EAAE,CAAC;KACX;IAED,MAAM,GAAG,GAAG,IAAA,0BAAkB,GAAE,CAAC;IACjC,OAAO;YACG,gCAAsB,GAC9B,GAAG;QACD,CAAC,CAAC;kBACU,GAAG,EAAE;QACjB,CAAC,CAAC,EACN,EAAE,CAAC;AACL,CAAC;AA5BD,4DA4BC"}
|