nx 18.1.0-canary.20240229-f6a183c → 18.1.0-canary.20240301-d705372

package/migrations.json

@@ -86,7 +86,7 @@
     "18.0.0-disable-adding-plugins-for-existing-workspaces": {
       "cli": "nx",
       "version": "18.0.0-beta.2",
-      "description": "Updates .env to disabled adding plugins when generating projects in an existing Nx workspace",
+      "description": "Updates nx.json to disabled adding plugins when generating projects in an existing Nx workspace",
       "implementation": "./src/migrations/update-18-0-0/disable-crystal-for-existing-workspaces",
       "x-repair-skip": true
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "18.1.0-canary.20240229-f6a183c",
+  "version": "18.1.0-canary.20240301-d705372",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -66,7 +66,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "18.1.0-canary.20240229-f6a183c"
+    "@nrwl/tao": "18.1.0-canary.20240301-d705372"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "18.1.0-canary.20240229-f6a183c",
-    "@nx/nx-darwin-arm64": "18.1.0-canary.20240229-f6a183c",
-    "@nx/nx-linux-x64-gnu": "18.1.0-canary.20240229-f6a183c",
-    "@nx/nx-linux-x64-musl": "18.1.0-canary.20240229-f6a183c",
-    "@nx/nx-win32-x64-msvc": "18.1.0-canary.20240229-f6a183c",
-    "@nx/nx-linux-arm64-gnu": "18.1.0-canary.20240229-f6a183c",
-    "@nx/nx-linux-arm64-musl": "18.1.0-canary.20240229-f6a183c",
-    "@nx/nx-linux-arm-gnueabihf": "18.1.0-canary.20240229-f6a183c",
-    "@nx/nx-win32-arm64-msvc": "18.1.0-canary.20240229-f6a183c",
-    "@nx/nx-freebsd-x64": "18.1.0-canary.20240229-f6a183c"
+    "@nx/nx-darwin-x64": "18.1.0-canary.20240301-d705372",
+    "@nx/nx-darwin-arm64": "18.1.0-canary.20240301-d705372",
+    "@nx/nx-linux-x64-gnu": "18.1.0-canary.20240301-d705372",
+    "@nx/nx-linux-x64-musl": "18.1.0-canary.20240301-d705372",
+    "@nx/nx-win32-x64-msvc": "18.1.0-canary.20240301-d705372",
+    "@nx/nx-linux-arm64-gnu": "18.1.0-canary.20240301-d705372",
+    "@nx/nx-linux-arm64-musl": "18.1.0-canary.20240301-d705372",
+    "@nx/nx-linux-arm-gnueabihf": "18.1.0-canary.20240301-d705372",
+    "@nx/nx-win32-arm64-msvc": "18.1.0-canary.20240301-d705372",
+    "@nx/nx-freebsd-x64": "18.1.0-canary.20240301-d705372"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/schemas/nx-schema.json

@@ -101,6 +101,10 @@
       "type": "boolean",
       "description": "Specifies whether the daemon should be used for the default tasks runner."
     },
