@nx/workspace 16.0.0-beta.2 → 16.0.0-beta.4

package/migrations.json

@@ -89,6 +89,12 @@
       "version": "16.0.0-beta.1",
       "description": "Replace @nrwl/workspace with @nx/workspace",
       "implementation": "./src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages"
+    },
+    "16-0-0-move-workspace-generators-into-local-plugin": {
+      "version": "16.0.0-beta.4",
+      "description": "Generates a plugin called 'workspace-plugin' containing your workspace generators.",
+      "cli": "nx",
+      "implementation": "./src/migrations/update-16-0-0/move-workspace-generators-to-local-plugin"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "16.0.0-beta.2",
+  "version": "16.0.0-beta.4",
   "private": false,
   "description": "The Workspace plugin contains executors and generators that are useful for any Nx workspace. It should be present in every Nx workspace and other plugins build on it.",
   "repository": {
@@ -33,36 +33,36 @@
     "requirements": {},
     "migrations": "./migrations.json",
     "packageGroup": {
-      "@nrwl/js": "16.0.0-beta.2",
-      "@nrwl/jest": "16.0.0-beta.2",
-      "@nrwl/linter": "16.0.0-beta.2",
-      "@nrwl/angular": "16.0.0-beta.2",
-      "@nrwl/cypress": "16.0.0-beta.2",
-      "@nrwl/detox": "16.0.0-beta.2",
-      "@nrwl/devkit": "16.0.0-beta.2",
-      "@nrwl/esbuild": "16.0.0-beta.2",
-      "@nrwl/eslint-plugin-nx": "16.0.0-beta.2",
-      "@nrwl/expo": "16.0.0-beta.2",
-      "@nrwl/express": "16.0.0-beta.2",
-      "@nrwl/nest": "16.0.0-beta.2",
-      "@nrwl/next": "16.0.0-beta.2",
-      "@nrwl/node": "16.0.0-beta.2",
+      "@nrwl/js": "16.0.0-beta.4",
+      "@nrwl/jest": "16.0.0-beta.4",
+      "@nrwl/linter": "16.0.0-beta.4",
+      "@nrwl/angular": "16.0.0-beta.4",
+      "@nrwl/cypress": "16.0.0-beta.4",
+      "@nrwl/detox": "16.0.0-beta.4",
+      "@nrwl/devkit": "16.0.0-beta.4",
+      "@nrwl/esbuild": "16.0.0-beta.4",
+      "@nrwl/eslint-plugin-nx": "16.0.0-beta.4",
+      "@nrwl/expo": "16.0.0-beta.4",
+      "@nrwl/express": "16.0.0-beta.4",
+      "@nrwl/nest": "16.0.0-beta.4",
+      "@nrwl/next": "16.0.0-beta.4",
+      "@nrwl/node": "16.0.0-beta.4",
       "nx-cloud": "latest",
-      "@nrwl/nx-plugin": "16.0.0-beta.2",
-      "@nrwl/react-native": "16.0.0-beta.2",
-      "@nrwl/react": "16.0.0-beta.2",
-      "@nrwl/rollup": "16.0.0-beta.2",
-      "@nrwl/storybook": "16.0.0-beta.2",
-      "@nrwl/tao": "16.0.0-beta.2",
-      "@nrwl/vite": "16.0.0-beta.2",
-      "@nrwl/web": "16.0.0-beta.2",
-      "@nrwl/webpack": "16.0.0-beta.2",
-      "nx": "16.0.0-beta.2"
+      "@nrwl/nx-plugin": "16.0.0-beta.4",
+      "@nrwl/react-native": "16.0.0-beta.4",
+      "@nrwl/react": "16.0.0-beta.4",
+      "@nrwl/rollup": "16.0.0-beta.4",
+      "@nrwl/storybook": "16.0.0-beta.4",
+      "@nrwl/tao": "16.0.0-beta.4",
+      "@nrwl/vite": "16.0.0-beta.4",
+      "@nrwl/web": "16.0.0-beta.4",
+      "@nrwl/webpack": "16.0.0-beta.4",
+      "nx": "16.0.0-beta.4"
     }
   },
   "dependencies": {
-    "@nrwl/workspace": "16.0.0-beta.2",
-    "@nx/devkit": "16.0.0-beta.2",
+    "@nrwl/workspace": "16.0.0-beta.4",
+    "@nx/devkit": "16.0.0-beta.4",
     "@parcel/watcher": "2.0.4",
     "chalk": "^4.1.0",
     "chokidar": "^3.5.1",
@@ -74,7 +74,7 @@
     "ignore": "^5.0.4",
     "minimatch": "3.0.5",
     "npm-run-path": "^4.0.1",
-    "nx": "16.0.0-beta.2",
+    "nx": "16.0.0-beta.4",
     "open": "^8.4.0",
     "rxjs": "^6.5.4",
     "tmp": "~0.2.1",
@@ -86,5 +86,5 @@
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "0d7dbbc5254390f53a28d94de536da916ed06a70"
+  "gitHead": "0fc3d4441eb6900f8bdf0091c39f65e3cd1977ba"
 }

package/src/generators/move/lib/create-project-configuration-in-new-destination.js

@@ -1,15 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createProjectConfigurationInNewDestination = void 0;
+const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
 function createProjectConfigurationInNewDestination(tree, schema, projectConfig) {
-    if (projectConfig.name) {
-        projectConfig.name = schema.newProjectName;
-    }
+    projectConfig.name = schema.newProjectName;
+    // Subtle bug if project name === path, where the updated name was being overrideen.
+    const { name } = projectConfig, rest = tslib_1.__rest(projectConfig, ["name"]);
     // replace old root path with new one
-    const projectString = JSON.stringify(projectConfig);
+    const projectString = JSON.stringify(rest);
     const newProjectString = projectString.replace(new RegExp(projectConfig.root, 'g'), schema.relativeToRootDestination);
-    const newProject = JSON.parse(newProjectString);
+    const newProject = Object.assign({ name }, JSON.parse(newProjectString));
     // Create a new project with the root replaced
     (0, devkit_1.addProjectConfiguration)(tree, schema.newProjectName, newProject);
 }

package/src/generators/move/lib/create-project-configuration-in-new-destination.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-project-configuration-in-new-destination.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/create-project-configuration-in-new-destination.ts"],"names":[],"mappings":";;;AAAA,uCAIoB;AAGpB,SAAgB,0CAA0C,CACxD,IAAU,EACV,MAAwB,EACxB,aAAmC;IAEnC,IAAI,aAAa,CAAC,IAAI,EAAE;QACtB,aAAa,CAAC,IAAI,GAAG,MAAM,CAAC,cAAc,CAAC;KAC5C;IAED,qCAAqC;IACrC,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IACpD,MAAM,gBAAgB,GAAG,aAAa,CAAC,OAAO,CAC5C,IAAI,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,EACnC,MAAM,CAAC,yBAAyB,CACjC,CAAC;IACF,MAAM,UAAU,GAAyB,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAEtE,8CAA8C;IAC9C,IAAA,gCAAuB,EAAC,IAAI,EAAE,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;AACnE,CAAC;AAnBD,gGAmBC"}
+{"version":3,"file":"create-project-configuration-in-new-destination.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/create-project-configuration-in-new-destination.ts"],"names":[],"mappings":";;;;AAAA,uCAIoB;AAGpB,SAAgB,0CAA0C,CACxD,IAAU,EACV,MAAwB,EACxB,aAAmC;IAEnC,aAAa,CAAC,IAAI,GAAG,MAAM,CAAC,cAAc,CAAC;IAE3C,oFAAoF;IACpF,MAAM,EAAE,IAAI,KAAc,aAAa,EAAtB,IAAI,kBAAK,aAAa,EAAjC,QAAiB,CAAgB,CAAC;IAExC,qCAAqC;IACrC,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,gBAAgB,GAAG,aAAa,CAAC,OAAO,CAC5C,IAAI,MAAM,CAAC,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,EACnC,MAAM,CAAC,yBAAyB,CACjC,CAAC;IACF,MAAM,UAAU,mBACd,IAAI,IACD,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAChC,CAAC;IAEF,8CAA8C;IAC9C,IAAA,gCAAuB,EAAC,IAAI,EAAE,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;AACnE,CAAC;AAvBD,gGAuBC"}

