@nrwl/workspace 14.8.8 → 14.9.0-beta.1

package/src/generators/remove/lib/check-targets.js.map

@@ -1 +1 @@
-{"version":3,"file":"check-targets.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/check-targets.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AAGtB;;;;;;GAMG;AACH,SAAgB,YAAY,CAAC,IAAU,EAAE,MAAc;IACrD,IAAI,MAAM,CAAC,WAAW,EAAE;QACtB,OAAO;KACR;IAED,MAAM,MAAM,GAAa,EAAE,CAAC;IAE5B,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,WAAW,EAAE,EAAE;QACvD,IAAI,WAAW,KAAK,MAAM,CAAC,WAAW,EAAE;YACtC,OAAO;SACR;QACD,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,EAAE,EAAE;YACvE,oBAAoB,CAAC,YAAY,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC3C,IAAI;oBACF,MAAM,EAAE,OAAO,EAAE,GAAG,IAAA,0BAAiB,EAAC,KAAK,CAAC,CAAC;oBAC7C,IAAI,OAAO,KAAK,MAAM,CAAC,WAAW,EAAE;wBAClC,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,iBAAiB,WAAW,GAAG,CAAC,CAAC;qBACvD;iBACF;gBAAC,OAAO,GAAG,EAAE;oBACZ;;;;;;uBAMG;iBACJ;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;QACrB,IAAI,OAAO,GAAG,GAAG,MAAM,CAAC,WAAW,0CAA0C,CAAC;QAC9E,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE;YACxB,OAAO,IAAI,GAAG,KAAK,IAAI,CAAC;SACzB;QAED,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;KAC1B;AACH,CAAC;AAvCD,oCAuCC;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"}
+{"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"}

package/src/generators/remove/lib/remove-project-references-in-config.d.ts

@@ -0,0 +1,3 @@
+import { Schema } from '../schema';
+import { Tree } from '@nrwl/devkit';
+export declare function removeProjectReferencesInConfig(tree: Tree, schema: Schema): void;

package/src/generators/remove/lib/remove-project-references-in-config.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.removeProjectReferencesInConfig = void 0;
+const devkit_1 = require("@nrwl/devkit");
+function removeProjectReferencesInConfig(tree, schema) {
+    // Unset default project if deleting the default project
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    if (nxJson.defaultProject && nxJson.defaultProject === schema.projectName) {
+        delete nxJson.defaultProject;
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+    }
+    // Remove implicit dependencies onto removed project
+    (0, devkit_1.getProjects)(tree).forEach((project, projectName) => {
+        if (project.implicitDependencies &&
+            project.implicitDependencies.some((projectName) => projectName === schema.projectName)) {
+            project.implicitDependencies = project.implicitDependencies.filter((projectName) => projectName !== schema.projectName);
+            (0, devkit_1.updateProjectConfiguration)(tree, projectName, project);
+        }
+    });
+}
+exports.removeProjectReferencesInConfig = removeProjectReferencesInConfig;
+//# sourceMappingURL=remove-project-references-in-config.js.map

package/src/generators/remove/lib/remove-project-references-in-config.js.map

@@ -0,0 +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"}

package/src/generators/remove/lib/update-jest-config.js

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateJestConfig = void 0;
 const devkit_1 = require("@nrwl/devkit");
 const get_source_nodes_1 = require("../../../utilities/typescript/get-source-nodes");
-const typescript_1 = require("typescript");
 const path_1 = require("path");
+const typescript_1 = require("../../../utilities/typescript");
+let tsModule;
 function isUsingUtilityFunction(host) {
     return host.read('jest.config.ts').toString().includes('getJestProjects()');
 }