+    "useInferencePlugins": {
+      "type": "boolean",
+      "description": "Specifies whether to add inference plugins when generating new projects."
+    },
     "release": {
       "type": "object",
       "description": "Configuration for the nx release commands.",

package/src/adapter/compat.d.ts

@@ -1,2 +1,2 @@
 export declare const allowedProjectExtensions: readonly ["tags", "implicitDependencies", "configFilePath", "$schema", "generators", "namedInputs", "name", "files", "root", "sourceRoot", "projectType", "release", "includedScripts"];
-export declare const allowedWorkspaceExtensions: readonly ["implicitDependencies", "affected", "defaultBase", "tasksRunnerOptions", "workspaceLayout", "plugins", "targetDefaults", "files", "generators", "namedInputs", "extends", "cli", "pluginsConfig", "defaultProject", "installation", "release", "nxCloudAccessToken", "nxCloudUrl", "nxCloudEncryptionKey", "parallel", "cacheDirectory", "useDaemonProcess"];
+export declare const allowedWorkspaceExtensions: readonly ["implicitDependencies", "affected", "defaultBase", "tasksRunnerOptions", "workspaceLayout", "plugins", "targetDefaults", "files", "generators", "namedInputs", "extends", "cli", "pluginsConfig", "defaultProject", "installation", "release", "nxCloudAccessToken", "nxCloudUrl", "nxCloudEncryptionKey", "parallel", "cacheDirectory", "useDaemonProcess", "useInferencePlugins"];

package/src/adapter/compat.js

@@ -58,6 +58,7 @@ exports.allowedWorkspaceExtensions = [
     'parallel',
     'cacheDirectory',
     'useDaemonProcess',
+    'useInferencePlugins',
 ];
 if (!patched) {
     Module.prototype.require = function () {

package/src/command-line/add/add.js

@@ -97,7 +97,8 @@ async function initializePlugin(pkgName, options) {
         }
         else {
             updatePackageScripts =
-                process.env.NX_ADD_PLUGINS !== 'false' &&
+                (0, nx_json_1.readNxJson)().useInferencePlugins !== false &&
+                    process.env.NX_ADD_PLUGINS !== 'false' &&
                     coreNxPlugins.includes(pkgName);
         }
         await (0, child_process_2.runNxAsync)(`g ${pkgName}:${initGenerator} --keepExistingVersions${updatePackageScripts ? ' --updatePackageScripts' : ''}`, {

package/src/command-line/init/command-object.js

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.yargsInitCommand = void 0;
 const shared_options_1 = require("../yargs-utils/shared-options");
-const useV2 = process.env['NX_ADD_PLUGINS'] !== 'false';
+const nx_json_1 = require("../../config/nx-json");
+const useV2 = process.env['NX_ADD_PLUGINS'] !== 'false' &&
+    (0, nx_json_1.readNxJson)().useInferencePlugins !== false;
 exports.yargsInitCommand = {
     command: 'init',
     describe: 'Adds Nx to any type of workspace. It installs nx, creates an nx.json configuration file and optionally sets up remote caching. For more info, check https://nx.dev/recipes/adopting-nx.',

package/src/command-line/init/init-v2.js

@@ -108,6 +108,7 @@ const npmPackageToPluginMap = {
     vite: '@nx/vite',
     vitest: '@nx/vite',
     webpack: '@nx/webpack',
+    rollup: '@nx/rollup',
     // Testing tools
     jest: '@nx/jest',
     cypress: '@nx/cypress',

package/src/command-line/release/utils/git.js

@@ -14,11 +14,25 @@ function escapeRegExp(string) {
 const SEMVER_REGEX = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/g;
 async function getLatestGitTagForPattern(releaseTagPattern, additionalInterpolationData = {}) {
     try {
-        const tags = await (0, exec_command_1.execCommand)('git', ['tag', '--sort', '-v:refname']).then((r) => r
+        let tags;
+        tags = await (0, exec_command_1.execCommand)('git', [
+            'tag',
+            '--sort',
+            '-v:refname',
+            '--merged',
+        ]).then((r) => r
             .trim()
             .split('\n')
             .map((t) => t.trim())
             .filter(Boolean));
+        if (!tags.length) {
+            // try again, but include all tags on the repo instead of just --merged ones
+            tags = await (0, exec_command_1.execCommand)('git', ['tag', '--sort', '-v:refname']).then((r) => r
+                .trim()
+                .split('\n')
+                .map((t) => t.trim())
+                .filter(Boolean));
+        }
         if (!tags.length) {
             return null;
         }

package/src/config/nx-json.d.ts

@@ -358,6 +358,10 @@ export interface NxJsonConfiguration<T = '*' | string[]> {
      * Set this to false to disable the daemon.
      */
     useDaemonProcess?: boolean;
+    /**
+     * Set this to false to disable adding inference plugins when generating new projects
+     */
+    useInferencePlugins?: boolean;
 }
 export type PluginConfiguration = string | {
     plugin: string;

package/src/generators/utils/project-configuration.js

@@ -35,6 +35,7 @@ function addProjectConfiguration(tree, projectName, projectConfiguration, standa
         throw new Error(`Cannot create a new project ${projectName} at ${projectConfiguration.root}. A project already exists in this directory.`);
     }
     delete projectConfiguration.$schema;
+    handleEmptyTargets(projectName, projectConfiguration);
     (0, json_1.writeJson)(tree, projectConfigFile, {
         name: projectName,
         $schema: getRelativeProjectJsonSchemaPath(tree, projectConfiguration),
@@ -55,6 +56,7 @@ function updateProjectConfiguration(tree, projectName, projectConfiguration) {
     if (!tree.exists(projectConfigFile)) {
         throw new Error(`Cannot update Project ${projectName} at ${projectConfiguration.root}. It either doesn't exist yet, or may not use project.json for configuration. Use \`addProjectConfiguration()\` instead if you want to create a new project.`);
     }
+    handleEmptyTargets(projectName, projectConfiguration);
     (0, json_1.writeJson)(tree, projectConfigFile, {
         name: projectConfiguration.name ?? projectName,
         $schema: getRelativeProjectJsonSchemaPath(tree, projectConfiguration),
@@ -131,7 +133,7 @@ function readAndCombineAllProjectConfigurations(tree) {
     const patterns = [
         '**/project.json',
         'project.json',
-        ...(0, package_json_workspaces_1.getGlobPatternsFromPackageManagerWorkspaces)(tree.root, (p) => (0, json_1.readJson)(tree, p)),
+        ...(0, package_json_workspaces_1.getGlobPatternsFromPackageManagerWorkspaces)(tree.root, (p) => (0, json_1.readJson)(tree, p, { expectComments: true })),
     ];
     const projectGlobPatterns = (0, retrieve_workspace_files_1.configurationGlobs)([
         project_json_1.ProjectJsonProjectsPlugin,
@@ -237,3 +239,15 @@ function toNewFormat(w) {
     }
     return w;
 }
+function handleEmptyTargets(projectName, projectConfiguration) {
+    if (projectConfiguration.targets &&
+        !Object.keys(projectConfiguration.targets).length) {
+        // Re-order `targets` to appear after the `// target` comment.
+        delete projectConfiguration.targets;
+        projectConfiguration['// targets'] = `to see all targets run: nx show project ${projectName} --web`;
+        projectConfiguration.targets = {};
+    }
+    else {
+        delete projectConfiguration['// targets'];
+    }
+}

package/src/migrations/update-18-0-0/disable-crystal-for-existing-workspaces.js

@@ -1,29 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const logger_1 = require("../../utils/logger");
-const ignore_1 = require("ignore");
+const nx_json_1 = require("../../generators/utils/nx-json");
 function migrate(tree) {
-    const ig = (0, ignore_1.default)();
-    try {
-        ig.add(tree.read('.gitignore', 'utf-8'));
-        if (ig.ignores('.env')) {
-            logger_1.logger.warn('NX The NX_ADD_PLUGINS=false environment variable was added to your .env file for backwards compatibility. However, your .env is ignored by git. Other contributors should add this key to their .env file or ensure that the environment variable is set to false when generating code with Nx.');
-        }
-    }
-    catch { }
-    if (!tree.exists('.env')) {
-        tree.write('.env', '');
-    }
-    const dotenv = tree.read('.env', 'utf-8');
-    const newDotenvContents = [
-        '# Nx 18 enables using plugins to infer targets by default',
-        '# This is disabled for existing workspaces to maintain compatibility',
-        '# For more info, see: https://nx.dev/concepts/inferred-tasks',
-        'NX_ADD_PLUGINS=false',
-    ];
-    if (dotenv.length) {
-        newDotenvContents.unshift(dotenv, '');
-    }
-    tree.write('.env', newDotenvContents.join('\n'));
+    const nxJson = (0, nx_json_1.readNxJson)(tree);
+    nxJson.useInferencePlugins = false;
+    (0, nx_json_1.updateNxJson)(tree, nxJson);
 }
 exports.default = migrate;

package/src/plugins/js/utils/register.js

@@ -67,6 +67,7 @@ function getTranspiler(compilerOptions) {
     }
     compilerOptions.lib = ['es2021'];
     compilerOptions.module = ts.ModuleKind.CommonJS;
+    compilerOptions.moduleResolution = ts.ModuleResolutionKind.Node10;
     compilerOptions.target = ts.ScriptTarget.ES2021;
     compilerOptions.inlineSourceMap = true;
     compilerOptions.skipLibCheck = true;

package/src/project-graph/utils/project-configuration-utils.js

@@ -195,6 +195,10 @@ function readProjectConfigurationsFromRootMap(projectRootMap) {
     // to provide better error messaging.
     const errors = new Map();
     for (const [root, configuration] of projectRootMap.entries()) {
+        // We're setting `// targets` as a comment `targets` is empty due to Project Crystal.
+        // Strip it before returning configuration for usage.
+        if (configuration['// targets'])
+            delete configuration['// targets'];
         if (!configuration.name) {
             try {
                 const { name } = (0, fileutils_1.readJsonFile)((0, path_1.join)(root, 'package.json'));