package/src/generators/move/lib/normalize-schema.js

@@ -5,13 +5,13 @@ const devkit_1 = require("@nx/devkit");
 const path_1 = require("nx/src/utils/path");
 const utils_1 = require("./utils");
 function normalizeSchema(tree, schema, projectConfiguration) {
-    var _a;
+    var _a, _b;
     const destination = schema.destination.startsWith('/')
         ? (0, utils_1.normalizeSlashes)(schema.destination.slice(1))
         : schema.destination;
-    const newProjectName = (0, utils_1.getNewProjectName)(destination);
+    const newProjectName = (_a = schema.newProjectName) !== null && _a !== void 0 ? _a : (0, utils_1.getNewProjectName)(destination);
     const { npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
-    return Object.assign(Object.assign({}, schema), { destination, importPath: (_a = schema.importPath) !== null && _a !== void 0 ? _a : (0, utils_1.normalizeSlashes)((0, path_1.getImportPath)(npmScope, destination)), newProjectName, relativeToRootDestination: (0, utils_1.getDestination)(tree, schema, projectConfiguration) });
+    return Object.assign(Object.assign({}, schema), { destination, importPath: (_b = schema.importPath) !== null && _b !== void 0 ? _b : (0, utils_1.normalizeSlashes)((0, path_1.getImportPath)(npmScope, destination)), newProjectName, relativeToRootDestination: (0, utils_1.getDestination)(tree, schema, projectConfiguration) });
 }
 exports.normalizeSchema = normalizeSchema;
 //# sourceMappingURL=normalize-schema.js.map

package/src/generators/move/lib/normalize-schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"normalize-schema.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/normalize-schema.ts"],"names":[],"mappings":";;;AAAA,uCAA4E;AAC5E,4CAAkD;AAElD,mCAA8E;AAE9E,SAAgB,eAAe,CAC7B,IAAU,EACV,MAAc,EACd,oBAA0C;;IAE1C,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC;QACpD,CAAC,CAAC,IAAA,wBAAgB,EAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC/C,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC;IACvB,MAAM,cAAc,GAAG,IAAA,yBAAiB,EAAC,WAAW,CAAC,CAAC;IACtD,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAE9C,uCACK,MAAM,KACT,WAAW,EACX,UAAU,EACR,MAAA,MAAM,CAAC,UAAU,mCACjB,IAAA,wBAAgB,EAAC,IAAA,oBAAa,EAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,EACxD,cAAc,EACd,yBAAyB,EAAE,IAAA,sBAAc,EACvC,IAAI,EACJ,MAAM,EACN,oBAAoB,CACrB,IACD;AACJ,CAAC;AAxBD,0CAwBC"}
+{"version":3,"file":"normalize-schema.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/normalize-schema.ts"],"names":[],"mappings":";;;AAAA,uCAA4E;AAC5E,4CAAkD;AAElD,mCAA8E;AAE9E,SAAgB,eAAe,CAC7B,IAAU,EACV,MAAc,EACd,oBAA0C;;IAE1C,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC;QACpD,CAAC,CAAC,IAAA,wBAAgB,EAAC,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC/C,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC;IACvB,MAAM,cAAc,GAClB,MAAA,MAAM,CAAC,cAAc,mCAAI,IAAA,yBAAiB,EAAC,WAAW,CAAC,CAAC;IAC1D,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAE9C,uCACK,MAAM,KACT,WAAW,EACX,UAAU,EACR,MAAA,MAAM,CAAC,UAAU,mCACjB,IAAA,wBAAgB,EAAC,IAAA,oBAAa,EAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,EACxD,cAAc,EACd,yBAAyB,EAAE,IAAA,sBAAc,EACvC,IAAI,EACJ,MAAM,EACN,oBAAoB,CACrB,IACD;AACJ,CAAC;AAzBD,0CAyBC"}

