@nx/web 18.2.0-beta.0 → 18.2.0-beta.2

package/LICENSE

@@ -1,6 +1,6 @@
 (The MIT License)
 
-Copyright (c) 2017-2023 Narwhal Technologies Inc.
+Copyright (c) 2017-2024 Narwhal Technologies Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/web",
-  "version": "18.2.0-beta.0",
+  "version": "18.2.0-beta.2",
   "private": false,
   "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, Cypress, and Storybook.\n\n- Scaffolding for creating buildable libraries that can be published to npm.\n\n- Utilities for automatic workspace refactoring.",
   "repository": {
@@ -34,9 +34,9 @@
     "detect-port": "^1.5.1",
     "http-server": "^14.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "18.2.0-beta.0",
-    "@nx/js": "18.2.0-beta.0",
-    "@nrwl/web": "18.2.0-beta.0"
+    "@nx/devkit": "18.2.0-beta.2",
+    "@nx/js": "18.2.0-beta.2",
+    "@nrwl/web": "18.2.0-beta.2"
   },
   "publishConfig": {
     "access": "public"

package/src/executors/file-server/file-server.impl.js

@@ -150,12 +150,16 @@ async function* fileServerExecutor(options, context) {
         // perform initial run
         run();
     }
+    const port = await detectPort(options.port || 8080);
     const outputPath = getBuildTargetOutputPath(options, context);
     if (options.spa) {
         const src = (0, path_1.join)(outputPath, 'index.html');
         const dst = (0, path_1.join)(outputPath, '404.html');
         // See: https://github.com/http-party/http-server#magic-files
         (0, fs_1.copyFileSync)(src, dst);
+        // We also need to ensure the proxyUrl is set, otherwise the browser will continue to throw a 404 error
+        // This can cause unexpected behaviors and failures especially in automated test suites
+        options.proxyUrl ??= `http${options.ssl ? 's' : ''}://localhost:${port}?`;
     }
     const args = getHttpServerArgs(options);
     const { path: pathToHttpServerPkgJson, packageJson } = (0, package_json_1.readModulePackageJson)('http-server', module.paths);
@@ -163,7 +167,6 @@ async function* fileServerExecutor(options, context) {
     const pathToHttpServer = (0, path_1.resolve)(pathToHttpServerPkgJson.replace('package.json', ''), pathToHttpServerBin);
     // detect port as close to when used to prevent port being used by another process
     // when running in  parallel
-    const port = await detectPort(options.port || 8080);
     args.push(`-p=${port}`);
     const serve = (0, child_process_1.fork)(pathToHttpServer, [outputPath, ...args], {
         stdio: 'pipe',

package/src/executors/file-server/schema.json

@@ -44,7 +44,7 @@
     },
     "proxyUrl": {
       "type": "string",
-      "description": "URL to proxy unhandled requests to."
+      "description": "URL to proxy unhandled requests to. _Note: If the 'spa' flag is set to true, manually setting this value will override the catch-all redirect functionality from http-server which may lead to unexpected behavior._"
     },
     "proxyOptions": {
       "type": "object",

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

@@ -18,6 +18,11 @@
       "type": "string",
       "description": "Name of the serve target to add. Defaults to 'serve-static'.",
       "default": "serve-static"
+    },
+    "spa": {
+      "type": "boolean",
+      "description": "Whether to set the 'spa' flag on the generated target.",
+      "default": true
     }
   },
   "required": ["buildTarget"]

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

@@ -1,8 +1,9 @@
-import { Tree } from '@nx/devkit';
+import { type Tree } from '@nx/devkit';
 interface WebStaticServeSchema {
     buildTarget: string;
     outputPath?: string;
     targetName?: string;
+    spa?: boolean;
 }
-export declare function webStaticServeGenerator(tree: Tree, options: WebStaticServeSchema): void;
+export declare function webStaticServeGenerator(tree: Tree, options: WebStaticServeSchema): Promise<void>;
 export default webStaticServeGenerator;

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

@@ -2,17 +2,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webStaticServeGenerator = void 0;
 const devkit_1 = require("@nx/devkit");
-function webStaticServeGenerator(tree, options) {
-    const opts = normalizeOptions(tree, options);
+async function webStaticServeGenerator(tree, options) {
+    const opts = await normalizeOptions(tree, options);
     addStaticConfig(tree, opts);
 }
 exports.webStaticServeGenerator = webStaticServeGenerator;
-function normalizeOptions(tree, options) {
-    const target = (0, devkit_1.parseTargetString)(options.buildTarget);
+async function normalizeOptions(tree, options) {
+    let projectGraph;
+    try {
+        projectGraph = (0, devkit_1.readCachedProjectGraph)();
+    }
+    catch (e) {
+        projectGraph = await (0, devkit_1.createProjectGraphAsync)();
+    }
+    const target = (0, devkit_1.parseTargetString)(options.buildTarget, projectGraph);
     const opts = {
         ...options,
         targetName: options.targetName || 'serve-static',
         projectName: target.project,
+        spa: options.spa ?? true,
     };
     const projectConfig = (0, devkit_1.readProjectConfiguration)(tree, target.project);
     const buildTargetConfig = projectConfig?.targets?.[target.target];
@@ -27,7 +35,7 @@ Optionally, you can provide a different name with the --target-name option other
     }
     // NOTE: @nx/web:file-server only looks for the outputPath option
     if (!buildTargetConfig.options?.outputPath && !opts.outputPath) {
-        // attempt to find the suiteable path from the outputs
+        // attempt to find the suitable path from the outputs
         let maybeOutputValue;
         for (const o of buildTargetConfig?.outputs || []) {
             const isInterpolatedOutput = o.trim().startsWith('{options.');
@@ -65,6 +73,7 @@ function addStaticConfig(tree, opts) {
         options: {
             buildTarget: opts.buildTarget,
             staticFilePath: opts.outputPath,
+            spa: opts.spa,
         },
     };
     projectConfig.targets[opts.targetName] = staticServeOptions;