@nrwl/workspace 13.1.4 → 13.2.0-beta.4
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 +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.d.ts +0 -3
- package/src/command-line/dep-graph.js +75 -84
- 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.d.ts +0 -1
- package/src/core/file-utils.js +31 -33
- 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 +22 -22
- 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 +11 -12
- 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/files/prettier/.prettierignore +1 -0
- 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 +8 -8
- package/src/generators/move/lib/update-imports.js.map +1 -1
- package/src/generators/move/lib/update-package-json.js +1 -1
- package/src/generators/move/lib/update-package-json.js.map +1 -1
- package/src/generators/move/lib/update-project-root-files.js +3 -3
- package/src/generators/move/lib/update-project-root-files.js.map +1 -1
- package/src/generators/move/lib/update-readme.js +1 -1
- package/src/generators/move/lib/update-readme.js.map +1 -1
- package/src/generators/move/lib/update-storybook-config.js +2 -2
- package/src/generators/move/lib/update-storybook-config.js.map +1 -1
- package/src/generators/move/lib/utils.js +2 -2
- package/src/generators/move/lib/utils.js.map +1 -1
- package/src/generators/move/move.js +19 -19
- package/src/generators/move/move.js.map +1 -1
- package/src/generators/new/new.js +23 -23
- package/src/generators/new/new.js.map +1 -1
- package/src/generators/npm-package/npm-package.js +12 -12
- package/src/generators/npm-package/npm-package.js.map +1 -1
- package/src/generators/preset/preset.js +17 -17
- package/src/generators/preset/preset.js.map +1 -1
- package/src/generators/remove/lib/check-dependencies.js +3 -3
- package/src/generators/remove/lib/check-dependencies.js.map +1 -1
- package/src/generators/remove/lib/check-targets.js +1 -1
- package/src/generators/remove/lib/check-targets.js.map +1 -1
- package/src/generators/remove/lib/remove-project-config.js +6 -6
- package/src/generators/remove/lib/remove-project-config.js.map +1 -1
- package/src/generators/remove/lib/remove-project.js +1 -1
- package/src/generators/remove/lib/remove-project.js.map +1 -1
- package/src/generators/remove/lib/update-jest-config.js +7 -7
- package/src/generators/remove/lib/update-jest-config.js.map +1 -1
- package/src/generators/remove/lib/update-tsconfig.js +2 -2
- package/src/generators/remove/lib/update-tsconfig.js.map +1 -1
- package/src/generators/remove/remove.js +10 -10
- package/src/generators/remove/remove.js.map +1 -1
- package/src/generators/run-commands/run-commands.js +5 -5
- package/src/generators/run-commands/run-commands.js.map +1 -1
- package/src/generators/utils/insert-import.js +5 -5
- package/src/generators/utils/insert-import.js.map +1 -1
- package/src/generators/utils/insert-statement.js +2 -2
- package/src/generators/utils/insert-statement.js.map +1 -1
- package/src/generators/workspace/workspace.js +18 -18
- package/src/generators/workspace/workspace.js.map +1 -1
- package/src/generators/workspace-generator/workspace-generator.js +5 -5
- package/src/generators/workspace-generator/workspace-generator.js.map +1 -1
- package/src/migrations/update-10-0-0/solution-tsconfigs.js +18 -18
- package/src/migrations/update-10-0-0/solution-tsconfigs.js.map +1 -1
- package/src/migrations/update-10-0-0/update-10-0-0.js +3 -3
- package/src/migrations/update-10-0-0/update-10-0-0.js.map +1 -1
- package/src/migrations/update-10-0-1/migrate-eslintrc.js +6 -6
- package/src/migrations/update-10-0-1/migrate-eslintrc.js.map +1 -1
- package/src/migrations/update-10-1-0/migrate-eslintrc-tsconfig-wildcard.js +4 -4
- package/src/migrations/update-10-1-0/migrate-eslintrc-tsconfig-wildcard.js.map +1 -1
- package/src/migrations/update-10-3-0/add-buildable-project-deps-in-package-json-type.js +3 -3
- package/src/migrations/update-10-3-0/add-buildable-project-deps-in-package-json-type.js.map +1 -1
- package/src/migrations/update-10-3-0/add-cli-dependency.js +5 -5
- package/src/migrations/update-10-3-0/add-cli-dependency.js.map +1 -1
- package/src/migrations/update-10-3-0/add-vscode-extensions.js +3 -3
- package/src/migrations/update-10-3-0/add-vscode-extensions.js.map +1 -1
- package/src/migrations/update-10-3-0/update-typescript.js +2 -2
- package/src/migrations/update-10-3-0/update-typescript.js.map +1 -1
- package/src/migrations/update-10-4-0/add-explicit-dep-on-tao.js +5 -5
- package/src/migrations/update-10-4-0/add-explicit-dep-on-tao.js.map +1 -1
- package/src/migrations/update-10-4-0/update-script-to-invoke-nx-migrate.js +1 -1
- package/src/migrations/update-10-4-0/update-script-to-invoke-nx-migrate.js.map +1 -1
- package/src/migrations/update-11-0-0/add-outputs-in-workspace.js +2 -2
- package/src/migrations/update-11-0-0/add-outputs-in-workspace.js.map +1 -1
- package/src/migrations/update-11-0-0/rename-workspace-schematic-script.js +1 -1
- package/src/migrations/update-11-0-0/rename-workspace-schematic-script.js.map +1 -1
- package/src/migrations/update-11-0-0/rename-workspace-schematics.js +2 -2
- package/src/migrations/update-11-0-0/rename-workspace-schematics.js.map +1 -1
- package/src/migrations/update-11-0-0/update-decorate-angular-cli.js +1 -1
- package/src/migrations/update-11-0-0/update-decorate-angular-cli.js.map +1 -1
- package/src/migrations/update-11-0-0/update-node-types.js +2 -2
- package/src/migrations/update-11-0-0/update-node-types.js.map +1 -1
- package/src/migrations/update-11-1-2/update-11-1-2.js +2 -2
- package/src/migrations/update-11-1-2/update-11-1-2.js.map +1 -1
- package/src/migrations/update-12-5-0/add-target-dependencies.js +4 -4
- package/src/migrations/update-12-5-0/add-target-dependencies.js.map +1 -1
- package/src/migrations/update-13-0-0/config-locations/config-locations.js +6 -6
- package/src/migrations/update-13-0-0/config-locations/config-locations.js.map +1 -1
- package/src/migrations/update-13-0-0/set-default-base-if-not-set.js +4 -4
- package/src/migrations/update-13-0-0/set-default-base-if-not-set.js.map +1 -1
- package/src/migrations/update-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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/remove/remove.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AAEtB,iEAA6D;AAC7D,uDAAmD;AACnD,yDAAqD;AACrD,2DAAuD;AACvD,uEAAkE;AAElE,iEAA4D;AAE5D,SAAsB,eAAe,CAAC,IAAU,EAAE,MAAc;;QAC9D,MAAM,OAAO,GAAG,iCAAwB,
|
|
1
|
+
{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/remove/remove.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AAEtB,iEAA6D;AAC7D,uDAAmD;AACnD,yDAAqD;AACrD,2DAAuD;AACvD,uEAAkE;AAElE,iEAA4D;AAE5D,SAAsB,eAAe,CAAC,IAAU,EAAE,MAAc;;QAC9D,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;QACnE,MAAM,IAAA,sCAAiB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACtC,IAAA,4BAAY,EAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACpC,IAAA,qCAAgB,EAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACxC,IAAA,2CAAmB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAClC,IAAA,8BAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC7B,IAAA,gCAAc,EAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACtC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAXD,0CAWC;AAED,kBAAe,eAAe,CAAC;AAElB,QAAA,eAAe,GAAG,IAAA,2BAAkB,EAAC,eAAe,CAAC,CAAC"}
|
|
@@ -4,8 +4,8 @@ exports.runCommandsSchematic = exports.runCommandsGenerator = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
function runCommandsGenerator(host, schema) {
|
|
7
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
8
|
-
const project = devkit_1.readProjectConfiguration(host, schema.project);
|
|
7
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
8
|
+
const project = (0, devkit_1.readProjectConfiguration)(host, schema.project);
|
|
9
9
|
project.targets = project.targets || {};
|
|
10
10
|
project.targets[schema.name] = {
|
|
11
11
|
executor: '@nrwl/workspace:run-commands',
|
|
@@ -18,11 +18,11 @@ function runCommandsGenerator(host, schema) {
|
|
|
18
18
|
envFile: schema.envFile,
|
|
19
19
|
},
|
|
20
20
|
};
|
|
21
|
-
devkit_1.updateProjectConfiguration(host, schema.project, project);
|
|
22
|
-
yield devkit_1.formatFiles(host);
|
|
21
|
+
(0, devkit_1.updateProjectConfiguration)(host, schema.project, project);
|
|
22
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
23
23
|
});
|
|
24
24
|
}
|
|
25
25
|
exports.runCommandsGenerator = runCommandsGenerator;
|
|
26
26
|
exports.default = runCommandsGenerator;
|
|
27
|
-
exports.runCommandsSchematic = devkit_1.convertNxGenerator(runCommandsGenerator);
|
|
27
|
+
exports.runCommandsSchematic = (0, devkit_1.convertNxGenerator)(runCommandsGenerator);
|
|
28
28
|
//# sourceMappingURL=run-commands.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-commands.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/run-commands/run-commands.ts"],"names":[],"mappings":";;;;AACA,yCAMsB;AAEtB,SAAsB,oBAAoB,CAAC,IAAU,EAAE,MAAc;;QACnE,MAAM,OAAO,GAAG,iCAAwB,
|
|
1
|
+
{"version":3,"file":"run-commands.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/run-commands/run-commands.ts"],"names":[],"mappings":";;;;AACA,yCAMsB;AAEtB,SAAsB,oBAAoB,CAAC,IAAU,EAAE,MAAc;;QACnE,MAAM,OAAO,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;QAC/D,OAAO,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;QACxC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG;YAC7B,QAAQ,EAAE,8BAA8B;YACxC,OAAO,EAAE,MAAM,CAAC,OAAO;gBACrB,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAChD,CAAC,CAAC,EAAE;YACN,OAAO,EAAE;gBACP,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,GAAG,EAAE,MAAM,CAAC,GAAG;gBACf,OAAO,EAAE,MAAM,CAAC,OAAO;aACxB;SACF,CAAC;QACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAE1D,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAjBD,oDAiBC;AAED,kBAAe,oBAAoB,CAAC;AAEvB,QAAA,oBAAoB,GAAG,IAAA,2BAAkB,EAAC,oBAAoB,CAAC,CAAC"}
|
|
@@ -6,17 +6,17 @@ const devkit_1 = require("@nrwl/devkit");
|
|
|
6
6
|
const typescript_1 = require("typescript");
|
|
7
7
|
function insertImport(tree, path, name, modulePath) {
|
|
8
8
|
const contents = tree.read(path, 'utf-8');
|
|
9
|
-
const sourceFile = typescript_1.createSourceFile(path, contents, typescript_1.ScriptTarget.ESNext);
|
|
9
|
+
const sourceFile = (0, typescript_1.createSourceFile)(path, contents, typescript_1.ScriptTarget.ESNext);
|
|
10
10
|
const importStatements = sourceFile.statements.filter(typescript_1.isImportDeclaration);
|
|
11
|
-
const existingImport = importStatements.find((statement) => typescript_1.isStringLiteral(statement.moduleSpecifier) &&
|
|
11
|
+
const existingImport = importStatements.find((statement) => (0, typescript_1.isStringLiteral)(statement.moduleSpecifier) &&
|
|
12
12
|
statement.moduleSpecifier
|
|
13
13
|
.getText(sourceFile)
|
|
14
14
|
.replace(/['"`]/g, '')
|
|
15
15
|
.trim() === modulePath &&
|
|
16
16
|
statement.importClause.namedBindings &&
|
|
17
|
-
typescript_1.isNamedImports(statement.importClause.namedBindings));
|
|
17
|
+
(0, typescript_1.isNamedImports)(statement.importClause.namedBindings));
|
|
18
18
|
if (!existingImport) {
|
|
19
|
-
insert_statement_1.insertStatement(tree, path, `import { ${name} } from '${modulePath}';`);
|
|
19
|
+
(0, insert_statement_1.insertStatement)(tree, path, `import { ${name} } from '${modulePath}';`);
|
|
20
20
|
return;
|
|
21
21
|
}
|
|
22
22
|
// TODO: Also check if the namedImport already exists
|
|
@@ -30,7 +30,7 @@ function insertImport(tree, path, name, modulePath) {
|
|
|
30
30
|
else {
|
|
31
31
|
text = `,${name}`;
|
|
32
32
|
}
|
|
33
|
-
const newContents = devkit_1.applyChangesToString(contents, [
|
|
33
|
+
const newContents = (0, devkit_1.applyChangesToString)(contents, [
|
|
34
34
|
{
|
|
35
35
|
type: devkit_1.ChangeType.Insert,
|
|
36
36
|
index,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insert-import.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/utils/insert-import.ts"],"names":[],"mappings":";;;AAAA,yDAAqD;AACrD,yCAAsE;AACtE,2CAOoB;AAEpB,SAAgB,YAAY,CAC1B,IAAU,EACV,IAAY,EACZ,IAAY,EACZ,UAAkB;IAElB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAE1C,MAAM,UAAU,GAAG,6BAAgB,
|
|
1
|
+
{"version":3,"file":"insert-import.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/utils/insert-import.ts"],"names":[],"mappings":";;;AAAA,yDAAqD;AACrD,yCAAsE;AACtE,2CAOoB;AAEpB,SAAgB,YAAY,CAC1B,IAAU,EACV,IAAY,EACZ,IAAY,EACZ,UAAkB;IAElB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAE1C,MAAM,UAAU,GAAG,IAAA,6BAAgB,EAAC,IAAI,EAAE,QAAQ,EAAE,yBAAY,CAAC,MAAM,CAAC,CAAC;IAEzE,MAAM,gBAAgB,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,gCAAmB,CAAC,CAAC;IAE3E,MAAM,cAAc,GAAG,gBAAgB,CAAC,IAAI,CAC1C,CAAC,SAAS,EAAE,EAAE,CACZ,IAAA,4BAAe,EAAC,SAAS,CAAC,eAAe,CAAC;QAC1C,SAAS,CAAC,eAAe;aACtB,OAAO,CAAC,UAAU,CAAC;aACnB,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;aACrB,IAAI,EAAE,KAAK,UAAU;QACxB,SAAS,CAAC,YAAY,CAAC,aAAa;QACpC,IAAA,2BAAc,EAAC,SAAS,CAAC,YAAY,CAAC,aAAa,CAAC,CACvD,CAAC;IACF,IAAI,CAAC,cAAc,EAAE;QACnB,IAAA,kCAAe,EAAC,IAAI,EAAE,IAAI,EAAE,YAAY,IAAI,YAAY,UAAU,IAAI,CAAC,CAAC;QACxE,OAAO;KACR;IAED,qDAAqD;IACrD,MAAM,YAAY,GAAG,cAAc,CAAC,YAAY;SAC7C,aAA6B,CAAC;IAEjC,MAAM,KAAK,GAAG,YAAY,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAExC,IAAI,IAAY,CAAC;IACjB,IAAI,YAAY,CAAC,QAAQ,CAAC,gBAAgB,EAAE;QAC1C,IAAI,GAAG,GAAG,IAAI,GAAG,CAAC;KACnB;SAAM;QACL,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;KACnB;IAED,MAAM,WAAW,GAAG,IAAA,6BAAoB,EAAC,QAAQ,EAAE;QACjD;YACE,IAAI,EAAE,mBAAU,CAAC,MAAM;YACvB,KAAK;YACL,IAAI;SACL;KACF,CAAC,CAAC;IAEH,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;AAChC,CAAC;AAjDD,oCAiDC"}
|
|
@@ -8,7 +8,7 @@ const typescript_1 = require("typescript");
|
|
|
8
8
|
*/
|
|
9
9
|
function insertStatement(tree, path, statement) {
|
|
10
10
|
const contents = tree.read(path, 'utf-8');
|
|
11
|
-
const sourceFile = typescript_1.createSourceFile(path, contents, typescript_1.ScriptTarget.ESNext);
|
|
11
|
+
const sourceFile = (0, typescript_1.createSourceFile)(path, contents, typescript_1.ScriptTarget.ESNext);
|
|
12
12
|
const importStatements = sourceFile.statements.filter(typescript_1.isImportDeclaration);
|
|
13
13
|
const index = importStatements.length > 0
|
|
14
14
|
? importStatements[importStatements.length - 1].getEnd()
|
|
@@ -16,7 +16,7 @@ function insertStatement(tree, path, statement) {
|
|
|
16
16
|
if (importStatements.length > 0) {
|
|
17
17
|
statement = `\n${statement}`;
|
|
18
18
|
}
|
|
19
|
-
const newContents = devkit_1.applyChangesToString(contents, [
|
|
19
|
+
const newContents = (0, devkit_1.applyChangesToString)(contents, [
|
|
20
20
|
{
|
|
21
21
|
type: devkit_1.ChangeType.Insert,
|
|
22
22
|
index,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insert-statement.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/utils/insert-statement.ts"],"names":[],"mappings":";;;AAAA,yCAAsE;AACtE,2CAIoB;AAEpB;;GAEG;AACH,SAAgB,eAAe,CAAC,IAAU,EAAE,IAAY,EAAE,SAAiB;IACzE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAE1C,MAAM,UAAU,GAAG,6BAAgB,
|
|
1
|
+
{"version":3,"file":"insert-statement.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/utils/insert-statement.ts"],"names":[],"mappings":";;;AAAA,yCAAsE;AACtE,2CAIoB;AAEpB;;GAEG;AACH,SAAgB,eAAe,CAAC,IAAU,EAAE,IAAY,EAAE,SAAiB;IACzE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAE1C,MAAM,UAAU,GAAG,IAAA,6BAAgB,EAAC,IAAI,EAAE,QAAQ,EAAE,yBAAY,CAAC,MAAM,CAAC,CAAC;IAEzE,MAAM,gBAAgB,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,gCAAmB,CAAC,CAAC;IAC3E,MAAM,KAAK,GACT,gBAAgB,CAAC,MAAM,GAAG,CAAC;QACzB,CAAC,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,MAAM,EAAE;QACxD,CAAC,CAAC,CAAC,CAAC;IAER,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;QAC/B,SAAS,GAAG,KAAK,SAAS,EAAE,CAAC;KAC9B;IAED,MAAM,WAAW,GAAG,IAAA,6BAAoB,EAAC,QAAQ,EAAE;QACjD;YACE,IAAI,EAAE,mBAAU,CAAC,MAAM;YACvB,KAAK;YACL,IAAI,EAAE,SAAS;SAChB;KACF,CAAC,CAAC;IAEH,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;AAChC,CAAC;AAxBD,0CAwBC"}
|
|
@@ -13,11 +13,11 @@ exports.DEFAULT_NRWL_PRETTIER_CONFIG = {
|
|
|
13
13
|
singleQuote: true,
|
|
14
14
|
};
|
|
15
15
|
function decorateAngularClI(host, options) {
|
|
16
|
-
const decorateCli = fs_1.readFileSync(path_1.join(__dirname, '..', 'utils', 'decorate-angular-cli.js__tmpl__')).toString();
|
|
17
|
-
host.write(path_1.join(options.directory, 'decorate-angular-cli.js'), decorateCli);
|
|
16
|
+
const decorateCli = (0, fs_1.readFileSync)((0, path_1.join)(__dirname, '..', 'utils', 'decorate-angular-cli.js__tmpl__')).toString();
|
|
17
|
+
host.write((0, path_1.join)(options.directory, 'decorate-angular-cli.js'), decorateCli);
|
|
18
18
|
}
|
|
19
19
|
function setPresetProperty(tree, options) {
|
|
20
|
-
devkit_1.updateJson(tree, path_1.join(options.directory, 'nx.json'), (json) => {
|
|
20
|
+
(0, devkit_1.updateJson)(tree, (0, path_1.join)(options.directory, 'nx.json'), (json) => {
|
|
21
21
|
if (options.preset === presets_1.Preset.NPM) {
|
|
22
22
|
addPropertyWithStableKeys(json, 'extends', '@nrwl/workspace/presets/npm.json');
|
|
23
23
|
delete json.implicitDependencies;
|
|
@@ -29,31 +29,31 @@ function setPresetProperty(tree, options) {
|
|
|
29
29
|
}
|
|
30
30
|
function createAppsAndLibsFolders(host, options) {
|
|
31
31
|
if (options.preset === presets_1.Preset.NPM) {
|
|
32
|
-
host.write(path_1.join(options.directory, 'packages/.gitkeep'), '');
|
|
32
|
+
host.write((0, path_1.join)(options.directory, 'packages/.gitkeep'), '');
|
|
33
33
|
}
|
|
34
34
|
else {
|
|
35
|
-
host.write(path_1.join(options.directory, 'apps/.gitkeep'), '');
|
|
36
|
-
host.write(path_1.join(options.directory, 'libs/.gitkeep'), '');
|
|
35
|
+
host.write((0, path_1.join)(options.directory, 'apps/.gitkeep'), '');
|
|
36
|
+
host.write((0, path_1.join)(options.directory, 'libs/.gitkeep'), '');
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
39
|
function createFiles(host, options) {
|
|
40
40
|
var _a;
|
|
41
41
|
const npmScope = (_a = options.npmScope) !== null && _a !== void 0 ? _a : options.name;
|
|
42
|
-
const formattedNames = devkit_1.names(options.name);
|
|
43
|
-
devkit_1.generateFiles(host, path_1.join(__dirname, './files'), options.directory, Object.assign(Object.assign({ formattedNames, dot: '.', tmpl: '', workspaceFile: options.cli === 'angular' ? 'angular' : 'workspace', cliCommand: options.cli === 'angular' ? 'ng' : 'nx', nxCli: false, typescriptVersion: versions_1.typescriptVersion,
|
|
42
|
+
const formattedNames = (0, devkit_1.names)(options.name);
|
|
43
|
+
(0, devkit_1.generateFiles)(host, (0, path_1.join)(__dirname, './files'), options.directory, Object.assign(Object.assign({ formattedNames, dot: '.', tmpl: '', workspaceFile: options.cli === 'angular' ? 'angular' : 'workspace', cliCommand: options.cli === 'angular' ? 'ng' : 'nx', nxCli: false, typescriptVersion: versions_1.typescriptVersion,
|
|
44
44
|
prettierVersion: versions_1.prettierVersion,
|
|
45
45
|
// angular cli is used only when workspace schematics is added to angular cli
|
|
46
46
|
angularCliVersion: versions_1.angularCliVersion }, options), { nxVersion: versions_1.nxVersion,
|
|
47
47
|
npmScope, packageManager: options.packageManager }));
|
|
48
48
|
}
|
|
49
49
|
function createPrettierrc(host, options) {
|
|
50
|
-
devkit_1.writeJson(host, path_1.join(options.directory, '.prettierrc'), exports.DEFAULT_NRWL_PRETTIER_CONFIG);
|
|
50
|
+
(0, devkit_1.writeJson)(host, (0, path_1.join)(options.directory, '.prettierrc'), exports.DEFAULT_NRWL_PRETTIER_CONFIG);
|
|
51
51
|
}
|
|
52
52
|
function formatWorkspaceJson(host, options) {
|
|
53
|
-
const path = path_1.join(options.directory, options.cli === 'angular' ? 'angular.json' : 'workspace.json');
|
|
53
|
+
const path = (0, path_1.join)(options.directory, options.cli === 'angular' ? 'angular.json' : 'workspace.json');
|
|
54
54
|
try {
|
|
55
|
-
devkit_1.updateJson(host, path, (workspaceJson) => {
|
|
56
|
-
const reformatted = workspace_1.reformattedWorkspaceJsonOrNull(workspaceJson);
|
|
55
|
+
(0, devkit_1.updateJson)(host, path, (workspaceJson) => {
|
|
56
|
+
const reformatted = (0, workspace_1.reformattedWorkspaceJsonOrNull)(workspaceJson);
|
|
57
57
|
if (reformatted) {
|
|
58
58
|
return reformatted;
|
|
59
59
|
}
|
|
@@ -67,7 +67,7 @@ function formatWorkspaceJson(host, options) {
|
|
|
67
67
|
}
|
|
68
68
|
function addNpmScripts(host, options) {
|
|
69
69
|
if (options.cli === 'angular') {
|
|
70
|
-
devkit_1.updateJson(host, path_1.join(options.directory, 'package.json'), (json) => {
|
|
70
|
+
(0, devkit_1.updateJson)(host, (0, path_1.join)(options.directory, 'package.json'), (json) => {
|
|
71
71
|
Object.assign(json.scripts, {
|
|
72
72
|
ng: 'nx',
|
|
73
73
|
postinstall: 'node ./decorate-angular-cli.js',
|
|
@@ -76,7 +76,7 @@ function addNpmScripts(host, options) {
|
|
|
76
76
|
});
|
|
77
77
|
}
|
|
78
78
|
if (options.preset !== presets_1.Preset.NPM) {
|
|
79
|
-
devkit_1.updateJson(host, path_1.join(options.directory, 'package.json'), (json) => {
|
|
79
|
+
(0, devkit_1.updateJson)(host, (0, path_1.join)(options.directory, 'package.json'), (json) => {
|
|
80
80
|
Object.assign(json.scripts, {
|
|
81
81
|
start: 'nx serve',
|
|
82
82
|
build: 'nx build',
|
|
@@ -87,7 +87,7 @@ function addNpmScripts(host, options) {
|
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
89
|
function workspaceGenerator(host, options) {
|
|
90
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
90
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
91
91
|
if (!options.name) {
|
|
92
92
|
throw new Error(`Invalid options, "name" is required.`);
|
|
93
93
|
}
|
|
@@ -100,12 +100,12 @@ function workspaceGenerator(host, options) {
|
|
|
100
100
|
setPresetProperty(host, options);
|
|
101
101
|
addNpmScripts(host, options);
|
|
102
102
|
createAppsAndLibsFolders(host, options);
|
|
103
|
-
yield devkit_1.formatFiles(host);
|
|
103
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
104
104
|
formatWorkspaceJson(host, options);
|
|
105
105
|
});
|
|
106
106
|
}
|
|
107
107
|
exports.workspaceGenerator = workspaceGenerator;
|
|
108
|
-
exports.workspaceSchematic = devkit_1.convertNxGenerator(workspaceGenerator);
|
|
108
|
+
exports.workspaceSchematic = (0, devkit_1.convertNxGenerator)(workspaceGenerator);
|
|
109
109
|
function addPropertyWithStableKeys(obj, key, value) {
|
|
110
110
|
const copy = Object.assign({}, obj);
|
|
111
111
|
Object.keys(obj).forEach((k) => {
|
|
@@ -117,7 +117,7 @@ function addPropertyWithStableKeys(obj, key, value) {
|
|
|
117
117
|
});
|
|
118
118
|
}
|
|
119
119
|
function normalizeOptions(options) {
|
|
120
|
-
let defaultBase = options.defaultBase || default_base_1.deduceDefaultBase();
|
|
120
|
+
let defaultBase = options.defaultBase || (0, default_base_1.deduceDefaultBase)();
|
|
121
121
|
return Object.assign(Object.assign({}, options), { defaultBase });
|
|
122
122
|
}
|
|
123
123
|
//# sourceMappingURL=workspace.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/workspace/workspace.ts"],"names":[],"mappings":";;;;AAAA,yCAQsB;AAEtB,mDAK8B;AAC9B,2BAAkC;AAClC,+BAA8C;AAC9C,8DAAgF;AAChF,8CAA0C;AAC1C,+DAAiE;AAEpD,QAAA,4BAA4B,GAAG;IAC1C,WAAW,EAAE,IAAI;CAClB,CAAC;AAEF,SAAS,kBAAkB,CAAC,IAAU,EAAE,OAAe;IACrD,MAAM,WAAW,GAAG,iBAAY,
|
|
1
|
+
{"version":3,"file":"workspace.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/workspace/workspace.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,21 +4,21 @@ const tslib_1 = require("tslib");
|
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
|
5
5
|
const versions_1 = require("../../utils/versions");
|
|
6
6
|
function default_1(host, schema) {
|
|
7
|
-
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
7
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
8
8
|
const options = normalizeOptions(schema);
|
|
9
|
-
devkit_1.generateFiles(host, devkit_1.joinPathFragments(__dirname, 'files'), devkit_1.joinPathFragments('tools/generators', schema.name), options);
|
|
10
|
-
const installTask = devkit_1.addDependenciesToPackageJson(host, {}, {
|
|
9
|
+
(0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, 'files'), (0, devkit_1.joinPathFragments)('tools/generators', schema.name), options);
|
|
10
|
+
const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
|
|
11
11
|
'@nrwl/devkit': versions_1.nxVersion,
|
|
12
12
|
});
|
|
13
13
|
if (!schema.skipFormat) {
|
|
14
|
-
yield devkit_1.formatFiles(host);
|
|
14
|
+
yield (0, devkit_1.formatFiles)(host);
|
|
15
15
|
}
|
|
16
16
|
return installTask;
|
|
17
17
|
});
|
|
18
18
|
}
|
|
19
19
|
exports.default = default_1;
|
|
20
20
|
function normalizeOptions(options) {
|
|
21
|
-
const name = devkit_1.names(options.name).fileName;
|
|
21
|
+
const name = (0, devkit_1.names)(options.name).fileName;
|
|
22
22
|
return Object.assign(Object.assign({}, options), { name, tmpl: '' });
|
|
23
23
|
}
|
|
24
24
|
//# sourceMappingURL=workspace-generator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-generator.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/workspace-generator/workspace-generator.ts"],"names":[],"mappings":";;;AACA,yCAOsB;AACtB,mDAAiD;AAEjD,mBAA+B,IAAU,EAAE,MAAc;;QACvD,MAAM,OAAO,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAEzC,sBAAa,
|
|
1
|
+
{"version":3,"file":"workspace-generator.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/workspace-generator/workspace-generator.ts"],"names":[],"mappings":";;;AACA,yCAOsB;AACtB,mDAAiD;AAEjD,mBAA+B,IAAU,EAAE,MAAc;;QACvD,MAAM,OAAO,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAEzC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EACrC,IAAA,0BAAiB,EAAC,kBAAkB,EAAE,MAAM,CAAC,IAAI,CAAC,EAClD,OAAO,CACR,CAAC;QAEF,MAAM,WAAW,GAAG,IAAA,qCAA4B,EAC9C,IAAI,EACJ,EAAE,EACF;YACE,cAAc,EAAE,oBAAS;SAC1B,CACF,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;CAAA;AAtBD,4BAsBC;AAED,SAAS,gBAAgB,CAAC,OAAe;IACvC,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,uCAAY,OAAO,KAAE,IAAI,EAAE,IAAI,EAAE,EAAE,IAAG;AACxC,CAAC"}
|
|
@@ -12,30 +12,30 @@ function renameRootTsconfig(host) {
|
|
|
12
12
|
host.rename('tsconfig.json', 'tsconfig.base.json');
|
|
13
13
|
}
|
|
14
14
|
function moveIncludesToProjectTsconfig(file, extendedTsconfigPath, extendedTsconfig) {
|
|
15
|
-
return workspace_1.updateJsonInTree(file, (json) => {
|
|
15
|
+
return (0, workspace_1.updateJsonInTree)(file, (json) => {
|
|
16
16
|
var _a, _b;
|
|
17
17
|
json.files =
|
|
18
18
|
json.files ||
|
|
19
|
-
((_a = extendedTsconfig.files) === null || _a === void 0 ? void 0 : _a.map((p) => path_1.relative(core_1.dirname(file), core_1.join(core_1.dirname(extendedTsconfigPath), p))));
|
|
19
|
+
((_a = extendedTsconfig.files) === null || _a === void 0 ? void 0 : _a.map((p) => (0, path_1.relative)((0, core_1.dirname)(file), (0, core_1.join)((0, core_1.dirname)(extendedTsconfigPath), p))));
|
|
20
20
|
json.include =
|
|
21
21
|
json.include ||
|
|
22
|
-
((_b = extendedTsconfig.include) === null || _b === void 0 ? void 0 : _b.map((p) => path_1.relative(core_1.dirname(file), core_1.join(core_1.dirname(extendedTsconfigPath), p))));
|
|
22
|
+
((_b = extendedTsconfig.include) === null || _b === void 0 ? void 0 : _b.map((p) => (0, path_1.relative)((0, core_1.dirname)(file), (0, core_1.join)((0, core_1.dirname)(extendedTsconfigPath), p))));
|
|
23
23
|
return json;
|
|
24
24
|
});
|
|
25
25
|
}
|
|
26
26
|
function convertToSolutionTsconfig(tsconfigPath) {
|
|
27
|
-
return workspace_1.updateJsonInTree(tsconfigPath, (json) => {
|
|
27
|
+
return (0, workspace_1.updateJsonInTree)(tsconfigPath, (json) => {
|
|
28
28
|
json.files = [];
|
|
29
29
|
json.include = [];
|
|
30
30
|
return json;
|
|
31
31
|
});
|
|
32
32
|
}
|
|
33
33
|
function addReference(extendedTsconfigPath, file) {
|
|
34
|
-
return workspace_1.updateJsonInTree(extendedTsconfigPath, (json, context) => {
|
|
34
|
+
return (0, workspace_1.updateJsonInTree)(extendedTsconfigPath, (json, context) => {
|
|
35
35
|
json.references = json.references || [];
|
|
36
|
-
const relativePath = `${path_1.relative(core_1.dirname(extendedTsconfigPath), file).startsWith('../')
|
|
36
|
+
const relativePath = `${(0, path_1.relative)((0, core_1.dirname)(extendedTsconfigPath), file).startsWith('../')
|
|
37
37
|
? ''
|
|
38
|
-
: './'}${path_1.relative(core_1.dirname(extendedTsconfigPath), file)}`;
|
|
38
|
+
: './'}${(0, path_1.relative)((0, core_1.dirname)(extendedTsconfigPath), file)}`;
|
|
39
39
|
context.logger.info(`Referencing ${file} in ${extendedTsconfigPath}`);
|
|
40
40
|
json.references.push({
|
|
41
41
|
path: relativePath,
|
|
@@ -44,13 +44,13 @@ function addReference(extendedTsconfigPath, file) {
|
|
|
44
44
|
});
|
|
45
45
|
}
|
|
46
46
|
function updateExtend(file) {
|
|
47
|
-
return workspace_1.updateJsonInTree(file, (json) => {
|
|
47
|
+
return (0, workspace_1.updateJsonInTree)(file, (json) => {
|
|
48
48
|
json.extends = json.extends.replace(/tsconfig.json$/, 'tsconfig.base.json');
|
|
49
49
|
return json;
|
|
50
50
|
});
|
|
51
51
|
}
|
|
52
52
|
const originalExtendedTsconfigMap = new Map();
|
|
53
|
-
const changeImplicitDependency = workspace_1.updateJsonInTree('nx.json', (json) => {
|
|
53
|
+
const changeImplicitDependency = (0, workspace_1.updateJsonInTree)('nx.json', (json) => {
|
|
54
54
|
if (!json.implicitDependencies ||
|
|
55
55
|
!json.implicitDependencies['tsconfig.json']) {
|
|
56
56
|
return json;
|
|
@@ -61,29 +61,29 @@ const changeImplicitDependency = workspace_1.updateJsonInTree('nx.json', (json)
|
|
|
61
61
|
return json;
|
|
62
62
|
});
|
|
63
63
|
function default_1(schema) {
|
|
64
|
-
return schematics_1.chain([
|
|
64
|
+
return (0, schematics_1.chain)([
|
|
65
65
|
renameRootTsconfig,
|
|
66
66
|
changeImplicitDependency,
|
|
67
|
-
visit_not_ignored_files_1.visitNotIgnoredFiles((file, host, context) => {
|
|
67
|
+
(0, visit_not_ignored_files_1.visitNotIgnoredFiles)((file, host, context) => {
|
|
68
68
|
if (!file.endsWith('.json')) {
|
|
69
69
|
return;
|
|
70
70
|
}
|
|
71
71
|
try {
|
|
72
|
-
const json = workspace_1.readJsonInTree(host, file);
|
|
72
|
+
const json = (0, workspace_1.readJsonInTree)(host, file);
|
|
73
73
|
if (!json.extends) {
|
|
74
74
|
return;
|
|
75
75
|
}
|
|
76
|
-
const extendedTsconfigPath = core_1.join(core_1.dirname(file), json.extends);
|
|
77
|
-
if (extendedTsconfigPath === core_1.normalize('tsconfig.json')) {
|
|
76
|
+
const extendedTsconfigPath = (0, core_1.join)((0, core_1.dirname)(file), json.extends);
|
|
77
|
+
if (extendedTsconfigPath === (0, core_1.normalize)('tsconfig.json')) {
|
|
78
78
|
return updateExtend(file);
|
|
79
79
|
}
|
|
80
|
-
else if (core_1.basename(json.extends) === 'tsconfig.json') {
|
|
80
|
+
else if ((0, core_1.basename)(json.extends) === 'tsconfig.json') {
|
|
81
81
|
let extendedTsconfig = originalExtendedTsconfigMap.get(extendedTsconfigPath);
|
|
82
82
|
if (!extendedTsconfig) {
|
|
83
|
-
extendedTsconfig = workspace_1.readJsonInTree(host, extendedTsconfigPath);
|
|
83
|
+
extendedTsconfig = (0, workspace_1.readJsonInTree)(host, extendedTsconfigPath);
|
|
84
84
|
originalExtendedTsconfigMap.set(extendedTsconfigPath, extendedTsconfig);
|
|
85
85
|
}
|
|
86
|
-
return schematics_1.chain([
|
|
86
|
+
return (0, schematics_1.chain)([
|
|
87
87
|
moveIncludesToProjectTsconfig(file, extendedTsconfigPath, extendedTsconfig),
|
|
88
88
|
convertToSolutionTsconfig(extendedTsconfigPath),
|
|
89
89
|
addReference(extendedTsconfigPath, file),
|
|
@@ -97,7 +97,7 @@ function default_1(schema) {
|
|
|
97
97
|
context.logger.warn(`Could not update ${file}: Invalid JSON`);
|
|
98
98
|
}
|
|
99
99
|
}),
|
|
100
|
-
workspace_1.formatFiles(),
|
|
100
|
+
(0, workspace_1.formatFiles)(),
|
|
101
101
|
]);
|
|
102
102
|
}
|
|
103
103
|
exports.default = default_1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solution-tsconfigs.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-10-0-0/solution-tsconfigs.ts"],"names":[],"mappings":";;AAAA,+CAAgF;AAChF,2DAA+D;AAE/D,+CAAgF;AAChF,+BAAgC;AAChC,uFAAiF;AAEjF,SAAS,kBAAkB,CAAC,IAAU;IACpC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE;QACjC,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;KACtD;IAED,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE,oBAAoB,CAAC,CAAC;AACrD,CAAC;AAED,SAAS,6BAA6B,CACpC,IAAU,EACV,oBAA0B,EAC1B,gBAAqB;IAErB,OAAO,4BAAgB,
|
|
1
|
+
{"version":3,"file":"solution-tsconfigs.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-10-0-0/solution-tsconfigs.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,15 +4,15 @@ const schematics_1 = require("@angular-devkit/schematics");
|
|
|
4
4
|
const ast_utils_1 = require("../../utils/ast-utils");
|
|
5
5
|
const update_packages_in_package_json_1 = require("../../utils/update-packages-in-package-json");
|
|
6
6
|
const path_1 = require("path");
|
|
7
|
-
const updatePackages = update_packages_in_package_json_1.updatePackagesInPackageJson(path_1.join(__dirname, '../../..', 'migrations.json'), '10.0.0');
|
|
8
|
-
const addNxJsonAffectedConfig = ast_utils_1.updateJsonInTree('nx.json', (json) => {
|
|
7
|
+
const updatePackages = (0, update_packages_in_package_json_1.updatePackagesInPackageJson)((0, path_1.join)(__dirname, '../../..', 'migrations.json'), '10.0.0');
|
|
8
|
+
const addNxJsonAffectedConfig = (0, ast_utils_1.updateJsonInTree)('nx.json', (json) => {
|
|
9
9
|
json.affected = {
|
|
10
10
|
defaultBase: 'main',
|
|
11
11
|
};
|
|
12
12
|
return json;
|
|
13
13
|
});
|
|
14
14
|
function default_1() {
|
|
15
|
-
return schematics_1.chain([updatePackages, addNxJsonAffectedConfig]);
|
|
15
|
+
return (0, schematics_1.chain)([updatePackages, addNxJsonAffectedConfig]);
|
|
16
16
|
}
|
|
17
17
|
exports.default = default_1;
|
|
18
18
|
//# sourceMappingURL=update-10-0-0.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-10-0-0.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-10-0-0/update-10-0-0.ts"],"names":[],"mappings":";;AAAA,2DAAmD;AACnD,qDAAyD;AAEzD,iGAA0F;AAC1F,+BAA4B;AAE5B,MAAM,cAAc,GAAG,6DAA2B,
|
|
1
|
+
{"version":3,"file":"update-10-0-0.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-10-0-0/update-10-0-0.ts"],"names":[],"mappings":";;AAAA,2DAAmD;AACnD,qDAAyD;AAEzD,iGAA0F;AAC1F,+BAA4B;AAE5B,MAAM,cAAc,GAAG,IAAA,6DAA2B,EAChD,IAAA,WAAI,EAAC,SAAS,EAAE,UAAU,EAAE,iBAAiB,CAAC,EAC9C,QAAQ,CACT,CAAC;AAEF,MAAM,uBAAuB,GAAG,IAAA,4BAAgB,EAC9C,SAAS,EACT,CAAC,IAAyB,EAAE,EAAE;IAC5B,IAAI,CAAC,QAAQ,GAAG;QACd,WAAW,EAAE,MAAM;KACpB,CAAC;IAEF,OAAO,IAAI,CAAC;AACd,CAAC,CACF,CAAC;AAEF;IACE,OAAO,IAAA,kBAAK,EAAC,CAAC,cAAc,EAAE,uBAAuB,CAAC,CAAC,CAAC;AAC1D,CAAC;AAFD,4BAEC"}
|
|
@@ -5,18 +5,18 @@ const schematics_1 = require("@angular-devkit/schematics");
|
|
|
5
5
|
const workspace_1 = require("@nrwl/workspace");
|
|
6
6
|
const visit_not_ignored_files_1 = require("../../utils/rules/visit-not-ignored-files");
|
|
7
7
|
function default_1(schema) {
|
|
8
|
-
return schematics_1.chain([
|
|
9
|
-
visit_not_ignored_files_1.visitNotIgnoredFiles((file, host, context) => {
|
|
10
|
-
if (core_1.basename(file) !== '.eslintrc') {
|
|
8
|
+
return (0, schematics_1.chain)([
|
|
9
|
+
(0, visit_not_ignored_files_1.visitNotIgnoredFiles)((file, host, context) => {
|
|
10
|
+
if ((0, core_1.basename)(file) !== '.eslintrc') {
|
|
11
11
|
return;
|
|
12
12
|
}
|
|
13
13
|
return (host, context) => {
|
|
14
14
|
try {
|
|
15
|
-
workspace_1.updateJsonInTree(file, (json) => {
|
|
15
|
+
(0, workspace_1.updateJsonInTree)(file, (json) => {
|
|
16
16
|
var _a;
|
|
17
17
|
const tsconfig = (_a = json === null || json === void 0 ? void 0 : json.parserOptions) === null || _a === void 0 ? void 0 : _a.project;
|
|
18
18
|
if (tsconfig) {
|
|
19
|
-
const tsconfigPath = core_1.join(core_1.dirname(file), tsconfig);
|
|
19
|
+
const tsconfigPath = (0, core_1.join)((0, core_1.dirname)(file), tsconfig);
|
|
20
20
|
if (tsconfigPath === 'tsconfig.json') {
|
|
21
21
|
json.parserOptions.project = json.parserOptions.project.replace(/tsconfig.json$/, 'tsconfig.base.json');
|
|
22
22
|
}
|
|
@@ -33,7 +33,7 @@ function default_1(schema) {
|
|
|
33
33
|
}
|
|
34
34
|
};
|
|
35
35
|
}),
|
|
36
|
-
workspace_1.formatFiles(),
|
|
36
|
+
(0, workspace_1.formatFiles)(),
|
|
37
37
|
]);
|
|
38
38
|
}
|
|
39
39
|
exports.default = default_1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate-eslintrc.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-10-0-1/migrate-eslintrc.ts"],"names":[],"mappings":";;AAAA,+CAA+D;AAC/D,2DAAyD;AACzD,+CAAgE;AAChE,uFAAiF;AAEjF,mBAAyB,MAAW;IAClC,OAAO,kBAAK,
|
|
1
|
+
{"version":3,"file":"migrate-eslintrc.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-10-0-1/migrate-eslintrc.ts"],"names":[],"mappings":";;AAAA,+CAA+D;AAC/D,2DAAyD;AACzD,+CAAgE;AAChE,uFAAiF;AAEjF,mBAAyB,MAAW;IAClC,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,8CAAoB,EAAC,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;YAC3C,IAAI,IAAA,eAAQ,EAAC,IAAI,CAAC,KAAK,WAAW,EAAE;gBAClC,OAAO;aACR;YAED,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;gBACvB,IAAI;oBACF,IAAA,4BAAgB,EAAC,IAAI,EAAE,CAAC,IAAI,EAAE,EAAE;;wBAC9B,MAAM,QAAQ,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,aAAa,0CAAE,OAAO,CAAC;wBAC9C,IAAI,QAAQ,EAAE;4BACZ,MAAM,YAAY,GAAG,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAC;4BACnD,IAAI,YAAY,KAAK,eAAe,EAAE;gCACpC,IAAI,CAAC,aAAa,CAAC,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,CAC7D,gBAAgB,EAChB,oBAAoB,CACrB,CAAC;6BACH;4BACD,OAAO,IAAI,CAAC;yBACb;6BAAM;4BACL,OAAO,IAAI,CAAC;yBACb;oBACH,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;iBACnB;gBAAC,OAAO,CAAC,EAAE;oBACV,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,GAAG,IAAI,qDAAqD,CAC7D,CAAC;oBACF,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;iBACzB;YACH,CAAC,CAAC;QACJ,CAAC,CAAC;QACF,IAAA,uBAAW,GAAE;KACd,CAAC,CAAC;AACL,CAAC;AAlCD,4BAkCC"}
|
|
@@ -5,11 +5,11 @@ const workspace_1 = require("@nrwl/workspace");
|
|
|
5
5
|
function default_1() {
|
|
6
6
|
return (host) => {
|
|
7
7
|
if (!host.exists('.eslintrc')) {
|
|
8
|
-
return schematics_1.noop();
|
|
8
|
+
return (0, schematics_1.noop)();
|
|
9
9
|
}
|
|
10
10
|
else {
|
|
11
|
-
return schematics_1.chain([
|
|
12
|
-
workspace_1.updateJsonInTree('.eslintrc', (json) => {
|
|
11
|
+
return (0, schematics_1.chain)([
|
|
12
|
+
(0, workspace_1.updateJsonInTree)('.eslintrc', (json) => {
|
|
13
13
|
var _a;
|
|
14
14
|
const tsconfig = (_a = json === null || json === void 0 ? void 0 : json.parserOptions) === null || _a === void 0 ? void 0 : _a.project;
|
|
15
15
|
if (tsconfig && tsconfig === './tsconfig.base.json') {
|
|
@@ -20,7 +20,7 @@ function default_1() {
|
|
|
20
20
|
return json;
|
|
21
21
|
}
|
|
22
22
|
}),
|
|
23
|
-
workspace_1.formatFiles(),
|
|
23
|
+
(0, workspace_1.formatFiles)(),
|
|
24
24
|
]);
|
|
25
25
|
}
|
|
26
26
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate-eslintrc-tsconfig-wildcard.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-10-1-0/migrate-eslintrc-tsconfig-wildcard.ts"],"names":[],"mappings":";;AAAA,2DAAqE;AACrE,+CAAgE;AAEhE;IACE,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;YAC7B,OAAO,iBAAI,
|
|
1
|
+
{"version":3,"file":"migrate-eslintrc-tsconfig-wildcard.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-10-1-0/migrate-eslintrc-tsconfig-wildcard.ts"],"names":[],"mappings":";;AAAA,2DAAqE;AACrE,+CAAgE;AAEhE;IACE,OAAO,CAAC,IAAU,EAAE,EAAE;QACpB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE;YAC7B,OAAO,IAAA,iBAAI,GAAE,CAAC;SACf;aAAM;YACL,OAAO,IAAA,kBAAK,EAAC;gBACX,IAAA,4BAAgB,EAAC,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE;;oBACrC,MAAM,QAAQ,GAAG,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,aAAa,0CAAE,OAAO,CAAC;oBAC9C,IAAI,QAAQ,IAAI,QAAQ,KAAK,sBAAsB,EAAE;wBACnD,IAAI,CAAC,aAAa,CAAC,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,CAC7D,qBAAqB,EACrB,kBAAkB,CACnB,CAAC;wBACF,OAAO,IAAI,CAAC;qBACb;yBAAM;wBACL,OAAO,IAAI,CAAC;qBACb;gBACH,CAAC,CAAC;gBACF,IAAA,uBAAW,GAAE;aACd,CAAC,CAAC;SACJ;IACH,CAAC,CAAC;AACJ,CAAC;AAtBD,4BAsBC"}
|
|
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const workspace_1 = require("@nrwl/workspace");
|
|
5
5
|
function default_1() {
|
|
6
|
-
return (host) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
7
|
-
const workspace = yield workspace_1.getWorkspace(host);
|
|
6
|
+
return (host) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
7
|
+
const workspace = yield (0, workspace_1.getWorkspace)(host);
|
|
8
8
|
for (let [, projectTarget] of workspace.projects) {
|
|
9
9
|
for (let [, buildTarget] of projectTarget.targets) {
|
|
10
10
|
if (buildTarget.builder === '@nrwl/web:package' ||
|
|
@@ -17,7 +17,7 @@ function default_1() {
|
|
|
17
17
|
}
|
|
18
18
|
}
|
|
19
19
|
}
|
|
20
|
-
return workspace_1.updateWorkspace(workspace);
|
|
20
|
+
return (0, workspace_1.updateWorkspace)(workspace);
|
|
21
21
|
});
|
|
22
22
|
}
|
|
23
23
|
exports.default = default_1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-buildable-project-deps-in-package-json-type.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-10-3-0/add-buildable-project-deps-in-package-json-type.ts"],"names":[],"mappings":";;;AACA,+CAAgE;AAEhE;IACE,OAAO,CAAO,IAAU,EAAE,EAAE;QAC1B,MAAM,SAAS,GAAG,MAAM,wBAAY,
|
|
1
|
+
{"version":3,"file":"add-buildable-project-deps-in-package-json-type.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-10-3-0/add-buildable-project-deps-in-package-json-type.ts"],"names":[],"mappings":";;;AACA,+CAAgE;AAEhE;IACE,OAAO,CAAO,IAAU,EAAE,EAAE;QAC1B,MAAM,SAAS,GAAG,MAAM,IAAA,wBAAY,EAAC,IAAI,CAAC,CAAC;QAE3C,KAAK,IAAI,CAAC,EAAE,aAAa,CAAC,IAAI,SAAS,CAAC,QAAQ,EAAE;YAChD,KAAK,IAAI,CAAC,EAAE,WAAW,CAAC,IAAI,aAAa,CAAC,OAAO,EAAE;gBACjD,IACE,WAAW,CAAC,OAAO,KAAK,mBAAmB;oBAC3C,WAAW,CAAC,OAAO,KAAK,uBAAuB,EAC/C;oBACA,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE;wBACxB,WAAW,CAAC,OAAO,GAAG,EAAE,CAAC;qBAC1B;oBAED,WAAW,CAAC,OAAO,CAAC,uCAAuC,CAAC;wBAC1D,cAAc,CAAC;iBAClB;aACF;SACF;QAED,OAAO,IAAA,2BAAe,EAAC,SAAS,CAAC,CAAC;IACpC,CAAC,CAAA,CAAC;AACJ,CAAC;AAtBD,4BAsBC"}
|
|
@@ -5,17 +5,17 @@ const format_files_1 = require("../../utils/rules/format-files");
|
|
|
5
5
|
const versions_1 = require("../../utils/versions");
|
|
6
6
|
const ast_utils_1 = require("../../utils/ast-utils");
|
|
7
7
|
function update() {
|
|
8
|
-
return schematics_1.chain([
|
|
9
|
-
ast_utils_1.updateJsonInTree('package.json', (json) => {
|
|
8
|
+
return (0, schematics_1.chain)([
|
|
9
|
+
(0, ast_utils_1.updateJsonInTree)('package.json', (json) => {
|
|
10
10
|
json.dependencies = json.dependencies || {};
|
|
11
11
|
json.devDependencies = json.devDependencies || {};
|
|
12
12
|
delete json.dependencies['@nrwl/cli'];
|
|
13
13
|
json.devDependencies['@nrwl/cli'] = versions_1.nxVersion;
|
|
14
|
-
json.dependencies = ast_utils_1.sortObjectByKeys(json.dependencies);
|
|
15
|
-
json.devDependencies = ast_utils_1.sortObjectByKeys(json.devDependencies);
|
|
14
|
+
json.dependencies = (0, ast_utils_1.sortObjectByKeys)(json.dependencies);
|
|
15
|
+
json.devDependencies = (0, ast_utils_1.sortObjectByKeys)(json.devDependencies);
|
|
16
16
|
return json;
|
|
17
17
|
}),
|
|
18
|
-
format_files_1.formatFiles(),
|
|
18
|
+
(0, format_files_1.formatFiles)(),
|
|
19
19
|
]);
|
|
20
20
|
}
|
|
21
21
|
exports.default = update;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-cli-dependency.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-10-3-0/add-cli-dependency.ts"],"names":[],"mappings":";;AAAA,2DAAyD;AACzD,iEAA6D;AAC7D,mDAAiD;AACjD,qDAA2E;AAE3E,SAAwB,MAAM;IAC5B,OAAO,kBAAK,
|
|
1
|
+
{"version":3,"file":"add-cli-dependency.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-10-3-0/add-cli-dependency.ts"],"names":[],"mappings":";;AAAA,2DAAyD;AACzD,iEAA6D;AAC7D,mDAAiD;AACjD,qDAA2E;AAE3E,SAAwB,MAAM;IAC5B,OAAO,IAAA,kBAAK,EAAC;QACX,IAAA,4BAAgB,EAAC,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE;YACxC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC;YAE5C,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC;YAElD,OAAO,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;YACtC,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,GAAG,oBAAS,CAAC;YAE9C,IAAI,CAAC,YAAY,GAAG,IAAA,4BAAgB,EAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YACxD,IAAI,CAAC,eAAe,GAAG,IAAA,4BAAgB,EAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAE9D,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;QACF,IAAA,0BAAW,GAAE;KACd,CAAC,CAAC;AACL,CAAC;AAjBD,yBAiBC"}
|
|
@@ -4,11 +4,11 @@ const tslib_1 = require("tslib");
|
|
|
4
4
|
const core_1 = require("@angular-devkit/core");
|
|
5
5
|
const workspace_1 = require("@nrwl/workspace");
|
|
6
6
|
function default_1() {
|
|
7
|
-
return (host) => tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
7
|
+
return (host) => (0, tslib_1.__awaiter)(this, void 0, void 0, function* () {
|
|
8
8
|
if (host.exists('.vscode/extensions.json')) {
|
|
9
9
|
return;
|
|
10
10
|
}
|
|
11
|
-
const workspace = yield workspace_1.getWorkspace(host);
|
|
11
|
+
const workspace = yield (0, workspace_1.getWorkspace)(host);
|
|
12
12
|
let needsAngularExtension = false;
|
|
13
13
|
for (let [, project] of workspace.projects) {
|
|
14
14
|
needsAngularExtension = Array.from(project.targets).some(([, targetDefinition]) => targetDefinition.builder.startsWith('@angular-devkit'));
|
|
@@ -25,7 +25,7 @@ function default_1() {
|
|
|
25
25
|
}
|
|
26
26
|
host.create('.vscode/extensions.json', core_1.tags.stripIndents `
|
|
27
27
|
{
|
|
28
|
-
"recommendations": ${workspace_1.serializeJson(extensions)}
|
|
28
|
+
"recommendations": ${(0, workspace_1.serializeJson)(extensions)}
|
|
29
29
|
}
|
|
30
30
|
`);
|
|
31
31
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-vscode-extensions.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-10-3-0/add-vscode-extensions.ts"],"names":[],"mappings":";;;AACA,+CAA4C;AAC5C,+CAA8D;AAE9D;IACE,OAAO,CAAO,IAAU,EAAE,EAAE;QAC1B,IAAI,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,EAAE;YAC1C,OAAO;SACR;QAED,MAAM,SAAS,GAAG,MAAM,wBAAY,
|
|
1
|
+
{"version":3,"file":"add-vscode-extensions.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-10-3-0/add-vscode-extensions.ts"],"names":[],"mappings":";;;AACA,+CAA4C;AAC5C,+CAA8D;AAE9D;IACE,OAAO,CAAO,IAAU,EAAE,EAAE;QAC1B,IAAI,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC,EAAE;YAC1C,OAAO;SACR;QAED,MAAM,SAAS,GAAG,MAAM,IAAA,wBAAY,EAAC,IAAI,CAAC,CAAC;QAE3C,IAAI,qBAAqB,GAAG,KAAK,CAAC;QAElC,KAAK,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI,SAAS,CAAC,QAAQ,EAAE;YAC1C,qBAAqB,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CACtD,CAAC,CAAC,EAAE,gBAAgB,CAAC,EAAE,EAAE,CACvB,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,iBAAiB,CAAC,CACzD,CAAC;YAEF,IAAI,qBAAqB;gBAAE,MAAM;SAClC;QAED,MAAM,UAAU,GAAG;YACjB,sBAAsB;YACtB,2CAA2C;YAC3C,wBAAwB;SACzB,CAAC;QAEF,IAAI,qBAAqB,EAAE;YACzB,UAAU,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;SACxC;QAED,IAAI,CAAC,MAAM,CACT,yBAAyB,EACzB,WAAI,CAAC,YAAY,CAAA;;sBAED,IAAA,yBAAa,EAAC,UAAU,CAAC;;KAE1C,CACA,CAAC;IACJ,CAAC,CAAA,CAAC;AACJ,CAAC;AAtCD,4BAsCC"}
|