package/src/generators/move/lib/update-imports.js

@@ -3,10 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateImports = void 0;
 const devkit_1 = require("@nx/devkit");
 const ts_config_1 = require("../../../utilities/ts-config");
-const typescript_1 = require("nx/src/utils/typescript");
 const utils_1 = require("./utils");
 const path_1 = require("path");
-const typescript_2 = require("../../../utilities/typescript");
+const typescript_1 = require("../../../utilities/typescript");
 let tsModule;
 /**
  * Updates all the imports in the workspace and modifies the tsconfig appropriately.
@@ -65,7 +64,9 @@ function updateImports(tree, schema, project) {
         const updatedPath = path.map((x) => (0, devkit_1.joinPathFragments)(projectRoot.to, (0, path_1.relative)(projectRoot.from, x)));
         if (schema.updateImportPath) {
             tsConfig.compilerOptions.paths[projectRef.to] = updatedPath;
-            delete tsConfig.compilerOptions.paths[projectRef.from];
+            if (projectRef.from !== projectRef.to) {
+                delete tsConfig.compilerOptions.paths[projectRef.from];
+            }
         }
         else {
             tsConfig.compilerOptions.paths[projectRef.from] = updatedPath;
@@ -79,7 +80,7 @@ exports.updateImports = updateImports;
  */
 function updateImportPaths(tree, path, from, to) {
     if (!tsModule) {
-        tsModule = (0, typescript_2.ensureTypescript)();
+        tsModule = (0, typescript_1.ensureTypescript)();
     }
     const contents = tree.read(path, 'utf-8');
     const sourceFile = tsModule.createSourceFile(path, contents, tsModule.ScriptTarget.Latest, true);
@@ -95,9 +96,9 @@ function updateImportPaths(tree, path, from, to) {
  */
 function updateImportDeclarations(sourceFile, from, to) {
     if (!tsModule) {
-        tsModule = (0, typescript_2.ensureTypescript)();
+        tsModule = (0, typescript_1.ensureTypescript)();
     }
-    const importDecls = (0, typescript_1.findNodes)(sourceFile, tsModule.SyntaxKind.ImportDeclaration);
+    const importDecls = (0, ts_config_1.findNodes)(sourceFile, tsModule.SyntaxKind.ImportDeclaration);
     const changes = [];
     for (const { moduleSpecifier } of importDecls) {
         if (tsModule.isStringLiteral(moduleSpecifier)) {
@@ -111,9 +112,9 @@ function updateImportDeclarations(sourceFile, from, to) {
  */
 function updateDynamicImports(sourceFile, from, to) {
     if (!tsModule) {
-        tsModule = (0, typescript_2.ensureTypescript)();
+        tsModule = (0, typescript_1.ensureTypescript)();
     }
-    const expressions = (0, typescript_1.findNodes)(sourceFile, tsModule.SyntaxKind.CallExpression);
+    const expressions = (0, ts_config_1.findNodes)(sourceFile, tsModule.SyntaxKind.CallExpression);
     const changes = [];
     for (const { expression, arguments: args } of expressions) {
         const moduleSpecifier = args[0];

package/src/generators/move/lib/update-imports.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-imports.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-imports.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update-imports.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/update-imports.ts"],"names":[],"mappings":"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"}

package/src/generators/move/lib/utils.js

@@ -10,6 +10,9 @@ const devkit_1 = require("@nx/devkit");
  * folders. In that case, they're on their own :/
  */
 function getDestination(host, schema, project) {
+    if (schema.destinationRelativeToRoot) {
+        return schema.destination;
+    }
     const projectType = project.projectType;
     const workspaceLayout = (0, devkit_1.getWorkspaceLayout)(host);
     let rootFolder = workspaceLayout.libsDir;

package/src/generators/move/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/utils.ts"],"names":[],"mappings":";;;AAAA,uCAKoB;AAIpB;;;;;;GAMG;AACH,SAAgB,cAAc,CAC5B,IAAU,EACV,MAAc,EACd,OAA6B;IAE7B,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IAExC,MAAM,eAAe,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAEjD,IAAI,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC;IACzC,IAAI,WAAW,KAAK,aAAa,EAAE;QACjC,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC;KACtC;IACD,OAAO,IAAA,0BAAiB,EAAC,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;AAC3D,CAAC;AAdD,wCAcC;AAED;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,IAAY;IAC5C,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AAClC,CAAC;AAFD,8CAEC;AAED;;;;GAIG;AACH,SAAgB,gBAAgB,CAAC,KAAa;IAC5C,OAAO,KAAK;SACT,KAAK,CAAC,GAAG,CAAC;SACV,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;SAClB,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,CAAC;AALD,4CAKC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../../packages/workspace/src/generators/move/lib/utils.ts"],"names":[],"mappings":";;;AAAA,uCAKoB;AAIpB;;;;;;GAMG;AACH,SAAgB,cAAc,CAC5B,IAAU,EACV,MAAc,EACd,OAA6B;IAE7B,IAAI,MAAM,CAAC,yBAAyB,EAAE;QACpC,OAAO,MAAM,CAAC,WAAW,CAAC;KAC3B;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IAExC,MAAM,eAAe,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC;IAEjD,IAAI,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC;IACzC,IAAI,WAAW,KAAK,aAAa,EAAE;QACjC,UAAU,GAAG,eAAe,CAAC,OAAO,CAAC;KACtC;IACD,OAAO,IAAA,0BAAiB,EAAC,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;AAC3D,CAAC;AAlBD,wCAkBC;AAED;;;;GAIG;AACH,SAAgB,iBAAiB,CAAC,IAAY;IAC5C,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AAClC,CAAC;AAFD,8CAEC;AAED;;;;GAIG;AACH,SAAgB,gBAAgB,CAAC,KAAa;IAC5C,OAAO,KAAK;SACT,KAAK,CAAC,GAAG,CAAC;SACV,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;SAClB,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,CAAC;AALD,4CAKC"}

package/src/generators/move/schema.d.ts

@@ -4,10 +4,11 @@ export interface Schema {
   importPath?: string;
   updateImportPath: boolean;
   skipFormat?: boolean;
+  destinationRelativeToRoot?: boolean;
+  newProjectName?: string;
 }
 
 export interface NormalizedSchema extends Schema {
   importPath: string;
-  newProjectName: string;
   relativeToRootDestination: string;
 }

package/src/generators/preset/schema.d.ts

@@ -10,7 +10,7 @@ export interface Schema {
   standaloneConfig?: boolean;
   framework?: string;
   packageManager?: PackageManager;
-  bundler?: 'vite' | 'webpack';
+  bundler?: 'vite' | 'webpack' | 'rspack';
   docker?: boolean;
   routing?: boolean;
   standaloneApi?: boolean;

package/src/generators/preset/schema.json

@@ -76,7 +76,7 @@
     "bundler": {
       "description": "The bundler to use for building the application.",
       "type": "string",
-      "enum": ["webpack", "vite"],
+      "enum": ["webpack", "vite", "rspack"],
       "default": "vite"
     },
     "docker": {

package/src/generators/workspace-generator/schema.d.ts

@@ -1,4 +1 @@
-export interface Schema {
-  name: string;
-  skipFormat: boolean;
-}
+export interface Schema {}

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

@@ -4,22 +4,6 @@
   "title": "Create a custom generator",
   "description": "Create a custom generator.",
   "type": "object",
-  "properties": {
-    "name": {
-      "type": "string",
-      "description": "Generator name.",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      },
-      "x-prompt": "What name would you like to use for the workspace generator?"
-    },
-    "skipFormat": {
-      "description": "Skip formatting files.",
-      "type": "boolean",
-      "default": false,
-      "x-priority": "internal"
-    }
-  },
+  "properties": {},
   "required": ["name"]
 }

package/src/generators/workspace-generator/workspace-generator.d.ts

@@ -1,3 +1,3 @@
 import { Schema } from './schema';
 import { Tree } from '@nx/devkit';
-export default function (host: Tree, schema: Schema): Promise<import("@nx/devkit").GeneratorCallback>;
+export default function (host: Tree, schema: Schema): Promise<void>;

package/src/generators/workspace-generator/workspace-generator.js

@@ -2,26 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
-const versions_1 = require("../../utils/versions");
 function default_1(host, schema) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        const options = normalizeOptions(schema);
-        (0, devkit_1.generateFiles)(host, (0, devkit_1.joinPathFragments)(__dirname, 'files'), (0, devkit_1.joinPathFragments)('tools/generators', schema.name), options);
-        const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, {}, {
-            '@nx/devkit': versions_1.nxVersion,
-            // types/node is neccessary for pnpm since it's used in tsconfig and transitive
-            // dependencies are not resolved correctly
-            '@types/node': 'latest',
-        });
-        if (!schema.skipFormat) {
-            yield (0, devkit_1.formatFiles)(host);
-        }
-        return installTask;
+        const message = (0, devkit_1.stripIndents) `Workspace Generators are no longer supported. Instead,
+    Nx now supports executing generators or executors from local plugins. To get 
+    started, install @nx/nx-plugin and run \`nx g plugin\`.
+
+    Afterwards, or if you already have an Nx plugin, you can run 
+    \`nx g generator --project {my-plugin}\` to add a new generator.
+    
+    For more information, see: https://nx.dev/deprecated/workspace-generators`;
+        throw new Error(message);
     });
 }
 exports.default = default_1;
-function normalizeOptions(options) {
-    const name = (0, devkit_1.names)(options.name).fileName;
-    return Object.assign(Object.assign({}, options), { name, tmpl: '' });
-}
 //# sourceMappingURL=workspace-generator.js.map

package/src/generators/workspace-generator/workspace-generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-generator.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/workspace-generator/workspace-generator.ts"],"names":[],"mappings":";;;AACA,uCAOoB;AACpB,mDAAiD;AAEjD,mBAA+B,IAAU,EAAE,MAAc;;QACvD,MAAM,OAAO,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAEzC,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EACrC,IAAA,0BAAiB,EAAC,kBAAkB,EAAE,MAAM,CAAC,IAAI,CAAC,EAClD,OAAO,CACR,CAAC;QAEF,MAAM,WAAW,GAAG,IAAA,qCAA4B,EAC9C,IAAI,EACJ,EAAE,EACF;YACE,YAAY,EAAE,oBAAS;YACvB,+EAA+E;YAC/E,0CAA0C;YAC1C,aAAa,EAAE,QAAQ;SACxB,CACF,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;SACzB;QACD,OAAO,WAAW,CAAC;IACrB,CAAC;CAAA;AAzBD,4BAyBC;AAED,SAAS,gBAAgB,CAAC,OAAe;IACvC,MAAM,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC1C,uCAAY,OAAO,KAAE,IAAI,EAAE,IAAI,EAAE,EAAE,IAAG;AACxC,CAAC"}
+{"version":3,"file":"workspace-generator.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/workspace-generator/workspace-generator.ts"],"names":[],"mappings":";;;AACA,uCAAgD;AAEhD,mBAA+B,IAAU,EAAE,MAAc;;QACvD,MAAM,OAAO,GAAG,IAAA,qBAAY,EAAA;;;;;;;8EAOgD,CAAC;QAE7E,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;IAC3B,CAAC;CAAA;AAXD,4BAWC"}

package/src/migrations/update-16-0-0/move-workspace-generators-to-local-plugin.d.ts

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

package/src/migrations/update-16-0-0/move-workspace-generators-to-local-plugin.js

@@ -0,0 +1,135 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const devkit_1 = require("@nx/devkit");
+// nx-ignore-next-line
+const path = require("path");
+const move_1 = require("../../generators/move/move");
+const versions_1 = require("../../utils/versions");
+const PROJECT_NAME = 'workspace-plugin';
+const DESTINATION = `tools/${PROJECT_NAME}`;
+function default_1(tree) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const tasks = [];
+        if (!tree.children('tools/generators').length) {
+            return;
+        }
+        let project = (0, devkit_1.getProjects)(tree).get(PROJECT_NAME);
+        if (!project) {
+            yield createNewPlugin(tree);
+            tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+                '@nx/nx-plugin': versions_1.nxVersion,
+            }));
+            project = (0, devkit_1.readProjectConfiguration)(tree, PROJECT_NAME);
+        }
+        yield updateExistingPlugin(tree, project);
+        yield (0, devkit_1.formatFiles)(tree);
+        return () => {
+            for (const task of tasks) {
+                task();
+            }
+        };
+    });
+}
+exports.default = default_1;
+// Inspired by packages/nx/src/command-line/workspace-generators.ts
+function collectAndMoveGenerators(tree, destinationProjectRoot) {
+    var _a;
+    const generators = {};
+    const generatorsDir = 'tools/generators';
+    const destinationDir = (0, devkit_1.joinPathFragments)(destinationProjectRoot, 'src', 'generators');
+    for (const c of tree.children('tools/generators')) {
+        const childDir = path.join(generatorsDir, c);
+        const schemaPath = (0, devkit_1.joinPathFragments)(childDir, 'schema.json');
+        if (tree.exists(schemaPath)) {
+            const schema = (0, devkit_1.readJson)(tree, schemaPath);
+            generators[c] = {
+                implementation: `./src/generators/${c}`,
+                schema: `./src/generators/${(0, devkit_1.joinPathFragments)(c, 'schema.json')}`,
+                description: (_a = schema.description) !== null && _a !== void 0 ? _a : `Generator ${c}`,
+            };
+            tree.rename(childDir, (0, devkit_1.joinPathFragments)(destinationDir, c));
+        }
+    }
+    return generators;
+}
+function createNewPlugin(tree) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        (0, devkit_1.ensurePackage)('@nx/nx-plugin', versions_1.nxVersion);
+        const { pluginGenerator } = 
+        // nx-ignore-next-line
+        require('@nx/nx-plugin/src/generators/plugin/plugin');
+        // nx-ignore-next-line
+        const { Linter } = (0, devkit_1.ensurePackage)('@nx/linter', versions_1.nxVersion);
+        const { npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
+        const importPath = npmScope ? `${npmScope}/${PROJECT_NAME}` : PROJECT_NAME;
+        yield pluginGenerator(tree, {
+            minimal: true,
+            name: PROJECT_NAME,
+            importPath: importPath,
+            skipTsConfig: false,
+            compiler: 'tsc',
+            linter: Linter.EsLint,
+            skipFormat: true,
+            skipLintChecks: false,
+            unitTestRunner: 'jest',
+            e2eTestRunner: 'none',
+        });
+        getCreateGeneratorsJson()(tree, (0, devkit_1.readProjectConfiguration)(tree, PROJECT_NAME).root, PROJECT_NAME);
+        yield moveGeneratedPlugin(tree, DESTINATION, importPath);
+    });
+}
+function moveGeneratedPlugin(tree, destination, importPath) {
+    const config = (0, devkit_1.readProjectConfiguration)(tree, PROJECT_NAME);
+    if (config.root !== DESTINATION) {
+        return (0, move_1.moveGenerator)(tree, {
+            destination,
+            projectName: PROJECT_NAME,
+            newProjectName: PROJECT_NAME,
+            updateImportPath: true,
+            destinationRelativeToRoot: true,
+            importPath: importPath,
+        });
+    }
+}
+function updateExistingPlugin(tree, project) {
+    const packageJson = (0, devkit_1.readJson)(tree, (0, devkit_1.joinPathFragments)(project.root, 'package.json'));
+    const defaultGeneratorsPath = (0, devkit_1.joinPathFragments)(project.root, 'generators.json');
+    let generatorsJsonPath = packageJson.generators ||
+        packageJson.schematics ||
+        tree.exists(defaultGeneratorsPath)
+        ? defaultGeneratorsPath
+        : null;
+    if (!generatorsJsonPath) {
+        getCreateGeneratorsJson()(tree, (0, devkit_1.readProjectConfiguration)(tree, PROJECT_NAME).root, PROJECT_NAME);
+        generatorsJsonPath = defaultGeneratorsPath;
+    }
+    (0, devkit_1.updateJson)(tree, generatorsJsonPath, (json) => {
+        var _a;
+        const generators = collectAndMoveGenerators(tree, project.root);
+        (_a = json.generators) !== null && _a !== void 0 ? _a : (json.generators = {});
+        for (const generator in generators) {
+            if (json.generators[generator]) {
+                devkit_1.output.warn({
+                    title: `Generator ${generator} already exists in ${project.name}`,
+                    bodyLines: [
+                        'Since you have a generator with the same name in your plugin, the generator from workspace-generators has been discarded.',
+                    ],
+                });
+            }
+            else {
+                json.generators[generator] = generators[generator];
+            }
+        }
+        return json;
+    });
+}
+function getCreateGeneratorsJson() {
+    // We cant use  `as typeof import('@nx/nx-plugin/src/generators/generator/generator');` here
+    // because it will cause a typescript error at build time.
+    const { createGeneratorsJson } = 
+    // nx-ignore-next-line
+    require('@nx/nx-plugin/src/generators/generator/generator');
+    return createGeneratorsJson;
+}
+//# sourceMappingURL=move-workspace-generators-to-local-plugin.js.map

