@nx/web 24.0.0-beta.2 → 24.0.0-beta.4

package/dist/internal.js

@@ -3,8 +3,8 @@ 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/module-federation). Prefer
-// this over deep `@nx/web/src/*` imports — those are not part of the public API.
+// @nx/angular, @nx/rspack, @nx/next). 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");

package/dist/src/generators/application/application.js

@@ -79,10 +79,6 @@ function createApplicationFiles(tree, options) {
 async function setupBundler(tree, options) {
     const main = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/main.ts');
     const tsConfig = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'tsconfig.app.json');
-    const assets = [
-        (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/favicon.ico'),
-        (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/assets'),
-    ];
     if (options.bundler === 'webpack') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/webpack', versions_1.nxVersion);
         await configurationGenerator(tree, {
@@ -94,43 +90,7 @@ async function setupBundler(tree, options) {
             devServer: true,
             webpackConfig: (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'webpack.config.js'),
             skipFormat: true,
-            addPlugin: options.addPlugin,
         });
-        const project = (0, devkit_1.readProjectConfiguration)(tree, options.projectName);
-        // Only when asked: @nx/webpack:dev-server already defaults to 4200.
-        if (options.port != null && project.targets?.serve) {
-            project.targets.serve.options ??= {};
-            project.targets.serve.options.port = options.port;
-            (0, devkit_1.updateProjectConfiguration)(tree, options.projectName, project);
-        }
-        if (project.targets?.build) {
-            const prodConfig = project.targets.build.configurations.production;
-            const buildOptions = project.targets.build.options;
-            buildOptions.assets = assets;
-            buildOptions.index = (0, devkit_1.joinPathFragments)(options.appProjectRoot, 'src/index.html');
-            buildOptions.baseHref = '/';
-            buildOptions.styles = [
-                (0, devkit_1.joinPathFragments)(options.appProjectRoot, `src/styles.${options.style}`),
-            ];
-            // We can delete that, because this projest is an application
-            // and applications have a .babelrc file in their root dir.
-            // So Nx will find it and use it
-            delete buildOptions.babelUpwardRootMode;
-            buildOptions.scripts = [];
-            prodConfig.fileReplacements = [
-                {
-                    replace: (0, devkit_1.joinPathFragments)(options.appProjectRoot, `src/environments/environment.ts`),
-                    with: (0, devkit_1.joinPathFragments)(options.appProjectRoot, `src/environments/environment.prod.ts`),
-                },
-            ];
-            prodConfig.optimization = true;
-            prodConfig.outputHashing = 'all';
-            prodConfig.sourceMap = false;
-            prodConfig.namedChunks = false;
-            prodConfig.extractLicenses = true;
-            prodConfig.vendorChunk = false;
-            (0, devkit_1.updateProjectConfiguration)(tree, options.projectName, project);
-        }
         // TODO(jack): Flush this out... no bundler should be possible for web but the experience isn't holistic due to missing features (e.g. writing index.html).
     }
     else if (options.bundler === 'none') {
@@ -193,10 +153,7 @@ function setDefaults(tree, options) {
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
 async function applicationGenerator(host, schema) {
-    return await applicationGeneratorInternal(host, {
-        addPlugin: false,
-        ...schema,
-    });
+    return await applicationGeneratorInternal(host, schema);
 }
 async function applicationGeneratorInternal(host, schema) {
     const options = await normalizeOptions(host, schema);
@@ -227,7 +184,6 @@ async function applicationGeneratorInternal(host, schema) {
             linter: options.linter,
             project: options.projectName,
             unitTestRunner: options.unitTestRunner,
-            addPlugin: options.addPlugin,
         }));
     }
     if (options.linter === 'eslint') {
@@ -245,7 +201,6 @@ async function applicationGeneratorInternal(host, schema) {
             unitTestRunner: options.unitTestRunner,
             skipFormat: true,
             enableTypedLinting,
-            addPlugin: options.addPlugin,
         });
         tasks.push(lintTask);
         // Add out-tsc ignore pattern when using TS solution setup
@@ -267,7 +222,6 @@ async function applicationGeneratorInternal(host, schema) {
             includeVitest: options.unitTestRunner === 'vitest',
             inSourceTests: options.inSourceTests,
             skipFormat: true,
-            addPlugin: options.addPlugin,
             port: options.port,
         });
         tasks.push(viteTask);
@@ -293,7 +247,6 @@ async function applicationGeneratorInternal(host, schema) {
             coverageProvider: 'v8',
             inSourceTests: options.inSourceTests,
             skipFormat: true,
-            addPlugin: options.addPlugin,
             compiler: options.compiler,
         });
         tasks.push(vitestTask);
@@ -335,13 +288,13 @@ async function applicationGeneratorInternal(host, schema) {
     };
     if (options.bundler === 'webpack') {
         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, 
+        e2eWebServerInfo = await getWebpackE2EWebServerInfo(host, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `webpack.config.js`), 
         // Undefined unless --port was passed, so targetDefaults still apply.
         options.port);
     }
     else if (options.bundler === 'vite') {
         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, options.port ?? 4200, 
+        e2eWebServerInfo = await getViteE2EWebServerInfo(host, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `vite.config.ts`), options.port ?? 4200, 
         // An explicit port serves both dev and preview, as in @nx/react:app.
         options.port);
     }
