@nx/workspace 20.0.0-canary.20241002-1d10a19 → 20.0.0-canary.20241005-75c1da3

package/migrations.json

@@ -1,49 +1,6 @@
 {
-  "generators": {
-    "update-16-0-0-add-nx-packages": {
-      "cli": "nx",
-      "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"
-    },
-    "16-0-0-fix-invalid-babelrc": {
-      "version": "16.0.0-beta.9",
-      "description": "Fix .babelrc presets if it contains an invalid entry for @nx/web/babel.",
-      "cli": "nx",
-      "implementation": "./src/migrations/update-16-0-0/fix-invalid-babelrc"
-    }
-  },
+  "generators": {},
   "packageJsonUpdates": {
-    "16.1.0": {
-      "version": "16.1.0-beta.0",
-      "x-prompt": "Do you want to update to TypeScript v5.0?",
-      "requires": {
-        "typescript": ">=4.9.5 <5.0.0"
-      },
-      "packages": {
-        "typescript": {
-          "version": "~5.0.2"
-        }
-      }
-    },
-    "16.4.0": {
-      "version": "16.4.0-beta.11",
-      "x-prompt": "Do you want to update to TypeScript v5.1?",
-      "requires": {
-        "typescript": ">=5.0.0 <5.1.0"
-      },
-      "packages": {
-        "typescript": {
-          "version": "~5.1.3"
-        }
-      }
-    },
     "17.1.0": {
       "version": "17.1.0-beta.4",
       "x-prompt": "Do you want to update to TypeScript v5.2?",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/workspace",
-  "version": "20.0.0-canary.20241002-1d10a19",
+  "version": "20.0.0-canary.20241005-75c1da3",
   "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": {
@@ -38,12 +38,12 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "20.0.0-canary.20241002-1d10a19",
+    "@nx/devkit": "20.0.0-canary.20241005-75c1da3",
     "chalk": "^4.1.0",
     "enquirer": "~2.3.6",
     "tslib": "^2.3.0",
     "yargs-parser": "21.1.1",
-    "nx": "20.0.0-canary.20241002-1d10a19"
+    "nx": "20.0.0-canary.20241005-75c1da3"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/new/files-package-based-repo/__dot__vscode/extensions.json__tmpl__

@@ -1,8 +1,6 @@
 {
-  "recommendations": [
-    <% if(cliCommand === 'ng') { %>
-    "angular.ng-template",<% }
-    %>
+  "recommendations": [<% if(cliCommand === 'ng') { %>
+    "angular.ng-template",<% } %>
     "nrwl.angular-console"
   ]
 }

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

@@ -1,5 +1,5 @@
 {
-  "name": "<%= formattedNames.fileName %>",
+  "name": "@<%= formattedNames.fileName %>/source",
   "version": "0.0.0",
   "license": "MIT",
   "scripts": {

package/src/generators/new/generate-workspace-files.js

@@ -212,7 +212,7 @@ function createFiles(tree, options) {
         ? './files-root-app'
         : (options.preset === presets_1.Preset.TS &&
             process.env.NX_ADD_PLUGINS !== 'false' &&
-            process.env.NX_ADD_TS_PLUGIN === 'true') ||
+            process.env.NX_ADD_TS_PLUGIN !== 'false') ||
             options.preset === presets_1.Preset.NPM
             ? './files-package-based-repo'
             : './files-integrated-repo';
@@ -242,7 +242,7 @@ async function createReadme(tree, { name, appName, directory, preset, nxCloud },
         isJsStandalone: preset === presets_1.Preset.TsStandalone,
         isTsPreset: preset === presets_1.Preset.TS,
         isUsingNewTsSolutionSetup: process.env.NX_ADD_PLUGINS !== 'false' &&
-            process.env.NX_ADD_TS_PLUGIN === 'true',
+            process.env.NX_ADD_TS_PLUGIN !== 'false',
         isEmptyRepo: !appName,
         appName,
         generateAppCmd: presetInfo.generateAppCmd,
@@ -325,7 +325,7 @@ function setUpWorkspacesInPackageJson(tree, options) {
     if (options.preset === presets_1.Preset.NPM ||
         (options.preset === presets_1.Preset.TS &&
             process.env.NX_ADD_PLUGINS !== 'false' &&
-            process.env.NX_ADD_TS_PLUGIN === 'true')) {
+            process.env.NX_ADD_TS_PLUGIN !== 'false')) {
         if (options.packageManager === 'pnpm') {
             tree.write((0, path_1.join)(options.directory, 'pnpm-workspace.yaml'), `packages:
   - 'packages/*'

package/src/generators/preset/preset.js

@@ -258,7 +258,7 @@ async function createPreset(tree, options) {
         return initGenerator(tree, {
             formatter: options.formatter,
             addTsPlugin: process.env.NX_ADD_PLUGINS !== 'false' &&
-                process.env.NX_ADD_TS_PLUGIN === 'true',
+                process.env.NX_ADD_TS_PLUGIN !== 'false',
         });
     }
     else if (options.preset === presets_1.Preset.TsStandalone) {

package/src/migrations/update-16-0-0/fix-invalid-babelrc.d.ts

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

package/src/migrations/update-16-0-0/fix-invalid-babelrc.js

@@ -1,41 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = update;
-const devkit_1 = require("@nx/devkit");
-function update(tree) {
-    const projects = (0, devkit_1.getProjects)(tree);
-    const packageJson = (0, devkit_1.readJson)(tree, 'package.json');
-    // In case user installed as prod dep.
-    const deps = { ...packageJson.dependencies, ...packageJson.devDependencies };
-    // If web package is installed, skip update.
-    if (deps['@nrwl/web'] || deps['@nx/web']) {
-        return;
-    }
-    projects.forEach((config, name) => {
-        const babelRcPath = (0, devkit_1.joinPathFragments)(config.root, '.babelrc');
-        if (!tree.exists(babelRcPath))
-            return;
-        const babelRc = (0, devkit_1.readJson)(tree, babelRcPath);
-        const nrwlWebBabelPresetIdx = babelRc.presets?.findIndex((p) => 
-        // Babel preset could be specified as a string or a tuple with options.
-        // Account for rescope migration running before or after this one.
-        Array.isArray(p)
-            ? p[0] === '@nrwl/web/babel' || p[0] === '@nx/web/babel'
-            : p === '@nrwl/web/babel' || p === '@nx/web/babel');
-        if (nrwlWebBabelPresetIdx === undefined || nrwlWebBabelPresetIdx === -1) {
-            return;
-        }
-        if (deps['@nrwl/js'] || deps['@nx/js']) {
-            // If JS plugin is installed, then rename to @nx/js/babel.
-            const found = babelRc.presets[nrwlWebBabelPresetIdx];
-            babelRc.presets[nrwlWebBabelPresetIdx] = Array.isArray(found)
-                ? ['@nx/js/babel', found[1]]
-                : '@nx/js/babel';
-        }
-        else {
-            // Otherwise, remove from config.
-            babelRc.presets.splice(nrwlWebBabelPresetIdx, 1);
-        }
-        (0, devkit_1.writeJson)(tree, babelRcPath, babelRc);
-    });
-}

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

@@ -1,2 +0,0 @@
-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

@@ -1,186 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = default_1;
-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 path_1 = require("path");
-const get_import_path_1 = require("../../utilities/get-import-path");
-const PROJECT_NAME = 'workspace-plugin';
-const DESTINATION = `tools/${PROJECT_NAME}`;
-async function default_1(tree) {
-    if (!tree.exists('tools/generators')) {
-        return;
-    }
-    const tasks = [];
-    if (hasWorkspaceGenerators(tree)) {
-        tasks.push(...(await moveWorkspaceGeneratorsToLocalPlugin(tree)));
-    }
-    removeToolsGeneratorsIfEmpty(tree);
-    await (0, devkit_1.formatFiles)(tree);
-    return () => {
-        for (const task of tasks) {
-            task();
-        }
-    };
-}
-async function moveWorkspaceGeneratorsToLocalPlugin(tree) {
-    const tasks = [];
-    let project = (0, devkit_1.getProjects)(tree).get(PROJECT_NAME);
-    if (!project) {
-        await createNewPlugin(tree);
-        tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-            '@nx/plugin': versions_1.nxVersion,
-        }));
-        project = (0, devkit_1.readProjectConfiguration)(tree, PROJECT_NAME);
-    }
-    updateExistingPlugin(tree, project);
-    return tasks;
-}
-function hasWorkspaceGenerators(tree) {
-    const children = tree.children('tools/generators');
-    return (children.length > 0 &&
-        !(children.length === 1 && children[0] === '.gitkeep'));
-}
-function removeToolsGeneratorsIfEmpty(tree) {
-    if (!hasWorkspaceGenerators(tree)) {
-        tree.delete('tools/generators');
-    }
-}
-// Inspired by packages/nx/src/command-line/workspace-generators.ts
-function collectAndMoveGenerators(tree, destinationProjectRoot) {
-    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: schema.description ?? `Generator ${c}`,
-            };
-            moveFilesInDirectory(tree, childDir, (0, devkit_1.joinPathFragments)(destinationDir, c));
-        }
-    }
-    return generators;
-}
-function moveFilesInDirectory(tree, source, destination) {
-    const relative = path_1.posix.relative(source, path_1.posix.dirname(destination));
-    if (!relative.startsWith('../')) {
-        // If the destination is in the same directory or a subdirectory of the source
-        // we can just move the files. If it is not, we need to update the relative imports.
-        return;
-    }
-    let offsetLevel = 0;
-    const pathParts = relative.split('/');
-    for (const part of pathParts) {
-        if (part === '..') {
-            offsetLevel++;
-        }
-        else {
-            break;
-        }
-    }
-    for (const c of tree.children(source)) {
-        if (!tree.isFile(c)) {
-            moveFilesInDirectory(tree, (0, devkit_1.joinPathFragments)(source, c), (0, devkit_1.joinPathFragments)(destination, c));
-        }
-        tree.rename((0, devkit_1.joinPathFragments)(source, c), (0, devkit_1.joinPathFragments)(destination, c));
-        // If its a TS file we can update relative imports with find + replace
-        // This could be done with AST, but since we are only looking at relative
-        // imports its easy to do via string replace. We replace any strings starting
-        // with a relative path outside of their own directory.
-        if (c.endsWith('.ts')) {
-            let content = tree.read((0, devkit_1.joinPathFragments)(destination, c)).toString();
-            // +2 is a bit of a magic number here - represents extra directory levels in a normal
-            // plugin structure compared to the workspace-generator layout
-            const extraDirectoriesInPluginStructure = 2;
-            content = content.replace(new RegExp(`'` + `\.\.\/`.repeat(offsetLevel), 'g'), "'" + '../'.repeat(offsetLevel + extraDirectoriesInPluginStructure));
-            content = content.replace(new RegExp(`"` + `\.\.\/`.repeat(offsetLevel), 'g'), '"' + '../'.repeat(offsetLevel + extraDirectoriesInPluginStructure));
-            // We write it back in the same spot, since it is moved as if it was a regular file after this
-            tree.write((0, devkit_1.joinPathFragments)(source, c), content);
-        }
-        tree.rename((0, devkit_1.joinPathFragments)(source, c), (0, devkit_1.joinPathFragments)(destination, c));
-    }
-}
-async function createNewPlugin(tree) {
-    (0, devkit_1.ensurePackage)('@nx/plugin', versions_1.nxVersion);
-    const { pluginGenerator } = 
-    // nx-ignore-next-line
-    require('@nx/plugin/src/generators/plugin/plugin');
-    // nx-ignore-next-line
-    const { Linter } = (0, devkit_1.ensurePackage)('@nx/eslint', versions_1.nxVersion);
-    const npmScope = (0, get_import_path_1.getNpmScope)(tree);
-    const importPath = npmScope ? `@${npmScope}/${PROJECT_NAME}` : PROJECT_NAME;
-    await pluginGenerator(tree, {
-        minimal: true,
-        directory: PROJECT_NAME,
-        importPath: importPath,
-        skipTsConfig: false,
-        compiler: 'tsc',
-        linter: Linter.EsLint,
-        skipFormat: true,
-        skipLintChecks: false,
-        unitTestRunner: 'jest',
-        e2eTestRunner: 'none',
-        publishable: false,
-    });
-    await getCreateGeneratorsJson()(tree, (0, devkit_1.readProjectConfiguration)(tree, PROJECT_NAME).root, PROJECT_NAME);
-    await 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,
-            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) => {
-        const generators = collectAndMoveGenerators(tree, project.root);
-        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/plugin/src/generators/generator/generator');` here
-    // because it will cause a typescript error at build time.
-    const { createGeneratorsJson } = 
-    // nx-ignore-next-line
-    require('@nx/plugin/src/generators/generator/generator');
-    return createGeneratorsJson;
-}

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.d.ts

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

package/src/migrations/update-16-0-0-add-nx-packages/update-16-0-0-add-nx-packages.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = replacePackage;
-const devkit_1 = require("@nx/devkit");
-const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
-async function replacePackage(tree) {
-    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nrwl/workspace', '@nx/workspace');
-    await (0, devkit_1.formatFiles)(tree);
-}