@nrwl/workspace 14.8.7 → 14.9.0-beta.1
Sign up to get free protection for your applications and to get access to all the features.
- package/CHANGELOG.md +1 -1
- package/LICENSE +22 -22
- package/README.md +5 -26
- package/executors.json +4 -2
- package/generators.json +7 -52
- package/index.d.ts +4 -10
- package/index.js +4 -42
- package/index.js.map +1 -1
- package/migrations.json +20 -1
- package/package.json +33 -44
- package/presets/core.json +4 -9
- package/presets/npm.json +4 -12
- package/src/executors/counter/schema.json +1 -0
- package/src/executors/run-commands/schema.json +9 -1
- package/src/executors/run-script/schema.json +1 -0
- package/src/generators/ci-workflow/ci-workflow.d.ts +1 -1
- package/src/generators/ci-workflow/ci-workflow.js +13 -0
- package/src/generators/ci-workflow/ci-workflow.js.map +1 -1
- package/src/generators/ci-workflow/files/azure/azure-pipelines.yml__tmpl__ +0 -2
- package/src/generators/ci-workflow/files/bitbucket-pipelines/bitbucket-pipelines.yml__tmpl__ +36 -0
- package/src/generators/ci-workflow/files/circleci/.circleci/config.yml__tmpl__ +1 -4
- package/src/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml__tmpl__ +3 -3
- package/src/generators/ci-workflow/files/gitlab/.gitlab-ci.yml__tmpl__ +47 -0
- package/src/generators/ci-workflow/schema.json +5 -3
- package/src/generators/convert-to-nx-project/convert-to-nx-project.d.ts +1 -2
- package/src/generators/convert-to-nx-project/convert-to-nx-project.js +62 -38
- package/src/generators/convert-to-nx-project/convert-to-nx-project.js.map +1 -1
- package/src/generators/convert-to-nx-project/schema.d.ts +2 -0
- package/src/generators/convert-to-nx-project/schema.json +11 -6
- package/src/generators/library/files/lib/__dot__babelrc__tmpl__ +1 -1
- package/src/generators/library/files/lib/tsconfig.lib.json +2 -2
- package/src/generators/library/library.d.ts +2 -1
- package/src/generators/library/library.js +44 -33
- package/src/generators/library/library.js.map +1 -1
- package/src/generators/library/schema.d.ts +1 -1
- package/src/generators/library/schema.json +9 -4
- package/src/generators/move/lib/create-project-configuration-in-new-destination.d.ts +3 -0
- package/src/generators/move/lib/{move-project-configuration.js → create-project-configuration-in-new-destination.js} +6 -9
- package/src/generators/move/lib/create-project-configuration-in-new-destination.js.map +1 -0
- package/src/generators/move/lib/{move-project.d.ts → move-project-files.d.ts} +1 -1
- package/src/generators/move/lib/{move-project.js → move-project-files.js} +4 -4
- package/src/generators/move/lib/move-project-files.js.map +1 -0
- package/src/generators/move/lib/update-cypress-config.js +8 -2
- package/src/generators/move/lib/update-cypress-config.js.map +1 -1
- package/src/generators/move/lib/update-default-project.js +4 -5
- package/src/generators/move/lib/update-default-project.js.map +1 -1
- package/src/generators/move/lib/update-implicit-dependencies.d.ts +0 -2
- package/src/generators/move/lib/update-implicit-dependencies.js +0 -2
- package/src/generators/move/lib/update-implicit-dependencies.js.map +1 -1
- package/src/generators/move/lib/update-imports.js +28 -18
- package/src/generators/move/lib/update-imports.js.map +1 -1
- package/src/generators/move/move.js +5 -4
- package/src/generators/move/move.js.map +1 -1
- package/src/generators/move/schema.json +2 -1
- package/src/generators/{workspace/files → new/files-integrated-repo}/__dot__gitignore +2 -2
- package/src/generators/{workspace/files → new/files-integrated-repo}/__dot__vscode/extensions.json__tmpl__ +1 -1
- package/src/generators/new/files-integrated-repo/package.json__tmpl__ +14 -0
- package/src/generators/new/files-package-based-repo/__dot__gitignore +39 -0
- package/src/generators/new/files-package-based-repo/__dot__vscode/extensions.json__tmpl__ +8 -0
- package/src/generators/new/files-package-based-repo/package.json__tmpl__ +13 -0
- package/src/generators/new/files-readme/README.md.template +21 -0
- package/src/generators/new/files-root-app/__dot__gitignore +39 -0
- package/src/generators/new/files-root-app/__dot__vscode/extensions.json__tmpl__ +6 -0
- package/src/generators/new/files-root-app/package.json__tmpl__ +14 -0
- package/src/generators/new/generate-preset.d.ts +4 -0
- package/src/generators/new/generate-preset.js +131 -0
- package/src/generators/new/generate-preset.js.map +1 -0
- package/src/generators/new/generate-workspace-files.d.ts +3 -0
- package/src/generators/{workspace/workspace.js → new/generate-workspace-files.js} +81 -72
- package/src/generators/new/generate-workspace-files.js.map +1 -0
- package/src/generators/new/new.d.ts +11 -6
- package/src/generators/new/new.js +41 -212
- package/src/generators/new/new.js.map +1 -1
- package/src/generators/new/schema.json +16 -7
- package/src/generators/npm-package/npm-package.js +3 -6
- package/src/generators/npm-package/npm-package.js.map +1 -1
- package/src/generators/preset/preset.d.ts +1 -2
- package/src/generators/preset/preset.js +57 -255
- package/src/generators/preset/preset.js.map +1 -1
- package/src/generators/preset/schema.d.ts +5 -1
- package/src/generators/preset/schema.json +34 -7
- package/src/generators/remove/lib/check-project-is-safe-to-remove.d.ts +3 -0
- package/src/generators/remove/lib/check-project-is-safe-to-remove.js +26 -0
- package/src/generators/remove/lib/check-project-is-safe-to-remove.js.map +1 -0
- package/src/generators/remove/lib/check-targets.d.ts +1 -1
- package/src/generators/remove/lib/check-targets.js +33 -29
- package/src/generators/remove/lib/check-targets.js.map +1 -1
- package/src/generators/remove/lib/remove-project-references-in-config.d.ts +3 -0
- package/src/generators/remove/lib/remove-project-references-in-config.js +22 -0
- package/src/generators/remove/lib/remove-project-references-in-config.js.map +1 -0
- package/src/generators/remove/lib/update-jest-config.js +10 -5
- package/src/generators/remove/lib/update-jest-config.js.map +1 -1
- package/src/generators/remove/lib/update-tsconfig.d.ts +2 -2
- package/src/generators/remove/lib/update-tsconfig.js +23 -15
- package/src/generators/remove/lib/update-tsconfig.js.map +1 -1
- package/src/generators/remove/remove.js +6 -4
- package/src/generators/remove/remove.js.map +1 -1
- package/src/generators/remove/schema.json +2 -1
- package/src/generators/run-commands/run-commands.js +3 -1
- package/src/generators/run-commands/run-commands.js.map +1 -1
- package/src/generators/run-commands/schema.json +2 -1
- package/src/generators/utils/insert-import.js +10 -5
- package/src/generators/utils/insert-import.js.map +1 -1
- package/src/generators/utils/insert-statement.js +8 -3
- package/src/generators/utils/insert-statement.js.map +1 -1
- package/src/generators/utils/presets.d.ts +6 -5
- package/src/generators/utils/presets.js +5 -4
- package/src/generators/utils/presets.js.map +1 -1
- package/src/generators/workspace-generator/schema.json +3 -2
- package/src/migrations/update-12-5-0/add-target-dependencies.js +2 -2
- 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.d.ts +1 -1
- package/src/migrations/update-13-0-0/config-locations/config-locations.js +19 -9
- 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 +2 -2
- package/src/migrations/update-13-0-0/set-default-base-if-not-set.js.map +1 -1
- package/src/migrations/update-13-10-0/update-tasks-runner.js +4 -3
- package/src/migrations/update-13-10-0/update-tasks-runner.js.map +1 -1
- package/src/migrations/update-13-2-0/set-parallel-default.js +2 -2
- package/src/migrations/update-13-2-0/set-parallel-default.js.map +1 -1
- package/src/migrations/update-13-6-0/remove-old-task-runner-options.js +3 -3
- package/src/migrations/update-13-6-0/remove-old-task-runner-options.js.map +1 -1
- package/src/migrations/update-14-0-0/change-npm-script-executor.js +1 -1
- package/src/migrations/update-14-0-0/change-npm-script-executor.js.map +1 -1
- package/src/migrations/update-14-0-0/change-nx-json-presets.js +3 -3
- package/src/migrations/update-14-0-0/change-nx-json-presets.js.map +1 -1
- package/src/migrations/update-14-2-0/enable-source-analysis.js +14 -13
- package/src/migrations/update-14-2-0/enable-source-analysis.js.map +1 -1
- package/src/migrations/update-14-8-0/change-run-commands-executor.js +1 -1
- package/src/migrations/update-14-8-0/change-run-commands-executor.js.map +1 -1
- package/src/migrations/update-15-7-0/split-configuration-into-project-json-files.d.ts +3 -0
- package/src/migrations/update-15-7-0/split-configuration-into-project-json-files.js +15 -0
- package/src/migrations/update-15-7-0/split-configuration-into-project-json-files.js.map +1 -0
- package/src/utilities/assets.d.ts +2 -2
- package/src/utilities/buildable-libs-utils.d.ts +18 -7
- package/src/utilities/buildable-libs-utils.js +28 -13
- package/src/utilities/buildable-libs-utils.js.map +1 -1
- package/src/utilities/plugins/plugin-capabilities.d.ts +1 -3
- package/src/utilities/plugins/plugin-capabilities.js +2 -75
- package/src/utilities/plugins/plugin-capabilities.js.map +1 -1
- package/src/utilities/run-tasks-in-serial.d.ts +6 -0
- package/src/utilities/run-tasks-in-serial.js +6 -0
- package/src/utilities/run-tasks-in-serial.js.map +1 -1
- package/src/utilities/set-default-collection.js +5 -5
- package/src/utilities/set-default-collection.js.map +1 -1
- package/src/utilities/ts-config.d.ts +5 -0
- package/src/utilities/ts-config.js +40 -0
- package/src/utilities/ts-config.js.map +1 -0
- package/src/utilities/typescript/compilation.d.ts +1 -1
- package/src/utilities/typescript/compilation.js +22 -12
- package/src/utilities/typescript/compilation.js.map +1 -1
- package/src/utilities/typescript/find-nodes.d.ts +5 -2
- package/src/utilities/typescript/find-nodes.js +7 -25
- package/src/utilities/typescript/find-nodes.js.map +1 -1
- package/src/utilities/typescript/get-source-nodes.d.ts +4 -1
- package/src/utilities/typescript/get-source-nodes.js +3 -0
- package/src/utilities/typescript/get-source-nodes.js.map +1 -1
- package/src/utilities/typescript.d.ts +8 -4
- package/src/utilities/typescript.js +21 -38
- package/src/utilities/typescript.js.map +1 -1
- package/src/utilities/version-utils.d.ts +3 -0
- package/src/utilities/version-utils.js +7 -12
- package/src/utilities/version-utils.js.map +1 -1
- package/src/utils/ast-utils.d.ts +0 -123
- package/src/utils/ast-utils.js +5 -546
- package/src/utils/ast-utils.js.map +1 -1
- package/src/utils/cli-config-utils.d.ts +4 -3
- package/src/utils/cli-config-utils.js +4 -45
- package/src/utils/cli-config-utils.js.map +1 -1
- package/src/utils/lint.d.ts +0 -32
- package/src/utils/lint.js +0 -262
- package/src/utils/lint.js.map +1 -1
- package/src/utils/project-type.d.ts +1 -3
- package/src/utils/project-type.js +1 -8
- package/src/utils/project-type.js.map +1 -1
- package/src/utils/rules/add-install-task.d.ts +1 -1
- package/src/utils/rules/add-install-task.js +2 -2
- package/src/utils/rules/add-install-task.js.map +1 -1
- package/src/utils/rules/deleteFile.d.ts +1 -1
- package/src/utils/rules/format-files.js +0 -19
- package/src/utils/rules/format-files.js.map +1 -1
- package/src/utils/rules/workspace.d.ts +1 -1
- package/src/utils/strings.d.ts +12 -0
- package/src/utils/strings.js +12 -0
- package/src/utils/strings.js.map +1 -1
- package/src/utils/testing-utils.d.ts +1 -1
- package/src/utils/testing-utils.js +6 -6
- package/src/utils/testing-utils.js.map +1 -1
- package/src/utils/testing.d.ts +1 -1
- package/src/utils/versions.d.ts +3 -4
- package/src/utils/versions.js +6 -5
- package/src/utils/versions.js.map +1 -1
- package/src/utils/workspace.d.ts +1 -1
- package/src/generators/convert-to-nx-project/utils/get-project-configuration-path.d.ts +0 -2
- package/src/generators/convert-to-nx-project/utils/get-project-configuration-path.js +0 -9
- package/src/generators/convert-to-nx-project/utils/get-project-configuration-path.js.map +0 -1
- package/src/generators/move/lib/move-project-configuration.d.ts +0 -3
- package/src/generators/move/lib/move-project-configuration.js.map +0 -1
- package/src/generators/move/lib/move-project.js.map +0 -1
- package/src/generators/preset/files/pnpm-workspace/pnpm-workspace.yaml +0 -2
- package/src/generators/remove/lib/remove-project-config.d.ts +0 -8
- package/src/generators/remove/lib/remove-project-config.js +0 -32
- package/src/generators/remove/lib/remove-project-config.js.map +0 -1
- package/src/generators/utils/decorate-angular-cli.js__tmpl__ +0 -69
- package/src/generators/workspace/files/README.md__tmpl__ +0 -186
- package/src/generators/workspace/files/__dot__prettierignore +0 -4
- package/src/generators/workspace/files/package.json__tmpl__ +0 -18
- package/src/generators/workspace/schema.d.ts +0 -15
- package/src/generators/workspace/schema.json +0 -77
- package/src/generators/workspace/workspace.d.ts +0 -7
- package/src/generators/workspace/workspace.js.map +0 -1
- package/src/tslint/nxEnforceModuleBoundariesRule.d.ts +0 -14
- package/src/tslint/nxEnforceModuleBoundariesRule.js +0 -177
- package/src/tslint/nxEnforceModuleBoundariesRule.js.map +0 -1
- package/src/utilities/ast-utils.d.ts +0 -22
- package/src/utilities/ast-utils.js +0 -182
- package/src/utilities/ast-utils.js.map +0 -1
- package/src/utilities/create-package-json.d.ts +0 -10
- package/src/utilities/create-package-json.js +0 -87
- package/src/utilities/create-package-json.js.map +0 -1
- package/src/utilities/executor-options-utils.d.ts +0 -13
- package/src/utilities/executor-options-utils.js +0 -36
- package/src/utilities/executor-options-utils.js.map +0 -1
- package/src/utilities/generate-globs.d.ts +0 -6
- package/src/utilities/generate-globs.js +0 -75
- package/src/utilities/generate-globs.js.map +0 -1
- package/src/utilities/prettier.d.ts +0 -6
- package/src/utilities/prettier.js +0 -38
- package/src/utilities/prettier.js.map +0 -1
- package/src/utils/app-root.d.ts +0 -1
- package/src/utils/app-root.js +0 -8
- package/src/utils/app-root.js.map +0 -1
- package/src/utils/graph-utils.d.ts +0 -5
- package/src/utils/graph-utils.js +0 -116
- package/src/utils/graph-utils.js.map +0 -1
- package/src/utils/rules/check-project-exists.d.ts +0 -10
- package/src/utils/rules/check-project-exists.js +0 -24
- package/src/utils/rules/check-project-exists.js.map +0 -1
- package/src/utils/rules/move-npm-packages.d.ts +0 -11
- package/src/utils/rules/move-npm-packages.js +0 -76
- package/src/utils/rules/move-npm-packages.js.map +0 -1
- package/src/utils/rules/rename-npm-packages.d.ts +0 -10
- package/src/utils/rules/rename-npm-packages.js +0 -81
- package/src/utils/rules/rename-npm-packages.js.map +0 -1
- package/src/utils/rules/rename-package-imports.d.ts +0 -10
- package/src/utils/rules/rename-package-imports.js +0 -58
- package/src/utils/rules/rename-package-imports.js.map +0 -1
- package/src/utils/rules/to-js.d.ts +0 -8
- package/src/utils/rules/to-js.js +0 -77
- package/src/utils/rules/to-js.js.map +0 -1
- package/src/utils/rules/update-karma-conf.d.ts +0 -8
- package/src/utils/rules/update-karma-conf.js +0 -36
- package/src/utils/rules/update-karma-conf.js.map +0 -1
- package/src/utils/runtime-lint-utils.d.ts +0 -80
- package/src/utils/runtime-lint-utils.js +0 -307
- package/src/utils/runtime-lint-utils.js.map +0 -1
- package/src/utils/update-packages-in-package-json.d.ts +0 -3
- package/src/utils/update-packages-in-package-json.js +0 -56
- package/src/utils/update-packages-in-package-json.js.map +0 -1
- package/src/utils/update-task.d.ts +0 -2
- package/src/utils/update-task.js +0 -83
- package/src/utils/update-task.js.map +0 -1
- /package/src/generators/{workspace/files → library/files/root}/tsconfig.base.json +0 -0
- /package/src/generators/{workspace/files → new/files-integrated-repo}/__dot__editorconfig +0 -0
- /package/src/generators/{workspace/files → new/files-integrated-repo}/tools/generators/.gitkeep +0 -0
- /package/src/generators/{workspace/files → new/files-integrated-repo}/tools/tsconfig.tools.json +0 -0
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"check-targets.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/check-targets.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"check-targets.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/check-targets.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AAGtB;;;;;;GAMG;AACH,SAAsB,YAAY,CAAC,IAAU,EAAE,MAAc;;QAC3D,IAAI,MAAM,CAAC,WAAW,EAAE;YACtB,OAAO;SACR;QAED,MAAM,KAAK,GAAG,MAAM,IAAA,gCAAuB,GAAE,CAAC;QAC9C,MAAM,MAAM,GAAa,EAAE,CAAC;QAE5B,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,WAAW,EAAE,EAAE;YACvD,IAAI,WAAW,KAAK,MAAM,CAAC,WAAW,EAAE;gBACtC,OAAO;aACR;YACD,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,EAAE,EAAE;gBACvE,oBAAoB,CAAC,YAAY,EAAE,CAAC,KAAK,EAAE,EAAE;oBAC3C,IAAI;wBACF,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,0BAAiB,EAAC,KAAK,EAAE,KAAK,CAAC,CAAC;wBACpD,IAAI,OAAO,KAAK,MAAM,CAAC,WAAW,EAAE;4BAClC,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,iBAAiB,WAAW,GAAG,CAAC,CAAC;yBACvD;qBACF;oBAAC,OAAO,GAAG,EAAE;wBACZ;;;;;;2BAMG;qBACJ;gBACH,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;YACrB,IAAI,OAAO,GAAG,GAAG,MAAM,CAAC,WAAW,0CAA0C,CAAC;YAC9E,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE;gBACxB,OAAO,IAAI,GAAG,KAAK,IAAI,CAAC;aACzB;YAED,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;SAC1B;IACH,CAAC;CAAA;AAxCD,oCAwCC;AAED,SAAS,oBAAoB,CAC3B,MAA2B,EAC3B,QAAsC;IAEtC,SAAS,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK;QAC5B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,QAAQ,CAAC,KAAK,CAAC,CAAC;SACjB;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YAC/B,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;SACjD;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACpC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;gBACvC,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YACrB,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;QACxC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACtB,CAAC,CAAC,CAAC;AACL,CAAC"}
|
@@ -0,0 +1,22 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.removeProjectReferencesInConfig = void 0;
|
4
|
+
const devkit_1 = require("@nrwl/devkit");
|
5
|
+
function removeProjectReferencesInConfig(tree, schema) {
|
6
|
+
// Unset default project if deleting the default project
|
7
|
+
const nxJson = (0, devkit_1.readNxJson)(tree);
|
8
|
+
if (nxJson.defaultProject && nxJson.defaultProject === schema.projectName) {
|
9
|
+
delete nxJson.defaultProject;
|
10
|
+
(0, devkit_1.updateNxJson)(tree, nxJson);
|
11
|
+
}
|
12
|
+
// Remove implicit dependencies onto removed project
|
13
|
+
(0, devkit_1.getProjects)(tree).forEach((project, projectName) => {
|
14
|
+
if (project.implicitDependencies &&
|
15
|
+
project.implicitDependencies.some((projectName) => projectName === schema.projectName)) {
|
16
|
+
project.implicitDependencies = project.implicitDependencies.filter((projectName) => projectName !== schema.projectName);
|
17
|
+
(0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
|
18
|
+
}
|
19
|
+
});
|
20
|
+
}
|
21
|
+
exports.removeProjectReferencesInConfig = removeProjectReferencesInConfig;
|
22
|
+
//# sourceMappingURL=remove-project-references-in-config.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"remove-project-references-in-config.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/remove-project-references-in-config.ts"],"names":[],"mappings":";;;AACA,yCAOsB;AAEtB,SAAgB,+BAA+B,CAAC,IAAU,EAAE,MAAc;IACxE,wDAAwD;IACxD,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAChC,IAAI,MAAM,CAAC,cAAc,IAAI,MAAM,CAAC,cAAc,KAAK,MAAM,CAAC,WAAW,EAAE;QACzE,OAAO,MAAM,CAAC,cAAc,CAAC;QAC7B,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;KAC5B;IAED,oDAAoD;IACpD,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE;QACjD,IACE,OAAO,CAAC,oBAAoB;YAC5B,OAAO,CAAC,oBAAoB,CAAC,IAAI,CAC/B,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,KAAK,MAAM,CAAC,WAAW,CACpD,EACD;YACA,OAAO,CAAC,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC,MAAM,CAChE,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,KAAK,MAAM,CAAC,WAAW,CACpD,CAAC;YACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;SACxD;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAtBD,0EAsBC"}
|
@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateJestConfig = void 0;
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
5
5
|
const get_source_nodes_1 = require("../../../utilities/typescript/get-source-nodes");
|
6
|
-
const typescript_1 = require("typescript");
|
7
6
|
const path_1 = require("path");
|
7
|
+
const typescript_1 = require("../../../utilities/typescript");
|
8
|
+
let tsModule;
|
8
9
|
function isUsingUtilityFunction(host) {
|
9
10
|
return host.read('jest.config.ts').toString().includes('getJestProjects()');
|
10
11
|
}
|
@@ -12,6 +13,10 @@ function isUsingUtilityFunction(host) {
|
|
12
13
|
* Updates the root jest config projects array and removes the project.
|
13
14
|
*/
|
14
15
|
function updateJestConfig(tree, schema, projectConfig) {
|
16
|
+
if (!tsModule) {
|
17
|
+
tsModule = (0, typescript_1.ensureTypescript)();
|
18
|
+
}
|
19
|
+
const { createSourceFile, ScriptTarget, isPropertyAssignment, isArrayLiteralExpression, isStringLiteral, } = tsModule;
|
15
20
|
const projectToRemove = schema.projectName;
|
16
21
|
if (!tree.exists('jest.config.ts') ||
|
17
22
|
!tree.exists((0, path_1.join)(projectConfig.root, 'jest.config.ts')) ||
|
@@ -19,16 +24,16 @@ function updateJestConfig(tree, schema, projectConfig) {
|
|
19
24
|
return;
|
20
25
|
}
|
21
26
|
const contents = tree.read('jest.config.ts', 'utf-8');
|
22
|
-
const sourceFile =
|
27
|
+
const sourceFile = createSourceFile('jest.config.ts', contents, ScriptTarget.Latest);
|
23
28
|
const sourceNodes = (0, get_source_nodes_1.getSourceNodes)(sourceFile);
|
24
|
-
const projectsAssignment = sourceNodes.find((node) =>
|
29
|
+
const projectsAssignment = sourceNodes.find((node) => isPropertyAssignment(node) &&
|
25
30
|
node.name.getText(sourceFile) === 'projects' &&
|
26
|
-
|
31
|
+
isArrayLiteralExpression(node.initializer));
|
27
32
|
if (!projectsAssignment) {
|
28
33
|
throw Error(`Could not remove ${projectToRemove} from projects in /jest.config.ts. Please remove ${projectToRemove} from your projects.`);
|
29
34
|
}
|
30
35
|
const projectsArray = projectsAssignment.initializer;
|
31
|
-
const project = projectsArray.elements.find((item) =>
|
36
|
+
const project = projectsArray.elements.find((item) => isStringLiteral(item) &&
|
32
37
|
item.text.startsWith(`<rootDir>/${projectConfig.root}`));
|
33
38
|
if (!project) {
|
34
39
|
console.warn(`Could not find ${projectToRemove} in projects in /jest.config.ts.`);
|
@@ -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;
|
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;AAQhF,+BAA4B;AAC5B,8DAAiE;AAEjE,IAAI,QAAqC,CAAC;AAE1C,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,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,6BAAgB,GAAE,CAAC;KAC/B;IACD,MAAM,EACJ,gBAAgB,EAChB,YAAY,EACZ,oBAAoB,EACpB,wBAAwB,EACxB,eAAe,GAChB,GAAG,QAAQ,CAAC;IACb,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,gBAAgB,CACjC,gBAAgB,EAChB,QAAQ,EACR,YAAY,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,oBAAoB,CAAC,IAAI,CAAC;QAC1B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,UAAU;QAC5C,wBAAwB,CAAC,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,eAAe,CAAC,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;AA/ED,4CA+EC"}
|
@@ -1,8 +1,8 @@
|
|
1
|
-
import {
|
1
|
+
import { Tree } from '@nrwl/devkit';
|
2
2
|
import { Schema } from '../schema';
|
3
3
|
/**
|
4
4
|
* Updates the tsconfig paths to remove the project.
|
5
5
|
*
|
6
6
|
* @param schema The options provided to the schematic
|
7
7
|
*/
|
8
|
-
export declare function updateTsconfig(tree: Tree, schema: Schema
|
8
|
+
export declare function updateTsconfig(tree: Tree, schema: Schema): Promise<void>;
|
@@ -1,27 +1,35 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.updateTsconfig = void 0;
|
4
|
+
const tslib_1 = require("tslib");
|
4
5
|
const devkit_1 = require("@nrwl/devkit");
|
5
|
-
const
|
6
|
-
const
|
6
|
+
const ts_config_1 = require("../../../utilities/ts-config");
|
7
|
+
const find_project_for_path_1 = require("nx/src/project-graph/utils/find-project-for-path");
|
7
8
|
/**
|
8
9
|
* Updates the tsconfig paths to remove the project.
|
9
10
|
*
|
10
11
|
* @param schema The options provided to the schematic
|
11
12
|
*/
|
12
|
-
function updateTsconfig(tree, schema
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
13
|
+
function updateTsconfig(tree, schema) {
|
14
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
15
|
+
const tsConfigPath = (0, ts_config_1.getRootTsConfigPathInTree)(tree);
|
16
|
+
if (tree.exists(tsConfigPath)) {
|
17
|
+
const graph = yield (0, devkit_1.createProjectGraphAsync)();
|
18
|
+
const projectMapping = (0, find_project_for_path_1.createProjectRootMappings)(graph.nodes);
|
19
|
+
(0, devkit_1.updateJson)(tree, tsConfigPath, (json) => {
|
20
|
+
for (const importPath in json.compilerOptions.paths) {
|
21
|
+
for (const path of json.compilerOptions.paths[importPath]) {
|
22
|
+
const project = (0, find_project_for_path_1.findProjectForPath)((0, devkit_1.normalizePath)(path), projectMapping);
|
23
|
+
if (project === schema.projectName) {
|
24
|
+
delete json.compilerOptions.paths[importPath];
|
25
|
+
break;
|
26
|
+
}
|
27
|
+
}
|
28
|
+
}
|
29
|
+
return json;
|
30
|
+
});
|
31
|
+
}
|
32
|
+
});
|
25
33
|
}
|
26
34
|
exports.updateTsconfig = updateTsconfig;
|
27
35
|
//# sourceMappingURL=update-tsconfig.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/update-tsconfig.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/update-tsconfig.ts"],"names":[],"mappings":";;;;AAAA,yCAMsB;AACtB,4DAAyE;AAEzE,4FAG0D;AAE1D;;;;GAIG;AACH,SAAsB,cAAc,CAAC,IAAU,EAAE,MAAc;;QAC7D,MAAM,YAAY,GAAG,IAAA,qCAAyB,EAAC,IAAI,CAAC,CAAC;QAErD,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;YAC7B,MAAM,KAAK,GAAiB,MAAM,IAAA,gCAAuB,GAAE,CAAC;YAC5D,MAAM,cAAc,GAAG,IAAA,iDAAyB,EAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC9D,IAAA,mBAAU,EAAC,IAAI,EAAE,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE;gBACtC,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE;oBACnD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE;wBACzD,MAAM,OAAO,GAAG,IAAA,0CAAkB,EAChC,IAAA,sBAAa,EAAC,IAAI,CAAC,EACnB,cAAc,CACf,CAAC;wBACF,IAAI,OAAO,KAAK,MAAM,CAAC,WAAW,EAAE;4BAClC,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;4BAC9C,MAAM;yBACP;qBACF;iBACF;gBACD,OAAO,IAAI,CAAC;YACd,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;CAAA;AAtBD,wCAsBC"}
|
@@ -3,21 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.removeSchematic = exports.removeGenerator = void 0;
|
4
4
|
const tslib_1 = require("tslib");
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
6
|
+
const check_project_is_safe_to_remove_1 = require("./lib/check-project-is-safe-to-remove");
|
6
7
|
const check_dependencies_1 = require("./lib/check-dependencies");
|
7
8
|
const check_targets_1 = require("./lib/check-targets");
|
8
9
|
const remove_project_1 = require("./lib/remove-project");
|
9
10
|
const update_tsconfig_1 = require("./lib/update-tsconfig");
|
10
|
-
const
|
11
|
+
const remove_project_references_in_config_1 = require("./lib/remove-project-references-in-config");
|
11
12
|
const update_jest_config_1 = require("./lib/update-jest-config");
|
12
13
|
function removeGenerator(tree, schema) {
|
13
14
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
14
15
|
const project = (0, devkit_1.readProjectConfiguration)(tree, schema.projectName);
|
16
|
+
yield (0, check_project_is_safe_to_remove_1.checkProjectIsSafeToRemove)(tree, schema, project);
|
15
17
|
yield (0, check_dependencies_1.checkDependencies)(tree, schema);
|
16
|
-
(0, check_targets_1.checkTargets)(tree, schema);
|
18
|
+
yield (0, check_targets_1.checkTargets)(tree, schema);
|
17
19
|
(0, update_jest_config_1.updateJestConfig)(tree, schema, project);
|
18
|
-
(0,
|
20
|
+
(0, remove_project_references_in_config_1.removeProjectReferencesInConfig)(tree, schema);
|
19
21
|
(0, remove_project_1.removeProject)(tree, project);
|
20
|
-
(0, update_tsconfig_1.updateTsconfig)(tree, schema
|
22
|
+
yield (0, update_tsconfig_1.updateTsconfig)(tree, schema);
|
21
23
|
if (!schema.skipFormat) {
|
22
24
|
yield (0, devkit_1.formatFiles)(tree);
|
23
25
|
}
|
@@ -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,
|
1
|
+
{"version":3,"file":"remove.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/remove/remove.ts"],"names":[],"mappings":";;;;AAAA,yCAKsB;AAEtB,2FAAmF;AACnF,iEAA6D;AAC7D,uDAAmD;AACnD,yDAAqD;AACrD,2DAAuD;AACvD,mGAA4F;AAE5F,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,4DAA0B,EAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACxD,MAAM,IAAA,sCAAiB,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACtC,MAAM,IAAA,4BAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACjC,IAAA,qCAAgB,EAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACxC,IAAA,qEAA+B,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC9C,IAAA,8BAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC7B,MAAM,IAAA,gCAAc,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACnC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;IACH,CAAC;CAAA;AAZD,0CAYC;AAED,kBAAe,eAAe,CAAC;AAElB,QAAA,eAAe,GAAG,IAAA,2BAAkB,EAAC,eAAe,CAAC,CAAC"}
|
@@ -10,7 +10,9 @@ function runCommandsGenerator(host, schema) {
|
|
10
10
|
project.targets[schema.name] = {
|
11
11
|
executor: 'nx:run-commands',
|
12
12
|
outputs: schema.outputs
|
13
|
-
? schema.outputs
|
13
|
+
? schema.outputs
|
14
|
+
.split(',')
|
15
|
+
.map((s) => (0, devkit_1.joinPathFragments)('{workspaceRoot}', s.trim()))
|
14
16
|
: [],
|
15
17
|
options: {
|
16
18
|
command: schema.command,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"run-commands.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/run-commands/run-commands.ts"],"names":[],"mappings":";;;;AACA,
|
1
|
+
{"version":3,"file":"run-commands.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/run-commands/run-commands.ts"],"names":[],"mappings":";;;;AACA,yCAOsB;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,iBAAiB;YAC3B,OAAO,EAAE,MAAM,CAAC,OAAO;gBACrB,CAAC,CAAC,MAAM,CAAC,OAAO;qBACX,KAAK,CAAC,GAAG,CAAC;qBACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,0BAAiB,EAAC,iBAAiB,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC/D,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;AAnBD,oDAmBC;AAED,kBAAe,oBAAoB,CAAC;AAEvB,QAAA,oBAAoB,GAAG,IAAA,2BAAkB,EAAC,oBAAoB,CAAC,CAAC"}
|
@@ -24,7 +24,8 @@
|
|
24
24
|
"project": {
|
25
25
|
"description": "Project name.",
|
26
26
|
"type": "string",
|
27
|
-
"x-prompt": "What project does the target belong to?"
|
27
|
+
"x-prompt": "What project does the target belong to?",
|
28
|
+
"x-dropdown": "projects"
|
28
29
|
},
|
29
30
|
"command": {
|
30
31
|
"description": "Command to run.",
|
@@ -3,18 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.insertImport = void 0;
|
4
4
|
const insert_statement_1 = require("./insert-statement");
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
6
|
-
const typescript_1 = require("typescript");
|
6
|
+
const typescript_1 = require("../../utilities/typescript");
|
7
|
+
let tsModule;
|
7
8
|
function insertImport(tree, path, name, modulePath) {
|
9
|
+
if (!tsModule) {
|
10
|
+
tsModule = (0, typescript_1.ensureTypescript)();
|
11
|
+
}
|
12
|
+
const { createSourceFile, ScriptTarget, isStringLiteral, isImportDeclaration, isNamedImports, } = tsModule;
|
8
13
|
const contents = tree.read(path, 'utf-8');
|
9
|
-
const sourceFile =
|
10
|
-
const importStatements = sourceFile.statements.filter(
|
11
|
-
const existingImport = importStatements.find((statement) =>
|
14
|
+
const sourceFile = createSourceFile(path, contents, ScriptTarget.ESNext);
|
15
|
+
const importStatements = sourceFile.statements.filter(isImportDeclaration);
|
16
|
+
const existingImport = importStatements.find((statement) => isStringLiteral(statement.moduleSpecifier) &&
|
12
17
|
statement.moduleSpecifier
|
13
18
|
.getText(sourceFile)
|
14
19
|
.replace(/['"`]/g, '')
|
15
20
|
.trim() === modulePath &&
|
16
21
|
statement.importClause.namedBindings &&
|
17
|
-
|
22
|
+
isNamedImports(statement.importClause.namedBindings));
|
18
23
|
if (!existingImport) {
|
19
24
|
(0, insert_statement_1.insertStatement)(tree, path, `import { ${name} } from '${modulePath}';`);
|
20
25
|
return;
|
@@ -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;
|
1
|
+
{"version":3,"file":"insert-import.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/utils/insert-import.ts"],"names":[],"mappings":";;;AAAA,yDAAqD;AACrD,yCAAsE;AAEtE,2DAA8D;AAE9D,IAAI,QAAqC,CAAC;AAE1C,SAAgB,YAAY,CAC1B,IAAU,EACV,IAAY,EACZ,IAAY,EACZ,UAAkB;IAElB,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,6BAAgB,GAAE,CAAC;KAC/B;IACD,MAAM,EACJ,gBAAgB,EAChB,YAAY,EACZ,eAAe,EACf,mBAAmB,EACnB,cAAc,GACf,GAAG,QAAQ,CAAC;IAEb,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAE1C,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IAEzE,MAAM,gBAAgB,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAE3E,MAAM,cAAc,GAAG,gBAAgB,CAAC,IAAI,CAC1C,CAAC,SAAS,EAAE,EAAE,CACZ,eAAe,CAAC,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,cAAc,CAAC,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;AA5DD,oCA4DC"}
|
@@ -2,14 +2,19 @@
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.insertStatement = void 0;
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
5
|
-
const typescript_1 = require("typescript");
|
5
|
+
const typescript_1 = require("../../utilities/typescript");
|
6
|
+
let tsModule;
|
6
7
|
/**
|
7
8
|
* Insert a statement after the last import statement in a file
|
8
9
|
*/
|
9
10
|
function insertStatement(tree, path, statement) {
|
11
|
+
if (!tsModule) {
|
12
|
+
tsModule = (0, typescript_1.ensureTypescript)();
|
13
|
+
}
|
14
|
+
const { createSourceFile, isImportDeclaration, ScriptTarget } = tsModule;
|
10
15
|
const contents = tree.read(path, 'utf-8');
|
11
|
-
const sourceFile =
|
12
|
-
const importStatements = sourceFile.statements.filter(
|
16
|
+
const sourceFile = createSourceFile(path, contents, ScriptTarget.ESNext);
|
17
|
+
const importStatements = sourceFile.statements.filter(isImportDeclaration);
|
13
18
|
const index = importStatements.length > 0
|
14
19
|
? importStatements[importStatements.length - 1].getEnd()
|
15
20
|
: 0;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"insert-statement.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/utils/insert-statement.ts"],"names":[],"mappings":";;;AAAA,yCAAsE;AACtE,
|
1
|
+
{"version":3,"file":"insert-statement.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/utils/insert-statement.ts"],"names":[],"mappings":";;;AAAA,yCAAsE;AACtE,2DAA8D;AAE9D,IAAI,QAAqC,CAAC;AAE1C;;GAEG;AACH,SAAgB,eAAe,CAAC,IAAU,EAAE,IAAY,EAAE,SAAiB;IACzE,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,6BAAgB,GAAE,CAAC;KAC/B;IACD,MAAM,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC;IAEzE,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAE1C,MAAM,UAAU,GAAG,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,YAAY,CAAC,MAAM,CAAC,CAAC;IAEzE,MAAM,gBAAgB,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,CAAC,mBAAmB,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;AA7BD,0CA6BC"}
|
@@ -5,13 +5,14 @@ export declare enum Preset {
|
|
5
5
|
NPM = "npm",
|
6
6
|
TS = "ts",
|
7
7
|
WebComponents = "web-components",
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
8
|
+
AngularMonorepo = "angular-monorepo",
|
9
|
+
AngularStandalone = "angular-standalone",
|
10
|
+
ReactMonorepo = "react-monorepo",
|
11
|
+
ReactStandalone = "react-standalone",
|
12
12
|
ReactNative = "react-native",
|
13
13
|
Expo = "expo",
|
14
14
|
NextJs = "next",
|
15
15
|
Nest = "nest",
|
16
|
-
Express = "express"
|
16
|
+
Express = "express",
|
17
|
+
NodeServer = "node-server"
|
17
18
|
}
|
@@ -9,14 +9,15 @@ var Preset;
|
|
9
9
|
Preset["NPM"] = "npm";
|
10
10
|
Preset["TS"] = "ts";
|
11
11
|
Preset["WebComponents"] = "web-components";
|
12
|
-
Preset["
|
13
|
-
Preset["
|
14
|
-
Preset["
|
15
|
-
Preset["
|
12
|
+
Preset["AngularMonorepo"] = "angular-monorepo";
|
13
|
+
Preset["AngularStandalone"] = "angular-standalone";
|
14
|
+
Preset["ReactMonorepo"] = "react-monorepo";
|
15
|
+
Preset["ReactStandalone"] = "react-standalone";
|
16
16
|
Preset["ReactNative"] = "react-native";
|
17
17
|
Preset["Expo"] = "expo";
|
18
18
|
Preset["NextJs"] = "next";
|
19
19
|
Preset["Nest"] = "nest";
|
20
20
|
Preset["Express"] = "express";
|
21
|
+
Preset["NodeServer"] = "node-server";
|
21
22
|
})(Preset = exports.Preset || (exports.Preset = {}));
|
22
23
|
//# sourceMappingURL=presets.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"presets.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/utils/presets.ts"],"names":[],"mappings":";;;AAAA,IAAY,
|
1
|
+
{"version":3,"file":"presets.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/utils/presets.ts"],"names":[],"mappings":";;;AAAA,IAAY,MAiBX;AAjBD,WAAY,MAAM;IAChB,uBAAa,CAAA;IACb,yBAAe,CAAA;IACf,uBAAa,CAAA;IACb,qBAAW,CAAA;IACX,mBAAS,CAAA;IACT,0CAAgC,CAAA;IAChC,8CAAoC,CAAA;IACpC,kDAAwC,CAAA;IACxC,0CAAgC,CAAA;IAChC,8CAAoC,CAAA;IACpC,sCAA4B,CAAA;IAC5B,uBAAa,CAAA;IACb,yBAAe,CAAA;IACf,uBAAa,CAAA;IACb,6BAAmB,CAAA;IACnB,oCAA0B,CAAA;AAC5B,CAAC,EAjBW,MAAM,GAAN,cAAM,KAAN,cAAM,QAiBjB"}
|
@@ -7,7 +7,7 @@ const output_1 = require("../../utilities/output");
|
|
7
7
|
function setTargetDependencies(host) {
|
8
8
|
var _a, _b, _c, _d, _e, _f, _g;
|
9
9
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
10
|
-
const config = (0, devkit_1.
|
10
|
+
const config = (0, devkit_1.readNxJson)(host);
|
11
11
|
const strictlyOrderedTargets = ((_c = (_b = (_a = config.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a['default']) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.strictlyOrderedTargets) || ['build'];
|
12
12
|
(_f = (_e = (_d = config.tasksRunnerOptions) === null || _d === void 0 ? void 0 : _d['default']) === null || _e === void 0 ? void 0 : _e.options) === null || _f === void 0 ? true : delete _f.strictlyOrderedTargets;
|
13
13
|
config.targetDependencies = (_g = config.targetDependencies) !== null && _g !== void 0 ? _g : {};
|
@@ -20,7 +20,7 @@ function setTargetDependencies(host) {
|
|
20
20
|
updatedStrictlyOrderedTargets.push(target);
|
21
21
|
}
|
22
22
|
});
|
23
|
-
(0, devkit_1.
|
23
|
+
(0, devkit_1.updateNxJson)(host, config);
|
24
24
|
if (updatedStrictlyOrderedTargets.length > 0) {
|
25
25
|
output_1.output.note({
|
26
26
|
title: 'Target dependencies have been updated in nx.json',
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"add-target-dependencies.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-12-5-0/add-target-dependencies.ts"],"names":[],"mappings":";;;;AAAA,
|
1
|
+
{"version":3,"file":"add-target-dependencies.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-12-5-0/add-target-dependencies.ts"],"names":[],"mappings":";;;;AAAA,yCAA2E;AAC3E,mDAAgD;AAEhD,SAAsB,qBAAqB,CAAC,IAAU;;;QACpD,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;QAChC,MAAM,sBAAsB,GAAG,CAAA,MAAA,MAAA,MAAA,MAAM,CAAC,kBAAkB,0CAAG,SAAS,CAAC,0CAAE,OAAO,0CAC1E,sBAAsB,KAAI,CAAC,OAAO,CAAC,CAAC;QACjC,MAAA,MAAA,MAAA,MAAM,CAAC,kBAAkB,0CAAG,SAAS,CAAC,0CAAE,OAAO,+CAClD,sBAAsB,CAAC;QAC3B,MAAM,CAAC,kBAAkB,GAAG,MAAA,MAAM,CAAC,kBAAkB,mCAAI,EAAE,CAAC;QAE5D,MAAM,6BAA6B,GAAG,EAAE,CAAC;QACzC,sBAAsB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACxC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,EAAE;gBACtC,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,GAAG;oBAClC,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE;iBACrC,CAAC;gBACF,6BAA6B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aAC5C;QACH,CAAC,CAAC,CAAC;QACH,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE3B,IAAI,6BAA6B,CAAC,MAAM,GAAG,CAAC,EAAE;YAC5C,eAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,kDAAkD;gBACzD,SAAS,EAAE;oBACT,2EAA2E;oBAC3E,0GAA0G,6BAA6B,CAAC,IAAI,CAC1I,IAAI,CACL,GAAG;oBACJ,gEAAgE;iBACjE;aACF,CAAC,CAAC;SACJ;QAED,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;;CACzB;AAjCD,sDAiCC;AAED,kBAAe,qBAAqB,CAAC"}
|
@@ -1,2 +1,2 @@
|
|
1
1
|
import { Tree } from '@nrwl/devkit';
|
2
|
-
export default function update(
|
2
|
+
export default function update(tree: Tree): Promise<void>;
|
@@ -2,23 +2,33 @@
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
const tslib_1 = require("tslib");
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
5
|
-
function update(
|
5
|
+
function update(tree) {
|
6
6
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
7
|
-
const nxJson = (0, devkit_1.readJson)(
|
7
|
+
const nxJson = (0, devkit_1.readJson)(tree, 'nx.json');
|
8
8
|
// updateProjectConfiguration automatically saves the project opts into workspace/project.json
|
9
9
|
if (nxJson.projects) {
|
10
|
-
Object.entries(nxJson.projects).forEach(([p,
|
10
|
+
Object.entries(nxJson.projects).forEach(([p, nxJsonConfiguration]) => {
|
11
11
|
var _a, _b;
|
12
|
-
const configuration = (0, devkit_1.readProjectConfiguration)(
|
13
|
-
(_a = configuration.tags) !== null && _a !== void 0 ? _a : (configuration.tags =
|
14
|
-
(_b = configuration.implicitDependencies) !== null && _b !== void 0 ? _b : (configuration.implicitDependencies =
|
15
|
-
(0, devkit_1.updateProjectConfiguration)(
|
12
|
+
const configuration = (0, devkit_1.readProjectConfiguration)(tree, p);
|
13
|
+
(_a = configuration.tags) !== null && _a !== void 0 ? _a : (configuration.tags = nxJsonConfiguration.tags);
|
14
|
+
(_b = configuration.implicitDependencies) !== null && _b !== void 0 ? _b : (configuration.implicitDependencies = nxJsonConfiguration.implicitDependencies);
|
15
|
+
(0, devkit_1.updateProjectConfiguration)(tree, p, configuration);
|
16
16
|
});
|
17
17
|
delete nxJson.projects;
|
18
18
|
}
|
19
|
-
(0, devkit_1.writeJson)(
|
20
|
-
|
19
|
+
(0, devkit_1.writeJson)(tree, 'nx.json', nxJson);
|
20
|
+
movePropertiesAreInNewLocations(tree); // move config options to new spots.
|
21
|
+
yield (0, devkit_1.formatFiles)(tree);
|
21
22
|
});
|
22
23
|
}
|
23
24
|
exports.default = update;
|
25
|
+
/**
|
26
|
+
* `updateWorkspaceConfiguration` already handles
|
27
|
+
* placing properties in their new locations, so
|
28
|
+
* reading + updating it ensures that props are placed
|
29
|
+
* correctly.
|
30
|
+
*/
|
31
|
+
function movePropertiesAreInNewLocations(tree) {
|
32
|
+
return;
|
33
|
+
}
|
24
34
|
//# sourceMappingURL=config-locations.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"config-locations.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/migrations/update-13-0-0/config-locations/config-locations.ts"],"names":[],"mappings":";;;AAAA,yCASsB;AAEtB,SAA8B,MAAM,CAAC,IAAU;;QAC7C,MAAM,MAAM,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,SAAS,CAKtC,CAAC;QACF,8FAA8F;QAC9F,IAAI,MAAM,CAAC,QAAQ,EAAE;YACnB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,
|
1
|
+
{"version":3,"file":"config-locations.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/migrations/update-13-0-0/config-locations/config-locations.ts"],"names":[],"mappings":";;;AAAA,yCASsB;AAEtB,SAA8B,MAAM,CAAC,IAAU;;QAC7C,MAAM,MAAM,GAAG,IAAA,iBAAQ,EAAC,IAAI,EAAE,SAAS,CAKtC,CAAC;QACF,8FAA8F;QAC9F,IAAI,MAAM,CAAC,QAAQ,EAAE;YACnB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,mBAAmB,CAAC,EAAE,EAAE;;gBACnE,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBACxD,MAAA,aAAa,CAAC,IAAI,oCAAlB,aAAa,CAAC,IAAI,GAAK,mBAAmB,CAAC,IAAI,EAAC;gBAChD,MAAA,aAAa,CAAC,oBAAoB,oCAAlC,aAAa,CAAC,oBAAoB,GAChC,mBAAmB,CAAC,oBAAoB,EAAC;gBAC3C,IAAA,mCAA0B,EAAC,IAAI,EAAE,CAAC,EAAE,aAAa,CAAC,CAAC;YACrD,CAAC,CAAC,CAAC;YACH,OAAO,MAAM,CAAC,QAAQ,CAAC;SACxB;QAED,IAAA,kBAAS,EAAC,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QAEnC,+BAA+B,CAAC,IAAI,CAAC,CAAC,CAAC,oCAAoC;QAE3E,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CAAA;AAxBD,yBAwBC;AAED;;;;;GAKG;AACH,SAAS,+BAA+B,CAAC,IAAU;IACjD,OAAO;AACT,CAAC"}
|
@@ -8,7 +8,7 @@ function setDefaultBaseIfNotSet(host) {
|
|
8
8
|
var _a, _b, _c;
|
9
9
|
var _d;
|
10
10
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
11
|
-
const config = (0, devkit_1.
|
11
|
+
const config = (0, devkit_1.readNxJson)(host);
|
12
12
|
if (!((_a = config.affected) === null || _a === void 0 ? void 0 : _a.defaultBase)) {
|
13
13
|
(_b = config.affected) !== null && _b !== void 0 ? _b : (config.affected = {});
|
14
14
|
(_c = (_d = config.affected).defaultBase) !== null && _c !== void 0 ? _c : (_d.defaultBase = 'master');
|
@@ -21,7 +21,7 @@ function setDefaultBaseIfNotSet(host) {
|
|
21
21
|
],
|
22
22
|
});
|
23
23
|
}
|
24
|
-
(0, devkit_1.
|
24
|
+
(0, devkit_1.updateNxJson)(host, config);
|
25
25
|
yield (0, devkit_1.formatFiles)(host);
|
26
26
|
});
|
27
27
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"set-default-base-if-not-set.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-13-0-0/set-default-base-if-not-set.ts"],"names":[],"mappings":";;;;AAAA,
|
1
|
+
{"version":3,"file":"set-default-base-if-not-set.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-13-0-0/set-default-base-if-not-set.ts"],"names":[],"mappings":";;;;AAAA,yCAA2E;AAC3E,mDAAgD;AAEhD,SAAsB,sBAAsB,CAAC,IAAU;;;;QACrD,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;QAChC,IAAI,CAAC,CAAA,MAAA,MAAM,CAAC,QAAQ,0CAAE,WAAW,CAAA,EAAE;YACjC,MAAA,MAAM,CAAC,QAAQ,oCAAf,MAAM,CAAC,QAAQ,GAAK,EAAE,EAAC;YACvB,YAAA,MAAM,CAAC,QAAQ,EAAC,WAAW,uCAAX,WAAW,GAAK,QAAQ,EAAC;YAEzC,eAAM,CAAC,IAAI,CAAC;gBACV,KAAK,EAAE,sCAAsC;gBAC7C,SAAS,EAAE;oBACT,+CAA+C;oBAC/C,0FAA0F;oBAC1F,kDAAkD;iBACnD;aACF,CAAC,CAAC;SACJ;QACD,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC3B,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;;CACzB;AAjBD,wDAiBC;AAED,kBAAe,sBAAsB,CAAC"}
|
@@ -3,13 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.updateTasksRunner = void 0;
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
5
5
|
function updateTasksRunner(host) {
|
6
|
-
|
7
|
-
|
6
|
+
var _a;
|
7
|
+
const config = (0, devkit_1.readNxJson)(host);
|
8
|
+
if (((_a = config === null || config === void 0 ? void 0 : config.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a['default']) &&
|
8
9
|
(config === null || config === void 0 ? void 0 : config.tasksRunnerOptions['default'].runner) ==
|
9
10
|
'@nrwl/workspace/tasks-runners/default') {
|
10
11
|
config.tasksRunnerOptions['default'].runner = 'nx/tasks-runners/default';
|
11
12
|
}
|
12
|
-
(0, devkit_1.
|
13
|
+
(0, devkit_1.updateNxJson)(host, config);
|
13
14
|
}
|
14
15
|
exports.updateTasksRunner = updateTasksRunner;
|
15
16
|
exports.default = updateTasksRunner;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"update-tasks-runner.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-13-10-0/update-tasks-runner.ts"],"names":[],"mappings":";;;AAAA,
|
1
|
+
{"version":3,"file":"update-tasks-runner.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-13-10-0/update-tasks-runner.ts"],"names":[],"mappings":";;;AAAA,yCAA8D;AAE9D,SAAgB,iBAAiB,CAAC,IAAU;;IAC1C,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAChC,IACE,CAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,kBAAkB,0CAAG,SAAS,CAAC;QACvC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,kBAAkB,CAAC,SAAS,EAAE,MAAM;YAC1C,uCAAuC,EACzC;QACA,MAAM,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,0BAA0B,CAAC;KAC1E;IACD,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7B,CAAC;AAVD,8CAUC;AAED,kBAAe,iBAAiB,CAAC"}
|
@@ -6,7 +6,7 @@ const devkit_1 = require("@nrwl/devkit");
|
|
6
6
|
function setParallelDefault(host) {
|
7
7
|
var _a, _b;
|
8
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
9
|
-
const config = (0, devkit_1.
|
9
|
+
const config = (0, devkit_1.readNxJson)(host);
|
10
10
|
const defaultTaskRunnerOptions = (_b = (_a = config.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a['default']) === null || _b === void 0 ? void 0 : _b.options;
|
11
11
|
if (defaultTaskRunnerOptions) {
|
12
12
|
if (defaultTaskRunnerOptions.parallel) {
|
@@ -17,7 +17,7 @@ function setParallelDefault(host) {
|
|
17
17
|
else {
|
18
18
|
defaultTaskRunnerOptions.parallel = 1;
|
19
19
|
}
|
20
|
-
(0, devkit_1.
|
20
|
+
(0, devkit_1.updateNxJson)(host, config);
|
21
21
|
}
|
22
22
|
yield (0, devkit_1.formatFiles)(host);
|
23
23
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"set-parallel-default.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-13-2-0/set-parallel-default.ts"],"names":[],"mappings":";;;;AAAA,
|
1
|
+
{"version":3,"file":"set-parallel-default.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-13-2-0/set-parallel-default.ts"],"names":[],"mappings":";;;;AAAA,yCAA2E;AAE3E,SAAsB,kBAAkB,CAAC,IAAU;;;QACjD,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;QAChC,MAAM,wBAAwB,GAC5B,MAAA,MAAA,MAAM,CAAC,kBAAkB,0CAAG,SAAS,CAAC,0CAAE,OAAO,CAAC;QAClD,IAAI,wBAAwB,EAAE;YAC5B,IAAI,wBAAwB,CAAC,QAAQ,EAAE;gBACrC,wBAAwB,CAAC,QAAQ;oBAC/B,wBAAwB,CAAC,WAAW,IAAI,CAAC,CAAC;gBAC5C,OAAO,wBAAwB,CAAC,WAAW,CAAC;aAC7C;iBAAM;gBACL,wBAAwB,CAAC,QAAQ,GAAG,CAAC,CAAC;aACvC;YACD,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SAC5B;QACD,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;;CACzB;AAfD,gDAeC;AAED,kBAAe,kBAAkB,CAAC"}
|
@@ -4,12 +4,12 @@ exports.removeOldTaskRunnerOptions = void 0;
|
|
4
4
|
const devkit_1 = require("@nrwl/devkit");
|
5
5
|
function removeOldTaskRunnerOptions(host) {
|
6
6
|
var _a, _b;
|
7
|
-
const
|
8
|
-
const options = (_b = (_a =
|
7
|
+
const nxJson = (0, devkit_1.readNxJson)(host);
|
8
|
+
const options = (_b = (_a = nxJson.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a['default']) === null || _b === void 0 ? void 0 : _b.options;
|
9
9
|
if (options) {
|
10
10
|
delete options.scan;
|
11
11
|
delete options.analytics;
|
12
|
-
(0, devkit_1.
|
12
|
+
(0, devkit_1.updateNxJson)(host, nxJson);
|
13
13
|
}
|
14
14
|
}
|
15
15
|
exports.removeOldTaskRunnerOptions = removeOldTaskRunnerOptions;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"remove-old-task-runner-options.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-13-6-0/remove-old-task-runner-options.ts"],"names":[],"mappings":";;;AAAA,
|
1
|
+
{"version":3,"file":"remove-old-task-runner-options.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-13-6-0/remove-old-task-runner-options.ts"],"names":[],"mappings":";;;AAAA,yCAA8D;AAE9D,SAAgB,0BAA0B,CAAC,IAAU;;IACnD,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAChC,MAAM,OAAO,GAAG,MAAA,MAAA,MAAM,CAAC,kBAAkB,0CAAG,SAAS,CAAC,0CAAE,OAAO,CAAC;IAChE,IAAI,OAAO,EAAE;QACX,OAAO,OAAO,CAAC,IAAI,CAAC;QACpB,OAAO,OAAO,CAAC,SAAS,CAAC;QACzB,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;KAC5B;AACH,CAAC;AARD,gEAQC;AAED,kBAAe,0BAA0B,CAAC"}
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.changeNpmScriptExecutor = void 0;
|
4
4
|
const tslib_1 = require("tslib");
|
5
5
|
const devkit_1 = require("@nrwl/devkit");
|
6
|
-
const executor_options_utils_1 = require("@nrwl/
|
6
|
+
const executor_options_utils_1 = require("@nrwl/devkit/src/generators/executor-options-utils");
|
7
7
|
function changeNpmScriptExecutor(tree) {
|
8
8
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
9
9
|
(0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/workspace:run-script', (currentValue, project, target) => {
|