nx 18.2.0-canary.20240326-fb90767 → 18.2.0-canary.20240328-7d2a420

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "18.2.0-canary.20240326-fb90767",
+  "version": "18.2.0-canary.20240328-7d2a420",
   "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.2.0-canary.20240326-fb90767"
+    "@nrwl/tao": "18.2.0-canary.20240328-7d2a420"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "18.2.0-canary.20240326-fb90767",
-    "@nx/nx-darwin-arm64": "18.2.0-canary.20240326-fb90767",
-    "@nx/nx-linux-x64-gnu": "18.2.0-canary.20240326-fb90767",
-    "@nx/nx-linux-x64-musl": "18.2.0-canary.20240326-fb90767",
-    "@nx/nx-win32-x64-msvc": "18.2.0-canary.20240326-fb90767",
-    "@nx/nx-linux-arm64-gnu": "18.2.0-canary.20240326-fb90767",
-    "@nx/nx-linux-arm64-musl": "18.2.0-canary.20240326-fb90767",
-    "@nx/nx-linux-arm-gnueabihf": "18.2.0-canary.20240326-fb90767",
-    "@nx/nx-win32-arm64-msvc": "18.2.0-canary.20240326-fb90767",
-    "@nx/nx-freebsd-x64": "18.2.0-canary.20240326-fb90767"
+    "@nx/nx-darwin-x64": "18.2.0-canary.20240328-7d2a420",
+    "@nx/nx-darwin-arm64": "18.2.0-canary.20240328-7d2a420",
+    "@nx/nx-linux-x64-gnu": "18.2.0-canary.20240328-7d2a420",
+    "@nx/nx-linux-x64-musl": "18.2.0-canary.20240328-7d2a420",
+    "@nx/nx-win32-x64-msvc": "18.2.0-canary.20240328-7d2a420",
+    "@nx/nx-linux-arm64-gnu": "18.2.0-canary.20240328-7d2a420",
+    "@nx/nx-linux-arm64-musl": "18.2.0-canary.20240328-7d2a420",
+    "@nx/nx-linux-arm-gnueabihf": "18.2.0-canary.20240328-7d2a420",
+    "@nx/nx-win32-arm64-msvc": "18.2.0-canary.20240328-7d2a420",
+    "@nx/nx-freebsd-x64": "18.2.0-canary.20240328-7d2a420"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/command-line/init/implementation/add-nx-to-monorepo.d.ts

@@ -1,4 +1,6 @@
 import { InitArgs } from '../init-v1';
-type Options = Pick<InitArgs, 'nxCloud' | 'interactive' | 'cacheable'>;
+type Options = Pick<InitArgs, 'nxCloud' | 'interactive' | 'cacheable'> & {
+    legacy?: boolean;
+};
 export declare function addNxToMonorepo(options: Options): Promise<void>;
 export {};

package/src/command-line/init/implementation/add-nx-to-monorepo.js

@@ -61,6 +61,11 @@ async function addNxToMonorepo(options) {
                     : false);
     }
     (0, utils_1.createNxJsonFile)(repoRoot, targetDefaults, cacheableOperations, scriptOutputs);
+    if (!options.legacy) {
+        packageJsonFiles.forEach((packageJsonPath) => {
+            (0, utils_1.markPackageJsonAsNxProject)((0, path_1.join)(repoRoot, packageJsonPath), cacheableOperations);
+        });
+    }
     (0, utils_1.updateGitIgnore)(repoRoot);
     (0, utils_1.addDepsToPackageJson)(repoRoot);
     output_1.output.log({ title: '📦 Installing dependencies' });

package/src/command-line/init/implementation/add-nx-to-nest.js

