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

package/dist/bin/post-install.js

@@ -36,10 +36,12 @@ const postinstallTimeout = setTimeout(() => {
     }
 })();
 function isMainNxPackage() {
-    const mainNxPath = require.resolve('nx', {
+    // @ohos-ports/nx port: resolve the self package under its real name —
+    // a bare `nx` specifier would fail when no `node_modules/nx` alias exists.
+    const mainNxPath = require.resolve('@ohos-ports/nx', {
         paths: [workspace_root_1.workspaceRoot],
     });
-    const thisNxPath = require.resolve('nx');
+    const thisNxPath = require.resolve('@ohos-ports/nx');
     return mainNxPath === thisNxPath;
 }
 process.on('uncaughtException', (e) => {

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

@@ -1244,7 +1244,7 @@ async function downloadPackageMigrationsFromRegistry(packageName, packageVersion
     const { dir, cleanup } = (0, package_manager_1.createTempNpmDirectory)();
     let result;
     try {
-        const { tarballPath } = await (0, package_manager_1.packageRegistryPack)(dir, packageName, packageVersion, 
+        const { tarballPath } = await (0, package_manager_1.packageRegistryPack)(dir, packageName, packageVersion,
         // packageVersion is exact and already resolved through the workspace
         // package manager's min-release-age policy by the fetcher. In an npm
         // workspace the pack gate IS that policy, so leave it enforcing; for
@@ -1478,7 +1478,7 @@ async function isMigratingToNewMajor(from, to) {
     return (0, semver_1.major)(from) < (0, semver_1.major)(to);
 }
 function readNxVersion(packageJson, root) {
-    return ((0, package_json_1.getDependencyVersionFromPackageJson)('nx', root, packageJson) ??
+    return ((0, package_json_1.getDependencyVersionFromPackageJson)('@ohos-ports/nx', root, packageJson) ??
         (0, package_json_1.getDependencyVersionFromPackageJson)('@nx/workspace', root, packageJson) ??
         (0, package_json_1.getDependencyVersionFromPackageJson)('@nrwl/workspace', root, packageJson));
 }
@@ -1890,7 +1890,7 @@ async function executeMigrations(root, migrations, isVerbose, shouldCreateCommit
                 }
             }
             else if ((0, migration_shape_1.isHybridMigration)(m)) {
-                const { changes, nextSteps, agentContext, skipAgentic, logs, madeChanges, } = await (0, execute_migration_1.runNxOrAngularMigration)(root, m, isVerbose, 
+                const { changes, nextSteps, agentContext, skipAgentic, logs, madeChanges, } = await (0, execute_migration_1.runNxOrAngularMigration)(root, m, isVerbose,
                 /* captureGeneratorOutput: */ !!agenticRun, resolvedCollection);
                 migrationEmittedNextSteps.push(...nextSteps);
                 if (skipAgentic) {
@@ -1949,7 +1949,7 @@ async function executeMigrations(root, migrations, isVerbose, shouldCreateCommit
                 // Defer commit until validation succeeds; failed validation leaves
                 // changes uncommitted in the working tree for the user to review.
                 const validationRun = agenticRun && shouldRunValidation ? agenticRun : undefined;
-                const { changes, nextSteps, agentContext, skipAgentic, logs, madeChanges, } = await (0, execute_migration_1.runNxOrAngularMigration)(root, m, isVerbose, 
+                const { changes, nextSteps, agentContext, skipAgentic, logs, madeChanges, } = await (0, execute_migration_1.runNxOrAngularMigration)(root, m, isVerbose,
                 /* captureGeneratorOutput: */ !!validationRun, resolvedCollection);
                 migrationEmittedNextSteps.push(...nextSteps);
                 // Whether a validation step was on the table at all. `skipAgentic`
@@ -2152,7 +2152,7 @@ async function runMigrations(root, opts, args, isVerbose, shouldCreateCommits, c
             !(await (0, migrate_commits_1.confirmMigrationCommitsOnDefaultBranch)(root, 'running migrations'))) {
             return;
         }
-        const { packageJson: orchestratorNxPackageJson } = (0, package_json_1.readModulePackageJson)('nx', (0, installation_directory_1.getNxRequirePaths)(root));
+        const { packageJson: orchestratorNxPackageJson } = (0, package_json_1.readModulePackageJson)('@ohos-ports/nx', (0, installation_directory_1.getNxRequirePaths)(root));
         const { runOrchestratorInit } = require('./run');
         return await runOrchestratorInit({
             root,
@@ -2215,7 +2215,7 @@ async function runMigrations(root, opts, args, isVerbose, shouldCreateCommits, c
     }
     if (agentic.kind === 'enabled') {
         const { applyAgenticHandoffGitignoreFallback } = require('./agentic/handoff-gitignore');
-        const { packageJson: nxPackageJson } = (0, package_json_1.readModulePackageJson)('nx', (0, installation_directory_1.getNxRequirePaths)(root));
+        const { packageJson: nxPackageJson } = (0, package_json_1.readModulePackageJson)('@ohos-ports/nx', (0, installation_directory_1.getNxRequirePaths)(root));
         await applyAgenticHandoffGitignoreFallback({
             migrations,
             installedNxVersion: nxPackageJson.version,
@@ -2651,7 +2651,7 @@ async function runMigration() {
                 cliVersionSpec,
                 fromEnvOverride: !!process.env.NX_MIGRATE_CLI_VERSION,
                 ownNxVersion: versions_1.nxVersion,
-                resolveVersion: (spec) => 
+                resolveVersion: (spec) =>
                 // A probe must not prompt, write pnpm excludes, or install; a
                 // minimum-release-age violation surfaces as a rejection and
                 // routes local.

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

@@ -539,7 +539,7 @@ function buildOutcome(changes, nextSteps, description, root) {
 // imports both statically.
 async function prepareAgenticRun(root, migration, agentic, effectiveCreateCommits, commitPrefix) {
     const { applyAgenticHandoffGitignoreFallback } = require('../agentic/handoff-gitignore');
-    const { packageJson: nxPackageJson } = (0, package_json_1.readModulePackageJson)('nx', (0, installation_directory_1.getNxRequirePaths)(root));
+    const { packageJson: nxPackageJson } = (0, package_json_1.readModulePackageJson)('@ohos-ports/nx', (0, installation_directory_1.getNxRequirePaths)(root));
     await applyAgenticHandoffGitignoreFallback({
         migrations: [migration],
         installedNxVersion: nxPackageJson.version,

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

@@ -357,7 +357,7 @@ export interface NxReleaseChangelogConfiguration {
      * If configuring using a custom `ReleaseClient` via the programmatic API, you can either provide a path or directly
      * provide the implementation class itself.
      *
-     * By default, the renderer is set to the DefaultChangelogRenderer implementation from "nx/release/changelog-renderer",
+     * By default, the renderer is set to the DefaultChangelogRenderer implementation from "@ohos-ports/nx/release/changelog-renderer",
      * which nx provides out of the box.
      */
     renderer?: string | typeof ChangelogRenderer;
@@ -409,7 +409,7 @@ export interface NxReleaseConventionalCommitsConfiguration {
      * If not set, this will default to 'true'
      */
     useCommitScope?: boolean;
-    types?: Record<string, 
+    types?: Record<string,
     /**
      * A map of commit types to their configuration.
      * If a type is set to 'true', then it will be enabled with the default 'semverBump' of 'patch' and will appear in the changelog.

package/dist/src/project-graph/plugins/in-process-loader.js

@@ -14,6 +14,15 @@ const transpiler_1 = require("./transpiler");
 const handle_import_1 = require("../../utils/handle-import");
 function readPluginPackageJson(pluginName, projects, paths = (0, installation_directory_1.getNxRequirePaths)()) {
     try {
+        // @ohos-ports/nx port: executor/generator specifiers such as
+        // `nx:run-commands` resolve the plugin package by the literal name `nx`.
+        // When this CLI is installed as `@ohos-ports/nx` without a
+        // `node_modules/nx` alias, map the self-package specifier to the real
+        // package name so Node's package self-reference (via "exports")
+        // resolves it to this package itself.
+        if (pluginName === 'nx') {
+            pluginName = '@ohos-ports/nx';
+        }
         const result = (0, package_json_1.readModulePackageJsonWithoutFallbacks)(pluginName, paths);
         return {
             json: result.packageJson,

package/dist/src/project-graph/plugins/isolation/enabled.js

@@ -11,7 +11,14 @@ function isIsolationEnabled() {
     // Explicitly disabled
     process.env.NX_ISOLATE_PLUGINS === 'false' ||
         // Isolation is disabled on WASM builds currently.
-        native_1.IS_WASM) {
+        native_1.IS_WASM ||
+        // HarmonyOS (openharmony): the hmfs file system enforces mode 2771 on
+        // all directories (chmod 0700 cannot stick), so the 0700 socket dir
+        // required by plugin isolation cannot be created. Default to nx's
+        // in-process plugin loading unless NX_ISOLATE_PLUGINS is explicitly
+        // set (explicit values are respected by the branches above).
+        (process.platform === 'openharmony' &&
+            process.env.NX_ISOLATE_PLUGINS === undefined)) {
         return false;
     }
     // Default value

package/dist/src/utils/installed-nx-version.js

@@ -41,7 +41,9 @@ function getInstalledVersion(packageName) {
  * `nx` can be located.
  */
 function getInstalledNxVersion() {
-    return getInstalledVersion('nx');
+    // @ohos-ports/nx port: the "installed nx" is this package itself; resolve
+    // under the real package name (no `node_modules/nx` alias is guaranteed).
+    return getInstalledVersion('@ohos-ports/nx');
 }
 /**
  * Resolve the workspace's installed `@nrwl/workspace` version (legacy-era

package/dist/src/utils/package-json.js

@@ -158,6 +158,13 @@ function readTargetsFromPackageJson(packageJson, nxJson, projectRoot, workspaceR
  * @returns package json contents and path
  */
 function readModulePackageJsonWithoutFallbacks(moduleSpecifier, requirePaths = (0, installation_directory_1.getNxRequirePaths)()) {
+    // @ohos-ports/nx port: a bare `nx` specifier here refers to the nx package
+    // itself. When installed as `@ohos-ports/nx` without a `node_modules/nx`
+    // alias, map it to the real package name so Node's package self-reference
+    // (via "exports") resolves it to this package itself.
+    if (moduleSpecifier === 'nx') {
+        moduleSpecifier = '@ohos-ports/nx';
+    }
     const packageJsonPath = require.resolve(`${moduleSpecifier}/package.json`, {
         paths: requirePaths,
     });
@@ -182,6 +189,10 @@ function readModulePackageJsonWithoutFallbacks(moduleSpecifier, requirePaths = (
  * @returns package json contents and path
  */
 function readModulePackageJson(moduleSpecifier, requirePaths = (0, installation_directory_1.getNxRequirePaths)()) {
+    // @ohos-ports/nx port: see readModulePackageJsonWithoutFallbacks above.
+    if (moduleSpecifier === 'nx') {
+        moduleSpecifier = '@ohos-ports/nx';
+    }
     let packageJsonPath;
     let packageJson;
     try {

package/dist/src/utils/workspace-root.js

@@ -31,7 +31,10 @@ function workspaceRootInner(dir, candidateRoot) {
         // e.g. packages/my-lib/package.json contains @nx/devkit, which references Nx and is
         // thus located in //packages/my-lib/node_modules/nx/package.json
     }
-    else if ((0, fileutils_1.fileExists)(path.join(dir, 'node_modules', 'nx', 'package.json'))) {
+    else if ((0, fileutils_1.fileExists)(path.join(dir, 'node_modules', 'nx', 'package.json')) ||
+        // @ohos-ports/nx port: the workspace's nx dependency may be installed
+        // under the ported package name without a `node_modules/nx` alias.
+        (0, fileutils_1.fileExists)(path.join(dir, 'node_modules', '@ohos-ports', 'nx', 'package.json'))) {
         return workspaceRootInner(path.dirname(dir), dir);
     }
     else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohos-ports/nx",
-  "version": "23.2.0-beta.2",
+  "version": "23.2.0-beta.4",
   "private": false,
   "type": "commonjs",
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
@@ -173,7 +173,7 @@
     "yargs-parser": "21.1.1"
   },
   "peerDependencies": {
-    "@swc-node/register": "^1.11.1",
+    "@ohos-ports/swc-node-register": "^1.12.1-beta.0",
     "@ohos-ports/swc-core": "^1.15.43-beta.1"
   },
   "peerDependenciesMeta": {