.gitignore

@@ -10,4 +10,4 @@ explorations
 *.local
 /packages/vite/LICENSE
 *.cpuprofile
-.vscode/
+/.vscode/

docs/guide/env-and-mode.md

@@ -16,7 +16,7 @@ Vite exposes env variables on the special **`import.meta.env`** object. Some bui
 
 During production, these env variables are **statically replaced**. It is therefore necessary to always reference them using the full static string. For example, dynamic key access like `import.meta.env[key]` will not work.
 
-It will also replace these strings appearing in JavaScript strings and Vue templates. This should be a rare case, but it can be unintended. There are ways to work around this behavior:
+It will also replace these strings appearing in JavaScript strings and Vue templates. This should be a rare case, but it can be unintended. You may see errors like `Missing Semicolon` or `Unexpected token` in this case, for example when `"process.env.NODE_ENV: "` is transformed to `""development": "`. There are ways to work around this behavior:
 
 - For JavaScript strings, you can break the string up with a unicode zero-width space, e.g. `'import.meta\u200b.env.MODE'`.
 
@@ -44,7 +44,7 @@ VITE_SOME_KEY=123
 
 Only `VITE_SOME_KEY` will be exposed as `import.meta.env.VITE_SOME_KEY` to your client source code, but `DB_PASSWORD` will not.
 
-If you want to customize env variables prefix, see [envPrefix](/config/index#envPrefix) option.
+If you want to customize env variables prefix, see [envPrefix](/config/index#envprefix) option.
 
 :::warning SECURITY NOTES
 

package.json

@@ -55,7 +55,7 @@
     "ts-jest": "^27.0.4",
     "ts-node": "^10.1.0",
     "typescript": "^4.3.5",
-    "vitepress": "^0.16.0",
+    "vitepress": "^0.17.0",
     "yorkie": "^2.0.0"
   },
   "peerDependencies": {

packages/create-vite/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [2.6.2](https://github.com/vitejs/vite/compare/create-vite@2.6.1...create-vite@2.6.2) (2021-09-07)
+
+
+
 ## [2.6.1](https://github.com/vitejs/vite/compare/create-vite@2.5.4...create-vite@2.6.1) (2021-08-31)
 
 

packages/create-vite/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-vite",
-  "version": "2.6.1",
+  "version": "2.6.2",
   "license": "MIT",
   "author": "Evan You",
   "bin": {

packages/create-vite/template-lit-element-ts/package.json

@@ -18,7 +18,7 @@
     "lit-element": "^2.4.0"
   },
   "devDependencies": {
-    "vite": "^2.5.2",
+    "vite": "^2.5.4",
     "typescript": "^4.3.2"
   }
 }

packages/create-vite/template-lit-element/package.json

@@ -16,6 +16,6 @@
     "lit-element": "^2.4.0"
   },
   "devDependencies": {
-    "vite": "^2.5.2"
+    "vite": "^2.5.4"
   }
 }

packages/create-vite/template-preact-ts/package.json

@@ -12,6 +12,6 @@
   "devDependencies": {
     "@preact/preset-vite": "^2.0.0",
     "typescript": "^4.3.2",
-    "vite": "^2.5.2"
+    "vite": "^2.5.4"
   }
 }

packages/create-vite/template-preact/package.json

@@ -11,6 +11,6 @@
   },
   "devDependencies": {
     "@preact/preset-vite": "^2.0.0",
-    "vite": "^2.5.2"
+    "vite": "^2.5.4"
   }
 }

packages/create-vite/template-react-ts/package.json

@@ -15,6 +15,6 @@
     "@types/react-dom": "^17.0.0",
     "@vitejs/plugin-react-refresh": "^1.3.1",
     "typescript": "^4.3.2",
-    "vite": "^2.5.2"
+    "vite": "^2.5.4"
   }
 }

packages/create-vite/template-react/package.json

@@ -12,6 +12,6 @@
   },
   "devDependencies": {
     "@vitejs/plugin-react-refresh": "^1.3.1",
-    "vite": "^2.5.2"
+    "vite": "^2.5.4"
   }
 }

packages/create-vite/template-svelte-ts/package.json

@@ -16,6 +16,6 @@
     "svelte-preprocess": "^4.7.2",
     "tslib": "^2.2.0",
     "typescript": "^4.3.2",
-    "vite": "^2.5.2"
+    "vite": "^2.5.4"
   }
 }

packages/create-vite/template-svelte/package.json

@@ -10,6 +10,6 @@
   "devDependencies": {
     "@sveltejs/vite-plugin-svelte": "^1.0.0-next.11",
     "svelte": "^3.37.0",
-    "vite": "^2.5.2"
+    "vite": "^2.5.4"
   }
 }