@@ -12,6 +13,10 @@ function isUsingUtilityFunction(host) {
  * Updates the root jest config projects array and removes the project.
  */
 function updateJestConfig(tree, schema, projectConfig) {
+    if (!tsModule) {
+        tsModule = (0, typescript_1.ensureTypescript)();
+    }
+    const { createSourceFile, ScriptTarget, isPropertyAssignment, isArrayLiteralExpression, isStringLiteral, } = tsModule;
     const projectToRemove = schema.projectName;
     if (!tree.exists('jest.config.ts') ||
         !tree.exists((0, path_1.join)(projectConfig.root, 'jest.config.ts')) ||
@@ -19,16 +24,16 @@ function updateJestConfig(tree, schema, projectConfig) {
         return;
     }
     const contents = tree.read('jest.config.ts', 'utf-8');
-    const sourceFile = (0, typescript_1.createSourceFile)('jest.config.ts', contents, typescript_1.ScriptTarget.Latest);
+    const sourceFile = createSourceFile('jest.config.ts', contents, ScriptTarget.Latest);
     const sourceNodes = (0, get_source_nodes_1.getSourceNodes)(sourceFile);
-    const projectsAssignment = sourceNodes.find((node) => (0, typescript_1.isPropertyAssignment)(node) &&
+    const projectsAssignment = sourceNodes.find((node) => isPropertyAssignment(node) &&
         node.name.getText(sourceFile) === 'projects' &&
-        (0, typescript_1.isArrayLiteralExpression)(node.initializer));
+        isArrayLiteralExpression(node.initializer));
     if (!projectsAssignment) {
         throw Error(`Could not remove ${projectToRemove} from projects in /jest.config.ts. Please remove ${projectToRemove} from your projects.`);
     }
     const projectsArray = projectsAssignment.initializer;
-    const project = projectsArray.elements.find((item) => (0, typescript_1.isStringLiteral)(item) &&
+    const project = projectsArray.elements.find((item) => isStringLiteral(item) &&
         item.text.startsWith(`<rootDir>/${projectConfig.root}`));
     if (!project) {
         console.warn(`Could not find ${projectToRemove} in projects in /jest.config.ts.`);

package/src/generators/remove/lib/update-jest-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-jest-config.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/update-jest-config.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,qFAAgF;AAGhF,2CASoB;AACpB,+BAA4B;AAE5B,SAAS,sBAAsB,CAAC,IAAU;IACxC,OAAO,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;AAC9E,CAAC;AAED;;GAEG;AACH,SAAgB,gBAAgB,CAC9B,IAAU,EACV,MAAc,EACd,aAAmC;IAEnC,MAAM,eAAe,GAAG,MAAM,CAAC,WAAW,CAAC;IAE3C,IACE,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC;QAC9B,CAAC,IAAI,CAAC,MAAM,CAAC,IAAA,WAAI,EAAC,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;QACxD,sBAAsB,CAAC,IAAI,CAAC,EAC5B;QACA,OAAO;KACR;IAED,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IACtD,MAAM,UAAU,GAAG,IAAA,6BAAgB,EACjC,gBAAgB,EAChB,QAAQ,EACR,yBAAY,CAAC,MAAM,CACpB,CAAC;IAEF,MAAM,WAAW,GAAG,IAAA,iCAAc,EAAC,UAAU,CAAC,CAAC;IAE/C,MAAM,kBAAkB,GAAG,WAAW,CAAC,IAAI,CACzC,CAAC,IAAI,EAAE,EAAE,CACP,IAAA,iCAAoB,EAAC,IAAI,CAAC;QAC1B,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,UAAU;QAC5C,IAAA,qCAAwB,EAAC,IAAI,CAAC,WAAW,CAAC,CACvB,CAAC;IAExB,IAAI,CAAC,kBAAkB,EAAE;QACvB,MAAM,KAAK,CACT,oBAAoB,eAAe,oDAAoD,eAAe,sBAAsB,CAC7H,CAAC;KACH;IACD,MAAM,aAAa,GACjB,kBAAkB,CAAC,WAAqC,CAAC;IAE3D,MAAM,OAAO,GAAG,aAAa,CAAC,QAAQ,CAAC,IAAI,CACzC,CAAC,IAAI,EAAE,EAAE,CACP,IAAA,4BAAe,EAAC,IAAI,CAAC;QACrB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,aAAa,CAAC,IAAI,EAAE,CAAC,CACzC,CAAC;IAEnB,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,CAAC,IAAI,CACV,kBAAkB,eAAe,kCAAkC,CACpE,CAAC;QACF,OAAO;KACR;IAED,MAAM,eAAe,GACnB,aAAa,CAAC,QAAQ,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IAEtE,MAAM,KAAK,GAAG,eAAe;QAC3B,CAAC,CAAC,eAAe,CAAC,MAAM,EAAE;QAC1B,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAEjC,IAAI,CAAC,KAAK,CACR,gBAAgB,EAChB,IAAA,6BAAoB,EAAC,QAAQ,EAAE;QAC7B;YACE,IAAI,EAAE,mBAAU,CAAC,MAAM;YACvB,KAAK;YACL,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG,KAAK;SACjC;KACF,CAAC,CACH,CAAC;AACJ,CAAC;AArED,4CAqEC"}
+{"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"}

package/src/generators/remove/lib/update-tsconfig.d.ts

@@ -1,8 +1,8 @@
-import { ProjectConfiguration, Tree } from '@nrwl/devkit';
+import { Tree } from '@nrwl/devkit';
 import { Schema } from '../schema';
 /**
  * Updates the tsconfig paths to remove the project.
  *
  * @param schema The options provided to the schematic
  */
-export declare function updateTsconfig(tree: Tree, schema: Schema, project: ProjectConfiguration): void;
+export declare function updateTsconfig(tree: Tree, schema: Schema): Promise<void>;

package/src/generators/remove/lib/update-tsconfig.js

@@ -1,27 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateTsconfig = void 0;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
-const path_1 = require("nx/src/utils/path");
-const typescript_1 = require("../../../utilities/typescript");
+const ts_config_1 = require("../../../utilities/ts-config");
+const find_project_for_path_1 = require("nx/src/project-graph/utils/find-project-for-path");
 /**
  * Updates the tsconfig paths to remove the project.
  *
  * @param schema The options provided to the schematic
  */
-function updateTsconfig(tree, schema, project) {
-    const { appsDir, libsDir, npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
-    const tsConfigPath = (0, typescript_1.getRootTsConfigPathInTree)(tree);
-    const defaultImportPath = (0, path_1.getImportPath)(npmScope, project.root
-        .slice(project.projectType === 'application' ? appsDir.length : libsDir.length)
-        .replace(/^\/|\\/, ''));
-    const importPath = schema.importPath || defaultImportPath;
-    if (tree.exists(tsConfigPath)) {
-        (0, devkit_1.updateJson)(tree, tsConfigPath, (json) => {
-            delete json.compilerOptions.paths[importPath];
-            return json;
-        });
-    }
+function updateTsconfig(tree, schema) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const tsConfigPath = (0, ts_config_1.getRootTsConfigPathInTree)(tree);
+        if (tree.exists(tsConfigPath)) {
+            const graph = yield (0, devkit_1.createProjectGraphAsync)();
+            const projectMapping = (0, find_project_for_path_1.createProjectRootMappings)(graph.nodes);
+            (0, devkit_1.updateJson)(tree, tsConfigPath, (json) => {
+                for (const importPath in json.compilerOptions.paths) {
+                    for (const path of json.compilerOptions.paths[importPath]) {
+                        const project = (0, find_project_for_path_1.findProjectForPath)((0, devkit_1.normalizePath)(path), projectMapping);
+                        if (project === schema.projectName) {
+                            delete json.compilerOptions.paths[importPath];
+                            break;
+                        }
+                    }
+                }
+                return json;
+            });
+        }
+    });
 }
 exports.updateTsconfig = updateTsconfig;
 //# sourceMappingURL=update-tsconfig.js.map

package/src/generators/remove/lib/update-tsconfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-tsconfig.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/remove/lib/update-tsconfig.ts"],"names":[],"mappings":";;;AAAA,yCAKsB;AACtB,4CAAkD;AAClD,8DAA0E;AAG1E;;;;GAIG;AACH,SAAgB,cAAc,CAC5B,IAAU,EACV,MAAc,EACd,OAA6B;IAE7B,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAEhE,MAAM,YAAY,GAAG,IAAA,sCAAyB,EAAC,IAAI,CAAC,CAAC;IACrD,MAAM,iBAAiB,GAAG,IAAA,oBAAa,EACrC,QAAQ,EACR,OAAO,CAAC,IAAI;SACT,KAAK,CACJ,OAAO,CAAC,WAAW,KAAK,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CACxE;SACA,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CACzB,CAAC;IACF,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,iBAAiB,CAAC;IAC1D,IAAI,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE;QAC7B,IAAA,mBAAU,EAAC,IAAI,EAAE,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE;YACtC,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC9C,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AAvBD,wCAuBC"}
+{"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"}

package/src/generators/remove/remove.js

@@ -3,21 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeSchematic = exports.removeGenerator = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
+const check_project_is_safe_to_remove_1 = require("./lib/check-project-is-safe-to-remove");
 const check_dependencies_1 = require("./lib/check-dependencies");
 const check_targets_1 = require("./lib/check-targets");
 const remove_project_1 = require("./lib/remove-project");
 const update_tsconfig_1 = require("./lib/update-tsconfig");
-const remove_project_config_1 = require("./lib/remove-project-config");
+const remove_project_references_in_config_1 = require("./lib/remove-project-references-in-config");
 const update_jest_config_1 = require("./lib/update-jest-config");
 function removeGenerator(tree, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const project = (0, devkit_1.readProjectConfiguration)(tree, schema.projectName);
+        yield (0, check_project_is_safe_to_remove_1.checkProjectIsSafeToRemove)(tree, schema, project);
         yield (0, check_dependencies_1.checkDependencies)(tree, schema);
-        (0, check_targets_1.checkTargets)(tree, schema);
+        yield (0, check_targets_1.checkTargets)(tree, schema);
         (0, update_jest_config_1.updateJestConfig)(tree, schema, project);
-        (0, remove_project_config_1.removeProjectConfig)(tree, schema);
+        (0, remove_project_references_in_config_1.removeProjectReferencesInConfig)(tree, schema);
         (0, remove_project_1.removeProject)(tree, project);
-        (0, update_tsconfig_1.updateTsconfig)(tree, schema, project);
+        yield (0, update_tsconfig_1.updateTsconfig)(tree, schema);
         if (!schema.skipFormat) {
             yield (0, devkit_1.formatFiles)(tree);
         }

package/src/generators/remove/remove.js.map

@@ -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,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,CAAC,CAAC;QAC3B,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"}
+{"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"}

package/src/generators/remove/schema.json

@@ -35,7 +35,8 @@
       "type": "boolean",
       "aliases": ["skip-format"],
       "description": "Skip formatting files.",
-      "default": false
+      "default": false,
+      "x-priority": "internal"
     },
     "importPath": {
       "type": "string",

package/src/generators/run-commands/run-commands.js

@@ -10,7 +10,9 @@ function runCommandsGenerator(host, schema) {
         project.targets[schema.name] = {
             executor: 'nx:run-commands',
             outputs: schema.outputs
-                ? schema.outputs.split(',').map((s) => s.trim())
+                ? schema.outputs
+                    .split(',')
+                    .map((s) => (0, devkit_1.joinPathFragments)('{workspaceRoot}', s.trim()))
                 : [],
             options: {
                 command: schema.command,

package/src/generators/run-commands/run-commands.js.map

@@ -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,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,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"}
+{"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"}

package/src/generators/run-commands/schema.json

@@ -24,7 +24,8 @@
     "project": {
       "description": "Project name.",
       "type": "string",
-      "x-prompt": "What project does the target belong to?"
+      "x-prompt": "What project does the target belong to?",
+      "x-dropdown": "projects"
     },
     "command": {
       "description": "Command to run.",

package/src/generators/utils/insert-import.js

@@ -3,18 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.insertImport = void 0;
 const insert_statement_1 = require("./insert-statement");
 const devkit_1 = require("@nrwl/devkit");
-const typescript_1 = require("typescript");
+const typescript_1 = require("../../utilities/typescript");
+let tsModule;
 function insertImport(tree, path, name, modulePath) {
+    if (!tsModule) {
+        tsModule = (0, typescript_1.ensureTypescript)();
+    }
+    const { createSourceFile, ScriptTarget, isStringLiteral, isImportDeclaration, isNamedImports, } = tsModule;
     const contents = tree.read(path, 'utf-8');
-    const sourceFile = (0, typescript_1.createSourceFile)(path, contents, typescript_1.ScriptTarget.ESNext);
-    const importStatements = sourceFile.statements.filter(typescript_1.isImportDeclaration);
-    const existingImport = importStatements.find((statement) => (0, typescript_1.isStringLiteral)(statement.moduleSpecifier) &&
+    const sourceFile = createSourceFile(path, contents, ScriptTarget.ESNext);
+    const importStatements = sourceFile.statements.filter(isImportDeclaration);
+    const existingImport = importStatements.find((statement) => isStringLiteral(statement.moduleSpecifier) &&
         statement.moduleSpecifier
             .getText(sourceFile)
             .replace(/['"`]/g, '')
             .trim() === modulePath &&
         statement.importClause.namedBindings &&
-        (0, typescript_1.isNamedImports)(statement.importClause.namedBindings));
+        isNamedImports(statement.importClause.namedBindings));
     if (!existingImport) {
         (0, insert_statement_1.insertStatement)(tree, path, `import { ${name} } from '${modulePath}';`);
         return;

package/src/generators/utils/insert-import.js.map

@@ -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,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"}
+{"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"}

package/src/generators/utils/insert-statement.js

@@ -2,14 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.insertStatement = void 0;
 const devkit_1 = require("@nrwl/devkit");
-const typescript_1 = require("typescript");
+const typescript_1 = require("../../utilities/typescript");
+let tsModule;
 /**
  * Insert a statement after the last import statement in a file
  */
 function insertStatement(tree, path, statement) {
+    if (!tsModule) {
+        tsModule = (0, typescript_1.ensureTypescript)();
+    }
+    const { createSourceFile, isImportDeclaration, ScriptTarget } = tsModule;
     const contents = tree.read(path, 'utf-8');
-    const sourceFile = (0, typescript_1.createSourceFile)(path, contents, typescript_1.ScriptTarget.ESNext);
-    const importStatements = sourceFile.statements.filter(typescript_1.isImportDeclaration);
+    const sourceFile = createSourceFile(path, contents, ScriptTarget.ESNext);
+    const importStatements = sourceFile.statements.filter(isImportDeclaration);
     const index = importStatements.length > 0
         ? importStatements[importStatements.length - 1].getEnd()
         : 0;

package/src/generators/utils/insert-statement.js.map

@@ -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,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"}
+{"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"}

package/src/generators/utils/presets.d.ts

@@ -5,13 +5,14 @@ export declare enum Preset {
     NPM = "npm",
     TS = "ts",
     WebComponents = "web-components",
-    Angular = "angular",
-    AngularWithNest = "angular-nest",
-    React = "react",
-    ReactWithExpress = "react-express",
+    AngularMonorepo = "angular-monorepo",
+    AngularStandalone = "angular-standalone",
+    ReactMonorepo = "react-monorepo",
+    ReactStandalone = "react-standalone",
     ReactNative = "react-native",
     Expo = "expo",
     NextJs = "next",
     Nest = "nest",
-    Express = "express"
+    Express = "express",
+    NodeServer = "node-server"
 }

package/src/generators/utils/presets.js

@@ -9,14 +9,15 @@ var Preset;
     Preset["NPM"] = "npm";
     Preset["TS"] = "ts";
     Preset["WebComponents"] = "web-components";
-    Preset["Angular"] = "angular";
-    Preset["AngularWithNest"] = "angular-nest";
-    Preset["React"] = "react";
-    Preset["ReactWithExpress"] = "react-express";
+    Preset["AngularMonorepo"] = "angular-monorepo";
+    Preset["AngularStandalone"] = "angular-standalone";
+    Preset["ReactMonorepo"] = "react-monorepo";
+    Preset["ReactStandalone"] = "react-standalone";
     Preset["ReactNative"] = "react-native";
     Preset["Expo"] = "expo";
     Preset["NextJs"] = "next";
     Preset["Nest"] = "nest";
     Preset["Express"] = "express";
+    Preset["NodeServer"] = "node-server";
 })(Preset = exports.Preset || (exports.Preset = {}));
 //# sourceMappingURL=presets.js.map

package/src/generators/utils/presets.js.map

@@ -1 +1 @@
-{"version":3,"file":"presets.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/utils/presets.ts"],"names":[],"mappings":";;;AAAA,IAAY,MAgBX;AAhBD,WAAY,MAAM;IAChB,uBAAa,CAAA;IACb,yBAAe,CAAA;IACf,uBAAa,CAAA;IACb,qBAAW,CAAA;IACX,mBAAS,CAAA;IACT,0CAAgC,CAAA;IAChC,6BAAmB,CAAA;IACnB,0CAAgC,CAAA;IAChC,yBAAe,CAAA;IACf,4CAAkC,CAAA;IAClC,sCAA4B,CAAA;IAC5B,uBAAa,CAAA;IACb,yBAAe,CAAA;IACf,uBAAa,CAAA;IACb,6BAAmB,CAAA;AACrB,CAAC,EAhBW,MAAM,GAAN,cAAM,KAAN,cAAM,QAgBjB"}
+{"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"}

package/src/generators/workspace-generator/schema.json

@@ -17,8 +17,9 @@
     "skipFormat": {
       "description": "Skip formatting files.",
       "type": "boolean",
-      "default": false
+      "default": false,
+      "x-priority": "internal"
     }
   },
-  "required": []
+  "required": ["name"]
 }

package/src/migrations/update-12-5-0/add-target-dependencies.js

@@ -7,7 +7,7 @@ const output_1 = require("../../utilities/output");
 function setTargetDependencies(host) {
     var _a, _b, _c, _d, _e, _f, _g;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const config = (0, devkit_1.readWorkspaceConfiguration)(host);
+        const config = (0, devkit_1.readNxJson)(host);
         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'];
         (_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;
         config.targetDependencies = (_g = config.targetDependencies) !== null && _g !== void 0 ? _g : {};
@@ -20,7 +20,7 @@ function setTargetDependencies(host) {
                 updatedStrictlyOrderedTargets.push(target);
             }
         });
-        (0, devkit_1.updateWorkspaceConfiguration)(host, config);
+        (0, devkit_1.updateNxJson)(host, config);
         if (updatedStrictlyOrderedTargets.length > 0) {
             output_1.output.note({
                 title: 'Target dependencies have been updated in nx.json',

package/src/migrations/update-12-5-0/add-target-dependencies.js.map

@@ -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,yCAKsB;AACtB,mDAAgD;AAEhD,SAAsB,qBAAqB,CAAC,IAAU;;;QACpD,MAAM,MAAM,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;QAChD,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,qCAA4B,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAE3C,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"}
+{"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"}

package/src/migrations/update-13-0-0/config-locations/config-locations.d.ts

@@ -1,2 +1,2 @@
 import { Tree } from '@nrwl/devkit';
-export default function update(host: Tree): Promise<void>;
+export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-13-0-0/config-locations/config-locations.js

@@ -2,23 +2,33 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
-function update(host) {
+function update(tree) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const nxJson = (0, devkit_1.readJson)(host, 'nx.json');
+        const nxJson = (0, devkit_1.readJson)(tree, 'nx.json');
         // updateProjectConfiguration automatically saves the project opts into workspace/project.json
         if (nxJson.projects) {
-            Object.entries(nxJson.projects).forEach(([p, nxJsonConfig]) => {
+            Object.entries(nxJson.projects).forEach(([p, nxJsonConfiguration]) => {
                 var _a, _b;
-                const configuration = (0, devkit_1.readProjectConfiguration)(host, p);
-                (_a = configuration.tags) !== null && _a !== void 0 ? _a : (configuration.tags = nxJsonConfig.tags);
-                (_b = configuration.implicitDependencies) !== null && _b !== void 0 ? _b : (configuration.implicitDependencies = nxJsonConfig.implicitDependencies);
-                (0, devkit_1.updateProjectConfiguration)(host, p, configuration);
+                const configuration = (0, devkit_1.readProjectConfiguration)(tree, p);
+                (_a = configuration.tags) !== null && _a !== void 0 ? _a : (configuration.tags = nxJsonConfiguration.tags);
+                (_b = configuration.implicitDependencies) !== null && _b !== void 0 ? _b : (configuration.implicitDependencies = nxJsonConfiguration.implicitDependencies);
+                (0, devkit_1.updateProjectConfiguration)(tree, p, configuration);
             });
             delete nxJson.projects;
         }
-        (0, devkit_1.writeJson)(host, 'nx.json', nxJson);
-        yield (0, devkit_1.formatFiles)(host); // format files handles moving config options to new spots.
+        (0, devkit_1.writeJson)(tree, 'nx.json', nxJson);
+        movePropertiesAreInNewLocations(tree); // move config options to new spots.
+        yield (0, devkit_1.formatFiles)(tree);
     });
 }
 exports.default = update;
+/**
+ * `updateWorkspaceConfiguration` already handles
+ * placing properties in their new locations, so
+ * reading + updating it ensures that props are placed
+ * correctly.
+ */
+function movePropertiesAreInNewLocations(tree) {
+    return;
+}
 //# sourceMappingURL=config-locations.js.map

package/src/migrations/update-13-0-0/config-locations/config-locations.js.map

@@ -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,YAAY,CAAC,EAAE,EAAE;;gBAC5D,MAAM,aAAa,GAAG,IAAA,iCAAwB,EAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBACxD,MAAA,aAAa,CAAC,IAAI,oCAAlB,aAAa,CAAC,IAAI,GAAK,YAAY,CAAC,IAAI,EAAC;gBACzC,MAAA,aAAa,CAAC,oBAAoB,oCAAlC,aAAa,CAAC,oBAAoB,GAAK,YAAY,CAAC,oBAAoB,EAAC;gBACzE,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;QACnC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,CAAC,2DAA2D;IACtF,CAAC;CAAA;AApBD,yBAoBC"}
+{"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"}

package/src/migrations/update-13-0-0/set-default-base-if-not-set.js

@@ -8,7 +8,7 @@ function setDefaultBaseIfNotSet(host) {
     var _a, _b, _c;
     var _d;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const config = (0, devkit_1.readWorkspaceConfiguration)(host);
+        const config = (0, devkit_1.readNxJson)(host);
         if (!((_a = config.affected) === null || _a === void 0 ? void 0 : _a.defaultBase)) {
             (_b = config.affected) !== null && _b !== void 0 ? _b : (config.affected = {});
             (_c = (_d = config.affected).defaultBase) !== null && _c !== void 0 ? _c : (_d.defaultBase = 'master');
@@ -21,7 +21,7 @@ function setDefaultBaseIfNotSet(host) {
                 ],
             });
         }
-        (0, devkit_1.updateWorkspaceConfiguration)(host, config);
+        (0, devkit_1.updateNxJson)(host, config);
         yield (0, devkit_1.formatFiles)(host);
     });
 }

package/src/migrations/update-13-0-0/set-default-base-if-not-set.js.map

@@ -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,yCAKsB;AACtB,mDAAgD;AAEhD,SAAsB,sBAAsB,CAAC,IAAU;;;;QACrD,MAAM,MAAM,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;QAChD,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,qCAA4B,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC3C,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;;CACzB;AAjBD,wDAiBC;AAED,kBAAe,sBAAsB,CAAC"}
+{"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"}

package/src/migrations/update-13-10-0/update-tasks-runner.js

@@ -3,13 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateTasksRunner = void 0;
 const devkit_1 = require("@nrwl/devkit");
 function updateTasksRunner(host) {
-    const config = (0, devkit_1.readWorkspaceConfiguration)(host);
-    if ((config === null || config === void 0 ? void 0 : config.tasksRunnerOptions['default']) &&
+    var _a;
+    const config = (0, devkit_1.readNxJson)(host);
+    if (((_a = config === null || config === void 0 ? void 0 : config.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a['default']) &&
         (config === null || config === void 0 ? void 0 : config.tasksRunnerOptions['default'].runner) ==
             '@nrwl/workspace/tasks-runners/default') {
         config.tasksRunnerOptions['default'].runner = 'nx/tasks-runners/default';
     }
-    (0, devkit_1.updateWorkspaceConfiguration)(host, config);
+    (0, devkit_1.updateNxJson)(host, config);
 }
 exports.updateTasksRunner = updateTasksRunner;
 exports.default = updateTasksRunner;

package/src/migrations/update-13-10-0/update-tasks-runner.js.map

@@ -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,yCAIsB;AAEtB,SAAgB,iBAAiB,CAAC,IAAU;IAC1C,MAAM,MAAM,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IAChD,IACE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,kBAAkB,CAAC,SAAS,CAAC;QACrC,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,qCAA4B,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC7C,CAAC;AAVD,8CAUC;AAED,kBAAe,iBAAiB,CAAC"}
+{"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"}

package/src/migrations/update-13-2-0/set-parallel-default.js

@@ -6,7 +6,7 @@ const devkit_1 = require("@nrwl/devkit");
 function setParallelDefault(host) {
     var _a, _b;
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const config = (0, devkit_1.readWorkspaceConfiguration)(host);
+        const config = (0, devkit_1.readNxJson)(host);
         const defaultTaskRunnerOptions = (_b = (_a = config.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a['default']) === null || _b === void 0 ? void 0 : _b.options;
         if (defaultTaskRunnerOptions) {
             if (defaultTaskRunnerOptions.parallel) {
@@ -17,7 +17,7 @@ function setParallelDefault(host) {
             else {
                 defaultTaskRunnerOptions.parallel = 1;
             }
-            (0, devkit_1.updateWorkspaceConfiguration)(host, config);
+            (0, devkit_1.updateNxJson)(host, config);
         }
         yield (0, devkit_1.formatFiles)(host);
     });

package/src/migrations/update-13-2-0/set-parallel-default.js.map

@@ -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,yCAKsB;AAEtB,SAAsB,kBAAkB,CAAC,IAAU;;;QACjD,MAAM,MAAM,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;QAChD,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,qCAA4B,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;SAC5C;QACD,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;;CACzB;AAfD,gDAeC;AAED,kBAAe,kBAAkB,CAAC"}
+{"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"}

package/src/migrations/update-13-6-0/remove-old-task-runner-options.js

@@ -4,12 +4,12 @@ exports.removeOldTaskRunnerOptions = void 0;
 const devkit_1 = require("@nrwl/devkit");
 function removeOldTaskRunnerOptions(host) {
     var _a, _b;
-    const workspaceConfig = (0, devkit_1.readWorkspaceConfiguration)(host);
-    const options = (_b = (_a = workspaceConfig.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a['default']) === null || _b === void 0 ? void 0 : _b.options;
+    const nxJson = (0, devkit_1.readNxJson)(host);
+    const options = (_b = (_a = nxJson.tasksRunnerOptions) === null || _a === void 0 ? void 0 : _a['default']) === null || _b === void 0 ? void 0 : _b.options;
     if (options) {
         delete options.scan;
         delete options.analytics;
-        (0, devkit_1.updateWorkspaceConfiguration)(host, workspaceConfig);
+        (0, devkit_1.updateNxJson)(host, nxJson);
     }
 }
 exports.removeOldTaskRunnerOptions = removeOldTaskRunnerOptions;

package/src/migrations/update-13-6-0/remove-old-task-runner-options.js.map

@@ -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,yCAIsB;AAEtB,SAAgB,0BAA0B,CAAC,IAAU;;IACnD,MAAM,eAAe,GAAG,IAAA,mCAA0B,EAAC,IAAI,CAAC,CAAC;IACzD,MAAM,OAAO,GAAG,MAAA,MAAA,eAAe,CAAC,kBAAkB,0CAAG,SAAS,CAAC,0CAAE,OAAO,CAAC;IACzE,IAAI,OAAO,EAAE;QACX,OAAO,OAAO,CAAC,IAAI,CAAC;QACpB,OAAO,OAAO,CAAC,SAAS,CAAC;QACzB,IAAA,qCAA4B,EAAC,IAAI,EAAE,eAAe,CAAC,CAAC;KACrD;AACH,CAAC;AARD,gEAQC;AAED,kBAAe,0BAA0B,CAAC"}
+{"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"}

package/src/migrations/update-14-0-0/change-npm-script-executor.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.changeNpmScriptExecutor = void 0;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nrwl/devkit");
-const executor_options_utils_1 = require("@nrwl/workspace/src/utilities/executor-options-utils");
+const executor_options_utils_1 = require("@nrwl/devkit/src/generators/executor-options-utils");
 function changeNpmScriptExecutor(tree) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nrwl/workspace:run-script', (currentValue, project, target) => {