@ohos-ports/nx 23.2.0-beta.4 → 23.2.1-beta.1

package/dist/src/utils/min-release-age/behavior/pnpm.js

@@ -9,6 +9,14 @@ const errors_1 = require("../errors");
 const pick_1 = require("../pick");
 // Ordered newest-bound-first so the first matching row applies.
 const PNPM_BEHAVIOR_ROWS = [
+    {
+        minVersion: '12.0.0',
+        major: 12,
+        strictMode: 'default-loose',
+        strictAutoOnWhenExplicit: true,
+        excludeGrammar: 'v2-globs-unions',
+        writesExcludes: true,
+    },
     {
         minVersion: '11.1.3',
         major: 11,
@@ -134,7 +142,7 @@ function toBoolean(value) {
 async function readPnpmPolicy(root, pmVersion) {
     // A pnpm major newer than the table knows can behave differently; defer to a
     // real install rather than guessing.
-    if ((0, semver_1.gte)(pmVersion, '12.0.0')) {
+    if ((0, semver_1.gte)(pmVersion, '13.0.0')) {
         return {
             outcome: 'ambiguous',
             reason: `pnpm ${pmVersion} is newer than the known cooldown behavior table.`,
@@ -155,15 +163,15 @@ async function readPnpmPolicy(root, pmVersion) {
     }
     const { windowMinutes: explicitWindow, excludes, strictExplicit, ignoreMissingTimeExplicit, } = parseCooldownConfig(config);
     // An explicitly configured window (from whatever surface pnpm honors) wins;
-    // otherwise v11 falls back to its built-in 1440-minute (1 day) default, while
-    // v10 has no default (no cooldown).
+    // otherwise v11 and v12 fall back to the built-in 1440-minute (1 day) default,
+    // while v10 has no default (no cooldown).
     let windowMinutes;
     let windowExplicit;
     if (explicitWindow !== undefined) {
         windowMinutes = explicitWindow;
         windowExplicit = true;
     }
-    else if (row.major === 11) {
+    else if (row.major >= 11) {
         windowMinutes = 1440;
         windowExplicit = false;
     }
@@ -178,14 +186,14 @@ async function readPnpmPolicy(root, pmVersion) {
     const cutoffMs = Date.now() - windowMs;
     const sourceDescription = `pnpm minimumReleaseAge (${windowMinutes} min)`;
     const strict = resolveStrict(row, strictExplicit, windowExplicit);
-    // v10 always errors on missing time; v11 defaults to skip unless a surface
-    // explicitly disabled it.
-    const ignoreMissingTime = row.major === 11 ? (ignoreMissingTimeExplicit ?? true) : false;
+    // v10 always errors on missing time; v11 and above default to skip unless a
+    // surface explicitly disabled it.
+    const ignoreMissingTime = row.major >= 11 ? (ignoreMissingTimeExplicit ?? true) : false;
     const behavior = {
         packageManager: 'pnpm',
         strict,
-        // Loose fallback only exists on v11 when strict is off.
-        looseFallback: row.major === 11 && !strict,
+        // Loose fallback only exists from v11 onwards when strict is off.
+        looseFallback: row.major >= 11 && !strict,
         writesExcludes: row.writesExcludes,
         missingTimeMap: row.major === 10 ? 'error' : ignoreMissingTime ? 'skip' : 'error',
     };

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('@ohos-ports/nx/package.json'));
+    const nxPkg = (0, fileutils_1.readJsonFile)(require.resolve('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,9 +190,8 @@ function isSafeSharedRoot(dir) {
         if (!stats.isDirectory()) {
             return deny(notADirectory(dir, stats));
         }
-        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.
+        if (process.platform === 'win32') {
+            // The OS temp root is already scoped to the current Windows user.
             return allow(dir);
         }
         if (typeof process.getuid === 'function' &&
@@ -283,8 +282,7 @@ function isOwnedRealDirectory(dir) {
             return null;
         }
         return typeof process.getuid !== 'function' ||
-            stats.uid === process.getuid() ||
-            process.platform === 'openharmony'
+            stats.uid === process.getuid()
             ? dir
             : null;
     }
@@ -342,7 +340,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() && process.platform !== 'openharmony') {
+        if (stats.uid !== process.getuid()) {
             return deny({ kind: 'foreign-owner', dir, uid: stats.uid });
         }
         if (stats.mode & 0o077) {

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

@@ -23,6 +23,7 @@ const target_merging_1 = require("../project-graph/utils/project-configuration/t
 const catalog_1 = require("./catalog");
 const fileutils_1 = require("./fileutils");
 const has_nx_js_plugin_1 = require("./has-nx-js-plugin");
+const path_2 = require("./path");
 const installation_directory_1 = require("./installation-directory");
 const package_manager_1 = require("./package-manager");
 const workspace_root_1 = require("./workspace-root");
@@ -35,15 +36,25 @@ function normalizePackageGroup(packageGroup) {
         }));
 }
 function readNxMigrateConfig(json) {
+    // Registry fetching uses this value to build a temporary extraction path.
+    // Reject unsupported absolute paths and escaping parent traversal before extraction.
+    const assertContained = (migrations) => {
+        if (!(0, path_2.isContainedRelativePath)(migrations)) {
+            throw new Error(`Invalid migrations path "${migrations}" in package "${json.name ?? 'unknown'}@${json.version ?? 'unknown'}": migration paths must not be absolute or escape their base directory through parent traversal.`);
+        }
+        return migrations;
+    };
     const parseNxMigrationsConfig = (fromJson) => {
         if (!fromJson) {
             return {};
         }
         if (typeof fromJson === 'string') {
-            return { migrations: fromJson, packageGroup: [] };
+            return { migrations: assertContained(fromJson), packageGroup: [] };
         }
         return {
-            ...(fromJson.migrations ? { migrations: fromJson.migrations } : {}),
+            ...(fromJson.migrations
+                ? { migrations: assertContained(fromJson.migrations) }
+                : {}),
             ...(fromJson.packageGroup
                 ? { packageGroup: normalizePackageGroup(fromJson.packageGroup) }
                 : {}),
@@ -158,13 +169,6 @@ 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,
     });
@@ -189,10 +193,6 @@ 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/params.js

@@ -443,7 +443,7 @@ function applyVerbosity(options, schema, isVerbose) {
 }
 function combineOptionsForExecutor(commandLineOpts, config, target, schema, defaultProjectName, relativeCwd, isVerbose = false) {
     const r = convertAliases(coerceTypesInOptions(convertToCamelCase(commandLineOpts, schema), schema), schema, false);
-    let combined = target.options || {};
+    let combined = { ...target.options };
     if (config && target.configurations && target.configurations[config]) {
         Object.assign(combined, target.configurations[config]);
     }

package/dist/src/utils/path.d.ts

@@ -8,6 +8,12 @@ export declare function normalizePath(osSpecificPath: string): string;
  * This should not be used to read files on disk because of the removal of Windows drive letters.
  */
 export declare function joinPathFragments(...fragments: string[]): string;
+/**
+ * True when `relativePath` stays inside the directory it is resolved against.
+ * Absolute paths are rejected because `path.join` silently treats them as
+ * relative, so they would otherwise slip past a `..` check.
+ */
+export declare function isContainedRelativePath(relativePath: string): boolean;
 /**
  * When running a script with the package manager (e.g. `npm run`), the package manager will
  * traverse the directory tree upwards until it finds a `package.json` and will set `process.cwd()`

package/dist/src/utils/path.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.normalizePath = normalizePath;
 exports.joinPathFragments = joinPathFragments;
+exports.isContainedRelativePath = isContainedRelativePath;
 exports.getCwd = getCwd;
 const tslib_1 = require("tslib");
 const path = tslib_1.__importStar(require("path"));
@@ -23,6 +24,20 @@ function normalizePath(osSpecificPath) {
 function joinPathFragments(...fragments) {
     return normalizePath(path.join(...fragments));
 }
+/**
+ * True when `relativePath` stays inside the directory it is resolved against.
+ * Absolute paths are rejected because `path.join` silently treats them as
+ * relative, so they would otherwise slip past a `..` check.
+ */
+function isContainedRelativePath(relativePath) {
+    if (path.isAbsolute(relativePath)) {
+        return false;
+    }
+    const normalized = path.normalize(relativePath);
+    return !(normalized === '..' ||
+        normalized.startsWith(`..${path.sep}`) ||
+        normalized.startsWith(`..${path.posix.sep}`));
+}
 /**
  * When running a script with the package manager (e.g. `npm run`), the package manager will
  * traverse the directory tree upwards until it finds a `package.json` and will set `process.cwd()`

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('@ohos-ports/nx/package.json');
+    const packageJsonPath = (0, module_1.createRequire)(__filename).resolve('nx/package.json');
     const packageJson = (0, fileutils_1.readJsonFile)(packageJsonPath);
     if (!packageJson['nx-migrations']?.packageGroup) {
         return ['nx'];

package/dist/src/utils/versions.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nxVersion = void 0;
-exports.nxVersion = require('@ohos-ports/nx/package.json').version;
+exports.nxVersion = require('nx/package.json').version;

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

@@ -31,10 +31,7 @@ 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')) ||
-        // @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'))) {
+    else if ((0, fileutils_1.fileExists)(path.join(dir, 'node_modules', 'nx', 'package.json'))) {
         return workspaceRootInner(path.dirname(dir), dir);
     }
     else {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@ohos-ports/nx",
-  "version": "23.2.0-beta.4",
+  "version": "23.2.1-beta.1",
   "private": false,
   "type": "commonjs",
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
     "type": "git",
     "url": "https://github.com/ohos-ports/ohos-ports.git",
-    "directory": "ports/nx/23.2.0"
+    "directory": "ports/nx/23.2.1"
   },
   "files": [
     "dist/bin",
@@ -50,7 +50,7 @@
     "@clack/core": "1.4.3",
     "@clack/prompts": "1.7.0",
     "@emnapi/core": "1.4.5",
-    "@ohos-ports/emnapi-runtime": "^1.11.2-beta.0",
+    "@emnapi/runtime": "1.4.5",
     "@emnapi/wasi-threads": "1.0.4",
     "@jest/diff-sequences": "30.0.1",
     "@napi-rs/wasm-runtime": "0.2.4",
@@ -79,8 +79,8 @@
     "color-name": "1.1.4",
     "combined-stream": "1.0.8",
     "debug": "4.4.3",
-    "@ohos-ports/default-browser": "^5.5.0-beta.1",
-    "@ohos-ports/default-browser-id": "^5.0.2-beta.0",
+    "default-browser": "5.2.1",
+    "default-browser-id": "5.0.0",
     "defaults": "1.0.4",
     "define-lazy-prop": "3.0.0",
     "delayed-stream": "1.0.0",
@@ -173,8 +173,8 @@
     "yargs-parser": "21.1.1"
   },
   "peerDependencies": {
-    "@ohos-ports/swc-node-register": "^1.12.1-beta.0",
-    "@ohos-ports/swc-core": "^1.15.43-beta.1"
+    "@swc-node/register": "^1.11.1",
+    "@swc/core": "^1.15.8"
   },
   "peerDependenciesMeta": {
     "@swc-node/register": {
@@ -185,16 +185,17 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "23.2.0",
-    "@nx/nx-darwin-x64": "23.2.0",
-    "@nx/nx-freebsd-x64": "23.2.0",
-    "@nx/nx-linux-arm-gnueabihf": "23.2.0",
-    "@nx/nx-linux-arm64-gnu": "23.2.0",
-    "@nx/nx-linux-arm64-musl": "23.2.0",
-    "@nx/nx-linux-x64-musl": "23.2.0",
-    "@nx/nx-win32-arm64-msvc": "23.2.0",
-    "@nx/nx-win32-x64-msvc": "23.2.0",
-    "@ohos-ports/nx-nx-linux-x64-gnu": "^23.2.0-beta.0"
+    "@nx/nx-darwin-arm64": "23.2.1",
+    "@nx/nx-darwin-x64": "23.2.1",
+    "@nx/nx-freebsd-x64": "23.2.1",
+    "@nx/nx-linux-arm-gnueabihf": "23.2.1",
+    "@nx/nx-linux-arm64-gnu": "23.2.1",
+    "@nx/nx-linux-arm64-musl": "23.2.1",
+    "@nx/nx-linux-x64-gnu": "23.2.1",
+    "@nx/nx-linux-x64-musl": "23.2.1",
+    "@nx/nx-win32-arm64-msvc": "23.2.1",
+    "@nx/nx-win32-x64-msvc": "23.2.1",
+    "@nx/nx-openharmony-arm64": "npm:@ohos-ports/nx-openharmony-arm64@23.2.1-beta.0"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",
@@ -541,7 +542,5 @@
       "default": "./dist/tasks-runners/*.js"
     }
   },
-  "scripts": {
-    "postinstall": "node -e \"try{require('./dist/bin/post-install')}catch(e){}\""
-  }
-}
+  "scripts": {}
+}