@ohos-ports/nx 19.8.14-beta.0 → 20.8.4-beta.1

package/.eslintrc.json

@@ -130,7 +130,13 @@
               "@nx/nx-linux-arm-gnueabihf",
               "@nx/nx-win32-arm64-msvc",
               "@nx/nx-freebsd-x64",
-              "@nx/powerpack-license"
+              "@nx/powerpack-license",
+              "@nx/key",
+              // Powerpack plugin conditionally available dynamically at runtime
+              "@nx/powerpack-conformance",
+              "@nx/conformance",
+              // Only used in test-utils at the time of writing
+              "@ltd/j-toml"
             ]
           }
         ]

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017-2024 Narwhal Technologies Inc.
+Copyright (c) 2017-2025 Narwhal Technologies Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/bin/init-local.js

@@ -5,7 +5,6 @@ exports.rewriteTargetsAndProjects = rewriteTargetsAndProjects;
 const perf_hooks_1 = require("perf_hooks");
 const nx_commands_1 = require("../src/command-line/nx-commands");
 const strip_indents_1 = require("../src/utils/strip-indents");
-const Mod = require("module");
 /**
  * Nx is being run inside a workspace.
  *
@@ -15,7 +14,6 @@ function initLocal(workspace) {
     process.env.NX_CLI_SET = 'true';
     try {
         perf_hooks_1.performance.mark('init-local');
-        monkeyPatchRequire();
         if (workspace.type !== 'nx' && shouldDelegateToAngularCLI()) {
             console.warn((0, strip_indents_1.stripIndents) `Using Nx to run Angular CLI commands is deprecated and will be removed in a future version.
         To run Angular CLI commands, use \`ng\`.`);
@@ -144,40 +142,3 @@ To update the cache configuration, you can directly update the relevant options
         }
     }
 }
-// TODO(v17): Remove this once the @nrwl/* packages are not
-function monkeyPatchRequire() {
-    const originalRequire = Mod.prototype.require;
-    Mod.prototype.require = function (...args) {
-        const modulePath = args[0];
-        if (!modulePath.startsWith('@nrwl/')) {
-            return originalRequire.apply(this, args);
-        }
-        else {
-            try {
-                // Try the original require
-                return originalRequire.apply(this, args);
-            }
-            catch (e) {
-                if (e.code !== 'MODULE_NOT_FOUND') {
-                    throw e;
-                }
-                try {
-                    // Retry the require with the @nx package
-                    return originalRequire.apply(this, args.map((value, i) => {
-                        if (i !== 0) {
-                            return value;
-                        }
-                        else {
-                            return value.replace('@nrwl/', '@nx/');
-                        }
-                    }));
-                }
-                catch {
-                    // Throw the original error
-                    throw e;
-                }
-            }
-        }
-        // do some side-effect of your own
-    };
-}

package/bin/nx.js

@@ -17,6 +17,7 @@ const perf_hooks_1 = require("perf_hooks");
 const workspace_context_1 = require("../src/utils/workspace-context");
 const client_1 = require("../src/daemon/client/client");
 const db_connection_1 = require("../src/utils/db-connection");
+const exit_codes_1 = require("../src/utils/exit-codes");
 function main() {
     if (process.argv[2] !== 'report' &&
         process.argv[2] !== '--version' &&
@@ -128,19 +129,9 @@ function resolveNx(workspace) {
     }
     catch { }
     // check for root install
-    try {
-        return require.resolve('nx/bin/nx.js', {
-            paths: [workspace ? workspace.dir : globalsRoot],
-        });
-    }
-    catch {
-        // TODO(v17): Remove this
-        // fallback for old CLI install setup
-        // nx-ignore-next-line
-        return require.resolve('@nrwl/cli/bin/nx.js', {
-            paths: [workspace ? workspace.dir : globalsRoot],
-        });
-    }
+    return require.resolve('nx/bin/nx.js', {
+        paths: [workspace ? workspace.dir : globalsRoot],
+    });
 }
 function handleMissingLocalInstallation() {
     output_1.output.error({
@@ -202,7 +193,7 @@ function getLocalNxVersion(workspace) {
 function _getLatestVersionOfNx() {
     try {
         return (0, child_process_1.execSync)('npm view nx@latest version', {
-            windowsHide: true,
+            windowsHide: false,
         })
             .toString()
             .trim();
@@ -210,7 +201,7 @@ function _getLatestVersionOfNx() {
     catch {
         try {
             return (0, child_process_1.execSync)('pnpm view nx@latest version', {
-                windowsHide: true,
+                windowsHide: false,
             })
                 .toString()
                 .trim();
@@ -224,11 +215,25 @@ const getLatestVersionOfNx = ((fn) => {
     let cache = null;
     return () => cache || (cache = fn());
 })(_getLatestVersionOfNx);
-function nxCleanup() {
+function nxCleanup(signal) {
     (0, db_connection_1.removeDbConnections)();
+    if (signal) {
+        process.exit((0, exit_codes_1.signalToCode)(signal));
+    }
+    else {
+        process.exit();
+    }
 }
-process.on('exit', nxCleanup);
-process.on('SIGINT', nxCleanup);
-process.on('SIGTERM', nxCleanup);
-process.on('SIGHUP', nxCleanup);
+process.on('exit', () => {
+    nxCleanup();
+});
+process.on('SIGINT', () => {
+    nxCleanup('SIGINT');
+});
+process.on('SIGTERM', () => {
+    nxCleanup('SIGTERM');
+});
+process.on('SIGHUP', () => {
+    nxCleanup('SIGHUP');
+});
 main();

package/migrations.json

@@ -1,42 +1,5 @@
 {
   "generators": {
-    "16.0.0-remove-nrwl-cli": {
-      "cli": "nx",
-      "version": "16.0.0-beta.0",
-      "description": "Remove @nrwl/cli.",
-      "implementation": "./src/migrations/update-16-0-0/remove-nrwl-cli"
-    },
-    "16.0.0-tokens-for-depends-on": {
-      "cli": "nx",
-      "version": "16.0.0-beta.9",
-      "description": "Replace `dependsOn.projects` and `inputs` definitions with new configuration format.",
-      "implementation": "./src/migrations/update-16-0-0/update-depends-on-to-tokens"
-    },
-    "16.0.0-update-nx-cloud-runner": {
-      "cli": "nx",
-      "version": "16.0.0-beta.0",
-      "description": "Replace @nrwl/nx-cloud with nx-cloud",
-      "implementation": "./src/migrations/update-16-0-0/update-nx-cloud-runner"
-    },
-    "16.2.0-remove-output-path-from-run-commands": {
-      "cli": "nx",
-      "version": "16.2.0-beta.0",
-      "description": "Remove outputPath from run commands",
-      "implementation": "./src/migrations/update-16-2-0/remove-run-commands-output-path"
-    },
-    "16.6.0-prefix-outputs": {
-      "cli": "nx",
-      "version": "16.6.0-beta.6",
-      "description": "Prefix outputs with {workspaceRoot}/{projectRoot} if needed",
-      "implementation": "./src/migrations/update-15-0-0/prefix-outputs"
-    },
-    "16.8.0-escape-dollar-sign-env": {
-      "cli": "nx",
-      "version": "16.8.0-beta.3",
-      "description": "Escape $ in env variables",
-      "implementation": "./src/migrations/update-16-8-0/escape-dollar-sign-env-variables",
-      "x-repair-skip": true
-    },
     "17.0.0-move-cache-directory": {
       "cli": "nx",
       "version": "17.0.0-beta.1",
@@ -89,6 +52,17 @@
       "description": "Set project name in nx.json explicitly",
       "implementation": "./src/migrations/update-19-2-4/set-project-name",
       "x-repair-skip": true
+    },
+    "move-use-daemon-process": {
+      "version": "20.0.0-beta.7",
+      "description": "Migration for v20.0.0-beta.7",
+      "implementation": "./src/migrations/update-20-0-0/move-use-daemon-process"
+    },
+    "use-legacy-cache": {
+      "version": "20.0.1",
+      "description": "Set `useLegacyCache` to true for migrating workspaces",
+      "implementation": "./src/migrations/update-20-0-1/use-legacy-cache",
+      "x-repair-skip": true
     }
   }
 }

package/ohos-build/build-Cargo.toml.patch

@@ -0,0 +1,12 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 217f75a..3da0b78 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -7,3 +7,7 @@ members = [
+ 
+ [profile.release]
+ lto = true
++
++[patch.crates-io]
++nix_0_27_1 = { package = "nix", path = "../patched-crates/nix-0.27.1" }
++nix_0_25_1 = { package = "nix", path = "../patched-crates/nix-0.25.1" }

package/ohos-build/build-cargo-config.patch

@@ -0,0 +1,20 @@
+diff --git a/.cargo/config.toml b/.cargo/config.toml
+index cd80114..f47551e 100644
+--- a/.cargo/config.toml
++++ b/.cargo/config.toml
+@@ -9,4 +9,13 @@ rustflags = [
+ 
+ [target.aarch64-unknown-linux-musl]
+ linker = "aarch64-linux-musl-gcc"
+-rustflags = ["-C", "target-feature=-crt-static"]
+
++rustflags = ["-C", "target-feature=-crt-static"]
++# HarmonyOS (OpenHarmony) arm64 cross-compilation target.
++# Linker/AR point at the OHOS NDK (harmonybrew ohos-sdk) clang wrappers
++# which already carry --sysroot and -D__MUSL__.
++[target.aarch64-unknown-linux-ohos]
++linker = "/storage/Users/currentUser/.harmonybrew/Cellar/ohos-sdk/26.0.0.18_2/native/llvm/bin/aarch64-unknown-linux-ohos-clang"
++ar = "/storage/Users/currentUser/.harmonybrew/Cellar/ohos-sdk/26.0.0.18_2/native/llvm/bin/llvm-ar"
++
++[net]
++git-fetch-with-cli = true

package/ohos-build/index.js.patch

@@ -0,0 +1,18 @@
+--- a/packages/nx/src/native/index.js
++++ b/packages/nx/src/native/index.js
+@@ -35,6 +35,7 @@
+   '@nx/nx-linux-arm64-musl',
+   '@nx/nx-linux-arm64-gnu',
+   '@nx/nx-linux-arm-gnueabihf',
++  '@nx/nx-openharmony-arm64',
+ ]);
+ 
+ const localNodeFiles = [
+@@ -52,6 +53,7 @@
+   'nx.linux-arm64-musl.node',
+   'nx.linux-arm64-gnu.node',
+   'nx.linux-arm-gnueabihf.node',
++  'nx.openharmony-arm64.node',
+ ];
+ 
+ const originalLoad = Module._load;

package/ohos-build/native-bindings.js.patch

@@ -0,0 +1,25 @@
+--- a/packages/nx/src/native/native-bindings.js
++++ b/packages/nx/src/native/native-bindings.js
+@@ -324,6 +324,22 @@
+     } else {
+       loadErrors.push(new Error(`Unsupported architecture on Linux: ${process.arch}`))
+     }
++  } else if (process.platform === 'openharmony') {
++    if (process.arch === 'arm64') {
++      try {
++        return require('./nx.openharmony-arm64.node')
++      } catch (e) {
++        loadErrors.push(e)
++      }
++      try {
++        return require('@nx/nx-openharmony-arm64')
++      } catch (e) {
++        loadErrors.push(e)
++      }
++
++    } else {
++      loadErrors.push(new Error(`Unsupported architecture on OpenHarmony: ${process.arch}`))
++    }
+   } else {
+     loadErrors.push(new Error(`Unsupported OS: ${process.platform}, architecture: ${process.arch}`))
+   }