@nx/vite 23.0.0-rc.3 → 23.0.0-rc.4

package/dist/src/migrations/update-22-2-0/migrate-vitest-to-vitest-package.js

@@ -119,35 +119,19 @@ function migrateTargetDefaults(tree) {
         return;
     }
     let hasChanges = false;
-    if (Array.isArray(nxJson.targetDefaults)) {
-        for (const entry of nxJson.targetDefaults) {
-            // Pattern A: an executor entry for @nx/vite:test
-            if (entry.executor === '@nx/vite:test' && entry.target === undefined) {
-                entry.executor = '@nx/vitest:test';
-                hasChanges = true;
-            }
-            // Pattern B: a target entry whose executor field references @nx/vite:test
-            else if (entry.executor === '@nx/vite:test') {
-                entry.executor = '@nx/vitest:test';
-                hasChanges = true;
-            }
+    for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
+        // Pattern A: Executor-keyed (e.g., "@nx/vite:test": { ... })
+        if (targetOrExecutor === '@nx/vite:test') {
+            // Move config to new executor key
+            nxJson.targetDefaults['@nx/vitest:test'] ??= {};
+            Object.assign(nxJson.targetDefaults['@nx/vitest:test'], targetConfig);
+            delete nxJson.targetDefaults['@nx/vite:test'];
+            hasChanges = true;
         }
-    }
-    else {
-        for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
-            // Pattern A: Executor-keyed (e.g., "@nx/vite:test": { ... })
-            if (targetOrExecutor === '@nx/vite:test') {
-                // Move config to new executor key
-                nxJson.targetDefaults['@nx/vitest:test'] ??= {};
-                Object.assign(nxJson.targetDefaults['@nx/vitest:test'], targetConfig);
-                delete nxJson.targetDefaults['@nx/vite:test'];
-                hasChanges = true;
-            }
-            // Pattern B: Target-name-keyed (e.g., "test": { "executor": "@nx/vite:test", ... })
-            else if (targetConfig.executor === '@nx/vite:test') {
-                targetConfig.executor = '@nx/vitest:test';
-                hasChanges = true;
-            }
+        // Pattern B: Target-name-keyed (e.g., "test": { "executor": "@nx/vite:test", ... })
+        else if (targetConfig.executor === '@nx/vite:test') {
+            targetConfig.executor = '@nx/vitest:test';
+            hasChanges = true;
         }
     }
     if (hasChanges) {

package/dist/src/utils/e2e-web-server-info-utils.js

@@ -7,12 +7,13 @@ const internal_1 = require("@nx/devkit/internal");
 async function getViteE2EWebServerInfo(tree, projectName, configFilePath, isPluginBeingAdded, e2ePortOverride, e2eCIPortOverride) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     let e2ePort = e2ePortOverride ?? 4200;
-    const devPort = (0, internal_1.readTargetDefaultsForTarget)('dev', nxJson.targetDefaults)
-        ?.options?.port;
-    const servePort = (0, internal_1.readTargetDefaultsForTarget)('serve', nxJson.targetDefaults)
-        ?.options?.port;
-    if (devPort || servePort) {
-        e2ePort = devPort ?? servePort;
+    if ((nxJson.targetDefaults?.['dev'] &&
+        nxJson.targetDefaults?.['dev'].options?.port) ||
+        (nxJson.targetDefaults?.['serve'] &&
+            nxJson.targetDefaults?.['serve'].options?.port)) {
+        e2ePort =
+            nxJson.targetDefaults?.['dev'].options?.port ??
+                nxJson.targetDefaults?.['serve'].options?.port;
     }
     return (0, internal_1.getE2EWebServerInfo)(tree, projectName, {
         plugin: '@nx/vite/plugin',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/vite",
-  "version": "23.0.0-rc.3",
+  "version": "23.0.0-rc.4",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -101,13 +101,13 @@
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "ajv": "^8.0.0",
-    "@nx/devkit": "23.0.0-rc.3",
-    "@nx/js": "23.0.0-rc.3",
-    "@nx/vitest": "23.0.0-rc.3"
+    "@nx/devkit": "23.0.0-rc.4",
+    "@nx/js": "23.0.0-rc.4",
+    "@nx/vitest": "23.0.0-rc.4"
   },
   "devDependencies": {
-    "nx": "23.0.0-rc.3",
-    "@nx/eslint": "23.0.0-rc.3"
+    "@nx/eslint": "23.0.0-rc.4",
+    "nx": "23.0.0-rc.4"
   },
   "peerDependencies": {
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"