package/src/migrations/update-16-0-0/move-workspace-generators-to-local-plugin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"move-workspace-generators-to-local-plugin.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/migrations/update-16-0-0/move-workspace-generators-to-local-plugin.ts"],"names":[],"mappings":"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"}

package/src/utilities/ts-config.d.ts

@@ -1,5 +1,7 @@
 import { Tree } from '@nx/devkit';
+import type { Node, SyntaxKind } from 'typescript';
 export declare function readTsConfig(tsConfigPath: string): import("typescript").ParsedCommandLine;
 export declare function getRootTsConfigPathInTree(tree: Tree): string | null;
 export declare function getRelativePathToRootTsConfig(tree: Tree, targetPath: string): string;
 export declare function getRootTsConfigFileName(): string | null;
+export declare function findNodes(node: Node, kind: SyntaxKind | SyntaxKind[], max?: number): Node[];

package/src/utilities/ts-config.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getRootTsConfigFileName = exports.getRelativePathToRootTsConfig = exports.getRootTsConfigPathInTree = exports.readTsConfig = void 0;
+exports.findNodes = exports.getRootTsConfigFileName = exports.getRelativePathToRootTsConfig = exports.getRootTsConfigPathInTree = exports.readTsConfig = void 0;
 const devkit_1 = require("@nx/devkit");
 const fs_1 = require("fs");
 const path_1 = require("path");
