vite 2.7.9 → 2.7.13

package/dist/node/chunks/{dep-4b9dfa16.js → dep-f5552faa.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-37807119.js'); }).then(function (n) { return n.index; })).default({
+        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-61b103b4.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-0cbbc772.js'); }).then(function (n) { return n.compilerDom_cjs; });
+    const { parse, transform } = await Promise.resolve().then(function () { return require('./dep-4e5ae969.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-6e9ef787.js'); }).then(function (n) { return n.index; });
+    const { generate } = await Promise.resolve().then(function () { return require('./dep-9fc73d70.js'); }).then(function (n) { return n.index; });
     const pems = generate(null, {
         algorithm: 'sha256',
         days: 30,
@@ -50943,6 +50943,37 @@ function walk(root, { onIdentifier, onImportMeta, onDynamicImport }) {
     function isInScope(name, parents) {
         return parents.some((node) => { var _a; return node && ((_a = scopeMap.get(node)) === null || _a === void 0 ? void 0 : _a.has(name)); });
     }
+    function handlePattern(p, parentFunction) {
+        if (p.type === 'Identifier') {
+            setScope(parentFunction, p.name);
+        }
+        else if (p.type === 'RestElement') {
+            handlePattern(p.argument, parentFunction);
+        }
+        else if (p.type === 'ObjectPattern') {
+            p.properties.forEach((property) => {
+                if (property.type === 'RestElement') {
+                    setScope(parentFunction, property.argument.name);
+                }
+                else {
+                    handlePattern(property.value, parentFunction);
+                }
+            });
+        }
+        else if (p.type === 'ArrayPattern') {
+            p.elements.forEach((element) => {
+                if (element) {
+                    handlePattern(element, parentFunction);
+                }
+            });
+        }
+        else if (p.type === 'AssignmentPattern') {
+            handlePattern(p.left, parentFunction);
+        }
+        else {
+            setScope(parentFunction, p.name);
+        }
+    }
     walk$1(root, {
         enter(node, parent) {
             if (node.type === 'ImportDeclaration') {
@@ -50973,25 +51004,34 @@ function walk(root, { onIdentifier, onImportMeta, onDynamicImport }) {
                 }
                 // walk function expressions and add its arguments to known identifiers
                 // so that we don't prefix them
-                node.params.forEach((p) => walk$1(p.type === 'AssignmentPattern' ? p.left : p, {
-                    enter(child, parent) {
-                        if (child.type !== 'Identifier')
-                            return;
-                        // do not record as scope variable if is a destructuring keyword
-                        if (isStaticPropertyKey(child, parent))
-                            return;
-                        // do not record if this is a default value
-                        // assignment of a destructuring variable
-                        if (((parent === null || parent === void 0 ? void 0 : parent.type) === 'AssignmentPattern' &&
-                            (parent === null || parent === void 0 ? void 0 : parent.right) === child) ||
-                            ((parent === null || parent === void 0 ? void 0 : parent.type) === 'TemplateLiteral' &&
+                node.params.forEach((p) => {
+                    if (p.type === 'ObjectPattern' || p.type === 'ArrayPattern') {
+                        handlePattern(p, node);
+                        return;
+                    }
+                    walk$1(p.type === 'AssignmentPattern' ? p.left : p, {
+                        enter(child, parent) {
+                            // skip params default value of destructure
+                            if ((parent === null || parent === void 0 ? void 0 : parent.type) === 'AssignmentPattern' &&
+                                (parent === null || parent === void 0 ? void 0 : parent.right) === child) {
+                                return this.skip();
+                            }
+                            if (child.type !== 'Identifier')
+                                return;
+                            // do not record as scope variable if is a destructuring keyword
+                            if (isStaticPropertyKey(child, parent))
+                                return;
+                            // do not record if this is a default value
+                            // assignment of a destructuring variable
+                            if (((parent === null || parent === void 0 ? void 0 : parent.type) === 'TemplateLiteral' &&
                                 (parent === null || parent === void 0 ? void 0 : parent.expressions.includes(child))) ||
-                            ((parent === null || parent === void 0 ? void 0 : parent.type) === 'CallExpression' && (parent === null || parent === void 0 ? void 0 : parent.callee) === child)) {
-                            return;
+                                ((parent === null || parent === void 0 ? void 0 : parent.type) === 'CallExpression' && (parent === null || parent === void 0 ? void 0 : parent.callee) === child)) {
+                                return;
+                            }
+                            setScope(node, child.name);
                         }
-                        setScope(node, child.name);
-                    }
-                }));
+                    });
+                });
             }
             else if (node.type === 'Property' && parent.type === 'ObjectPattern') {
                 node.inPattern = true;
@@ -50999,36 +51039,7 @@ function walk(root, { onIdentifier, onImportMeta, onDynamicImport }) {
             else if (node.type === 'VariableDeclarator') {
                 const parentFunction = findParentFunction(parentStack);
                 if (parentFunction) {
-                    const handlePattern = (p) => {
-                        if (p.type === 'Identifier') {
-                            setScope(parentFunction, p.name);
-                        }
-                        else if (p.type === 'RestElement') {
-                            handlePattern(p.argument);
-                        }
-                        else if (p.type === 'ObjectPattern') {
-                            p.properties.forEach((property) => {
-                                if (property.type === 'RestElement') {
-                                    setScope(parentFunction, property.argument.name);
-                                }
-                                else
-                                    handlePattern(property.value);
-                            });
-                        }
-                        else if (p.type === 'ArrayPattern') {
-                            p.elements.forEach((element) => {
-                                if (element)
-                                    handlePattern(element);
-                            });
-                        }
-                        else if (p.type === 'AssignmentPattern') {
-                            handlePattern(p.left);
-                        }
-                        else {
-                            setScope(parentFunction, p.name);
-                        }
-                    };
-                    handlePattern(node.id);
+                    handlePattern(node.id, parentFunction);
                 }
             }
         },
@@ -59940,7 +59951,8 @@ function ssrRequireHookPlugin(config) {
                 return {
                     code: s.toString(),
                     map: s.generateMap({
-                        source: id
+                        source: id,
+                        hires: true
                     })
                 };
             }
@@ -60125,7 +60137,13 @@ async function nodeImport(id, importer, resolveOptions) {
             return nodeResolve(id, parent, isMain, options);
         }
         if (parent) {
-            return viteResolve(id, parent.id);
+            let resolved = viteResolve(id, parent.id);
+            if (resolved) {
+                // hookNodeResolve must use platform-specific path.normalize
+                // to be compatible with dynamicImport (#6080)
+                resolved = path__default.normalize(resolved);
+            }
+            return resolved;
         }
         // Importing a CJS module from an ESM module. In this case, the import
         // specifier is already an absolute path, so this is a no-op.
@@ -60638,7 +60656,10 @@ function resolvedAllowDir(root, dir) {
 }
 function resolveServerOptions(root, raw) {
     var _a, _b, _c, _d;
-    const server = raw || {};
+    const server = {
+        preTransformRequests: true,
+        ...raw
+    };
     let allowDirs = (_a = server.fs) === null || _a === void 0 ? void 0 : _a.allow;
     const deny = ((_b = server.fs) === null || _b === void 0 ? void 0 : _b.deny) || ['.env', '.env.*', '*.{crt,pem}'];
     if (!allowDirs) {
@@ -73940,7 +73961,7 @@ function importAnalysisPlugin(config) {
             isDebug &&
                 debug$1(`${timeFrom(start)} ${source.dim(`[${importedUrls.size} imports rewritten] ${prettyImporter}`)}`);
             // pre-transform known direct imports
-            if (staticImportedUrls.size) {
+            if (config.server.preTransformRequests && staticImportedUrls.size) {
                 staticImportedUrls.forEach((url) => {
                     transformRequest(unwrapId$1(removeImportQuery(url)), server, { ssr });
                 });
@@ -74414,7 +74435,6 @@ async function resolvePlugins(config, prePlugins, normalPlugins, postPlugins) {
             ssrConfig: config.ssr,
             asSrc: true
         }),
-        config.build.ssr ? ssrRequireHookPlugin(config) : null,
         htmlInlineScriptProxyPlugin(config),
         cssPlugin(config),
         config.esbuild !== false ? esbuildPlugin(config.esbuild) : null,
@@ -74428,6 +74448,7 @@ async function resolvePlugins(config, prePlugins, normalPlugins, postPlugins) {
         ...normalPlugins,
         definePlugin(config),
         cssPostPlugin(config),
+        config.build.ssr ? ssrRequireHookPlugin(config) : null,
         ...buildPlugins.pre,
         ...postPlugins,
         ...buildPlugins.post,
@@ -74680,10 +74701,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,
@@ -74917,28 +74938,30 @@ function mergeConfigRecursively(defaults, overrides, rootPath) {
             continue;
         }
         const existing = merged[key];
-        if (Array.isArray(existing) && Array.isArray(value)) {
-            merged[key] = [...existing, ...value];
+        if (existing == null) {
+            merged[key] = value;
+            continue;
+        }
+        // fields that require special handling
+        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 !== null && existing !== void 0 ? existing : []), ...arraify(value !== null && value !== void 0 ? value : [])];
             continue;
         }
         if (isObject$3(existing) && isObject$3(value)) {
             merged[key] = mergeConfigRecursively(existing, value, rootPath ? `${rootPath}.${key}` : key);
             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;
-            }
-        }
         merged[key] = value;
     }
     return merged;
@@ -74946,10 +74969,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({
@@ -75230,4 +75262,4 @@ exports.send = send$1;
 exports.sortUserPlugins = sortUserPlugins;
 exports.source = source;
 exports.transformWithEsbuild = transformWithEsbuild;
-//# sourceMappingURL=dep-4b9dfa16.js.map
+//# sourceMappingURL=dep-f5552faa.js.map