vite 3.0.0-alpha.11 → 3.0.0-alpha.12

package/dist/node/chunks/{dep-46501b7a.js → dep-7d4129cb.js}

@@ -12061,6 +12061,7 @@ function printCommonServerUrls(server, options, config) {
 }
 function printServerUrls(hostname, protocol, port, base, info) {
     const urls = [];
+    const notes = [];
     if (hostname.host && loopbackHosts.has(hostname.host)) {
         let hostnameName = hostname.name;
         if (hostnameName === '::1' ||
@@ -12072,9 +12073,9 @@ function printServerUrls(hostname, protocol, port, base, info) {
             url: colors$1.cyan(`${protocol}://${hostnameName}:${colors$1.bold(port)}${base}`)
         });
         if (hostname.name === 'localhost') {
-            urls.push({
-                label: 'Network',
-                url: colors$1.dim(`use ${colors$1.white(colors$1.bold('--host'))} to expose`)
+            notes.push({
+                label: 'Hint',
+                message: colors$1.dim(`Use ${colors$1.white(colors$1.bold('--host'))} to expose to network.`)
             });
         }
     }
@@ -12094,16 +12095,22 @@ function printServerUrls(hostname, protocol, port, base, info) {
             urls.push({ label, url: colors$1.cyan(url) });
         });
     }
-    const length = urls.reduce((length, { label }) => Math.max(length, label.length), 0);
+    if (!hostname.host || wildcardHosts.has(hostname.host)) {
+        notes.push({
+            label: 'Note',
+            message: colors$1.dim('You are using a wildcard host. Ports might be overridden.')
+        });
+    }
+    const length = Math.max(...[...urls, ...notes].map(({ label }) => label.length));
     const print = (iconWithColor, label, messageWithColor) => {
         info(`  ${iconWithColor}  ${colors$1.bold(label)}: ${' '.repeat(length - label.length)}${messageWithColor}`);
     };
     urls.forEach(({ label, url: text }) => {
         print(colors$1.green('➜'), label, text);
     });
-    if (!hostname.host || wildcardHosts.has(hostname.host)) {
-        print(colors$1.bold(colors$1.blue('ⓘ')), 'Note', colors$1.dim('You are using a wildcard host. Ports might be overriden.'));
-    }
+    notes.forEach(({ label, message: text }) => {
+        print(colors$1.white('❖'), label, text);
+    });
 }
 
 const writeColors = {
@@ -15447,6 +15454,23 @@ function esbuildDepPlugin(qualified, exportsData, config) {
         const resolver = kind.startsWith('require') ? _resolveRequire : _resolve;
         return resolver(id, _importer, undefined);
     };
+    const resolveResult = (id, resolved) => {
+        if (resolved.startsWith(browserExternalId)) {
+            return {
+                path: id,
+                namespace: 'browser-external'
+            };
+        }
+        if (isExternalUrl(resolved)) {
+            return {
+                path: resolved,
+                external: true
+            };
+        }
+        return {
+            path: path$p.resolve(resolved)
+        };
+    };
     return {
         name: 'vite:dep-pre-bundle',
         setup(build) {
@@ -15510,21 +15534,7 @@ function esbuildDepPlugin(qualified, exportsData, config) {
                 // use vite's own resolver
                 const resolved = await resolve(id, importer, kind);
                 if (resolved) {
-                    if (resolved.startsWith(browserExternalId)) {
-                        return {
-                            path: id,
-                            namespace: 'browser-external'
-                        };
-                    }
-                    if (isExternalUrl(resolved)) {
-                        return {
-                            path: resolved,
-                            external: true
-                        };
-                    }
-                    return {
-                        path: path$p.resolve(resolved)
-                    };
+                    return resolveResult(id, resolved);
                 }
             });
             // For entry files, we'll read it ourselves and construct a proxy module
@@ -15599,10 +15609,14 @@ module.exports = Object.create(new Proxy({}, {
             });
             // yarn 2 pnp compat
             if (isRunningWithYarnPnp) {
-                build.onResolve({ filter: /.*/ }, async ({ path, importer, kind, resolveDir }) => ({
+                build.onResolve({ filter: /.*/ }, async ({ path: id, importer, kind, resolveDir, namespace }) => {
+                    const resolved = await resolve(id, importer, kind, 
                     // pass along resolveDir for entries
-                    path: await resolve(path, importer, kind, resolveDir)
-                }));
+                    namespace === 'dep' ? resolveDir : undefined);
+                    if (resolved) {
+                        return resolveResult(id, resolved);
+                    }
+                });
                 build.onLoad({ filter: /.*/ }, async (args) => ({
                     contents: await promises.readFile(args.path),
                     loader: 'default'
@@ -28089,10 +28103,16 @@ async function fileToBuiltUrl(id, config, pluginContext, skipPublicCheck = false
         const { search, hash } = parse$m(id);
         const postfix = (search || '') + (hash || '');
         const output = config.build?.rollupOptions?.output;
-        const assetFileNames = (output && !Array.isArray(output) ? output.assetFileNames : undefined) ??
-            // defaults to '<assetsDir>/[name].[hash][extname]'
-            // slightly different from rollup's one ('assets/[name]-[hash][extname]')
-            path$p.posix.join(config.build.assetsDir, '[name].[hash][extname]');
+        const defaultAssetFileNames = path$p.posix.join(config.build.assetsDir, '[name].[hash][extname]');
+        // Steps to determine which assetFileNames will be actually used.
+        // First, if output is an object or string, use assetFileNames in it.
+        // And a default assetFileNames as fallback.
+        let assetFileNames = (output && !Array.isArray(output) ? output.assetFileNames : undefined) ??
+            defaultAssetFileNames;
+        if (output && Array.isArray(output)) {
+            // Second, if output is an array, adopt assetFileNames in the first object.
+            assetFileNames = output[0].assetFileNames ?? assetFileNames;
+        }
         const fileName = assetFileNamesToFileName(assetFileNames, file, contentHash, content);
         if (!map.has(contentHash)) {
             map.set(contentHash, fileName);
@@ -29981,6 +30001,7 @@ function depsLogString(qualifiedIds) {
  * the metadata and start the server without waiting for the optimizeDeps processing to be completed
  */
 async function runOptimizeDeps(resolvedConfig, depsInfo) {
+    const isBuild = resolvedConfig.command === 'build';
     const config = {
         ...resolvedConfig,
         command: 'build'
@@ -30048,18 +30069,14 @@ async function runOptimizeDeps(resolvedConfig, depsInfo) {
         idToExports[id] = exportsData;
         flatIdToExports[flatId] = exportsData;
     }
-    const define = {
-        'process.env.NODE_ENV': JSON.stringify(process.env.NODE_ENV || config.mode)
-    };
-    for (const key in config.define) {
-        const value = config.define[key];
-        define[key] = typeof value === 'string' ? value : JSON.stringify(value);
-    }
     const start = performance.now();
     const result = await build$3({
         absWorkingDir: process.cwd(),
         entryPoints: Object.keys(flatIdDeps),
         bundle: true,
+        // Ensure resolution is handled by esbuildDepPlugin and
+        // avoid replacing `process.env.NODE_ENV` for 'browser'
+        platform: 'neutral',
         format: 'esm',
         target: config.build.target || undefined,
         external: config.optimizeDeps?.exclude,
@@ -30067,9 +30084,8 @@ async function runOptimizeDeps(resolvedConfig, depsInfo) {
         splitting: true,
         sourcemap: true,
         outdir: processingCacheDir,
-        ignoreAnnotations: resolvedConfig.command !== 'build',
+        ignoreAnnotations: !isBuild,
         metafile: true,
-        define,
         plugins: [
             ...plugins,
             esbuildDepPlugin(flatIdDeps, flatIdToExports, config)
@@ -30156,7 +30172,10 @@ function getOptimizedDepPath(id, config) {
 function getDepsCacheSuffix(config) {
     let suffix = '';
     if (config.command === 'build') {
-        suffix += '_build';
+        // Differentiate build caches depending on outDir to allow parallel builds
+        const { outDir } = config.build;
+        const buildId = outDir.length > 8 || outDir.includes('/') ? getHash(outDir) : outDir;
+        suffix += `_build-${buildId}`;
         if (config.build.ssr) {
             suffix += '_ssr';
         }
@@ -30355,7 +30374,6 @@ function getDepHash(config) {
     content += JSON.stringify({
         mode: process.env.NODE_ENV || config.mode,
         root: config.root,
-        define: config.define,
         resolve: config.resolve,
         buildTarget: config.build.target,
         assetsInclude: config.assetsInclude,
@@ -38365,7 +38383,7 @@ const assetAttrsConfig = {
 const isAsyncScriptMap = new WeakMap();
 async function traverseHtml(html, filePath, visitor) {
     // lazy load compiler
-    const { parse, transform } = await import('./dep-d6e255b8.js').then(function (n) { return n.c; });
+    const { parse, transform } = await import('./dep-bb927dda.js').then(function (n) { return n.c; });
     // @vue/compiler-core doesn't like lowercase doctypes
     html = html.replace(/<!doctype\s/i, '<!DOCTYPE ');
     try {
@@ -38807,10 +38825,6 @@ function resolveHtmlTransforms(plugins) {
     return [preHooks, postHooks];
 }
 async function applyHtmlTransforms(html, hooks, ctx) {
-    const headTags = [];
-    const headPrependTags = [];
-    const bodyTags = [];
-    const bodyPrependTags = [];
     for (const hook of hooks) {
         const res = await hook(html, ctx);
         if (!res) {
@@ -38828,6 +38842,10 @@ async function applyHtmlTransforms(html, hooks, ctx) {
                 html = res.html || html;
                 tags = res.tags;
             }
+            const headTags = [];
+            const headPrependTags = [];
+            const bodyTags = [];
+            const bodyPrependTags = [];
             for (const tag of tags) {
                 if (tag.injectTo === 'body') {
                     bodyTags.push(tag);
@@ -38842,21 +38860,12 @@ async function applyHtmlTransforms(html, hooks, ctx) {
                     headPrependTags.push(tag);
                 }
             }
+            html = injectToHead(html, headPrependTags, true);
+            html = injectToHead(html, headTags);
+            html = injectToBody(html, bodyPrependTags, true);
+            html = injectToBody(html, bodyTags);
         }
     }
-    // inject tags
-    if (headPrependTags.length) {
-        html = injectToHead(html, headPrependTags, true);
-    }
-    if (headTags.length) {
-        html = injectToHead(html, headTags);
-    }
-    if (bodyPrependTags.length) {
-        html = injectToBody(html, bodyPrependTags, true);
-    }
-    if (bodyTags.length) {
-        html = injectToBody(html, bodyTags);
-    }
     return html;
 }
 const importRE = /\bimport\s*("[^"]*[^\\]"|'[^']*[^\\]');*/g;
@@ -38885,6 +38894,8 @@ const bodyInjectRE = /([ \t]*)<\/body>/i;
 const bodyPrependInjectRE = /([ \t]*)<body[^>]*>/i;
 const doctypePrependInjectRE = /<!doctype html>/i;
 function injectToHead(html, tags, prepend = false) {
+    if (tags.length === 0)
+        return html;
     if (prepend) {
         // inject as the first element of head
         if (headPrependInjectRE.test(html)) {
@@ -38906,6 +38917,8 @@ function injectToHead(html, tags, prepend = false) {
     return prependInjectFallback(html, tags);
 }
 function injectToBody(html, tags, prepend = false) {
+    if (tags.length === 0)
+        return html;
     if (prepend) {
         // inject after body open
         if (bodyPrependInjectRE.test(html)) {
@@ -39470,7 +39483,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         logger: config.logger
     }));
     if (isModule) {
-        postcssPlugins.unshift((await import('./dep-4e458630.js').then(function (n) { return n.i; })).default({
+        postcssPlugins.unshift((await import('./dep-9b1a7a5b.js').then(function (n) { return n.i; })).default({
             ...modulesOptions,
             getJSON(cssFileName, _modules, outputFileName) {
                 modules = _modules;
@@ -39524,7 +39537,9 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         else if (message.type === 'dir-dependency') {
             // https://github.com/postcss/postcss/blob/main/docs/guidelines/plugin.md#3-dependencies
             const { dir, glob: globPattern = '**' } = message;
-            const pattern = normalizePath$3(path$p.resolve(path$p.dirname(id), dir)) + `/` + globPattern;
+            const pattern = out.escapePath(normalizePath$3(path$p.resolve(path$p.dirname(id), dir))) +
+                `/` +
+                globPattern;
             const files = out.sync(pattern, {
                 ignore: ['**/node_modules/**']
             });
@@ -48710,7 +48725,7 @@ async function getCertificate(cacheDir) {
         return content;
     }
     catch {
-        const content = (await import('./dep-fb927717.js')).createCertificate();
+        const content = (await import('./dep-82a07453.js')).createCertificate();
         promises
             .mkdir(cacheDir, { recursive: true })
             .then(() => promises.writeFile(cachePath, content))
@@ -55623,11 +55638,16 @@ function proxyMiddleware(httpServer, options, config) {
             opts = { target: opts, changeOrigin: true };
         }
         const proxy = httpProxy.createProxyServer(opts);
-        proxy.on('error', (err) => {
+        proxy.on('error', (err, req, res) => {
             config.logger.error(`${colors$1.red(`http proxy error:`)}\n${err.stack}`, {
                 timestamp: true,
                 error: err
             });
+            res
+                .writeHead(500, {
+                'Content-Type': 'text/plain'
+            })
+                .end();
         });
         if (opts.configure) {
             opts.configure(proxy, opts);
@@ -60985,7 +61005,9 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development')
         worker: resolvedWorkerOptions,
         spa: config.spa ?? true
     };
-    // flat config.worker.plugin
+    // Some plugins that aren't intended to work in the bundling of workers (doing post-processing at build time for example).
+    // And Plugins may also have cached that could be corrupted by being used in these extra rollup calls.
+    // So we need to separate the worker plugin from the plugin that vite needs to run.
     const [workerPrePlugins, workerNormalPlugins, workerPostPlugins] = sortUserPlugins(config.worker?.plugins);
     const workerResolved = {
         ...resolved,
@@ -61009,6 +61031,22 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development')
             `Note Vite now defaults to use esbuild for minification. If you still ` +
             `prefer Terser, set build.minify to "terser".`));
     }
+    // Check if all assetFileNames have the same reference.
+    // If not, display a warn for user.
+    const outputOption = config.build?.rollupOptions?.output ?? [];
+    // Use isArray to narrow its type to array
+    if (Array.isArray(outputOption)) {
+        const assetFileNamesList = outputOption.map((output) => output.assetFileNames);
+        if (assetFileNamesList.length > 1) {
+            const firstAssetFileNames = assetFileNamesList[0];
+            const hasDifferentReference = assetFileNamesList.some((assetFileNames) => assetFileNames !== firstAssetFileNames);
+            if (hasDifferentReference) {
+                resolved.logger.warn(colors$1.yellow(`
+assetFileNames isn't equal for every build.rollupOptions.output. A single pattern across all outputs is supported by Vite.
+`));
+            }
+        }
+    }
     return resolved;
 }
 /**

package/dist/node/chunks/{dep-fb927717.js → dep-82a07453.js}

@@ -1,4 +1,4 @@
-import { x as commonjsGlobal } from './dep-46501b7a.js';
+import { x as commonjsGlobal } from './dep-7d4129cb.js';
 import require$$1 from 'crypto';
 import 'fs';
 import 'path';

package/dist/node/chunks/{dep-4e458630.js → dep-9b1a7a5b.js}

@@ -1,5 +1,5 @@
 import require$$0 from 'postcss';
-import { x as commonjsGlobal } from './dep-46501b7a.js';
+import { x as commonjsGlobal } from './dep-7d4129cb.js';
 import path$2 from 'path';
 import require$$1 from 'crypto';
 import fs__default from 'fs';

package/dist/node/chunks/{dep-d6e255b8.js → dep-bb927dda.js}

@@ -1,4 +1,4 @@
-import { y as getAugmentedNamespace, z as getDefaultExportFromCjs } from './dep-46501b7a.js';
+import { y as getAugmentedNamespace, z as getDefaultExportFromCjs } from './dep-7d4129cb.js';
 
 import { fileURLToPath as __cjs_fileURLToPath } from 'url';
 import { dirname as __cjs_dirname } from 'path';

package/dist/node/cli.js

@@ -1,6 +1,6 @@
 import { performance } from 'perf_hooks';
 import { EventEmitter } from 'events';
-import { w as colors, k as createLogger, e as resolveConfig } from './chunks/dep-46501b7a.js';
+import { w as colors, k as createLogger, e as resolveConfig } from './chunks/dep-7d4129cb.js';
 import { VERSION } from './constants.js';
 import 'fs';
 import 'path';
@@ -683,7 +683,7 @@ cli
     .action(async (root, options) => {
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-46501b7a.js').then(function (n) { return n.C; });
+    const { createServer } = await import('./chunks/dep-7d4129cb.js').then(function (n) { return n.C; });
     try {
         const server = await createServer({
             root,
@@ -729,7 +729,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 import('./chunks/dep-46501b7a.js').then(function (n) { return n.B; });
+    const { build } = await import('./chunks/dep-7d4129cb.js').then(function (n) { return n.B; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -753,7 +753,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 import('./chunks/dep-46501b7a.js').then(function (n) { return n.A; });
+    const { optimizeDeps } = await import('./chunks/dep-7d4129cb.js').then(function (n) { return n.A; });
     try {
         const config = await resolveConfig({
             root,
@@ -776,7 +776,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 import('./chunks/dep-46501b7a.js').then(function (n) { return n.D; });
+    const { preview } = await import('./chunks/dep-7d4129cb.js').then(function (n) { return n.D; });
     try {
         const server = await preview({
             root,

package/dist/node/constants.js

@@ -1,7 +1,7 @@
 import path, { resolve } from 'path';
 import { fileURLToPath } from 'url';
 
-var version = "3.0.0-alpha.11";
+var version = "3.0.0-alpha.12";
 
 const VERSION = version;
 const DEFAULT_MAIN_FIELDS = [

package/dist/node/index.js

@@ -1,4 +1,4 @@
-export { b as build, h as createFilter, k as createLogger, c as createServer, d as defineConfig, f as formatPostcssSourceMap, i as isDepsOptimizerEnabled, l as loadConfigFromFile, u as loadEnv, g as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, p as preview, e as resolveConfig, v as resolveEnvPrefix, a as resolvePackageData, r as resolvePackageEntry, q as searchForWorkspaceRoot, j as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-46501b7a.js';
+export { b as build, h as createFilter, k as createLogger, c as createServer, d as defineConfig, f as formatPostcssSourceMap, i as isDepsOptimizerEnabled, l as loadConfigFromFile, u as loadEnv, g as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, p as preview, e as resolveConfig, v as resolveEnvPrefix, a as resolvePackageData, r as resolvePackageEntry, q as searchForWorkspaceRoot, j as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-7d4129cb.js';
 export { VERSION as version } from './constants.js';
 import 'fs';
 import 'path';

package/dist/node-cjs/publicUtils.cjs

@@ -22,7 +22,7 @@ var require$$0__default = /*#__PURE__*/_interopDefaultLegacy(require$$0);
 var require$$0__default$1 = /*#__PURE__*/_interopDefaultLegacy(require$$0$1);
 var readline__default = /*#__PURE__*/_interopDefaultLegacy(readline);
 
-var version = "3.0.0-alpha.11";
+var version = "3.0.0-alpha.12";
 
 const VERSION = version;
 const VITE_PACKAGE_DIR = path$3.resolve(url.fileURLToPath((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('node-cjs/publicUtils.cjs', document.baseURI).href))), '../../..');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "3.0.0-alpha.11",
+  "version": "3.0.0-alpha.12",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",
@@ -51,8 +51,8 @@
     "patch-types": "esno scripts/patchTypes.ts",
     "roll-types": "api-extractor run && rimraf temp",
     "check-dist-types": "tsc --project tsconfig.check.json",
-    "lint": "eslint --ext .ts src/**",
-    "format": "prettier --write --parser typescript \"src/**/*.ts\"",
+    "lint": "eslint --cache --ext .ts src/**",
+    "format": "prettier --write --cache --parser typescript \"src/**/*.ts\"",
     "prepublishOnly": "npm run build"
   },
   "//": "READ CONTRIBUTING.md to understand what to put under deps vs. devDeps!",