@nx/web 17.2.0-beta.9 → 17.2.0-canary.20231207-b8d24e6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/web",
-  "version": "17.2.0-beta.9",
+  "version": "17.2.0-canary.20231207-b8d24e6",
   "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": "17.2.0-beta.9",
-    "@nx/js": "17.2.0-beta.9",
-    "@nrwl/web": "17.2.0-beta.9"
+    "@nx/devkit": "17.2.0-canary.20231207-b8d24e6",
+    "@nx/js": "17.2.0-canary.20231207-b8d24e6",
+    "@nrwl/web": "17.2.0-canary.20231207-b8d24e6"
   },
   "publishConfig": {
     "access": "public"

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

@@ -9,6 +9,7 @@ const path_1 = require("path");
 const package_json_1 = require("nx/src/utils/package-json");
 const detectPort = require("detect-port");
 const client_1 = require("nx/src/daemon/client/client");
+const utils_1 = require("nx/src/tasks-runner/utils");
 // platform specific command name
 const pmCmd = (0, os_1.platform)() === 'win32' ? `npx.cmd` : 'npx';
 function getHttpServerArgs(options) {
@@ -44,8 +45,15 @@ function getHttpServerArgs(options) {
     }
     return args;
 }
-function getBuildTargetCommand(options) {
-    const cmd = ['nx', 'run', options.buildTarget];
+function getBuildTargetCommand(options, context) {
+    const target = (0, devkit_1.parseTargetString)(options.buildTarget, context);
+    const cmd = ['nx', 'run'];
+    if (target.configuration) {
+        cmd.push(`${target.project}:${target.target}:${target.configuration}`);
+    }
+    else {
+        cmd.push(`${target.project}:${target.target}`);
+    }
     if (options.parallel) {
         cmd.push(`--parallel`);
     }
@@ -58,16 +66,27 @@ function getBuildTargetOutputPath(options, context) {
     if (options.staticFilePath) {
         return options.staticFilePath;
     }
-    let buildOptions;
+    let outputPath;
     try {
         const target = (0, devkit_1.parseTargetString)(options.buildTarget, context);
-        buildOptions = (0, devkit_1.readTargetOptions)(target, context);
+        const buildOptions = (0, devkit_1.readTargetOptions)(target, context);
+        if (buildOptions?.outputPath) {
+            outputPath = buildOptions.outputPath;
+        }
+        else {
+            const project = context.projectGraph.nodes[context.projectName];
+            const buildTarget = project.data.targets[target.target];
+            outputPath = buildTarget.outputs?.[0];
+            if (outputPath)
+                outputPath = (0, utils_1.interpolate)(outputPath, {
+                    projectName: project.data.name,
+                    projectRoot: project.data.root,
+                });
+        }
     }
     catch (e) {
         throw new Error(`Invalid buildTarget: ${options.buildTarget}`);
     }
-    // TODO: vsavkin we should also check outputs
-    const outputPath = buildOptions.outputPath;
     if (!outputPath) {
         throw new Error(`Unable to get the outputPath from buildTarget ${options.buildTarget}. Make sure ${options.buildTarget} has an outputPath property or manually provide an staticFilePath property`);
     }
@@ -104,7 +123,7 @@ async function* fileServerExecutor(options, context) {
             if (!running) {
                 running = true;
                 try {
-                    const args = getBuildTargetCommand(options);
+                    const args = getBuildTargetCommand(options, context);
                     (0, child_process_1.execFileSync)(pmCmd, args, {
                         stdio: [0, 1, 2],
                     });

package/src/migrations/update-15-9-1/add-dropped-dependencies.js

@@ -13,7 +13,7 @@ async function addDroppedDependencies(tree) {
     for (const [_, projectConfiguration] of projects) {
         for (const [_, targetConfiguration] of Object.entries(projectConfiguration.targets ?? {})) {
             for (const droppedDependency of droppedDependencies) {
-                if (targetConfiguration.executor?.startsWith(droppedDependency + ':')) {
+                if (targetConfiguration?.['executor']?.startsWith(droppedDependency + ':')) {
                     devDependencies[droppedDependency] = devkit_1.NX_VERSION;
                 }
             }
@@ -22,7 +22,7 @@ async function addDroppedDependencies(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     for (const [_, targetConfiguration] of Object.entries(nxJson?.targetDefaults ?? {})) {
         for (const droppedDependency of droppedDependencies) {
-            if (targetConfiguration.executor?.startsWith(droppedDependency + ':')) {
+            if (targetConfiguration?.['executor']?.startsWith(droppedDependency + ':')) {
                 devDependencies[droppedDependency] = devkit_1.NX_VERSION;
             }
         }