vite 2.7.11 → 2.7.12

package/dist/node/chunks/{dep-48c3e8a4.js → dep-0351185a.js}

@@ -20397,7 +20397,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         replacer: urlReplacer
     }));
     if (isModule) {
-        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-03a0dd3b.js'); }).then(function (n) { return n.index; })).default({
+        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-73d734ac.js'); }).then(function (n) { return n.index; })).default({
             ...modulesOptions,
             getJSON(cssFileName, _modules, outputFileName) {
                 modules = _modules;
@@ -21402,7 +21402,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-81908534.js'); }).then(function (n) { return n.compilerDom_cjs; });
+    const { parse, transform } = await Promise.resolve().then(function () { return require('./dep-d7204208.js'); }).then(function (n) { return n.compilerDom_cjs; });
     // @vue/compiler-core doesn't like lowercase doctypes
     html = html.replace(/<!doctype\s/i, '<!DOCTYPE ');
     try {
@@ -43719,7 +43719,7 @@ function readFileIfExists(value) {
  * https://github.com/webpack/webpack-dev-server/blob/master/LICENSE
  */
 async function createCertificate() {
-    const { generate } = await Promise.resolve().then(function () { return require('./dep-eba23f6c.js'); }).then(function (n) { return n.index; });
+    const { generate } = await Promise.resolve().then(function () { return require('./dep-374a3cfd.js'); }).then(function (n) { return n.index; });
     const pems = generate(null, {
         algorithm: 'sha256',
         days: 30,
@@ -74692,10 +74692,10 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development')
         { find: /^[\/]?@vite\/client/, replacement: () => CLIENT_ENTRY }
     ];
     // resolve alias with internal client alias
-    const resolvedAlias = mergeAlias(
+    const resolvedAlias = normalizeAlias(mergeAlias(
     // @ts-ignore because @rollup/plugin-alias' type doesn't allow function
     // replacement, but its implementation does work with function values.
-    clientAlias, ((_a = config.resolve) === null || _a === void 0 ? void 0 : _a.alias) || config.alias || []);
+    clientAlias, ((_a = config.resolve) === null || _a === void 0 ? void 0 : _a.alias) || config.alias || []));
     const resolveOptions = {
         dedupe: config.dedupe,
         ...config.resolve,
@@ -74929,22 +74929,24 @@ function mergeConfigRecursively(defaults, overrides, rootPath) {
             continue;
         }
         const existing = merged[key];
+        if (existing == null) {
+            merged[key] = value;
+            continue;
+        }
         // fields that require special handling
-        if (existing != null) {
-            if (key === 'alias' && (rootPath === 'resolve' || rootPath === '')) {
-                merged[key] = mergeAlias(existing, value);
-                continue;
-            }
-            else if (key === 'assetsInclude' && rootPath === '') {
-                merged[key] = [].concat(existing, value);
-                continue;
-            }
-            else if (key === 'noExternal' && existing === true) {
-                continue;
-            }
+        if (key === 'alias' && (rootPath === 'resolve' || rootPath === '')) {
+            merged[key] = mergeAlias(existing, value);
+            continue;
+        }
+        else if (key === 'assetsInclude' && rootPath === '') {
+            merged[key] = [].concat(existing, value);
+            continue;
+        }
+        else if (key === 'noExternal' && existing === true) {
+            continue;
         }
         if (Array.isArray(existing) || Array.isArray(value)) {
-            merged[key] = [...arraify(existing), ...arraify(value)];
+            merged[key] = [...arraify(existing !== null && existing !== void 0 ? existing : []), ...arraify(value !== null && value !== void 0 ? value : [])];
             continue;
         }
         if (isObject$3(existing) && isObject$3(value)) {
@@ -74958,10 +74960,19 @@ function mergeConfigRecursively(defaults, overrides, rootPath) {
 function mergeConfig(defaults, overrides, isRoot = true) {
     return mergeConfigRecursively(defaults, overrides, isRoot ? '' : '.');
 }
-function mergeAlias(a = [], b = []) {
-    return [...normalizeAlias(a), ...normalizeAlias(b)];
+function mergeAlias(a, b) {
+    if (!a)
+        return b;
+    if (!b)
+        return a;
+    if (isObject$3(a) && isObject$3(b)) {
+        return { ...a, ...b };
+    }
+    // the order is flipped because the alias is resolved from top-down,
+    // where the later should have higher priority
+    return [...normalizeAlias(b), ...normalizeAlias(a)];
 }
-function normalizeAlias(o) {
+function normalizeAlias(o = []) {
     return Array.isArray(o)
         ? o.map(normalizeSingleAlias)
         : Object.keys(o).map((find) => normalizeSingleAlias({
@@ -75242,4 +75253,4 @@ exports.send = send$1;
 exports.sortUserPlugins = sortUserPlugins;
 exports.source = source;
 exports.transformWithEsbuild = transformWithEsbuild;
-//# sourceMappingURL=dep-48c3e8a4.js.map
+//# sourceMappingURL=dep-0351185a.js.map