@@ -422,7 +375,6 @@ async function applicationGeneratorInternal(host, schema) {
             enableTypedLinting,
             webServerCommand: e2eWebServerInfo.e2eCiWebServerCommand,
             webServerAddress: e2eWebServerInfo.e2eCiBaseUrl,
-            addPlugin: options.addPlugin,
         });
         tasks.push(playwrightTask);
     }
@@ -436,7 +388,6 @@ async function applicationGeneratorInternal(host, schema) {
             setupFile: 'none',
             compiler: options.compiler,
             skipFormat: true,
-            addPlugin: options.addPlugin,
         });
         tasks.push(jestTask);
     }
@@ -485,10 +436,6 @@ async function normalizeOptions(host, options) {
         projectType: 'application',
         directory: options.directory,
     });
-    const nxJson = (0, devkit_1.readNxJson)(host);
-    const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
-        nxJson.useInferencePlugins !== false;
-    options.addPlugin ??= addPluginDefault;
     const isUsingTsSolutionConfig = (0, internal_2.isUsingTsSolutionSetup)(host);
     const appProjectName = !isUsingTsSolutionConfig || options.name ? projectName : importPath;
     const e2eProjectName = `${appProjectName}-e2e`;

package/dist/src/generators/application/files/app-webpack/webpack.config.js__tmpl__

@@ -25,17 +25,10 @@ module.exports = {
   ],
 };
 <% } else { %>
-const { composePlugins, withNx, withWeb } = require('@nx/webpack');
+const { NxAppWebpackPlugin } = require('@nx/webpack/app-plugin');
 
-// Nx plugins for webpack.
-module.exports = composePlugins(
-  withNx(),
-  withWeb(),
-  (config) => {
-    // Update the webpack config as needed here.
-    // e.g. `config.plugins.push(new MyPlugin())`
-    config.output.clean = true;
-    return config;
-  }
-);
+module.exports = {
+  output: { clean: true },
+  plugins: [new NxAppWebpackPlugin()],
+};
 <% } %>

package/dist/src/generators/application/schema.d.ts

@@ -20,7 +20,6 @@ export interface Schema {
    */
   setParserOptionsProject?: boolean;
   strict?: boolean;
-  addPlugin?: boolean;
   useProjectJson?: boolean;
   port?: number;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/web",
-  "version": "24.0.0-beta.2",
+  "version": "24.0.0-beta.4",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -79,20 +79,20 @@
     "http-server": "^14.1.0",
     "picocolors": "^1.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "24.0.0-beta.2",
-    "@nx/js": "24.0.0-beta.2"
+    "@nx/devkit": "24.0.0-beta.4",
+    "@nx/js": "24.0.0-beta.4"
   },
   "devDependencies": {
-    "nx": "24.0.0-beta.2",
-    "@nx/vitest": "24.0.0-beta.2"
+    "nx": "24.0.0-beta.4",
+    "@nx/vitest": "24.0.0-beta.4"
   },
   "peerDependencies": {
-    "@nx/cypress": "24.0.0-beta.2",
-    "@nx/eslint": "24.0.0-beta.2",
-    "@nx/jest": "24.0.0-beta.2",
-    "@nx/playwright": "24.0.0-beta.2",
-    "@nx/vite": "24.0.0-beta.2",
-    "@nx/webpack": "24.0.0-beta.2"
+    "@nx/cypress": "24.0.0-beta.4",
+    "@nx/eslint": "24.0.0-beta.4",
+    "@nx/jest": "24.0.0-beta.4",
+    "@nx/playwright": "24.0.0-beta.4",
+    "@nx/vite": "24.0.0-beta.4",
+    "@nx/webpack": "24.0.0-beta.4"
   },
   "peerDependenciesMeta": {
     "@nx/cypress": {