Merge branch 'main' into main

Author: Shinigami92

docs/config/index.md

@@ -78,7 +78,7 @@ export default defineConfig(async ({ command, mode }) => {
   return {
     // build specific config
   }
-}
+})
 ```
 
 ## Shared Options

packages/playground/define/__tests__/define.spec.ts

@@ -14,4 +14,10 @@ test('string', async () => {
   expect(await page.textContent('.process-as-property')).toBe(
     defines.__OBJ__.process.env.SOMEVAR
   )
+  expect(await page.textContent('.spread-object')).toBe(
+    JSON.stringify({ SOMEVAR: defines['process.env.SOMEVAR'] })
+  )
+  expect(await page.textContent('.spread-array')).toBe(
+    JSON.stringify([...defines.__STRING__])
+  )
 })

packages/playground/define/index.html

@@ -7,6 +7,8 @@ <h1>Define</h1>
 <p>Object <span class="pre object"></span></p>
 <p>Env Var <code class="env-var"></code></p>
 <p>process as property: <code class="process-as-property"></code></p>
+<p>spread object: <code class="spread-object"></code></p>
+<p>spread array: <code class="spread-array"></code></p>
 
 <script type="module">
   text('.exp', __EXP__)
@@ -16,6 +18,13 @@ <h1>Define</h1>
   text('.object', JSON.stringify(__OBJ__, null, 2))
   text('.env-var', process.env.SOMEVAR)
   text('.process-as-property', __OBJ__.process.env.SOMEVAR)
+  text(
+    '.spread-object',
+    JSON.stringify({
+      ...(process.env.SOMEVAR ? { SOMEVAR: `"${process.env.SOMEVAR}"` } : {})
+    })
+  )
+  text('.spread-array', JSON.stringify([...`"${__STRING__}"`]))
 
   function text(el, text) {
     document.querySelector(el).textContent = text

packages/plugin-vue/package.json

@@ -38,7 +38,7 @@
     "debug": "^4.3.2",
     "hash-sum": "^2.0.0",
     "rollup": "^2.38.5",
-    "slash": "^3.0.0",
+    "slash": "^4.0.0",
     "source-map": "^0.6.1"
   }
 }

packages/vite/src/node/cli.ts

@@ -30,7 +30,9 @@ interface GlobalCLIOptions {
 /**
  * removing global flags before passing as command specific sub-configs
  */
-function cleanOptions(options: GlobalCLIOptions) {
+function cleanOptions<Options extends GlobalCLIOptions>(
+  options: Options
+): Omit<Options, keyof GlobalCLIOptions> {
   const ret = { ...options }
   delete ret['--']
   delete ret.debug
@@ -86,7 +88,7 @@ cli
         configFile: options.config,
         logLevel: options.logLevel,
         clearScreen: options.clearScreen,
-        server: cleanOptions(options) as ServerOptions
+        server: cleanOptions(options)
       })
       await server.listen()
     } catch (e) {
@@ -133,7 +135,7 @@ cli
   .option('-w, --watch', `[boolean] rebuilds when modules have changed on disk`)
   .action(async (root: string, options: BuildOptions & GlobalCLIOptions) => {
     const { build } = await import('./build')
-    const buildOptions = cleanOptions(options) as BuildOptions
+    const buildOptions: BuildOptions = cleanOptions(options)
 
     try {
       await build({
@@ -195,7 +197,7 @@ cli
     async (
       root: string,
       options: {
-        host?: string
+        host?: string | boolean
         port?: number
         https?: boolean
         open?: boolean | string
@@ -218,13 +220,7 @@ cli
           'serve',
           'development'
         )
-        await preview(
-          config,
-          cleanOptions(options) as {
-            host?: string
-            port?: number
-          }
-        )
+        await preview(config, cleanOptions(options))
       } catch (e) {
         createLogger(options.logLevel).error(
           chalk.red(`error when starting preview server:\n${e.stack}`)

packages/vite/src/node/plugins/define.ts

@@ -46,7 +46,8 @@ export function definePlugin(config: ResolvedConfig): Plugin {
   }
 
   const pattern = new RegExp(
-    '(?<!\\.)\\b(' +
+    // Do not allow preceding '.', but do allow preceding '...' for spread operations
+    '(?<!(?<!\\.\\.)\\.)\\b(' +
       Object.keys(replacements)
         .map((str) => {
           return str.replace(/[-[\]/{}()*+?.\\^$|]/g, '\\$&')

packages/vite/src/node/preview.ts

@@ -3,7 +3,7 @@ import sirv from 'sirv'
 import chalk from 'chalk'
 import connect from 'connect'
 import compression from 'compression'
-import { ResolvedConfig } from '.'
+import { ResolvedConfig, ServerOptions } from '.'
 import { Connect } from 'types/connect'
 import {
   resolveHttpsConfig,
@@ -18,7 +18,7 @@ import { resolveHostname } from './utils'
 
 export async function preview(
   config: ResolvedConfig,
-  serverOptions: { host?: string; port?: number }
+  serverOptions: Pick<ServerOptions, 'port' | 'host'>
 ): Promise<void> {
   const app = connect() as Connect.Server
   const httpServer = await resolveHttpServer(

yarn.lock

@@ -6913,6 +6913,11 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
+slash@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
+  integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
+
 slice-ansi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787"