@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
|
@@ -12,7 +12,7 @@ function getCommandAsString(task) {
|
|
|
12
12
|
exports.getCommandAsString = getCommandAsString;
|
|
13
13
|
function getCommand(task) {
|
|
14
14
|
const args = Object.entries(task.overrides || {}).map(([prop, value]) => `--${prop}=${value}`);
|
|
15
|
-
const execCommand = devkit_1.getPackageManagerCommand().exec;
|
|
15
|
+
const execCommand = (0, devkit_1.getPackageManagerCommand)().exec;
|
|
16
16
|
if (commonCommands.includes(task.target.target)) {
|
|
17
17
|
const config = task.target.configuration
|
|
18
18
|
? [`--configuration`, task.target.configuration]
|
|
@@ -112,7 +112,7 @@ function unparseOption(key, value, unparsed) {
|
|
|
112
112
|
value.forEach((item) => unparseOption(key, item, unparsed));
|
|
113
113
|
}
|
|
114
114
|
else if (Object.prototype.toString.call(value) === '[object Object]') {
|
|
115
|
-
const flattened = flat_1.flatten(value, { safe: true });
|
|
115
|
+
const flattened = (0, flat_1.flatten)(value, { safe: true });
|
|
116
116
|
for (const flattenedKey in flattened) {
|
|
117
117
|
unparseOption(`${key}.${flattenedKey}`, flattened[flattenedKey], unparsed);
|
|
118
118
|
}
|
|
@@ -145,7 +145,7 @@ function interpolateOutputs(template, data) {
|
|
|
145
145
|
function getExecutorNameForTask(task, workspace) {
|
|
146
146
|
const project = workspace.readWorkspaceConfiguration().projects[task.target.project];
|
|
147
147
|
if (!project.targets) {
|
|
148
|
-
project.targets = build_nodes_1.convertNpmScriptsToTargets(project.root);
|
|
148
|
+
project.targets = (0, build_nodes_1.convertNpmScriptsToTargets)(project.root);
|
|
149
149
|
}
|
|
150
150
|
if (!project.targets[task.target.target]) {
|
|
151
151
|
throw new Error(`Cannot find configuration for task ${task.target.project}:${task.target.target}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/utils.ts"],"names":[],"mappings":";;;AAAA,yCAOsB;AACtB,+BAA+B;AAC/B,gDAA6C;AAE7C,oFAAgG;AAEhG,MAAM,cAAc,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;AAElE,SAAgB,kBAAkB,CAAC,IAAU;IAC3C,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;AAC3C,CAAC;AAFD,gDAEC;AAED,SAAgB,UAAU,CAAC,IAAU;IACnC,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,GAAG,CACnD,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,KAAK,IAAI,IAAI,KAAK,EAAE,CACxC,CAAC;IAEF,MAAM,WAAW,GAAG,iCAAwB,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tasks-runner/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,16 +18,16 @@ class Rule extends Lint.Rules.AbstractRule {
|
|
|
18
18
|
this.projectGraph = projectGraph;
|
|
19
19
|
this.targetProjectLocator = targetProjectLocator;
|
|
20
20
|
if (!projectPath) {
|
|
21
|
-
this.projectPath = path_1.normalize(app_root_1.appRootPath);
|
|
21
|
+
this.projectPath = (0, path_1.normalize)(app_root_1.appRootPath);
|
|
22
22
|
if (!global.projectGraph) {
|
|
23
|
-
const nxJson = file_utils_1.readNxJson();
|
|
23
|
+
const nxJson = (0, file_utils_1.readNxJson)();
|
|
24
24
|
global.npmScope = nxJson.npmScope;
|
|
25
25
|
/**
|
|
26
26
|
* Because there are a number of ways in which the rule can be invoked (executor vs TSLint CLI vs IDE Plugin),
|
|
27
27
|
* the ProjectGraph may or may not exist by the time the lint rule is invoked for the first time.
|
|
28
28
|
*/
|
|
29
29
|
try {
|
|
30
|
-
global.projectGraph = runtime_lint_utils_1.mapProjectGraphFiles(project_graph_1.readCachedProjectGraph());
|
|
30
|
+
global.projectGraph = (0, runtime_lint_utils_1.mapProjectGraphFiles)((0, project_graph_1.readCachedProjectGraph)());
|
|
31
31
|
}
|
|
32
32
|
catch (_a) { }
|
|
33
33
|
}
|
|
@@ -71,19 +71,19 @@ class EnforceModuleBoundariesWalker extends Lint.RuleWalker {
|
|
|
71
71
|
.getText()
|
|
72
72
|
.substring(1, node.moduleSpecifier.getText().length - 1);
|
|
73
73
|
// whitelisted import
|
|
74
|
-
if (this.allow.some((a) => runtime_lint_utils_1.matchImportWithWildcard(a, imp))) {
|
|
74
|
+
if (this.allow.some((a) => (0, runtime_lint_utils_1.matchImportWithWildcard)(a, imp))) {
|
|
75
75
|
super.visitImportDeclaration(node);
|
|
76
76
|
return;
|
|
77
77
|
}
|
|
78
|
-
const filePath = runtime_lint_utils_1.getSourceFilePath(this.getSourceFile().fileName, this.projectPath);
|
|
79
|
-
const sourceProject = runtime_lint_utils_1.findSourceProject(this.projectGraph, filePath);
|
|
78
|
+
const filePath = (0, runtime_lint_utils_1.getSourceFilePath)(this.getSourceFile().fileName, this.projectPath);
|
|
79
|
+
const sourceProject = (0, runtime_lint_utils_1.findSourceProject)(this.projectGraph, filePath);
|
|
80
80
|
// check for relative and absolute imports
|
|
81
|
-
if (runtime_lint_utils_1.isRelativeImportIntoAnotherProject(imp, this.projectPath, this.projectGraph, filePath, sourceProject) ||
|
|
82
|
-
runtime_lint_utils_1.isAbsoluteImportIntoAnotherProject(imp)) {
|
|
81
|
+
if ((0, runtime_lint_utils_1.isRelativeImportIntoAnotherProject)(imp, this.projectPath, this.projectGraph, filePath, sourceProject) ||
|
|
82
|
+
(0, runtime_lint_utils_1.isAbsoluteImportIntoAnotherProject)(imp)) {
|
|
83
83
|
this.addFailureAt(node.getStart(), node.getWidth(), `libraries cannot be imported by a relative or absolute path, and must begin with a npm scope`);
|
|
84
84
|
return;
|
|
85
85
|
}
|
|
86
|
-
const targetProject = runtime_lint_utils_1.findProjectUsingImport(this.projectGraph, this.targetProjectLocator, filePath, imp, this.npmScope);
|
|
86
|
+
const targetProject = (0, runtime_lint_utils_1.findProjectUsingImport)(this.projectGraph, this.targetProjectLocator, filePath, imp, this.npmScope);
|
|
87
87
|
// If source or target are not part of an nx workspace, return.
|
|
88
88
|
if (!sourceProject || !targetProject || targetProject.type === 'npm') {
|
|
89
89
|
super.visitImportDeclaration(node);
|
|
@@ -91,7 +91,7 @@ class EnforceModuleBoundariesWalker extends Lint.RuleWalker {
|
|
|
91
91
|
}
|
|
92
92
|
// same project => allow
|
|
93
93
|
if (sourceProject === targetProject) {
|
|
94
|
-
if (!this.allowCircularSelfDependency && !fileutils_1.isRelativePath(imp)) {
|
|
94
|
+
if (!this.allowCircularSelfDependency && !(0, fileutils_1.isRelativePath)(imp)) {
|
|
95
95
|
const error = `Projects should use relative imports to import from other files within the same project. Use "./path/to/file" instead of import from "${imp}"`;
|
|
96
96
|
this.addFailureAt(node.getStart(), node.getWidth(), error);
|
|
97
97
|
}
|
|
@@ -101,10 +101,10 @@ class EnforceModuleBoundariesWalker extends Lint.RuleWalker {
|
|
|
101
101
|
return;
|
|
102
102
|
}
|
|
103
103
|
// check for circular dependency
|
|
104
|
-
const circularPath = graph_utils_1.checkCircularPath(this.projectGraph, sourceProject, targetProject);
|
|
104
|
+
const circularPath = (0, graph_utils_1.checkCircularPath)(this.projectGraph, sourceProject, targetProject);
|
|
105
105
|
if (circularPath.length !== 0) {
|
|
106
106
|
const path = circularPath.reduce((acc, v) => `${acc} -> ${v.name}`, sourceProject.name);
|
|
107
|
-
const circularFilePath = graph_utils_1.findFilesInCircularPath(circularPath);
|
|
107
|
+
const circularFilePath = (0, graph_utils_1.findFilesInCircularPath)(circularPath);
|
|
108
108
|
const filePaths = circularFilePath
|
|
109
109
|
.map((files) => (files.length > 1 ? `[${files.join(',')}]` : files[0]))
|
|
110
110
|
.reduce((acc, files) => `${acc}\n- ${files}`, `- ${filePath}`);
|
|
@@ -126,26 +126,26 @@ class EnforceModuleBoundariesWalker extends Lint.RuleWalker {
|
|
|
126
126
|
if (this.enforceBuildableLibDependency === true &&
|
|
127
127
|
sourceProject.type === project_graph_1.ProjectType.lib &&
|
|
128
128
|
targetProject.type === project_graph_1.ProjectType.lib) {
|
|
129
|
-
if (runtime_lint_utils_1.hasBuildExecutor(sourceProject) && !runtime_lint_utils_1.hasBuildExecutor(targetProject)) {
|
|
129
|
+
if ((0, runtime_lint_utils_1.hasBuildExecutor)(sourceProject) && !(0, runtime_lint_utils_1.hasBuildExecutor)(targetProject)) {
|
|
130
130
|
this.addFailureAt(node.getStart(), node.getWidth(), 'buildable libraries cannot import non-buildable libraries');
|
|
131
131
|
return;
|
|
132
132
|
}
|
|
133
133
|
}
|
|
134
134
|
// if we import a library using loadChildren, we should not import it using es6imports
|
|
135
|
-
if (runtime_lint_utils_1.onlyLoadChildren(this.projectGraph, sourceProject.name, targetProject.name, [])) {
|
|
135
|
+
if ((0, runtime_lint_utils_1.onlyLoadChildren)(this.projectGraph, sourceProject.name, targetProject.name, [])) {
|
|
136
136
|
this.addFailureAt(node.getStart(), node.getWidth(), 'imports of lazy-loaded libraries are forbidden');
|
|
137
137
|
return;
|
|
138
138
|
}
|
|
139
139
|
// check that dependency constraints are satisfied
|
|
140
140
|
if (this.depConstraints.length > 0) {
|
|
141
|
-
const constraints = runtime_lint_utils_1.findConstraintsFor(this.depConstraints, sourceProject);
|
|
141
|
+
const constraints = (0, runtime_lint_utils_1.findConstraintsFor)(this.depConstraints, sourceProject);
|
|
142
142
|
// when no constrains found => error. Force the user to provision them.
|
|
143
143
|
if (constraints.length === 0) {
|
|
144
144
|
this.addFailureAt(node.getStart(), node.getWidth(), `A project without tags matching at least one constraint cannot depend on any libraries`);
|
|
145
145
|
return;
|
|
146
146
|
}
|
|
147
147
|
for (let constraint of constraints) {
|
|
148
|
-
if (runtime_lint_utils_1.hasNoneOfTheseTags(targetProject, constraint.onlyDependOnLibsWithTags || [])) {
|
|
148
|
+
if ((0, runtime_lint_utils_1.hasNoneOfTheseTags)(targetProject, constraint.onlyDependOnLibsWithTags || [])) {
|
|
149
149
|
const allowedTags = constraint.onlyDependOnLibsWithTags
|
|
150
150
|
.map((s) => `"${s}"`)
|
|
151
151
|
.join(', ');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nxEnforceModuleBoundariesRule.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tslint/nxEnforceModuleBoundariesRule.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAI/B,yDAI+B;AAC/B,2DAA2D;AAC3D,oEAcqC;AACrC,+BAAiC;AACjC,mDAAgD;AAChD,2EAAsE;AACtE,sDAG8B;AAC9B,sDAAwD;AAExD,MAAa,IAAK,SAAQ,IAAI,CAAC,KAAK,CAAC,YAAY;IAC/C,YACE,OAAiB,EACA,WAAoB,EACpB,QAAiB,EACjB,YAAiC,EACjC,oBAA2C;QAE5D,KAAK,CAAC,OAAO,CAAC,CAAC;QALE,gBAAW,GAAX,WAAW,CAAS;QACpB,aAAQ,GAAR,QAAQ,CAAS;QACjB,iBAAY,GAAZ,YAAY,CAAqB;QACjC,yBAAoB,GAApB,oBAAoB,CAAuB;QAI5D,IAAI,CAAC,WAAW,EAAE;YAChB,IAAI,CAAC,WAAW,GAAG,gBAAS,
|
|
1
|
+
{"version":3,"file":"nxEnforceModuleBoundariesRule.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/tslint/nxEnforceModuleBoundariesRule.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAI/B,yDAI+B;AAC/B,2DAA2D;AAC3D,oEAcqC;AACrC,+BAAiC;AACjC,mDAAgD;AAChD,2EAAsE;AACtE,sDAG8B;AAC9B,sDAAwD;AAExD,MAAa,IAAK,SAAQ,IAAI,CAAC,KAAK,CAAC,YAAY;IAC/C,YACE,OAAiB,EACA,WAAoB,EACpB,QAAiB,EACjB,YAAiC,EACjC,oBAA2C;QAE5D,KAAK,CAAC,OAAO,CAAC,CAAC;QALE,gBAAW,GAAX,WAAW,CAAS;QACpB,aAAQ,GAAR,QAAQ,CAAS;QACjB,iBAAY,GAAZ,YAAY,CAAqB;QACjC,yBAAoB,GAApB,oBAAoB,CAAuB;QAI5D,IAAI,CAAC,WAAW,EAAE;YAChB,IAAI,CAAC,WAAW,GAAG,IAAA,gBAAS,EAAC,sBAAW,CAAC,CAAC;YAC1C,IAAI,CAAE,MAAc,CAAC,YAAY,EAAE;gBACjC,MAAM,MAAM,GAAG,IAAA,uBAAU,GAAE,CAAC;gBAC3B,MAAc,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;gBAE3C;;;mBAGG;gBACH,IAAI;oBACD,MAAc,CAAC,YAAY,GAAG,IAAA,yCAAoB,EACjD,IAAA,sCAAsB,GAAE,CACzB,CAAC;iBACH;gBAAC,WAAM,GAAE;aACX;YACD,IAAI,CAAC,QAAQ,GAAI,MAAc,CAAC,QAAQ,CAAC;YACzC,IAAI,CAAC,YAAY,GAAI,MAAc,CAAC,YAAkC,CAAC;YAEvE,IAAI,CAAE,MAAc,CAAC,oBAAoB,IAAI,IAAI,CAAC,YAAY,EAAE;gBAC7D,MAAc,CAAC,oBAAoB,GAAG,IAAI,6CAAoB,CAC7D,IAAI,CAAC,YAAY,CAAC,KAAK,EACvB,IAAI,CAAC,YAAY,CAAC,aAAa,CAChC,CAAC;aACH;YACD,IAAI,CAAC,oBAAoB,GAAI,MAAc,CAAC,oBAAoB,CAAC;SAClE;IACH,CAAC;IAEM,KAAK,CAAC,UAAyB;QACpC,IAAI,CAAC,IAAI,CAAC,YAAY;YAAE,OAAO,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC,eAAe,CACzB,IAAI,6BAA6B,CAC/B,UAAU,EACV,IAAI,CAAC,UAAU,EAAE,EACjB,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,oBAAoB,CAC1B,CACF,CAAC;IACJ,CAAC;CACF;AApDD,oBAoDC;AAED,MAAM,6BAA8B,SAAQ,IAAI,CAAC,UAAU;IAMzD,YACE,UAAyB,EACzB,OAAiB,EACA,WAAmB,EACnB,QAAgB,EAChB,YAAgC,EAChC,oBAA0C;QAE3D,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QALV,gBAAW,GAAX,WAAW,CAAQ;QACnB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,iBAAY,GAAZ,YAAY,CAAoB;QAChC,yBAAoB,GAApB,oBAAoB,CAAsB;QAV5C,kCAA6B,GAAY,KAAK,CAAC,CAAC,uBAAuB;QAEvE,gCAA2B,GAAY,KAAK,CAAC;QAY5D,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;YACpD,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/C,CAAC,CAAC,EAAE,CAAC;QAEP,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC;YACtE,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,cAAc;YACrC,CAAC,CAAC,EAAE,CAAC;QAEP,IAAI,CAAC,6BAA6B;YAChC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,6BAA6B,KAAK,IAAI,CAAC;QAE9D,IAAI,CAAC,2BAA2B;YAC9B,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,2BAA2B,KAAK,IAAI,CAAC;IAC9D,CAAC;IAEM,sBAAsB,CAAC,IAA0B;QACtD,MAAM,GAAG,GAAG,IAAI,CAAC,eAAe;aAC7B,OAAO,EAAE;aACT,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAE3D,qBAAqB;QACrB,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,4CAAuB,EAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE;YAC3D,KAAK,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;YACnC,OAAO;SACR;QAED,MAAM,QAAQ,GAAG,IAAA,sCAAiB,EAChC,IAAI,CAAC,aAAa,EAAE,CAAC,QAAQ,EAC7B,IAAI,CAAC,WAAW,CACjB,CAAC;QACF,MAAM,aAAa,GAAG,IAAA,sCAAiB,EAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;QAErE,0CAA0C;QAC1C,IACE,IAAA,uDAAkC,EAChC,GAAG,EACH,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,YAAY,EACjB,QAAQ,EACR,aAAa,CACd;YACD,IAAA,uDAAkC,EAAC,GAAG,CAAC,EACvC;YACA,IAAI,CAAC,YAAY,CACf,IAAI,CAAC,QAAQ,EAAE,EACf,IAAI,CAAC,QAAQ,EAAE,EACf,8FAA8F,CAC/F,CAAC;YACF,OAAO;SACR;QAED,MAAM,aAAa,GAAG,IAAA,2CAAsB,EAC1C,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,oBAAoB,EACzB,QAAQ,EACR,GAAG,EACH,IAAI,CAAC,QAAQ,CACd,CAAC;QAEF,+DAA+D;QAC/D,IAAI,CAAC,aAAa,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,IAAI,KAAK,KAAK,EAAE;YACpE,KAAK,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;YACnC,OAAO;SACR;QAED,wBAAwB;QACxB,IAAI,aAAa,KAAK,aAAa,EAAE;YACnC,IAAI,CAAC,IAAI,CAAC,2BAA2B,IAAI,CAAC,IAAA,0BAAc,EAAC,GAAG,CAAC,EAAE;gBAC7D,MAAM,KAAK,GAAG,yIAAyI,GAAG,GAAG,CAAC;gBAC9J,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,CAAC;aAC5D;iBAAM;gBACL,KAAK,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;aACpC;YACD,OAAO;SACR;QAED,gCAAgC;QAChC,MAAM,YAAY,GAAG,IAAA,+BAAiB,EACpC,IAAI,CAAC,YAAY,EACjB,aAAa,EACb,aAAa,CACd,CAAC;QACF,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;YAC7B,MAAM,IAAI,GAAG,YAAY,CAAC,MAAM,CAC9B,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,OAAO,CAAC,CAAC,IAAI,EAAE,EACjC,aAAa,CAAC,IAAI,CACnB,CAAC;YAEF,MAAM,gBAAgB,GAAG,IAAA,qCAAuB,EAAC,YAAY,CAAC,CAAC;YAC/D,MAAM,SAAS,GAAG,gBAAgB;iBAC/B,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;iBACtE,MAAM,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,OAAO,KAAK,EAAE,EAAE,KAAK,QAAQ,EAAE,CAAC,CAAC;YAEjE,MAAM,KAAK,GAAG,gCAAgC,aAAa,CAAC,IAAI,UAAU,aAAa,CAAC,IAAI,eAAe,IAAI,6BAA6B,SAAS,EAAE,CAAC;YACxJ,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,CAAC;YAC3D,OAAO;SACR;QAED,qBAAqB;QACrB,IAAI,aAAa,CAAC,IAAI,KAAK,2BAAW,CAAC,GAAG,EAAE;YAC1C,IAAI,CAAC,YAAY,CACf,IAAI,CAAC,QAAQ,EAAE,EACf,IAAI,CAAC,QAAQ,EAAE,EACf,+BAA+B,CAChC,CAAC;YACF,OAAO;SACR;QAED,6BAA6B;QAC7B,IAAI,aAAa,CAAC,IAAI,KAAK,2BAAW,CAAC,GAAG,EAAE;YAC1C,IAAI,CAAC,YAAY,CACf,IAAI,CAAC,QAAQ,EAAE,EACf,IAAI,CAAC,QAAQ,EAAE,EACf,uCAAuC,CACxC,CAAC;YACF,OAAO;SACR;QAED,2DAA2D;QAC3D,IACE,IAAI,CAAC,6BAA6B,KAAK,IAAI;YAC3C,aAAa,CAAC,IAAI,KAAK,2BAAW,CAAC,GAAG;YACtC,aAAa,CAAC,IAAI,KAAK,2BAAW,CAAC,GAAG,EACtC;YACA,IAAI,IAAA,qCAAgB,EAAC,aAAa,CAAC,IAAI,CAAC,IAAA,qCAAgB,EAAC,aAAa,CAAC,EAAE;gBACvE,IAAI,CAAC,YAAY,CACf,IAAI,CAAC,QAAQ,EAAE,EACf,IAAI,CAAC,QAAQ,EAAE,EACf,2DAA2D,CAC5D,CAAC;gBACF,OAAO;aACR;SACF;QAED,sFAAsF;QACtF,IACE,IAAA,qCAAgB,EACd,IAAI,CAAC,YAAY,EACjB,aAAa,CAAC,IAAI,EAClB,aAAa,CAAC,IAAI,EAClB,EAAE,CACH,EACD;YACA,IAAI,CAAC,YAAY,CACf,IAAI,CAAC,QAAQ,EAAE,EACf,IAAI,CAAC,QAAQ,EAAE,EACf,gDAAgD,CACjD,CAAC;YACF,OAAO;SACR;QAED,kDAAkD;QAClD,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YAClC,MAAM,WAAW,GAAG,IAAA,uCAAkB,EACpC,IAAI,CAAC,cAAc,EACnB,aAAa,CACd,CAAC;YACF,uEAAuE;YACvE,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC5B,IAAI,CAAC,YAAY,CACf,IAAI,CAAC,QAAQ,EAAE,EACf,IAAI,CAAC,QAAQ,EAAE,EACf,wFAAwF,CACzF,CAAC;gBACF,OAAO;aACR;YAED,KAAK,IAAI,UAAU,IAAI,WAAW,EAAE;gBAClC,IACE,IAAA,uCAAkB,EAChB,aAAa,EACb,UAAU,CAAC,wBAAwB,IAAI,EAAE,CAC1C,EACD;oBACA,MAAM,WAAW,GAAG,UAAU,CAAC,wBAAwB;yBACpD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;yBACpB,IAAI,CAAC,IAAI,CAAC,CAAC;oBACd,MAAM,KAAK,GAAG,0BAA0B,UAAU,CAAC,SAAS,yCAAyC,WAAW,EAAE,CAAC;oBACnH,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,CAAC;oBAC3D,OAAO;iBACR;aACF;SACF;QAED,KAAK,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;CACF"}
|
|
@@ -12,8 +12,8 @@ function pathInner(dir) {
|
|
|
12
12
|
return process.env.NX_WORKSPACE_ROOT_PATH;
|
|
13
13
|
if (path.dirname(dir) === dir)
|
|
14
14
|
return process.cwd();
|
|
15
|
-
if (fileutils_1.fileExists(path.join(dir, 'workspace.json')) ||
|
|
16
|
-
fileutils_1.fileExists(path.join(dir, 'angular.json'))) {
|
|
15
|
+
if ((0, fileutils_1.fileExists)(path.join(dir, 'workspace.json')) ||
|
|
16
|
+
(0, fileutils_1.fileExists)(path.join(dir, 'angular.json'))) {
|
|
17
17
|
return dir;
|
|
18
18
|
}
|
|
19
19
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-root.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/app-root.ts"],"names":[],"mappings":";;;AAAA,2CAAyC;AACzC,6BAA6B;AAE7B;;GAEG;AACU,QAAA,WAAW,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;AAEhD,SAAS,SAAS,CAAC,GAAW;IAC5B,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB;QACpC,OAAO,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC;IAC5C,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG;QAAE,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC;IACpD,IACE,sBAAU,
|
|
1
|
+
{"version":3,"file":"app-root.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/app-root.ts"],"names":[],"mappings":";;;AAAA,2CAAyC;AACzC,6BAA6B;AAE7B;;GAEG;AACU,QAAA,WAAW,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC;AAEhD,SAAS,SAAS,CAAC,GAAW;IAC5B,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB;QACpC,OAAO,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC;IAC5C,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG;QAAE,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC;IACpD,IACE,IAAA,sBAAU,EAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC;QAC5C,IAAA,sBAAU,EAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC,EAC1C;QACA,OAAO,GAAG,CAAC;KACZ;SAAM;QACL,OAAO,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;KACrC;AACH,CAAC"}
|
package/src/utilities/assets.js
CHANGED
|
@@ -21,16 +21,16 @@ function assetGlobsToFiles(assets, rootDir, outDir) {
|
|
|
21
21
|
if (typeof asset === 'string') {
|
|
22
22
|
globbedFiles(asset, rootDir).forEach((globbedFile) => {
|
|
23
23
|
files.push({
|
|
24
|
-
input: path_1.join(rootDir, globbedFile),
|
|
25
|
-
output: path_1.join(outDir, path_1.basename(globbedFile)),
|
|
24
|
+
input: (0, path_1.join)(rootDir, globbedFile),
|
|
25
|
+
output: (0, path_1.join)(outDir, (0, path_1.basename)(globbedFile)),
|
|
26
26
|
});
|
|
27
27
|
});
|
|
28
28
|
}
|
|
29
29
|
else {
|
|
30
|
-
globbedFiles(asset.glob, path_1.join(rootDir, asset.input), asset.ignore, (_a = asset.dot) !== null && _a !== void 0 ? _a : false).forEach((globbedFile) => {
|
|
30
|
+
globbedFiles(asset.glob, (0, path_1.join)(rootDir, asset.input), asset.ignore, (_a = asset.dot) !== null && _a !== void 0 ? _a : false).forEach((globbedFile) => {
|
|
31
31
|
files.push({
|
|
32
|
-
input: path_1.join(rootDir, asset.input, globbedFile),
|
|
33
|
-
output: path_1.join(outDir, asset.output, globbedFile),
|
|
32
|
+
input: (0, path_1.join)(rootDir, asset.input, globbedFile),
|
|
33
|
+
output: (0, path_1.join)(outDir, asset.output, globbedFile),
|
|
34
34
|
});
|
|
35
35
|
});
|
|
36
36
|
}
|
|
@@ -44,10 +44,10 @@ function copyAssets(assets, rootDir, outDir) {
|
|
|
44
44
|
}
|
|
45
45
|
exports.copyAssets = copyAssets;
|
|
46
46
|
function copyAssetFiles(files) {
|
|
47
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
47
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
48
48
|
devkit_1.logger.info('Copying asset files...');
|
|
49
49
|
try {
|
|
50
|
-
yield Promise.all(files.map((file) => fs_extra_1.copy(file.input, file.output)));
|
|
50
|
+
yield Promise.all(files.map((file) => (0, fs_extra_1.copy)(file.input, file.output)));
|
|
51
51
|
devkit_1.logger.info('Done copying asset files.');
|
|
52
52
|
return { success: true };
|
|
53
53
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/assets.ts"],"names":[],"mappings":";;;;AAAA,yCAAsC;AACtC,uCAAgC;AAChC,6BAA6B;AAC7B,+BAAsC;AAYtC,SAAgB,iBAAiB,CAC/B,MAAiC,EACjC,OAAe,EACf,MAAc;IAEd,MAAM,KAAK,GAAsB,EAAE,CAAC;IAEpC,MAAM,YAAY,GAAG,CACnB,OAAe,EACf,KAAK,GAAG,EAAE,EACV,SAAmB,EAAE,EACrB,MAAe,KAAK,EACpB,EAAE;QACF,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACxB,GAAG,EAAE,KAAK;YACV,KAAK,EAAE,IAAI;YACX,GAAG;YACH,MAAM;SACP,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;;QACvB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;gBACnD,KAAK,CAAC,IAAI,CAAC;oBACT,KAAK,EAAE,WAAI,
|
|
1
|
+
{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/assets.ts"],"names":[],"mappings":";;;;AAAA,yCAAsC;AACtC,uCAAgC;AAChC,6BAA6B;AAC7B,+BAAsC;AAYtC,SAAgB,iBAAiB,CAC/B,MAAiC,EACjC,OAAe,EACf,MAAc;IAEd,MAAM,KAAK,GAAsB,EAAE,CAAC;IAEpC,MAAM,YAAY,GAAG,CACnB,OAAe,EACf,KAAK,GAAG,EAAE,EACV,SAAmB,EAAE,EACrB,MAAe,KAAK,EACpB,EAAE;QACF,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACxB,GAAG,EAAE,KAAK;YACV,KAAK,EAAE,IAAI;YACX,GAAG;YACH,MAAM;SACP,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;;QACvB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,YAAY,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;gBACnD,KAAK,CAAC,IAAI,CAAC;oBACT,KAAK,EAAE,IAAA,WAAI,EAAC,OAAO,EAAE,WAAW,CAAC;oBACjC,MAAM,EAAE,IAAA,WAAI,EAAC,MAAM,EAAE,IAAA,eAAQ,EAAC,WAAW,CAAC,CAAC;iBAC5C,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,YAAY,CACV,KAAK,CAAC,IAAI,EACV,IAAA,WAAI,EAAC,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,EAC1B,KAAK,CAAC,MAAM,EACZ,MAAA,KAAK,CAAC,GAAG,mCAAI,KAAK,CACnB,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;gBACxB,KAAK,CAAC,IAAI,CAAC;oBACT,KAAK,EAAE,IAAA,WAAI,EAAC,OAAO,EAAE,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC;oBAC9C,MAAM,EAAE,IAAA,WAAI,EAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,WAAW,CAAC;iBAChD,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;SACJ;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,KAAK,CAAC;AACf,CAAC;AA7CD,8CA6CC;AAED,SAAgB,UAAU,CACxB,MAAiC,EACjC,OAAe,EACf,MAAc;IAEd,MAAM,KAAK,GAAG,iBAAiB,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACzD,OAAO,cAAc,CAAC,KAAK,CAAC,CAAC;AAC/B,CAAC;AAPD,gCAOC;AAED,SAAsB,cAAc,CAClC,KAAwB;;QAExB,eAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACtC,IAAI;YACF,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,eAAI,EAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACtE,eAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;YACzC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SAC1B;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;SAC/C;IACH,CAAC;CAAA;AAXD,wCAWC"}
|
|
@@ -47,7 +47,7 @@ function removeChange(host, sourceFile, filePath, removePosition, contentToRemov
|
|
|
47
47
|
exports.removeChange = removeChange;
|
|
48
48
|
function insertImport(host, source, fileToEdit, symbolName, fileName, isDefault = false) {
|
|
49
49
|
const rootNode = source;
|
|
50
|
-
const allImports = find_nodes_1.findNodes(rootNode, ts.SyntaxKind.ImportDeclaration);
|
|
50
|
+
const allImports = (0, find_nodes_1.findNodes)(rootNode, ts.SyntaxKind.ImportDeclaration);
|
|
51
51
|
// get nodes that map to import statements from the file fileName
|
|
52
52
|
const relevantImports = allImports.filter((node) => {
|
|
53
53
|
// StringLiteral of the ImportDeclaration is the import file (fileName in this case).
|
|
@@ -62,8 +62,8 @@ function insertImport(host, source, fileToEdit, symbolName, fileName, isDefault
|
|
|
62
62
|
// imports from import file
|
|
63
63
|
const imports = [];
|
|
64
64
|
relevantImports.forEach((n) => {
|
|
65
|
-
Array.prototype.push.apply(imports, find_nodes_1.findNodes(n, ts.SyntaxKind.Identifier));
|
|
66
|
-
if (find_nodes_1.findNodes(n, ts.SyntaxKind.AsteriskToken).length > 0) {
|
|
65
|
+
Array.prototype.push.apply(imports, (0, find_nodes_1.findNodes)(n, ts.SyntaxKind.Identifier));
|
|
66
|
+
if ((0, find_nodes_1.findNodes)(n, ts.SyntaxKind.AsteriskToken).length > 0) {
|
|
67
67
|
importsAsterisk = true;
|
|
68
68
|
}
|
|
69
69
|
});
|
|
@@ -74,14 +74,14 @@ function insertImport(host, source, fileToEdit, symbolName, fileName, isDefault
|
|
|
74
74
|
const importTextNodes = imports.filter((n) => n.text === symbolName);
|
|
75
75
|
// insert import if it's not there
|
|
76
76
|
if (importTextNodes.length === 0) {
|
|
77
|
-
const fallbackPos = find_nodes_1.findNodes(relevantImports[0], ts.SyntaxKind.CloseBraceToken)[0].getStart() ||
|
|
78
|
-
find_nodes_1.findNodes(relevantImports[0], ts.SyntaxKind.FromKeyword)[0].getStart();
|
|
77
|
+
const fallbackPos = (0, find_nodes_1.findNodes)(relevantImports[0], ts.SyntaxKind.CloseBraceToken)[0].getStart() ||
|
|
78
|
+
(0, find_nodes_1.findNodes)(relevantImports[0], ts.SyntaxKind.FromKeyword)[0].getStart();
|
|
79
79
|
return insertAfterLastOccurrence(host, source, imports, `, ${symbolName}`, fileToEdit, fallbackPos);
|
|
80
80
|
}
|
|
81
81
|
return source;
|
|
82
82
|
}
|
|
83
83
|
// no such import declaration exists
|
|
84
|
-
const useStrict = find_nodes_1.findNodes(rootNode, ts.SyntaxKind.StringLiteral).filter((n) => n.text === 'use strict');
|
|
84
|
+
const useStrict = (0, find_nodes_1.findNodes)(rootNode, ts.SyntaxKind.StringLiteral).filter((n) => n.text === 'use strict');
|
|
85
85
|
let fallbackPos = 0;
|
|
86
86
|
if (useStrict.length > 0) {
|
|
87
87
|
fallbackPos = useStrict[0].end;
|
|
@@ -103,7 +103,7 @@ function insertAfterLastOccurrence(host, sourceFile, nodes, toInsert, pathToFile
|
|
|
103
103
|
throw new Error();
|
|
104
104
|
}
|
|
105
105
|
if (syntaxKind) {
|
|
106
|
-
lastItem = find_nodes_1.findNodes(lastItem, syntaxKind).sort(nodesByPosition).pop();
|
|
106
|
+
lastItem = (0, find_nodes_1.findNodes)(lastItem, syntaxKind).sort(nodesByPosition).pop();
|
|
107
107
|
}
|
|
108
108
|
if (!lastItem && fallbackPos == undefined) {
|
|
109
109
|
throw new Error(`tried to insert ${toInsert} as first occurrence with no fallback position`);
|
|
@@ -112,7 +112,7 @@ function insertAfterLastOccurrence(host, sourceFile, nodes, toInsert, pathToFile
|
|
|
112
112
|
return insertChange(host, sourceFile, pathToFile, lastItemPosition, toInsert);
|
|
113
113
|
}
|
|
114
114
|
function addGlobal(host, source, modulePath, statement) {
|
|
115
|
-
const allImports = find_nodes_1.findNodes(source, ts.SyntaxKind.ImportDeclaration);
|
|
115
|
+
const allImports = (0, find_nodes_1.findNodes)(source, ts.SyntaxKind.ImportDeclaration);
|
|
116
116
|
if (allImports.length > 0) {
|
|
117
117
|
const lastImport = allImports[allImports.length - 1];
|
|
118
118
|
return insertChange(host, source, modulePath, lastImport.end + 1, `\n${statement}\n`);
|
|
@@ -123,7 +123,7 @@ function addGlobal(host, source, modulePath, statement) {
|
|
|
123
123
|
}
|
|
124
124
|
exports.addGlobal = addGlobal;
|
|
125
125
|
function getImport(source, predicate) {
|
|
126
|
-
const allImports = find_nodes_1.findNodes(source, ts.SyntaxKind.ImportDeclaration);
|
|
126
|
+
const allImports = (0, find_nodes_1.findNodes)(source, ts.SyntaxKind.ImportDeclaration);
|
|
127
127
|
const matching = allImports.filter((i) => predicate(i.moduleSpecifier.getText()));
|
|
128
128
|
return matching.map((i) => {
|
|
129
129
|
const moduleSpec = i.moduleSpecifier
|
|
@@ -170,7 +170,7 @@ ${opts.methodHeader} {}
|
|
|
170
170
|
}
|
|
171
171
|
exports.addMethod = addMethod;
|
|
172
172
|
function findClass(source, className, silent = false) {
|
|
173
|
-
const nodes = typescript_1.getSourceNodes(source);
|
|
173
|
+
const nodes = (0, typescript_1.getSourceNodes)(source);
|
|
174
174
|
const clazz = nodes.filter((n) => n.kind === ts.SyntaxKind.ClassDeclaration &&
|
|
175
175
|
n.name.text === className)[0];
|
|
176
176
|
if (!clazz && !silent) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/ast-utils.ts"],"names":[],"mappings":";;;AACA,iCAAiC;AACjC,6CAA8C;AAC9C,wDAAoD;AAEpD,SAAS,eAAe,CAAC,KAAc,EAAE,MAAe;IACtD,OAAO,KAAK,CAAC,QAAQ,EAAE,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;AAC9C,CAAC;AAED,SAAS,kBAAkB,CACzB,IAAU,EACV,UAAyB,EACzB,QAAgB;IAEhB,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC9D,OAAO,UAAU,CAAC,MAAM,CAAC,eAAe,EAAE;QACxC,SAAS,EAAE,eAAe,CAAC,MAAM;QACjC,IAAI,EAAE;YACJ,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,MAAM;YAC9B,KAAK,EAAE,CAAC;SACT;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,YAAY,CAC1B,IAAU,EACV,UAAyB,EACzB,QAAgB,EAChB,cAAsB,EACtB,eAAuB;IAEvB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC/C,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAEjD,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,MAAM,GAAG,eAAe,GAAG,MAAM,EAAE,CAAC,CAAC;IAE7D,OAAO,kBAAkB,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;AACxD,CAAC;AAdD,oCAcC;AAED,SAAgB,aAAa,CAC3B,IAAU,EACV,UAAyB,EACzB,QAAgB,EAChB,cAAsB,EACtB,eAAuB,EACvB,UAAkB;IAElB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAE7C,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,cAAc,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;IACrE,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAC5B,cAAc,EACd,cAAc,GAAG,UAAU,CAAC,MAAM,CACnC,CAAC;IACF,IAAI,IAAI,KAAK,UAAU,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,qBAAqB,IAAI,SAAS,UAAU,IAAI,CAAC,CAAC;KACnE;IAED,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,MAAM,GAAG,eAAe,GAAG,MAAM,EAAE,CAAC,CAAC;IAE7D,OAAO,kBAAkB,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;AACxD,CAAC;AAvBD,sCAuBC;AAED,SAAgB,YAAY,CAC1B,IAAU,EACV,UAAyB,EACzB,QAAgB,EAChB,cAAsB,EACtB,eAAuB;IAEvB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC/C,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,cAAc,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IAC1E,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IAE3C,OAAO,kBAAkB,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;AACxD,CAAC;AAbD,oCAaC;AAED,SAAgB,YAAY,CAC1B,IAAU,EACV,MAAqB,EACrB,UAAkB,EAClB,UAAkB,EAClB,QAAgB,EAChB,SAAS,GAAG,KAAK;IAEjB,MAAM,QAAQ,GAAG,MAAM,CAAC;IACxB,MAAM,UAAU,GAAG,sBAAS,
|
|
1
|
+
{"version":3,"file":"ast-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/ast-utils.ts"],"names":[],"mappings":";;;AACA,iCAAiC;AACjC,6CAA8C;AAC9C,wDAAoD;AAEpD,SAAS,eAAe,CAAC,KAAc,EAAE,MAAe;IACtD,OAAO,KAAK,CAAC,QAAQ,EAAE,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;AAC9C,CAAC;AAED,SAAS,kBAAkB,CACzB,IAAU,EACV,UAAyB,EACzB,QAAgB;IAEhB,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC9D,OAAO,UAAU,CAAC,MAAM,CAAC,eAAe,EAAE;QACxC,SAAS,EAAE,eAAe,CAAC,MAAM;QACjC,IAAI,EAAE;YACJ,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,MAAM;YAC9B,KAAK,EAAE,CAAC;SACT;KACF,CAAC,CAAC;AACL,CAAC;AAED,SAAgB,YAAY,CAC1B,IAAU,EACV,UAAyB,EACzB,QAAgB,EAChB,cAAsB,EACtB,eAAuB;IAEvB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC/C,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;IAEjD,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,MAAM,GAAG,eAAe,GAAG,MAAM,EAAE,CAAC,CAAC;IAE7D,OAAO,kBAAkB,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;AACxD,CAAC;AAdD,oCAcC;AAED,SAAgB,aAAa,CAC3B,IAAU,EACV,UAAyB,EACzB,QAAgB,EAChB,cAAsB,EACtB,eAAuB,EACvB,UAAkB;IAElB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAE7C,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,cAAc,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;IACrE,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAC5B,cAAc,EACd,cAAc,GAAG,UAAU,CAAC,MAAM,CACnC,CAAC;IACF,IAAI,IAAI,KAAK,UAAU,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,qBAAqB,IAAI,SAAS,UAAU,IAAI,CAAC,CAAC;KACnE;IAED,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,MAAM,GAAG,eAAe,GAAG,MAAM,EAAE,CAAC,CAAC;IAE7D,OAAO,kBAAkB,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;AACxD,CAAC;AAvBD,sCAuBC;AAED,SAAgB,YAAY,CAC1B,IAAU,EACV,UAAyB,EACzB,QAAgB,EAChB,cAAsB,EACtB,eAAuB;IAEvB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;IAC/C,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,cAAc,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IAC1E,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IAE3C,OAAO,kBAAkB,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;AACxD,CAAC;AAbD,oCAaC;AAED,SAAgB,YAAY,CAC1B,IAAU,EACV,MAAqB,EACrB,UAAkB,EAClB,UAAkB,EAClB,QAAgB,EAChB,SAAS,GAAG,KAAK;IAEjB,MAAM,QAAQ,GAAG,MAAM,CAAC;IACxB,MAAM,UAAU,GAAG,IAAA,sBAAS,EAAC,QAAQ,EAAE,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;IAExE,iEAAiE;IACjE,MAAM,eAAe,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QACjD,qFAAqF;QACrF,MAAM,WAAW,GAAG,IAAI;aACrB,WAAW,EAAE;aACb,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC;aAC7D,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAE,CAAsB,CAAC,IAAI,CAAC,CAAC;QAE5C,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;IACtE,CAAC,CAAC,CAAC;IAEH,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;QAC9B,IAAI,eAAe,GAAG,KAAK,CAAC;QAC5B,2BAA2B;QAC3B,MAAM,OAAO,GAAc,EAAE,CAAC;QAC9B,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAC5B,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CACxB,OAAO,EACP,IAAA,sBAAS,EAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,UAAU,CAAC,CACvC,CAAC;YACF,IAAI,IAAA,sBAAS,EAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;gBACxD,eAAe,GAAG,IAAI,CAAC;aACxB;QACH,CAAC,CAAC,CAAC;QAEH,mDAAmD;QACnD,IAAI,eAAe,EAAE;YACnB,OAAO,MAAM,CAAC;SACf;QAED,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CACpC,CAAC,CAAC,EAAE,EAAE,CAAE,CAAmB,CAAC,IAAI,KAAK,UAAU,CAChD,CAAC;QAEF,kCAAkC;QAClC,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE;YAChC,MAAM,WAAW,GACf,IAAA,sBAAS,EACP,eAAe,CAAC,CAAC,CAAC,EAClB,EAAE,CAAC,UAAU,CAAC,eAAe,CAC9B,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;gBACf,IAAA,sBAAS,EAAC,eAAe,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YAEzE,OAAO,yBAAyB,CAC9B,IAAI,EACJ,MAAM,EACN,OAAO,EACP,KAAK,UAAU,EAAE,EACjB,UAAU,EACV,WAAW,CACZ,CAAC;SACH;QAED,OAAO,MAAM,CAAC;KACf;IAED,oCAAoC;IACpC,MAAM,SAAS,GAAG,IAAA,sBAAS,EAAC,QAAQ,EAAE,EAAE,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,MAAM,CACvE,CAAC,CAAmB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,CACjD,CAAC;IACF,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;QACxB,WAAW,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;KAChC;IACD,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACnC,MAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACpC,wFAAwF;IACxF,MAAM,iBAAiB,GAAG,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,CAAC;IAC5E,MAAM,SAAS,GAAG,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;IACjD,MAAM,QAAQ,GACZ,GAAG,SAAS,UAAU,IAAI,GAAG,UAAU,GAAG,KAAK,EAAE;QACjD,UAAU,QAAQ,IAAI,iBAAiB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IAEzD,OAAO,yBAAyB,CAC9B,IAAI,EACJ,MAAM,EACN,UAAU,EACV,QAAQ,EACR,UAAU,EACV,WAAW,EACX,EAAE,CAAC,UAAU,CAAC,aAAa,CAC5B,CAAC;AACJ,CAAC;AA7FD,oCA6FC;AAED,SAAS,yBAAyB,CAChC,IAAU,EACV,UAAyB,EACzB,KAAgB,EAChB,QAAgB,EAChB,UAAkB,EAClB,WAAmB,EACnB,UAA0B;IAE1B,2FAA2F;IAC3F,IAAI,QAAQ,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,EAAE,CAAC;IACtD,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,EAAE,CAAC;KACnB;IACD,IAAI,UAAU,EAAE;QACd,QAAQ,GAAG,IAAA,sBAAS,EAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,EAAE,CAAC;KACxE;IACD,IAAI,CAAC,QAAQ,IAAI,WAAW,IAAI,SAAS,EAAE;QACzC,MAAM,IAAI,KAAK,CACb,mBAAmB,QAAQ,gDAAgD,CAC5E,CAAC;KACH;IACD,MAAM,gBAAgB,GAAW,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;IAE5E,OAAO,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,gBAAgB,EAAE,QAAQ,CAAC,CAAC;AAChF,CAAC;AAED,SAAgB,SAAS,CACvB,IAAU,EACV,MAAqB,EACrB,UAAkB,EAClB,SAAiB;IAEjB,MAAM,UAAU,GAAG,IAAA,sBAAS,EAAC,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;IACtE,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;QACzB,MAAM,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACrD,OAAO,YAAY,CACjB,IAAI,EACJ,MAAM,EACN,UAAU,EACV,UAAU,CAAC,GAAG,GAAG,CAAC,EAClB,KAAK,SAAS,IAAI,CACnB,CAAC;KACH;SAAM;QACL,OAAO,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,SAAS,IAAI,CAAC,CAAC;KACpE;AACH,CAAC;AAnBD,8BAmBC;AAED,SAAgB,SAAS,CACvB,MAAqB,EACrB,SAA8B;IAE9B,MAAM,UAAU,GAAG,IAAA,sBAAS,EAAC,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;IACtE,MAAM,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAuB,EAAE,EAAE,CAC7D,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,CACvC,CAAC;IAEF,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAuB,EAAE,EAAE;QAC9C,MAAM,UAAU,GAAG,CAAC,CAAC,eAAe;aACjC,OAAO,EAAE;aACT,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACxD,MAAM,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;QACjD,MAAM,QAAQ,GAAG,CAAC;aACf,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;aAChB,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;aAChB,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QACxB,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC;IAClC,CAAC,CAAC,CAAC;AACL,CAAC;AArBD,8BAqBC;AAED,SAAgB,gBAAgB,CAC9B,IAAU,EACV,UAAyB,EACzB,UAAkB,EAClB,IAAa,EACb,OAAe;IAEf,OAAO,aAAa,CAClB,IAAI,EACJ,UAAU,EACV,UAAU,EACV,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,EACnC,OAAO,EACP,IAAI,CAAC,OAAO,EAAE,CACf,CAAC;AACJ,CAAC;AAfD,4CAeC;AAED,SAAgB,yBAAyB,CACvC,IAAU,EACV,MAAqB,EACrB,UAAkB,EAClB,IAA0C;IAE1C,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAChD,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CACtC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,WAAW,CAC5C,CAAC,CAAC,CAAC,CAAC;IAEL,IAAI,WAAW,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC,mBAAmB;KACzD;IAED,OAAO,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE;QACzC,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,YAAY,EAAE,eAAe,IAAI,CAAC,KAAK,GAAG;KAC3C,CAAC,CAAC;AACL,CAAC;AAnBD,8DAmBC;AAED,SAAgB,SAAS,CACvB,IAAU,EACV,MAAqB,EACrB,UAAkB,EAClB,IAAgE;IAEhE,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAChD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI;QACpB,CAAC,CAAC;EACJ,IAAI,CAAC,YAAY;EACjB,IAAI,CAAC,IAAI;;CAEV;QACG,CAAC,CAAC;EACJ,IAAI,CAAC,YAAY;CAClB,CAAC;IAEA,OAAO,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;AACrE,CAAC;AAlBD,8BAkBC;AAED,SAAgB,SAAS,CACvB,MAAqB,EACrB,SAAiB,EACjB,SAAkB,KAAK;IAEvB,MAAM,KAAK,GAAG,IAAA,2BAAc,EAAC,MAAM,CAAC,CAAC;IAErC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CACxB,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,gBAAgB;QACnC,CAAE,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CACnC,CAAC,CAAC,CAAwB,CAAC;IAE5B,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,SAAS,IAAI,CAAC,CAAC;KACtD;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAlBD,8BAkBC"}
|
|
@@ -22,10 +22,10 @@ function calculateProjectDependencies(projGraph, root, projectName, targetName,
|
|
|
22
22
|
const depNode = projGraph.nodes[dep] || projGraph.externalNodes[dep];
|
|
23
23
|
if (depNode.type === project_graph_1.ProjectType.lib &&
|
|
24
24
|
isBuildable(targetName, depNode)) {
|
|
25
|
-
const libPackageJson = fileutils_1.readJsonFile(path_1.join(root, depNode.data.root, 'package.json'));
|
|
25
|
+
const libPackageJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(root, depNode.data.root, 'package.json'));
|
|
26
26
|
return {
|
|
27
27
|
name: libPackageJson.name,
|
|
28
|
-
outputs: utils_1.getOutputsForTargetAndConfiguration({
|
|
28
|
+
outputs: (0, utils_1.getOutputsForTargetAndConfiguration)({
|
|
29
29
|
overrides: {},
|
|
30
30
|
target: {
|
|
31
31
|
project: projectName,
|
|
@@ -62,7 +62,7 @@ function recursivelyCollectDependencies(project, projGraph, acc) {
|
|
|
62
62
|
}
|
|
63
63
|
function readTsConfigWithRemappedPaths(tsConfig, generatedTsConfigPath, dependencies) {
|
|
64
64
|
const generatedTsConfig = { compilerOptions: {} };
|
|
65
|
-
generatedTsConfig.extends = path_1.relative(path_1.dirname(generatedTsConfigPath), tsConfig);
|
|
65
|
+
generatedTsConfig.extends = (0, path_1.relative)((0, path_1.dirname)(generatedTsConfigPath), tsConfig);
|
|
66
66
|
generatedTsConfig.compilerOptions.paths = computeCompilerOptionsPaths(tsConfig, dependencies);
|
|
67
67
|
if (process.env.NX_VERBOSE_LOGGING === 'true') {
|
|
68
68
|
output_1.output.log({
|
|
@@ -86,7 +86,7 @@ function readPaths(tsConfig) {
|
|
|
86
86
|
return parsedTSConfig.compilerOptions.paths;
|
|
87
87
|
}
|
|
88
88
|
else if (parsedTSConfig.extends) {
|
|
89
|
-
return readPaths(path_1.resolve(path_1.dirname(tsConfig), parsedTSConfig.extends));
|
|
89
|
+
return readPaths((0, path_1.resolve)((0, path_1.dirname)(tsConfig), parsedTSConfig.extends));
|
|
90
90
|
}
|
|
91
91
|
else {
|
|
92
92
|
return null;
|
|
@@ -97,17 +97,17 @@ function readPaths(tsConfig) {
|
|
|
97
97
|
}
|
|
98
98
|
}
|
|
99
99
|
function createTmpTsConfig(tsconfigPath, workspaceRoot, projectRoot, dependencies) {
|
|
100
|
-
const tmpTsConfigPath = path_1.join(workspaceRoot, 'tmp', projectRoot, 'tsconfig.generated.json');
|
|
100
|
+
const tmpTsConfigPath = (0, path_1.join)(workspaceRoot, 'tmp', projectRoot, 'tsconfig.generated.json');
|
|
101
101
|
const parsedTSConfig = readTsConfigWithRemappedPaths(tsconfigPath, tmpTsConfigPath, dependencies);
|
|
102
102
|
process.on('exit', () => cleanupTmpTsConfigFile(tmpTsConfigPath));
|
|
103
|
-
fileutils_1.writeJsonFile(tmpTsConfigPath, parsedTSConfig);
|
|
104
|
-
return path_1.join(tmpTsConfigPath);
|
|
103
|
+
(0, fileutils_1.writeJsonFile)(tmpTsConfigPath, parsedTSConfig);
|
|
104
|
+
return (0, path_1.join)(tmpTsConfigPath);
|
|
105
105
|
}
|
|
106
106
|
exports.createTmpTsConfig = createTmpTsConfig;
|
|
107
107
|
function cleanupTmpTsConfigFile(tmpTsConfigPath) {
|
|
108
108
|
try {
|
|
109
109
|
if (tmpTsConfigPath) {
|
|
110
|
-
fs_1.unlinkSync(tmpTsConfigPath);
|
|
110
|
+
(0, fs_1.unlinkSync)(tmpTsConfigPath);
|
|
111
111
|
}
|
|
112
112
|
}
|
|
113
113
|
catch (e) { }
|
|
@@ -115,7 +115,7 @@ function cleanupTmpTsConfigFile(tmpTsConfigPath) {
|
|
|
115
115
|
function checkDependentProjectsHaveBeenBuilt(root, projectName, targetName, projectDependencies) {
|
|
116
116
|
const missing = findMissingBuildDependencies(root, projectName, targetName, projectDependencies);
|
|
117
117
|
if (missing.length > 0) {
|
|
118
|
-
console.error(devkit_1.stripIndents `
|
|
118
|
+
console.error((0, devkit_1.stripIndents) `
|
|
119
119
|
Some of the project ${projectName}'s dependencies have not been built yet. Please build these libraries before:
|
|
120
120
|
${missing.map((x) => ` - ${x.node.name}`).join('\n')}
|
|
121
121
|
|
|
@@ -135,7 +135,7 @@ function findMissingBuildDependencies(root, projectName, targetName, projectDepe
|
|
|
135
135
|
if (dep.node.type !== project_graph_1.ProjectType.lib) {
|
|
136
136
|
return;
|
|
137
137
|
}
|
|
138
|
-
const paths = dep.outputs.map((p) => path_1.join(root, p));
|
|
138
|
+
const paths = dep.outputs.map((p) => (0, path_1.join)(root, p));
|
|
139
139
|
if (!paths.some(fileutils_1.directoryExists)) {
|
|
140
140
|
depLibsToBuildFirst.push(dep);
|
|
141
141
|
}
|
|
@@ -164,7 +164,7 @@ exports.updatePaths = updatePaths;
|
|
|
164
164
|
* the proper dependency and version
|
|
165
165
|
*/
|
|
166
166
|
function updateBuildableProjectPackageJsonDependencies(root, projectName, targetName, configurationName, node, dependencies, typeOfDependency = 'dependencies') {
|
|
167
|
-
const outputs = utils_1.getOutputsForTargetAndConfiguration({
|
|
167
|
+
const outputs = (0, utils_1.getOutputsForTargetAndConfiguration)({
|
|
168
168
|
overrides: {},
|
|
169
169
|
target: {
|
|
170
170
|
project: projectName,
|
|
@@ -176,8 +176,8 @@ function updateBuildableProjectPackageJsonDependencies(root, projectName, target
|
|
|
176
176
|
let packageJson;
|
|
177
177
|
let workspacePackageJson;
|
|
178
178
|
try {
|
|
179
|
-
packageJson = fileutils_1.readJsonFile(packageJsonPath);
|
|
180
|
-
workspacePackageJson = fileutils_1.readJsonFile(`${root}/package.json`);
|
|
179
|
+
packageJson = (0, fileutils_1.readJsonFile)(packageJsonPath);
|
|
180
|
+
workspacePackageJson = (0, fileutils_1.readJsonFile)(`${root}/package.json`);
|
|
181
181
|
}
|
|
182
182
|
catch (e) {
|
|
183
183
|
// cannot find or invalid package.json
|
|
@@ -188,7 +188,7 @@ function updateBuildableProjectPackageJsonDependencies(root, projectName, target
|
|
|
188
188
|
let updatePackageJson = false;
|
|
189
189
|
dependencies.forEach((entry) => {
|
|
190
190
|
var _a;
|
|
191
|
-
const packageName = project_graph_1.isNpmProject(entry.node)
|
|
191
|
+
const packageName = (0, project_graph_1.isNpmProject)(entry.node)
|
|
192
192
|
? entry.node.data.packageName
|
|
193
193
|
: entry.name;
|
|
194
194
|
if (!hasDependency(packageJson, 'dependencies', packageName) &&
|
|
@@ -197,7 +197,7 @@ function updateBuildableProjectPackageJsonDependencies(root, projectName, target
|
|
|
197
197
|
try {
|
|
198
198
|
let depVersion;
|
|
199
199
|
if (entry.node.type === project_graph_1.ProjectType.lib) {
|
|
200
|
-
const outputs = utils_1.getOutputsForTargetAndConfiguration({
|
|
200
|
+
const outputs = (0, utils_1.getOutputsForTargetAndConfiguration)({
|
|
201
201
|
overrides: {},
|
|
202
202
|
target: {
|
|
203
203
|
project: projectName,
|
|
@@ -205,11 +205,11 @@ function updateBuildableProjectPackageJsonDependencies(root, projectName, target
|
|
|
205
205
|
configuration: configurationName,
|
|
206
206
|
},
|
|
207
207
|
}, entry.node);
|
|
208
|
-
const depPackageJsonPath = path_1.join(root, outputs[0], 'package.json');
|
|
209
|
-
depVersion = fileutils_1.readJsonFile(depPackageJsonPath).version;
|
|
208
|
+
const depPackageJsonPath = (0, path_1.join)(root, outputs[0], 'package.json');
|
|
209
|
+
depVersion = (0, fileutils_1.readJsonFile)(depPackageJsonPath).version;
|
|
210
210
|
packageJson[typeOfDependency][packageName] = depVersion;
|
|
211
211
|
}
|
|
212
|
-
else if (project_graph_1.isNpmProject(entry.node)) {
|
|
212
|
+
else if ((0, project_graph_1.isNpmProject)(entry.node)) {
|
|
213
213
|
// If an npm dep is part of the workspace devDependencies, do not include it the library
|
|
214
214
|
if (!!((_a = workspacePackageJson.devDependencies) === null || _a === void 0 ? void 0 : _a[entry.node.data.packageName])) {
|
|
215
215
|
return;
|
|
@@ -226,7 +226,7 @@ function updateBuildableProjectPackageJsonDependencies(root, projectName, target
|
|
|
226
226
|
}
|
|
227
227
|
});
|
|
228
228
|
if (updatePackageJson) {
|
|
229
|
-
fileutils_1.writeJsonFile(packageJsonPath, packageJson);
|
|
229
|
+
(0, fileutils_1.writeJsonFile)(packageJsonPath, packageJson);
|
|
230
230
|
}
|
|
231
231
|
}
|
|
232
232
|
exports.updateBuildableProjectPackageJsonDependencies = updateBuildableProjectPackageJsonDependencies;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildable-libs-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/buildable-libs-utils.ts"],"names":[],"mappings":";;;AAAA,yDAAkE;AAClE,+BAAwD;AACxD,2CAA2E;AAC3E,yCAA4C;AAE5C,iDAA4E;AAC5E,iCAAiC;AACjC,2BAAgC;AAChC,qCAAkC;AAElC,SAAS,WAAW,CAAC,MAAc,EAAE,IAAsB;IACzD,OAAO,CACL,IAAI,CAAC,IAAI,CAAC,OAAO;QACjB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,KAAK,EAAE,CAC1C,CAAC;AACJ,CAAC;AAQD,SAAgB,4BAA4B,CAC1C,SAAuB,EACvB,IAAY,EACZ,WAAmB,EACnB,UAAkB,EAClB,iBAAyB;IAEzB,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAC5C,kCAAkC;IAClC,MAAM,YAAY,GAAG,8BAA8B,CACjD,WAAW,EACX,SAAS,EACT,EAAE,CACH;SACE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;QACX,MAAM,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QACrE,IACE,OAAO,CAAC,IAAI,KAAK,2BAAW,CAAC,GAAG;YAChC,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC,EAChC;YACA,MAAM,cAAc,GAAG,wBAAY,
|
|
1
|
+
{"version":3,"file":"buildable-libs-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/buildable-libs-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ const path_1 = require("path");
|
|
|
5
5
|
const fileutils_1 = require("./fileutils");
|
|
6
6
|
function readCacheDirectoryProperty(root) {
|
|
7
7
|
try {
|
|
8
|
-
const nxJson = fileutils_1.readJsonFile(path_1.join(root, 'nx.json'));
|
|
8
|
+
const nxJson = (0, fileutils_1.readJsonFile)((0, path_1.join)(root, 'nx.json'));
|
|
9
9
|
return nxJson.tasksRunnerOptions.default.options.cacheDirectory;
|
|
10
10
|
}
|
|
11
11
|
catch (e) {
|
|
@@ -20,14 +20,14 @@ function cacheDirectory(root, cacheDirectory) {
|
|
|
20
20
|
}
|
|
21
21
|
if (cacheDirectory) {
|
|
22
22
|
if (cacheDirectory.startsWith('./')) {
|
|
23
|
-
return path_1.join(root, cacheDirectory);
|
|
23
|
+
return (0, path_1.join)(root, cacheDirectory);
|
|
24
24
|
}
|
|
25
25
|
else {
|
|
26
26
|
return cacheDirectory;
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
29
|
else {
|
|
30
|
-
return path_1.join(root, 'node_modules', '.cache', 'nx');
|
|
30
|
+
return (0, path_1.join)(root, 'node_modules', '.cache', 'nx');
|
|
31
31
|
}
|
|
32
32
|
}
|
|
33
33
|
exports.cacheDirectory = cacheDirectory;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cache-directory.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/cache-directory.ts"],"names":[],"mappings":";;;AACA,+BAA4B;AAC5B,2CAA2C;AAE3C,SAAgB,0BAA0B,CAAC,IAAY;IACrD,IAAI;QACF,MAAM,MAAM,GAAG,wBAAY,
|
|
1
|
+
{"version":3,"file":"cache-directory.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/cache-directory.ts"],"names":[],"mappings":";;;AACA,+BAA4B;AAC5B,2CAA2C;AAE3C,SAAgB,0BAA0B,CAAC,IAAY;IACrD,IAAI;QACF,MAAM,MAAM,GAAG,IAAA,wBAAY,EAAsB,IAAA,WAAI,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC;QACxE,OAAO,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC;KACjE;IAAC,OAAO,CAAC,EAAE;QACV,OAAO,SAAS,CAAC;KAClB;AACH,CAAC;AAPD,gEAOC;AAED,SAAgB,cAAc,CAAC,IAAY,EAAE,cAAsB;IACjE,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;IACvD,IAAI,eAAe,EAAE;QACnB,cAAc,GAAG,eAAe,CAAC;KAClC;IACD,IAAI,cAAc,EAAE;QAClB,IAAI,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACnC,OAAO,IAAA,WAAI,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;SACnC;aAAM;YACL,OAAO,cAAc,CAAC;SACvB;KACF;SAAM;QACL,OAAO,IAAA,WAAI,EAAC,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;KACnD;AACH,CAAC;AAdD,wCAcC"}
|
|
@@ -17,7 +17,7 @@ function createPackageJson(projectName, graph, options) {
|
|
|
17
17
|
devDependencies: {},
|
|
18
18
|
};
|
|
19
19
|
try {
|
|
20
|
-
packageJson = fileutils_1.readJsonFile(`${options.projectRoot}/package.json`);
|
|
20
|
+
packageJson = (0, fileutils_1.readJsonFile)(`${options.projectRoot}/package.json`);
|
|
21
21
|
if (!packageJson.dependencies) {
|
|
22
22
|
packageJson.dependencies = {};
|
|
23
23
|
}
|
|
@@ -26,7 +26,7 @@ function createPackageJson(projectName, graph, options) {
|
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
28
|
catch (e) { }
|
|
29
|
-
const rootPackageJson = fileutils_1.readJsonFile(`${options.root}/package.json`);
|
|
29
|
+
const rootPackageJson = (0, fileutils_1.readJsonFile)(`${options.root}/package.json`);
|
|
30
30
|
Object.entries(npmDeps).forEach(([packageName, version]) => {
|
|
31
31
|
var _a;
|
|
32
32
|
if ((_a = rootPackageJson.devDependencies) === null || _a === void 0 ? void 0 : _a[packageName]) {
|