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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "16.0.0-beta.1",
+  "version": "16.0.0-beta.2",
   "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.1",
-      "@nrwl/jest": "16.0.0-beta.1",
-      "@nrwl/linter": "16.0.0-beta.1",
-      "@nrwl/angular": "16.0.0-beta.1",
-      "@nrwl/cypress": "16.0.0-beta.1",
-      "@nrwl/detox": "16.0.0-beta.1",
-      "@nrwl/devkit": "16.0.0-beta.1",
-      "@nrwl/esbuild": "16.0.0-beta.1",
-      "@nrwl/eslint-plugin-nx": "16.0.0-beta.1",
-      "@nrwl/expo": "16.0.0-beta.1",
-      "@nrwl/express": "16.0.0-beta.1",
-      "@nrwl/nest": "16.0.0-beta.1",
-      "@nrwl/next": "16.0.0-beta.1",
-      "@nrwl/node": "16.0.0-beta.1",
+      "@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",
       "nx-cloud": "latest",
-      "@nrwl/nx-plugin": "16.0.0-beta.1",
-      "@nrwl/react-native": "16.0.0-beta.1",
-      "@nrwl/react": "16.0.0-beta.1",
-      "@nrwl/rollup": "16.0.0-beta.1",
-      "@nrwl/storybook": "16.0.0-beta.1",
-      "@nrwl/tao": "16.0.0-beta.1",
-      "@nrwl/vite": "16.0.0-beta.1",
-      "@nrwl/web": "16.0.0-beta.1",
-      "@nrwl/webpack": "16.0.0-beta.1",
-      "nx": "16.0.0-beta.1"
+      "@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"
     }
   },
   "dependencies": {
-    "@nrwl/workspace": "16.0.0-beta.1",
-    "@nx/devkit": "16.0.0-beta.1",
+    "@nrwl/workspace": "16.0.0-beta.2",
+    "@nx/devkit": "16.0.0-beta.2",
     "@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.1",
+    "nx": "16.0.0-beta.2",
     "open": "^8.4.0",
     "rxjs": "^6.5.4",
     "tmp": "~0.2.1",
@@ -86,5 +86,5 @@
     "access": "public"
   },
   "types": "./index.d.ts",
-  "gitHead": "abf534c265f5aa3aac146e55bb31de598ea281d7"
+  "gitHead": "0d7dbbc5254390f53a28d94de536da916ed06a70"
 }

package/src/generators/new/files-integrated-repo/package.json__tmpl__

@@ -9,6 +9,6 @@
   },
   "devDependencies": {
     "nx": "<%= nxVersion %>",
-    "@nrwl/workspace": "<%= nxVersion %>"
+    "@nx/workspace": "<%= nxVersion %>"
   }
 }

package/src/generators/new/files-root-app/package.json__tmpl__

@@ -8,7 +8,7 @@
   "dependencies": {
   },
   "devDependencies": {
-    "@nrwl/workspace": "<%= nxVersion %>",
+    "@nx/workspace": "<%= nxVersion %>",
     "nx": "<%= nxVersion %>"
   }
 }

package/src/generators/new/generate-preset.js

