@nrwl/workspace 13.1.2 → 13.2.0-beta.3
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/README.md +1 -1
- package/index.d.ts +1 -1
- package/index.js +5 -4
- package/index.js.map +1 -1
- package/migrations.json +6 -0
- 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/examples.js +6 -6
- package/src/command-line/examples.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 +31 -38
- 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.d.ts +1 -3
- package/src/command-line/utils.js +14 -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 +20 -16
- 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-13-2-0/set-parallel-default.d.ts +3 -0
- package/src/migrations/update-13-2-0/set-parallel-default.js +23 -0
- package/src/migrations/update-13-2-0/set-parallel-default.js.map +1 -0
- 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.d.ts +1 -2
- package/src/tasks-runner/default-tasks-runner.js +12 -1
- package/src/tasks-runner/default-tasks-runner.js.map +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 +23 -26
- 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
|
@@ -19,9 +19,9 @@ function generatePreset(host, opts) {
|
|
|
19
19
|
const spawnOptions = {
|
|
20
20
|
stdio: [process.stdin, process.stdout, process.stderr],
|
|
21
21
|
shell: true,
|
|
22
|
-
cwd: path_1.join(host.root, opts.directory),
|
|
22
|
+
cwd: (0, path_1.join)(host.root, opts.directory),
|
|
23
23
|
};
|
|
24
|
-
const pmc = devkit_1.getPackageManagerCommand();
|
|
24
|
+
const pmc = (0, devkit_1.getPackageManagerCommand)();
|
|
25
25
|
const executable = `${pmc.exec} ${cliCommand}`;
|
|
26
26
|
const args = [
|
|
27
27
|
`g`,
|
|
@@ -35,7 +35,7 @@ function generatePreset(host, opts) {
|
|
|
35
35
|
parsedArgs.interactive ? '--interactive=true' : '--interactive=false',
|
|
36
36
|
].filter((e) => !!e);
|
|
37
37
|
return new Promise((resolve, reject) => {
|
|
38
|
-
child_process_1.spawn(executable, args, spawnOptions).on('close', (code) => {
|
|
38
|
+
(0, child_process_1.spawn)(executable, args, spawnOptions).on('close', (code) => {
|
|
39
39
|
if (code === 0) {
|
|
40
40
|
resolve();
|
|
41
41
|
}
|
|
@@ -47,14 +47,14 @@ function generatePreset(host, opts) {
|
|
|
47
47
|
});
|
|
48
48
|
}
|
|
49
49
|
function initializeGitRepo(host, rootDirectory, options) {
|
|
50
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
50
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
51
51
|
const execute = (args, ignoreErrorStream = false) => {
|
|
52
52
|
const outputStream = 'ignore';
|
|
53
53
|
const errorStream = ignoreErrorStream ? 'ignore' : process.stderr;
|
|
54
54
|
const spawnOptions = {
|
|
55
55
|
stdio: [process.stdin, outputStream, errorStream],
|
|
56
56
|
shell: true,
|
|
57
|
-
cwd: path_1.join(host.root, rootDirectory),
|
|
57
|
+
cwd: (0, path_1.join)(host.root, rootDirectory),
|
|
58
58
|
env: Object.assign(Object.assign(Object.assign({}, process.env), (options.commit.name
|
|
59
59
|
? {
|
|
60
60
|
GIT_AUTHOR_NAME: options.commit.name,
|
|
@@ -68,7 +68,7 @@ function initializeGitRepo(host, rootDirectory, options) {
|
|
|
68
68
|
: {})),
|
|
69
69
|
};
|
|
70
70
|
return new Promise((resolve, reject) => {
|
|
71
|
-
child_process_1.spawn('git', args, spawnOptions).on('close', (code) => {
|
|
71
|
+
(0, child_process_1.spawn)('git', args, spawnOptions).on('close', (code) => {
|
|
72
72
|
if (code === 0) {
|
|
73
73
|
resolve();
|
|
74
74
|
}
|
|
@@ -78,7 +78,7 @@ function initializeGitRepo(host, rootDirectory, options) {
|
|
|
78
78
|
});
|
|
79
79
|
});
|
|
80
80
|
};
|
|
81
|
-
const gitVersion = default_base_1.checkGitVersion();
|
|
81
|
+
const gitVersion = (0, default_base_1.checkGitVersion)();
|
|
82
82
|
if (!gitVersion) {
|
|
83
83
|
return;
|
|
84
84
|
}
|
|
@@ -87,8 +87,8 @@ function initializeGitRepo(host, rootDirectory, options) {
|
|
|
87
87
|
console.info(`Directory is already under version control. Skipping initialization of git.`);
|
|
88
88
|
return;
|
|
89
89
|
}
|
|
90
|
-
const defaultBase = options.defaultBase || default_base_1.deduceDefaultBase();
|
|
91
|
-
if (semver_1.gte(gitVersion, '2.28.0')) {
|
|
90
|
+
const defaultBase = options.defaultBase || (0, default_base_1.deduceDefaultBase)();
|
|
91
|
+
if ((0, semver_1.gte)(gitVersion, '2.28.0')) {
|
|
92
92
|
yield execute(['init', '-b', defaultBase]);
|
|
93
93
|
}
|
|
94
94
|
else {
|
|
@@ -104,7 +104,7 @@ function initializeGitRepo(host, rootDirectory, options) {
|
|
|
104
104
|
});
|
|
105
105
|
}
|
|
106
106
|
function newGenerator(host, options) {
|
|
107
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
107
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
108
108
|
if (options.skipInstall &&
|
|
109
109
|
options.preset !== presets_1.Preset.Empty &&
|
|
110
110
|
options.preset !== presets_1.Preset.NPM) {
|
|
@@ -113,22 +113,22 @@ function newGenerator(host, options) {
|
|
|
113
113
|
if (options.skipInstall && options.nxCloud) {
|
|
114
114
|
throw new Error(`Cannot select nxCloud when skipInstall is set to true.`);
|
|
115
115
|
}
|
|
116
|
-
if (devkit_1.getWorkspacePath(host)) {
|
|
116
|
+
if ((0, devkit_1.getWorkspacePath)(host)) {
|
|
117
117
|
throw new Error('Cannot generate a new workspace within an existing workspace');
|
|
118
118
|
}
|
|
119
119
|
options = normalizeOptions(options);
|
|
120
120
|
if (host.exists(options.name) &&
|
|
121
121
|
!host.isFile(options.name) &&
|
|
122
122
|
host.children(options.name).length > 0) {
|
|
123
|
-
throw new Error(`${path_1.join(host.root, options.name)} is not an empty directory.`);
|
|
123
|
+
throw new Error(`${(0, path_1.join)(host.root, options.name)} is not an empty directory.`);
|
|
124
124
|
}
|
|
125
|
-
yield workspace_1.workspaceGenerator(host, Object.assign(Object.assign({}, options), { nxCloud: undefined }));
|
|
125
|
+
yield (0, workspace_1.workspaceGenerator)(host, Object.assign(Object.assign({}, options), { nxCloud: undefined }));
|
|
126
126
|
setDefaultLinter(host, options);
|
|
127
127
|
addPresetDependencies(host, options);
|
|
128
128
|
addCloudDependencies(host, options);
|
|
129
|
-
yield devkit_1.formatFiles(host);
|
|
130
|
-
return () => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
131
|
-
devkit_1.installPackagesTask(host, false, options.directory, options.packageManager);
|
|
129
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
130
|
+
return () => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
131
|
+
(0, devkit_1.installPackagesTask)(host, false, options.directory, options.packageManager);
|
|
132
132
|
yield generatePreset(host, options);
|
|
133
133
|
if (!options.skipGit) {
|
|
134
134
|
yield initializeGitRepo(host, options.directory, options);
|
|
@@ -138,10 +138,10 @@ function newGenerator(host, options) {
|
|
|
138
138
|
}
|
|
139
139
|
exports.newGenerator = newGenerator;
|
|
140
140
|
exports.default = newGenerator;
|
|
141
|
-
exports.newSchematic = devkit_1.convertNxGenerator(newGenerator);
|
|
141
|
+
exports.newSchematic = (0, devkit_1.convertNxGenerator)(newGenerator);
|
|
142
142
|
function addCloudDependencies(host, options) {
|
|
143
143
|
if (options.nxCloud) {
|
|
144
|
-
return devkit_1.addDependenciesToPackageJson(host, {}, { '@nrwl/nx-cloud': 'latest' }, path_1.join(options.directory, 'package.json'));
|
|
144
|
+
return (0, devkit_1.addDependenciesToPackageJson)(host, {}, { '@nrwl/nx-cloud': 'latest' }, (0, path_1.join)(options.directory, 'package.json'));
|
|
145
145
|
}
|
|
146
146
|
}
|
|
147
147
|
const presetDependencies = {
|
|
@@ -200,10 +200,10 @@ function addPresetDependencies(host, options) {
|
|
|
200
200
|
return;
|
|
201
201
|
}
|
|
202
202
|
const { dependencies, dev } = presetDependencies[options.preset];
|
|
203
|
-
return devkit_1.addDependenciesToPackageJson(host, dependencies, dev, path_1.join(options.directory, 'package.json'));
|
|
203
|
+
return (0, devkit_1.addDependenciesToPackageJson)(host, dependencies, dev, (0, path_1.join)(options.directory, 'package.json'));
|
|
204
204
|
}
|
|
205
205
|
function normalizeOptions(options) {
|
|
206
|
-
options.name = devkit_1.names(options.name).fileName;
|
|
206
|
+
options.name = (0, devkit_1.names)(options.name).fileName;
|
|
207
207
|
if (!options.directory) {
|
|
208
208
|
options.directory = options.name;
|
|
209
209
|
}
|
|
@@ -230,7 +230,7 @@ function setDefaultLinter(host, options) {
|
|
|
230
230
|
* This sets ESLint as the default for any schematics that default to TSLint
|
|
231
231
|
*/
|
|
232
232
|
function setESLintDefault(host, options) {
|
|
233
|
-
devkit_1.updateJson(host, getWorkspacePath(host, options), (json) => {
|
|
233
|
+
(0, devkit_1.updateJson)(host, getWorkspacePath(host, options), (json) => {
|
|
234
234
|
setDefault(json, '@nrwl/angular', 'application', 'linter', 'eslint');
|
|
235
235
|
setDefault(json, '@nrwl/angular', 'library', 'linter', 'eslint');
|
|
236
236
|
setDefault(json, '@nrwl/angular', 'storybook-configuration', 'linter', 'eslint');
|
|
@@ -241,7 +241,7 @@ function setESLintDefault(host, options) {
|
|
|
241
241
|
* This sets TSLint as the default for any schematics that default to ESLint
|
|
242
242
|
*/
|
|
243
243
|
function setTSLintDefault(host, options) {
|
|
244
|
-
devkit_1.updateJson(host, getWorkspacePath(host, options), (json) => {
|
|
244
|
+
(0, devkit_1.updateJson)(host, getWorkspacePath(host, options), (json) => {
|
|
245
245
|
setDefault(json, '@nrwl/workspace', 'library', 'linter', 'tslint');
|
|
246
246
|
setDefault(json, '@nrwl/cypress', 'cypress-project', 'linter', 'tslint');
|
|
247
247
|
setDefault(json, '@nrwl/cypress', 'cypress-project', 'linter', 'tslint');
|
|
@@ -255,7 +255,7 @@ function setTSLintDefault(host, options) {
|
|
|
255
255
|
});
|
|
256
256
|
}
|
|
257
257
|
function getWorkspacePath(host, { directory, cli }) {
|
|
258
|
-
return path_1.join(directory, cli === 'angular' ? 'angular.json' : 'workspace.json');
|
|
258
|
+
return (0, path_1.join)(directory, cli === 'angular' ? 'angular.json' : 'workspace.json');
|
|
259
259
|
}
|
|
260
260
|
function setDefault(json, collectionName, generatorName, key, value) {
|
|
261
261
|
if (!json.schematics)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/new.ts"],"names":[],"mappings":";;;;AAAA,yCAasB;AAEtB,+BAA4B;AAC5B,4CAA4C;AAC5C,iDAAoD;AAEpD,mCAA6B;AAE7B,sDAA4D;AAC5D,mDAAiD;AACjD,8CAA0C;AAC1C,+DAGsC;AAmBtC,SAAS,cAAc,CAAC,IAAU,EAAE,IAAY;IAC9C,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IACxD,MAAM,UAAU,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,EAAE;QAC3C,OAAO,EAAE,CAAC,aAAa,CAAC;KACzB,CAAC,CAAC;IACH,MAAM,YAAY,GAAG;QACnB,KAAK,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC;QACtD,KAAK,EAAE,IAAI;QACX,GAAG,EAAE,WAAI,
|
|
1
|
+
{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/new.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,36 +5,36 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
function normalizeOptions(options) {
|
|
8
|
-
options.name = devkit_1.names(options.name).fileName;
|
|
8
|
+
options.name = (0, devkit_1.names)(options.name).fileName;
|
|
9
9
|
return options;
|
|
10
10
|
}
|
|
11
11
|
function addFiles(projectRoot, tree, npmScope, options) {
|
|
12
|
-
const packageJsonPath = path_1.join(projectRoot, 'package.json');
|
|
13
|
-
devkit_1.writeJson(tree, packageJsonPath, {
|
|
14
|
-
name: path_1.join(`@${npmScope}`, options.name),
|
|
12
|
+
const packageJsonPath = (0, path_1.join)(projectRoot, 'package.json');
|
|
13
|
+
(0, devkit_1.writeJson)(tree, packageJsonPath, {
|
|
14
|
+
name: (0, path_1.join)(`@${npmScope}`, options.name),
|
|
15
15
|
scripts: {
|
|
16
16
|
test: 'node index.js',
|
|
17
17
|
},
|
|
18
18
|
});
|
|
19
|
-
devkit_1.generateFiles(tree, path_1.join(__dirname, './files'), projectRoot, {});
|
|
19
|
+
(0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, './files'), projectRoot, {});
|
|
20
20
|
}
|
|
21
21
|
function npmPackageGenerator(tree, options) {
|
|
22
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
22
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
23
23
|
options = normalizeOptions(options);
|
|
24
|
-
const { libsDir, npmScope } = devkit_1.getWorkspaceLayout(tree);
|
|
25
|
-
const projectRoot = path_1.join(libsDir, options.name);
|
|
26
|
-
devkit_1.addProjectConfiguration(tree, options.name, {
|
|
24
|
+
const { libsDir, npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
|
|
25
|
+
const projectRoot = (0, path_1.join)(libsDir, options.name);
|
|
26
|
+
(0, devkit_1.addProjectConfiguration)(tree, options.name, {
|
|
27
27
|
root: projectRoot,
|
|
28
28
|
});
|
|
29
29
|
const fileCount = tree.children(projectRoot).length;
|
|
30
|
-
const projectJsonExists = tree.exists(path_1.join(projectRoot, 'project.json'));
|
|
30
|
+
const projectJsonExists = tree.exists((0, path_1.join)(projectRoot, 'project.json'));
|
|
31
31
|
const isEmpty = fileCount === 0 || (fileCount === 1 && projectJsonExists);
|
|
32
32
|
if (isEmpty) {
|
|
33
33
|
addFiles(projectRoot, tree, npmScope, options);
|
|
34
34
|
}
|
|
35
|
-
yield devkit_1.formatFiles(tree);
|
|
35
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
36
36
|
});
|
|
37
37
|
}
|
|
38
38
|
exports.npmPackageGenerator = npmPackageGenerator;
|
|
39
|
-
exports.npmPackageSchematic = devkit_1.convertNxGenerator(npmPackageGenerator);
|
|
39
|
+
exports.npmPackageSchematic = (0, devkit_1.convertNxGenerator)(npmPackageGenerator);
|
|
40
40
|
//# sourceMappingURL=npm-package.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"npm-package.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/npm-package/npm-package.ts"],"names":[],"mappings":";;;;AAAA,yCAUsB;AACtB,+BAA4B;AAM5B,SAAS,gBAAgB,CAAC,OAAuB;IAC/C,OAAO,CAAC,IAAI,GAAG,cAAK,
|
|
1
|
+
{"version":3,"file":"npm-package.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/npm-package/npm-package.ts"],"names":[],"mappings":";;;;AAAA,yCAUsB;AACtB,+BAA4B;AAM5B,SAAS,gBAAgB,CAAC,OAAuB;IAC/C,OAAO,CAAC,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC5C,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,QAAQ,CACf,WAAmB,EACnB,IAAU,EACV,QAAgB,EAChB,OAAuB;IAEvB,MAAM,eAAe,GAAG,IAAA,WAAI,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAC1D,IAAA,kBAAS,EAAC,IAAI,EAAE,eAAe,EAAE;QAC/B,IAAI,EAAE,IAAA,WAAI,EAAC,IAAI,QAAQ,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC;QACxC,OAAO,EAAE;YACP,IAAI,EAAE,eAAe;SACtB;KACF,CAAC,CAAC;IAEH,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,SAAS,CAAC,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;AACnE,CAAC;AAED,SAAsB,mBAAmB,CAAC,IAAU,EAAE,OAAuB;;QAC3E,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAEpC,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;QACvD,MAAM,WAAW,GAAG,IAAA,WAAI,EAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAEhD,IAAA,gCAAuB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;YAC1C,IAAI,EAAE,WAAW;SAClB,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC;QACpD,MAAM,iBAAiB,GAAG,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,WAAW,EAAE,cAAc,CAAC,CAAC,CAAC;QACzE,MAAM,OAAO,GAAG,SAAS,KAAK,CAAC,IAAI,CAAC,SAAS,KAAK,CAAC,IAAI,iBAAiB,CAAC,CAAC;QAE1E,IAAI,OAAO,EAAE;YACX,QAAQ,CAAC,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;SAChD;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAnBD,kDAmBC;AAEY,QAAA,mBAAmB,GAAG,IAAA,2BAAkB,EAAC,mBAAmB,CAAC,CAAC"}
|
|
@@ -8,20 +8,20 @@ const insert_import_1 = require("../utils/insert-import");
|
|
|
8
8
|
const insert_statement_1 = require("../utils/insert-statement");
|
|
9
9
|
const presets_1 = require("../utils/presets");
|
|
10
10
|
function presetGenerator(tree, options) {
|
|
11
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
12
12
|
options = normalizeOptions(options);
|
|
13
13
|
yield createPreset(tree, options);
|
|
14
|
-
yield devkit_1.formatFiles(tree);
|
|
14
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
15
15
|
return () => {
|
|
16
|
-
devkit_1.installPackagesTask(tree);
|
|
16
|
+
(0, devkit_1.installPackagesTask)(tree);
|
|
17
17
|
};
|
|
18
18
|
});
|
|
19
19
|
}
|
|
20
20
|
exports.presetGenerator = presetGenerator;
|
|
21
|
-
exports.presetSchematic = devkit_1.convertNxGenerator(presetGenerator);
|
|
21
|
+
exports.presetSchematic = (0, devkit_1.convertNxGenerator)(presetGenerator);
|
|
22
22
|
exports.default = presetGenerator;
|
|
23
23
|
function createPreset(tree, options) {
|
|
24
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
24
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
25
25
|
if (options.preset === presets_1.Preset.Empty) {
|
|
26
26
|
return;
|
|
27
27
|
}
|
|
@@ -29,7 +29,7 @@ function createPreset(tree, options) {
|
|
|
29
29
|
return;
|
|
30
30
|
}
|
|
31
31
|
else if (options.preset === presets_1.Preset.Angular) {
|
|
32
|
-
const { applicationGenerator: angularApplicationGenerator, } = require('@nrwl' + '/angular/
|
|
32
|
+
const { applicationGenerator: angularApplicationGenerator, } = require('@nrwl' + '/angular/generators');
|
|
33
33
|
yield angularApplicationGenerator(tree, {
|
|
34
34
|
name: options.name,
|
|
35
35
|
style: options.style,
|
|
@@ -68,14 +68,14 @@ function createPreset(tree, options) {
|
|
|
68
68
|
linter: options.linter,
|
|
69
69
|
standaloneConfig: options.standaloneConfig,
|
|
70
70
|
});
|
|
71
|
-
devkit_1.addDependenciesToPackageJson(tree, {}, {
|
|
71
|
+
(0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
|
|
72
72
|
'@ungap/custom-elements': '0.1.6',
|
|
73
73
|
});
|
|
74
|
-
addPolyfills(tree, `apps/${devkit_1.names(options.name).fileName}/src/polyfills.ts`, ['@ungap/custom-elements']);
|
|
74
|
+
addPolyfills(tree, `apps/${(0, devkit_1.names)(options.name).fileName}/src/polyfills.ts`, ['@ungap/custom-elements']);
|
|
75
75
|
setDefaultCollection(tree, '@nrwl/web');
|
|
76
76
|
}
|
|
77
77
|
else if (options.preset === presets_1.Preset.AngularWithNest) {
|
|
78
|
-
const { applicationGenerator: angularApplicationGenerator, } = require('@nrwl' + '/angular/
|
|
78
|
+
const { applicationGenerator: angularApplicationGenerator, } = require('@nrwl' + '/angular/generators');
|
|
79
79
|
const { applicationGenerator: nestApplicationGenerator } = require('@nrwl' +
|
|
80
80
|
'/nest');
|
|
81
81
|
yield angularApplicationGenerator(tree, {
|
|
@@ -91,7 +91,7 @@ function createPreset(tree, options) {
|
|
|
91
91
|
linter: options.linter,
|
|
92
92
|
standaloneConfig: options.standaloneConfig,
|
|
93
93
|
});
|
|
94
|
-
yield library_1.libraryGenerator(tree, {
|
|
94
|
+
yield (0, library_1.libraryGenerator)(tree, {
|
|
95
95
|
name: 'api-interfaces',
|
|
96
96
|
unitTestRunner: 'none',
|
|
97
97
|
linter: options.linter,
|
|
@@ -115,7 +115,7 @@ function createPreset(tree, options) {
|
|
|
115
115
|
linter: options.linter,
|
|
116
116
|
standaloneConfig: options.standaloneConfig,
|
|
117
117
|
});
|
|
118
|
-
yield library_1.libraryGenerator(tree, {
|
|
118
|
+
yield (0, library_1.libraryGenerator)(tree, {
|
|
119
119
|
name: 'api-interfaces',
|
|
120
120
|
unitTestRunner: 'none',
|
|
121
121
|
linter: options.linter,
|
|
@@ -171,10 +171,10 @@ function createPreset(tree, options) {
|
|
|
171
171
|
function connectAngularAndNest(host, options) {
|
|
172
172
|
var _a;
|
|
173
173
|
const { insertNgModuleImport } = require('@nrwl' +
|
|
174
|
-
'/angular/src/generators/utils
|
|
174
|
+
'/angular/src/generators/utils');
|
|
175
175
|
host.write('libs/api-interfaces/src/lib/api-interfaces.ts', `export interface Message { message: string }`);
|
|
176
176
|
const modulePath = `apps/${options.name}/src/app/app.module.ts`;
|
|
177
|
-
insert_import_1.insertImport(host, modulePath, 'HttpClientModule', '@angular/common/http');
|
|
177
|
+
(0, insert_import_1.insertImport)(host, modulePath, 'HttpClientModule', '@angular/common/http');
|
|
178
178
|
insertNgModuleImport(host, modulePath, 'HttpClientModule');
|
|
179
179
|
const scope = options.npmScope;
|
|
180
180
|
const style = (_a = options.style) !== null && _a !== void 0 ? _a : 'css';
|
|
@@ -322,16 +322,16 @@ server.on('error', console.error);
|
|
|
322
322
|
`);
|
|
323
323
|
}
|
|
324
324
|
function setDefaultCollection(tree, defaultCollection) {
|
|
325
|
-
const workspaceConfiguration = devkit_1.readWorkspaceConfiguration(tree);
|
|
326
|
-
devkit_1.updateWorkspaceConfiguration(tree, Object.assign(Object.assign({}, workspaceConfiguration), { cli: Object.assign(Object.assign({}, (workspaceConfiguration.cli || {})), { defaultCollection }) }));
|
|
325
|
+
const workspaceConfiguration = (0, devkit_1.readWorkspaceConfiguration)(tree);
|
|
326
|
+
(0, devkit_1.updateWorkspaceConfiguration)(tree, Object.assign(Object.assign({}, workspaceConfiguration), { cli: Object.assign(Object.assign({}, (workspaceConfiguration.cli || {})), { defaultCollection }) }));
|
|
327
327
|
}
|
|
328
328
|
function addPolyfills(host, polyfillsPath, polyfills) {
|
|
329
329
|
for (const polyfill of polyfills) {
|
|
330
|
-
insert_statement_1.insertStatement(host, polyfillsPath, `import '${polyfill}';\n`);
|
|
330
|
+
(0, insert_statement_1.insertStatement)(host, polyfillsPath, `import '${polyfill}';\n`);
|
|
331
331
|
}
|
|
332
332
|
}
|
|
333
333
|
function normalizeOptions(options) {
|
|
334
|
-
options.name = devkit_1.names(options.name).fileName;
|
|
334
|
+
options.name = (0, devkit_1.names)(options.name).fileName;
|
|
335
335
|
return options;
|
|
336
336
|
}
|
|
337
337
|
//# sourceMappingURL=preset.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/preset/preset.ts"],"names":[],"mappings":";;;;AAAA,yCASsB;AAGtB,gDAAsD;AAEtD,0DAAsD;AACtD,gEAA4D;AAC5D,8CAA0C;AAE1C,SAAsB,eAAe,CAAC,IAAU,EAAE,OAAe;;QAC/D,OAAO,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACpC,MAAM,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAClC,MAAM,oBAAW,
|
|
1
|
+
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/preset/preset.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,12 +9,12 @@ const project_graph_1 = require("../../../core/project-graph");
|
|
|
9
9
|
* Throws an error if the project is in use, unless the `--forceRemove` option is used.
|
|
10
10
|
*/
|
|
11
11
|
function checkDependencies(_, schema) {
|
|
12
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
12
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
13
13
|
if (schema.forceRemove) {
|
|
14
14
|
return;
|
|
15
15
|
}
|
|
16
|
-
const graph = yield project_graph_1.createProjectGraphAsync();
|
|
17
|
-
const reverseGraph = project_graph_1.reverse(graph);
|
|
16
|
+
const graph = yield (0, project_graph_1.createProjectGraphAsync)();
|
|
17
|
+
const reverseGraph = (0, project_graph_1.reverse)(graph);
|
|
18
18
|
const deps = reverseGraph.dependencies[schema.projectName] || [];
|
|
19
19
|
if (deps.length > 0) {
|
|
20
20
|
throw new Error(`${schema.projectName} is still depended on by the following projects:\n${deps
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/check-dependencies.ts"],"names":[],"mappings":";;;;AAAA,+DAA+E;AAI/E;;;;GAIG;AACH,SAAsB,iBAAiB,CAAC,CAAC,EAAE,MAAc;;QACvD,IAAI,MAAM,CAAC,WAAW,EAAE;YACtB,OAAO;SACR;QAED,MAAM,KAAK,GAAiB,MAAM,uCAAuB,
|
|
1
|
+
{"version":3,"file":"check-dependencies.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/check-dependencies.ts"],"names":[],"mappings":";;;;AAAA,+DAA+E;AAI/E;;;;GAIG;AACH,SAAsB,iBAAiB,CAAC,CAAC,EAAE,MAAc;;QACvD,IAAI,MAAM,CAAC,WAAW,EAAE;YACtB,OAAO;SACR;QAED,MAAM,KAAK,GAAiB,MAAM,IAAA,uCAAuB,GAAE,CAAC;QAE5D,MAAM,YAAY,GAAG,IAAA,uBAAO,EAAC,KAAK,CAAC,CAAC;QAEpC,MAAM,IAAI,GAAG,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;QAEjE,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;YACnB,MAAM,IAAI,KAAK,CACb,GACE,MAAM,CAAC,WACT,qDAAqD,IAAI;iBACtD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;iBACpB,IAAI,CAAC,IAAI,CAAC,EAAE,CAChB,CAAC;SACH;IACH,CAAC;CAAA;AApBD,8CAoBC"}
|
|
@@ -15,7 +15,7 @@ function checkTargets(tree, schema, proj) {
|
|
|
15
15
|
}
|
|
16
16
|
const errors = [];
|
|
17
17
|
const findRegex = new RegExp(`${schema.projectName}:(${Object.keys(proj.targets).join('|')})`);
|
|
18
|
-
devkit_1.getProjects(tree).forEach((project, projectName) => {
|
|
18
|
+
(0, devkit_1.getProjects)(tree).forEach((project, projectName) => {
|
|
19
19
|
if (projectName === schema.projectName) {
|
|
20
20
|
return;
|
|
21
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check-targets.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/check-targets.ts"],"names":[],"mappings":";;;AAAA,yCAAuE;AAGvE;;;;;;GAMG;AACH,SAAgB,YAAY,CAC1B,IAAU,EACV,MAAc,EACd,IAA0B;IAE1B,IAAI,MAAM,CAAC,WAAW,EAAE;QACtB,OAAO;KACR;IAED,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,SAAS,GAAG,IAAI,MAAM,CAC1B,GAAG,MAAM,CAAC,WAAW,KAAK,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CACjE,CAAC;IACF,oBAAW,
|
|
1
|
+
{"version":3,"file":"check-targets.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/check-targets.ts"],"names":[],"mappings":";;;AAAA,yCAAuE;AAGvE;;;;;;GAMG;AACH,SAAgB,YAAY,CAC1B,IAAU,EACV,MAAc,EACd,IAA0B;IAE1B,IAAI,MAAM,CAAC,WAAW,EAAE;QACtB,OAAO;KACR;IAED,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,MAAM,SAAS,GAAG,IAAI,MAAM,CAC1B,GAAG,MAAM,CAAC,WAAW,KAAK,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CACjE,CAAC;IACF,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE;QACjD,IAAI,WAAW,KAAK,MAAM,CAAC,WAAW,EAAE;YACtC,OAAO;SACR;QAED,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QACxD,IAAI,OAAO,EAAE;YACX,MAAM,CAAC,IAAI,CACT,IAAI,MAAM,CAAC,WAAW,IAAI,OAAO,CAAC,CAAC,CAAC,iBAAiB,WAAW,GAAG,CACpE,CAAC;SACH;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QACrB,IAAI,OAAO,GAAG,GAAG,MAAM,CAAC,WAAW,0CAA0C,CAAC;QAC9E,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE;YACxB,OAAO,IAAI,GAAG,KAAK,IAAI,CAAC;SACzB;QAED,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;KAC1B;AACH,CAAC;AAlCD,oCAkCC"}
|
|
@@ -9,22 +9,22 @@ const devkit_2 = require("@nrwl/devkit");
|
|
|
9
9
|
* @param schema The options provided to the schematic
|
|
10
10
|
*/
|
|
11
11
|
function removeProjectConfig(tree, schema) {
|
|
12
|
-
devkit_2.removeProjectConfiguration(tree, schema.projectName);
|
|
12
|
+
(0, devkit_2.removeProjectConfiguration)(tree, schema.projectName);
|
|
13
13
|
// Unset default project if deleting the default project
|
|
14
|
-
const workspaceConfiguration = devkit_2.readWorkspaceConfiguration(tree);
|
|
14
|
+
const workspaceConfiguration = (0, devkit_2.readWorkspaceConfiguration)(tree);
|
|
15
15
|
if (workspaceConfiguration.defaultProject &&
|
|
16
16
|
workspaceConfiguration.defaultProject === schema.projectName) {
|
|
17
|
-
const workspacePath = devkit_2.getWorkspacePath(tree);
|
|
17
|
+
const workspacePath = (0, devkit_2.getWorkspacePath)(tree);
|
|
18
18
|
delete workspaceConfiguration.defaultProject;
|
|
19
19
|
console.warn(`Default project was removed in ${workspacePath} because it was "${schema.projectName}". If you want a default project you should define a new one.`);
|
|
20
|
-
devkit_1.updateWorkspaceConfiguration(tree, workspaceConfiguration);
|
|
20
|
+
(0, devkit_1.updateWorkspaceConfiguration)(tree, workspaceConfiguration);
|
|
21
21
|
}
|
|
22
22
|
// Remove implicit dependencies onto removed project
|
|
23
|
-
devkit_1.getProjects(tree).forEach((project, projectName) => {
|
|
23
|
+
(0, devkit_1.getProjects)(tree).forEach((project, projectName) => {
|
|
24
24
|
if (project.implicitDependencies) {
|
|
25
25
|
project.implicitDependencies = project.implicitDependencies.filter((projectName) => projectName !== schema.projectName);
|
|
26
26
|
}
|
|
27
|
-
devkit_1.updateProjectConfiguration(tree, projectName, project);
|
|
27
|
+
(0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
|
|
28
28
|
});
|
|
29
29
|
}
|
|
30
30
|
exports.removeProjectConfig = removeProjectConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove-project-config.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/remove-project-config.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AACtB,yCAIsB;AAEtB;;;;GAIG;AACH,SAAgB,mBAAmB,CAAC,IAAU,EAAE,MAAc;IAC5D,mCAA0B,
|
|
1
|
+
{"version":3,"file":"remove-project-config.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/remove-project-config.ts"],"names":[],"mappings":";;;AACA,yCAKsB;AACtB,yCAIsB;AAEtB;;;;GAIG;AACH,SAAgB,mBAAmB,CAAC,IAAU,EAAE,MAAc;IAC5D,IAAA,mCAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAErD,wDAAwD;IACxD,MAAM,sBAAsB,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAChE,IACE,sBAAsB,CAAC,cAAc;QACrC,sBAAsB,CAAC,cAAc,KAAK,MAAM,CAAC,WAAW,EAC5D;QACA,MAAM,aAAa,GAAG,IAAA,yBAAgB,EAAC,IAAI,CAAC,CAAC;QAC7C,OAAO,sBAAsB,CAAC,cAAc,CAAC;QAC7C,OAAO,CAAC,IAAI,CACV,kCAAkC,aAAa,oBAAoB,MAAM,CAAC,WAAW,+DAA+D,CACrJ,CAAC;QAEF,IAAA,qCAA4B,EAAC,IAAI,EAAE,sBAAsB,CAAC,CAAC;KAC5D;IAED,oDAAoD;IACpD,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE;QACjD,IAAI,OAAO,CAAC,oBAAoB,EAAE;YAChC,OAAO,CAAC,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC,MAAM,CAChE,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,KAAK,MAAM,CAAC,WAAW,CACpD,CAAC;SACH;QACD,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;AACL,CAAC;AA3BD,kDA2BC"}
|
|
@@ -6,7 +6,7 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
6
6
|
* Removes (deletes) a project's files from the folder tree
|
|
7
7
|
*/
|
|
8
8
|
function removeProject(tree, project) {
|
|
9
|
-
devkit_1.visitNotIgnoredFiles(tree, project.root, (file) => {
|
|
9
|
+
(0, devkit_1.visitNotIgnoredFiles)(tree, project.root, (file) => {
|
|
10
10
|
tree.delete(file);
|
|
11
11
|
});
|
|
12
12
|
tree.delete(project.root);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove-project.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/remove-project.ts"],"names":[],"mappings":";;;AAAA,yCAAgF;AAEhF;;GAEG;AACH,SAAgB,aAAa,CAAC,IAAU,EAAE,OAA6B;IACrE,6BAAoB,
|
|
1
|
+
{"version":3,"file":"remove-project.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/remove-project.ts"],"names":[],"mappings":";;;AAAA,yCAAgF;AAEhF;;GAEG;AACH,SAAgB,aAAa,CAAC,IAAU,EAAE,OAA6B;IACrE,IAAA,6BAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE;QAChD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC;AALD,sCAKC"}
|
|
@@ -14,21 +14,21 @@ function isUsingUtilityFunction(host) {
|
|
|
14
14
|
function updateJestConfig(tree, schema, projectConfig) {
|
|
15
15
|
const projectToRemove = schema.projectName;
|
|
16
16
|
if (!tree.exists('jest.config.js') ||
|
|
17
|
-
!tree.exists(path_1.join(projectConfig.root, 'jest.config.js')) ||
|
|
17
|
+
!tree.exists((0, path_1.join)(projectConfig.root, 'jest.config.js')) ||
|
|
18
18
|
isUsingUtilityFunction(tree)) {
|
|
19
19
|
return;
|
|
20
20
|
}
|
|
21
21
|
const contents = tree.read('jest.config.js', 'utf-8');
|
|
22
|
-
const sourceFile = typescript_1.createSourceFile('jest.config.js', contents, typescript_1.ScriptTarget.Latest);
|
|
23
|
-
const sourceNodes = get_source_nodes_1.getSourceNodes(sourceFile);
|
|
24
|
-
const projectsAssignment = sourceNodes.find((node) => typescript_1.isPropertyAssignment(node) &&
|
|
22
|
+
const sourceFile = (0, typescript_1.createSourceFile)('jest.config.js', contents, typescript_1.ScriptTarget.Latest);
|
|
23
|
+
const sourceNodes = (0, get_source_nodes_1.getSourceNodes)(sourceFile);
|
|
24
|
+
const projectsAssignment = sourceNodes.find((node) => (0, typescript_1.isPropertyAssignment)(node) &&
|
|
25
25
|
node.name.getText(sourceFile) === 'projects' &&
|
|
26
|
-
typescript_1.isArrayLiteralExpression(node.initializer));
|
|
26
|
+
(0, typescript_1.isArrayLiteralExpression)(node.initializer));
|
|
27
27
|
if (!projectsAssignment) {
|
|
28
28
|
throw Error(`Could not remove ${projectToRemove} from projects in /jest.config.js. Please remove ${projectToRemove} from your projects.`);
|
|
29
29
|
}
|
|
30
30
|
const projectsArray = projectsAssignment.initializer;
|
|
31
|
-
const project = projectsArray.elements.find((item) => typescript_1.isStringLiteral(item) &&
|
|
31
|
+
const project = projectsArray.elements.find((item) => (0, typescript_1.isStringLiteral)(item) &&
|
|
32
32
|
item.text.startsWith(`<rootDir>/${projectConfig.root}`));
|
|
33
33
|
if (!project) {
|
|
34
34
|
console.warn(`Could not find ${projectToRemove} in projects in /jest.config.js.`);
|
|
@@ -38,7 +38,7 @@ function updateJestConfig(tree, schema, projectConfig) {
|
|
|
38
38
|
const start = previousProject
|
|
39
39
|
? previousProject.getEnd()
|
|
40
40
|
: project.getStart(sourceFile);
|
|
41
|
-
tree.write('jest.config.js', devkit_1.applyChangesToString(contents, [
|
|
41
|
+
tree.write('jest.config.js', (0, devkit_1.applyChangesToString)(contents, [
|
|
42
42
|
{
|
|
43
43
|
type: devkit_1.ChangeType.Delete,
|
|
44
44
|
start,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-jest-config.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/update-jest-config.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,qFAAgF;AAGhF,2CASoB;AACpB,+BAA4B;AAE5B,SAAS,sBAAsB,CAAC,IAAU;IACxC,OAAO,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;AAC9E,CAAC;AAED;;GAEG;AACH,SAAgB,gBAAgB,CAC9B,IAAU,EACV,MAAc,EACd,aAAmC;IAEnC,MAAM,eAAe,GAAG,MAAM,CAAC,WAAW,CAAC;IAE3C,IACE,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;QAC9B,CAAC,IAAI,CAAC,MAAM,CAAC,WAAI,
|
|
1
|
+
{"version":3,"file":"update-jest-config.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/update-jest-config.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,qFAAgF;AAGhF,2CASoB;AACpB,+BAA4B;AAE5B,SAAS,sBAAsB,CAAC,IAAU;IACxC,OAAO,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;AAC9E,CAAC;AAED;;GAEG;AACH,SAAgB,gBAAgB,CAC9B,IAAU,EACV,MAAc,EACd,aAAmC;IAEnC,MAAM,eAAe,GAAG,MAAM,CAAC,WAAW,CAAC;IAE3C,IACE,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;QAC9B,CAAC,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QACxD,sBAAsB,CAAC,IAAI,CAAC,EAC5B;QACA,OAAO;KACR;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IACtD,MAAM,UAAU,GAAG,IAAA,6BAAgB,EACjC,gBAAgB,EAChB,QAAQ,EACR,yBAAY,CAAC,MAAM,CACpB,CAAC;IAEF,MAAM,WAAW,GAAG,IAAA,iCAAc,EAAC,UAAU,CAAC,CAAC;IAE/C,MAAM,kBAAkB,GAAG,WAAW,CAAC,IAAI,CACzC,CAAC,IAAI,EAAE,EAAE,CACP,IAAA,iCAAoB,EAAC,IAAI,CAAC;QAC1B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,UAAU;QAC5C,IAAA,qCAAwB,EAAC,IAAI,CAAC,WAAW,CAAC,CACvB,CAAC;IAExB,IAAI,CAAC,kBAAkB,EAAE;QACvB,MAAM,KAAK,CACT,oBAAoB,eAAe,oDAAoD,eAAe,sBAAsB,CAC7H,CAAC;KACH;IACD,MAAM,aAAa,GACjB,kBAAkB,CAAC,WAAqC,CAAC;IAE3D,MAAM,OAAO,GAAG,aAAa,CAAC,QAAQ,CAAC,IAAI,CACzC,CAAC,IAAI,EAAE,EAAE,CACP,IAAA,4BAAe,EAAC,IAAI,CAAC;QACrB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,aAAa,CAAC,IAAI,EAAE,CAAC,CACzC,CAAC;IAEnB,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,CAAC,IAAI,CACV,kBAAkB,eAAe,kCAAkC,CACpE,CAAC;QACF,OAAO;KACR;IAED,MAAM,eAAe,GACnB,aAAa,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IAEtE,MAAM,KAAK,GAAG,eAAe;QAC3B,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE;QAC1B,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAEjC,IAAI,CAAC,KAAK,CACR,gBAAgB,EAChB,IAAA,6BAAoB,EAAC,QAAQ,EAAE;QAC7B;YACE,IAAI,EAAE,mBAAU,CAAC,MAAM;YACvB,KAAK;YACL,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG,KAAK;SACjC;KACF,CAAC,CACH,CAAC;AACJ,CAAC;AArED,4CAqEC"}
|
|
@@ -8,10 +8,10 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
8
8
|
* @param schema The options provided to the schematic
|
|
9
9
|
*/
|
|
10
10
|
function updateTsconfig(tree, schema, project) {
|
|
11
|
-
const { appsDir, libsDir, npmScope } = devkit_1.getWorkspaceLayout(tree);
|
|
11
|
+
const { appsDir, libsDir, npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
|
|
12
12
|
const tsConfigPath = 'tsconfig.base.json';
|
|
13
13
|
if (tree.exists(tsConfigPath)) {
|
|
14
|
-
devkit_1.updateJson(tree, tsConfigPath, (json) => {
|
|
14
|
+
(0, devkit_1.updateJson)(tree, tsConfigPath, (json) => {
|
|
15
15
|
delete json.compilerOptions.paths[`@${npmScope}/${project.root.substr(project.projectType === 'application'
|
|
16
16
|
? appsDir.length + 1
|
|
17
17
|
: libsDir.length + 1)}`];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAGtB;;;;GAIG;AACH,SAAgB,cAAc,CAC5B,IAAU,EACV,MAAc,EACd,OAA6B;IAE7B,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,2BAAkB,
|
|
1
|
+
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAGtB;;;;GAIG;AACH,SAAgB,cAAc,CAC5B,IAAU,EACV,MAAc,EACd,OAA6B;IAE7B,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAEhE,MAAM,YAAY,GAAG,oBAAoB,CAAC;IAC1C,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;QAC7B,IAAA,mBAAU,EAAC,IAAI,EAAE,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE;YACtC,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAC/B,IAAI,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,CACjC,OAAO,CAAC,WAAW,KAAK,aAAa;gBACnC,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;gBACpB,CAAC,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CACvB,EAAE,CACJ,CAAC;YAEF,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AArBD,wCAqBC"}
|
|
@@ -10,20 +10,20 @@ const update_tsconfig_1 = require("./lib/update-tsconfig");
|
|
|
10
10
|
const remove_project_config_1 = require("./lib/remove-project-config");
|
|
11
11
|
const update_jest_config_1 = require("./lib/update-jest-config");
|
|
12
12
|
function removeGenerator(tree, schema) {
|
|
13
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
14
|
-
const project = devkit_1.readProjectConfiguration(tree, schema.projectName);
|
|
15
|
-
yield check_dependencies_1.checkDependencies(tree, schema);
|
|
16
|
-
check_targets_1.checkTargets(tree, schema, project);
|
|
17
|
-
update_jest_config_1.updateJestConfig(tree, schema, project);
|
|
18
|
-
remove_project_config_1.removeProjectConfig(tree, schema);
|
|
19
|
-
remove_project_1.removeProject(tree, project);
|
|
20
|
-
update_tsconfig_1.updateTsconfig(tree, schema, project);
|
|
13
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
14
|
+
const project = (0, devkit_1.readProjectConfiguration)(tree, schema.projectName);
|
|
15
|
+
yield (0, check_dependencies_1.checkDependencies)(tree, schema);
|
|
16
|
+
(0, check_targets_1.checkTargets)(tree, schema, project);
|
|
17
|
+
(0, update_jest_config_1.updateJestConfig)(tree, schema, project);
|
|
18
|
+
(0, remove_project_config_1.removeProjectConfig)(tree, schema);
|
|
19
|
+
(0, remove_project_1.removeProject)(tree, project);
|
|
20
|
+
(0, update_tsconfig_1.updateTsconfig)(tree, schema, project);
|
|
21
21
|
if (!schema.skipFormat) {
|
|
22
|
-
yield devkit_1.formatFiles(tree);
|
|
22
|
+
yield (0, devkit_1.formatFiles)(tree);
|
|
23
23
|
}
|
|
24
24
|
});
|
|
25
25
|
}
|
|
26
26
|
exports.removeGenerator = removeGenerator;
|
|
27
27
|
exports.default = removeGenerator;
|
|
28
|
-
exports.removeSchematic = devkit_1.convertNxGenerator(removeGenerator);
|
|
28
|
+
exports.removeSchematic = (0, devkit_1.convertNxGenerator)(removeGenerator);
|
|
29
29
|
//# sourceMappingURL=remove.js.map
|