@@ -78,7 +78,7 @@ async function addNxToNest(options, packageJson) {
     (0, utils_1.updateGitIgnore)(repoRoot);
     (0, utils_1.addDepsToPackageJson)(repoRoot);
     addNestPluginToPackageJson(repoRoot);
-    (0, utils_1.markRootPackageJsonAsNxProject)(repoRoot, cacheableOperations, pmc);
+    (0, utils_1.markRootPackageJsonAsNxProjectLegacy)(repoRoot, cacheableOperations, pmc);
     createProjectJson(repoRoot, packageJson, nestCLIConfiguration);
     removeFile(repoRoot, 'nest-cli.json');
     updatePackageJsonScripts(repoRoot, isJS);

package/src/command-line/init/implementation/add-nx-to-npm-repo.d.ts

@@ -1,4 +1,6 @@
 import { InitArgs } from '../init-v1';
-type Options = Pick<InitArgs, 'nxCloud' | 'interactive' | 'cacheable'>;
+type Options = Pick<InitArgs, 'nxCloud' | 'interactive' | 'cacheable'> & {
+    legacy?: boolean;
+};
 export declare function addNxToNpmRepo(options: Options): Promise<void>;
 export {};

package/src/command-line/init/implementation/add-nx-to-npm-repo.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addNxToNpmRepo = void 0;
 const enquirer = require("enquirer");
+const path_1 = require("path");
 const fileutils_1 = require("../../../utils/fileutils");
 const output_1 = require("../../../utils/output");
 const package_manager_1 = require("../../../utils/package-manager");
@@ -52,7 +53,12 @@ async function addNxToNpmRepo(options) {
     const pmc = (0, package_manager_1.getPackageManagerCommand)();
     (0, utils_1.updateGitIgnore)(repoRoot);
     (0, utils_1.addDepsToPackageJson)(repoRoot);
-    (0, utils_1.markRootPackageJsonAsNxProject)(repoRoot, cacheableOperations, pmc);
+    if (options.legacy) {
+        (0, utils_1.markRootPackageJsonAsNxProjectLegacy)(repoRoot, cacheableOperations, pmc);
+    }
+    else {
+        (0, utils_1.markPackageJsonAsNxProject)((0, path_1.join)(repoRoot, 'package.json'), cacheableOperations);
+    }
     output_1.output.log({ title: '📦 Installing dependencies' });
     (0, utils_1.runInstall)(repoRoot, pmc);
     if (useNxCloud) {

package/src/command-line/init/implementation/utils.d.ts

@@ -8,7 +8,8 @@ export declare function updateGitIgnore(root: string): void;
 export declare function runInstall(repoRoot: string, pmc?: PackageManagerCommands): void;
 export declare function initCloud(repoRoot: string, installationSource: 'nx-init-angular' | 'nx-init-cra' | 'nx-init-monorepo' | 'nx-init-nest' | 'nx-init-npm-repo'): void;
 export declare function addVsCodeRecommendedExtensions(repoRoot: string, extensions: string[]): void;
-export declare function markRootPackageJsonAsNxProject(repoRoot: string, cacheableScripts: string[], pmc: PackageManagerCommands): void;
+export declare function markRootPackageJsonAsNxProjectLegacy(repoRoot: string, cacheableScripts: string[], pmc: PackageManagerCommands): void;
+export declare function markPackageJsonAsNxProject(packageJsonPath: string, cacheableScripts: string[]): void;
 export declare function printFinalMessage({ learnMoreLink, bodyLines, }: {
     learnMoreLink?: string;
     bodyLines?: string[];

package/src/command-line/init/implementation/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isMonorepo = exports.printFinalMessage = exports.markRootPackageJsonAsNxProject = exports.addVsCodeRecommendedExtensions = exports.initCloud = exports.runInstall = exports.updateGitIgnore = exports.addDepsToPackageJson = exports.createNxJsonFile = void 0;
+exports.isMonorepo = exports.printFinalMessage = exports.markPackageJsonAsNxProject = exports.markRootPackageJsonAsNxProjectLegacy = exports.addVsCodeRecommendedExtensions = exports.initCloud = exports.runInstall = exports.updateGitIgnore = exports.addDepsToPackageJson = exports.createNxJsonFile = void 0;
 const child_process_1 = require("child_process");
 const path_1 = require("path");
 const child_process_2 = require("../../../utils/child-process");
@@ -134,7 +134,7 @@ function addVsCodeRecommendedExtensions(repoRoot, extensions) {
     }
 }
 exports.addVsCodeRecommendedExtensions = addVsCodeRecommendedExtensions;
-function markRootPackageJsonAsNxProject(repoRoot, cacheableScripts, pmc) {
+function markRootPackageJsonAsNxProjectLegacy(repoRoot, cacheableScripts, pmc) {
     const json = (0, fileutils_1.readJsonFile)((0, path_2.joinPathFragments)(repoRoot, `package.json`));
     json.nx = {};
     for (let script of cacheableScripts) {
@@ -153,7 +153,21 @@ function markRootPackageJsonAsNxProject(repoRoot, cacheableScripts, pmc) {
     }
     (0, fileutils_1.writeJsonFile)(`package.json`, json);
 }
-exports.markRootPackageJsonAsNxProject = markRootPackageJsonAsNxProject;
+exports.markRootPackageJsonAsNxProjectLegacy = markRootPackageJsonAsNxProjectLegacy;
+function markPackageJsonAsNxProject(packageJsonPath, cacheableScripts) {
+    const json = (0, fileutils_1.readJsonFile)(packageJsonPath);
+    if (!json.scripts) {
+        return;
+    }
+    json.nx = { includedScripts: [] };
+    for (let script of cacheableScripts) {
+        if (json.scripts[script]) {
+            json.nx.includedScripts.push(script);
+        }
+    }
+    (0, fileutils_1.writeJsonFile)(packageJsonPath, json);
+}
+exports.markPackageJsonAsNxProject = markPackageJsonAsNxProject;
 function printFinalMessage({ learnMoreLink, bodyLines, }) {
     const normalizedBodyLines = (bodyLines ?? []).map((l) => l.startsWith('- ') ? l : `- ${l}`);
     output_1.output.success({

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

@@ -37,10 +37,10 @@ async function initHandler(options) {
             await (0, add_nx_to_nest_1.addNxToNest)(options, packageJson);
         }
         else if ((0, utils_1.isMonorepo)(packageJson)) {
-            await (0, add_nx_to_monorepo_1.addNxToMonorepo)(options);
+            await (0, add_nx_to_monorepo_1.addNxToMonorepo)({ ...options, legacy: true });
         }
         else {
-            await (0, add_nx_to_npm_repo_1.addNxToNpmRepo)(options);
+            await (0, add_nx_to_npm_repo_1.addNxToNpmRepo)({ ...options, legacy: true });
         }
     }
     else {

package/src/core/graph/3rdpartylicenses.txt

@@ -34,7 +34,7 @@ MIT
 MIT
 (The MIT License)
 
-Copyright (c) 2017-2023 Narwhal Technologies Inc.
+Copyright (c) 2017-2024 Narwhal Technologies Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -704,57 +704,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
-regenerator-runtime
-MIT
-MIT License
-
-Copyright (c) 2014-present, Facebook, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-tabbable
-MIT
-The MIT License (MIT)
-
-Copyright (c) 2015 David Clark
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-
 toggle-selection
 MIT
 

package/src/core/graph/index.html

@@ -27,5 +27,5 @@
 
   <body class="bg-white text-slate-500 dark:bg-slate-900 dark:text-slate-400">
     <div class="flex p-0" id="app"></div>
-  <script src="runtime.js" type="module"></script><script src="polyfills.js" type="module"></script><script src="styles.js" type="module"></script><script src="main.js" type="module"></script></body>
+  <script src="runtime.js" type="module"></script><script src="styles.js" type="module"></script><script src="main.js" type="module"></script></body>
 </html>