@nx/web 23.0.0-pr.35413.460eeef → 23.0.0-rc.0

package/dist/babel.d.ts

@@ -0,0 +1 @@
+export {};

package/{babel.js → dist/babel.js}

@@ -1,3 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 const nxJsBabelPreset = require('@nx/js/babel');
 /** @deprecated Use `@nx/js/babel`. */
 module.exports = function (api, options = {}) {

package/{index.d.ts → dist/index.d.ts}

@@ -1,4 +1,3 @@
 export { webInitGenerator } from './src/generators/init/init';
 export { applicationGenerator } from './src/generators/application/application';
 export { webStaticServeGenerator } from './src/generators/static-serve/static-serve-configuration';
-//# sourceMappingURL=index.d.ts.map

package/dist/internal.d.ts

@@ -0,0 +1,2 @@
+export { waitForPortOpen } from './src/utils/wait-for-port-open';
+export { default as fileServerExecutor } from './src/executors/file-server/file-server.impl';

package/dist/internal.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fileServerExecutor = exports.waitForPortOpen = void 0;
+const tslib_1 = require("tslib");
+// Curated internal API surface for other first-party Nx plugins (e.g. @nx/react,
+// @nx/angular, @nx/rspack, @nx/next, @nx/remix, @nx/module-federation). Prefer
+// this over deep `@nx/web/src/*` imports — those are not part of the public API.
+var wait_for_port_open_1 = require("./src/utils/wait-for-port-open");
+Object.defineProperty(exports, "waitForPortOpen", { enumerable: true, get: function () { return wait_for_port_open_1.waitForPortOpen; } });
+var file_server_impl_1 = require("./src/executors/file-server/file-server.impl");
+Object.defineProperty(exports, "fileServerExecutor", { enumerable: true, get: function () { return tslib_1.__importDefault(file_server_impl_1).default; } });

package/{src → dist/src}/executors/file-server/compat.d.ts

@@ -1,3 +1,2 @@
 declare const _default: any;
 export default _default;
-//# sourceMappingURL=compat.d.ts.map

package/{src → dist/src}/executors/file-server/file-server.impl.d.ts

@@ -6,4 +6,3 @@ export default function fileServerExecutor(options: Schema, context: ExecutorCon
 }, {
     success: boolean;
 }, unknown>;
-//# sourceMappingURL=file-server.impl.d.ts.map

package/{src → dist/src}/executors/file-server/file-server.impl.js

@@ -12,7 +12,8 @@ const path_1 = require("path");
 const package_json_1 = require("nx/src/utils/package-json");
 const client_1 = require("nx/src/daemon/client/client");
 const utils_1 = require("nx/src/tasks-runner/utils");
-const detectPort = require('detect-port');
+const internal_2 = require("@nx/js/internal");
+const detect_port_1 = tslib_1.__importDefault(require("detect-port"));
 // platform specific command name
 const pmCmd = (0, os_1.platform)() === 'win32' ? `npx.cmd` : 'npx';
 function getHttpServerArgs(options) {
@@ -80,11 +81,13 @@ function getBuildTargetOutputPath(options, context) {
             const project = context.projectGraph.nodes[context.projectName];
             const buildTarget = project.data.targets[target.target];
             outputPath = buildTarget.outputs?.[0];
-            if (outputPath)
+            if (outputPath) {
                 outputPath = (0, utils_1.interpolate)(outputPath, {
                     projectName: project.data.name,
                     projectRoot: project.data.root,
                 });
+                outputPath = (0, internal_2.stripGlobToBaseDir)(outputPath);
+            }
         }
     }
     catch (e) {
@@ -99,7 +102,7 @@ function createFileWatcher(project, changeHandler) {
     return client_1.daemonClient.registerFileWatcher({
         watchProjects: project ? [project] : 'all',
         includeGlobalWorkspaceFiles: true,
-        includeDependentProjects: true,
+        includeDependencies: true,
     }, async (error, val) => {
         if (error === 'reconnecting') {
             // Silent - daemon restarts automatically on lockfile changes
@@ -167,7 +170,7 @@ async function* fileServerExecutor(options, context) {
         // perform initial run
         run();
     }
-    const port = await detectPort(options.port || 8080);
+    const port = await (0, detect_port_1.default)(options.port || 8080);
     const outputPath = getBuildTargetOutputPath(options, context);
     if (options.spa) {
         const src = (0, path_1.join)(outputPath, 'index.html');

package/{src → dist/src}/generators/application/application.d.ts

@@ -3,4 +3,3 @@ import { Schema } from './schema';
 export declare function applicationGenerator(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export declare function applicationGeneratorInternal(host: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default applicationGenerator;
-//# sourceMappingURL=application.d.ts.map

package/{src → dist/src}/generators/application/application.js

@@ -3,19 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.applicationGenerator = applicationGenerator;
 exports.applicationGeneratorInternal = applicationGeneratorInternal;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const project_name_and_root_utils_1 = require("@nx/devkit/src/generators/project-name-and-root-utils");
 const js_1 = require("@nx/js");
-const versions_1 = require("@nx/js/src/utils/versions");
+const internal_2 = require("@nx/js/internal");
 const path_1 = require("path");
-const versions_2 = require("../../utils/versions");
+const versions_1 = require("../../utils/versions");
 const init_1 = require("../init/init");
-const get_npm_scope_1 = require("@nx/js/src/utils/package-json/get-npm-scope");
 const has_webpack_plugin_1 = require("../../utils/has-webpack-plugin");
-const target_defaults_utils_1 = require("@nx/devkit/src/generators/target-defaults-utils");
-const log_show_project_command_1 = require("@nx/devkit/src/utils/log-show-project-command");
 const static_serve_configuration_1 = tslib_1.__importDefault(require("../static-serve/static-serve-configuration"));
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function createApplicationFiles(tree, options) {
     const rootTsConfigPath = (0, js_1.getRelativePathToRootTsConfig)(tree, options.appProjectRoot);
     if (options.bundler === 'vite') {
@@ -87,7 +83,7 @@ async function setupBundler(tree, options) {
         (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/assets'),
     ];
     if (options.bundler === 'webpack') {
-        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/webpack', versions_2.nxVersion);
+        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/webpack', versions_1.nxVersion);
         await configurationGenerator(tree, {
             target: 'web',
             project: options.projectName,
@@ -132,7 +128,7 @@ async function setupBundler(tree, options) {
     }
     else if (options.bundler === 'none') {
         const project = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
-        (0, target_defaults_utils_1.addBuildTargetDefaults)(tree, `@nx/js:${options.compiler}`);
+        (0, internal_1.addBuildTargetDefaults)(tree, `@nx/js:${options.compiler}`);
         project.targets ??= {};
         project.targets.build = {
             executor: `@nx/js:${options.compiler}`,
@@ -198,7 +194,7 @@ async function applicationGenerator(host, schema) {
 async function applicationGeneratorInternal(host, schema) {
     const options = await normalizeOptions(host, schema);
     if (options.isUsingTsSolutionConfig) {
-        await (0, ts_solution_setup_1.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
+        await (0, internal_2.addProjectToTsSolutionWorkspace)(host, options.appProjectRoot);
     }
     const tasks = [];
     const jsInitTask = await (0, js_1.initGenerator)(host, {
@@ -218,7 +214,7 @@ async function applicationGeneratorInternal(host, schema) {
     }
     createApplicationFiles(host, options);
     if (options.linter === 'eslint') {
-        const { lintProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/eslint', versions_2.nxVersion);
+        const { lintProjectGenerator } = (0, devkit_1.ensurePackage)('@nx/eslint', versions_1.nxVersion);
         const lintTask = await lintProjectGenerator(host, {
             linter: options.linter,
             project: options.projectName,
@@ -233,12 +229,14 @@ async function applicationGeneratorInternal(host, schema) {
         tasks.push(lintTask);
         // Add out-tsc ignore pattern when using TS solution setup
         if (options.isUsingTsSolutionConfig) {
-            const { addIgnoresToLintConfig } = await Promise.resolve().then(() => tslib_1.__importStar(require('@nx/eslint/src/generators/utils/eslint-file')));
+            // CommonJS `require` instead of dynamic ESM `import` — `ensurePackage`
+            // exposes the temp install via `Module._initPaths`, which ESM ignores.
+            const { addIgnoresToLintConfig, } = require('@nx/eslint/internal');
             addIgnoresToLintConfig(host, options.appProjectRoot, ['**/out-tsc']);
         }
     }
     if (options.bundler === 'vite') {
-        const { viteConfigurationGenerator, createOrEditViteConfig } = (0, devkit_1.ensurePackage)('@nx/vite', versions_2.nxVersion);
+        const { viteConfigurationGenerator, createOrEditViteConfig } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
         // We recommend users use `import.meta.env.MODE` and other variables in their code to differentiate between production and development.
         // See: https://vite.dev/guide/env-and-mode.html
         if (host.exists((0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/environments'))) {
@@ -263,9 +261,11 @@ async function applicationGeneratorInternal(host, schema) {
         }, false);
     }
     if (options.bundler !== 'vite' && options.unitTestRunner === 'vitest') {
-        const { createOrEditViteConfig } = (0, devkit_1.ensurePackage)('@nx/vite', versions_2.nxVersion);
-        (0, devkit_1.ensurePackage)('@nx/vitest', versions_2.nxVersion);
-        const { configurationGenerator } = await Promise.resolve().then(() => tslib_1.__importStar(require('@nx/vitest/generators')));
+        const { createOrEditViteConfig } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
+        (0, devkit_1.ensurePackage)('@nx/vitest', versions_1.nxVersion);
+        // CommonJS `require` instead of dynamic ESM `import` — `ensurePackage`
+        // exposes the temp install via `Module._initPaths`, which ESM ignores.
+        const { configurationGenerator, } = require('@nx/vitest/generators');
         const vitestTask = await configurationGenerator(host, {
             uiFramework: 'none',
             project: options.projectName,
@@ -312,15 +312,15 @@ async function applicationGeneratorInternal(host, schema) {
         e2eDevServerTarget: `${options.projectName}:serve`,
     };
     if (options.bundler === 'webpack') {
-        const { getWebpackE2EWebServerInfo } = (0, devkit_1.ensurePackage)('@nx/webpack', versions_2.nxVersion);
+        const { getWebpackE2EWebServerInfo } = (0, devkit_1.ensurePackage)('@nx/webpack', versions_1.nxVersion);
         e2eWebServerInfo = await getWebpackE2EWebServerInfo(host, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `webpack.config.js`), options.addPlugin, 4200);
     }
     else if (options.bundler === 'vite') {
-        const { getViteE2EWebServerInfo } = (0, devkit_1.ensurePackage)('@nx/vite', versions_2.nxVersion);
+        const { getViteE2EWebServerInfo } = (0, devkit_1.ensurePackage)('@nx/vite', versions_1.nxVersion);
         e2eWebServerInfo = await getViteE2EWebServerInfo(host, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `vite.config.ts`), options.addPlugin, 4200);
     }
     if (options.e2eTestRunner === 'cypress') {
-        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_2.nxVersion);
+        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);
         const packageJson = {
             name: options.e2eProjectName,
             version: '0.0.1',
@@ -361,7 +361,7 @@ async function applicationGeneratorInternal(host, schema) {
         tasks.push(cypressTask);
     }
     else if (options.e2eTestRunner === 'playwright') {
-        const { configurationGenerator: playwrightConfigGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_2.nxVersion);
+        const { configurationGenerator: playwrightConfigGenerator } = (0, devkit_1.ensurePackage)('@nx/playwright', versions_1.nxVersion);
         const packageJson = {
             name: options.e2eProjectName,
             version: '0.0.1',
@@ -400,7 +400,7 @@ async function applicationGeneratorInternal(host, schema) {
         tasks.push(playwrightTask);
     }
     if (options.unitTestRunner === 'jest') {
-        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_2.nxVersion);
+        const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_1.nxVersion);
         const jestTask = await configurationGenerator(host, {
             project: options.projectName,
             skipSerializers: true,
@@ -420,7 +420,7 @@ async function applicationGeneratorInternal(host, schema) {
                 target: 'es2016',
             },
         });
-        const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, {}, { '@swc/core': versions_1.swcCoreVersion, 'swc-loader': versions_2.swcLoaderVersion });
+        const installTask = (0, devkit_1.addDependenciesToPackageJson)(host, {}, { '@swc/core': internal_2.swcCoreVersion, 'swc-loader': versions_1.swcLoaderVersion });
         tasks.push(installTask);
     }
     else {
@@ -429,8 +429,8 @@ async function applicationGeneratorInternal(host, schema) {
         });
     }
     setDefaults(host, options);
-    tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, { tslib: versions_2.tsLibVersion }, { '@types/node': versions_2.typesNodeVersion }));
-    (0, ts_solution_setup_1.updateTsconfigFiles)(host, options.appProjectRoot, 'tsconfig.app.json', {
+    tasks.push((0, devkit_1.addDependenciesToPackageJson)(host, { tslib: versions_1.tsLibVersion }, { '@types/node': versions_1.typesNodeVersion }));
+    (0, internal_2.updateTsconfigFiles)(host, options.appProjectRoot, 'tsconfig.app.json', {
         module: 'esnext',
         moduleResolution: 'bundler',
     }, options.linter === 'eslint'
@@ -440,13 +440,13 @@ async function applicationGeneratorInternal(host, schema) {
         await (0, devkit_1.formatFiles)(host);
     }
     tasks.push(() => {
-        (0, log_show_project_command_1.logShowProjectCommand)(options.projectName);
+        (0, internal_1.logShowProjectCommand)(options.projectName);
     });
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 async function normalizeOptions(host, options) {
-    await (0, project_name_and_root_utils_1.ensureRootProjectName)(options, 'application');
-    const { projectName, projectRoot: appProjectRoot, importPath, } = await (0, project_name_and_root_utils_1.determineProjectNameAndRootOptions)(host, {
+    await (0, internal_1.ensureRootProjectName)(options, 'application');
+    const { projectName, projectRoot: appProjectRoot, importPath, } = await (0, internal_1.determineProjectNameAndRootOptions)(host, {
         name: options.name,
         projectType: 'application',
         directory: options.directory,
@@ -455,11 +455,11 @@ async function normalizeOptions(host, options) {
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPluginDefault;
-    const isUsingTsSolutionConfig = (0, ts_solution_setup_1.isUsingTsSolutionSetup)(host);
+    const isUsingTsSolutionConfig = (0, internal_2.isUsingTsSolutionSetup)(host);
     const appProjectName = !isUsingTsSolutionConfig || options.name ? projectName : importPath;
     const e2eProjectName = `${appProjectName}-e2e`;
     const e2eProjectRoot = `${appProjectRoot}-e2e`;
-    const npmScope = (0, get_npm_scope_1.getNpmScope)(host);
+    const npmScope = (0, internal_2.getNpmScope)(host);
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
         : [];

package/{src → dist/src}/generators/application/schema.json

@@ -25,6 +25,7 @@
       "description": "The file extension to be used for style files.",
       "type": "string",
       "default": "css",
+      "enum": ["css", "scss"],
       "x-prompt": {
         "message": "Which stylesheet format would you like to use?",
         "type": "list",
@@ -35,11 +36,7 @@
           },
           {
             "value": "scss",
-            "label": "SASS(.scss)  [ https://sass-lang.com   ]"
-          },
-          {
-            "value": "less",
-            "label": "LESS         [ https://lesscss.org     ]"
+            "label": "SASS(.scss)  [ https://sass-lang.com ]"
           }
         ]
       }

package/{src → dist/src}/generators/init/init.d.ts

@@ -2,4 +2,3 @@ import { GeneratorCallback, Tree } from '@nx/devkit';
 import { Schema } from './schema';
 export declare function webInitGenerator(tree: Tree, schema: Schema): Promise<GeneratorCallback>;
 export default webInitGenerator;
-//# sourceMappingURL=init.d.ts.map

package/{src → dist/src}/generators/static-serve/static-serve-configuration.d.ts

@@ -7,4 +7,3 @@ interface WebStaticServeSchema {
 }
 export declare function webStaticServeGenerator(tree: Tree, options: WebStaticServeSchema): Promise<void>;
 export default webStaticServeGenerator;
-//# sourceMappingURL=static-serve-configuration.d.ts.map

package/dist/src/migrations/update-23-0-0/rewrite-internal-subpath-imports.d.ts

@@ -0,0 +1,3 @@
+import { type Tree } from '@nx/devkit';
+export default function rewriteInternalSubpathImports(tree: Tree): Promise<void>;
+export declare function rewriteSubpathImports(source: string): string;

package/dist/src/migrations/update-23-0-0/rewrite-internal-subpath-imports.js

@@ -0,0 +1,197 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = rewriteInternalSubpathImports;
+exports.rewriteSubpathImports = rewriteSubpathImports;
+const devkit_1 = require("@nx/devkit");
+const TS_EXTENSIONS = ['.ts', '.tsx', '.cts', '.mts'];
+const FROM_PREFIX = '@nx/web/src/';
+const TO_PUBLIC = '@nx/web';
+const TO_INTERNAL = '@nx/web/internal';
+// Symbols exported from `@nx/web`'s public entry (packages/web/index.ts).
+// A named import/export of one of these from `@nx/web/src/*` is routed to
+// the public `@nx/web` entry; everything else goes to `@nx/web/internal`.
+const PUBLIC_SYMBOLS = new Set([
+    'applicationGenerator',
+    'webInitGenerator',
+    'webStaticServeGenerator',
+]);
+// Methods on `jest` and `vi` that take a module specifier as their first arg.
+const MOCK_HELPER_METHODS = new Set([
+    'mock',
+    'unmock',
+    'doMock',
+    'dontMock',
+    'requireActual',
+    'requireMock',
+    'importActual',
+    'importMock',
+]);
+let ts;
+async function rewriteInternalSubpathImports(tree) {
+    let touchedCount = 0;
+    (0, devkit_1.visitNotIgnoredFiles)(tree, '.', (filePath) => {
+        if (!TS_EXTENSIONS.some((ext) => filePath.endsWith(ext))) {
+            return;
+        }
+        const original = tree.read(filePath, 'utf-8');
+        if (!original || !original.includes(FROM_PREFIX)) {
+            return;
+        }
+        const updated = rewriteSubpathImports(original);
+        if (updated !== original) {
+            tree.write(filePath, updated);
+            touchedCount += 1;
+        }
+    });
+    if (touchedCount > 0) {
+        devkit_1.logger.info(`Rewrote @nx/web/src/* imports in ${touchedCount} file(s) ` +
+            `(public symbols to @nx/web, internals to @nx/web/internal).`);
+    }
+    await (0, devkit_1.formatFiles)(tree);
+}
+function rewriteSubpathImports(source) {
+    ts ??= (0, devkit_1.ensurePackage)('typescript', '*');
+    const sourceFile = ts.createSourceFile('tmp.ts', source, ts.ScriptTarget.Latest, 
+    /* setParentNodes */ true, ts.ScriptKind.TSX);
+    const changes = [];
+    for (const stmt of sourceFile.statements) {
+        if (ts.isImportDeclaration(stmt)) {
+            collectImportRewrite(sourceFile, stmt, changes);
+        }
+        else if (ts.isExportDeclaration(stmt)) {
+            collectExportRewrite(sourceFile, stmt, changes);
+        }
+    }
+    collectCallExpressionRewrites(sourceFile, changes);
+    return changes.length > 0 ? (0, devkit_1.applyChangesToString)(source, changes) : source;
+}
+function isSubpathSpecifier(node) {
+    return ts.isStringLiteral(node) && node.text.startsWith(FROM_PREFIX);
+}
+function collectImportRewrite(sourceFile, stmt, changes) {
+    if (!isSubpathSpecifier(stmt.moduleSpecifier)) {
+        return;
+    }
+    const clause = stmt.importClause;
+    // Pure named imports (`import { a, b } from '...'`) can be split by symbol.
+    // A default or namespace import grabs the whole module, so it can't be
+    // split — route it wholesale to the internal entry.
+    if (clause &&
+        !clause.name &&
+        clause.namedBindings &&
+        ts.isNamedImports(clause.namedBindings)) {
+        rewriteNamedDeclaration(sourceFile, stmt, stmt.moduleSpecifier, clause.isTypeOnly, clause.namedBindings.elements, 'import', changes);
+        return;
+    }
+    replaceSpecifier(sourceFile, stmt.moduleSpecifier, TO_INTERNAL, changes);
+}
+function collectExportRewrite(sourceFile, stmt, changes) {
+    if (!stmt.moduleSpecifier || !isSubpathSpecifier(stmt.moduleSpecifier)) {
+        return;
+    }
+    // `export { a, b } from '...'` can be split; `export * from '...'` cannot.
+    if (stmt.exportClause && ts.isNamedExports(stmt.exportClause)) {
+        rewriteNamedDeclaration(sourceFile, stmt, stmt.moduleSpecifier, stmt.isTypeOnly, stmt.exportClause.elements, 'export', changes);
+        return;
+    }
+    replaceSpecifier(sourceFile, stmt.moduleSpecifier, TO_INTERNAL, changes);
+}
+/**
+ * Partition the named bindings of an import/export declaration into the ones
+ * that resolve to `@nx/web`'s public entry and the ones that don't. If both
+ * groups are non-empty, the single declaration is split into two.
+ */
+function rewriteNamedDeclaration(sourceFile, decl, specifier, isTypeOnly, elements, keyword, changes) {
+    const publicEls = [];
+    const internalEls = [];
+    for (const el of elements) {
+        // `propertyName` is the original name in `orig as alias`; fall back to
+        // `name` for the plain `orig` form.
+        const importedName = (el.propertyName ?? el.name).text;
+        (PUBLIC_SYMBOLS.has(importedName) ? publicEls : internalEls).push(el);
+    }
+    if (publicEls.length === 0) {
+        replaceSpecifier(sourceFile, specifier, TO_INTERNAL, changes);
+        return;
+    }
+    if (internalEls.length === 0) {
+        replaceSpecifier(sourceFile, specifier, TO_PUBLIC, changes);
+        return;
+    }
+    // Mixed — replace the whole declaration with one statement per target.
+    const quote = sourceFile.text.charAt(specifier.getStart(sourceFile));
+    const start = decl.getStart(sourceFile);
+    const end = decl.getEnd();
+    const semicolon = sourceFile.text.charAt(end - 1) === ';' ? ';' : '';
+    const prefix = isTypeOnly ? `${keyword} type` : keyword;
+    const render = (els, target) => `${prefix} { ${els
+        .map((el) => el.getText(sourceFile))
+        .join(', ')} } from ${quote}${target}${quote}${semicolon}`;
+    changes.push({ type: devkit_1.ChangeType.Delete, start, length: end - start }, {
+        type: devkit_1.ChangeType.Insert,
+        index: start,
+        text: `${render(publicEls, TO_PUBLIC)}\n${render(internalEls, TO_INTERNAL)}`,
+    });
+}
+function collectCallExpressionRewrites(sourceFile, changes) {
+    const visit = (node) => {
+        if (ts.isCallExpression(node) &&
+            shouldRewriteCallExpression(node) &&
+            node.arguments.length >= 1 &&
+            isSubpathSpecifier(node.arguments[0])) {
+            // `require(...)`, dynamic `import(...)` and `jest.mock(...)` reference
+            // the module as a whole and can't be symbol-split, so they go to the
+            // internal entry.
+            replaceSpecifier(sourceFile, node.arguments[0], TO_INTERNAL, changes);
+        }
+        else if (ts.isImportTypeNode(node)) {
+            // `typeof import('...')` parses as an `ImportTypeNode`, not a
+            // CallExpression — its argument is `LiteralTypeNode<StringLiteral>`.
+            // The whole module is referenced, so it can't be symbol-split.
+            const literal = getImportTypeStringLiteral(node);
+            if (literal && literal.text.startsWith(FROM_PREFIX)) {
+                replaceSpecifier(sourceFile, literal, TO_INTERNAL, changes);
+            }
+        }
+        ts.forEachChild(node, visit);
+    };
+    visit(sourceFile);
+}
+function getImportTypeStringLiteral(node) {
+    const arg = node.argument;
+    if (arg && ts.isLiteralTypeNode(arg) && ts.isStringLiteral(arg.literal)) {
+        return arg.literal;
+    }
+    return undefined;
+}
+function shouldRewriteCallExpression(call) {
+    const callee = call.expression;
+    // `require('...')`
+    if (ts.isIdentifier(callee) && callee.text === 'require')
+        return true;
+    // dynamic `import('...')` (runtime form parses as a CallExpression whose
+    // callee is the `import` keyword). The `typeof import('...')` type-position
+    // form is an `ImportTypeNode` (handled in `collectCallExpressionRewrites`).
+    if (callee.kind === ts.SyntaxKind.ImportKeyword)
+        return true;
+    // `jest.mock(...)` / `vi.mock(...)` and friends.
+    if (ts.isPropertyAccessExpression(callee)) {
+        const obj = callee.expression;
+        if (ts.isIdentifier(obj) &&
+            (obj.text === 'jest' || obj.text === 'vi') &&
+            MOCK_HELPER_METHODS.has(callee.name.text)) {
+            return true;
+        }
+    }
+    return false;
+}
+function replaceSpecifier(sourceFile, literal, target, changes) {
+    const start = literal.getStart(sourceFile);
+    const end = literal.getEnd();
+    const quote = sourceFile.text.charAt(start);
+    changes.push({ type: devkit_1.ChangeType.Delete, start, length: end - start }, {
+        type: devkit_1.ChangeType.Insert,
+        index: start,
+        text: `${quote}${target}${quote}`,
+    });
+}

package/dist/src/plugins/webpack-nx-build-coordination-plugin.d.ts

@@ -0,0 +1 @@
+export { WebpackNxBuildCoordinationPlugin } from '@nx/webpack/internal';

package/dist/src/plugins/webpack-nx-build-coordination-plugin.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WebpackNxBuildCoordinationPlugin = void 0;
+var internal_1 = require("@nx/webpack/internal");
+Object.defineProperty(exports, "WebpackNxBuildCoordinationPlugin", { enumerable: true, get: function () { return internal_1.WebpackNxBuildCoordinationPlugin; } });

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

@@ -0,0 +1 @@
+export { findUp, findAllNodeModules, deleteOutputDir, } from '@nx/webpack/internal';

package/dist/src/utils/fs.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deleteOutputDir = exports.findAllNodeModules = exports.findUp = void 0;
+var internal_1 = require("@nx/webpack/internal");
+Object.defineProperty(exports, "findUp", { enumerable: true, get: function () { return internal_1.findUp; } });
+Object.defineProperty(exports, "findAllNodeModules", { enumerable: true, get: function () { return internal_1.findAllNodeModules; } });
+Object.defineProperty(exports, "deleteOutputDir", { enumerable: true, get: function () { return internal_1.deleteOutputDir; } });

package/{src → dist/src}/utils/has-vite-plugin.d.ts

@@ -1,3 +1,2 @@
 import { Tree } from '@nx/devkit';
 export declare function hasVitePlugin(tree: Tree): boolean;
-//# sourceMappingURL=has-vite-plugin.d.ts.map

package/{src → dist/src}/utils/has-webpack-plugin.d.ts

@@ -1,3 +1,2 @@
 import { Tree } from '@nx/devkit';
 export declare function hasWebpackPlugin(tree: Tree): boolean;
-//# sourceMappingURL=has-webpack-plugin.d.ts.map

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

@@ -0,0 +1 @@
+export { normalizeOptions, normalizePluginPath } from '@nx/webpack';

package/dist/src/utils/normalize.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizePluginPath = exports.normalizeOptions = void 0;
+var webpack_1 = require("@nx/webpack");
+Object.defineProperty(exports, "normalizeOptions", { enumerable: true, get: function () { return webpack_1.normalizeOptions; } });
+Object.defineProperty(exports, "normalizePluginPath", { enumerable: true, get: function () { return webpack_1.normalizePluginPath; } });

package/{src → dist/src}/utils/versions.d.ts

@@ -1,5 +1,4 @@
 export declare const nxVersion: any;
 export declare const swcLoaderVersion = "0.1.15";
-export declare const typesNodeVersion = "20.19.9";
+export declare const typesNodeVersion = "^22.0.0";
 export declare const tsLibVersion = "^2.3.0";
-//# sourceMappingURL=versions.d.ts.map

package/{src → dist/src}/utils/versions.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tsLibVersion = exports.typesNodeVersion = exports.swcLoaderVersion = exports.nxVersion = void 0;
-exports.nxVersion = require('../../package.json').version;
+const path_1 = require("path");
+exports.nxVersion = require((0, path_1.join)('@nx/web', 'package.json')).version;
 exports.swcLoaderVersion = '0.1.15';
-exports.typesNodeVersion = '20.19.9';
+exports.typesNodeVersion = '^22.0.0';
 exports.tsLibVersion = '^2.3.0';

package/{src → dist/src}/utils/wait-for-port-open.d.ts

@@ -3,4 +3,3 @@ export declare function waitForPortOpen(port: number, options?: {
     retries?: number;
     retryDelay?: number;
 }): Promise<void>;
-//# sourceMappingURL=wait-for-port-open.d.ts.map

package/executors.json

@@ -1,15 +1,15 @@
 {
   "builders": {
     "file-server": {
-      "implementation": "./src/executors/file-server/compat",
-      "schema": "./src/executors/file-server/schema.json",
+      "implementation": "./dist/src/executors/file-server/compat",
+      "schema": "./dist/src/executors/file-server/schema.json",
       "description": "Serve a web application from a folder."
     }
   },
   "executors": {
     "file-server": {
-      "implementation": "./src/executors/file-server/file-server.impl",
-      "schema": "./src/executors/file-server/schema.json",
+      "implementation": "./dist/src/executors/file-server/file-server.impl",
+      "schema": "./dist/src/executors/file-server/schema.json",
       "description": "Serve a web application from a folder."
     }
   }

package/generators.json

@@ -4,21 +4,21 @@
   "extends": ["@nx/workspace"],
   "generators": {
     "init": {
-      "factory": "./src/generators/init/init#webInitGenerator",
-      "schema": "./src/generators/init/schema.json",
+      "factory": "./dist/src/generators/init/init#webInitGenerator",
+      "schema": "./dist/src/generators/init/schema.json",
       "description": "Add `@nrwl/web` to a project.",
       "hidden": true
     },
     "application": {
-      "factory": "./src/generators/application/application#applicationGeneratorInternal",
-      "schema": "./src/generators/application/schema.json",
+      "factory": "./dist/src/generators/application/application#applicationGeneratorInternal",
+      "schema": "./dist/src/generators/application/schema.json",
       "aliases": ["app"],
       "x-type": "application",
       "description": "Create an web application."
     },
     "static-config": {
-      "factory": "./src/generators/static-serve/static-serve-configuration",
-      "schema": "./src/generators/static-serve/schema.json",
+      "factory": "./dist/src/generators/static-serve/static-serve-configuration",
+      "schema": "./dist/src/generators/static-serve/schema.json",
       "description": "Add a new static-serve target to a project."
     }
   }

package/migrations.json

@@ -1,4 +1,10 @@
 {
-  "generators": {},
+  "generators": {
+    "rewrite-web-internal-subpath-imports": {
+      "version": "23.0.0-beta.25",
+      "description": "Rewrites `@nx/web/src/*` subpath imports now that the `./src/*` subpath is no longer exposed by `@nx/web`'s exports map. Named imports/exports of public symbols are routed to `@nx/web` and the rest to the new `@nx/web/internal` entry; `require`, dynamic `import` and `jest.mock` calls reference the whole module and are routed to `@nx/web/internal`.",
+      "implementation": "./dist/src/migrations/update-23-0-0/rewrite-internal-subpath-imports"
+    }
+  },
   "packageJsonUpdates": {}
 }

package/package.json

@@ -1,7 +1,15 @@
 {
   "name": "@nx/web",
-  "version": "23.0.0-pr.35413.460eeef",
+  "version": "23.0.0-rc.0",
   "private": false,
+  "type": "commonjs",
+  "files": [
+    "dist",
+    "!dist/tsconfig.tsbuildinfo",
+    "migrations.json",
+    "executors.json",
+    "generators.json"
+  ],
   "description": "The Nx Plugin for Web Components contains generators for managing Web Component applications and libraries within an Nx workspace. It provides:\n\n\n- Integration with libraries such as Jest, Playwright, Cypress, and Storybook.\n\n- Scaffolding for creating buildable libraries that can be published to npm.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
     "type": "git",
@@ -16,9 +24,18 @@
     "CLI",
     "Front-end"
   ],
-  "main": "./index.js",
-  "type": "commonjs",
-  "types": "./index.d.ts",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "typesVersions": {
+    "*": {
+      "babel": [
+        "dist/babel.d.ts"
+      ],
+      "internal": [
+        "dist/internal.d.ts"
+      ]
+    }
+  },
   "author": "Victor Savkin",
   "license": "MIT",
   "bugs": {
@@ -29,27 +46,49 @@
   "executors": "./executors.json",
   "ng-update": {
     "requirements": {},
-    "migrations": "./migrations.json"
+    "migrations": "./migrations.json",
+    "supportsOptionalMigrations": true
+  },
+  "exports": {
+    ".": {
+      "@nx/nx-source": "./index.ts",
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
+    },
+    "./package.json": "./package.json",
+    "./migrations.json": "./migrations.json",
+    "./generators.json": "./generators.json",
+    "./executors.json": "./executors.json",
+    "./babel": {
+      "@nx/nx-source": "./babel.ts",
+      "types": "./dist/babel.d.ts",
+      "default": "./dist/babel.js"
+    },
+    "./internal": {
+      "@nx/nx-source": "./internal.ts",
+      "types": "./dist/internal.d.ts",
+      "default": "./dist/internal.js"
+    }
   },
   "dependencies": {
-    "detect-port": "^1.5.1",
+    "detect-port": "^2.1.0",
     "http-server": "^14.1.0",
     "picocolors": "^1.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "23.0.0-pr.35413.460eeef",
-    "@nx/js": "23.0.0-pr.35413.460eeef"
+    "@nx/devkit": "23.0.0-rc.0",
+    "@nx/js": "23.0.0-rc.0"
   },
   "devDependencies": {
-    "nx": "23.0.0-pr.35413.460eeef",
-    "@nx/vitest": "23.0.0-pr.35413.460eeef"
+    "nx": "23.0.0-rc.0",
+    "@nx/vitest": "23.0.0-rc.0"
   },
   "peerDependencies": {
-    "@nx/cypress": "23.0.0-pr.35413.460eeef",
-    "@nx/eslint": "23.0.0-pr.35413.460eeef",
-    "@nx/jest": "23.0.0-pr.35413.460eeef",
-    "@nx/playwright": "23.0.0-pr.35413.460eeef",
-    "@nx/vite": "23.0.0-pr.35413.460eeef",
-    "@nx/webpack": "23.0.0-pr.35413.460eeef"
+    "@nx/cypress": "23.0.0-rc.0",
+    "@nx/eslint": "23.0.0-rc.0",
+    "@nx/jest": "23.0.0-rc.0",
+    "@nx/playwright": "23.0.0-rc.0",
+    "@nx/webpack": "23.0.0-rc.0",
+    "@nx/vite": "23.0.0-rc.0"
   },
   "peerDependenciesMeta": {
     "@nx/cypress": {

package/babel.d.ts

@@ -1,2 +0,0 @@
-declare const nxJsBabelPreset: any;
-//# sourceMappingURL=babel.d.ts.map

package/babel.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"babel.d.ts","sourceRoot":"","sources":["../../../packages/web/babel.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,eAAe,KAA0B,CAAC"}

package/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../packages/web/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAChF,OAAO,EAAE,uBAAuB,EAAE,MAAM,0DAA0D,CAAC"}

package/src/executors/file-server/compat.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"compat.d.ts","sourceRoot":"","sources":["../../../../../../packages/web/src/executors/file-server/compat.ts"],"names":[],"mappings":";AAGA,wBAA6C"}

package/src/executors/file-server/file-server.impl.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"file-server.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/web/src/executors/file-server/file-server.impl.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,eAAe,EAIhB,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AA6IlC,wBAA+B,kBAAkB,CAC/C,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe;;;;aA4HM,OAAO;YAUtC"}

package/src/generators/application/application.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"application.d.ts","sourceRoot":"","sources":["../../../../../../packages/web/src/generators/application/application.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,iBAAiB,EASjB,IAAI,EAKL,MAAM,YAAY,CAAC;AAkBpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AA2PlC,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAKpE;AAED,wBAAsB,4BAA4B,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAqW5E;AA0DD,eAAe,oBAAoB,CAAC"}

package/src/generators/init/init.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/web/src/generators/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAGjB,IAAI,EACL,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAkBlC,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,8BAWhE;AAED,eAAe,gBAAgB,CAAC"}

package/src/generators/static-serve/static-serve-configuration.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"static-serve-configuration.d.ts","sourceRoot":"","sources":["../../../../../../packages/web/src/generators/static-serve/static-serve-configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,IAAI,EAEV,MAAM,YAAY,CAAC;AAGpB,UAAU,oBAAoB;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AASD,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,oBAAoB,iBAI9B;AA4FD,eAAe,uBAAuB,CAAC"}

package/src/plugins/webpack-nx-build-coordination-plugin.d.ts

@@ -1,2 +0,0 @@
-export { WebpackNxBuildCoordinationPlugin } from '@nx/webpack/src/plugins/webpack-nx-build-coordination-plugin';
-//# sourceMappingURL=webpack-nx-build-coordination-plugin.d.ts.map

package/src/plugins/webpack-nx-build-coordination-plugin.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"webpack-nx-build-coordination-plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/web/src/plugins/webpack-nx-build-coordination-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gCAAgC,EAAE,MAAM,8DAA8D,CAAC"}

package/src/plugins/webpack-nx-build-coordination-plugin.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WebpackNxBuildCoordinationPlugin = void 0;
-var webpack_nx_build_coordination_plugin_1 = require("@nx/webpack/src/plugins/webpack-nx-build-coordination-plugin");
-Object.defineProperty(exports, "WebpackNxBuildCoordinationPlugin", { enumerable: true, get: function () { return webpack_nx_build_coordination_plugin_1.WebpackNxBuildCoordinationPlugin; } });

package/src/utils/fs.d.ts

@@ -1,2 +0,0 @@
-export * from '@nx/webpack/src/utils/fs';
-//# sourceMappingURL=fs.d.ts.map

package/src/utils/fs.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"fs.d.ts","sourceRoot":"","sources":["../../../../../packages/web/src/utils/fs.ts"],"names":[],"mappings":"AAAA,cAAc,0BAA0B,CAAC"}

package/src/utils/fs.js

@@ -1,4 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("@nx/webpack/src/utils/fs"), exports);

package/src/utils/has-vite-plugin.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"has-vite-plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/web/src/utils/has-vite-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,IAAI,EAAE,MAAM,YAAY,CAAC;AAE9C,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,WAOvC"}

package/src/utils/has-webpack-plugin.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"has-webpack-plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/web/src/utils/has-webpack-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,IAAI,EAAE,MAAM,YAAY,CAAC;AAE9C,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,WAO1C"}

package/src/utils/normalize.d.ts

@@ -1,2 +0,0 @@
-export * from '@nx/webpack/src/executors/webpack/lib/normalize-options';
-//# sourceMappingURL=normalize.d.ts.map

package/src/utils/normalize.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"normalize.d.ts","sourceRoot":"","sources":["../../../../../packages/web/src/utils/normalize.ts"],"names":[],"mappings":"AAAA,cAAc,yDAAyD,CAAC"}

package/src/utils/normalize.js

@@ -1,4 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("@nx/webpack/src/executors/webpack/lib/normalize-options"), exports);

package/src/utils/versions.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"versions.d.ts","sourceRoot":"","sources":["../../../../../packages/web/src/utils/versions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,KAAwC,CAAC;AAE/D,eAAO,MAAM,gBAAgB,WAAW,CAAC;AACzC,eAAO,MAAM,gBAAgB,YAAY,CAAC;AAC1C,eAAO,MAAM,YAAY,WAAW,CAAC"}

package/src/utils/wait-for-port-open.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"wait-for-port-open.d.ts","sourceRoot":"","sources":["../../../../../packages/web/src/utils/wait-for-port-open.ts"],"names":[],"mappings":"AAGA,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAO,GACrE,OAAO,CAAC,IAAI,CAAC,CA2Cf"}