@ohos-ports/nx 23.2.0-beta.1 → 23.2.0-beta.2

package/dist/bin/nx.js

@@ -36,10 +36,10 @@ async function main() {
     if (process.env.NX_COMPLETE) {
         try {
             perf_hooks_1.performance.mark('init-local');
-            const { tryValueCompletion } = await import('nx/src/command-line/completion/value-completions');
+            const { tryValueCompletion } = await import('@ohos-ports/nx/src/command-line/completion/value-completions');
             if (tryValueCompletion())
                 return;
-            const { tryCommandSurfaceCompletion } = await import('nx/src/command-line/completion/command-completions');
+            const { tryCommandSurfaceCompletion } = await import('@ohos-ports/nx/src/command-line/completion/command-completions');
             tryCommandSurfaceCompletion();
         }
         catch (e) {
@@ -91,7 +91,7 @@ async function main() {
             // inherited via NX_ANALYTICS_SESSION_ID.
             await initAnalytics();
         }
-        (await import('nx/src/command-line/nx-commands')).commandsObject.argv;
+        (await import('@ohos-ports/nx/src/command-line/nx-commands')).commandsObject.argv;
     }
     else {
         // polyfill rxjs observable to avoid issues with multiple version of Observable installed in node_modules
@@ -127,7 +127,7 @@ async function main() {
             await initAnalytics();
             // nx-cloud commands can run without local Nx installation
             process.env.NX_DAEMON = 'false';
-            (await import('nx/src/command-line/nx-commands')).commandsObject.argv;
+            (await import('@ohos-ports/nx/src/command-line/nx-commands')).commandsObject.argv;
         }
         else if (isLocalInstall) {
             const { daemonClient } = await import('../src/daemon/client/client.js');

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

@@ -129,7 +129,7 @@ function parsePackageSpecifier(packageSpecifier) {
     const version = packageSpecifier.substring(i + 1);
     return [pkgName, version];
 }
-exports.coreNxPluginVersions = require(require.resolve('nx/package.json'))['nx-migrations'].packageGroup.reduce((map, entry) => {
+exports.coreNxPluginVersions = require(require.resolve('@ohos-ports/nx/package.json'))['nx-migrations'].packageGroup.reduce((map, entry) => {
     const packageName = typeof entry === 'string' ? entry : entry.package;
     const version = typeof entry === 'string' ? versions_1.nxVersion : entry.version;
     return map.set(packageName, version);

package/dist/src/command-line/configure-ai-agents/configure-ai-agents.js

@@ -47,7 +47,7 @@ async function configureAiAgentsHandler(args, inner = false) {
         await (0, provenance_1.ensurePackageHasProvenance)('nx', 'latest');
         const packageInstallResults = (0, package_json_1.installPackageToTmp)('nx', 'latest', (0, package_manager_1.detectPackageManager)(workspace_root_1.workspaceRoot));
         cleanup = packageInstallResults.cleanup;
-        let modulePath = require.resolve('nx/src/command-line/configure-ai-agents/configure-ai-agents.js', { paths: [packageInstallResults.tempDir] });
+        let modulePath = require.resolve('@ohos-ports/nx/src/command-line/configure-ai-agents/configure-ai-agents.js', { paths: [packageInstallResults.tempDir] });
         const module = await (0, handle_import_1.handleImport)(modulePath);
         await module.configureAiAgentsHandler(args, true);
         cleanup();

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

@@ -48,7 +48,7 @@ async function initHandler(options, inner = false) {
         await (0, provenance_1.ensurePackageHasProvenance)('nx', 'latest');
         const packageInstallResults = (0, package_json_1.installPackageToTmp)('nx', 'latest', (0, package_manager_1.detectPackageManager)(process.cwd()));
         cleanup = packageInstallResults.cleanup;
-        let modulePath = require.resolve('nx/src/command-line/init/init-v2.js', {
+        let modulePath = require.resolve('@ohos-ports/nx/src/command-line/init/init-v2.js', {
             paths: [packageInstallResults.tempDir],
         });
         const module = await (0, handle_import_1.handleImport)(modulePath);

package/dist/src/command-line/migrate/migrate.js

@@ -1061,7 +1061,7 @@ function createInstalledPackageVersionsResolver(root) {
                 (() => {
                     for (const req of nxRequires) {
                         try {
-                            const packageJsonPath = req.resolve('nx/package.json');
+                            const packageJsonPath = req.resolve('@ohos-ports/nx/package.json');
                             if (packageJsonPath.startsWith(workspace_root_1.workspaceRoot)) {
                                 return (0, fileutils_1.readJsonFile)(packageJsonPath).version;
                             }
@@ -2472,7 +2472,7 @@ function readLocalNxVersion(root) {
                     exports: {},
                 };
                 new Function('module', 'exports', 'require', '__dirname', '__filename', (0, fs_1.readFileSync)(pnpManifest, 'utf-8').replace(/^#!.*/, ''))(manifestModule, manifestModule.exports, require, root, pnpManifest);
-                const packageJsonPath = manifestModule.exports.resolveRequest('nx/package.json', (0, path_1.join)(root, 'package.json'));
+                const packageJsonPath = manifestModule.exports.resolveRequest('@ohos-ports/nx/package.json', (0, path_1.join)(root, 'package.json'));
                 if (packageJsonPath) {
                     // A resolving manifest names the install the yarn spawn runs, so
                     // every branch below returns rather than falling through to the

package/dist/src/command-line/repair/repair.js

@@ -6,7 +6,7 @@ const migrate_1 = require("../migrate/migrate");
 const output_1 = require("../../utils/output");
 async function repair(args, extraMigrations = []) {
     return (0, handle_errors_1.handleErrors)(args.verbose, async () => {
-        const migrationsJson = require(require.resolve('nx/migrations.json'));
+        const migrationsJson = require(require.resolve('@ohos-ports/nx/migrations.json'));
         const nxMigrations = Object.entries(migrationsJson.generators).reduce((agg, [name, migration]) => {
             const skip = migration['x-repair-skip'];
             if (!skip) {

package/dist/src/command-line/report/report.js

@@ -27,7 +27,7 @@ const nx_key_1 = require("../../utils/nx-key");
 const cache_1 = require("../../tasks-runner/cache");
 const client_1 = require("../../daemon/client/client");
 const nx_package_group_1 = require("../../utils/nx-package-group");
-const nxPackageJson = (0, fileutils_1.readJsonFile)(require.resolve('nx/package.json'));
+const nxPackageJson = (0, fileutils_1.readJsonFile)(require.resolve('@ohos-ports/nx/package.json'));
 exports.packagesWeCareAbout = [
     'lerna',
     ...(0, nx_package_group_1.readNxPackageGroup)(),

package/dist/src/command-line/run/run.js

@@ -56,7 +56,7 @@ async function printTargetRunHelpInternal({ project, target }, root, projectsCon
         plugin: nodeModule,
         entity: executor,
     });
-    if (nodeModule === 'nx' &&
+    if ((nodeModule === 'nx' || nodeModule === '@ohos-ports/nx') &&
         executor === 'run-commands' &&
         targetConfig.options.command) {
         const command = targetConfig.options.command.split(' ')[0];

package/dist/src/daemon/server/handle-configure-ai-agents.js

@@ -71,11 +71,11 @@ async function computeAgentStatuses() {
         let modulePath;
         if (process.env.NX_USE_LOCAL === 'true') {
             log('Using local implementation (NX_USE_LOCAL=true)');
-            modulePath = require.resolve('nx/src/ai/utils.js');
+            modulePath = require.resolve('@ohos-ports/nx/src/ai/utils.js');
         }
         else {
             const tmpPath = await (0, latest_nx_1.getLatestNxTmpPath)();
-            modulePath = require.resolve('nx/src/ai/utils.js', {
+            modulePath = require.resolve('@ohos-ports/nx/src/ai/utils.js', {
                 paths: [tmpPath],
             });
         }

package/dist/src/daemon/server/nx-console-operations.js

@@ -26,7 +26,7 @@ async function getNxConsoleStatus({ inner, } = {}) {
     }
     try {
         const tmpPath = await (0, latest_nx_1.getLatestNxTmpPath)();
-        const modulePath = require.resolve('nx/src/daemon/server/nx-console-operations.js', { paths: [tmpPath] });
+        const modulePath = require.resolve('@ohos-ports/nx/src/daemon/server/nx-console-operations.js', { paths: [tmpPath] });
         const module = await (0, handle_import_1.handleImport)(modulePath);
         const result = await module.getNxConsoleStatus({ inner: true });
         log('Console status check completed, shouldPrompt:', result);
@@ -53,7 +53,7 @@ async function handleNxConsolePreferenceAndInstall({ preference, inner, }) {
     }
     try {
         const tmpPath = await (0, latest_nx_1.getLatestNxTmpPath)();
-        const modulePath = require.resolve('nx/src/daemon/server/nx-console-operations.js', { paths: [tmpPath] });
+        const modulePath = require.resolve('@ohos-ports/nx/src/daemon/server/nx-console-operations.js', { paths: [tmpPath] });
         const module = await (0, handle_import_1.handleImport)(modulePath);
         const result = await module.handleNxConsolePreferenceAndInstall({
             preference,

package/dist/src/daemon/server/shutdown-utils.js

@@ -38,7 +38,7 @@ async function startNewDaemonInBackground() {
     // Resolve from workspace root to pick up the correct symlink target
     let startScriptPath;
     try {
-        startScriptPath = require.resolve('nx/src/daemon/server/start.js', {
+        startScriptPath = require.resolve('@ohos-ports/nx/src/daemon/server/start.js', {
             paths: [workspace_root_1.workspaceRoot],
         });
     }

package/dist/src/utils/nx-package-group.js

@@ -10,6 +10,6 @@ const fileutils_1 = require("./fileutils");
  * the package group — no hand-maintained list.
  */
 function readNxPackageGroup() {
-    const nxPkg = (0, fileutils_1.readJsonFile)(require.resolve('nx/package.json'));
+    const nxPkg = (0, fileutils_1.readJsonFile)(require.resolve('@ohos-ports/nx/package.json'));
     return (nxPkg['nx-migrations']?.packageGroup ?? []).map((e) => typeof e === 'string' ? e : e.package);
 }

package/dist/src/utils/owned-private-dir.js

@@ -190,8 +190,9 @@ function isSafeSharedRoot(dir) {
         if (!stats.isDirectory()) {
             return deny(notADirectory(dir, stats));
         }
-        if (process.platform === 'win32') {
-            // The OS temp root is already scoped to the current Windows user.
+        if (process.platform === 'win32' || process.platform === 'openharmony') {
+            // Windows: the OS temp root is already scoped to the current user.
+            // HarmonyOS: file_manager service remaps uid, so ownership checks are unreliable.
             return allow(dir);
         }
         if (typeof process.getuid === 'function' &&
@@ -282,7 +283,8 @@ function isOwnedRealDirectory(dir) {
             return null;
         }
         return typeof process.getuid !== 'function' ||
-            stats.uid === process.getuid()
+            stats.uid === process.getuid() ||
+            process.platform === 'openharmony'
             ? dir
             : null;
     }
@@ -340,7 +342,7 @@ function ensureOwnedPrivateDir(dir) {
             // Windows: the roots there are per-user OS temp dirs, not a shared /tmp.
             return allow(dir);
         }
-        if (stats.uid !== process.getuid()) {
+        if (stats.uid !== process.getuid() && process.platform !== 'openharmony') {
             return deny({ kind: 'foreign-owner', dir, uid: stats.uid });
         }
         if (stats.mode & 0o077) {

package/dist/src/utils/provenance.js

@@ -96,7 +96,7 @@ class ProvenanceError extends Error {
 }
 exports.ProvenanceError = ProvenanceError;
 function getNxPackageGroup() {
-    const packageJsonPath = (0, module_1.createRequire)(__filename).resolve('nx/package.json');
+    const packageJsonPath = (0, module_1.createRequire)(__filename).resolve('@ohos-ports/nx/package.json');
     const packageJson = (0, fileutils_1.readJsonFile)(packageJsonPath);
     if (!packageJson['nx-migrations']?.packageGroup) {
         return ['nx'];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohos-ports/nx",
-  "version": "23.2.0-beta.1",
+  "version": "23.2.0-beta.2",
   "private": false,
   "type": "commonjs",
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",