nx 18.4.0-canary.20240417-801a22b → 18.4.0-canary.20240418-e549ea2

package/.eslintrc.json

@@ -25,6 +25,10 @@
               {
                 "group": ["nx/*"],
                 "message": "Circular import in 'nx' found. Use relative path."
+              },
+              {
+                "group": ["**/native-bindings", "**/native-bindings.js"],
+                "message": "Direct imports from native-bindings.js are not allowed. Import from index.js instead."
               }
             ]
           }

package/bin/nx.js

@@ -3,8 +3,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const find_workspace_root_1 = require("../src/utils/find-workspace-root");
 const chalk = require("chalk");
-const dotenv_1 = require("dotenv");
-const dotenv_expand_1 = require("dotenv-expand");
+const dotenv_1 = require("../src/utils/dotenv");
 const init_local_1 = require("./init-local");
 const output_1 = require("../src/utils/output");
 const installation_directory_1 = require("../src/utils/installation-directory");
@@ -20,15 +19,18 @@ const client_1 = require("../src/daemon/client/client");
 function main() {
     if (process.argv[2] !== 'report' &&
         process.argv[2] !== '--version' &&
-        process.argv[2] !== '--help') {
+        process.argv[2] !== '--help' &&
+        process.argv[2] !== 'reset') {
         (0, assert_supported_platform_1.assertSupportedPlatform)();
     }
     require('nx/src/utils/perf-logging');
+    const workspace = (0, find_workspace_root_1.findWorkspaceRoot)(process.cwd());
     perf_hooks_1.performance.mark('loading dotenv files:start');
-    loadDotEnvFiles();
+    if (workspace) {
+        (0, dotenv_1.loadRootEnvFiles)(workspace.dir);
+    }
     perf_hooks_1.performance.mark('loading dotenv files:end');
     perf_hooks_1.performance.measure('loading dotenv files', 'loading dotenv files:start', 'loading dotenv files:end');
-    const workspace = (0, find_workspace_root_1.findWorkspaceRoot)(process.cwd());
     // new is a special case because there is no local workspace to load
     if (process.argv[2] === 'new' ||
         process.argv[2] === '_migrate' ||
@@ -81,20 +83,6 @@ function main() {
         }
     }
 }
-/**
- * This loads dotenv files from:
- * - .env
- * - .local.env
- * - .env.local
- */
-function loadDotEnvFiles() {
-    for (const file of ['.local.env', '.env.local', '.env']) {
-        const myEnv = (0, dotenv_1.config)({
-            path: file,
-        });
-        (0, dotenv_expand_1.expand)(myEnv);
-    }
-}
 function handleNoWorkspace(globalNxVersion) {
     output_1.output.log({
         title: `The current directory isn't part of an Nx workspace.`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "18.4.0-canary.20240417-801a22b",
+  "version": "18.4.0-canary.20240418-e549ea2",
   "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.4.0-canary.20240417-801a22b"
+    "@nrwl/tao": "18.4.0-canary.20240418-e549ea2"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -81,16 +81,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "18.4.0-canary.20240417-801a22b",
-    "@nx/nx-darwin-arm64": "18.4.0-canary.20240417-801a22b",
-    "@nx/nx-linux-x64-gnu": "18.4.0-canary.20240417-801a22b",
-    "@nx/nx-linux-x64-musl": "18.4.0-canary.20240417-801a22b",
-    "@nx/nx-win32-x64-msvc": "18.4.0-canary.20240417-801a22b",
-    "@nx/nx-linux-arm64-gnu": "18.4.0-canary.20240417-801a22b",
-    "@nx/nx-linux-arm64-musl": "18.4.0-canary.20240417-801a22b",
-    "@nx/nx-linux-arm-gnueabihf": "18.4.0-canary.20240417-801a22b",
-    "@nx/nx-win32-arm64-msvc": "18.4.0-canary.20240417-801a22b",
-    "@nx/nx-freebsd-x64": "18.4.0-canary.20240417-801a22b"
+    "@nx/nx-darwin-x64": "18.4.0-canary.20240418-e549ea2",
+    "@nx/nx-darwin-arm64": "18.4.0-canary.20240418-e549ea2",
+    "@nx/nx-linux-x64-gnu": "18.4.0-canary.20240418-e549ea2",
+    "@nx/nx-linux-x64-musl": "18.4.0-canary.20240418-e549ea2",
+    "@nx/nx-win32-x64-msvc": "18.4.0-canary.20240418-e549ea2",
+    "@nx/nx-linux-arm64-gnu": "18.4.0-canary.20240418-e549ea2",
+    "@nx/nx-linux-arm64-musl": "18.4.0-canary.20240418-e549ea2",
+    "@nx/nx-linux-arm-gnueabihf": "18.4.0-canary.20240418-e549ea2",
+    "@nx/nx-win32-arm64-msvc": "18.4.0-canary.20240418-e549ea2",
+    "@nx/nx-freebsd-x64": "18.4.0-canary.20240418-e549ea2"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/command-line/init/implementation/react/check-for-uncommitted-changes.js

@@ -3,12 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkForUncommittedChanges = void 0;
 const child_process_1 = require("child_process");
 function checkForUncommittedChanges() {
-    const gitResult = (0, child_process_1.execSync)(`git status --porcelain`);
-    if (gitResult.length > 0) {
+    const gitResult = (0, child_process_1.execSync)('git status --porcelain').toString();
+    const filteredResults = gitResult
+        .split('\n')
+        .filter((line) => !line.includes('.nx') && line.trim().length > 0);
+    if (filteredResults.length > 0) {
         console.log('❗️ Careful!');
         console.log('You have uncommitted changes in your repository.');
         console.log('');
-        console.log(gitResult.toString());
+        console.log(filteredResults.join('\n').toString());
         console.log('Please commit your changes before running the migrator!');
         process.exit(1);
     }