vite 2.8.0-beta.0 → 2.8.0-beta.1

package/dist/node/chunks/{dep-5ad1713b.js → dep-e4dc9ea2.js}

@@ -18916,7 +18916,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         replacer: urlReplacer
     }));
     if (isModule) {
-        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-372aad6a.js'); }).then(function (n) { return n.index; })).default({
+        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-e4a9e288.js'); }).then(function (n) { return n.index; })).default({
             ...modulesOptions,
             getJSON(cssFileName, _modules, outputFileName) {
                 modules = _modules;
@@ -19939,7 +19939,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-7cd25957.js'); }).then(function (n) { return n.compilerDom_cjs; });
+    const { parse, transform } = await Promise.resolve().then(function () { return require('./dep-51191982.js'); }).then(function (n) { return n.compilerDom_cjs; });
     // @vue/compiler-core doesn't like lowercase doctypes
     html = html.replace(/<!doctype\s/i, '<!DOCTYPE ');
     try {
@@ -44442,7 +44442,7 @@ function readFileIfExists(value) {
     return value;
 }
 async function createCertificateLazily() {
-    const { createCertificate } = await Promise.resolve().then(function () { return require('./dep-920a704a.js'); });
+    const { createCertificate } = await Promise.resolve().then(function () { return require('./dep-fccf00e1.js'); });
     return createCertificate();
 }
 async function getCertificate(cacheDir) {
@@ -69652,14 +69652,34 @@ export default opts => initWasm(opts, ${JSON.stringify(url)})
 };
 
 const WorkerFileId = 'worker_file';
+async function bundleWorkerEntry(config, id) {
+    // bundle the file as entry to support imports
+    const rollup = require('rollup');
+    const { plugins, rollupOptions, format } = config.worker;
+    const bundle = await rollup.rollup({
+        ...rollupOptions,
+        input: cleanUrl(id),
+        plugins,
+        onwarn(warning, warn) {
+            onRollupWarning(warning, warn, config);
+        },
+        preserveEntrySignatures: false
+    });
+    let code;
+    try {
+        const { output } = await bundle.generate({
+            format,
+            sourcemap: config.build.sourcemap
+        });
+        code = output[0].code;
+    }
+    finally {
+        await bundle.close();
+    }
+    return Buffer.from(code);
+}
 function webWorkerPlugin(config) {
-    var _a, _b, _c;
     const isBuild = config.command === 'build';
-    const workerBundleOptions = {
-        format: ((_a = config.worker) === null || _a === void 0 ? void 0 : _a.format) || 'iife',
-        plugins: sortUserPlugins((_b = config.worker) === null || _b === void 0 ? void 0 : _b.plugins),
-        rollupOptions: ((_c = config.worker) === null || _c === void 0 ? void 0 : _c.rollupOptions) || {}
-    };
     return {
         name: 'vite:worker',
         load(id) {
@@ -69686,35 +69706,12 @@ function webWorkerPlugin(config) {
             }
             let url;
             if (isBuild) {
-                // bundle the file as entry to support imports
-                const rollup = require('rollup');
-                const { plugins, rollupOptions, format } = workerBundleOptions;
-                const [prePlugins, normalPlugins, postPlugins] = plugins;
-                const bundle = await rollup.rollup({
-                    ...rollupOptions,
-                    input: cleanUrl(id),
-                    plugins: await resolvePlugins({ ...config }, prePlugins, normalPlugins, postPlugins),
-                    onwarn(warning, warn) {
-                        onRollupWarning(warning, warn, config);
-                    },
-                    preserveEntrySignatures: false
-                });
-                let code;
-                try {
-                    const { output } = await bundle.generate({
-                        format,
-                        sourcemap: config.build.sourcemap
-                    });
-                    code = output[0].code;
-                }
-                finally {
-                    await bundle.close();
-                }
-                const content = Buffer.from(code);
+                const code = await bundleWorkerEntry(config, id);
                 if (query.inline != null) {
+                    const { format } = config.worker;
                     const workerOptions = format === 'es' ? '{type: "module"}' : '{}';
                     // inline as blob data url
-                    return `const encodedJs = "${content.toString('base64')}";
+                    return `const encodedJs = "${code.toString('base64')}";
             const blob = typeof window !== "undefined" && window.Blob && new Blob([atob(encodedJs)], { type: "text/javascript;charset=utf-8" });
             export default function WorkerWrapper() {
               const objURL = blob && (window.URL || window.webkitURL).createObjectURL(blob);
@@ -69727,7 +69724,7 @@ function webWorkerPlugin(config) {
                 }
                 else {
                     const basename = path__default.parse(cleanUrl(id)).name;
-                    const contentHash = getAssetHash(content);
+                    const contentHash = getAssetHash(code);
                     const fileName = path__default.posix.join(config.build.assetsDir, `${basename}.${contentHash}.js`);
                     url = `__VITE_ASSET__${this.emitFile({
                         fileName,
@@ -69869,6 +69866,69 @@ function definePlugin(config) {
     };
 }
 
+const WORKER_FILE_ID = 'worker_url_file';
+function workerImportMetaUrlPlugin(config) {
+    const isBuild = config.command === 'build';
+    return {
+        name: 'vite:worker-import-meta-url',
+        async transform(code, id, options) {
+            const query = parseRequest(id);
+            if (query && query[WORKER_FILE_ID] != null) {
+                return {
+                    code: `import '${ENV_PUBLIC_PATH}'\n` + code
+                };
+            }
+            if ((code.includes('new Worker') || code.includes('new ShareWorker')) &&
+                code.includes('new URL') &&
+                code.includes(`import.meta.url`)) {
+                const importMetaUrlRE = /\bnew\s+(Worker|SharedWorker)\s*\(\s*(new\s+URL\s*\(\s*('[^']+'|"[^"]+"|`[^`]+`)\s*,\s*import\.meta\.url\s*\))/g;
+                const noCommentsCode = code
+                    .replace(multilineCommentsRE$1, (m) => ' '.repeat(m.length))
+                    .replace(singlelineCommentsRE$1, (m) => ' '.repeat(m.length));
+                let match;
+                let s = null;
+                while ((match = importMetaUrlRE.exec(noCommentsCode))) {
+                    const { 0: allExp, 2: exp, 3: rawUrl, index } = match;
+                    const urlIndex = allExp.indexOf(exp) + index;
+                    if (options === null || options === void 0 ? void 0 : options.ssr) {
+                        this.error(`\`new URL(url, import.meta.url)\` is not supported in SSR.`, urlIndex);
+                    }
+                    // potential dynamic template string
+                    if (rawUrl[0] === '`' && /\$\{/.test(rawUrl)) {
+                        this.error(`\`new URL(url, import.meta.url)\` is not supported in dynamic template string.`, urlIndex);
+                    }
+                    s || (s = new MagicString(code));
+                    const file = path__default.resolve(path__default.dirname(id), rawUrl.slice(1, -1));
+                    let url;
+                    if (isBuild) {
+                        const content = await bundleWorkerEntry(config, file);
+                        const basename = path__default.parse(cleanUrl(file)).name;
+                        const contentHash = getAssetHash(content);
+                        const fileName = path__default.posix.join(config.build.assetsDir, `${basename}.${contentHash}.js`);
+                        url = `__VITE_ASSET__${this.emitFile({
+                            fileName,
+                            type: 'asset',
+                            source: content
+                        })}__`;
+                    }
+                    else {
+                        url = await fileToUrl(cleanUrl(file), config, this);
+                        url = injectQuery(url, WORKER_FILE_ID);
+                    }
+                    s.overwrite(urlIndex, urlIndex + exp.length, JSON.stringify(url));
+                }
+                if (s) {
+                    return {
+                        code: s.toString(),
+                        map: config.build.sourcemap ? s.generateMap({ hires: true }) : null
+                    };
+                }
+                return null;
+            }
+        }
+    };
+}
+
 async function resolvePlugins(config, prePlugins, normalPlugins, postPlugins) {
     const isBuild = config.command === 'build';
     const buildPlugins = isBuild
@@ -69899,6 +69959,7 @@ async function resolvePlugins(config, prePlugins, normalPlugins, postPlugins) {
         }, isBuild),
         wasmPlugin(config),
         webWorkerPlugin(config),
+        workerImportMetaUrlPlugin(config),
         assetPlugin(config),
         ...normalPlugins,
         definePlugin(config),
@@ -70092,7 +70153,7 @@ function defineConfig(config) {
     return config;
 }
 async function resolveConfig(inlineConfig, command, defaultMode = 'development') {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     let config = inlineConfig;
     let configFileDependencies = [];
     let mode = inlineConfig.mode || defaultMode;
@@ -70139,6 +70200,12 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development')
         }
     });
     const [prePlugins, normalPlugins, postPlugins] = sortUserPlugins(rawUserPlugins);
+    // resolve worker
+    const resolvedWorkerOptions = {
+        format: ((_a = config.worker) === null || _a === void 0 ? void 0 : _a.format) || 'iife',
+        plugins: [],
+        rollupOptions: ((_b = config.worker) === null || _b === void 0 ? void 0 : _b.rollupOptions) || {}
+    };
     // run config hooks
     const userPlugins = [...prePlugins, ...normalPlugins, ...postPlugins];
     for (const p of userPlugins) {
@@ -70159,7 +70226,7 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development')
     const resolvedAlias = 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, ((_c = config.resolve) === null || _c === void 0 ? void 0 : _c.alias) || config.alias || []);
     const resolveOptions = {
         dedupe: config.dedupe,
         ...config.resolve,
@@ -70268,12 +70335,19 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development')
         optimizeDeps: {
             ...config.optimizeDeps,
             esbuildOptions: {
-                keepNames: (_b = config.optimizeDeps) === null || _b === void 0 ? void 0 : _b.keepNames,
-                preserveSymlinks: (_c = config.resolve) === null || _c === void 0 ? void 0 : _c.preserveSymlinks,
-                ...(_d = config.optimizeDeps) === null || _d === void 0 ? void 0 : _d.esbuildOptions
+                keepNames: (_d = config.optimizeDeps) === null || _d === void 0 ? void 0 : _d.keepNames,
+                preserveSymlinks: (_e = config.resolve) === null || _e === void 0 ? void 0 : _e.preserveSymlinks,
+                ...(_f = config.optimizeDeps) === null || _f === void 0 ? void 0 : _f.esbuildOptions
             }
-        }
+        },
+        worker: resolvedWorkerOptions
     };
+    // flat config.worker.plugin
+    const [workerPrePlugins, workerNormalPlugins, workerPostPlugins] = sortUserPlugins((_g = config.worker) === null || _g === void 0 ? void 0 : _g.plugins);
+    const workerResolved = { ...resolved };
+    resolved.worker.plugins = await resolvePlugins(workerResolved, workerPrePlugins, workerNormalPlugins, workerPostPlugins);
+    // call configResolved worker plugins hooks
+    await Promise.all(resolved.worker.plugins.map((p) => { var _a; return (_a = p.configResolved) === null || _a === void 0 ? void 0 : _a.call(p, workerResolved); }));
     resolved.plugins = await resolvePlugins(resolved, prePlugins, normalPlugins, postPlugins);
     // call configResolved hooks
     await Promise.all(userPlugins.map((p) => { var _a; return (_a = p.configResolved) === null || _a === void 0 ? void 0 : _a.call(p, resolved); }));
@@ -70287,7 +70361,7 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development')
     const logDeprecationWarning = (deprecatedOption, hint, error) => {
         logger.warn(colors$1.yellow(colors$1.bold(`(!) "${deprecatedOption}" option is deprecated. ${hint}${error ? `\n${error.stack}` : ''}`)));
     };
-    if ((_e = config.build) === null || _e === void 0 ? void 0 : _e.base) {
+    if ((_h = config.build) === null || _h === void 0 ? void 0 : _h.base) {
         logDeprecationWarning('build.base', '"base" is now a root-level config option.');
         config.base = config.build.base;
     }
@@ -70318,7 +70392,7 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development')
             return resolved.resolve.dedupe;
         }
     });
