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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/web",
-  "version": "19.7.0-beta.0",
+  "version": "19.7.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, 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": {
@@ -35,9 +35,9 @@
     "detect-port": "^1.5.1",
     "http-server": "^14.1.0",
     "tslib": "^2.3.0",
-    "@nx/devkit": "19.7.0-beta.0",
-    "@nx/js": "19.7.0-beta.0",
-    "@nrwl/web": "19.7.0-beta.0"
+    "@nx/devkit": "19.7.0-beta.2",
+    "@nx/js": "19.7.0-beta.2",
+    "@nrwl/web": "19.7.0-beta.2"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/application/application.js

@@ -255,6 +255,21 @@ async function applicationGeneratorInternal(host, schema) {
             spa: true,
         });
     }
+    let e2eWebServerInfo = {
+        e2eWebServerAddress: `http://localhost: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`,
+        e2eDevServerTarget: `${options.projectName}:serve`,
+    };
+    if (options.bundler === 'webpack') {
+        const { getWebpackE2EWebServerInfo } = (0, devkit_1.ensurePackage)('@nx/webpack', versions_2.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);
+        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);
         (0, devkit_1.addProjectConfiguration)(host, options.e2eProjectName, {
@@ -268,20 +283,20 @@ async function applicationGeneratorInternal(host, schema) {
         const cypressTask = await configurationGenerator(host, {
             ...options,
             project: options.e2eProjectName,
-            devServerTarget: `${options.projectName}:${options.e2eWebServerTarget}`,
-            baseUrl: options.e2eWebServerAddress,
+            devServerTarget: e2eWebServerInfo.e2eDevServerTarget,
+            baseUrl: e2eWebServerInfo.e2eWebServerAddress,
             directory: 'src',
             skipFormat: true,
             webServerCommands: hasPlugin
                 ? {
-                    default: `nx run ${options.projectName}:${options.e2eWebServerTarget}`,
-                    production: `nx run ${options.projectName}:preview`,
+                    default: e2eWebServerInfo.e2eWebServerCommand,
+                    production: e2eWebServerInfo.e2eCiWebServerCommand,
                 }
                 : undefined,
             ciWebServerCommand: hasPlugin
-                ? `nx run ${options.projectName}:${options.e2eCiWebServerTarget}`
+                ? e2eWebServerInfo.e2eCiWebServerCommand
                 : undefined,
-            ciBaseUrl: options.bundler === 'vite' ? options.e2eCiBaseUrl : undefined,
+            ciBaseUrl: e2eWebServerInfo.e2eCiBaseUrl,
         });
         if (options.addPlugin ||
             (0, devkit_1.readNxJson)(host).plugins?.find((p) => typeof p === 'string'
@@ -316,8 +331,8 @@ async function applicationGeneratorInternal(host, schema) {
             js: false,
             linter: options.linter,
             setParserOptionsProject: options.setParserOptionsProject,
-            webServerCommand: `${(0, devkit_1.getPackageManagerCommand)().exec} nx run ${options.projectName}:${options.e2eCiWebServerTarget}`,
-            webServerAddress: options.e2eCiBaseUrl,
+            webServerCommand: e2eWebServerInfo.e2eCiWebServerCommand,
+            webServerAddress: e2eWebServerInfo.e2eCiBaseUrl,
             addPlugin: options.addPlugin,
         });
         if (options.addPlugin ||
@@ -387,45 +402,8 @@ async function normalizeOptions(host, options) {
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
     options.addPlugin ??= addPluginDefault;
-    let e2ePort = 4200;
-    let e2eWebServerTarget = 'serve';
-    let e2eCiWebServerTarget = options.bundler === 'vite' ? 'preview' : 'serve-static';
-    if (options.addPlugin) {
-        if (nxJson.plugins) {
-            for (const plugin of nxJson.plugins) {
-                if (options.bundler === 'vite' &&
-                    typeof plugin === 'object' &&
-                    plugin.plugin === '@nx/vite/plugin') {
-                    e2eCiWebServerTarget =
-                        plugin.options?.previewTargetName ??
-                            e2eCiWebServerTarget;
-                    e2eWebServerTarget =
-                        plugin.options?.serveTargetName ??
-                            e2eWebServerTarget;
-                }
-                else if (options.bundler === 'webpack' &&
-                    typeof plugin === 'object' &&
-                    plugin.plugin === '@nx/webpack/plugin') {
-                    e2eCiWebServerTarget =
-                        plugin.options?.serveStaticTargetName ??
-                            e2eCiWebServerTarget;
-                    e2eWebServerTarget =
-                        plugin.options?.serveTargetName ??
-                            e2eWebServerTarget;
-                }
-            }
-        }
-    }
-    if (nxJson.targetDefaults?.[e2eWebServerTarget] &&
-        nxJson.targetDefaults?.[e2eWebServerTarget].options?.port) {
-        e2ePort = nxJson.targetDefaults?.[e2eWebServerTarget].options?.port;
-    }
     const e2eProjectName = `${appProjectName}-e2e`;
     const e2eProjectRoot = `${appProjectRoot}-e2e`;
-    const e2eWebServerAddress = `http://localhost:${e2ePort}`;
-    const e2eCiBaseUrl = options.bundler === 'vite'
-        ? 'http://localhost:4300'
-        : `http://localhost:${e2ePort}`;
     const npmScope = (0, get_npm_scope_1.getNpmScope)(host);
     const parsedTags = options.tags
         ? options.tags.split(',').map((s) => s.trim())
@@ -445,11 +423,6 @@ async function normalizeOptions(host, options) {
         appProjectRoot,
         e2eProjectRoot,
         e2eProjectName,
-        e2eWebServerAddress,
-        e2eWebServerTarget,
-        e2eCiWebServerTarget,
-        e2eCiBaseUrl,
-        e2ePort,
         parsedTags,
     };
 }