chore: rebase

docs/guide/features.md

@@ -187,7 +187,7 @@ document.getElementById('foo').className = applyColor
 
 ### CSS Pre-processors
 
-Because Vite targets modern browsers only, it is recommended to use native CSS variables with PostCSS plugins that implement CSSWG drafts (e.g. [postcss-nesting](https://github.com/jonathantneal/postcss-nesting)) and author plain, future-standards-compliant CSS.
+Because Vite targets modern browsers only, it is recommended to use native CSS variables with PostCSS plugins that implement CSSWG drafts (e.g. [postcss-nesting](https://github.com/csstools/postcss-plugins/tree/main/plugins/postcss-nesting)) and author plain, future-standards-compliant CSS.
 
 That said, Vite does provide built-in support for `.scss`, `.sass`, `.less`, `.styl` and `.stylus` files. There is no need to install Vite-specific plugins for them, but the corresponding pre-processor itself must be installed:
 

packages/playground/hmr/__tests__/hmr.spec.ts

@@ -162,15 +162,15 @@ if (!isBuild) {
   })
 
   test('not loaded dynamic import', async () => {
-    await page.goto(viteTestUrl + '/dynamic-import/index.html')
+    await page.goto(viteTestUrl + '/counter/index.html')
 
     let btn = await page.$('button')
     expect(await btn.textContent()).toBe('Counter 0')
     await btn.click()
     expect(await btn.textContent()).toBe('Counter 1')
 
     // Modifying `index.ts` triggers a page reload, as expected
-    editFile('dynamic-import/index.ts', (code) => code)
+    editFile('counter/index.ts', (code) => code)
     await page.waitForNavigation()
     btn = await page.$('button')
     expect(await btn.textContent()).toBe('Counter 0')
@@ -184,7 +184,7 @@ if (!isBuild) {
     // (Note that, a dynamic import that is never loaded and that does not
     // define `accept.module.hot.accept` may wrongfully trigger a full page
     // reload, see discussion at #7561.)
-    editFile('dynamic-import/dep.ts', (code) => code)
+    editFile('counter/dep.ts', (code) => code)
     try {
       await page.waitForNavigation({ timeout: 1000 })
     } catch (err) {
@@ -194,4 +194,16 @@ if (!isBuild) {
     btn = await page.$('button')
     expect(await btn.textContent()).toBe('Counter 1')
   })
+
+  test('HTML', async () => {
+    await page.goto(viteTestUrl + '/counter/index.html')
+    let btn = await page.$('button')
+    expect(await btn.textContent()).toBe('Counter 0')
+    editFile('counter/index.html', (code) =>
+      code.replace('Counter', 'Compteur')
+    )
+    await page.waitForNavigation()
+    btn = await page.$('button')
+    expect(await btn.textContent()).toBe('Compteur 0')
+  })
 }

packages/playground/worker/__tests__/es/es-worker.spec.ts

@@ -51,16 +51,20 @@ test.concurrent.each([[true], [false]])('shared worker', async (doTick) => {
   await waitSharedWorkerTick(page)
 })
 
-test('worker emitted', async () => {
-  await untilUpdated(() => page.textContent('.nested-worker'), 'pong')
+test('worker emitted and import.meta.url in nested worker (serve)', async () => {
+  expect(await page.textContent('.nested-worker')).toMatch('/worker-nested')
+  expect(await page.textContent('.nested-worker-module')).toMatch('/sub-worker')
+  expect(await page.textContent('.nested-worker-constructor')).toMatch(
+    '"type":"constructor"'
+  )
 })
 
 if (isBuild) {
   const assetsDir = path.resolve(testDir, 'dist/es/assets')
   // assert correct files
   test('inlined code generation', async () => {
     const files = fs.readdirSync(assetsDir)
-    expect(files.length).toBe(23)
+    expect(files.length).toBe(26)
     const index = files.find((f) => f.includes('main-module'))
     const content = fs.readFileSync(path.resolve(assetsDir, index), 'utf-8')
     const worker = files.find((f) => f.includes('my-worker'))
@@ -79,6 +83,15 @@ if (isBuild) {
     expect(content).toMatch(`(window.URL||window.webkitURL).createObjectURL`)
     expect(content).toMatch(`window.Blob`)
   })
+
+  test('worker emitted and import.meta.url in nested worker (build)', async () => {
+    expect(await page.textContent('.nested-worker-module')).toMatch(
+      '"type":"module"'
+    )
+    expect(await page.textContent('.nested-worker-constructor')).toMatch(
+      '"type":"constructor"'
+    )
+  })
 }
 
 test('module worker', async () => {
@@ -106,3 +119,11 @@ test('url query worker', async () => {
     'Hello from simple worker!'
   )
 })
+
+test('import.meta.glob in worker', async () => {
+  expect(await page.textContent('.importMetaGlob-worker')).toMatch('["')
+})
+
+test('import.meta.globEager in worker', async () => {
+  expect(await page.textContent('.importMetaGlobEager-worker')).toMatch('["')
+})

packages/playground/worker/__tests__/iife/worker.spec.ts

@@ -51,10 +51,11 @@ test.concurrent.each([[true], [false]])('shared worker', async (doTick) => {
   await waitSharedWorkerTick(page)
 })
 
-test('worker emitted and import.meta.url in nested worker', async () => {
-  await untilUpdated(
-    () => page.textContent('.nested-worker'),
-    'pong http://localhost:3000/iife/sub-worker.js?worker_file'
+test('worker emitted and import.meta.url in nested worker (serve)', async () => {
+  expect(await page.textContent('.nested-worker')).toMatch('/worker-nested')
+  expect(await page.textContent('.nested-worker-module')).toMatch('/sub-worker')
+  expect(await page.textContent('.nested-worker-constructor')).toMatch(
+    '"type":"constructor"'
   )
 })
 
@@ -82,6 +83,15 @@ if (isBuild) {
     expect(content).toMatch(`(window.URL||window.webkitURL).createObjectURL`)
     expect(content).toMatch(`window.Blob`)
   })
+
+  test('worker emitted and import.meta.url in nested worker (build)', async () => {
+    expect(await page.textContent('.nested-worker-module')).toMatch(
+      '"type":"module"'
+    )
+    expect(await page.textContent('.nested-worker-constructor')).toMatch(
+      '"type":"constructor"'
+    )
+  })
 }
 
 test('module worker', async () => {
@@ -100,3 +110,7 @@ test('url query worker', async () => {
     'Hello from simple worker!'
   )
 })
+
+test('import.meta.globEager in worker', async () => {
+  expect(await page.textContent('.importMetaGlobEager-worker')).toMatch('["')
+})

packages/playground/worker/classic-shared-worker.js

@@ -4,3 +4,6 @@ self.onconnect = (event) => {
   const port = event.ports[0]
   port.postMessage(self.constant)
 }
+
+// for sourcemap
+console.log('classic-shared-worker.js')

packages/playground/worker/classic-worker.js

@@ -3,3 +3,6 @@ importScripts(`/${self.location.pathname.split("/")[1]}/classic.js`)
 self.addEventListener('message', () => {
   self.postMessage(self.constant)
 })
+
+// for sourcemap
+console.log("classic-worker.js")

packages/playground/worker/emit-chunk-dynamic-import-worker.js

@@ -1,3 +1,6 @@
-import('./modules/module').then((module) => {
+import('./modules/module0').then((module) => {
   self.postMessage(module.default + import.meta.env.BASE_URL)
 })
+
+// for sourcemap
+console.log('emit-chunk-dynamic-import-worker.js')

packages/playground/worker/emit-chunk-nested-worker.js

@@ -26,3 +26,6 @@ import('./module-and-worker').then((res) => {
     data: res.module
   })
 })
+
+// for sourcemap
+console.log('emit-chunk-nested-worker.js')

packages/playground/worker/emit-chunk-sub-worker.js

@@ -6,3 +6,6 @@ Promise.all([
   const _data = { ...data[0], ...data[1], ...data[2] }
   self.postMessage(_data)
 })
+
+// for sourcemap
+console.log('emit-chunk-sub-worker.js')

packages/playground/worker/importMetaGlob.worker.js

@@ -0,0 +1,8 @@
+const modules = import.meta.glob('./modules/*js')
+
+self.onmessage = function (e) {
+  self.postMessage(Object.keys(modules))
+}
+
+// for sourcemap
+console.log('importMetaGlob.worker.js')

packages/playground/worker/importMetaGlobEager.worker.js

@@ -0,0 +1,8 @@
+const modules = import.meta.globEager('./modules/*js')
+
+self.onmessage = function (e) {
+  self.postMessage(Object.keys(modules))
+}
+
+// for sourcemap
+console.log('importMetaGlobEager.worker.js')

packages/playground/worker/index.html

@@ -40,11 +40,25 @@ <h2 class="format-iife">format iife:</h2>
 <code class="shared-worker-import-meta-url"></code>
 
 <p>
-  import NestedWorker from './worker-nested-worker?worker' - nested worker
+  import NestedWorker from './worker-nested-worker?worker' - import.meta.url
   <span class="classname">.nested-worker</span>
 </p>
 <code class="nested-worker"></code>
 
+<p>
+  import NestedWorker from './worker-nested-worker?worker' - nested module
+  worker
+  <span class="classname">.nested-worker-module</span>
+</p>
+<code class="nested-worker-module"></code>
+
+<p>
+  import NestedWorker from './worker-nested-worker?worker' - nested worker
+  constructor
+  <span class="classname">.nested-worker-constructor</span>
+</p>
+<code class="nested-worker-constructor"></code>
+
 <p>
   new Worker(new URL('./classic-worker.js', import.meta.url))
   <span class="classname">.classic-worker</span>
@@ -64,9 +78,22 @@ <h2 class="format-iife">format iife:</h2>
 </p>
 <code class="simple-worker-url"></code>
 
+<p>
+  use import.meta.globEager in iife worker
+  <span class="classname">.importMetaGlobEager-worker</span>
+</p>
+<code class="importMetaGlobEager-worker"></code>
+
 <hr />
+
 <h2 class="format-es"></h2>
 
+<p>
+  use import.meta.glob in es worker
+  <span class="classname">.importMetaGlob-worker</span>
+</p>
+<code class="importMetaGlob-worker"></code>
+
 <p>
   worker emit chunk <br />
   module and worker:worker in worker file <br />

packages/playground/worker/module-and-worker.js

@@ -1,5 +1,8 @@
-import constant from './modules/module'
+import constant from './modules/module0'
 
 self.postMessage(constant)
 
 export const module = 'module and worker'
+
+// for sourcemap
+console.log('module-and-worker.js')

packages/playground/worker/modules/module2.js

@@ -1,3 +1,3 @@
-export * from './module'
+export * from './module0'
 export * from './module1'
 export const msg2 = 'module2'

packages/playground/worker/modules/module3.js

@@ -1,2 +1,2 @@
-export * from './module'
+export * from './module0'
 export const msg3 = 'module3'

packages/playground/worker/my-shared-worker.ts

@@ -14,3 +14,6 @@ onconnect = (event) => {
     }
   }
 }
+
+// for sourcemap
+console.log('my-shared-worker.js')

packages/playground/worker/my-worker.ts

@@ -6,3 +6,6 @@ self.onmessage = (e) => {
     self.postMessage({ msg, mode, bundleWithPlugin })
   }
 }
+
+// for sourcemap
+console.log('my-worker.js')

packages/playground/worker/possible-ts-output-worker.mjs

@@ -5,3 +5,6 @@ self.onmessage = (e) => {
     self.postMessage({ msg, mode })
   }
 }
+
+// for sourcemap
+console.log('possible-ts-output-worker.mjs')

packages/playground/worker/sub-worker.js

@@ -1,5 +1,8 @@
 self.onmessage = (event) => {
   if (event.data === 'ping') {
-    self.postMessage(`pong ${import.meta.url}`)
+    self.postMessage(`pong ${self.location.href}`)
   }
 }
+
+// for sourcemap
+console.log('sub-worker.js')

packages/playground/worker/url-shared-worker.js

@@ -1,6 +1,9 @@
-import constant from './modules/module'
+import constant from './modules/module0'
 
 self.onconnect = (event) => {
   const port = event.ports[0]
   port.postMessage(constant)
 }
+
+// for sourcemap
+console.log('url-shared-worker.js')

packages/playground/worker/url-worker.js

@@ -1 +1,4 @@
-self.postMessage('A string' + import.meta.env.BASE_URL + import.meta.url)
+self.postMessage('A string' + import.meta.env.BASE_URL + self.location.url)
+
+// for sourcemap
+console.log('url-worker.js')

packages/playground/worker/worker-nested-worker.js

@@ -8,6 +8,24 @@ self.onmessage = (event) => {
   }
 }
 
-subWorker.onmessage = (event) => {
-  self.postMessage(event.data)
+self.postMessage(self.location.href)
+
+subWorker.onmessage = (ev) => {
+  self.postMessage({
+    type: 'module',
+    data: ev.data
+  })
 }
+
+const classicWorker = new Worker(new URL('./url-worker.js', import.meta.url), {
+  type: 'module'
+})
+classicWorker.addEventListener('message', (ev) => {
+  self.postMessage({
+    type: 'constructor',
+    data: ev.data
+  })
+})
+
+// for sourcemap
+console.log('worker-nested-worker.js')

packages/playground/worker/worker/main-format-es.js

@@ -1,5 +1,6 @@
 // run when format es
 import NestedWorker from '../emit-chunk-nested-worker?worker'
+import ImportMetaGlobWorker from '../importMetaGlob.worker?worker'
 
 function text(el, text) {
   document.querySelector(el).textContent = text
@@ -39,3 +40,11 @@ const moduleWorker = new Worker(
 moduleWorker.addEventListener('message', (ev) => {
   text('.module-and-worker-worker', JSON.stringify(ev.data))
 })
+
+const importMetaGlobWorker = new ImportMetaGlobWorker()
+
+importMetaGlobWorker.postMessage('1')
+
+importMetaGlobWorker.addEventListener('message', (e) => {
+  text('.importMetaGlob-worker', JSON.stringify(e.data))
+})

packages/playground/worker/worker/main-module.js

@@ -3,6 +3,7 @@ import InlineWorker from '../my-worker?worker&inline'
 import mySharedWorker from '../my-shared-worker?sharedworker&name=shared'
 import TSOutputWorker from '../possible-ts-output-worker?worker'
 import NestedWorker from '../worker-nested-worker?worker'
+import ImportMetaGlobEagerWorker from '../importMetaGlobEager.worker?worker'
 import { mode } from '../modules/workerImport'
 
 function text(el, text) {
@@ -56,6 +57,13 @@ const nestedWorker = new NestedWorker()
 nestedWorker.addEventListener('message', (ev) => {
   if (typeof ev.data === 'string') {
     text('.nested-worker', JSON.stringify(ev.data))
+  } else if (typeof ev.data === 'object') {
+    const data = ev.data
+    if (data.type === 'module') {
+      text('.nested-worker-module', JSON.stringify(ev.data))
+    } else if (data.type === 'constructor') {
+      text('.nested-worker-constructor', JSON.stringify(ev.data))
+    }
   }
 })
 nestedWorker.postMessage('ping')
@@ -83,3 +91,11 @@ w2.port.addEventListener('message', (ev) => {
   text('.shared-worker-import-meta-url', JSON.stringify(ev.data))
 })
 w2.port.start()
+
+const importMetaGlobEagerWorker = new ImportMetaGlobEagerWorker()
+
+importMetaGlobEagerWorker.postMessage('1')
+
+importMetaGlobEagerWorker.addEventListener('message', (e) => {
+  text('.importMetaGlobEager-worker', JSON.stringify(e.data))
+})