-    if ((_f = config.optimizeDeps) === null || _f === void 0 ? void 0 : _f.keepNames) {
+    if ((_j = config.optimizeDeps) === null || _j === void 0 ? void 0 : _j.keepNames) {
         logDeprecationWarning('optimizeDeps.keepNames', 'Use "optimizeDeps.esbuildOptions.keepNames" instead.');
     }
     Object.defineProperty(resolved.optimizeDeps, 'keepNames', {
@@ -70329,7 +70403,7 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development')
             return (_a = resolved.optimizeDeps.esbuildOptions) === null || _a === void 0 ? void 0 : _a.keepNames;
         }
     });
-    if ((_g = config.build) === null || _g === void 0 ? void 0 : _g.polyfillDynamicImport) {
+    if ((_k = config.build) === null || _k === void 0 ? void 0 : _k.polyfillDynamicImport) {
         logDeprecationWarning('build.polyfillDynamicImport', '"polyfillDynamicImport" has been removed. Please use @vitejs/plugin-legacy if your target browsers do not support dynamic imports.');
     }
     Object.defineProperty(resolvedBuildOptions, 'polyfillDynamicImport', {
@@ -70339,10 +70413,10 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development')
             return false;
         }
     });
-    if ((_h = config.build) === null || _h === void 0 ? void 0 : _h.cleanCssOptions) {
+    if ((_l = config.build) === null || _l === void 0 ? void 0 : _l.cleanCssOptions) {
         logDeprecationWarning('build.cleanCssOptions', 'Vite now uses esbuild for CSS minification.');
     }
-    if (((_j = config.build) === null || _j === void 0 ? void 0 : _j.terserOptions) && config.build.minify === 'esbuild') {
+    if (((_m = config.build) === null || _m === void 0 ? void 0 : _m.terserOptions) && config.build.minify === 'esbuild') {
         logger.warn(colors$1.yellow(`build.terserOptions is specified but build.minify is not set to use Terser. ` +
             `Note Vite now defaults to use esbuild for minification. If you still ` +
             `prefer Terser, set build.minify to "terser".`));
@@ -70713,4 +70787,4 @@ exports.searchForWorkspaceRoot = searchForWorkspaceRoot;
 exports.send = send$1;
 exports.sortUserPlugins = sortUserPlugins;
 exports.transformWithEsbuild = transformWithEsbuild;
-//# sourceMappingURL=dep-5ad1713b.js.map
+//# sourceMappingURL=dep-e4dc9ea2.js.map