vite 2.8.2 → 2.8.3

package/LICENSE.md

@@ -1241,7 +1241,6 @@ Repository: git://github.com/motdotla/dotenv.git
 ## dotenv-expand
 License: BSD-2-Clause
 By: motdotla
-Repository: https://github.com/motdotla/dotenv-expand
 
 > Copyright (c) 2016, Scott Motte
 > All rights reserved.

package/dist/node/chunks/{dep-15d13ae7.js → dep-8a5027b8.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var build = require('./dep-3d5f2596.js');
+var build = require('./dep-f9d9421a.js');
 var require$$1 = require('crypto');
 require('fs');
 require('path');

package/dist/node/chunks/{dep-50851e02.js → dep-cc251a32.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var require$$0 = require('postcss');
-var build$2 = require('./dep-3d5f2596.js');
+var build$2 = require('./dep-f9d9421a.js');
 var path$2 = require('path');
 var require$$1 = require('crypto');
 var fs = require('fs');

package/dist/node/chunks/{dep-333341a0.js → dep-d44e59ba.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var build = require('./dep-3d5f2596.js');
+var build = require('./dep-f9d9421a.js');
 
 function _mergeNamespaces(n, m) {
     for (var i = 0; i < m.length; i++) {

package/dist/node/chunks/{dep-3d5f2596.js → dep-f9d9421a.js}

@@ -2177,7 +2177,7 @@ function injectQuery(url, queryToInject) {
         pathname = pathname.slice(1);
     }
     pathname = decodeURIComponent(pathname);
-    return `${pathname}?${queryToInject}${search ? `&` + search.slice(1) : ''}${hash || ''}`;
+    return `${pathname}?${queryToInject}${search ? `&` + search.slice(1) : ''}${hash !== null && hash !== void 0 ? hash : ''}`;
 }
 const timestampRE = /\bt=\d{13}&?\b/;
 function removeTimestampQuery(url) {
@@ -2415,7 +2415,7 @@ async function processSrcSet(srcs, replacer) {
         };
     }));
     return ret.reduce((prev, { url, descriptor }, index) => {
-        descriptor = descriptor || '';
+        descriptor !== null && descriptor !== void 0 ? descriptor : (descriptor = '');
         return (prev +=
             url + ` ${descriptor}${index === ret.length - 1 ? '' : ', '}`);
     }, '');
@@ -5668,7 +5668,7 @@ const append$1 = (queue = '', stash = '', enclose = false) => {
   return utils$g.flatten(result);
 };
 
-const expand$4 = (ast, options = {}) => {
+const expand$3 = (ast, options = {}) => {
   let rangeLimit = options.rangeLimit === void 0 ? 1000 : options.rangeLimit;
 
   let walk = (node, parent = {}) => {
@@ -5748,7 +5748,7 @@ const expand$4 = (ast, options = {}) => {
   return utils$g.flatten(walk(ast));
 };
 
-var expand_1$1 = expand$4;
+var expand_1 = expand$3;
 
 var constants$6 = {
   MAX_LENGTH: 1024 * 64,
@@ -6137,7 +6137,7 @@ var parse_1$2 = parse$m;
 
 const stringify$4 = stringify$8;
 const compile = compile_1;
-const expand$3 = expand_1$1;
+const expand$2 = expand_1;
 const parse$l = parse_1$2;
 
 /**
@@ -6257,7 +6257,7 @@ braces$2.expand = (input, options = {}) => {
     input = braces$2.parse(input, options);
   }
 
-  let result = expand$3(input, options);
+  let result = expand$2(input, options);
 
   // filter out empty strings if specified
   if (options.noempty === true) {
@@ -18880,7 +18880,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         replacer: urlReplacer
     }));
     if (isModule) {
-        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-50851e02.js'); }).then(function (n) { return n.index; })).default({
+        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-cc251a32.js'); }).then(function (n) { return n.index; })).default({
             ...modulesOptions,
             getJSON(cssFileName, _modules, outputFileName) {
                 modules = _modules;
@@ -21303,7 +21303,7 @@ const assetAttrsConfig = {
 const isAsyncScriptMap = new WeakMap();
 async function traverseHtml(html, filePath, visitor) {
     // lazy load compiler
-    const { parse, transform } = await Promise.resolve().then(function () { return require('./dep-333341a0.js'); }).then(function (n) { return n.compilerDom_cjs; });
+    const { parse, transform } = await Promise.resolve().then(function () { return require('./dep-d44e59ba.js'); }).then(function (n) { return n.compilerDom_cjs; });
     // @vue/compiler-core doesn't like lowercase doctypes
     html = html.replace(/<!doctype\s/i, '<!DOCTYPE ');
     try {
@@ -23692,7 +23692,7 @@ function expandTop(str) {
     str = '\\{\\}' + str.substr(2);
   }
 
-  return expand$2(escapeBraces(str), true).map(unescapeBraces);
+  return expand$1(escapeBraces(str), true).map(unescapeBraces);
 }
 
 function embrace(str) {
@@ -23709,7 +23709,7 @@ function gte(i, y) {
   return i >= y;
 }
 
-function expand$2(str, isTop) {
+function expand$1(str, isTop) {
   var expansions = [];
 
   var m = balanced('{', '}', str);
@@ -23723,7 +23723,7 @@ function expand$2(str, isTop) {
     // {a},b}
     if (m.post.match(/,.*\}/)) {
       str = m.pre + '{' + m.body + escClose + m.post;
-      return expand$2(str);
+      return expand$1(str);
     }
     return [str];
   }
@@ -23735,10 +23735,10 @@ function expand$2(str, isTop) {
     n = parseCommaParts(m.body);
     if (n.length === 1) {
       // x{{a,b}}y ==> x{a}y x{b}y
-      n = expand$2(n[0], false).map(embrace);
+      n = expand$1(n[0], false).map(embrace);
       if (n.length === 1) {
         var post = m.post.length
-          ? expand$2(m.post, false)
+          ? expand$1(m.post, false)
           : [''];
         return post.map(function(p) {
           return m.pre + n[0] + p;
@@ -23753,7 +23753,7 @@ function expand$2(str, isTop) {
   // no need to expand pre, since it is guaranteed to be free of brace-sets
   var pre = m.pre;
   var post = m.post.length
-    ? expand$2(m.post, false)
+    ? expand$1(m.post, false)
     : [''];
 
   var N;
@@ -23797,7 +23797,7 @@ function expand$2(str, isTop) {
       N.push(c);
     }
   } else {
-    N = concatMap(n, function(el) { return expand$2(el, false) });
+    N = concatMap(n, function(el) { return expand$1(el, false) });
   }
 
   for (var j = 0; j < N.length; j++) {
@@ -23820,7 +23820,7 @@ try {
 } catch (er) {}
 
 var GLOBSTAR$1 = minimatch$3.GLOBSTAR = Minimatch$1.GLOBSTAR = {};
-var expand$1 = braceExpansion;
+var expand = braceExpansion;
 
 var plTypes = {
   '!': { open: '(?:(?!(?:', close: '))[^/]*?)'},
@@ -24065,7 +24065,7 @@ function braceExpand (pattern, options) {
     return [pattern]
   }
 
-  return expand$1(pattern)
+  return expand(pattern)
 }
 
 // parse a component of the expanded set.
@@ -29788,6 +29788,7 @@ function ssrManifestPlugin(config) {
     return {
         name: 'vite:ssr-manifest',
         generateBundle(_options, bundle) {
+            var _a;
             for (const file in bundle) {
                 const chunk = bundle[file];
                 if (chunk.type === 'chunk') {
@@ -29799,7 +29800,7 @@ function ssrManifestPlugin(config) {
                     const assetFiles = chunkToEmittedAssetsMap.get(chunk);
                     for (const id in chunk.modules) {
                         const normalizedId = normalizePath$4(path$r.relative(config.root, id));
-                        const mappedChunks = ssrManifest[normalizedId] || (ssrManifest[normalizedId] = []);
+                        const mappedChunks = (_a = ssrManifest[normalizedId]) !== null && _a !== void 0 ? _a : (ssrManifest[normalizedId] = []);
                         if (!chunk.isEntry) {
                             mappedChunks.push(base + chunk.fileName);
                         }
@@ -45048,7 +45049,7 @@ async function getCertificate(cacheDir) {
         return content;
     }
     catch {
-        const content = (await Promise.resolve().then(function () { return require('./dep-15d13ae7.js'); })).createCertificate();
+        const content = (await Promise.resolve().then(function () { return require('./dep-8a5027b8.js'); })).createCertificate();
         fs$n.promises
             .mkdir(cacheDir, { recursive: true })
             .then(() => fs$n.promises.writeFile(cachePath, content))
@@ -55956,7 +55957,7 @@ function ssrRewriteStacktrace(stack, moduleGraph) {
         .split('\n')
         .map((line) => {
         return line.replace(/^ {4}at (?:(.+?)\s+\()?(?:(.+?):(\d+)(?::(\d+))?)\)?/, (input, varName, url, line, column) => {
-            var _a;
+            var _a, _b, _c;
             if (!url)
                 return input;
             const mod = moduleGraph.urlToModuleMap.get(url);
@@ -55973,7 +55974,7 @@ function ssrRewriteStacktrace(stack, moduleGraph) {
             if (!pos.source) {
                 return input;
             }
-            const source = `${pos.source}:${pos.line || 0}:${pos.column || 0}`;
+            const source = `${pos.source}:${(_b = pos.line) !== null && _b !== void 0 ? _b : 0}:${(_c = pos.column) !== null && _c !== void 0 ? _c : 0}`;
             if (!varName || varName === 'eval') {
                 return `    at ${source}`;
             }
@@ -70625,7 +70626,7 @@ async function resolvePlugins(config, prePlugins, normalPlugins, postPlugins) {
     ].filter(Boolean);
 }
 
-var main = {exports: {}};
+var main$1 = {exports: {}};
 
 const fs = fs__default;
 const path = path__default;
@@ -70766,70 +70767,56 @@ const DotenvModule = {
   parse
 };
 
-main.exports.config = DotenvModule.config;
-main.exports.parse = DotenvModule.parse;
-main.exports = DotenvModule;
+main$1.exports.config = DotenvModule.config;
+main$1.exports.parse = DotenvModule.parse;
+main$1.exports = DotenvModule;
 
-var dotenv = main.exports;
+var dotenv = main$1.exports;
 
-function _interpolate (envValue, environment, config) {
-  const matches = envValue.match(/(.?\${*[\w]*(?::-)?[\w]*}*)/g) || [];
+var dotenvExpand = function (config) {
+  // if ignoring process.env, use a blank object
+  var environment = config.ignoreProcessEnv ? {} : process.env;
 
-  return matches.reduce(function (newEnv, match, index) {
-    const parts = /(.?)\${*([\w]*(?::-)?[\w]*)?}*/g.exec(match);
-    if (!parts || parts.length === 0) {
-      return newEnv
-    }
+  var interpolate = function (envValue) {
+    var matches = envValue.match(/(.?\${?(?:[a-zA-Z0-9_]+)?}?)/g) || [];
 
-    const prefix = parts[1];
+    return matches.reduce(function (newEnv, match) {
+      var parts = /(.?)\${?([a-zA-Z0-9_]+)?}?/g.exec(match);
+      var prefix = parts[1];
 
-    let value, replacePart;
+      var value, replacePart;
 
-    if (prefix === '\\') {
-      replacePart = parts[0];
-      value = replacePart.replace('\\$', '$');
-    } else {
-      const keyParts = parts[2].split(':-');
-      const key = keyParts[0];
-      replacePart = parts[0].substring(prefix.length);
-      // process.env value 'wins' over .env file's value
-      value = Object.prototype.hasOwnProperty.call(environment, key)
-        ? environment[key]
-        : (config.parsed[key] || keyParts[1] || '');
-
-      // If the value is found, remove nested expansions.
-      if (keyParts.length > 1 && value) {
-        const replaceNested = matches[index + 1];
-        matches[index + 1] = '';
-
-        newEnv = newEnv.replace(replaceNested, '');
-      }
-      // Resolve recursive interpolations
-      value = _interpolate(value, environment, config);
-    }
+      if (prefix === '\\') {
+        replacePart = parts[0];
+        value = replacePart.replace('\\$', '$');
+      } else {
+        var key = parts[2];
+        replacePart = parts[0].substring(prefix.length);
+        // process.env value 'wins' over .env file's value
+        value = environment.hasOwnProperty(key) ? environment[key] : (config.parsed[key] || '');
 
-    return newEnv.replace(replacePart, value)
-  }, envValue)
-}
+        // Resolve recursive interpolations
+        value = interpolate(value);
+      }
 
-function expand (config) {
-  // if ignoring process.env, use a blank object
-  const environment = config.ignoreProcessEnv ? {} : process.env;
+      return newEnv.replace(replacePart, value)
+    }, envValue)
+  };
 
-  for (const configKey in config.parsed) {
-    const value = Object.prototype.hasOwnProperty.call(environment, configKey) ? environment[configKey] : config.parsed[configKey];
+  for (var configKey in config.parsed) {
+    var value = environment.hasOwnProperty(configKey) ? environment[configKey] : config.parsed[configKey];
 
-    config.parsed[configKey] = _interpolate(value, environment, config);
+    config.parsed[configKey] = interpolate(value);
   }
 
-  for (const processKey in config.parsed) {
+  for (var processKey in config.parsed) {
     environment[processKey] = config.parsed[processKey];
   }
 
   return config
-}
+};
 
-var expand_1 = expand;
+var main = dotenvExpand;
 
 const debug = createDebugger('vite:config');
 /**
@@ -71443,7 +71430,7 @@ function loadEnv(mode, envDir, prefixes = 'VITE_') {
                 debug: ((_a = process.env.DEBUG) === null || _a === void 0 ? void 0 : _a.includes('vite:dotenv')) || undefined
             });
             // let environment variables use each other
-            expand_1({
+            main({
                 parsed,
                 // prevent process.env mutation
                 ignoreProcessEnv: true

package/dist/node/cli.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var require$$0 = require('events');
-var build = require('./chunks/dep-3d5f2596.js');
+var build = require('./chunks/dep-f9d9421a.js');
 var perf_hooks = require('perf_hooks');
 require('fs');
 require('path');
@@ -683,7 +683,7 @@ cli
     .action(async (root, options) => {
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await Promise.resolve().then(function () { return require('./chunks/dep-3d5f2596.js'); }).then(function (n) { return n.index$1; });
+    const { createServer } = await Promise.resolve().then(function () { return require('./chunks/dep-f9d9421a.js'); }).then(function (n) { return n.index$1; });
     try {
         const server = await createServer({
             root,
@@ -732,7 +732,7 @@ cli
     .option('--emptyOutDir', `[boolean] force empty outDir when it's outside of root`)
     .option('-w, --watch', `[boolean] rebuilds when modules have changed on disk`)
     .action(async (root, options) => {
-    const { build: build$1 } = await Promise.resolve().then(function () { return require('./chunks/dep-3d5f2596.js'); }).then(function (n) { return n.build$1; });
+    const { build: build$1 } = await Promise.resolve().then(function () { return require('./chunks/dep-f9d9421a.js'); }).then(function (n) { return n.build$1; });
     const buildOptions = cleanOptions(options);
     try {
         await build$1({
@@ -755,7 +755,7 @@ cli
     .command('optimize [root]')
     .option('--force', `[boolean] force the optimizer to ignore the cache and re-bundle`)
     .action(async (root, options) => {
-    const { optimizeDeps } = await Promise.resolve().then(function () { return require('./chunks/dep-3d5f2596.js'); }).then(function (n) { return n.index; });
+    const { optimizeDeps } = await Promise.resolve().then(function () { return require('./chunks/dep-f9d9421a.js'); }).then(function (n) { return n.index; });
     try {
         const config = await build.resolveConfig({
             root,
@@ -778,7 +778,7 @@ cli
     .option('--https', `[boolean] use TLS + HTTP/2`)
     .option('--open [path]', `[boolean | string] open browser on startup`)
     .action(async (root, options) => {
-    const { preview } = await Promise.resolve().then(function () { return require('./chunks/dep-3d5f2596.js'); }).then(function (n) { return n.preview$1; });
+    const { preview } = await Promise.resolve().then(function () { return require('./chunks/dep-f9d9421a.js'); }).then(function (n) { return n.preview$1; });
     try {
         const server = await preview({
             root,

package/dist/node/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var build = require('./chunks/dep-3d5f2596.js');
+var build = require('./chunks/dep-f9d9421a.js');
 require('fs');
 require('path');
 require('tty');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "2.8.2",
+  "version": "2.8.3",
   "license": "MIT",
   "author": "Evan You",
   "description": "Native-ESM powered web dev build tool",
@@ -87,7 +87,7 @@
     "cross-spawn": "^7.0.3",
     "debug": "^4.3.3",
     "dotenv": "^14.3.2",
-    "dotenv-expand": "^6.0.1",
+    "dotenv-expand": "^5.1.0",
     "es-module-lexer": "^0.9.3",
     "estree-walker": "^2.0.2",
     "etag": "^1.8.1",