@nx/vite 23.1.0-beta.4 → 23.1.0-beta.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -120,6 +120,10 @@ function migrateTargetDefaults(tree) {
|
|
|
120
120
|
}
|
|
121
121
|
let hasChanges = false;
|
|
122
122
|
for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
|
|
123
|
+
if (Array.isArray(targetConfig)) {
|
|
124
|
+
// This migration predates the filtered array value form; values are plain objects here.
|
|
125
|
+
continue;
|
|
126
|
+
}
|
|
123
127
|
// Pattern A: Executor-keyed (e.g., "@nx/vite:test": { ... })
|
|
124
128
|
if (targetOrExecutor === '@nx/vite:test') {
|
|
125
129
|
// Move config to new executor key
|
|
@@ -110,6 +110,10 @@ function migrateTargetDefaults(tree) {
|
|
|
110
110
|
}
|
|
111
111
|
let hasChanges = false;
|
|
112
112
|
for (const [targetOrExecutor, targetConfig] of Object.entries(nxJson.targetDefaults)) {
|
|
113
|
+
if (Array.isArray(targetConfig)) {
|
|
114
|
+
// This migration predates the filtered array value form; values are plain objects here.
|
|
115
|
+
continue;
|
|
116
|
+
}
|
|
113
117
|
if (targetOrExecutor === '@nx/vite:test') {
|
|
114
118
|
nxJson.targetDefaults['@nx/vitest:test'] ??= {};
|
|
115
119
|
Object.assign(nxJson.targetDefaults['@nx/vitest:test'], targetConfig);
|
|
@@ -145,7 +145,7 @@ async function buildViteTargets(configFilePath, projectRoot, options, tsConfigFi
|
|
|
145
145
|
if (tsConfigFiles.length) {
|
|
146
146
|
const tsConfigToUse = ['tsconfig.app.json', 'tsconfig.lib.json', 'tsconfig.json'].find((t) => tsConfigFiles.includes(t)) ?? tsConfigFiles[0];
|
|
147
147
|
// Check if the project uses Vue plugin
|
|
148
|
-
const hasVuePlugin = viteBuildConfig.plugins?.some((p) => p.name === 'vite:vue');
|
|
148
|
+
const hasVuePlugin = viteBuildConfig.plugins?.some((p) => p.name === 'vite:vue' || p.name === 'vite:vue2');
|
|
149
149
|
// Explicit `compiler` option wins over inference so users can override
|
|
150
150
|
// when their setup isn't detected (e.g. custom/non-standard Vue plugin).
|
|
151
151
|
const resolvedCompiler = options.compiler ?? (hasVuePlugin ? 'vue-tsc' : 'tsc');
|
|
@@ -7,13 +7,12 @@ const internal_1 = require("@nx/devkit/internal");
|
|
|
7
7
|
async function getViteE2EWebServerInfo(tree, projectName, configFilePath, isPluginBeingAdded, e2ePortOverride, e2eCIPortOverride) {
|
|
8
8
|
const nxJson = (0, devkit_1.readNxJson)(tree);
|
|
9
9
|
let e2ePort = e2ePortOverride ?? 4200;
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
nxJson.targetDefaults?.['serve'].options?.port;
|
|
10
|
+
const devPort = (0, internal_1.readTargetDefaultsForTarget)('dev', nxJson.targetDefaults)
|
|
11
|
+
?.options?.port;
|
|
12
|
+
const servePort = (0, internal_1.readTargetDefaultsForTarget)('serve', nxJson.targetDefaults)
|
|
13
|
+
?.options?.port;
|
|
14
|
+
if (devPort || servePort) {
|
|
15
|
+
e2ePort = devPort ?? servePort;
|
|
17
16
|
}
|
|
18
17
|
return (0, internal_1.getE2EWebServerInfo)(tree, projectName, {
|
|
19
18
|
plugin: '@nx/vite/plugin',
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/vite",
|
|
3
|
-
"version": "23.1.0-beta.
|
|
3
|
+
"version": "23.1.0-beta.5",
|
|
4
4
|
"private": false,
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"files": [
|
|
@@ -101,13 +101,13 @@
|
|
|
101
101
|
"semver": "^7.6.3",
|
|
102
102
|
"tslib": "^2.3.0",
|
|
103
103
|
"ajv": "^8.0.0",
|
|
104
|
-
"@nx/devkit": "23.1.0-beta.
|
|
105
|
-
"@nx/js": "23.1.0-beta.
|
|
106
|
-
"@nx/vitest": "23.1.0-beta.
|
|
104
|
+
"@nx/devkit": "23.1.0-beta.5",
|
|
105
|
+
"@nx/js": "23.1.0-beta.5",
|
|
106
|
+
"@nx/vitest": "23.1.0-beta.5"
|
|
107
107
|
},
|
|
108
108
|
"devDependencies": {
|
|
109
|
-
"@nx/eslint": "23.1.0-beta.
|
|
110
|
-
"nx": "23.1.0-beta.
|
|
109
|
+
"@nx/eslint": "23.1.0-beta.5",
|
|
110
|
+
"nx": "23.1.0-beta.5"
|
|
111
111
|
},
|
|
112
112
|
"peerDependencies": {
|
|
113
113
|
"vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
|