Merge branch 'main' into fix/install-respect-shell-dir-settings

Author: fengmk2

.github/workflows/e2e-test.yml

@@ -246,6 +246,10 @@ jobs:
               vp run type-check:tsgo
               vp run build
               vp run test navigation-utils.test.ts real-browser-flicker.test.tsx workflow-parallel-limit.test.tsx
+          - name: viteplus-ws-repro
+            node-version: 24
+            command: |
+              vp test run
         exclude:
           # frm-stack uses Docker (testcontainers) which doesn't work the same way on Windows
           - os: windows-latest

crates/vite_global_cli/src/commands/upgrade/registry.rs

@@ -45,7 +45,8 @@ pub async fn resolve_version(
     registry_override: Option<&str>,
 ) -> Result<ResolvedVersion, Error> {
     let default_registry = npm_registry();
-    let registry = registry_override.unwrap_or(&default_registry);
+    let registry_raw = registry_override.unwrap_or(&default_registry);
+    let registry = registry_raw.trim_end_matches('/');
     let client = HttpClient::new();
 
     // Step 1: Fetch main package metadata to resolve version

crates/vite_shared/src/env_config.rs

@@ -133,7 +133,9 @@ impl EnvConfig {
             vite_plus_home: std::env::var(env_vars::VITE_PLUS_HOME).ok().map(PathBuf::from),
             npm_registry: std::env::var(env_vars::NPM_CONFIG_REGISTRY)
                 .or_else(|_| std::env::var(env_vars::NPM_CONFIG_REGISTRY_UPPER))
-                .unwrap_or_else(|_| "https://registry.npmjs.org".into()),
+                .unwrap_or_else(|_| "https://registry.npmjs.org".into())
+                .trim_end_matches('/')
+                .to_string(),
             node_dist_mirror: std::env::var(env_vars::VITE_NODE_DIST_MIRROR).ok(),
             is_ci: std::env::var("CI").is_ok(),
             bypass_shim: std::env::var(env_vars::VITE_PLUS_BYPASS).is_ok(),

ecosystem-ci/patch-project.ts

@@ -21,6 +21,18 @@ const cwd = directory ? join(repoRoot, directory) : repoRoot;
 // run vp migrate
 const cli = process.env.VITE_PLUS_CLI_BIN ?? 'vp';
 
+// Projects that already have vite-plus need it removed before migration so
+// vp migrate treats them as fresh and applies tgz overrides. Without this,
+// vp migrate detects "already using Vite+" and skips override injection.
+const forceFreshMigration = 'forceFreshMigration' in repoConfig && repoConfig.forceFreshMigration;
+if (forceFreshMigration) {
+  const pkgPath = join(cwd, 'package.json');
+  const pkg = JSON.parse(await readFile(pkgPath, 'utf-8'));
+  delete pkg.devDependencies?.['vite-plus'];
+  delete pkg.dependencies?.['vite-plus'];
+  await writeFile(pkgPath, JSON.stringify(pkg, null, 2) + '\n', 'utf-8');
+}
+
 if (project === 'rollipop') {
   const oxfmtrc = await readFile(join(repoRoot, '.oxfmtrc.json'), 'utf-8');
   await writeFile(

ecosystem-ci/repo.json

@@ -54,5 +54,11 @@
     "repository": "https://github.com/fengmk2/vite-vue-vercel.git",
     "branch": "main",
     "hash": "f2bf9fc40880c6a80f5d89bff70641c2eeaf77ef"
+  },
+  "viteplus-ws-repro": {
+    "repository": "https://github.com/Charles5277/viteplus-ws-repro.git",
+    "branch": "main",
+    "hash": "451925ad7c07750a23de1d6ed454825d0eb14092",
+    "forceFreshMigration": true
   }
 }

packages/cli/.gitignore

@@ -1,5 +1,4 @@
 /npm
 /artifacts
 /LICENSE
-/LICENSE.md
 /skills/vite-plus/docs

packages/cli/build.ts

@@ -8,7 +8,7 @@
  * 4. syncCorePackageExports() - Creates shim files to re-export from @voidzero-dev/vite-plus-core
  * 5. syncTestPackageExports() - Creates shim files to re-export from @voidzero-dev/vite-plus-test
  * 6. copySkillDocs() - Copies docs into skills/vite-plus/docs for runtime MCP access
- * 7. syncReadmeFromRoot()/syncLicenseFromRoot() - Keeps package docs/license in sync
+ * 7. syncReadmeFromRoot() - Keeps package README in sync
  *
  * The sync functions allow this package to be a drop-in replacement for 'vite' by
  * re-exporting all the same subpaths (./client, ./types/*, etc.) while delegating
@@ -64,13 +64,13 @@ if (!skipTs) {
   generateLicenseFile({
     title: 'Vite-Plus CLI license',
     packageName: 'Vite-Plus',
-    outputPath: join(projectDir, 'LICENSE.md'),
+    outputPath: join(projectDir, 'LICENSE'),
     coreLicensePath: join(projectDir, '..', '..', 'LICENSE'),
     bundledPaths: [join(projectDir, 'dist', 'global')],
     resolveFrom: [projectDir],
   });
-  if (!existsSync(join(projectDir, 'LICENSE.md'))) {
-    throw new Error('LICENSE.md was not generated during build');
+  if (!existsSync(join(projectDir, 'LICENSE'))) {
+    throw new Error('LICENSE was not generated during build');
   }
 }
 // Build native first - TypeScript may depend on the generated binding types
@@ -83,7 +83,6 @@ if (!skipTs) {
 }
 await copySkillDocs();
 await syncReadmeFromRoot();
-await syncLicenseFromRoot();
 
 async function buildNapiBinding() {
   const buildCommand = createBuildCommand(napiArgs);
@@ -482,12 +481,6 @@ async function syncReadmeFromRoot() {
   }
 }
 
-async function syncLicenseFromRoot() {
-  const rootLicensePath = join(projectDir, '..', '..', 'LICENSE');
-  const packageLicensePath = join(projectDir, 'LICENSE');
-  await copyFile(rootLicensePath, packageLicensePath);
-}
-
 function splitReadme(content: string, label: string) {
   const match = /^---\s*$/m.exec(content);
   if (!match || match.index === undefined) {

packages/test/build.ts

@@ -302,9 +302,18 @@ async function mergePackageJson(pluginExports: Array<{ exportPath: string; shimF
     // browser-provider exports. Browser code uses index.js which is safe.
     // This separation prevents Node.js-only code (like __vite__injectQuery) from being
     // loaded in the browser, which would cause "Identifier already declared" errors.
+    //
+    // IMPORTANT: The 'browser' condition must come BEFORE 'node' because vitest passes
+    // custom --conditions (like 'browser') to worker processes when frameworks like Nuxt
+    // set edge/cloudflare presets. Without the 'browser' condition here, Node.js would
+    // match 'node' first, loading index-node.js which imports @vitest/browser/index.js,
+    // which imports 'ws'. With --conditions browser active, 'ws' resolves to its browser
+    // stub (ws/browser.js) that doesn't export WebSocketServer, causing a SyntaxError.
+    // See: https://github.com/voidzero-dev/vite-plus/issues/831
     if (destPkg.exports['.'] && destPkg.exports['.'].import) {
       destPkg.exports['.'].import = {
         types: destPkg.exports['.'].import.types,
+        browser: destPkg.exports['.'].import.default,
         node: './dist/index-node.js',
         default: destPkg.exports['.'].import.default,
       };

packages/test/package.json

@@ -37,6 +37,7 @@
     ".": {
       "import": {
         "types": "./dist/index.d.ts",
+        "browser": "./dist/index.js",
         "node": "./dist/index-node.js",
         "default": "./dist/index.js"
       },