@nx/web 23.3.0-pr.37036.f6e3fb2 → 23.3.0-pr.37224.268062c

package/README.md

@@ -12,7 +12,7 @@
 [![Semantic Release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg?style=flat-square)](<>)
 [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
 [![Join us on the Official Nx Discord Server](https://img.shields.io/discord/1143497901675401286?label=discord)](https://go.nx.dev/community)
-[![Nx Sandboxing](https://staging.nx.app/workspaces/62d013ea0852fe0a2df74438/sandbox-badge.svg)](https://nx.dev/docs/features/ci-features/sandboxing)
+[![Hours saved](https://img.shields.io/endpoint?url=https%3A%2F%2Fstaging.nx.app%2Fnx-cloud%2Fbadge%2F62d013ea0852fe0a2df74438%2Fhours-saved.json)](https://nx.dev/nx-cloud)
 
 </div>
 

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

@@ -29,6 +29,7 @@ function createApplicationFiles(tree, options) {
             tmpl: '',
             offsetFromRoot: rootOffset,
             rootTsConfigPath,
+            devServerPort: options.port ?? 4200,
             webpackPluginOptions: (0, has_webpack_plugin_1.hasWebpackPlugin)(tree)
                 ? {
                     compiler: options.compiler,
@@ -96,6 +97,12 @@ async function setupBundler(tree, options) {
             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;
@@ -261,6 +268,7 @@ async function applicationGeneratorInternal(host, schema) {
             inSourceTests: options.inSourceTests,
             skipFormat: true,
             addPlugin: options.addPlugin,
+            port: options.port,
         });
         tasks.push(viteTask);
         createOrEditViteConfig(host, {
@@ -268,6 +276,8 @@ async function applicationGeneratorInternal(host, schema) {
             includeLib: false,
             includeVitest: options.unitTestRunner === 'vitest',
             inSourceTests: options.inSourceTests,
+            port: options.port,
+            previewPort: options.port,
             useEsmExtension: true,
         }, false);
     }
@@ -313,26 +323,27 @@ async function applicationGeneratorInternal(host, schema) {
         await (0, static_serve_configuration_1.default)(host, {
             buildTarget: `${options.projectName}:build`,
             spa: true,
+            port: options.port,
         });
     }
     let e2eWebServerInfo = {
-        e2eWebServerAddress: `http://localhost:4200`,
+        e2eWebServerAddress: `http://localhost:${options.port ?? 4200}`,
         e2eWebServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx run ${options.projectName}:serve`,
         e2eCiWebServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx run ${options.projectName}:serve-static`,
-        e2eCiBaseUrl: `http://localhost:4200`,
+        e2eCiBaseUrl: `http://localhost:${options.port ?? 4200}`,
         e2eDevServerTarget: `${options.projectName}:serve`,
     };
     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, 
-        // This generator has no `port` option, so there is never an explicit request
-        // to pass on. The helper defaults to 4200 itself, and leaving this undefined
-        // is what lets targetDefaults still apply.
-        undefined);
+        // 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, 4200);
+        e2eWebServerInfo = await getViteE2EWebServerInfo(host, options.projectName, (0, devkit_1.joinPathFragments)(options.appProjectRoot, `vite.config.ts`), options.addPlugin, options.port ?? 4200, 
+        // An explicit port serves both dev and preview, as in @nx/react:app.
+        options.port);
     }
     if (options.e2eTestRunner === 'cypress') {
         const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/cypress', versions_1.nxVersion);

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

@@ -8,7 +8,7 @@ module.exports = {
     clean: true,
   },
   devServer: {
-    port: 4200
+    port: <%= devServerPort %>
   },
   plugins: [
     new NxAppWebpackPlugin({

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

@@ -22,4 +22,5 @@ export interface Schema {
   strict?: boolean;
   addPlugin?: boolean;
   useProjectJson?: boolean;
+  port?: number;
 }

package/dist/src/generators/application/schema.json

@@ -114,6 +114,10 @@
     "useProjectJson": {
       "type": "boolean",
       "description": "Use a `project.json` configuration file instead of inlining the Nx configuration in the `package.json` file."
+    },
+    "port": {
+      "type": "number",
+      "description": "The port to use for the development server. Defaults to 4200."
     }
   },
   "required": ["directory"],

package/dist/src/generators/static-serve/schema.json

@@ -23,6 +23,10 @@
       "type": "boolean",
       "description": "Whether to set the 'spa' flag on the generated target.",
       "default": true
+    },
+    "port": {
+      "type": "number",
+      "description": "The port to serve on. Defaults to 4200."
     }
   },
   "required": ["buildTarget"]

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

@@ -4,6 +4,7 @@ interface WebStaticServeSchema {
     outputPath?: string;
     targetName?: string;
     spa?: boolean;
+    port?: number;
 }
 export declare function webStaticServeGenerator(tree: Tree, options: WebStaticServeSchema): Promise<void>;
 export default webStaticServeGenerator;

package/dist/src/generators/static-serve/static-serve-configuration.js

@@ -75,6 +75,8 @@ function addStaticConfig(tree, opts) {
             buildTarget: opts.buildTarget,
             staticFilePath: opts.outputPath,
             spa: opts.spa,
+            // Only when asked: @nx/web:file-server already defaults to 4200.
+            ...(opts.port != null ? { port: opts.port } : {}),
         },
     };
     projectConfig.targets[opts.targetName] = staticServeOptions;

package/package.json

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