@nrwl/workspace 13.1.1 → 13.2.0-beta.2
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 +11 -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.d.ts +0 -3
- package/src/command-line/dep-graph.js +76 -85
- 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 +117 -36
- package/src/core/dep-graph/index.html +3 -14
- 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
package/index.d.ts
CHANGED
|
@@ -6,7 +6,7 @@ export { ExistingPrettierConfig, resolveUserExistingPrettierConfig, } from './sr
|
|
|
6
6
|
export { output } from './src/utilities/output';
|
|
7
7
|
export { commandsObject } from './src/command-line/nx-commands';
|
|
8
8
|
export { supportedNxCommands } from './src/command-line/supported-nx-commands';
|
|
9
|
-
export { readWorkspaceJson, readNxJson, readWorkspaceConfig, } from './src/core/file-utils';
|
|
9
|
+
export { readWorkspaceJson, readNxJson, readWorkspaceConfig, readPackageJson, } from './src/core/file-utils';
|
|
10
10
|
export { ProjectGraphCache } from './src/core/nx-deps/nx-deps-cache';
|
|
11
11
|
export { readJsonInTree, updateJsonInTree, updateWorkspaceInTree, insert, replaceNodeValue, addDepsToPackageJson, addMethod, addIncludeToTsConfig, addGlobal, getProjectConfig, addParameterToConstructor, createOrUpdate, findNodes, updatePackageJsonDependencies, readWorkspace, renameSyncInTree, renameDirSyncInTree, updateNxJsonInTree, addProjectToNxJsonInTree, readNxJsonInTree, InsertChange, ReplaceChange, RemoveChange, } from './src/utils/ast-utils';
|
|
12
12
|
export { getNpmScope, getWorkspacePath, replaceAppNameWithPath, editTarget, parseTarget, serializeTarget, } from './src/utils/cli-config-utils';
|
package/index.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
4
|
-
exports.stringUtils = exports.convertToNxProjectSchematic = exports.convertToNxProjectGenerator = exports.runCommandsGenerator = exports.removeGenerator = exports.moveGenerator = exports.libraryGenerator = exports.updatePackagesInPackageJson = exports.checkAndCleanWithSemver = exports.renameNpmPackages = exports.renamePackageImports = exports.setDefaultCollection = exports.visitNotIgnoredFiles = exports.updateKarmaConf = exports.deleteFile = exports.formatFiles = exports.addInstallTask = exports.generateProjectLint = exports.addLintFiles = void 0;
|
|
3
|
+
exports.updateBuilderConfig = exports.updateWorkspace = exports.getWorkspace = exports.unparse = exports.serializeTarget = exports.parseTarget = exports.editTarget = exports.replaceAppNameWithPath = exports.getWorkspacePath = exports.getNpmScope = exports.RemoveChange = exports.ReplaceChange = exports.InsertChange = exports.readNxJsonInTree = exports.addProjectToNxJsonInTree = exports.updateNxJsonInTree = exports.renameDirSyncInTree = exports.renameSyncInTree = exports.readWorkspace = exports.updatePackageJsonDependencies = exports.findNodes = exports.createOrUpdate = exports.addParameterToConstructor = exports.getProjectConfig = exports.addGlobal = exports.addIncludeToTsConfig = exports.addMethod = exports.addDepsToPackageJson = exports.replaceNodeValue = exports.insert = exports.updateWorkspaceInTree = exports.updateJsonInTree = exports.readJsonInTree = exports.readPackageJson = exports.readWorkspaceConfig = exports.readNxJson = exports.readWorkspaceJson = exports.supportedNxCommands = exports.commandsObject = exports.output = exports.resolveUserExistingPrettierConfig = exports.createDirectory = exports.copyFile = exports.readJsonFile = exports.updateJsonFile = exports.renameSync = exports.serializeJson = exports.projectRootDir = exports.ProjectType = exports.readTsConfig = void 0;
|
|
4
|
+
exports.stringUtils = exports.convertToNxProjectSchematic = exports.convertToNxProjectGenerator = exports.runCommandsGenerator = exports.removeGenerator = exports.moveGenerator = exports.libraryGenerator = exports.updatePackagesInPackageJson = exports.checkAndCleanWithSemver = exports.renameNpmPackages = exports.renamePackageImports = exports.setDefaultCollection = exports.visitNotIgnoredFiles = exports.updateKarmaConf = exports.deleteFile = exports.formatFiles = exports.addInstallTask = exports.generateProjectLint = exports.addLintFiles = exports.addUpdateTask = void 0;
|
|
5
5
|
const tslib_1 = require("tslib");
|
|
6
6
|
var typescript_1 = require("./src/utilities/typescript");
|
|
7
7
|
Object.defineProperty(exports, "readTsConfig", { enumerable: true, get: function () { return typescript_1.readTsConfig; } });
|
|
@@ -16,7 +16,7 @@ Object.defineProperty(exports, "readJsonFile", { enumerable: true, get: function
|
|
|
16
16
|
Object.defineProperty(exports, "copyFile", { enumerable: true, get: function () { return fileutils_1.copyFile; } });
|
|
17
17
|
Object.defineProperty(exports, "createDirectory", { enumerable: true, get: function () { return fileutils_1.createDirectory; } });
|
|
18
18
|
// TODO: vsavkin delete after Nx 12
|
|
19
|
-
tslib_1.__exportStar(require("./src/devkit-reexport"), exports);
|
|
19
|
+
(0, tslib_1.__exportStar)(require("./src/devkit-reexport"), exports);
|
|
20
20
|
var prettier_1 = require("./src/utilities/prettier");
|
|
21
21
|
Object.defineProperty(exports, "resolveUserExistingPrettierConfig", { enumerable: true, get: function () { return prettier_1.resolveUserExistingPrettierConfig; } });
|
|
22
22
|
var output_1 = require("./src/utilities/output");
|
|
@@ -29,6 +29,7 @@ var file_utils_1 = require("./src/core/file-utils");
|
|
|
29
29
|
Object.defineProperty(exports, "readWorkspaceJson", { enumerable: true, get: function () { return file_utils_1.readWorkspaceJson; } });
|
|
30
30
|
Object.defineProperty(exports, "readNxJson", { enumerable: true, get: function () { return file_utils_1.readNxJson; } });
|
|
31
31
|
Object.defineProperty(exports, "readWorkspaceConfig", { enumerable: true, get: function () { return file_utils_1.readWorkspaceConfig; } });
|
|
32
|
+
Object.defineProperty(exports, "readPackageJson", { enumerable: true, get: function () { return file_utils_1.readPackageJson; } });
|
|
32
33
|
var ast_utils_1 = require("./src/utils/ast-utils");
|
|
33
34
|
Object.defineProperty(exports, "readJsonInTree", { enumerable: true, get: function () { return ast_utils_1.readJsonInTree; } });
|
|
34
35
|
Object.defineProperty(exports, "updateJsonInTree", { enumerable: true, get: function () { return ast_utils_1.updateJsonInTree; } });
|
|
@@ -77,7 +78,7 @@ var format_files_1 = require("./src/utils/rules/format-files");
|
|
|
77
78
|
Object.defineProperty(exports, "formatFiles", { enumerable: true, get: function () { return format_files_1.formatFiles; } });
|
|
78
79
|
var deleteFile_1 = require("./src/utils/rules/deleteFile");
|
|
79
80
|
Object.defineProperty(exports, "deleteFile", { enumerable: true, get: function () { return deleteFile_1.deleteFile; } });
|
|
80
|
-
tslib_1.__exportStar(require("./src/utils/rules/ng-add"), exports);
|
|
81
|
+
(0, tslib_1.__exportStar)(require("./src/utils/rules/ng-add"), exports);
|
|
81
82
|
var update_karma_conf_1 = require("./src/utils/rules/update-karma-conf");
|
|
82
83
|
Object.defineProperty(exports, "updateKarmaConf", { enumerable: true, get: function () { return update_karma_conf_1.updateKarmaConf; } });
|
|
83
84
|
var visit_not_ignored_files_1 = require("./src/utils/rules/visit-not-ignored-files");
|
package/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/workspace/index.ts"],"names":[],"mappings":";;;;;AAAA,yDAA0D;AAAjD,0GAAA,YAAY,OAAA;AACrB,yDAAuE;AAA9D,2GAAA,WAAW,OAAA;AAAE,8GAAA,cAAc,OAAA;AACpC,uDAOmC;AANjC,0GAAA,aAAa,OAAA;AACb,uGAAA,UAAU,OAAA;AACV,2GAAA,cAAc,OAAA;AACd,yGAAA,YAAY,OAAA;AACZ,qGAAA,QAAQ,OAAA;AACR,4GAAA,eAAe,OAAA;AAGjB,mCAAmC;AACnC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../packages/workspace/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nrwl/workspace",
|
|
3
|
-
"version": "13.
|
|
3
|
+
"version": "13.2.0-beta.2",
|
|
4
4
|
"description": "Smart, Extensible Build Framework",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -55,12 +55,17 @@
|
|
|
55
55
|
"peerDependencies": {
|
|
56
56
|
"prettier": "^2.3.0"
|
|
57
57
|
},
|
|
58
|
+
"peerDependenciesMeta": {
|
|
59
|
+
"prettier": {
|
|
60
|
+
"optional": true
|
|
61
|
+
}
|
|
62
|
+
},
|
|
58
63
|
"dependencies": {
|
|
59
64
|
"@parcel/watcher": "2.0.0-alpha.11",
|
|
60
|
-
"@nrwl/cli": "13.
|
|
61
|
-
"@nrwl/devkit": "13.
|
|
62
|
-
"@nrwl/jest": "13.
|
|
63
|
-
"@nrwl/linter": "13.
|
|
65
|
+
"@nrwl/cli": "13.2.0-beta.2",
|
|
66
|
+
"@nrwl/devkit": "13.2.0-beta.2",
|
|
67
|
+
"@nrwl/jest": "13.2.0-beta.2",
|
|
68
|
+
"@nrwl/linter": "13.2.0-beta.2",
|
|
64
69
|
"chokidar": "^3.5.1",
|
|
65
70
|
"cosmiconfig": "^4.0.0",
|
|
66
71
|
"fs-extra": "^9.1.0",
|
|
@@ -80,7 +85,7 @@
|
|
|
80
85
|
"flat": "^5.0.2",
|
|
81
86
|
"minimatch": "3.0.4",
|
|
82
87
|
"enquirer": "~2.3.6",
|
|
83
|
-
"tslib": "^2.
|
|
88
|
+
"tslib": "^2.3.0"
|
|
84
89
|
},
|
|
85
90
|
"nx-migrations": {
|
|
86
91
|
"migrations": "./migrations.json"
|
|
@@ -17,16 +17,16 @@ const utils_1 = require("./utils");
|
|
|
17
17
|
const perf_hooks_1 = require("perf_hooks");
|
|
18
18
|
const empty_reporter_1 = require("../tasks-runner/empty-reporter");
|
|
19
19
|
function affected(command, parsedArgs) {
|
|
20
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
20
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
21
21
|
perf_hooks_1.performance.mark('command-execution-begins');
|
|
22
|
-
const { nxArgs, overrides } = utils_1.splitArgsIntoNxArgsAndOverrides(parsedArgs, 'affected', {
|
|
22
|
+
const { nxArgs, overrides } = (0, utils_1.splitArgsIntoNxArgsAndOverrides)(parsedArgs, 'affected', {
|
|
23
23
|
printWarnings: command !== 'print-affected' && !parsedArgs.plain,
|
|
24
24
|
});
|
|
25
|
-
yield connect_to_nx_cloud_1.connectToNxCloudUsingScan(nxArgs.scan);
|
|
26
|
-
const projectGraph = yield project_graph_1.createProjectGraphAsync();
|
|
25
|
+
yield (0, connect_to_nx_cloud_1.connectToNxCloudUsingScan)(nxArgs.scan);
|
|
26
|
+
const projectGraph = yield (0, project_graph_1.createProjectGraphAsync)();
|
|
27
27
|
const projects = projectsToRun(nxArgs, projectGraph);
|
|
28
28
|
const projectsNotExcluded = applyExclude(projects, nxArgs);
|
|
29
|
-
const env = file_utils_1.readEnvironment(nxArgs.target, projectsNotExcluded);
|
|
29
|
+
const env = (0, file_utils_1.readEnvironment)(nxArgs.target, projectsNotExcluded);
|
|
30
30
|
const filteredProjects = applyOnlyFailed(projectsNotExcluded, nxArgs, env);
|
|
31
31
|
try {
|
|
32
32
|
switch (command) {
|
|
@@ -64,20 +64,20 @@ function affected(command, parsedArgs) {
|
|
|
64
64
|
break;
|
|
65
65
|
case 'dep-graph':
|
|
66
66
|
const projectNames = filteredProjects.map((p) => p.name);
|
|
67
|
-
yield dep_graph_1.generateGraph(parsedArgs, projectNames);
|
|
67
|
+
yield (0, dep_graph_1.generateGraph)(parsedArgs, projectNames);
|
|
68
68
|
break;
|
|
69
69
|
case 'print-affected':
|
|
70
70
|
if (nxArgs.target) {
|
|
71
71
|
const projectsWithTarget = allProjectsWithTarget(filteredProjects, nxArgs);
|
|
72
|
-
print_affected_1.printAffected(projectsWithTarget, filteredProjects, projectGraph, env, nxArgs, overrides);
|
|
72
|
+
(0, print_affected_1.printAffected)(projectsWithTarget, filteredProjects, projectGraph, env, nxArgs, overrides);
|
|
73
73
|
}
|
|
74
74
|
else {
|
|
75
|
-
print_affected_1.printAffected([], filteredProjects, projectGraph, env, nxArgs, overrides);
|
|
75
|
+
(0, print_affected_1.printAffected)([], filteredProjects, projectGraph, env, nxArgs, overrides);
|
|
76
76
|
}
|
|
77
77
|
break;
|
|
78
78
|
case 'affected': {
|
|
79
79
|
const projectsWithTarget = allProjectsWithTarget(filteredProjects, nxArgs);
|
|
80
|
-
run_command_1.runCommand(projectsWithTarget, projectGraph, env, nxArgs, overrides, nxArgs.hideCachedOutput ? new empty_reporter_1.EmptyReporter() : new default_reporter_1.DefaultReporter(), null);
|
|
80
|
+
(0, run_command_1.runCommand)(projectsWithTarget, projectGraph, env, nxArgs, overrides, nxArgs.hideCachedOutput ? new empty_reporter_1.EmptyReporter() : new default_reporter_1.DefaultReporter(), null);
|
|
81
81
|
break;
|
|
82
82
|
}
|
|
83
83
|
}
|
|
@@ -94,9 +94,9 @@ function projectsToRun(nxArgs, projectGraph) {
|
|
|
94
94
|
return projectGraph.nodes;
|
|
95
95
|
let affectedGraph = nxArgs.all
|
|
96
96
|
? projectGraph
|
|
97
|
-
: affected_project_graph_1.filterAffected(projectGraph, file_utils_1.calculateFileChanges(shared_1.parseFiles(nxArgs).files, nxArgs));
|
|
97
|
+
: (0, affected_project_graph_1.filterAffected)(projectGraph, (0, file_utils_1.calculateFileChanges)((0, shared_1.parseFiles)(nxArgs).files, nxArgs));
|
|
98
98
|
if (nxArgs.withDeps) {
|
|
99
|
-
affectedGraph = project_graph_1.withDeps(projectGraph, Object.values(affectedGraph.nodes));
|
|
99
|
+
affectedGraph = (0, project_graph_1.withDeps)(projectGraph, Object.values(affectedGraph.nodes));
|
|
100
100
|
}
|
|
101
101
|
return affectedGraph.nodes;
|
|
102
102
|
}
|
|
@@ -112,7 +112,7 @@ function applyOnlyFailed(projectsNotExcluded, nxArgs, env) {
|
|
|
112
112
|
return Object.values(projectsNotExcluded).filter((n) => !nxArgs.onlyFailed || !env.workspaceResults.getResult(n.name));
|
|
113
113
|
}
|
|
114
114
|
function allProjectsWithTarget(projects, nxArgs) {
|
|
115
|
-
return projects.filter((p) => project_graph_utils_1.projectHasTarget(p, nxArgs.target));
|
|
115
|
+
return projects.filter((p) => (0, project_graph_utils_1.projectHasTarget)(p, nxArgs.target));
|
|
116
116
|
}
|
|
117
117
|
function printError(e, verbose) {
|
|
118
118
|
const bodyLines = [e.message];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"affected.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/command-line/affected.ts"],"names":[],"mappings":";;;;AACA,2EAAgE;AAChE,mDAA2E;AAC3E,yDAI+B;AAM/B,uEAAmE;AACnE,6DAAyD;AACzD,gDAA6C;AAC7C,0EAAoE;AACpE,2CAA4C;AAC5C,qDAAiD;AACjD,+DAAkE;AAClE,qCAAsC;AACtC,mCAA0D;AAE1D,2CAAyC;AAEzC,mEAA+D;AAE/D,SAAsB,QAAQ,CAC5B,OAAsE,EACtE,UAAuC;;QAEvC,wBAAW,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAC7C,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,uCAA+B,
|
|
1
|
+
{"version":3,"file":"affected.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/command-line/affected.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,10 +7,10 @@ const output_1 = require("../utilities/output");
|
|
|
7
7
|
const devkit_1 = require("@nrwl/devkit");
|
|
8
8
|
const child_process_1 = require("child_process");
|
|
9
9
|
function connectToNxCloudUsingScan(scan) {
|
|
10
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
10
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
11
11
|
if (!scan)
|
|
12
12
|
return;
|
|
13
|
-
const nxJson = file_utils_1.readNxJson();
|
|
13
|
+
const nxJson = (0, file_utils_1.readNxJson)();
|
|
14
14
|
const defaultRunnerIsUsed = Object.values(nxJson.tasksRunnerOptions).find((r) => r.runner == '@nrwl/workspace/tasks-runners/default');
|
|
15
15
|
if (!defaultRunnerIsUsed)
|
|
16
16
|
return;
|
|
@@ -19,9 +19,9 @@ function connectToNxCloudUsingScan(scan) {
|
|
|
19
19
|
});
|
|
20
20
|
const res = yield connectToNxCloudPrompt();
|
|
21
21
|
if (res) {
|
|
22
|
-
const pmc = devkit_1.getPackageManagerCommand();
|
|
23
|
-
child_process_1.execSync(`${pmc.addDev} @nrwl/nx-cloud@latest`);
|
|
24
|
-
child_process_1.execSync(`${pmc.exec} nx g @nrwl/nx-cloud:init`, {
|
|
22
|
+
const pmc = (0, devkit_1.getPackageManagerCommand)();
|
|
23
|
+
(0, child_process_1.execSync)(`${pmc.addDev} @nrwl/nx-cloud@latest`);
|
|
24
|
+
(0, child_process_1.execSync)(`${pmc.exec} nx g @nrwl/nx-cloud:init`, {
|
|
25
25
|
stdio: [0, 1, 2],
|
|
26
26
|
});
|
|
27
27
|
}
|
|
@@ -32,8 +32,8 @@ function connectToNxCloudUsingScan(scan) {
|
|
|
32
32
|
}
|
|
33
33
|
exports.connectToNxCloudUsingScan = connectToNxCloudUsingScan;
|
|
34
34
|
function connectToNxCloudCommand() {
|
|
35
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
36
|
-
const nxJson = file_utils_1.readNxJson();
|
|
35
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
36
|
+
const nxJson = (0, file_utils_1.readNxJson)();
|
|
37
37
|
const nxCloudUsed = Object.values(nxJson.tasksRunnerOptions).find((r) => r.runner == '@nrwl/nx-cloud');
|
|
38
38
|
if (nxCloudUsed) {
|
|
39
39
|
output_1.output.log({
|
|
@@ -44,16 +44,16 @@ function connectToNxCloudCommand() {
|
|
|
44
44
|
const res = yield connectToNxCloudPrompt();
|
|
45
45
|
if (!res)
|
|
46
46
|
return;
|
|
47
|
-
const pmc = devkit_1.getPackageManagerCommand();
|
|
48
|
-
child_process_1.execSync(`${pmc.addDev} @nrwl/nx-cloud@latest`);
|
|
49
|
-
child_process_1.execSync(`${pmc.exec} nx g @nrwl/nx-cloud:init`, {
|
|
47
|
+
const pmc = (0, devkit_1.getPackageManagerCommand)();
|
|
48
|
+
(0, child_process_1.execSync)(`${pmc.addDev} @nrwl/nx-cloud@latest`);
|
|
49
|
+
(0, child_process_1.execSync)(`${pmc.exec} nx g @nrwl/nx-cloud:init`, {
|
|
50
50
|
stdio: [0, 1, 2],
|
|
51
51
|
});
|
|
52
52
|
});
|
|
53
53
|
}
|
|
54
54
|
exports.connectToNxCloudCommand = connectToNxCloudCommand;
|
|
55
55
|
function connectToNxCloudPrompt() {
|
|
56
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
56
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
57
57
|
return yield (yield Promise.resolve().then(() => require('enquirer')))
|
|
58
58
|
.prompt([
|
|
59
59
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect-to-nx-cloud.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/command-line/connect-to-nx-cloud.ts"],"names":[],"mappings":";;;;AAAA,mDAAgD;AAChD,gDAA6C;AAC7C,yCAAwD;AACxD,iDAAyC;AAEzC,SAAsB,yBAAyB,CAAC,IAAa;;QAC3D,IAAI,CAAC,IAAI;YAAE,OAAO;QAElB,MAAM,MAAM,GAAG,uBAAU,
|
|
1
|
+
{"version":3,"file":"connect-to-nx-cloud.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/command-line/connect-to-nx-cloud.ts"],"names":[],"mappings":";;;;AAAA,mDAAgD;AAChD,gDAA6C;AAC7C,yCAAwD;AACxD,iDAAyC;AAEzC,SAAsB,yBAAyB,CAAC,IAAa;;QAC3D,IAAI,CAAC,IAAI;YAAE,OAAO;QAElB,MAAM,MAAM,GAAG,IAAA,uBAAU,GAAE,CAAC;QAC5B,MAAM,mBAAmB,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CACvE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,uCAAuC,CAC3D,CAAC;QACF,IAAI,CAAC,mBAAmB;YAAE,OAAO;QAEjC,eAAM,CAAC,GAAG,CAAC;YACT,KAAK,EAAE,4DAA4D;SACpE,CAAC,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,sBAAsB,EAAE,CAAC;QAC3C,IAAI,GAAG,EAAE;YACP,MAAM,GAAG,GAAG,IAAA,iCAAwB,GAAE,CAAC;YACvC,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,MAAM,wBAAwB,CAAC,CAAC;YAChD,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,IAAI,2BAA2B,EAAE;gBAC/C,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;aACjB,CAAC,CAAC;SACJ;aAAM;YACL,eAAM,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,sCAAsC,EAAE,CAAC,CAAC;SAC/D;IACH,CAAC;CAAA;AAtBD,8DAsBC;AAED,SAAsB,uBAAuB;;QAC3C,MAAM,MAAM,GAAG,IAAA,uBAAU,GAAE,CAAC;QAC5B,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAC/D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,gBAAgB,CACpC,CAAC;QACF,IAAI,WAAW,EAAE;YACf,eAAM,CAAC,GAAG,CAAC;gBACT,KAAK,EAAE,kDAAkD;aAC1D,CAAC,CAAC;YACH,OAAO;SACR;QAED,MAAM,GAAG,GAAG,MAAM,sBAAsB,EAAE,CAAC;QAC3C,IAAI,CAAC,GAAG;YAAE,OAAO;QACjB,MAAM,GAAG,GAAG,IAAA,iCAAwB,GAAE,CAAC;QACvC,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,MAAM,wBAAwB,CAAC,CAAC;QAChD,IAAA,wBAAQ,EAAC,GAAG,GAAG,CAAC,IAAI,2BAA2B,EAAE;YAC/C,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;SACjB,CAAC,CAAC;IACL,CAAC;CAAA;AAnBD,0DAmBC;AAED,SAAe,sBAAsB;;QACnC,OAAO,MAAM,CACX,2CAAa,UAAU,EAAC,CACzB;aACE,MAAM,CAAC;YACN;gBACE,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,oEAAoE;gBAC7E,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE;oBACP;wBACE,IAAI,EAAE,KAAK;wBACX,IAAI,EAAE,8EAA8E;qBACrF;oBACD;wBACE,IAAI,EAAE,IAAI;qBACX;iBACF;gBACD,OAAO,EAAE,IAAW;aACrB;SACF,CAAC;aACD,IAAI,CAAC,CAAC,CAA4B,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,KAAK,CAAC,CAAC;IACjE,CAAC;CAAA"}
|
|
@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const tmp_dir_1 = require("../core/project-graph/daemon/tmp-dir");
|
|
7
7
|
function daemonHandler(args) {
|
|
8
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
9
9
|
const { startInBackground, startInCurrentProcess } = yield Promise.resolve().then(() => require('../core/project-graph/daemon/client/client'));
|
|
10
10
|
if (!args.background) {
|
|
11
11
|
return startInCurrentProcess();
|
|
@@ -17,7 +17,6 @@ const url_1 = require("url");
|
|
|
17
17
|
const file_utils_1 = require("../core/file-utils");
|
|
18
18
|
const file_hasher_1 = require("../core/hasher/file-hasher");
|
|
19
19
|
const project_graph_1 = require("../core/project-graph");
|
|
20
|
-
const cache_directory_1 = require("../utilities/cache-directory");
|
|
21
20
|
const fileutils_1 = require("../utilities/fileutils");
|
|
22
21
|
const output_1 = require("../utilities/output");
|
|
23
22
|
// maps file extention to MIME types
|
|
@@ -37,30 +36,35 @@ const mimeType = {
|
|
|
37
36
|
'.eot': 'appliaction/vnd.ms-fontobject',
|
|
38
37
|
'.ttf': 'aplication/font-sfnt',
|
|
39
38
|
};
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
39
|
+
function buildEnvironmentJs(exclude, focus, groupByFolder, watchMode, localMode, depGraphClientResponse) {
|
|
40
|
+
let environmentJs = `window.exclude = ${JSON.stringify(exclude)};
|
|
41
|
+
window.groupByFolder = ${!!groupByFolder};
|
|
42
|
+
window.watch = ${!!watchMode};
|
|
43
|
+
window.environment = 'release';
|
|
44
|
+
window.localMode = '${localMode}';
|
|
45
|
+
|
|
46
|
+
window.appConfig = {
|
|
47
|
+
showDebugger: false,
|
|
48
|
+
projectGraphs: [
|
|
49
|
+
{
|
|
50
|
+
id: 'local',
|
|
51
|
+
label: 'local',
|
|
52
|
+
url: 'projectGraph.json',
|
|
53
|
+
}
|
|
54
|
+
],
|
|
55
|
+
defaultProjectGraph: 'local',
|
|
56
|
+
};
|
|
57
|
+
`;
|
|
58
|
+
if (localMode === 'build') {
|
|
59
|
+
environmentJs += `window.projectGraphResponse = ${JSON.stringify(depGraphClientResponse)};`;
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
environmentJs += `window.projectGraphResponse = null;`;
|
|
63
|
+
}
|
|
64
|
+
if (!!focus) {
|
|
65
|
+
environmentJs += `window.focusedProject = '${focus}';`;
|
|
66
|
+
}
|
|
67
|
+
return environmentJs;
|
|
64
68
|
}
|
|
65
69
|
function projectExists(projects, projectToFind) {
|
|
66
70
|
return (projects.find((project) => project.name === projectToFind) !== undefined);
|
|
@@ -106,9 +110,9 @@ function filterGraph(graph, focus, exclude) {
|
|
|
106
110
|
return filteredGraph;
|
|
107
111
|
}
|
|
108
112
|
function generateGraph(args, affectedProjects) {
|
|
109
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
110
|
-
let graph = project_graph_1.pruneExternalNodes(yield project_graph_1.createProjectGraphAsync());
|
|
111
|
-
const layout = file_utils_1.workspaceLayout();
|
|
113
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
114
|
+
let graph = (0, project_graph_1.pruneExternalNodes)(yield (0, project_graph_1.createProjectGraphAsync)());
|
|
115
|
+
const layout = (0, file_utils_1.workspaceLayout)();
|
|
112
116
|
const projects = Object.values(graph.nodes);
|
|
113
117
|
projects.sort((a, b) => {
|
|
114
118
|
return a.name.localeCompare(b.name);
|
|
@@ -137,24 +141,19 @@ function generateGraph(args, affectedProjects) {
|
|
|
137
141
|
process.exit(1);
|
|
138
142
|
}
|
|
139
143
|
}
|
|
140
|
-
let html;
|
|
141
|
-
|
|
142
|
-
html = yield projectsToHtml(projects, graph, affectedProjects, args.focus || null, args.groupByFolder || false, args.exclude || [], layout, !!args.file && args.file.endsWith('html') ? 'build' : 'serve', args.watch);
|
|
143
|
-
}
|
|
144
|
-
else {
|
|
145
|
-
graph = filterGraph(graph, args.focus || null, args.exclude || []);
|
|
146
|
-
}
|
|
144
|
+
let html = (0, fs_1.readFileSync)((0, path_2.join)(__dirname, '../core/dep-graph/index.html'), 'utf-8');
|
|
145
|
+
graph = filterGraph(graph, args.focus || null, args.exclude || []);
|
|
147
146
|
if (args.file) {
|
|
148
147
|
const workspaceFolder = app_root_1.appRootPath;
|
|
149
|
-
const ext = path_2.extname(args.file);
|
|
150
|
-
const fullFilePath = path_2.isAbsolute(args.file)
|
|
148
|
+
const ext = (0, path_2.extname)(args.file);
|
|
149
|
+
const fullFilePath = (0, path_2.isAbsolute)(args.file)
|
|
151
150
|
? args.file
|
|
152
|
-
: path_2.join(workspaceFolder, args.file);
|
|
153
|
-
const fileFolderPath = path_2.dirname(fullFilePath);
|
|
151
|
+
: (0, path_2.join)(workspaceFolder, args.file);
|
|
152
|
+
const fileFolderPath = (0, path_2.dirname)(fullFilePath);
|
|
154
153
|
if (ext === '.html') {
|
|
155
|
-
const assetsFolder = path_2.join(fileFolderPath, 'static');
|
|
154
|
+
const assetsFolder = (0, path_2.join)(fileFolderPath, 'static');
|
|
156
155
|
const assets = [];
|
|
157
|
-
fs_extra_1.copySync(path_2.join(__dirname, '../core/dep-graph'), assetsFolder, {
|
|
156
|
+
(0, fs_extra_1.copySync)((0, path_2.join)(__dirname, '../core/dep-graph'), assetsFolder, {
|
|
158
157
|
filter: (_src, dest) => {
|
|
159
158
|
const isntHtml = !/index\.html/.test(dest);
|
|
160
159
|
if (isntHtml && dest.includes('.')) {
|
|
@@ -163,20 +162,22 @@ function generateGraph(args, affectedProjects) {
|
|
|
163
162
|
return isntHtml;
|
|
164
163
|
},
|
|
165
164
|
});
|
|
166
|
-
|
|
165
|
+
const depGraphClientResponse = yield createDepGraphClientResponse();
|
|
166
|
+
const environmentJs = buildEnvironmentJs(args.exclude || [], args.focus || null, args.groupByFolder || false, args.watch, !!args.file && args.file.endsWith('html') ? 'build' : 'serve', depGraphClientResponse);
|
|
167
167
|
html = html.replace(/src="/g, 'src="static/');
|
|
168
168
|
html = html.replace(/href="styles/g, 'href="static/styles');
|
|
169
|
-
html = html.replace('<base href="/"
|
|
169
|
+
html = html.replace('<base href="/" />', '');
|
|
170
170
|
html = html.replace(/type="module"/g, '');
|
|
171
|
-
fs_1.writeFileSync(fullFilePath, html);
|
|
171
|
+
(0, fs_1.writeFileSync)(fullFilePath, html);
|
|
172
|
+
(0, fs_1.writeFileSync)((0, path_2.join)(assetsFolder, 'environment.js'), environmentJs);
|
|
172
173
|
output_1.output.success({
|
|
173
174
|
title: `HTML output created in ${fileFolderPath}`,
|
|
174
175
|
bodyLines: [fileFolderPath, ...assets],
|
|
175
176
|
});
|
|
176
177
|
}
|
|
177
178
|
else if (ext === '.json') {
|
|
178
|
-
fs_extra_1.ensureDirSync(path_2.dirname(fullFilePath));
|
|
179
|
-
fileutils_1.writeJsonFile(fullFilePath, {
|
|
179
|
+
(0, fs_extra_1.ensureDirSync)((0, path_2.dirname)(fullFilePath));
|
|
180
|
+
(0, fileutils_1.writeJsonFile)(fullFilePath, {
|
|
180
181
|
graph,
|
|
181
182
|
affectedProjects,
|
|
182
183
|
criticalPath: affectedProjects,
|
|
@@ -195,13 +196,14 @@ function generateGraph(args, affectedProjects) {
|
|
|
195
196
|
}
|
|
196
197
|
}
|
|
197
198
|
else {
|
|
198
|
-
|
|
199
|
+
const environmentJs = buildEnvironmentJs(args.exclude || [], args.focus || null, args.groupByFolder || false, args.watch, !!args.file && args.file.endsWith('html') ? 'build' : 'serve');
|
|
200
|
+
yield startServer(html, environmentJs, args.host || '127.0.0.1', args.port || 4211, args.watch, affectedProjects, args.focus, args.groupByFolder, args.exclude, args.open);
|
|
199
201
|
}
|
|
200
202
|
});
|
|
201
203
|
}
|
|
202
204
|
exports.generateGraph = generateGraph;
|
|
203
|
-
function startServer(html, host, port = 4211, watchForchanges = false, affected = [], focus = null, groupByFolder = false, exclude = [], openBrowser = true) {
|
|
204
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
205
|
+
function startServer(html, environmentJs, host, port = 4211, watchForchanges = false, affected = [], focus = null, groupByFolder = false, exclude = [], openBrowser = true) {
|
|
206
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
205
207
|
if (watchForchanges) {
|
|
206
208
|
startWatcher();
|
|
207
209
|
}
|
|
@@ -217,7 +219,7 @@ function startServer(html, host, port = 4211, watchForchanges = false, affected
|
|
|
217
219
|
// Avoid https://en.wikipedia.org/wiki/Directory_traversal_attack
|
|
218
220
|
// e.g curl --path-as-is http://localhost:9000/../fileInDanger.txt
|
|
219
221
|
// by limiting the path to current directory only
|
|
220
|
-
const sanitizePath = path_2.basename(parsedUrl.pathname);
|
|
222
|
+
const sanitizePath = (0, path_2.basename)(parsedUrl.pathname);
|
|
221
223
|
if (sanitizePath === 'projectGraph.json') {
|
|
222
224
|
res.writeHead(200, { 'Content-Type': 'application/json' });
|
|
223
225
|
res.end(JSON.stringify(currentDepGraphClientResponse));
|
|
@@ -228,23 +230,27 @@ function startServer(html, host, port = 4211, watchForchanges = false, affected
|
|
|
228
230
|
res.end(JSON.stringify({ hash: currentDepGraphClientResponse.hash }));
|
|
229
231
|
return;
|
|
230
232
|
}
|
|
231
|
-
|
|
232
|
-
|
|
233
|
+
if (sanitizePath === 'environment.js') {
|
|
234
|
+
res.writeHead(200, { 'Content-Type': 'application/javascript' });
|
|
235
|
+
res.end(environmentJs);
|
|
236
|
+
return;
|
|
237
|
+
}
|
|
238
|
+
let pathname = (0, path_2.join)(__dirname, '../core/dep-graph/', sanitizePath);
|
|
239
|
+
if (!(0, fs_1.existsSync)(pathname)) {
|
|
233
240
|
// if the file is not found, return 404
|
|
234
241
|
res.statusCode = 404;
|
|
235
242
|
res.end(`File ${pathname} not found!`);
|
|
236
243
|
return;
|
|
237
244
|
}
|
|
238
245
|
// if is a directory, then look for index.html
|
|
239
|
-
if (fs_1.statSync(pathname).isDirectory()) {
|
|
240
|
-
// pathname += '/index.html';
|
|
246
|
+
if ((0, fs_1.statSync)(pathname).isDirectory()) {
|
|
241
247
|
res.writeHead(200, { 'Content-Type': 'text/html' });
|
|
242
248
|
res.end(html);
|
|
243
249
|
return;
|
|
244
250
|
}
|
|
245
251
|
try {
|
|
246
|
-
const data = fs_1.readFileSync(pathname);
|
|
247
|
-
const ext = path_2.parse(pathname).ext;
|
|
252
|
+
const data = (0, fs_1.readFileSync)(pathname);
|
|
253
|
+
const ext = (0, path_2.parse)(pathname).ext;
|
|
248
254
|
res.setHeader('Content-type', mimeType[ext] || 'text/plain');
|
|
249
255
|
res.end(data);
|
|
250
256
|
}
|
|
@@ -270,28 +276,25 @@ let currentDepGraphClientResponse = {
|
|
|
270
276
|
appsDir: '',
|
|
271
277
|
libsDir: '',
|
|
272
278
|
},
|
|
273
|
-
changes: {
|
|
274
|
-
added: [],
|
|
275
|
-
},
|
|
276
279
|
affected: [],
|
|
277
280
|
focus: null,
|
|
278
281
|
groupByFolder: false,
|
|
279
282
|
exclude: [],
|
|
280
283
|
};
|
|
281
284
|
function getIgnoredGlobs(root) {
|
|
282
|
-
const ig = ignore_1.default();
|
|
285
|
+
const ig = (0, ignore_1.default)();
|
|
283
286
|
try {
|
|
284
|
-
ig.add(fs_1.readFileSync(`${root}/.gitignore`, 'utf-8'));
|
|
287
|
+
ig.add((0, fs_1.readFileSync)(`${root}/.gitignore`, 'utf-8'));
|
|
285
288
|
}
|
|
286
289
|
catch (_a) { }
|
|
287
290
|
try {
|
|
288
|
-
ig.add(fs_1.readFileSync(`${root}/.nxignore`, 'utf-8'));
|
|
291
|
+
ig.add((0, fs_1.readFileSync)(`${root}/.nxignore`, 'utf-8'));
|
|
289
292
|
}
|
|
290
293
|
catch (_b) { }
|
|
291
294
|
return ig;
|
|
292
295
|
}
|
|
293
296
|
function startWatcher() {
|
|
294
|
-
createFileWatcher(app_root_1.appRootPath, () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
297
|
+
createFileWatcher(app_root_1.appRootPath, () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
295
298
|
output_1.output.note({ title: 'Recalculating dependency graph...' });
|
|
296
299
|
const newGraphClientResponse = yield createDepGraphClientResponse();
|
|
297
300
|
if (newGraphClientResponse.hash !== currentDepGraphClientResponse.hash) {
|
|
@@ -314,15 +317,15 @@ function debounce(fn, time) {
|
|
|
314
317
|
}
|
|
315
318
|
function createFileWatcher(root, changeHandler) {
|
|
316
319
|
const ignoredGlobs = getIgnoredGlobs(root);
|
|
317
|
-
const layout = file_utils_1.workspaceLayout();
|
|
318
|
-
const watcher = chokidar_1.watch([
|
|
319
|
-
path_1.joinPathFragments(layout.appsDir, '**'),
|
|
320
|
-
path_1.joinPathFragments(layout.libsDir, '**'),
|
|
320
|
+
const layout = (0, file_utils_1.workspaceLayout)();
|
|
321
|
+
const watcher = (0, chokidar_1.watch)([
|
|
322
|
+
(0, path_1.joinPathFragments)(layout.appsDir, '**'),
|
|
323
|
+
(0, path_1.joinPathFragments)(layout.libsDir, '**'),
|
|
321
324
|
], {
|
|
322
325
|
cwd: root,
|
|
323
326
|
ignoreInitial: true,
|
|
324
327
|
});
|
|
325
|
-
watcher.on('all', debounce((event, path) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
328
|
+
watcher.on('all', debounce((event, path) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
326
329
|
if (ignoredGlobs.ignores(path))
|
|
327
330
|
return;
|
|
328
331
|
yield changeHandler();
|
|
@@ -330,14 +333,14 @@ function createFileWatcher(root, changeHandler) {
|
|
|
330
333
|
return { close: () => watcher.close() };
|
|
331
334
|
}
|
|
332
335
|
function createDepGraphClientResponse() {
|
|
333
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
336
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
334
337
|
perf_hooks_1.performance.mark('dep graph watch calculation:start');
|
|
335
338
|
file_hasher_1.defaultFileHasher.clear();
|
|
336
339
|
file_hasher_1.defaultFileHasher.init();
|
|
337
|
-
let graph = project_graph_1.pruneExternalNodes(yield project_graph_1.createProjectGraphAsync());
|
|
340
|
+
let graph = (0, project_graph_1.pruneExternalNodes)(yield (0, project_graph_1.createProjectGraphAsync)());
|
|
338
341
|
perf_hooks_1.performance.mark('dep graph watch calculation:end');
|
|
339
342
|
perf_hooks_1.performance.mark('dep graph response generation:start');
|
|
340
|
-
const layout = file_utils_1.workspaceLayout();
|
|
343
|
+
const layout = (0, file_utils_1.workspaceLayout)();
|
|
341
344
|
const projects = Object.values(graph.nodes).map((project) => ({
|
|
342
345
|
name: project.name,
|
|
343
346
|
type: project.type,
|
|
@@ -348,28 +351,16 @@ function createDepGraphClientResponse() {
|
|
|
348
351
|
},
|
|
349
352
|
}));
|
|
350
353
|
const dependencies = graph.dependencies;
|
|
351
|
-
const hasher = crypto_1.createHash('sha256');
|
|
354
|
+
const hasher = (0, crypto_1.createHash)('sha256');
|
|
352
355
|
hasher.update(JSON.stringify({ layout, projects, dependencies }));
|
|
353
356
|
const hash = hasher.digest('hex');
|
|
354
|
-
let added = [];
|
|
355
|
-
if (currentDepGraphClientResponse.hash !== null &&
|
|
356
|
-
hash !== currentDepGraphClientResponse.hash) {
|
|
357
|
-
added = projects
|
|
358
|
-
.filter((project) => {
|
|
359
|
-
const result = currentDepGraphClientResponse.projects.find((previousProject) => previousProject.name === project.name);
|
|
360
|
-
return !result;
|
|
361
|
-
})
|
|
362
|
-
.map((project) => project.name);
|
|
363
|
-
}
|
|
364
357
|
perf_hooks_1.performance.mark('dep graph response generation:end');
|
|
365
358
|
perf_hooks_1.performance.measure('dep graph watch calculation', 'dep graph watch calculation:start', 'dep graph watch calculation:end');
|
|
366
359
|
perf_hooks_1.performance.measure('dep graph response generation', 'dep graph response generation:start', 'dep graph response generation:end');
|
|
367
360
|
return Object.assign(Object.assign({}, currentDepGraphClientResponse), { hash,
|
|
368
361
|
layout,
|
|
369
362
|
projects,
|
|
370
|
-
dependencies
|
|
371
|
-
added: [...currentDepGraphClientResponse.changes.added, ...added],
|
|
372
|
-
} });
|
|
363
|
+
dependencies });
|
|
373
364
|
});
|
|
374
365
|
}
|
|
375
366
|
//# sourceMappingURL=dep-graph.js.map
|