packages/create-vite/template-vanilla-ts/package.json

@@ -8,6 +8,6 @@
   },
   "devDependencies": {
     "typescript": "^4.3.2",
-    "vite": "^2.5.2"
+    "vite": "^2.5.4"
   }
 }

packages/create-vite/template-vanilla/package.json

@@ -7,6 +7,6 @@
     "serve": "vite preview"
   },
   "devDependencies": {
-    "vite": "^2.5.2"
+    "vite": "^2.5.4"
   }
 }

packages/create-vite/template-vue-ts/.vscode/extensions.json

@@ -0,0 +1,3 @@
+{
+  "recommendations": ["johnsoncodehk.volar"]
+}

packages/create-vite/template-vue-ts/README.md

@@ -1,6 +1,6 @@
 # Vue 3 + Typescript + Vite
 
-This template should help get you started developing with Vue 3 and Typescript in Vite.
+This template should help get you started developing with Vue 3 and Typescript in Vite. The template uses Vue 3 `<script setup>` SFCs, check out the [script setup docs](https://v3.vuejs.org/api/sfc-script-setup.html#sfc-script-setup) to learn more.
 
 ## Recommended IDE Setup
 

packages/create-vite/template-vue-ts/package.json

@@ -10,10 +10,10 @@
     "vue": "^3.2.6"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "^1.6.0",
+    "@vitejs/plugin-vue": "^1.6.1",
     "@vue/compiler-sfc": "^3.2.6",
     "typescript": "^4.3.2",
-    "vite": "^2.5.2",
+    "vite": "^2.5.4",
     "vue-tsc": "^0.2.2"
   }
 }

packages/create-vite/template-vue/.vscode/extensions.json

@@ -0,0 +1,3 @@
+{
+  "recommendations": ["johnsoncodehk.volar"]
+}

packages/create-vite/template-vue/README.md

@@ -0,0 +1,7 @@
+# Vue 3 + Vite
+
+This template should help get you started developing with Vue 3 in Vite. The template uses Vue 3 `<script setup>` SFCs, check out the [script setup docs](https://v3.vuejs.org/api/sfc-script-setup.html#sfc-script-setup) to learn more.
+
+## Recommended IDE Setup
+
+- [VSCode](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=johnsoncodehk.volar)

packages/create-vite/template-vue/package.json

@@ -10,8 +10,8 @@
     "vue": "^3.2.6"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "^1.6.0",
+    "@vitejs/plugin-vue": "^1.6.1",
     "@vue/compiler-sfc": "^3.2.6",
-    "vite": "^2.5.2"
+    "vite": "^2.5.4"
   }
 }

packages/playground/legacy/__tests__/ssr/legacy-ssr.spec.ts

@@ -0,0 +1,20 @@
+import { isBuild } from '../../../testUtils'
+import { port } from './serve'
+
+const url = `http://localhost:${port}`
+
+if (isBuild) {
+  test('should work', async () => {
+    await page.goto(url)
+    expect(await page.textContent('#app')).toMatch('Hello')
+  })
+
+  test('import.meta.env.LEGACY', async () => {
+    // SSR build is always modern
+    expect(await page.textContent('#env')).toMatch('false')
+  })
+} else {
+  // this test doesn't support serve mode
+  // must contain at least one test
+  test('should work', () => void 0)
+}

packages/playground/legacy/__tests__/ssr/serve.js

@@ -0,0 +1,52 @@
+// @ts-check
+// this is automtically detected by scripts/jestPerTestSetup.ts and will replace
+// the default e2e test serve behavior
+const path = require('path')
+
+const port = (exports.port = 9527)
+
+/**
+ * @param {string} root
+ * @param {boolean} _isProd
+ */
+exports.serve = async function serve(root, _isProd) {
+  const { build } = require('vite')
+  await build({
+    root,
+    logLevel: 'silent',
+    build: {
+      target: 'esnext',
+      ssr: 'entry-server.js',
+      outDir: 'dist/server'
+    }
+  })
+
+  const express = require('express')
+  const app = express()
+
+  app.use('/', async (_req, res) => {
+    const { render } = require(path.resolve(
+      root,
+      './dist/server/entry-server.js'
+    ))
+    const html = await render()
+    res.status(200).set({ 'Content-Type': 'text/html' }).end(html)
+  })
+
+  return new Promise((resolve, reject) => {
+    try {
+      const server = app.listen(port, () => {
+        resolve({
+          // for test teardown
+          async close() {
+            await new Promise((resolve) => {
+              server.close(resolve)
+            })
+          }
+        })
+      })
+    } catch (e) {
+      reject(e)
+    }
+  })
+}

packages/playground/legacy/entry-server.js

