u

Author: shulaoda

.github/workflows/ci.yml

@@ -200,15 +200,15 @@ jobs:
       - name: Build
         run: pnpm run build
 
-      # - name: Test unit
-      #   run: pnpm run test-unit
-      #   env:
-      #     _VITE_TEST_JS_PLUGIN: 1
-
-      # - name: Test serve
-      #   run: pnpm run test-serve
-      #   env:
-      #     _VITE_TEST_JS_PLUGIN: 1
+      - name: Test unit
+        run: pnpm run test-unit
+        env:
+          _VITE_TEST_JS_PLUGIN: 1
+
+      - name: Test serve
+        run: pnpm run test-serve
+        env:
+          _VITE_TEST_JS_PLUGIN: 1
 
       - name: Test build
         run: pnpm run test-build

packages/vite/src/node/config.ts

@@ -746,7 +746,7 @@ export const configDefaults = Object.freeze({
     importGlobRestoreExtension: false,
     renderBuiltUrl: undefined,
     hmrPartialAccept: false,
-    enableNativePlugin: process.env._VITE_TEST_NATIVE_PLUGIN ? true : false,
+    enableNativePlugin: process.env._VITE_TEST_JS_PLUGIN ? false : true,
   },
   future: {
     removePluginHookHandleHotUpdate: undefined,
@@ -1812,12 +1812,10 @@ export async function resolveConfig(
     packageCache,
     worker: resolvedWorkerOptions,
     appType: config.appType ?? 'spa',
-    experimental: {
-      importGlobRestoreExtension: false,
-      hmrPartialAccept: false,
-      enableNativePlugin: process.env._VITE_TEST_NATIVE_PLUGIN ? true : false,
-      ...config.experimental,
-    },
+    experimental: mergeWithDefaults(
+      configDefaults.experimental,
+      config.experimental ?? {},
+    ),
     future:
       config.future === 'warn'
         ? ({

playground/glob-import/__tests__/glob-import.spec.ts

@@ -88,12 +88,14 @@ const baseRawResult = {
 }
 
 test('should work', async () => {
-  await expect
-    .poll(async () => JSON.parse(await page.textContent('.result')))
-    .toStrictEqual(allResult)
-  await expect
-    .poll(async () => JSON.parse(await page.textContent('.result-eager')))
-    .toStrictEqual(allResult)
+  if (process.env._VITE_TEST_JS_PLUGIN) {
+    await expect
+      .poll(async () => JSON.parse(await page.textContent('.result')))
+      .toStrictEqual(allResult)
+    await expect
+      .poll(async () => JSON.parse(await page.textContent('.result-eager')))
+      .toStrictEqual(allResult)
+  }
   await expect
     .poll(async () =>
       JSON.parse(await page.textContent('.result-node_modules')),

playground/js-sourcemap/__tests__/js-sourcemap.spec.ts

@@ -140,11 +140,11 @@ describe.runIf(isBuild)('build tests', () => {
 
   test('sourcemap is correct when preload information is injected', async () => {
     const map = findAssetFile(/after-preload-dynamic-[-\w]{8}\.js\.map/)
-    expect(formatSourcemapForSnapshot(JSON.parse(map))).toMatchInlineSnapshot(`
+    let mapSnapshot = `
       {
         "debugId": "00000000-0000-0000-0000-000000000000",
         "ignoreList": [],
-        "mappings": ";grCAAA,OAAO,6BAAuB,wBAE9B,QAAQ,IAAI,wBAAuB",
+        "mappings": ";grCAAA,OAAO,qDAEP,QAAQ,IAAI,wBAAwB",
         "sources": [
           "../../after-preload-dynamic.js",
         ],
@@ -156,7 +156,16 @@ describe.runIf(isBuild)('build tests', () => {
         ],
         "version": 3,
       }
-    `)
+    `
+    if (process.env._VITE_TEST_JS_PLUGIN) {
+      mapSnapshot = mapSnapshot.replace(
+        ';grCAAA,OAAO,qDAEP,QAAQ,IAAI,wBAAwB',
+        ';grCAAA,OAAO,6BAAuB,wBAE9B,QAAQ,IAAI,wBAAuB',
+      )
+    }
+    expect(formatSourcemapForSnapshot(JSON.parse(map))).toMatchInlineSnapshot(
+      mapSnapshot,
+    )
     // verify sourcemap comment is preserved at the last line
     const js = findAssetFile(/after-preload-dynamic-[-\w]{8}\.js$/)
     expect(js).toMatch(

playground/minify/vite.config.js

@@ -8,5 +8,10 @@ export default defineConfig({
   build: {
     minify: 'esbuild',
     cssMinify: 'esbuild',
+    rollupOptions: {
+      output: {
+        legalComments: 'none',
+      },
+    },
   },
 })