vite 3.0.0-alpha.0 → 3.0.0-alpha.1

package/dist/node/chunks/{dep-fafc4143.js → dep-5cb039d6.js}

@@ -11727,6 +11727,9 @@ const timestampRE = /\bt=\d{13}&?\b/;
 function removeTimestampQuery(url) {
     return url.replace(timestampRE, '').replace(trailingSeparatorRE, '');
 }
+function isRelativeBase(base) {
+    return base === '' || base.startsWith('.');
+}
 async function asyncReplace(input, re, replacer) {
     let match;
     let remaining = input;
@@ -32352,6 +32355,7 @@ const emittedHashMap = new WeakMap();
 function assetPlugin(config) {
     // assetHashToFilenameMap initialization in buildStart causes getAssetFilename to return undefined
     assetHashToFilenameMap.set(config, new Map());
+    const relativeBase = isRelativeBase(config.base);
     // add own dictionary entry by directly assigning mrmine
     // https://github.com/lukeed/mrmime/issues/3
     mimes$1['ico'] = 'image/x-icon';
@@ -32394,8 +32398,9 @@ function assetPlugin(config) {
         renderChunk(code, chunk) {
             let match;
             let s;
+            const absoluteUrlPathInterpolation = (filename) => `"+new URL(${JSON.stringify(path__default.posix.relative(path__default.dirname(chunk.fileName), filename))},import.meta.url).href+"`;
             // Urls added with JS using e.g.
-            // imgElement.src = "my/file.png" are using quotes
+            // imgElement.src = "__VITE_ASSET__5aa0ddc0__" are using quotes
             // Urls added in CSS that is imported in JS end up like
             // var inlined = ".inlined{color:green;background:url(__VITE_ASSET__5aa0ddc0__)}\n";
             // In both cases, the wrapping should already be fine
@@ -32403,14 +32408,30 @@ function assetPlugin(config) {
                 s = s || (s = new MagicString(code));
                 const [full, hash, postfix = ''] = match;
                 // some internal plugins may still need to emit chunks (e.g. worker) so
-                // fallback to this.getFileName for that.
+                // fallback to this.getFileName for that. TODO: remove, not needed
                 const file = getAssetFilename(hash, config) || this.getFileName(hash);
                 chunk.viteMetadata.importedAssets.add(cleanUrl(file));
-                const outputFilepath = config.base + file + postfix;
+                const filename = file + postfix;
+                const outputFilepath = relativeBase
+                    ? absoluteUrlPathInterpolation(filename)
+                    : JSON.stringify(config.base + filename).slice(1, -1);
                 s.overwrite(match.index, match.index + full.length, outputFilepath, {
                     contentOnly: true
                 });
             }
+            // Replace __VITE_PUBLIC_ASSET__5aa0ddc0__ with absolute paths
+            if (relativeBase) {
+                const publicAssetUrlMap = publicAssetUrlCache.get(config);
+                while ((match = publicAssetUrlRE.exec(code))) {
+                    s = s || (s = new MagicString(code));
+                    const [full, hash] = match;
+                    const publicUrl = publicAssetUrlMap.get(hash);
+                    const replacement = absoluteUrlPathInterpolation(publicUrl.slice(1));
+                    s.overwrite(match.index, match.index + full.length, replacement, {
+                        contentOnly: true
+                    });
+                }
+            }
             if (s) {
                 return {
                     code: s.toString(),
@@ -32538,6 +32559,23 @@ function assetFileNamesToFileName(assetFileNames, file, contentHash, content) {
     });
     return fileName;
 }
+const publicAssetUrlCache = new WeakMap();
+const publicAssetUrlRE = /__VITE_PUBLIC_ASSET__([a-z\d]{8})__/g;
+function publicFileToBuiltUrl(url, config) {
+    if (!isRelativeBase(config.base)) {
+        return config.base + url.slice(1);
+    }
+    const hash = getHash(url);
+    let cache = publicAssetUrlCache.get(config);
+    if (!cache) {
+        cache = new Map();
+        publicAssetUrlCache.set(config, cache);
+    }
+    if (!cache.get(hash)) {
+        cache.set(hash, url);
+    }
+    return `__VITE_PUBLIC_ASSET__${hash}__`;
+}
 /**
  * Register an asset to be emitted as part of the bundle (if necessary)
  * and returns the resolved public URL
@@ -32545,7 +32583,7 @@ function assetFileNamesToFileName(assetFileNames, file, contentHash, content) {
 async function fileToBuiltUrl(id, config, pluginContext, skipPublicCheck = false) {
     var _a, _b, _c;
     if (!skipPublicCheck && checkPublicFile(id, config)) {
-        return config.base + id.slice(1);
+        return publicFileToBuiltUrl(id, config);
     }
     const cache = assetCache.get(config);
     const cached = cache.get(id);
@@ -32600,7 +32638,7 @@ async function fileToBuiltUrl(id, config, pluginContext, skipPublicCheck = false
 }
 async function urlToBuiltUrl(url, importer, config, pluginContext) {
     if (checkPublicFile(url, config)) {
-        return config.base + url.slice(1);
+        return publicFileToBuiltUrl(url, config);
     }
     const file = url.startsWith('/')
         ? path__default.join(config.root, url)
@@ -32746,7 +32784,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-63fe0f22.js'); }).then(function (n) { return n.compilerDom_cjs; });
+    const { parse, transform } = await Promise.resolve().then(function () { return require('./dep-99df5764.js'); }).then(function (n) { return n.compilerDom_cjs; });
     // @vue/compiler-core doesn't like lowercase doctypes
     html = html.replace(/<!doctype\s/i, '<!DOCTYPE ');
     try {
@@ -32819,7 +32857,9 @@ function buildHtmlPlugin(config) {
         async transform(html, id) {
             var _a, _b;
             if (id.endsWith('.html')) {
-                const publicPath = `/${slash$1(path__default.relative(config.root, id))}`;
+                const relativeUrlPath = slash$1(path__default.relative(config.root, id));
+                const publicPath = `/${relativeUrlPath}`;
+                const publicBase = getPublicBase(relativeUrlPath, config);
                 // pre-transform
                 html = await applyHtmlTransforms(html, preHooks, {
                     path: publicPath,
@@ -32846,7 +32886,7 @@ function buildHtmlPlugin(config) {
                         const isPublicFile = !!(url && checkPublicFile(url, config));
                         if (isPublicFile) {
                             // referencing public dir url, prefix with base
-                            s.overwrite(src.value.loc.start.offset, src.value.loc.end.offset, `"${config.base + url.slice(1)}"`, { contentOnly: true });
+                            s.overwrite(src.value.loc.start.offset, src.value.loc.end.offset, `"${normalizePublicPath(url, publicBase)}"`, { contentOnly: true });
                         }
                         if (isModule) {
                             inlineModuleIndex++;
@@ -32920,7 +32960,7 @@ function buildHtmlPlugin(config) {
                                     }
                                 }
                                 else if (checkPublicFile(url, config)) {
-                                    s.overwrite(p.value.loc.start.offset, p.value.loc.end.offset, `"${config.base + url.slice(1)}"`, { contentOnly: true });
+                                    s.overwrite(p.value.loc.start.offset, p.value.loc.end.offset, `"${normalizePublicPath(url, publicBase)}"`, { contentOnly: true });
                                 }
                             }
                         }
@@ -33000,7 +33040,7 @@ function buildHtmlPlugin(config) {
                         s.overwrite(start, end, await urlToBuiltUrl(url, id, config, this), { contentOnly: true });
                     }
                     else if (checkPublicFile(url, config)) {
-                        s.overwrite(start, end, config.base + url.slice(1), {
+                        s.overwrite(start, end, normalizePublicPath(url, publicBase), {
                             contentOnly: true
                         });
                     }
@@ -33044,31 +33084,31 @@ function buildHtmlPlugin(config) {
                 });
                 return chunks;
             };
-            const toScriptTag = (chunk, isAsync) => ({
+            const toScriptTag = (chunk, publicBase, isAsync) => ({
                 tag: 'script',
                 attrs: {
                     ...(isAsync ? { async: true } : {}),
                     type: 'module',
                     crossorigin: true,
-                    src: toPublicPath(chunk.fileName, config)
+                    src: toPublicPath(chunk.fileName, publicBase)
                 }
             });
-            const toPreloadTag = (chunk) => ({
+            const toPreloadTag = (chunk, publicBase) => ({
                 tag: 'link',
                 attrs: {
                     rel: 'modulepreload',
                     crossorigin: true,
-                    href: toPublicPath(chunk.fileName, config)
+                    href: toPublicPath(chunk.fileName, publicBase)
                 }
             });
-            const getCssTagsForChunk = (chunk, seen = new Set()) => {
+            const getCssTagsForChunk = (chunk, publicBase, seen = new Set()) => {
                 const tags = [];
                 if (!analyzedChunk.has(chunk)) {
                     analyzedChunk.set(chunk, 1);
                     chunk.imports.forEach((file) => {
                         const importee = bundle[file];
                         if ((importee === null || importee === void 0 ? void 0 : importee.type) === 'chunk') {
-                            tags.push(...getCssTagsForChunk(importee, seen));
+                            tags.push(...getCssTagsForChunk(importee, publicBase, seen));
                         }
                     });
                 }
@@ -33079,7 +33119,7 @@ function buildHtmlPlugin(config) {
                             tag: 'link',
                             attrs: {
                                 rel: 'stylesheet',
-                                href: toPublicPath(file, config)
+                                href: toPublicPath(file, publicBase)
                             }
                         });
                     }
@@ -33087,6 +33127,8 @@ function buildHtmlPlugin(config) {
                 return tags;
             };
             for (const [id, html] of processedHtml) {
+                const relativeUrlPath = path__default.posix.relative(config.root, id);
+                const publicBase = getPublicBase(relativeUrlPath, config);
                 const isAsync = isAsyncScriptMap.get(config).get(id);
                 let result = html;
                 // find corresponding entry chunk
@@ -33106,9 +33148,12 @@ function buildHtmlPlugin(config) {
                     // when inlined, discard entry chunk and inject <script> for everything in post-order
                     const imports = getImportedChunks(chunk);
                     const assetTags = canInlineEntry
-                        ? imports.map((chunk) => toScriptTag(chunk, isAsync))
-                        : [toScriptTag(chunk, isAsync), ...imports.map(toPreloadTag)];
-                    assetTags.push(...getCssTagsForChunk(chunk));
+                        ? imports.map((chunk) => toScriptTag(chunk, publicBase, isAsync))
+                        : [
+                            toScriptTag(chunk, publicBase, isAsync),
+                            ...imports.map((i) => toPreloadTag(i, publicBase))
+                        ];
+                    assetTags.push(...getCssTagsForChunk(chunk, publicBase));
                     result = injectToHead(result, assetTags);
                 }
                 // inject css link when cssCodeSplit is false
@@ -33120,7 +33165,7 @@ function buildHtmlPlugin(config) {
                                 tag: 'link',
                                 attrs: {
                                     rel: 'stylesheet',
-                                    href: toPublicPath(cssChunk.fileName, config)
+                                    href: toPublicPath(cssChunk.fileName, publicBase)
                                 }
                             }
                         ]);
@@ -33138,7 +33183,6 @@ function buildHtmlPlugin(config) {
                 if (s) {
                     result = s.toString();
                 }
-                const relativeUrlPath = path__default.posix.relative(config.root, id);
                 result = await applyHtmlTransforms(result, postHooks, {
                     path: '/' + relativeUrlPath,
                     filename: id,
@@ -33147,7 +33191,7 @@ function buildHtmlPlugin(config) {
                 });
                 // resolve asset url references
                 result = result.replace(assetUrlRE, (_, fileHash, postfix = '') => {
-                    return config.base + getAssetFilename(fileHash, config) + postfix;
+                    return publicBase + getAssetFilename(fileHash, config) + postfix;
                 });
                 if (chunk && canInlineEntry) {
                     // all imports from entry have been inlined to html, prevent rollup from outputting it
@@ -33242,8 +33286,16 @@ function isEntirelyImport(code) {
     // the regexes will remove too little in some exotic cases, but false-negatives are alright
     return !code.replace(importRE, '').replace(commentRE$1, '').trim().length;
 }
-function toPublicPath(filename, config) {
-    return isExternalUrl(filename) ? filename : config.base + filename;
+function getPublicBase(urlRelativePath, config) {
+    return isRelativeBase(config.base)
+        ? path__default.posix.join(path__default.posix.relative(urlRelativePath, '').slice(0, -2), './')
+        : config.base;
+}
+function toPublicPath(filename, publicBase) {
+    return isExternalUrl(filename) ? filename : publicBase + filename;
+}
+function normalizePublicPath(publicPath, publicBase) {
+    return publicBase + publicPath.slice(1);
 }
 const headInjectRE = /([ \t]*)<\/head>/i;
 const headPrependInjectRE = /([ \t]*)<head[^>]*>/i;
@@ -33351,6 +33403,7 @@ const inlineRE = /(\?|&)inline\b/;
 const inlineCSSRE = /(\?|&)inline-css\b/;
 const usedRE = /(\?|&)used\b/;
 const varRE = /^var\(/i;
+const cssBundleName = 'style.css';
 const isCSSRequest = (request) => cssLangRE.test(request);
 const isDirectCSSRequest = (request) => cssLangRE.test(request) && directRequestRE.test(request);
 const isDirectRequest = (request) => directRequestRE.test(request);
@@ -33390,7 +33443,12 @@ function cssPlugin(config) {
             const ssr = (options === null || options === void 0 ? void 0 : options.ssr) === true;
             const urlReplacer = async (url, importer) => {
                 if (checkPublicFile(url, config)) {
-                    return config.base + url.slice(1);
+                    if (isRelativeBase(config.base)) {
+                        return publicFileToBuiltUrl(url, config);
+                    }
+                    else {
+                        return config.base + url.slice(1);
+                    }
                 }
                 const resolved = await resolveUrl(url, importer);
                 if (resolved) {
@@ -33449,6 +33507,7 @@ function cssPlugin(config) {
  * Plugin applied after user plugins
  */
 function cssPostPlugin(config) {
+    var _a;
     // styles initialization in buildStart causes a styling loss in watch
     const styles = new Map();
     let pureCssChunks;
@@ -33456,6 +33515,26 @@ function cssPostPlugin(config) {
     // since output formats have no effect on the generated CSS.
     let outputToExtractedCSSMap;
     let hasEmitted = false;
+    const relativeBase = isRelativeBase(config.base);
+    const rollupOptionsOutput = config.build.rollupOptions.output;
+    const assetFileNames = (_a = (Array.isArray(rollupOptionsOutput)
+        ? rollupOptionsOutput[0]
+        : rollupOptionsOutput)) === null || _a === void 0 ? void 0 : _a.assetFileNames;
+    const getCssAssetDirname = (cssAssetName) => {
+        if (!assetFileNames) {
+            return config.build.assetsDir;
+        }
+        else if (typeof assetFileNames === 'string') {
+            return path__default.dirname(assetFileNames);
+        }
+        else {
+            return path__default.dirname(assetFileNames({
+                name: cssAssetName,
+                type: 'asset',
+                source: '/* vite internal call, ignore */'
+            }));
+        }
+    };
     return {
         name: 'vite:css-post',
         buildStart() {
@@ -33565,28 +33644,35 @@ function cssPostPlugin(config) {
             if (!chunkCSS) {
                 return null;
             }
-            // resolve asset URL placeholders to their built file URLs and perform
-            // minification if necessary
-            const processChunkCSS = async (css, { inlined, minify }) => {
+            const publicAssetUrlMap = publicAssetUrlCache.get(config);
+            // resolve asset URL placeholders to their built file URLs
+            function resolveAssetUrlsInCss(chunkCSS, cssAssetName) {
+                const cssAssetDirname = relativeBase
+                    ? getCssAssetDirname(cssAssetName)
+                    : undefined;
                 // replace asset url references with resolved url.
-                const isRelativeBase = config.base === '' || config.base.startsWith('.');
-                css = css.replace(assetUrlRE, (_, fileHash, postfix = '') => {
+                chunkCSS = chunkCSS.replace(assetUrlRE, (_, fileHash, postfix = '') => {
                     const filename = getAssetFilename(fileHash, config) + postfix;
                     chunk.viteMetadata.importedAssets.add(cleanUrl(filename));
-                    if (!isRelativeBase || inlined) {
-                        // absolute base or relative base but inlined (injected as style tag into
-                        // index.html) use the base as-is
-                        return config.base + filename;
+                    if (relativeBase) {
+                        // relative base + extracted CSS
+                        const relativePath = path__default.posix.relative(cssAssetDirname, filename);
+                        return relativePath.startsWith('.')
+                            ? relativePath
+                            : './' + relativePath;
                     }
                     else {
-                        // relative base + extracted CSS - asset file will be in the same dir
-                        return `./${path__default.posix.basename(filename)}`;
+                        // absolute base
+                        return config.base + filename;
                     }
                 });
-                // only external @imports and @charset should exist at this point
-                css = await finalizeCss(css, minify, config);
-                return css;
-            };
+                // resolve public URL from CSS paths
+                if (relativeBase) {
+                    const relativePathToPublicFromCSS = path__default.posix.relative(cssAssetDirname, '');
+                    chunkCSS = chunkCSS.replace(publicAssetUrlRE, (_, hash) => relativePathToPublicFromCSS + publicAssetUrlMap.get(hash));
+                }
+                return chunkCSS;
+            }
             if (config.build.cssCodeSplit) {
                 if (isPureCssChunk) {
                     // this is a shared CSS-only chunk that is empty.
@@ -33595,24 +33681,22 @@ function cssPostPlugin(config) {
                 if (opts.format === 'es' ||
                     opts.format === 'cjs' ||
                     opts.format === 'system') {
-                    chunkCSS = await processChunkCSS(chunkCSS, {
-                        inlined: false,
-                        minify: true
-                    });
+                    const cssAssetName = chunk.name + '.css';
+                    chunkCSS = resolveAssetUrlsInCss(chunkCSS, cssAssetName);
+                    chunkCSS = await finalizeCss(chunkCSS, true, config);
                     // emit corresponding css file
                     const fileHandle = this.emitFile({
-                        name: chunk.name + '.css',
+                        name: cssAssetName,
                         type: 'asset',
                         source: chunkCSS
                     });
                     chunk.viteMetadata.importedCss.add(this.getFileName(fileHandle));
                 }
                 else if (!config.build.ssr) {
-                    // legacy build, inline css
-                    chunkCSS = await processChunkCSS(chunkCSS, {
-                        inlined: true,
-                        minify: true
-                    });
+                    // legacy build and inline css
+                    // __VITE_ASSET__ and __VITE_PUBLIC_ASSET__ urls are processed by
+                    // the vite:asset plugin, don't call resolveAssetUrlsInCss here
+                    chunkCSS = await finalizeCss(chunkCSS, true, config);
                     const style = `__vite_style__`;
                     const injectCode = `var ${style} = document.createElement('style');` +
                         `${style}.innerHTML = ${JSON.stringify(chunkCSS)};` +
@@ -33620,6 +33704,7 @@ function cssPostPlugin(config) {
                     if (config.build.sourcemap) {
                         const s = new MagicString(code);
                         s.prepend(injectCode);
+                        // resolve public URL from CSS paths, we need to use absolute paths
                         return {
                             code: s.toString(),
                             map: s.generateMap({ hires: true })
@@ -33631,11 +33716,8 @@ function cssPostPlugin(config) {
                 }
             }
             else {
-                // non-split extracted CSS will be minified together
-                chunkCSS = await processChunkCSS(chunkCSS, {
-                    inlined: false,
-                    minify: false
-                });
+                chunkCSS = resolveAssetUrlsInCss(chunkCSS, cssBundleName);
+                // finalizeCss is called for the aggregated chunk in generateBundle
                 outputToExtractedCSSMap.set(opts, (outputToExtractedCSSMap.get(opts) || '') + chunkCSS);
             }
             return null;
@@ -33684,7 +33766,7 @@ function cssPostPlugin(config) {
                 hasEmitted = true;
                 extractedCss = await finalizeCss(extractedCss, true, config);
                 this.emitFile({
-                    name: 'style.css',
+                    name: cssBundleName,
                     type: 'asset',
                     source: extractedCss
                 });
@@ -33811,10 +33893,11 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         }));
     }
     postcssPlugins.push(UrlRewritePostcssPlugin({
-        replacer: urlReplacer
+        replacer: urlReplacer,
+        logger: config.logger
     }));
     if (isModule) {
-        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-2d9eaf08.js'); }).then(function (n) { return n.index; })).default({
+        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-8db43f98.js'); }).then(function (n) { return n.index; })).default({
             ...modulesOptions,
             getJSON(cssFileName, _modules, outputFileName) {
                 modules = _modules;
@@ -33999,12 +34082,18 @@ const UrlRewritePostcssPlugin = (opts) => {
         Once(root) {
             const promises = [];
             root.walkDecls((declaration) => {
+                var _a;
+                const importer = (_a = declaration.source) === null || _a === void 0 ? void 0 : _a.input.file;
+                if (!importer) {
+                    opts.logger.warnOnce('\nA PostCSS plugin did not pass the `from` option to `postcss.parse`. ' +
+                        'This may cause imported assets to be incorrectly transformed. ' +
+                        "If you've recently added a PostCSS plugin that raised this warning, " +
+                        'please contact the package author to fix the issue.');
+                }
                 const isCssUrl = cssUrlRE.test(declaration.value);
                 const isCssImageSet = cssImageSetRE.test(declaration.value);
                 if (isCssUrl || isCssImageSet) {
                     const replacerForDeclaration = (rawUrl) => {
-                        var _a;
-                        const importer = (_a = declaration.source) === null || _a === void 0 ? void 0 : _a.input.file;
                         return opts.replacer(rawUrl, importer);
                     };
                     const rewriterToUse = isCssImageSet
@@ -34468,8 +34557,7 @@ function isPreProcessor(lang) {
 const isModernFlag = `__VITE_IS_MODERN__`;
 const preloadMethod = `__vitePreload`;
 const preloadMarker = `__VITE_PRELOAD__`;
-const preloadBaseMarker = `__VITE_PRELOAD_BASE__`;
-const preloadHelperId = 'vite/preload-helper';
+const preloadHelperId = '\0vite/preload-helper';
 const preloadMarkerWithQuote = `"${preloadMarker}"`;
 const dynamicImportPrefixRE = /import\s*\(/;
 /**
@@ -34484,14 +34572,14 @@ function detectScriptRel() {
         ? 'modulepreload'
         : 'preload';
 }
-function preload(baseModule, deps) {
+function preload(baseModule, deps, importerUrl) {
     // @ts-ignore
     if (!__VITE_IS_MODERN__ || !deps || deps.length === 0) {
         return baseModule();
     }
     return Promise.all(deps.map((dep) => {
         // @ts-ignore
-        dep = `${base}${dep}`;
+        dep = assetsURL(dep, importerUrl);
         // @ts-ignore
         if (dep in seen)
             return;
@@ -34529,10 +34617,14 @@ function buildImportAnalysisPlugin(config) {
     const ssr = !!config.build.ssr;
     const isWorker = config.isWorker;
     const insertPreload = !(ssr || !!config.build.lib || isWorker);
+    const relativeBase = isRelativeBase(config.base);
     const scriptRel = config.build.polyfillModulePreload
         ? `'modulepreload'`
         : `(${detectScriptRel.toString()})()`;
-    const preloadCode = `const scriptRel = ${scriptRel};const seen = {};const base = '${preloadBaseMarker}';export const ${preloadMethod} = ${preload.toString()}`;
+    const assetsURL = relativeBase
+        ? `function(dep,importerUrl) { return new URL(dep, importerUrl).href }`
+        : `function(dep) { return ${JSON.stringify(config.base)}+dep }`;
+    const preloadCode = `const scriptRel = ${scriptRel};const assetsURL = ${assetsURL};const seen = {};export const ${preloadMethod} = ${preload.toString()}`;
     return {
         name: 'vite:build-import-analysis',
         resolveId(id) {
@@ -34542,7 +34634,7 @@ function buildImportAnalysisPlugin(config) {
         },
         load(id) {
             if (id === preloadHelperId) {
-                return preloadCode.replace(preloadBaseMarker, config.base);
+                return preloadCode;
             }
         },
         async transform(source, importer) {
@@ -34570,7 +34662,7 @@ function buildImportAnalysisPlugin(config) {
                 if (isDynamic && insertPreload) {
                     needPreloadHelper = true;
                     str().prependLeft(expStart, `${preloadMethod}(() => `);
-                    str().appendRight(expEnd, `,${isModernFlag}?"${preloadMarker}":void 0)`);
+                    str().appendRight(expEnd, `,${isModernFlag}?"${preloadMarker}":void 0${relativeBase ? ',import.meta.url' : ''})`);
                 }
                 // Differentiate CSS imports that use the default export from those that
                 // do not by injecting a ?used query - this allows us to avoid including
@@ -34701,12 +34793,17 @@ function buildImportAnalysisPlugin(config) {
                             }
                             if (markerStartPos > 0) {
                                 s.overwrite(markerStartPos, markerStartPos + preloadMarkerWithQuote.length, 
-                                // the dep list includes the main chunk, so only need to
-                                // preload when there are actual other deps.
+                                // the dep list includes the main chunk, so only need to reload when there are
+                                // actual other deps. Don't include the assets dir if the default asset file names
+                                // are used, the path will be reconstructed by the import preload helper
                                 deps.size > 1 ||
                                     // main chunk is removed
                                     (hasRemovedPureCssChunk && deps.size > 0)
-                                    ? `[${[...deps].map((d) => JSON.stringify(d)).join(',')}]`
+                                    ? `[${[...deps]
+                                        .map((d) => JSON.stringify(relativeBase
+                                        ? path__default.relative(path__default.dirname(file), d)
+                                        : d))
+                                        .join(',')}]`
                                     : `[]`, { contentOnly: true });
                                 rewroteMarkerStartPos.add(markerStartPos);
                             }
@@ -35635,19 +35732,40 @@ async function parseImportGlob(code, importer, root, resolveId) {
             return e;
         };
         let ast;
+        let lastTokenPos;
         try {
             ast = parseExpressionAt(code, start, {
                 ecmaVersion: 'latest',
                 sourceType: 'module',
-                ranges: true
+                ranges: true,
+                onToken: (token) => {
+                    lastTokenPos = token.end;
+                }
             });
         }
         catch (e) {
             const _e = e;
             if (_e.message && _e.message.startsWith('Unterminated string constant'))
                 return undefined;
-            throw _e;
+            if (lastTokenPos == null || lastTokenPos <= start)
+                throw _e;
+            // tailing comma in object or array will make the parser think it's a comma operation
+            // we try to parse again removing the comma
+            try {
+                const statement = code.slice(start, lastTokenPos).replace(/[,\s]*$/, '');
+                ast = parseExpressionAt(' '.repeat(start) + statement, // to keep the ast position
+                start, {
+                    ecmaVersion: 'latest',
+                    sourceType: 'module',
+                    ranges: true
+                });
+            }
+            catch {
+                throw _e;
+            }
         }
+        if (ast.type === 'SequenceExpression')
+            ast = ast.expressions[0];
         if (ast.type !== 'CallExpression')
             throw err(`Expect CallExpression, got ${ast.type}`);
         if (ast.arguments.length < 1 || ast.arguments.length > 2)
@@ -37872,6 +37990,7 @@ function assetImportMetaUrlPlugin(config) {
         name: 'vite:asset-import-meta-url',
         async transform(code, id, options) {
             if (!(options === null || options === void 0 ? void 0 : options.ssr) &&
+                id !== preloadHelperId &&
                 code.includes('new URL') &&
                 code.includes(`import.meta.url`)) {
                 let s;
@@ -38012,11 +38131,11 @@ function resolveBuildOptions(raw) {
         // Support browserslist
         // "defaults and supports es6-module and supports es6-module-dynamic-import",
         resolved.target = [
-            'es2019',
+            'es2020',
             'edge88',
             'firefox78',
             'chrome87',
-            'safari13.1'
+            'safari13' // transpile nullish coalescing
         ];
     }
     else if (resolved.target === 'esnext' && resolved.minify === 'terser') {
@@ -44730,7 +44849,7 @@ async function getCertificate(cacheDir) {
         return content;
     }
     catch {
-        const content = (await Promise.resolve().then(function () { return require('./dep-dfbd0b0c.js'); })).createCertificate();
+        const content = (await Promise.resolve().then(function () { return require('./dep-88b8fd2c.js'); })).createCertificate();
         fs$n.promises
             .mkdir(cacheDir, { recursive: true })
             .then(() => fs$n.promises.writeFile(cachePath, content))
@@ -53834,7 +53953,7 @@ const processNodeUrl = (node, s, config, htmlPath, originalUrl, moduleGraph) =>
         }
     }
     if (startsWithSingleSlashRE.test(url)) {
-        // prefix with base
+        // prefix with base (dev only, base is never relative)
         s.overwrite(node.value.loc.start.offset, node.value.loc.end.offset, `"${config.base + url.slice(1)}"`, { contentOnly: true });
     }
     else if (url.startsWith('.') &&
@@ -53886,7 +54005,7 @@ const devHtmlHook = async (html, { path: htmlPath, filename, server, originalUrl
         }
         // add HTML Proxy to Map
         addToHTMLProxyCache(config, proxyCacheUrl, inlineModuleIndex, { code, map });
-        // inline js module. convert to src="proxy"
+        // inline js module. convert to src="proxy" (dev only, base is never relative)
         const modulePath = `${proxyModuleUrl}?html-proxy&index=${inlineModuleIndex}.${ext}`;
         // invalidate the module so the newly cached contents will be served
         const module = server === null || server === void 0 ? void 0 : server.moduleGraph.getModuleById(modulePath);
@@ -57011,6 +57130,15 @@ function emitSourcemapForWorkerEntry(ctx, config, query, chunk) {
     }
     return chunk;
 }
+const workerAssetUrlRE = /__VITE_WORKER_ASSET__([a-z\d]{8})__/g;
+function encodeWorkerAssetFileName(fileName, workerCache) {
+    const { fileNameHash } = workerCache;
+    const hash = getHash(fileName);
+    if (!fileNameHash.get(hash)) {
+        fileNameHash.set(hash, fileName);
+    }
+    return `__VITE_WORKER_ASSET__${hash}__`;
+}
 async function workerFileToUrl(ctx, config, id, query) {
     const workerMap = workerCache.get(config.mainConfig || config);
     let fileName = workerMap.bundle.get(id);
@@ -57024,7 +57152,9 @@ async function workerFileToUrl(ctx, config, id, query) {
         });
         workerMap.bundle.set(id, fileName);
     }
-    return config.base + fileName;
+    return isRelativeBase(config.base)
+        ? encodeWorkerAssetFileName(fileName, workerMap)
+        : config.base + fileName;
 }
 function webWorkerPlugin(config) {
     const isBuild = config.command === 'build';
@@ -57037,7 +57167,8 @@ function webWorkerPlugin(config) {
             }
             workerCache.set(config, {
                 assets: new Map(),
-                bundle: new Map()
+                bundle: new Map(),
+                fileNameHash: new Map()
             });
         },
         load(id) {
@@ -57062,6 +57193,7 @@ function webWorkerPlugin(config) {
                 (query && ((_a = query.worker) !== null && _a !== void 0 ? _a : query.sharedworker) == null)) {
                 return;
             }
+            // stringified url or `new URL(...)`
             let url;
             if (isBuild) {
                 if (query.inline != null) {
@@ -57096,14 +57228,42 @@ function webWorkerPlugin(config) {
             const workerOptions = { type: 'module' };
             return {
                 code: `export default function WorkerWrapper() {
-          return new ${workerConstructor}(${JSON.stringify(url)}, ${JSON.stringify(workerOptions, null, 2)})
+          return new ${workerConstructor}(${JSON.stringify(url)}, ${JSON.stringify(workerOptions)})
         }`,
                 map: { mappings: '' } // Empty sourcemap to suppress Rollup warning
             };
         },
-        renderChunk(code) {
-            if (config.isWorker && code.includes('import.meta.url')) {
-                return code.replace('import.meta.url', 'self.location.href');
+        renderChunk(code, chunk) {
+            let s;
+            const result = () => {
+                return (s && {
+                    code: s.toString(),
+                    map: config.build.sourcemap ? s.generateMap({ hires: true }) : null
+                });
+            };
+            if (code.match(workerAssetUrlRE) || code.includes('import.meta.url')) {
+                let match;
+                s = new MagicString(code);
+                // Replace "__VITE_WORKER_ASSET__5aa0ddc0__" using relative paths
+                const workerMap = workerCache.get(config.mainConfig || config);
+                const { fileNameHash } = workerMap;
+                while ((match = workerAssetUrlRE.exec(code))) {
+                    const [full, hash] = match;
+                    const filename = fileNameHash.get(hash);
+                    let outputFilepath = path__default.posix.relative(path__default.dirname(chunk.fileName), filename);
+                    if (!outputFilepath.startsWith('.')) {
+                        outputFilepath = './' + outputFilepath;
+                    }
+                    const replacement = JSON.stringify(outputFilepath).slice(1, -1);
+                    s.overwrite(match.index, match.index + full.length, replacement, {
+                        contentOnly: true
+                    });
+                }
+                // TODO: check if this should be removed
+                if (config.isWorker) {
+                    s = s.replace('import.meta.url', 'self.location.href');
+                    return result();
+                }
             }
             if (!isWorker) {
                 const workerMap = workerCache.get(config);
@@ -57112,6 +57272,7 @@ function webWorkerPlugin(config) {
                     workerMap.assets.delete(asset.fileName);
                 });
             }
+            return result();
         }
     };
 }
@@ -58747,7 +58908,7 @@ function workerImportMetaUrlPlugin(config) {
                     }
                     s || (s = new MagicString(code));
                     const workerType = getWorkerType(code, cleanString, index + allExp.length);
-                    const file = path__default.resolve(path__default.dirname(id), rawUrl.slice(1, -1));
+                    const file = normalizePath$3(path__default.resolve(path__default.dirname(id), rawUrl.slice(1, -1)));
                     let url;
                     if (isBuild) {
                         url = await workerFileToUrl(this, config, file, query);

package/dist/node/chunks/{dep-dfbd0b0c.js → dep-88b8fd2c.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./dep-fafc4143.js');
+var index = require('./dep-5cb039d6.js');
 var require$$1 = require('crypto');
 require('fs');
 require('path');

package/dist/node/chunks/{dep-2d9eaf08.js → dep-8db43f98.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var require$$0 = require('postcss');
-var index$1 = require('./dep-fafc4143.js');
+var index$1 = require('./dep-5cb039d6.js');
 var path$2 = require('path');
 var require$$1 = require('crypto');
 var fs = require('fs');

package/dist/node/chunks/{dep-63fe0f22.js → dep-99df5764.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var index = require('./dep-fafc4143.js');
+var index = require('./dep-5cb039d6.js');
 
 function _mergeNamespaces(n, m) {
     for (var i = 0; i < m.length; i++) {

package/dist/node/cli.js

@@ -2,7 +2,7 @@
 
 var perf_hooks = require('perf_hooks');
 var require$$0 = require('events');
-var index = require('./chunks/dep-fafc4143.js');
+var index = require('./chunks/dep-5cb039d6.js');
 require('fs');
 require('path');
 require('url');
@@ -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-fafc4143.js'); }).then(function (n) { return n.index$1; });
+    const { createServer } = await Promise.resolve().then(function () { return require('./chunks/dep-5cb039d6.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 } = await Promise.resolve().then(function () { return require('./chunks/dep-fafc4143.js'); }).then(function (n) { return n.build$1; });
+    const { build } = await Promise.resolve().then(function () { return require('./chunks/dep-5cb039d6.js'); }).then(function (n) { return n.build$1; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -755,7 +755,7 @@ cli
     .command('optimize [root]', 'pre-bundle dependencies')
     .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-fafc4143.js'); }).then(function (n) { return n.index; });
+    const { optimizeDeps } = await Promise.resolve().then(function () { return require('./chunks/dep-5cb039d6.js'); }).then(function (n) { return n.index; });
     try {
         const config = await index.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-fafc4143.js'); }).then(function (n) { return n.preview$1; });
+    const { preview } = await Promise.resolve().then(function () { return require('./chunks/dep-5cb039d6.js'); }).then(function (n) { return n.preview$1; });
     try {
         const server = await preview({
             root,

package/dist/node/index.d.ts

@@ -1473,7 +1473,7 @@ export declare interface PreviewServer {
     /**
      * native Node http server instance
      */
-    httpServer: Server;
+    httpServer: http.Server;
     /**
      * Print server urls
      */

package/dist/node/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require('./chunks/dep-fafc4143.js');
+var index = require('./chunks/dep-5cb039d6.js');
 require('fs');
 require('path');
 require('url');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "3.0.0-alpha.0",
+  "version": "3.0.0-alpha.1",
   "license": "MIT",
   "author": "Evan You",
   "description": "Native-ESM powered web dev build tool",