@@ -0,0 +1,7 @@
+// This counts as 'server-side' rendering, yes?
+export async function render() {
+  return /* html */ `
+    <div id="app">Hello</div>
+    <div id="env">${import.meta.env.LEGACY}</div>
+  `
+}

packages/playground/vue-jsx/Script.vue

@@ -0,0 +1,14 @@
+<script lang="jsx">
+import { defineComponent, ref } from 'vue'
+
+export default defineComponent(() => {
+  const count = ref(4)
+  const inc = () => count.value++
+
+  return () => (
+    <button class="script" onClick={inc}>
+      script {count.value}
+    </button>
+  )
+})
+</script>

packages/playground/vue-jsx/SrcImport.jsx

@@ -0,0 +1,12 @@
+import { defineComponent, ref } from 'vue'
+
+export default defineComponent(() => {
+  const count = ref(5)
+  const inc = () => count.value++
+
+  return () => (
+    <button class="src-import" onClick={inc}>
+      src import {count.value}
+    </button>
+  )
+})

packages/playground/vue-jsx/SrcImport.vue

@@ -0,0 +1 @@
+<script src="./SrcImport.jsx"></script>

packages/playground/vue-jsx/__tests__/vue-jsx.spec.ts

@@ -5,6 +5,8 @@ test('should render', async () => {
   expect(await page.textContent('.named-specifier')).toMatch('1')
   expect(await page.textContent('.default')).toMatch('2')
   expect(await page.textContent('.default-tsx')).toMatch('3')
+  expect(await page.textContent('.script')).toMatch('4')
+  expect(await page.textContent('.src-import')).toMatch('5')
   expect(await page.textContent('.other-ext')).toMatch('Other Ext')
 })
 
@@ -17,6 +19,10 @@ test('should update', async () => {
   expect(await page.textContent('.default')).toMatch('3')
   await page.click('.default-tsx')
   expect(await page.textContent('.default-tsx')).toMatch('4')
+  await page.click('.script')
+  expect(await page.textContent('.script')).toMatch('5')
+  await page.click('.src-import')
+  expect(await page.textContent('.src-import')).toMatch('6')
 })
 
 if (!isBuild) {
@@ -74,4 +80,26 @@ if (!isBuild) {
     // should not affect other components on the page
     expect(await page.textContent('.named')).toMatch('1')
   })
+
+  test('hmr: script in .vue', async () => {
+    editFile('Script.vue', (code) =>
+      code.replace('script {count', 'script updated {count')
+    )
+    await untilUpdated(() => page.textContent('.script'), 'script updated 4')
+
+    expect(await page.textContent('.src-import')).toMatch('6')
+  })
+
+  test('hmr: src import in .vue', async () => {
+    await page.click('.script')
+    editFile('SrcImport.jsx', (code) =>
+      code.replace('src import {count', 'src import updated {count')
+    )
+    await untilUpdated(
+      () => page.textContent('.src-import'),
+      'src import updated 5'
+    )
+
+    expect(await page.textContent('.script')).toMatch('5')
+  })
 }

packages/playground/vue-jsx/main.jsx

@@ -2,6 +2,8 @@ import { createApp } from 'vue'
 import { Named, NamedSpec, default as Default } from './Comps'
 import { default as TsxDefault } from './Comp'
 import OtherExt from './OtherExt.tesx'
+import JsxScript from './Script.vue'
+import JsxSrcImport from './SrcImport.vue'
 
 function App() {
   return (
@@ -11,6 +13,8 @@ function App() {
       <Default />
       <TsxDefault />
       <OtherExt />
+      <JsxScript />
+      <JsxSrcImport />
     </>
   )
 }

packages/playground/vue-jsx/package.json

@@ -9,6 +9,7 @@
     "serve": "vite preview"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue-jsx": "^1.0.0"
+    "@vitejs/plugin-vue-jsx": "^1.0.0",
+    "@vitejs/plugin-vue": "^1.3.0"
   }
 }

packages/playground/vue-jsx/vite.config.js

@@ -1,4 +1,5 @@
 const vueJsxPlugin = require('@vitejs/plugin-vue-jsx')
+const vuePlugin = require('@vitejs/plugin-vue')
 
 /**
  * @type {import('vite').UserConfig}
@@ -7,7 +8,8 @@ module.exports = {
   plugins: [
     vueJsxPlugin({
       include: [/\.tesx$/, /\.[jt]sx$/]
-    })
+    }),
+    vuePlugin()
   ],
   build: {
     // to make tests faster

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

@@ -65,5 +65,6 @@ if (isBuild) {
     expect(content).toMatch(`new SharedWorker("/assets`)
     // inlined
     expect(content).toMatch(`(window.URL||window.webkitURL).createObjectURL`)
+    expect(content).toMatch(`window.Blob`)
   })
 }