vite 2.6.6 → 2.6.10

package/dist/node/chunks/{dep-713b45e1.js → dep-be032392.js}

@@ -20243,7 +20243,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         replacer: urlReplacer
     }));
     if (isModule) {
-        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-8fc3d0a8.js'); }).then(function (n) { return n.index; })).default({
+        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-8e7741a0.js'); }).then(function (n) { return n.index; })).default({
             ...modulesOptions,
             getJSON(cssFileName, _modules, outputFileName) {
                 modules = _modules;
@@ -21156,9 +21156,9 @@ function polyfill() {
 
 const htmlProxyRE = /\?html-proxy&index=(\d+)\.js$/;
 const isHTMLProxy = (id) => htmlProxyRE.test(id);
-const htmlCommentRE = /<!--[\s\S]*?-->/g;
-const scriptModuleRE$1 = /(<script\b[^>]*type\s*=\s*(?:"module"|'module')[^>]*>)(.*?)<\/script>/gims;
-function htmlInlineScriptProxyPlugin() {
+// HTML Proxy Caches are stored by config -> filePath -> index
+const htmlProxyMap = new WeakMap();
+function htmlInlineScriptProxyPlugin(config) {
     return {
         name: 'vite:html-inline-script-proxy',
         resolveId(id) {
@@ -21166,27 +21166,36 @@ function htmlInlineScriptProxyPlugin() {
                 return id;
             }
         },
+        buildStart() {
+            htmlProxyMap.set(config, new Map());
+        },
         load(id) {
             const proxyMatch = id.match(htmlProxyRE);
             if (proxyMatch) {
                 const index = Number(proxyMatch[1]);
                 const file = cleanUrl(id);
-                const html = fs__default.readFileSync(file, 'utf-8').replace(htmlCommentRE, '');
-                let match;
-                scriptModuleRE$1.lastIndex = 0;
-                for (let i = 0; i <= index; i++) {
-                    match = scriptModuleRE$1.exec(html);
-                }
-                if (match) {
-                    return match[2];
+                const url = file.replace(config.root, '');
+                const result = htmlProxyMap.get(config).get(url)[index];
+                if (result) {
+                    return result;
                 }
                 else {
-                    throw new Error(`No matching html proxy module found from ${id}`);
+                    throw new Error(`No matching HTML proxy module found from ${id}`);
                 }
             }
         }
     };
 }
+/** Add script to cache */
+function addToHTMLProxyCache(config, filePath, index, code) {
+    if (!htmlProxyMap.get(config)) {
+        htmlProxyMap.set(config, new Map());
+    }
+    if (!htmlProxyMap.get(config).get(filePath)) {
+        htmlProxyMap.get(config).set(filePath, []);
+    }
+    htmlProxyMap.get(config).get(filePath)[index] = code;
+}
 // this extends the config in @vue/compiler-sfc with <link href>
 const assetAttrsConfig = {
     link: ['href'],
@@ -21199,7 +21208,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-6a58f2f7.js'); }).then(function (n) { return n.compilerDom_cjs; });
+    const { parse, transform } = await Promise.resolve().then(function () { return require('./dep-9b6b378f.js'); }).then(function (n) { return n.compilerDom_cjs; });
     // @vue/compiler-core doesn't like lowercase doctypes
     html = html.replace(/<!doctype\s/i, '<!DOCTYPE ');
     try {
@@ -21301,7 +21310,12 @@ function buildHtmlPlugin(config) {
                                 shouldRemove = true;
                             }
                             else if (node.children.length) {
+                                const contents = node.children
+                                    .map((child) => child.content || '')
+                                    .join('');
                                 // <script type="module">...</script>
+                                const filePath = id.replace(config.root, '');
+                                addToHTMLProxyCache(config, filePath, inlineModuleIndex, contents);
                                 js += `\nimport "${id}?html-proxy&index=${inlineModuleIndex}.js"`;
                                 shouldRemove = true;
                             }
@@ -21577,14 +21591,16 @@ function toPublicPath(filename, config) {
     return isExternalUrl(filename) ? filename : config.base + filename;
 }
 const headInjectRE = /([ \t]*)<\/head>/;
-const headPrependInjectRE = [/([ \t]*)<head>/, /<!doctype html>/i];
+const headPrependInjectRE = /([ \t]*)<head[^>]*>/;
+const doctypePrependInjectRE = /<!doctype html>/i;
 function injectToHead(html, tags, prepend = false) {
     if (prepend) {
         // inject after head or doctype
-        for (const re of headPrependInjectRE) {
-            if (re.test(html)) {
-                return html.replace(re, (match, p1) => `${match}\n${serializeTags(tags, incrementIndent(p1))}`);
-            }
+        if (headPrependInjectRE.test(html)) {
+            return html.replace(headPrependInjectRE, (match, p1) => `${match}\n${serializeTags(tags, incrementIndent(p1))}`);
+        }
+        else if (doctypePrependInjectRE.test(html)) {
+            return html.replace(doctypePrependInjectRE, `$&\n${serializeTags(tags)}`);
         }
     }
     else {
@@ -42620,10 +42636,14 @@ function esbuildScanPlugin(config, container, depImports, missing, entries) {
                         js += `\nimport ${m[1]}`;
                     }
                 }
-                if (!code.includes(`export default`)) {
-                    js += `\nexport default {}`;
+                // This will trigger incorrectly if `export default` is contained
+                // anywhere in a string. Svelte and Astro files can't have
+                // `export default` as code so we know if it's encountered it's a
+                // false positive (e.g. contained in a string)
+                if (!path.endsWith('.vue') || !js.includes('export default')) {
+                    js += '\nexport default {}';
                 }
-                if (code.includes('import.meta.glob')) {
+                if (js.includes('import.meta.glob')) {
                     return {
                         // transformGlob already transforms to js
                         loader: 'js',
@@ -49034,7 +49054,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-da8087f5.js'); }).then(function (n) { return n.index; });
+    const { generate } = await Promise.resolve().then(function () { return require('./dep-b502d052.js'); }).then(function (n) { return n.index; });
     const pems = generate(null, {
         algorithm: 'sha256',
         days: 30,
@@ -53176,6 +53196,8 @@ function createWebSocketServer(server, config, httpsOptions) {
     // connected client.
     let bufferedError = null;
     return {
+        on: wss.on.bind(wss),
+        off: wss.off.bind(wss),
         send(payload) {
             if (payload.type === 'error' && !wss.clients.size) {
                 bufferedError = payload;
@@ -56934,6 +56956,7 @@ const devHtmlHook = async (html, { path: htmlPath, server, originalUrl }) => {
     const base = config.base || '/';
     const s = new MagicString(html);
     let scriptModuleIndex = -1;
+    const filePath = cleanUrl(htmlPath);
     await traverseHtml(html, htmlPath, (node) => {
         if (node.type !== 1 /* ELEMENT */) {
             return;
@@ -56948,8 +56971,14 @@ const devHtmlHook = async (html, { path: htmlPath, server, originalUrl }) => {
                 processNodeUrl(src, s, config, htmlPath, originalUrl);
             }
             else if (isModule) {
+                const url = filePath.replace(config.root, '');
+                const contents = node.children
+                    .map((child) => child.content || '')
+                    .join('');
+                // add HTML Proxy to Map
+                addToHTMLProxyCache(config, url, scriptModuleIndex, contents);
                 // inline js module. convert to src="proxy"
-                s.overwrite(node.loc.start.offset, node.loc.end.offset, `<script type="module" src="${config.base + htmlPath.slice(1)}?html-proxy&index=${scriptModuleIndex}.js"></script>`);
+                s.overwrite(node.loc.start.offset, node.loc.end.offset, `<script type="module" src="${config.base + url.slice(1)}?html-proxy&index=${scriptModuleIndex}.js"></script>`);
             }
         }
         // elements with [href/src] attrs
@@ -66417,7 +66446,10 @@ async function instantiateModule(url, server, context = { global }, urlStack = [
     // Tolerate circular imports by ensuring the module can be
     // referenced before it's been instantiated.
     mod.ssrModule = ssrModule;
-    const ssrImportMeta = { url };
+    const ssrImportMeta = {
+        // The filesystem URL, matching native Node.js modules
+        url: require$$0$8.pathToFileURL(mod.file).toString(),
+    };
     urlStack = urlStack.concat(url);
     const isCircular = (url) => urlStack.includes(url);
     // Since dynamic imports can happen in parallel, we need to
@@ -67899,7 +67931,7 @@ async function resolvePlugins(config, prePlugins, normalPlugins, postPlugins) {
             ssrConfig: config.ssr,
             asSrc: true
         }),
-        htmlInlineScriptProxyPlugin(),
+        htmlInlineScriptProxyPlugin(config),
         cssPlugin(config),
         config.esbuild !== false ? esbuildPlugin(config.esbuild) : null,
         jsonPlugin({
@@ -92020,4 +92052,4 @@ exports.send = send$1;
 exports.sortUserPlugins = sortUserPlugins;
 exports.source = source;
 exports.transformWithEsbuild = transformWithEsbuild;
-//# sourceMappingURL=dep-713b45e1.js.map
+//# sourceMappingURL=dep-be032392.js.map