@ohos-ports/nx 23.3.0-beta.3 → 24.0.2-beta.0

package/README.md

@@ -1,7 +1,7 @@
-<p style="text-align: center;">
+<p align="center">
   <picture>
-    <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-dark.svg">
-    <img alt="Nx - Smart Repos · Fast Builds" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-light.svg" width="100%">
+    <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-logo-light.svg">
+    <img alt="Nx Logo" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-logo.svg" width="140">
   </picture>
 </p>
 
@@ -60,6 +60,3 @@ npx nx@latest init
 - [Official Nx YouTube Channel](https://www.youtube.com/@NxDevtools)
 - [Blog Posts About Nx](https://nx.dev/blog)
 
-<p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg" 
-width="100%" alt="Nx - Smart Monorepos · Fast Builds"></a></p>
-

package/dist/bin/nx.js

@@ -198,13 +198,13 @@ function resolveNx(workspace) {
         const installPath = (0, installation_directory_1.getNxInstallationPath)(root);
         if ((0, fs_1.existsSync)(installPath)) {
             const installRequire = (0, module_1.createRequire)((0, path_1.join)(installPath, 'package.json'));
-            return installRequire.resolve('@ohos-ports/nx/bin/nx.js');
+            return installRequire.resolve('nx/bin/nx.js');
         }
     }
     catch { }
     // check for root install
     const rootRequire = (0, module_1.createRequire)((0, path_1.join)(root, 'package.json'));
-    return rootRequire.resolve('@ohos-ports/nx/bin/nx.js');
+    return rootRequire.resolve('nx/bin/nx.js');
 }
 function isNxCloudCommand(command) {
     const nxCloudCommands = [

package/dist/bin/post-install.js

@@ -9,6 +9,8 @@ const get_cloud_options_1 = require("../src/nx-cloud/utilities/get-cloud-options
 const nx_cloud_utils_1 = require("../src/utils/nx-cloud-utils");
 const nx_json_1 = require("../src/config/nx-json");
 const logger_1 = require("../src/utils/logger");
+const package_json_1 = require("../src/utils/package-json");
+const installation_directory_1 = require("../src/utils/installation-directory");
 // The post install is not critical, to avoid any chance that it may hang
 // we will kill this process after 30 seconds.
 const postinstallTimeout = setTimeout(() => {
@@ -36,9 +38,9 @@ const postinstallTimeout = setTimeout(() => {
     }
 })();
 function isMainNxPackage() {
-    const mainNxPath = require.resolve('nx', {
-        paths: [workspace_root_1.workspaceRoot],
-    });
+    // A plain `require.resolve('nx', { paths })` self-references this package,
+    // so every installed nx copy would pass.
+    const mainNxPath = (0, package_json_1.resolveWithoutCachePollution)('nx', (0, installation_directory_1.getNxRequirePaths)(workspace_root_1.workspaceRoot));
     const thisNxPath = require.resolve('nx');
     return mainNxPath === thisNxPath;
 }

package/dist/nx-cloud-internals.d.ts

@@ -1 +1,2 @@
 export { importUltracacheConfigurations, openUltracacheConfigurations, } from './src/ultracache/store';
+export declare const TASK_GRAPH_FORMAT = 2;

package/dist/nx-cloud-internals.js

@@ -3,7 +3,13 @@
 // a public API. The client probes these exports to tell what this nx supports,
 // so keep them stable.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.openUltracacheConfigurations = exports.importUltracacheConfigurations = void 0;
+exports.TASK_GRAPH_FORMAT = exports.openUltracacheConfigurations = exports.importUltracacheConfigurations = void 0;
 var store_1 = require("./src/ultracache/store");
 Object.defineProperty(exports, "importUltracacheConfigurations", { enumerable: true, get: function () { return store_1.importUltracacheConfigurations; } });
 Object.defineProperty(exports, "openUltracacheConfigurations", { enumerable: true, get: function () { return store_1.openUltracacheConfigurations; } });
+// Nx Cloud reads it to pick the task-graph shape it hands this nx. Bump it when
+// the shape changes in a way Cloud must handle.
+//   1: `dependencies` and `continuousDependencies` edges are task ids (implied
+//      when the export is absent)
+//   2: edges are objects (`{ id, waitFor?, inputs? }`)
+exports.TASK_GRAPH_FORMAT = 2;

package/dist/src/adapter/ngcli-adapter.js

@@ -253,8 +253,7 @@ async function createRecorder(host, record, logger) {
         else if (event.kind === 'rename') {
             record.loggingQueue.push(`${pc.blue('RENAME')} ${eventPath} => ${event.to}`);
             // Surface as DELETE source + CREATE destination so downstream consumers
-            // (e.g. the agentic validation prompt's `<files_changed>` block) see
-            // both endpoints.
+            // see both endpoints.
             const toPath = event.to.startsWith('/') ? event.to.slice(1) : event.to;
             record.changes?.push({ type: 'DELETE', path: eventPath, content: null });
             record.changes?.push(emptyFileChange('CREATE', toPath));
@@ -991,6 +990,7 @@ async function getWrappedWorkspaceNodeModulesArchitectHost(workspace, root, proj
                 const batchImplementationFactory = executorConfig.batchImplementation
                     ? this.getImplementationFactory(executorConfig.batchImplementation, executorsDir, nodeModule)
                     : null;
+                // TODO(v25): remove custom hasher support.
                 const hasherFactory = executorConfig.hasher
                     ? this.getImplementationFactory(executorConfig.hasher, executorsDir, nodeModule)
                     : null;

package/dist/src/ai/clone-ai-config-repo.js

@@ -7,18 +7,59 @@ const os_1 = require("os");
 const path_1 = require("path");
 const REPO_URL = 'https://github.com/nrwl/nx-ai-agents-config';
 const CACHE_DIR = (0, path_1.join)((0, os_1.tmpdir)(), 'nx-ai-agents-config');
+// `git rev-parse --local-env-vars`, plus GIT_NAMESPACE and the indexed
+// GIT_CONFIG_KEY_<n> / GIT_CONFIG_VALUE_<n> pairs. Hooks export GIT_INDEX_FILE;
+// inheriting it makes `git clone` rewrite the caller's index.
+const GIT_LOCAL_REPO_ENV_VARS = new Set([
+    'GIT_ALTERNATE_OBJECT_DIRECTORIES',
+    'GIT_COMMON_DIR',
+    'GIT_CONFIG',
+    'GIT_CONFIG_COUNT',
+    'GIT_CONFIG_PARAMETERS',
+    'GIT_DIR',
+    'GIT_GRAFT_FILE',
+    'GIT_IMPLICIT_WORK_TREE',
+    'GIT_INDEX_FILE',
+    'GIT_NAMESPACE',
+    'GIT_NO_REPLACE_OBJECTS',
+    'GIT_OBJECT_DIRECTORY',
+    'GIT_PREFIX',
+    'GIT_REPLACE_REF_BASE',
+    'GIT_SHALLOW_FILE',
+    'GIT_WORK_TREE',
+]);
+function isGitLocalRepoEnvVar(key) {
+    const upper = key.toUpperCase();
+    return (GIT_LOCAL_REPO_ENV_VARS.has(upper) ||
+        upper.startsWith('GIT_CONFIG_KEY_') ||
+        upper.startsWith('GIT_CONFIG_VALUE_'));
+}
+function environmentWithoutGitLocalRepoVars() {
+    const env = { ...process.env };
+    for (const key of Object.keys(env)) {
+        if (isGitLocalRepoEnvVar(key)) {
+            delete env[key];
+        }
+    }
+    return env;
+}
+function execGitWithoutLocalRepoEnv(command, timeout) {
+    return (0, child_process_1.execSync)(command, {
+        encoding: 'utf-8',
+        env: environmentWithoutGitLocalRepoVars(),
+        stdio: ['pipe', 'pipe', 'pipe'],
+        timeout,
+        windowsHide: true,
+    });
+}
 /**
  * Get the latest commit hash from the remote repository.
  * Uses `git ls-remote` to fetch the HEAD commit hash without cloning.
  */
 function getLatestCommitHash() {
     try {
-        const output = (0, child_process_1.execSync)(`git ls-remote ${REPO_URL} HEAD`, {
-            encoding: 'utf-8',
-            stdio: ['pipe', 'pipe', 'pipe'],
-            timeout: 30000, // 30 second timeout
-            windowsHide: true,
-        });
+        const output = execGitWithoutLocalRepoEnv(`git ls-remote ${REPO_URL} HEAD`, 30000 // 30 second timeout
+        );
         const hash = output.split('\t')[0];
         if (!hash || hash.length < 10) {
             throw new Error('Invalid commit hash received');
@@ -43,12 +84,8 @@ function cloneRepo(targetPath) {
         if ((0, fs_1.existsSync)(tempPath)) {
             (0, fs_1.rmSync)(tempPath, { recursive: true, force: true });
         }
-        (0, child_process_1.execSync)(`git clone --depth 1 ${REPO_URL} "${tempPath}"`, {
-            encoding: 'utf-8',
-            stdio: ['pipe', 'pipe', 'pipe'],
-            timeout: 120000, // 2 minute timeout for clone
-            windowsHide: true,
-        });
+        execGitWithoutLocalRepoEnv(`git clone --depth 1 ${REPO_URL} "${tempPath}"`, 120000 // 2 minute timeout for clone
+        );
         // Remove .git directory after clone
         const gitDir = (0, path_1.join)(tempPath, '.git');
         if ((0, fs_1.existsSync)(gitDir)) {

package/dist/src/command-line/add/add.d.ts

@@ -1,3 +1,5 @@
+import { type NxJsonConfiguration } from '../../config/nx-json';
 import type { AddOptions } from './command-object';
 export declare function addHandler(options: AddOptions): Promise<number>;
+export declare function installPackage(pkgName: string, version: string, nxJson: NxJsonConfiguration): Promise<void>;
 export declare const coreNxPluginVersions: Map<string, string>;

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

@@ -2,14 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.coreNxPluginVersions = void 0;
 exports.addHandler = addHandler;
+exports.installPackage = installPackage;
 const child_process_1 = require("child_process");
 const fs_1 = require("fs");
+const path_1 = require("path");
 const nx_json_1 = require("../../config/nx-json");
 const child_process_2 = require("../../utils/child-process");
 const fileutils_1 = require("../../utils/fileutils");
 const logger_1 = require("../../utils/logger");
 const output_1 = require("../../utils/output");
 const package_manager_1 = require("../../utils/package-manager");
+const acknowledge_build_scripts_1 = require("../../utils/acknowledge-build-scripts");
 const handle_errors_1 = require("../../utils/handle-errors");
 const versions_1 = require("../../utils/versions");
 const workspace_root_1 = require("../../utils/workspace-root");
@@ -48,13 +51,19 @@ async function installPackage(pkgName, version, nxJson) {
             : `${pmc.addDev} ${pkgName}@${version}`;
         // pnpm 11+ fails the install when the plugin's own dependency tree
         // carries unacknowledged build scripts, and the plugin's generators can
-        // only record allowBuilds decisions after this install. Warn and skip
-        // for this one install, like pnpm 10 did. pnpm 12 gave `--config` a
-        // meaning of its own and takes the setting from the environment instead.
+        // only record allowBuilds decisions after this install. A plugin that
+        // declares them in its package.json keeps the install strict; otherwise
+        // warn and skip for this one install, like pnpm 10 did. pnpm 12 gave
+        // `--config` a meaning of its own and takes the setting from the
+        // environment instead.
         const env = { ...process.env };
+        let restorePnpmWorkspace;
         if (pm === 'pnpm' && (0, semver_1.gte)(pmv, '11.0.0')) {
-            command += ' --config.strictDepBuilds=false';
-            env.PNPM_CONFIG_STRICT_DEP_BUILDS = 'false';
+            restorePnpmWorkspace = snapshotFile((0, path_1.join)(workspace_root_1.workspaceRoot, 'pnpm-workspace.yaml'));
+            if (!(await (0, acknowledge_build_scripts_1.acknowledgeDeclaredBuildScripts)(workspace_root_1.workspaceRoot, pm, pkgName, version))) {
+                command += ' --config.strictDepBuilds=false';
+                env.PNPM_CONFIG_STRICT_DEP_BUILDS = 'false';
+            }
         }
         await new Promise((resolve) => (0, child_process_1.exec)(command, {
             windowsHide: true,
@@ -70,6 +79,9 @@ async function installPackage(pkgName, version, nxJson) {
                 output_1.output.error({
                     title: `Failed to install ${pkgName}. Please check the error above for more details.`,
                 });
+                // The decisions the plugin declared were recorded for a plugin
+                // that never installed; put the file back.
+                restorePnpmWorkspace?.();
                 process.exit(1);
             }
             return resolve();
@@ -97,6 +109,12 @@ async function installPackage(pkgName, version, nxJson) {
     }
     spinner.succeed();
 }
+function snapshotFile(path) {
+    const before = (0, fs_1.existsSync)(path) ? (0, fs_1.readFileSync)(path, 'utf-8') : null;
+    return () => before === null
+        ? (0, fs_1.rmSync)(path, { force: true })
+        : (0, fs_1.writeFileSync)(path, before);
+}
 async function initializePlugin(pkgName, options, nxJson) {
     let updatePackageScripts = false;
     if (exports.coreNxPluginVersions.has(pkgName) &&
@@ -133,7 +151,7 @@ function parsePackageSpecifier(packageSpecifier) {
     const version = packageSpecifier.substring(i + 1);
     return [pkgName, version];
 }
-exports.coreNxPluginVersions = require(require.resolve('@ohos-ports/nx/package.json'))['nx-migrations'].packageGroup.reduce((map, entry) => {
+exports.coreNxPluginVersions = require(require.resolve('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/affected/affected.js

@@ -30,12 +30,12 @@ async function affected(command, args, extraTargetDependencies = {}, extraOption
     await (0, connect_to_nx_cloud_1.connectToNxCloudIfExplicitlyAsked)(nxArgs);
     // Task selection needs a target to select against, so `nx graph --affected`
     // and the deprecated print-affected stay project-grained.
-    const useTasks = (0, affected_tasks_1.selectsAffectedTasks)() &&
+    const useTasks = (0, affected_tasks_1.selectsAffectedTasks)(nxJson) &&
         command === 'affected' &&
         !!nxArgs.targets?.length;
     if ((0, affected_reasons_1.isExplaining)(nxArgs.explain) && !useTasks) {
         throw new Error((0, affected_reasons_1.explainUnavailable)([
-            !(0, affected_tasks_1.selectsAffectedTasks)() && 'NX_LEGACY_AFFECTED=false',
+            !(0, affected_tasks_1.selectsAffectedTasks)(nxJson) && (0, affected_tasks_1.taskGranularityRequirement)(),
             !nxArgs.targets?.length && 'targets passed with --targets (-t)',
         ].filter(Boolean)));
     }

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('@ohos-ports/nx/src/command-line/configure-ai-agents/configure-ai-agents.js', { paths: [packageInstallResults.tempDir] });
+        let modulePath = require.resolve('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();
@@ -64,18 +64,6 @@ async function configureAiAgentsHandler(args, inner = false) {
     await resetDaemonAgentStatus();
 }
 async function configureAiAgentsHandlerImpl(options) {
-    // Node 24's stricter readline throws ERR_USE_AFTER_CLOSE when a prompt
-    // library operates on a closed interface. Added for enquirer, which nx no
-    // longer uses; verify against Node 24 before removing.
-    // TODO(v24): drop if @clack/prompts proves not to need it.
-    process.on('uncaughtException', (error) => {
-        if (error &&
-            typeof error === 'object' &&
-            'code' in error &&
-            error['code'] === 'ERR_USE_AFTER_CLOSE')
-            return;
-        throw error;
-    });
     const normalizedOptions = normalizeOptions(options);
     const { nonConfiguredAgents, partiallyConfiguredAgents, fullyConfiguredAgents, disabledAgents, } = await (0, utils_1.getAgentConfigurations)(normalizedOptions.agents, workspace_root_1.workspaceRoot);
     if (disabledAgents.length > 0) {

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

@@ -39,6 +39,8 @@ const create_task_hasher_1 = require("../../hasher/create-task-hasher");
 const task_env_1 = require("../../tasks-runner/task-env");
 const error_types_1 = require("../../project-graph/error-types");
 const nx_cloud_utils_1 = require("../../utils/nx-cloud-utils");
+const ci_status_1 = require("../../ultracache/ci-status");
+const utils_2 = require("../show/show-target/utils");
 const split_target_1 = require("../../utils/split-target");
 // maps file extention to MIME types
 const mimeType = {
@@ -372,11 +374,9 @@ async function generateGraph(args, affectedProjects) {
             title: `Project graph started at ${url.toString()}`,
         });
         if (args.open) {
-            new Function('return import("open")')()
-                .then((m) => m.default(url.toString()))
-                .catch(() => {
-                // Ignore errors when opening browser (e.g. no browser available)
-            });
+            // Best-effort: openUrl never throws, returning false if no opener could be
+            // spawned. The URL is printed above, so a failure is silent.
+            (0, native_1.openUrl)(url.toString());
         }
         return new Promise((res) => {
             app.once('close', res);
@@ -614,7 +614,7 @@ function createProjectGraphListener() {
                     fileName: e.file ?? e.cause?.errors?.[0]?.location?.file,
                 }));
             }
-            const { projectGraphClientResponse, sourceMapResponse } = transformProjectGraphToClientResponse(projectGraph, sourceMaps, errors, currentProjectGraphClientResponse.affected, isFilteredGraph ? currentProjectGraphClientResponse.focus : null, isFilteredGraph ? currentProjectGraphClientResponse.exclude : []);
+            const { projectGraphClientResponse, sourceMapResponse } = transformProjectGraphToClientResponse(projectGraph, sourceMaps, errors, currentProjectGraphClientResponse.affected, isFilteredGraph ? currentProjectGraphClientResponse.focus : null, isFilteredGraph ? currentProjectGraphClientResponse.exclude : [], await (0, ci_status_1.isUltracacheOnInCI)((0, configuration_1.readNxJson)()));
             if (projectGraphClientResponse.hash !==
                 currentProjectGraphClientResponse.hash &&
                 sourceMapResponse) {
@@ -643,14 +643,41 @@ function createProjectGraphListener() {
         }
     }, 500));
 }
-function transformProjectGraphToClientResponse(projectGraph, sourceMaps, errors, affected = [], focus = null, exclude = []) {
+/** The graph's nodes, with `ultracacheInCI` set to each target's Ultracache mode in CI. */
+function markTargetsHashedFromUltracacheInCI(graph) {
+    return Object.values(graph.nodes).map((node) => {
+        const targets = Object.entries(node.data.targets ?? {});
+        const modes = new Map(targets.flatMap(([name, target]) => {
+            const mode = (0, ci_status_1.ultracacheModeInCI)(target, (0, utils_2.hasCustomHasher)(node.name, name, graph));
+            return mode ? [[name, mode]] : [];
+        }));
+        if (!modes.size) {
+            return node;
+        }
+        return {
+            ...node,
+            data: {
+                ...node.data,
+                targets: Object.fromEntries(targets.map(([name, target]) => [
+                    name,
+                    modes.has(name)
+                        ? { ...target, ultracacheInCI: modes.get(name) }
+                        : target,
+                ])),
+            },
+        };
+    });
+}
+function transformProjectGraphToClientResponse(projectGraph, sourceMaps, errors, affected = [], focus = null, exclude = [], ultracacheOnInCI = false) {
     node_perf_hooks_1.performance.mark('project graph transform:start');
     let graph = (0, operators_1.pruneExternalNodes)(projectGraph);
     // Apply focus and exclude filters
     graph = filterGraph(graph, focus, exclude);
     const fileMap = (0, nx_deps_cache_1.readFileMapCache)()?.fileMap.projectFileMap || {};
     const layout = (0, configuration_1.workspaceLayout)();
-    const projects = Object.values(graph.nodes);
+    const projects = ultracacheOnInCI
+        ? markTargetsHashedFromUltracacheInCI(graph)
+        : Object.values(graph.nodes);
     const dependencies = graph.dependencies;
     const nxJson = (0, configuration_1.readNxJson)();
     const connectedToCloud = (0, nx_cloud_utils_1.isNxCloudUsed)(nxJson);
@@ -713,7 +740,7 @@ async function createProjectGraphAndSourceMapClientResponse(affected = [], focus
     }
     node_perf_hooks_1.performance.mark('project graph watch calculation:end');
     node_perf_hooks_1.performance.mark('project graph response generation:start');
-    let { projectGraphClientResponse, sourceMapResponse } = transformProjectGraphToClientResponse(projectGraph, sourceMaps, errors, affected, focus, exclude);
+    let { projectGraphClientResponse, sourceMapResponse } = transformProjectGraphToClientResponse(projectGraph, sourceMaps, errors, affected, focus, exclude, await (0, ci_status_1.isUltracacheOnInCI)((0, configuration_1.readNxJson)()));
     node_perf_hooks_1.performance.mark('project graph response generation:end');
     node_perf_hooks_1.performance.measure('project graph watch calculation', 'project graph watch calculation:start', 'project graph watch calculation:end');
     node_perf_hooks_1.performance.measure('project graph response generation', 'project graph response generation:start', 'project graph response generation:end');
@@ -969,7 +996,8 @@ function expandInputs(inputs, project, allWorkspaceFiles, depGraphClientResponse
         }
     });
     const workspaceRootsExpanded = getExpandedWorkspaceRoots(workspaceRootInputs, allWorkspaceFiles);
-    const filesExpanded = filesInputs.flatMap((globs) => (0, native_1.expandFilesInput)(workspace_root_1.workspaceRoot, globs));
+    const projectRoots = depGraphClientResponse.projects.map((p) => p.data.root);
+    const filesExpanded = filesInputs.flatMap((globs) => (0, native_1.expandFilesInput)(workspace_root_1.workspaceRoot, globs, projectRoots));
     const otherInputsExpanded = otherInputs.map((input) => {
         if (input === 'TsConfig') {
             return (0, node_path_1.relative)(workspace_root_1.workspaceRoot, (0, typescript_1.getRootTsConfigPath)());

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

@@ -17,18 +17,6 @@ exports.yargsInitCommand = {
         return withInitOptions(yargs);
     },
     handler: async (args) => {
-        // Node 24's stricter readline throws ERR_USE_AFTER_CLOSE when a prompt
-        // library operates on a closed interface. Added for enquirer, which nx no
-        // longer uses; verify against Node 24 before removing.
-        // TODO(v24): drop if @clack/prompts proves not to need it.
-        process.on('uncaughtException', (error) => {
-            if (error &&
-                typeof error === 'object' &&
-                'code' in error &&
-                error['code'] === 'ERR_USE_AFTER_CLOSE')
-                return;
-            throw error;
-        });
         const useV2 = await isInitV2();
         if (useV2) {
             await require('./init-v2').initHandler(args);

package/dist/src/command-line/init/implementation/add-nx-to-nest.js

@@ -120,61 +120,28 @@ function createProjectJson(repoRoot, packageJson, nestCLIOptions) {
                 buildTarget: `${packageName}:build`,
             },
         };
-        if (nestCLIOptions.webpackOptions) {
-            json.targets['build'] = {
-                executor: '@nx/webpack:webpack',
-                outputs: ['{options.outputPath}'],
-                options: {
-                    target: 'node',
-                    compiler: 'tsc',
-                    outputPath: `dist/${packageName}`,
-                    main: (0, path_1.join)(nestCLIOptions.sourceRoot, nestCLIOptions.entryFile),
-                    tsConfig: 'tsconfig.build.json',
-                },
-                configurations: {
-                    production: {
-                        optimization: true,
-                        extractLicenses: true,
-                        inspect: false,
-                    },
-                },
-            };
-            json.targets['serve'] = {
-                ...json.targets['serve'],
-                configurations: {
-                    production: {
-                        buildTarget: `${packageName}:build:production`,
-                    },
-                },
-            };
-        }
-        else {
-            json.targets['build'] = {
-                executor: '@nx/js:tsc',
-                outputs: ['{options.outputPath}'],
-                options: {
-                    outputPath: `dist/${packageName}`,
-                    main: (0, path_1.join)(nestCLIOptions.sourceRoot, nestCLIOptions.entryFile),
-                    tsConfig: 'tsconfig.build.json',
-                },
-            };
-            json.targets['serve'] = {
-                ...json.targets['serve'],
-                configurations: {
-                    debug: {
-                        inspect: 'inspect',
-                    },
+        json.targets['build'] = {
+            executor: '@nx/js:tsc',
+            outputs: ['{options.outputPath}'],
+            options: {
+                outputPath: `dist/${packageName}`,
+                main: (0, path_1.join)(nestCLIOptions.sourceRoot, nestCLIOptions.entryFile),
+                tsConfig: 'tsconfig.build.json',
+            },
+        };
+        json.targets['serve'] = {
+            ...json.targets['serve'],
+            configurations: {
+                debug: {
+                    inspect: 'inspect',
                 },
-            };
-            // if we're using nrwl/js, then we add nrwl/js analyzeSourceFiles to nx.json
-            addNrwlJsPluginsConfig(repoRoot);
-        }
+            },
+        };
+        // if we're using nrwl/js, then we add nrwl/js analyzeSourceFiles to nx.json
+        addNrwlJsPluginsConfig(repoRoot);
         // lint
         json.targets['lint'] = {
-            executor: '@nx/eslint:lint',
-            options: {
-                lintFilePatterns: ['./src', './test'],
-            },
+            command: 'eslint ./src ./test',
         };
         // test and e2e
         addJestTargets(repoRoot, packageName, json, packageJson);
@@ -236,19 +203,11 @@ function addJestTargets(repoRoot, packageName, projectJson, packageJson) {
     (0, node_fs_1.writeFileSync)(e2eTestConfigPath, `export default ${JSON.stringify(e2eTestOptions, null, 2)}`, 'utf8');
     (0, format_1.recordInitWrite)(e2eTestConfigPath);
     projectJson.targets['test'] = {
-        executor: '@nx/jest:jest',
+        command: `jest --config ${unitTestConfigPath} --passWithNoTests`,
         outputs: [`{workspaceRoot}/coverage/${packageName}`],
-        options: {
-            passWithNoTests: true,
-            jestConfig: unitTestConfigPath,
-        },
     };
     projectJson.targets['e2e'] = {
-        executor: '@nx/jest:jest',
-        options: {
-            passWithNoTests: true,
-            jestConfig: e2eTestConfigPath,
-        },
+        command: `jest --config ${e2eTestConfigPath} --passWithNoTests`,
     };
     // remove jest options from package.json
     delete packageJson['jest'];

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('@ohos-ports/nx/src/command-line/init/init-v2.js', {
+        let modulePath = require.resolve('nx/src/command-line/init/init-v2.js', {
             paths: [packageInstallResults.tempDir],
         });
         const module = await (0, handle_import_1.handleImport)(modulePath);
@@ -442,7 +442,6 @@ function getPluginReason(plugin) {
         '@nx/next': 'next.js detected in dependencies',
         '@nx/nuxt': 'nuxt detected in dependencies',
         '@nx/react-native': 'react-native detected in dependencies',
-        '@nx/remix': '@remix-run/dev detected in dependencies',
         '@nx/rsbuild': '@rsbuild/core detected in dependencies',
         '@nx/react': '@react-router/dev detected in dependencies',
         '@nx/gradle': 'gradlew detected in workspace',
@@ -493,7 +492,6 @@ const npmPackageToPluginMap = {
     next: '@nx/next',
     nuxt: '@nx/nuxt',
     'react-native': '@nx/react-native',
-    '@remix-run/dev': '@nx/remix',
     '@rsbuild/core': '@nx/rsbuild',
     '@react-router/dev': '@nx/react',
 };

package/dist/src/command-line/migrate/agentic/close-agent-session.d.ts

@@ -18,4 +18,4 @@ export declare function waitForExit(child: ChildProcess): Promise<ExitInfo>;
  * orphan the agent. `taskkill` failures are swallowed.
  */
 export declare function closeAgentSession(child: ChildProcess, exitPromise: Promise<ExitInfo>, gracefulExitMs: number, forceKillWaitMs: number): Promise<void>;
-export declare function raceWithTimeout(promise: Promise<unknown>, timeoutMs: number): Promise<void>;
+export declare function raceWithTimeout(promise: Promise<unknown>, timeoutMs: number): Promise<boolean>;

package/dist/src/command-line/migrate/agentic/close-agent-session.js

@@ -109,13 +109,14 @@ async function forceKillWindowsTree(child, exitPromise, forceKillWaitMs) {
     }
     await raceWithTimeout(exitPromise, forceKillWaitMs);
 }
+// True when `promise` resolves before the timeout.
 async function raceWithTimeout(promise, timeoutMs) {
     let timer;
     try {
-        await Promise.race([
-            promise,
+        return await Promise.race([
+            promise.then(() => true),
             new Promise((resolve) => {
-                timer = setTimeout(resolve, timeoutMs);
+                timer = setTimeout(() => resolve(false), timeoutMs);
             }),
         ]);
     }

package/dist/src/command-line/migrate/agentic/definitions.d.ts

@@ -1,4 +1,4 @@
-import { AgentDefinition, AgentId } from './types';
+import { AgentDefinition } from './types';
 /**
  * Pre-authorizes the handoff write. Claude Code's default permission mode
  * asks before a file write it has no allow rule for, so without this every
@@ -24,7 +24,5 @@ export declare const claudeCodeDefinition: AgentDefinition;
  * back before it reaches the command line.
  */
 export declare function encodeTomlString(value: string): string;
-export declare const codexDefinition: AgentDefinition;
 export declare const opencodeDefinition: AgentDefinition;
 export declare const AGENT_DEFINITIONS: readonly AgentDefinition[];
-export declare function getAgentDefinition(id: AgentId): AgentDefinition | undefined;