@@ -37,4 +37,32 @@ function getRootTsConfigFileName() {
     return null;
 }
 exports.getRootTsConfigFileName = getRootTsConfigFileName;
+function findNodes(node, kind, max = Infinity) {
+    if (!node || max == 0) {
+        return [];
+    }
+    const arr = [];
+    const hasMatch = Array.isArray(kind)
+        ? kind.includes(node.kind)
+        : node.kind === kind;
+    if (hasMatch) {
+        arr.push(node);
+        max--;
+    }
+    if (max > 0) {
+        for (const child of node.getChildren()) {
+            findNodes(child, kind, max).forEach((node) => {
+                if (max > 0) {
+                    arr.push(node);
+                }
+                max--;
+            });
+            if (max <= 0) {
+                break;
+            }
+        }
+    }
+    return arr;
+}
+exports.findNodes = findNodes;
 //# sourceMappingURL=ts-config.js.map

package/src/utilities/ts-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"ts-config.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/ts-config.ts"],"names":[],"mappings":";;;AAAA,uCAAiE;AACjE,2BAAgC;AAChC,+BAAqC;AACrC,6CAAgD;AAEhD,IAAI,QAAqC,CAAC;AAE1C,SAAgB,YAAY,CAAC,YAAoB;IAC/C,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,6BAAgB,GAAE,CAAC;KAC/B;IACD,MAAM,UAAU,GAAG,QAAQ,CAAC,cAAc,CACxC,YAAY,EACZ,QAAQ,CAAC,GAAG,CAAC,QAAQ,CACtB,CAAC;IACF,OAAO,QAAQ,CAAC,0BAA0B,CACxC,UAAU,CAAC,MAAM,EACjB,QAAQ,CAAC,GAAG,EACZ,IAAA,cAAO,EAAC,YAAY,CAAC,CACtB,CAAC;AACJ,CAAC;AAbD,oCAaC;AAED,SAAgB,yBAAyB,CAAC,IAAU;IAClD,KAAK,MAAM,IAAI,IAAI,CAAC,oBAAoB,EAAE,eAAe,CAAC,EAAE;QAC1D,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YACrB,OAAO,IAAI,CAAC;SACb;KACF;IAED,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AARD,8DAQC;AAED,SAAgB,6BAA6B,CAC3C,IAAU,EACV,UAAkB;IAElB,OAAO,IAAA,uBAAc,EAAC,UAAU,CAAC,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAC;AACtE,CAAC;AALD,sEAKC;AAED,SAAgB,uBAAuB;IACrC,KAAK,MAAM,YAAY,IAAI,CAAC,oBAAoB,EAAE,eAAe,CAAC,EAAE;QAClE,MAAM,YAAY,GAAG,IAAA,WAAI,EAAC,sBAAa,EAAE,YAAY,CAAC,CAAC;QACvD,IAAI,IAAA,eAAU,EAAC,YAAY,CAAC,EAAE;YAC5B,OAAO,YAAY,CAAC;SACrB;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AATD,0DASC"}
+{"version":3,"file":"ts-config.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/ts-config.ts"],"names":[],"mappings":";;;AAAA,uCAAiE;AACjE,2BAAgC;AAChC,+BAAqC;AAErC,6CAAgD;AAEhD,IAAI,QAAqC,CAAC;AAE1C,SAAgB,YAAY,CAAC,YAAoB;IAC/C,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,6BAAgB,GAAE,CAAC;KAC/B;IACD,MAAM,UAAU,GAAG,QAAQ,CAAC,cAAc,CACxC,YAAY,EACZ,QAAQ,CAAC,GAAG,CAAC,QAAQ,CACtB,CAAC;IACF,OAAO,QAAQ,CAAC,0BAA0B,CACxC,UAAU,CAAC,MAAM,EACjB,QAAQ,CAAC,GAAG,EACZ,IAAA,cAAO,EAAC,YAAY,CAAC,CACtB,CAAC;AACJ,CAAC;AAbD,oCAaC;AAED,SAAgB,yBAAyB,CAAC,IAAU;IAClD,KAAK,MAAM,IAAI,IAAI,CAAC,oBAAoB,EAAE,eAAe,CAAC,EAAE;QAC1D,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YACrB,OAAO,IAAI,CAAC;SACb;KACF;IAED,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AARD,8DAQC;AAED,SAAgB,6BAA6B,CAC3C,IAAU,EACV,UAAkB;IAElB,OAAO,IAAA,uBAAc,EAAC,UAAU,CAAC,GAAG,yBAAyB,CAAC,IAAI,CAAC,CAAC;AACtE,CAAC;AALD,sEAKC;AAED,SAAgB,uBAAuB;IACrC,KAAK,MAAM,YAAY,IAAI,CAAC,oBAAoB,EAAE,eAAe,CAAC,EAAE;QAClE,MAAM,YAAY,GAAG,IAAA,WAAI,EAAC,sBAAa,EAAE,YAAY,CAAC,CAAC;QACvD,IAAI,IAAA,eAAU,EAAC,YAAY,CAAC,EAAE;YAC5B,OAAO,YAAY,CAAC;SACrB;KACF;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AATD,0DASC;AAED,SAAgB,SAAS,CACvB,IAAU,EACV,IAA+B,EAC/B,GAAG,GAAG,QAAQ;IAEd,IAAI,CAAC,IAAI,IAAI,GAAG,IAAI,CAAC,EAAE;QACrB,OAAO,EAAE,CAAC;KACX;IAED,MAAM,GAAG,GAAW,EAAE,CAAC;IACvB,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;QAClC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC;QAC1B,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC;IACvB,IAAI,QAAQ,EAAE;QACZ,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACf,GAAG,EAAE,CAAC;KACP;IACD,IAAI,GAAG,GAAG,CAAC,EAAE;QACX,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE;YACtC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC3C,IAAI,GAAG,GAAG,CAAC,EAAE;oBACX,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBAChB;gBACD,GAAG,EAAE,CAAC;YACR,CAAC,CAAC,CAAC;YAEH,IAAI,GAAG,IAAI,CAAC,EAAE;gBACZ,MAAM;aACP;SACF;KACF;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAjCD,8BAiCC"}

package/src/generators/workspace-generator/files/index.ts__tmpl__

@@ -1,10 +0,0 @@
-import { Tree, formatFiles, installPackagesTask } from '@nx/devkit';
-import { libraryGenerator } from '@nx/js';
-
-export default async function(tree: Tree, schema: any) {
-  await libraryGenerator(tree, {name: schema.name});
-  await formatFiles(tree);
-  return () => {
-    installPackagesTask(tree)
-  }
-}

package/src/generators/workspace-generator/files/schema.json__tmpl__

@@ -1,17 +0,0 @@
-{
-  "$schema": "http://json-schema.org/schema",
-  "cli": "nx",
-  "$id": "<%= name %>",
-  "type": "object",
-  "properties": {
-    "name": {
-      "type": "string",
-      "description": "Library name",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      }
-    }
-  },
-  "required": ["name"]
-}