@@ -52,7 +52,7 @@ function generatePreset(host, opts) {
     function getDefaultArgs(opts) {
         return [
             `g`,
-            `@nrwl/workspace:preset`,
+            `@nx/workspace:preset`,
             `--name=${opts.appName}`,
             opts.style ? `--style=${opts.style}` : null,
             opts.linter ? `--linter=${opts.linter}` : null,
@@ -72,55 +72,56 @@ function generatePreset(host, opts) {
 }
 exports.generatePreset = generatePreset;
 function getPresetDependencies({ preset, presetVersion, bundler, }) {
+    var _a;
     switch (preset) {
         case presets_1.Preset.TS:
-            return { dependencies: {}, dev: { '@nrwl/js': versions_1.nxVersion } };
+            return { dependencies: {}, dev: { '@nx/js': versions_1.nxVersion } };
         case presets_1.Preset.AngularMonorepo:
         case presets_1.Preset.AngularStandalone:
             return {
-                dependencies: { '@nrwl/angular': versions_1.nxVersion },
+                dependencies: { '@nx/angular': versions_1.nxVersion },
                 dev: {
                     '@angular-devkit/core': versions_1.angularCliVersion,
                     typescript: versions_1.typescriptVersion,
                 },
             };
         case presets_1.Preset.Express:
-            return { dependencies: {}, dev: { '@nrwl/express': versions_1.nxVersion } };
+            return { dependencies: {}, dev: { '@nx/express': versions_1.nxVersion } };
         case presets_1.Preset.Nest:
             return {
                 dependencies: {},
-                dev: { '@nrwl/nest': versions_1.nxVersion, typescript: versions_1.typescriptVersion },
+                dev: { '@nx/nest': versions_1.nxVersion, typescript: versions_1.typescriptVersion },
             };
         case presets_1.Preset.NextJs:
-            return { dependencies: { '@nrwl/next': versions_1.nxVersion }, dev: {} };
+            return { dependencies: { '@nx/next': versions_1.nxVersion }, dev: {} };
         case presets_1.Preset.ReactMonorepo:
         case presets_1.Preset.ReactStandalone:
             return {
                 dependencies: {},
                 dev: {
-                    '@nrwl/react': versions_1.nxVersion,
-                    '@nrwl/cypress': versions_1.nxVersion,
-                    '@nrwl/jest': bundler !== 'vite' ? versions_1.nxVersion : undefined,
-                    '@nrwl/vite': bundler === 'vite' ? versions_1.nxVersion : undefined,
-                    '@nrwl/webpack': bundler === 'webpack' ? versions_1.nxVersion : undefined,
+                    '@nx/react': versions_1.nxVersion,
+                    '@nx/cypress': versions_1.nxVersion,
+                    '@nx/jest': bundler !== 'vite' ? versions_1.nxVersion : undefined,
+                    '@nx/vite': bundler === 'vite' ? versions_1.nxVersion : undefined,
+                    '@nx/webpack': bundler === 'webpack' ? versions_1.nxVersion : undefined,
                 },
             };
         case presets_1.Preset.ReactNative:
-            return { dependencies: {}, dev: { '@nrwl/react-native': versions_1.nxVersion } };
+            return { dependencies: {}, dev: { '@nx/react-native': versions_1.nxVersion } };
         case presets_1.Preset.Expo:
-            return { dependencies: {}, dev: { '@nrwl/expo': versions_1.nxVersion } };
+            return { dependencies: {}, dev: { '@nx/expo': versions_1.nxVersion } };
         case presets_1.Preset.WebComponents:
             return {
                 dependencies: {},
-                dev: { '@nrwl/web': versions_1.nxVersion, typescript: versions_1.typescriptVersion },
+                dev: { '@nx/web': versions_1.nxVersion, typescript: versions_1.typescriptVersion },
             };
         case presets_1.Preset.NodeStandalone:
-            return { dependencies: {}, dev: { '@nrwl/node': versions_1.nxVersion } };
+            return { dependencies: {}, dev: { '@nx/node': versions_1.nxVersion } };
         default: {
             return {
                 dev: {},
                 dependencies: {
-                    [preset]: presetVersion !== null && presetVersion !== void 0 ? presetVersion : (0, get_npm_package_version_1.getNpmPackageVersion)(preset),
+                    [preset]: (_a = process.env['NX_E2E_PRESET_VERSION']) !== null && _a !== void 0 ? _a : (0, get_npm_package_version_1.getNpmPackageVersion)(preset, presetVersion),
                 },
             };
         }

package/src/generators/new/generate-preset.js.map

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

package/src/generators/new/new.js

@@ -48,20 +48,35 @@ function validateOptions(options, host) {
         throw new Error(`${(0, path_1.join)(host.root, options.name)} is not an empty directory.`);
     }
 }
+function parsePresetName(input) {
+    // If the preset already contains a version in the name
+    // -- my-package@2.0.1
+    // -- @scope/package@version
+    const atIndex = input.indexOf('@', 1); // Skip the beginning @ because it denotes a scoped package.
+    if (atIndex > 0) {
+        return {
+            package: input.slice(0, atIndex),
+            version: input.slice(atIndex + 1),
+        };
+    }
+    else {
+        if (!input) {
+            throw new Error(`Invalid package name: ${input}`);
+        }
+        return { package: input };
+    }
+}
 function normalizeOptions(options) {
+    var _a;
     const normalized = Object.assign({}, options);
     normalized.name = (0, devkit_1.names)(options.name).fileName;
     if (!options.directory) {
         normalized.directory = options.name;
     }
-    // If the preset already contains a version in the name
-    // -- my-package@2.0.1
-    // -- @scope/package@version
-    const match = options.preset.match(/^(?<package>(@.+\/)?[^@]+)(@(?<version>\d+\.\d+\.\d+))?$/);
-    if (match) {
-        normalized.preset = match.groups.package;
-        normalized.presetVersion = match.groups.version;
-    }
+    const parsed = parsePresetName(options.preset);
+    normalized.preset = parsed.package;
+    // explicitly specified "presetVersion" takes priority over the one from the package name
+    (_a = normalized.presetVersion) !== null && _a !== void 0 ? _a : (normalized.presetVersion = parsed.version);
     normalized.isCustomPreset = !Object.values(presets_1.Preset).includes(options.preset);
     return normalized;
 }

package/src/generators/new/new.js.map

@@ -1 +1 @@
-{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/new.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"new.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/new/new.ts"],"names":[],"mappings":";;;;AAAA,uCAMoB;AAEpB,+BAA4B;AAC5B,8CAA0C;AAE1C,yEAAoE;AACpE,uDAA0E;AA0B1E,SAAsB,YAAY,CAAC,IAAU,EAAE,IAAY;;QACzD,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACvC,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAE/B,MAAM,IAAA,iDAAsB,EAAC,IAAI,EAAE,gCAAK,OAAO,KAAE,OAAO,EAAE,SAAS,GAAS,CAAC,CAAC;QAE9E,IAAA,uCAAqB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACrC,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEpC,OAAO,GAAS,EAAE;YAChB,IAAA,4BAAmB,EAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;YAC5E,mDAAmD;YACnD,IACE,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,GAAG;gBAC7B,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,IAAI;gBAC9B,CAAC,OAAO,CAAC,cAAc,EACvB;gBACA,MAAM,IAAA,gCAAc,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;aACrC;QACH,CAAC,CAAA,CAAC;IACJ,CAAC;CAAA;AApBD,oCAoBC;AAED,kBAAe,YAAY,CAAC;AAE5B,SAAS,eAAe,CAAC,OAAe,EAAE,IAAU;IAClD,IACE,OAAO,CAAC,WAAW;QACnB,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,IAAI;QAC9B,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,IAAI;QAC9B,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,EAAE;QAC5B,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,KAAK;QAC/B,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,GAAG,EAC7B;QACA,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;KAC5E;IACD,IAAI,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,OAAO,EAAE;QAC1C,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;KAC3E;IAED,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAM,CAAC,cAAc,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;QAClE,MAAM,IAAI,KAAK,CACb,mBAAmB,OAAO,CAAC,MAAM,gCAAgC,CAClE,CAAC;KACH;IAED,IACE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;QACzB,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;QAC1B,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,EACtC;QACA,MAAM,IAAI,KAAK,CACb,GAAG,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,6BAA6B,CAC9D,CAAC;KACH;AACH,CAAC;AAED,SAAS,eAAe,CAAC,KAAa;IACpC,uDAAuD;IACvD,sBAAsB;IACtB,4BAA4B;IAC5B,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,4DAA4D;IAEnG,IAAI,OAAO,GAAG,CAAC,EAAE;QACf,OAAO;YACL,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC;YAChC,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC;SAClC,CAAC;KACH;SAAM;QACL,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,yBAAyB,KAAK,EAAE,CAAC,CAAC;SACnD;QACD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;KAC3B;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAe;;IACvC,MAAM,UAAU,qBACX,OAAO,CACX,CAAC;IAEF,UAAU,CAAC,IAAI,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;IAC/C,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE;QACtB,UAAU,CAAC,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;KACrC;IAED,MAAM,MAAM,GAAG,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAE/C,UAAU,CAAC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC;IACnC,yFAAyF;IACzF,MAAA,UAAU,CAAC,aAAa,oCAAxB,UAAU,CAAC,aAAa,GAAK,MAAM,CAAC,OAAO,EAAC;IAE5C,UAAU,CAAC,cAAc,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,gBAAM,CAAC,CAAC,QAAQ,CACzD,OAAO,CAAC,MAAa,CACtB,CAAC;IAEF,OAAO,UAA8B,CAAC;AACxC,CAAC;AAED,SAAS,oBAAoB,CAAC,IAAU,EAAE,OAAe;IACvD,IAAI,OAAO,CAAC,OAAO,EAAE;QACnB,OAAO,IAAA,qCAA4B,EACjC,IAAI,EACJ,EAAE,EACF,EAAE,UAAU,EAAE,QAAQ,EAAE,EACxB,IAAA,WAAI,EAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,CACxC,CAAC;KACH;AACH,CAAC"}

package/src/generators/utils/get-npm-package-version.d.ts

@@ -1 +1 @@
-export declare function getNpmPackageVersion(packageName: string): string | null;
+export declare function getNpmPackageVersion(packageName: string, packageVersion?: string): string | null;

package/src/generators/utils/get-npm-package-version.js

@@ -1,18 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getNpmPackageVersion = void 0;
-function getNpmPackageVersion(packageName) {
+function getNpmPackageVersion(packageName, packageVersion) {
     try {
-        const version = require('child_process').execSync(`npm view ${packageName} version`, { stdio: ['pipe', 'pipe', 'ignore'] });
+        const version = require('child_process').execSync(`npm view ${packageName}${packageVersion ? '@' + packageVersion : ''} version --json`, { stdio: ['pipe', 'pipe', 'ignore'] });
         if (version) {
-            return version
-                .toString()
-                .trim()
-                .replace(/^\n*|\n*$/g, '');
+            // package@1.12 => ["1.12.0", "1.12.1"]
+            // package@1.12.1 => "1.12.1"
+            // package@latest => "1.12.1"
+            const versionOrArray = JSON.parse(version.toString());
+            if (typeof versionOrArray === 'string') {
+                return versionOrArray;
+            }
+            return versionOrArray.pop();
         }
     }
     catch (err) { }
-    return null;
+    return packageVersion !== null && packageVersion !== void 0 ? packageVersion : null;
 }
 exports.getNpmPackageVersion = getNpmPackageVersion;
 //# sourceMappingURL=get-npm-package-version.js.map

package/src/generators/utils/get-npm-package-version.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-npm-package-version.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/utils/get-npm-package-version.ts"],"names":[],"mappings":";;;AAAA,SAAgB,oBAAoB,CAAC,WAAmB;IACtD,IAAI;QACF,MAAM,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,QAAQ,CAC/C,YAAY,WAAW,UAAU,EACjC,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,CACtC,CAAC;QAEF,IAAI,OAAO,EAAE;YACX,OAAO,OAAO;iBACX,QAAQ,EAAE;iBACV,IAAI,EAAE;iBACN,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;SAC9B;KACF;IAAC,OAAO,GAAG,EAAE,GAAE;IAChB,OAAO,IAAI,CAAC;AACd,CAAC;AAfD,oDAeC"}
+{"version":3,"file":"get-npm-package-version.js","sourceRoot":"","sources":["../../../../../../packages/workspace/src/generators/utils/get-npm-package-version.ts"],"names":[],"mappings":";;;AAAA,SAAgB,oBAAoB,CAClC,WAAmB,EACnB,cAAuB;IAEvB,IAAI;QACF,MAAM,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,QAAQ,CAC/C,YAAY,WAAW,GACrB,cAAc,CAAC,CAAC,CAAC,GAAG,GAAG,cAAc,CAAC,CAAC,CAAC,EAC1C,iBAAiB,EACjB,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,CACtC,CAAC;QAEF,IAAI,OAAO,EAAE;YACX,uCAAuC;YACvC,6BAA6B;YAC7B,6BAA6B;YAC7B,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YAEtD,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;gBACtC,OAAO,cAAc,CAAC;aACvB;YACD,OAAO,cAAc,CAAC,GAAG,EAAE,CAAC;SAC7B;KACF;IAAC,OAAO,GAAG,EAAE,GAAE;IAChB,OAAO,cAAc,aAAd,cAAc,cAAd,cAAc,GAAI,IAAI,CAAC;AAChC,CAAC;AAzBD,oDAyBC"}

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

@@ -1,5 +1,5 @@
-import { Tree, formatFiles, installPackagesTask } from '@nrwl/devkit';
-import { libraryGenerator } from '@nrwl/js';
+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});

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

@@ -8,7 +8,7 @@ function default_1(host, schema) {
         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, {}, {
-            '@nrwl/devkit': versions_1.nxVersion,
+            '@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',

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,cAAc,EAAE,oBAAS;YACzB,+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,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"}

package/src/utilities/buildable-libs-utils.d.ts

@@ -1,7 +1,7 @@
 import type { ProjectGraph, ProjectGraphProjectNode } from '@nx/devkit';
 import { ProjectGraphExternalNode } from '@nx/devkit';
 /**
- * @deprecated This type will be removed from @nrwl/workspace in version 17. Prefer importing from @nrwl/js.
+ * @deprecated This type will be removed from @nx/workspace in version 17. Prefer importing from @nx/js.
  */
 export type DependentBuildableProjectNode = {
     name: string;
@@ -9,7 +9,7 @@ export type DependentBuildableProjectNode = {
     node: ProjectGraphProjectNode | ProjectGraphExternalNode;
 };
 /**
- * @deprecated This function will be removed from @nrwl/workspace in version 17. Prefer importing from @nrwl/js.
+ * @deprecated This function will be removed from @nx/workspace in version 17. Prefer importing from @nx/js.
  */
 export declare function calculateProjectDependencies(projGraph: ProjectGraph, root: string, projectName: string, targetName: string, configurationName: string, shallow?: boolean): {
     target: ProjectGraphProjectNode;
@@ -18,24 +18,24 @@ export declare function calculateProjectDependencies(projGraph: ProjectGraph, ro
     topLevelDependencies: DependentBuildableProjectNode[];
 };
 /**
- * @deprecated This function will be removed from @nrwl/workspace in version 17. Prefer importing from @nrwl/js.
+ * @deprecated This function will be removed from @nx/workspace in version 17. Prefer importing from @nx/js.
  */
 export declare function createTmpTsConfig(tsconfigPath: string, workspaceRoot: string, projectRoot: string, dependencies: DependentBuildableProjectNode[]): string;
 /**
- * @deprecated This function will be removed from @nrwl/workspace in version 17. Prefer importing from @nrwl/js.
+ * @deprecated This function will be removed from @nx/workspace in version 17. Prefer importing from @nx/js.
  */
 export declare function checkDependentProjectsHaveBeenBuilt(root: string, projectName: string, targetName: string, projectDependencies: DependentBuildableProjectNode[]): boolean;
 /**
- * @deprecated This function will be removed from @nrwl/workspace in version 17. Prefer importing from @nrwl/js.
+ * @deprecated This function will be removed from @nx/workspace in version 17. Prefer importing from @nx/js.
  */
 export declare function findMissingBuildDependencies(root: string, projectName: string, targetName: string, projectDependencies: DependentBuildableProjectNode[]): DependentBuildableProjectNode[];
 /**
- * @deprecated This function will be removed from @nrwl/workspace in version 17. Prefer importing from @nrwl/js.
+ * @deprecated This function will be removed from @nx/workspace in version 17. Prefer importing from @nx/js.
  */
 export declare function updatePaths(dependencies: DependentBuildableProjectNode[], paths: Record<string, string[]>): void;
 /**
  * Updates the peerDependencies section in the `dist/lib/xyz/package.json` with
  * the proper dependency and version
- * @deprecated This function will be removed from @nrwl/workspace in version 17. Prefer importing from @nrwl/js.
+ * @deprecated This function will be removed from @nx/workspace in version 17. Prefer importing from @nx/js.
  */
 export declare function updateBuildableProjectPackageJsonDependencies(root: string, projectName: string, targetName: string, configurationName: string, node: ProjectGraphProjectNode, dependencies: DependentBuildableProjectNode[], typeOfDependency?: 'dependencies' | 'peerDependencies'): void;

package/src/utilities/buildable-libs-utils.js

@@ -15,7 +15,7 @@ function isBuildable(target, node) {
         node.data.targets[target].executor !== '');
 }
 /**
- * @deprecated This function will be removed from @nrwl/workspace in version 17. Prefer importing from @nrwl/js.
+ * @deprecated This function will be removed from @nx/workspace in version 17. Prefer importing from @nx/js.
  */
 function calculateProjectDependencies(projGraph, root, projectName, targetName, configurationName, shallow) {
     const target = projGraph.nodes[projectName];
@@ -142,7 +142,7 @@ function readPaths(tsConfig) {
     }
 }
 /**
- * @deprecated This function will be removed from @nrwl/workspace in version 17. Prefer importing from @nrwl/js.
+ * @deprecated This function will be removed from @nx/workspace in version 17. Prefer importing from @nx/js.
  */
 function createTmpTsConfig(tsconfigPath, workspaceRoot, projectRoot, dependencies) {
     const tmpTsConfigPath = (0, path_1.join)(workspaceRoot, 'tmp', projectRoot, 'tsconfig.generated.json');
@@ -161,7 +161,7 @@ function cleanupTmpTsConfigFile(tmpTsConfigPath) {
     catch (e) { }
 }
 /**
- * @deprecated This function will be removed from @nrwl/workspace in version 17. Prefer importing from @nrwl/js.
+ * @deprecated This function will be removed from @nx/workspace in version 17. Prefer importing from @nx/js.
  */
 function checkDependentProjectsHaveBeenBuilt(root, projectName, targetName, projectDependencies) {
     const missing = findMissingBuildDependencies(root, projectName, targetName, projectDependencies);
@@ -181,7 +181,7 @@ function checkDependentProjectsHaveBeenBuilt(root, projectName, targetName, proj
 }
 exports.checkDependentProjectsHaveBeenBuilt = checkDependentProjectsHaveBeenBuilt;
 /**
- * @deprecated This function will be removed from @nrwl/workspace in version 17. Prefer importing from @nrwl/js.
+ * @deprecated This function will be removed from @nx/workspace in version 17. Prefer importing from @nx/js.
  */
 function findMissingBuildDependencies(root, projectName, targetName, projectDependencies) {
     const depLibsToBuildFirst = [];
@@ -199,7 +199,7 @@ function findMissingBuildDependencies(root, projectName, targetName, projectDepe
 }
 exports.findMissingBuildDependencies = findMissingBuildDependencies;
 /**
- * @deprecated This function will be removed from @nrwl/workspace in version 17. Prefer importing from @nrwl/js.
+ * @deprecated This function will be removed from @nx/workspace in version 17. Prefer importing from @nx/js.
  */
 function updatePaths(dependencies, paths) {
     const pathsKeys = Object.keys(paths);
@@ -235,7 +235,7 @@ exports.updatePaths = updatePaths;
 /**
  * Updates the peerDependencies section in the `dist/lib/xyz/package.json` with
  * the proper dependency and version
- * @deprecated This function will be removed from @nrwl/workspace in version 17. Prefer importing from @nrwl/js.
+ * @deprecated This function will be removed from @nx/workspace in version 17. Prefer importing from @nx/js.
  */
 function updateBuildableProjectPackageJsonDependencies(root, projectName, targetName, configurationName, node, dependencies, typeOfDependency = 'dependencies') {
     const outputs = (0, devkit_1.getOutputsForTargetAndConfiguration)({

package/src/utilities/run-tasks-in-serial.d.ts

@@ -2,7 +2,7 @@ import type { GeneratorCallback } from '@nx/devkit';
 /**
  * Run tasks in serial
  *
- * @deprecated This function will be removed from `@nrwl/workspace` in version 17. Prefer importing it from `@nrwl/devkit`.
+ * @deprecated This function will be removed from `@nx/workspace` in version 17. Prefer importing it from `@nx/devkit`.
  * @param tasks The tasks to run in serial.
  */
 export declare function runTasksInSerial(...tasks: GeneratorCallback[]): GeneratorCallback;

package/src/utilities/run-tasks-in-serial.js

@@ -5,7 +5,7 @@ const tslib_1 = require("tslib");
 /**
  * Run tasks in serial
  *
- * @deprecated This function will be removed from `@nrwl/workspace` in version 17. Prefer importing it from `@nrwl/devkit`.
+ * @deprecated This function will be removed from `@nx/workspace` in version 17. Prefer importing it from `@nx/devkit`.
  * @param tasks The tasks to run in serial.
  */
 function runTasksInSerial(...tasks) {

package/src/utilities/typescript/get-source-nodes.d.ts

@@ -1,5 +1,5 @@
 import type * as ts from 'typescript';
 /**
- * @deprecated This function will be removed from @nrwl/workspace in version 17. Prefer importing from @nrwl/js.
+ * @deprecated This function will be removed from @nx/workspace in version 17. Prefer importing from @nx/js.
  */
 export declare function getSourceNodes(sourceFile: ts.SourceFile): ts.Node[];

package/src/utilities/typescript/get-source-nodes.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSourceNodes = void 0;
 /**
- * @deprecated This function will be removed from @nrwl/workspace in version 17. Prefer importing from @nrwl/js.
+ * @deprecated This function will be removed from @nx/workspace in version 17. Prefer importing from @nx/js.
  */
 function getSourceNodes(sourceFile) {
     const nodes = [sourceFile];

package/src/utilities/typescript.d.ts

@@ -13,10 +13,10 @@ export { getSourceNodes } from './typescript/get-source-nodes';
 export declare function resolveModuleByImport(importExpr: string, filePath: string, tsConfigPath: string): string;
 export declare function ensureTypescript(): typeof ts;
 /**
- * @deprecated Please import this from @nrwl/js instead. This function will be removed in v17
+ * @deprecated Please import this from @nx/js instead. This function will be removed in v17
  */
 export declare function getRelativePathToRootTsConfig(tree: Tree, targetPath: string): string;
 /**
- * @deprecated Please import this from @nrwl/js instead. This function will be removed in v17
+ * @deprecated Please import this from @nx/js instead. This function will be removed in v17
  */
 export declare function getRootTsConfigPathInTree(tree: Tree): string;

package/src/utilities/typescript.js

@@ -55,14 +55,14 @@ function ensureTypescript() {
 exports.ensureTypescript = ensureTypescript;
 const ts_config_1 = require("./ts-config");
 /**
- * @deprecated Please import this from @nrwl/js instead. This function will be removed in v17
+ * @deprecated Please import this from @nx/js instead. This function will be removed in v17
  */
 function getRelativePathToRootTsConfig(tree, targetPath) {
     return (0, ts_config_1.getRelativePathToRootTsConfig)(tree, targetPath);
 }
 exports.getRelativePathToRootTsConfig = getRelativePathToRootTsConfig;
 /**
- * @deprecated Please import this from @nrwl/js instead. This function will be removed in v17
+ * @deprecated Please import this from @nx/js instead. This function will be removed in v17
  */
 function getRootTsConfigPathInTree(tree) {
     return (0, ts_config_1.getRootTsConfigPathInTree)(tree);

package/src/utilities/version-utils.d.ts

@@ -1,4 +1,4 @@
-/** @deprecated Use checkAndCleanWithSemver from @nrwl/devkit/src/utils/semver instead.
+/** @deprecated Use checkAndCleanWithSemver from @nx/devkit/src/utils/semver instead.
  * TODO(v17): Remove this function from workspace. Keep it for now since there are projects that use it (e.g. https://github.com/gperdomor/nx-tools).
  */
 export declare function checkAndCleanWithSemver(pkgName: string, version: string): string;

package/src/utilities/version-utils.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkAndCleanWithSemver = void 0;
 const semver_1 = require("@nx/devkit/src/utils/semver");
 const devkit_1 = require("@nx/devkit");
-/** @deprecated Use checkAndCleanWithSemver from @nrwl/devkit/src/utils/semver instead.
+/** @deprecated Use checkAndCleanWithSemver from @nx/devkit/src/utils/semver instead.
  * TODO(v17): Remove this function from workspace. Keep it for now since there are projects that use it (e.g. https://github.com/gperdomor/nx-tools).
  */
 function checkAndCleanWithSemver(pkgName, version) {
-    devkit_1.logger.warn(`checkAndCleanWithSemver has been moved to @nrwl/devkit/src/utils/semver`);
+    devkit_1.logger.warn(`checkAndCleanWithSemver has been moved to @nx/devkit/src/utils/semver`);
     return (0, semver_1.checkAndCleanWithSemver)(pkgName, version);
 }
 exports.checkAndCleanWithSemver = checkAndCleanWithSemver;

package/src/utilities/version-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"version-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/version-utils.ts"],"names":[],"mappings":";;;AAAA,wDAAkG;AAClG,uCAAoC;AAEpC;;GAEG;AACH,SAAgB,uBAAuB,CAAC,OAAe,EAAE,OAAe;IACtE,eAAM,CAAC,IAAI,CACT,yEAAyE,CAC1E,CAAC;IACF,OAAO,IAAA,gCAAwB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AACpD,CAAC;AALD,0DAKC"}
+{"version":3,"file":"version-utils.js","sourceRoot":"","sources":["../../../../../packages/workspace/src/utilities/version-utils.ts"],"names":[],"mappings":";;;AAAA,wDAAkG;AAClG,uCAAoC;AAEpC;;GAEG;AACH,SAAgB,uBAAuB,CAAC,OAAe,EAAE,OAAe;IACtE,eAAM,CAAC,IAAI,CACT,uEAAuE,CACxE,CAAC;IACF,OAAO,IAAA,gCAAwB,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AACpD,CAAC;AALD,0DAKC"}

package/src/utils/rules/add-install-task.d.ts

@@ -1,6 +1,6 @@
 import type { Rule } from '@angular-devkit/schematics';
 /**
- * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nrwl/devkit. This function can be replaced with 'addDependenciesToPackageJson' from @nrwl/devkit.
+ * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nx/devkit. This function can be replaced with 'addDependenciesToPackageJson' from @nx/devkit.
  */
 export declare function addInstallTask(options?: {
     skipInstall: boolean;

package/src/utils/rules/add-install-task.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.addInstallTask = void 0;
 let installAdded = false;
 /**
- * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nrwl/devkit. This function can be replaced with 'addDependenciesToPackageJson' from @nrwl/devkit.
+ * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nx/devkit. This function can be replaced with 'addDependenciesToPackageJson' from @nx/devkit.
  */
 function addInstallTask(options = { skipInstall: false }) {
     const { NodePackageInstallTask, } = require('@angular-devkit/schematics/tasks');

package/src/utils/rules/deleteFile.d.ts

@@ -1,6 +1,6 @@
 import type { Rule } from '@angular-devkit/schematics';
 /**
  * Remove a file from the Virtual Schematic Tree
- * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nrwl/devkit. This function can be replaced with 'Tree.delete' from @nrwl/devkit.
+ * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nx/devkit. This function can be replaced with 'Tree.delete' from @nx/devkit.
  */
 export declare function deleteFile(from: string): Rule;

package/src/utils/rules/deleteFile.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteFile = void 0;
 /**
  * Remove a file from the Virtual Schematic Tree
- * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nrwl/devkit. This function can be replaced with 'Tree.delete' from @nrwl/devkit.
+ * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nx/devkit. This function can be replaced with 'Tree.delete' from @nx/devkit.
  */
 function deleteFile(from) {
     return (host) => host.delete(from);

package/src/utils/rules/format-files.d.ts

@@ -1,6 +1,6 @@
 import { Rule } from '@angular-devkit/schematics';
 /**
- * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nrwl/devkit. This function can be replaced with 'formatFiles' from @nrwl/devkit.
+ * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nx/devkit. This function can be replaced with 'formatFiles' from @nx/devkit.
  */
 export declare function formatFiles(options?: {
     skipFormat: boolean;

package/src/utils/rules/format-files.js

@@ -8,7 +8,7 @@ const operators_1 = require("rxjs/operators");
 const path = require("path");
 const devkit_1 = require("@nx/devkit");
 /**
- * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nrwl/devkit. This function can be replaced with 'formatFiles' from @nrwl/devkit.
+ * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nx/devkit. This function can be replaced with 'formatFiles' from @nx/devkit.
  */
 function formatFiles(options = { skipFormat: false }, directory = '') {
     let prettier;

package/src/utils/rules/visit-not-ignored-files.d.ts

@@ -1,6 +1,6 @@
 import { Path } from '@angular-devkit/core';
 import { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
 /**
- * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nrwl/devkit. This function can be replaced with 'visitNotIgnoredFiles' from @nrwl/devkit.
+ * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nx/devkit. This function can be replaced with 'visitNotIgnoredFiles' from @nx/devkit.
  */
 export declare function visitNotIgnoredFiles(visitor: (file: Path, host: Tree, context: SchematicContext) => void | Rule, dir?: Path): Rule;

package/src/utils/rules/visit-not-ignored-files.js

@@ -5,7 +5,7 @@ const core_1 = require("@angular-devkit/core");
 const schematics_1 = require("@angular-devkit/schematics");
 const ignore_1 = require("ignore");
 /**
- * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nrwl/devkit. This function can be replaced with 'visitNotIgnoredFiles' from @nrwl/devkit.
+ * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nx/devkit. This function can be replaced with 'visitNotIgnoredFiles' from @nx/devkit.
  */
 function visitNotIgnoredFiles(visitor, dir = (0, core_1.normalize)('')) {
     return (host, context) => {

package/src/utils/strings.d.ts

@@ -9,7 +9,7 @@
  ```
 
  @method decamelize
- @deprecated This will be removed from `@nrwl/workspace` in version 17. Prefer `@nrwl/js` when importing.
+ @deprecated This will be removed from `@nx/workspace` in version 17. Prefer `@nx/js` when importing.
  @param {String} str The string to decamelize.
  @return {String} the decamelized string.
  */
@@ -26,7 +26,7 @@ export declare function decamelize(str: string): string;
  ```
 
  @method dasherize
- @deprecated This will be removed from `@nrwl/workspace` in version 17. Prefer `@nrwl/js` when importing.
+ @deprecated This will be removed from `@nx/workspace` in version 17. Prefer `@nx/js` when importing.
  @param {String} str The string to dasherize.
  @return {String} the dasherized string.
  */
@@ -43,7 +43,7 @@ export declare function dasherize(str?: string): string;
  ```
 
  @method camelize
- @deprecated This will be removed from `@nrwl/workspace` in version 17. Prefer `@nrwl/js` when importing.
+ @deprecated This will be removed from `@nx/workspace` in version 17. Prefer `@nx/js` when importing.
  @param {String} str The string to camelize.
  @return {String} the camelized string.
  */
@@ -59,7 +59,7 @@ export declare function camelize(str: string): string;
  ```
 
  @method classify
- @deprecated This will be removed from `@nrwl/workspace` in version 17. Prefer `@nrwl/js` when importing.
+ @deprecated This will be removed from `@nx/workspace` in version 17. Prefer `@nx/js` when importing.
  @param {String} str the string to classify
  @return {String} the classified string
  */
@@ -76,7 +76,7 @@ export declare function classify(str: string): string;
  ```
 
  @method underscore
- @deprecated This will be removed from `@nrwl/workspace` in version 17. Prefer `@nrwl/js` when importing.
+ @deprecated This will be removed from `@nx/workspace` in version 17. Prefer `@nx/js` when importing.
  @param {String} str The string to underscore.
  @return {String} the underscored string.
  */
@@ -92,16 +92,16 @@ export declare function underscore(str: string): string;
  ```
 
  @method capitalize
- @deprecated This will be removed from `@nrwl/workspace` in version 17. Prefer `@nrwl/js` when importing.
+ @deprecated This will be removed from `@nx/workspace` in version 17. Prefer `@nx/js` when importing.
  @param {String} str The string to capitalize.
  @return {String} The capitalized string.
  */
 export declare function capitalize(str: string): string;
 /**
- * @deprecated This will be removed from `@nrwl/workspace` in version 17. Prefer `@nrwl/js` when importing.
+ * @deprecated This will be removed from `@nx/workspace` in version 17. Prefer `@nx/js` when importing.
  */
 export declare function group(name: string, group: string | undefined): string;
 /**
- * @deprecated This will be removed from `@nrwl/workspace` in version 17. Prefer `@nrwl/js` when importing.
+ * @deprecated This will be removed from `@nx/workspace` in version 17. Prefer `@nx/js` when importing.
  */
 export declare function featurePath(group: boolean | undefined, flat: boolean | undefined, path: string, name: string): string;

package/src/utils/strings.js

@@ -24,7 +24,7 @@ const STRING_UNDERSCORE_REGEXP_2 = /-|\s+/g;
  ```
 
  @method decamelize
- @deprecated This will be removed from `@nrwl/workspace` in version 17. Prefer `@nrwl/js` when importing.
+ @deprecated This will be removed from `@nx/workspace` in version 17. Prefer `@nx/js` when importing.
  @param {String} str The string to decamelize.
  @return {String} the decamelized string.
  */
@@ -44,7 +44,7 @@ exports.decamelize = decamelize;
  ```
 
  @method dasherize
- @deprecated This will be removed from `@nrwl/workspace` in version 17. Prefer `@nrwl/js` when importing.
+ @deprecated This will be removed from `@nx/workspace` in version 17. Prefer `@nx/js` when importing.
  @param {String} str The string to dasherize.
  @return {String} the dasherized string.
  */
@@ -64,7 +64,7 @@ exports.dasherize = dasherize;
  ```
 
  @method camelize
- @deprecated This will be removed from `@nrwl/workspace` in version 17. Prefer `@nrwl/js` when importing.
+ @deprecated This will be removed from `@nx/workspace` in version 17. Prefer `@nx/js` when importing.
  @param {String} str The string to camelize.
  @return {String} the camelized string.
  */
@@ -87,7 +87,7 @@ exports.camelize = camelize;
  ```
 
  @method classify
- @deprecated This will be removed from `@nrwl/workspace` in version 17. Prefer `@nrwl/js` when importing.
+ @deprecated This will be removed from `@nx/workspace` in version 17. Prefer `@nx/js` when importing.
  @param {String} str the string to classify
  @return {String} the classified string
  */
@@ -110,7 +110,7 @@ exports.classify = classify;
  ```
 
  @method underscore
- @deprecated This will be removed from `@nrwl/workspace` in version 17. Prefer `@nrwl/js` when importing.
+ @deprecated This will be removed from `@nx/workspace` in version 17. Prefer `@nx/js` when importing.
  @param {String} str The string to underscore.
  @return {String} the underscored string.
  */
@@ -132,7 +132,7 @@ exports.underscore = underscore;
  ```
 
  @method capitalize
- @deprecated This will be removed from `@nrwl/workspace` in version 17. Prefer `@nrwl/js` when importing.
+ @deprecated This will be removed from `@nx/workspace` in version 17. Prefer `@nx/js` when importing.
  @param {String} str The string to capitalize.
  @return {String} The capitalized string.
  */
@@ -141,14 +141,14 @@ function capitalize(str) {
 }
 exports.capitalize = capitalize;
 /**
- * @deprecated This will be removed from `@nrwl/workspace` in version 17. Prefer `@nrwl/js` when importing.
+ * @deprecated This will be removed from `@nx/workspace` in version 17. Prefer `@nx/js` when importing.
  */
 function group(name, group) {
     return group ? `${group}/${name}` : name;
 }
 exports.group = group;
 /**
- * @deprecated This will be removed from `@nrwl/workspace` in version 17. Prefer `@nrwl/js` when importing.
+ * @deprecated This will be removed from `@nx/workspace` in version 17. Prefer `@nx/js` when importing.
  */
 function featurePath(group, flat, path, name) {
     if (group && !flat) {

package/src/utils/testing-utils.d.ts

@@ -5,11 +5,11 @@ import { json, JsonObject } from '@angular-devkit/core';
 import { ScheduleOptions } from '@angular-devkit/architect/src/api';
 import { LoggerApi, LogLevel } from '@angular-devkit/core/src/logger';
 /**
- * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nrwl/devkit. Use tree.read(filePath, 'utf-8') instead.
+ * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nx/devkit. Use tree.read(filePath, 'utf-8') instead.
  */
 export declare function getFileContent(tree: Tree, path: string): string;
 /**
- * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nrwl/devkit. Tests for Generators can use 'createTreeWithEmptyWorkspace()' from @nrwl/devkit/testing.
+ * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nx/devkit. Tests for Generators can use 'createTreeWithEmptyWorkspace()' from @nx/devkit/testing.
  */
 export declare function createEmptyWorkspace(tree: Tree): Tree;
 declare class NoopLogger implements LoggerApi {
@@ -25,7 +25,7 @@ declare class NoopLogger implements LoggerApi {
 }
 /**
  * Mock context which makes testing builders easier
- * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nrwl/devkit.
+ * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nx/devkit.
  */
 export declare class MockBuilderContext implements BuilderContext {
     private architect;

package/src/utils/testing-utils.js

@@ -4,7 +4,7 @@ exports.MockBuilderContext = exports.createEmptyWorkspace = exports.getFileConte
 const tslib_1 = require("tslib");
 const core_1 = require("@angular-devkit/core/src/workspace/core");
 /**
- * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nrwl/devkit. Use tree.read(filePath, 'utf-8') instead.
+ * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nx/devkit. Use tree.read(filePath, 'utf-8') instead.
  */
 function getFileContent(tree, path) {
     const fileEntry = tree.get(path);
@@ -15,7 +15,7 @@ function getFileContent(tree, path) {
 }
 exports.getFileContent = getFileContent;
 /**
- * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nrwl/devkit. Tests for Generators can use 'createTreeWithEmptyWorkspace()' from @nrwl/devkit/testing.
+ * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nx/devkit. Tests for Generators can use 'createTreeWithEmptyWorkspace()' from @nx/devkit/testing.
  */
 function createEmptyWorkspace(tree) {
     (0, core_1._test_addWorkspaceFile)('workspace.json', core_1.WorkspaceFormat.JSON);
@@ -87,7 +87,7 @@ class NoopLogger {
 }
 /**
  * Mock context which makes testing builders easier
- * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nrwl/devkit.
+ * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nx/devkit.
  */
 class MockBuilderContext {
     get currentDirectory() {

package/src/utils/workspace.d.ts

@@ -2,19 +2,19 @@ import type { Rule, Tree } from '@angular-devkit/schematics';
 import { JsonArray, JsonObject, workspaces } from '@angular-devkit/core';
 import { ProjectDefinition, TargetDefinition } from '@angular-devkit/core/src/workspace';
 /**
- * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nrwl/devkit. This function can be replaced with 'getProjects' with Nx Devkit.
+ * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nx/devkit. This function can be replaced with 'getProjects' with Nx Devkit.
  */
 export declare function getWorkspace(tree: Tree, path?: string): Promise<workspaces.WorkspaceDefinition>;
 /**
- * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nrwl/devkit. This function can be replaced with 'updateProjectConfiguration' with Nx Devkit.
+ * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nx/devkit. This function can be replaced with 'updateProjectConfiguration' with Nx Devkit.
  */
 export declare function updateWorkspace(updater: (workspace: workspaces.WorkspaceDefinition) => void | PromiseLike<void>): Rule;
 /**
- * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nrwl/devkit. This function can be replaced with 'updateProjectConfiguration' with Nx Devkit.
+ * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nx/devkit. This function can be replaced with 'updateProjectConfiguration' with Nx Devkit.
  */
 export declare function updateWorkspace(workspace: workspaces.WorkspaceDefinition): Rule;
 /**
  * Updates builder options for options and configurations for given builder names
- * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nrwl/devkit. This function can be replaced with 'forEachExecutorOptions' with Nx Devkit.
+ * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nx/devkit. This function can be replaced with 'forEachExecutorOptions' with Nx Devkit.
  */
 export declare function updateBuilderConfig(updater: (currentValue: Record<string, string | number | boolean | JsonArray | JsonObject>, target?: TargetDefinition, project?: ProjectDefinition) => Record<string, string | number | boolean | JsonArray | JsonObject>, ...builderNames: string[]): Rule;

package/src/utils/workspace.js

@@ -36,7 +36,7 @@ function createHost(tree) {
     };
 }
 /**
- * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nrwl/devkit. This function can be replaced with 'getProjects' with Nx Devkit.
+ * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nx/devkit. This function can be replaced with 'getProjects' with Nx Devkit.
  */
 function getWorkspace(tree, path = '/') {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -47,7 +47,7 @@ function getWorkspace(tree, path = '/') {
 }
 exports.getWorkspace = getWorkspace;
 /**
- * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nrwl/devkit. This function can be replaced with 'updateProjectConfiguration' with Nx Devkit.
+ * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nx/devkit. This function can be replaced with 'updateProjectConfiguration' with Nx Devkit.
  */
 function updateWorkspace(updaterOrWorkspace) {
     return (tree) => tslib_1.__awaiter(this, void 0, void 0, function* () {
@@ -68,7 +68,7 @@ function updateWorkspace(updaterOrWorkspace) {
 exports.updateWorkspace = updateWorkspace;
 /**
  * Updates builder options for options and configurations for given builder names
- * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nrwl/devkit. This function can be replaced with 'forEachExecutorOptions' with Nx Devkit.
+ * @deprecated This will be removed in v17. Prefer writing Nx Generators with @nx/devkit. This function can be replaced with 'forEachExecutorOptions' with Nx Devkit.
  */
 function updateBuilderConfig(updater, ...builderNames) {
     return updateWorkspace((workspace) => {