vite 4.0.0-alpha.6 → 4.0.0-beta.1

package/dist/node-cjs/publicUtils.cjs

@@ -119,16 +119,16 @@ function splitVendorChunkPlugin() {
                     build: {
                         rollupOptions: {
                             output: {
-                                manualChunks: createSplitVendorChunk({}, config)
-                            }
-                        }
-                    }
+                                manualChunks: createSplitVendorChunk({}, config),
+                            },
+                        },
+                    },
                 };
             }
         },
         buildStart() {
             caches.forEach((cache) => cache.reset());
-        }
+        },
     };
 }
 
@@ -3594,12 +3594,12 @@ function normalizeAlias(o = []) {
         ? o.map(normalizeSingleAlias)
         : Object.keys(o).map((find) => normalizeSingleAlias({
             find,
-            replacement: o[find]
+            replacement: o[find],
         }));
 }
 // https://github.com/vitejs/vite/issues/1363
 // work around https://github.com/rollup/plugins/issues/759
-function normalizeSingleAlias({ find, replacement, customResolver }) {
+function normalizeSingleAlias({ find, replacement, customResolver, }) {
     if (typeof find === 'string' &&
         find.endsWith('/') &&
         replacement.endsWith('/')) {
@@ -3608,7 +3608,7 @@ function normalizeSingleAlias({ find, replacement, customResolver }) {
     }
     const alias = {
         find,
-        replacement
+        replacement,
     };
     if (customResolver) {
         alias.customResolver = customResolver;
@@ -3748,7 +3748,7 @@ function stattag (stat) {
 
 const isDebug = !!process.env.DEBUG;
 createDebugger('vite:sourcemap', {
-    onlyWhenFocused: true
+    onlyWhenFocused: true,
 });
 function genSourceMapUrl(map) {
     if (typeof map !== 'string') {
@@ -3773,10 +3773,10 @@ const alias = {
     js: 'application/javascript',
     css: 'text/css',
     html: 'text/html',
-    json: 'application/json'
+    json: 'application/json',
 };
 function send(req, res, content, type, options) {
-    const { etag = etag_1(content, { weak: true }), cacheControl = 'no-cache', headers, map } = options;
+    const { etag = etag_1(content, { weak: true }), cacheControl = 'no-cache', headers, map, } = options;
     if (res.writableEnded) {
         return;
     }
@@ -3809,7 +3809,7 @@ const LogLevels = {
     silent: 0,
     error: 1,
     warn: 2,
-    info: 3
+    info: 3,
 };
 let lastType;
 let lastMsg;
@@ -3898,7 +3898,7 @@ function createLogger(level = 'info', options = {}) {
         },
         hasErrorLogged(error) {
             return loggedErrors.has(error);
-        }
+        },
     };
     return logger;
 }
@@ -3914,7 +3914,7 @@ const ROOT_FILES = [
     // 'workspace.json',
     // 'nx.json',
     // https://github.com/lerna/lerna#lernajson
-    'lerna.json'
+    'lerna.json',
 ];
 // npm: https://docs.npmjs.com/cli/v7/using-npm/workspaces#installing-workspaces
 // yarn: https://classic.yarnpkg.com/en/docs/workspaces/#toc-how-to-use-it
@@ -4199,9 +4199,10 @@ function expand (config) {
     config.parsed[configKey] = _interpolate(value, environment, config);
   }
 
-  for (const processKey in config.parsed) {
-    environment[processKey] = config.parsed[processKey];
-  }
+  // PATCH: don't write to process.env
+  // for (const processKey in config.parsed) {
+  //   environment[processKey] = config.parsed[processKey]
+  // }
 
   return config
 }
@@ -4219,29 +4220,29 @@ function loadEnv(mode, envDir, prefixes = 'VITE_') {
         /** default file */ `.env`,
         /** local file */ `.env.local`,
         /** mode file */ `.env.${mode}`,
-        /** mode local file */ `.env.${mode}.local`
+        /** mode local file */ `.env.${mode}.local`,
     ];
     const parsed = Object.fromEntries(envFiles.flatMap((file) => {
         const path = lookupFile(envDir, [file], {
             pathOnly: true,
-            rootDir: envDir
+            rootDir: envDir,
         });
         if (!path)
             return [];
         return Object.entries(parse_1(fs$1.readFileSync(path)));
     }));
-    // let environment variables use each other
-    const expandParsed = expand_1({
-        parsed: {
-            ...process.env,
-            ...parsed
-        },
-        // prevent process.env mutation
-        ignoreProcessEnv: true
-    }).parsed;
-    Object.keys(parsed).forEach((key) => {
-        parsed[key] = expandParsed[key];
-    });
+    try {
+        // let environment variables use each other
+        expand_1({ parsed });
+    }
+    catch (e) {
+        // custom error handling until https://github.com/motdotla/dotenv-expand/issues/65 is fixed upstream
+        // check for message "TypeError: Cannot read properties of undefined (reading 'split')"
+        if (e.message.includes('split')) {
+            throw new Error('dotenv-expand failed to expand env vars. Maybe you need to escape `$`?');
+        }
+        throw e;
+    }
     // only keys that start with prefix are exposed to client
     for (const [key, value] of Object.entries(parsed)) {
         if (prefixes.some((prefix) => key.startsWith(prefix))) {
@@ -4262,7 +4263,7 @@ function loadEnv(mode, envDir, prefixes = 'VITE_') {
     }
     return env;
 }
-function resolveEnvPrefix({ envPrefix = 'VITE_' }) {
+function resolveEnvPrefix({ envPrefix = 'VITE_', }) {
     envPrefix = arraify(envPrefix);
     if (envPrefix.some((prefix) => prefix === '')) {
         throw new Error(`envPrefix option contains value '', which could lead unexpected exposure of sensitive information.`);

package/index.cjs

@@ -16,7 +16,7 @@ const asyncFunctions = [
   'optimizeDeps',
   'formatPostcssSourceMap',
   'loadConfigFromFile',
-  'preprocessCSS'
+  'preprocessCSS',
 ]
 asyncFunctions.forEach((name) => {
   module.exports[name] = (...args) =>
@@ -28,7 +28,7 @@ const unsupportedCJS = ['resolvePackageEntry', 'resolvePackageData']
 unsupportedCJS.forEach((name) => {
   module.exports[name] = () => {
     throw new Error(
-      `"${name}" is not supported in CJS build of Vite 3.\nPlease use ESM or dynamic imports \`const { ${name} } = await import('vite')\`.`
+      `"${name}" is not supported in CJS build of Vite 3.\nPlease use ESM or dynamic imports \`const { ${name} } = await import('vite')\`.`,
     )
   }
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "4.0.0-alpha.6",
+  "version": "4.0.0-beta.1",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -51,7 +51,7 @@
     "build-types-pre-patch": "tsx scripts/prePatchTypes.ts",
     "build-types-roll": "api-extractor run && rimraf temp",
     "build-types-post-patch": "tsx scripts/postPatchTypes.ts",
-    "build-types-check": "tsc --project tsconfig.check.json",
+    "build-types-check": "tsx scripts/checkBuiltTypes.ts && tsc --project tsconfig.check.json",
     "lint": "eslint --cache --ext .ts src/**",
     "format": "prettier --write --cache --parser typescript \"src/**/*.ts\"",
     "prepublishOnly": "npm run build"
@@ -61,7 +61,7 @@
     "esbuild": "^0.15.9",
     "postcss": "^8.4.19",
     "resolve": "^1.22.1",
-    "rollup": "~3.3.0"
+    "rollup": "^3.6.0"
   },
   "optionalDependencies": {
     "fsevents": "~2.3.2"
@@ -97,7 +97,7 @@
     "fast-glob": "^3.2.12",
     "http-proxy": "^1.18.1",
     "launch-editor-middleware": "^2.6.0",
-    "magic-string": "^0.26.7",
+    "magic-string": "^0.27.0",
     "micromatch": "^4.0.5",
     "mlly": "^0.5.17",
     "mrmime": "^1.0.1",
@@ -107,7 +107,7 @@
     "periscopic": "^3.0.4",
     "picocolors": "^1.0.0",
     "picomatch": "^2.3.1",
-    "postcss-import": "^15.0.0",
+    "postcss-import": "^15.0.1",
     "postcss-load-config": "^4.0.1",
     "postcss-modules": "^6.0.0",
     "resolve.exports": "^1.1.0",

package/types/customEvent.d.ts

@@ -2,7 +2,7 @@ import type {
   ErrorPayload,
   FullReloadPayload,
   PrunePayload,
-  UpdatePayload
+  UpdatePayload,
 } from './hmrPayload'
 
 export interface CustomEventMap {

package/types/hot.d.ts

@@ -12,22 +12,21 @@ export interface ViteHotContext {
   accept(dep: string, cb: (mod: ModuleNamespace | undefined) => void): void
   accept(
     deps: readonly string[],
-    cb: (mods: Array<ModuleNamespace | undefined>) => void
+    cb: (mods: Array<ModuleNamespace | undefined>) => void,
   ): void
 
   acceptExports(
     exportNames: string | readonly string[],
-    cb?: (mod: ModuleNamespace | undefined) => void
+    cb?: (mod: ModuleNamespace | undefined) => void,
   ): void
 
   dispose(cb: (data: any) => void): void
   prune(cb: (data: any) => void): void
-  decline(): void
   invalidate(message?: string): void
 
   on<T extends string>(
     event: T,
-    cb: (payload: InferCustomEventPayload<T>) => void
+    cb: (payload: InferCustomEventPayload<T>) => void,
   ): void
   send<T extends string>(event: T, data?: InferCustomEventPayload<T>): void
 }

package/types/importGlob.d.ts

@@ -1,6 +1,6 @@
 export interface ImportGlobOptions<
   Eager extends boolean,
-  AsType extends string
+  AsType extends string,
 > {
   /**
    * Import type for the import url.
@@ -45,10 +45,10 @@ export interface ImportGlobFunction {
   <
     Eager extends boolean,
     As extends string,
-    T = As extends keyof KnownAsTypeMap ? KnownAsTypeMap[As] : unknown
+    T = As extends keyof KnownAsTypeMap ? KnownAsTypeMap[As] : unknown,
   >(
     glob: string | string[],
-    options?: ImportGlobOptions<Eager, As>
+    options?: ImportGlobOptions<Eager, As>,
   ): (Eager extends true ? true : false) extends true
     ? Record<string, T>
     : Record<string, () => Promise<T>>
@@ -59,7 +59,7 @@ export interface ImportGlobFunction {
    */
   <M>(
     glob: string | string[],
-    options?: ImportGlobOptions<false, string>
+    options?: ImportGlobOptions<false, string>,
   ): Record<string, () => Promise<M>>
   /**
    * Import a list of files with a glob pattern.
@@ -68,7 +68,7 @@ export interface ImportGlobFunction {
    */
   <M>(
     glob: string | string[],
-    options: ImportGlobOptions<true, string>
+    options: ImportGlobOptions<true, string>,
   ): Record<string, M>
 }
 
@@ -80,10 +80,10 @@ export interface ImportGlobEagerFunction {
    */
   <
     As extends string,
-    T = As extends keyof KnownAsTypeMap ? KnownAsTypeMap[As] : unknown
+    T = As extends keyof KnownAsTypeMap ? KnownAsTypeMap[As] : unknown,
   >(
     glob: string | string[],
-    options?: Omit<ImportGlobOptions<boolean, As>, 'eager'>
+    options?: Omit<ImportGlobOptions<boolean, As>, 'eager'>,
   ): Record<string, T>
   /**
    * Eagerly import a list of files with a glob pattern.
@@ -92,6 +92,6 @@ export interface ImportGlobEagerFunction {
    */
   <M>(
     glob: string | string[],
-    options?: Omit<ImportGlobOptions<boolean, string>, 'eager'>
+    options?: Omit<ImportGlobOptions<boolean, string>, 'eager'>,
   ): Record<string, M>
 }