vite 4.0.0-alpha.3 → 4.0.0-alpha.4

package/dist/node/chunks/{dep-b522a97d.js → dep-2ed340b5.js}

@@ -1,5 +1,5 @@
 import require$$0$1 from 'postcss';
-import { A as commonjsGlobal } from './dep-f5aa12ea.js';
+import { A as commonjsGlobal } from './dep-b73c4a2f.js';
 import require$$0 from 'path';
 import require$$5 from 'crypto';
 import require$$0__default from 'fs';

package/dist/node/chunks/{dep-f5aa12ea.js → dep-b73c4a2f.js}

@@ -1,5 +1,5 @@
 import fs$l, { promises as promises$2 } from 'node:fs';
-import path$o, { posix as posix$1, isAbsolute as isAbsolute$2, resolve as resolve$6, join as join$2, relative as relative$2, dirname as dirname$2, basename as basename$2, extname as extname$1 } from 'node:path';
+import path$o, { posix as posix$1, isAbsolute as isAbsolute$2, join as join$2, relative as relative$2, dirname as dirname$2, basename as basename$2, extname as extname$1 } from 'node:path';
 import { URL as URL$3, URLSearchParams, parse as parse$j, pathToFileURL as pathToFileURL$1 } from 'node:url';
 import { performance } from 'node:perf_hooks';
 import { createRequire as createRequire$1, builtinModules } from 'node:module';
@@ -22,7 +22,7 @@ import { createHash as createHash$2 } from 'node:crypto';
 import { promisify as promisify$4 } from 'node:util';
 import { promises } from 'node:dns';
 import resolve$5 from 'resolve';
-import { CLIENT_ENTRY, OPTIMIZABLE_ENTRY_RE, DEFAULT_EXTENSIONS as DEFAULT_EXTENSIONS$1, wildcardHosts, loopbackHosts, VALID_ID_PREFIX, NULL_BYTE_PLACEHOLDER, FS_PREFIX, CLIENT_PUBLIC_PATH, ENV_PUBLIC_PATH, ENV_ENTRY, DEFAULT_MAIN_FIELDS, SPECIAL_QUERY_RE, DEP_VERSION_RE, KNOWN_ASSET_TYPES, CLIENT_DIR, JS_TYPES_RE, ESBUILD_MODULES_TARGET, VERSION, VITE_PACKAGE_DIR, DEFAULT_ASSETS_RE, DEFAULT_CONFIG_FILES } from '../constants.js';
+import { CLIENT_ENTRY, OPTIMIZABLE_ENTRY_RE, DEFAULT_EXTENSIONS as DEFAULT_EXTENSIONS$1, wildcardHosts, loopbackHosts, VALID_ID_PREFIX, NULL_BYTE_PLACEHOLDER, FS_PREFIX, CLIENT_PUBLIC_PATH, ENV_PUBLIC_PATH, ENV_ENTRY, DEFAULT_MAIN_FIELDS, SPECIAL_QUERY_RE, DEP_VERSION_RE, KNOWN_ASSET_TYPES, CLIENT_DIR, JS_TYPES_RE, ESBUILD_MODULES_TARGET, VERSION as VERSION$1, VITE_PACKAGE_DIR, DEFAULT_ASSETS_RE, DEFAULT_CONFIG_FILES } from '../constants.js';
 import require$$5 from 'crypto';
 import { Buffer as Buffer$1 } from 'node:buffer';
 import require$$0$8, { createRequire as createRequire$2 } from 'module';
@@ -32,6 +32,7 @@ import require$$1$2 from 'https';
 import require$$4 from 'tls';
 import { STATUS_CODES } from 'node:http';
 import { createServer as createServer$2 } from 'node:https';
+import { VERSION } from 'rollup';
 import * as qs from 'querystring';
 import readline from 'node:readline';
 import { execSync } from 'node:child_process';
@@ -20884,9 +20885,9 @@ async function bundleWorkerEntry(config, id, query) {
                 : workerOutputConfig
             : {};
         const { output: [outputChunk, ...outputChunks] } = await bundle.generate({
-            entryFileNames: path$o.posix.join(config.build.assetsDir, '[name].[hash].js'),
-            chunkFileNames: path$o.posix.join(config.build.assetsDir, '[name].[hash].js'),
-            assetFileNames: path$o.posix.join(config.build.assetsDir, '[name].[hash].[ext]'),
+            entryFileNames: path$o.posix.join(config.build.assetsDir, '[name]-[hash].js'),
+            chunkFileNames: path$o.posix.join(config.build.assetsDir, '[name]-[hash].js'),
+            assetFileNames: path$o.posix.join(config.build.assetsDir, '[name]-[hash].[ext]'),
             ...workerConfig,
             format,
             sourcemap: config.build.sourcemap
@@ -36451,7 +36452,7 @@ async function compileCSS(id, code, config, urlReplacer) {
         }));
     }
     if (isModule) {
-        postcssPlugins.unshift((await import('./dep-b522a97d.js').then(function (n) { return n.i; })).default({
+        postcssPlugins.unshift((await import('./dep-2ed340b5.js').then(function (n) { return n.i; })).default({
             ...modulesOptions,
             localsConvention: modulesOptions?.localsConvention,
             getJSON(cssFileName, _modules, outputFileName) {
@@ -38992,7 +38993,7 @@ function importAnalysisPlugin(config) {
                 // properly finish the request with a 504 sent to the browser.
                 throwOutdatedRequest(importer);
             }
-            if (!imports.length) {
+            if (!imports.length && !this._addedImports) {
                 importerModule.isSelfAccepting = false;
                 isDebug$1 &&
                     debug$9(`${timeFrom(start)} ${picocolors.exports.dim(`[no imports] ${prettyImporter}`)}`);
@@ -39013,7 +39014,7 @@ function importAnalysisPlugin(config) {
                 ? new Map()
                 : null;
             const toAbsoluteUrl = (url) => path$o.posix.resolve(path$o.posix.dirname(importerModule.url), url);
-            const normalizeUrl = async (url, pos) => {
+            const normalizeUrl = async (url, pos, forceSkipImportAnalysis = false) => {
                 url = stripBase(url, base);
                 let importerFile = importer;
                 const optimizeDeps = getDepOptimizationConfig(config, ssr);
@@ -39091,7 +39092,7 @@ function importAnalysisPlugin(config) {
                     // up-to-date version of this module.
                     try {
                         // delay setting `isSelfAccepting` until the file is actually used (#7870)
-                        const depModule = await moduleGraph.ensureEntryFromUrl(unwrapId(url), ssr, canSkipImportAnalysis(url));
+                        const depModule = await moduleGraph.ensureEntryFromUrl(unwrapId(url), ssr, canSkipImportAnalysis(url) || forceSkipImportAnalysis);
                         if (depModule.lastHMRTimestamp > 0) {
                             url = injectQuery(url, `t=${depModule.lastHMRTimestamp}`);
                         }
@@ -39306,7 +39307,7 @@ function importAnalysisPlugin(config) {
                 // attached by pluginContainer.addWatchFile
                 const pluginImports = this._addedImports;
                 if (pluginImports) {
-                    (await Promise.all([...pluginImports].map((id) => normalizeUrl(id, 0)))).forEach(([url]) => importedUrls.add(url));
+                    (await Promise.all([...pluginImports].map((id) => normalizeUrl(id, 0, true)))).forEach(([url]) => importedUrls.add(url));
                 }
                 // HMR transforms are no-ops in SSR, so an `accept` call will
                 // never be injected. Avoid updating the `isSelfAccepting`
@@ -42032,14 +42033,9 @@ async function createPluginContainer(config, moduleGraph, watcher) {
     });
     // ---------------------------------------------------------------------------
     const watchFiles = new Set();
-    // TODO: use import()
-    const _require = createRequire$1(import.meta.url);
-    // get rollup version
-    const rollupPkgPath = resolve$6(_require.resolve('rollup'), '../../package.json');
     const minimalContext = {
         meta: {
-            rollupVersion: JSON.parse(fs$l.readFileSync(rollupPkgPath, 'utf-8'))
-                .version,
+            rollupVersion: VERSION,
             watchMode: true
         }
     };
@@ -45215,7 +45211,7 @@ async function doBuild(inlineConfig = {}) {
     const options = config.build;
     const ssr = !!options.ssr;
     const libOptions = options.lib;
-    config.logger.info(picocolors.exports.cyan(`vite v${VERSION} ${picocolors.exports.green(`building ${ssr ? `SSR bundle ` : ``}for ${config.mode}...`)}`));
+    config.logger.info(picocolors.exports.cyan(`vite v${VERSION$1} ${picocolors.exports.green(`building ${ssr ? `SSR bundle ` : ``}for ${config.mode}...`)}`));
     const resolve = (p) => path$o.resolve(config.root, p);
     const input = libOptions
         ? options.rollupOptions?.input ||
@@ -45304,13 +45300,13 @@ async function doBuild(inlineConfig = {}) {
                     ? `[name].${jsExt}`
                     : libOptions
                         ? ({ name }) => resolveLibFilename(libOptions, format, name, config.root, jsExt)
-                        : path$o.posix.join(options.assetsDir, `[name].[hash].${jsExt}`),
+                        : path$o.posix.join(options.assetsDir, `[name]-[hash].${jsExt}`),
                 chunkFileNames: libOptions
-                    ? `[name].[hash].${jsExt}`
-                    : path$o.posix.join(options.assetsDir, `[name].[hash].${jsExt}`),
+                    ? `[name]-[hash].${jsExt}`
+                    : path$o.posix.join(options.assetsDir, `[name]-[hash].${jsExt}`),
                 assetFileNames: libOptions
                     ? `[name].[ext]`
-                    : path$o.posix.join(options.assetsDir, `[name].[hash].[ext]`),
+                    : path$o.posix.join(options.assetsDir, `[name]-[hash].[ext]`),
                 inlineDynamicImports: output.format === 'umd' ||
                     output.format === 'iife' ||
                     (ssrWorkerBuild &&
@@ -62427,7 +62423,8 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development')
         : pkgPath
             ? path$o.join(path$o.dirname(pkgPath), `node_modules/.vite`)
             : path$o.join(resolvedRoot, `.vite`);
-    const assetsFilter = config.assetsInclude
+    const assetsFilter = config.assetsInclude &&
+        (!Array.isArray(config.assetsInclude) || config.assetsInclude.length)
         ? createFilter(config.assetsInclude)
         : () => false;
     // create an internal resolver to be used in special scenarios, e.g.

package/dist/node/cli.js

@@ -2,7 +2,7 @@ import path from 'node:path';
 import fs from 'node:fs';
 import { performance } from 'node:perf_hooks';
 import { EventEmitter } from 'events';
-import { z as picocolors, v as createLogger, g as resolveConfig } from './chunks/dep-f5aa12ea.js';
+import { z as picocolors, v as createLogger, g as resolveConfig } from './chunks/dep-b73c4a2f.js';
 import { VERSION } from './constants.js';
 import 'node:url';
 import 'node:module';
@@ -32,6 +32,7 @@ import 'https';
 import 'tls';
 import 'node:http';
 import 'node:https';
+import 'rollup';
 import 'querystring';
 import 'node:readline';
 import 'node:child_process';
@@ -719,7 +720,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-f5aa12ea.js').then(function (n) { return n.D; });
+    const { createServer } = await import('./chunks/dep-b73c4a2f.js').then(function (n) { return n.D; });
     try {
         const server = await createServer({
             root,
@@ -772,7 +773,7 @@ cli
     .option('-w, --watch', `[boolean] rebuilds when modules have changed on disk`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { build } = await import('./chunks/dep-f5aa12ea.js').then(function (n) { return n.C; });
+    const { build } = await import('./chunks/dep-b73c4a2f.js').then(function (n) { return n.C; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -800,7 +801,7 @@ cli
     .option('--force', `[boolean] force the optimizer to ignore the cache and re-bundle`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { optimizeDeps } = await import('./chunks/dep-f5aa12ea.js').then(function (n) { return n.B; });
+    const { optimizeDeps } = await import('./chunks/dep-b73c4a2f.js').then(function (n) { return n.B; });
     try {
         const config = await resolveConfig({
             root,
@@ -825,7 +826,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-f5aa12ea.js').then(function (n) { return n.E; });
+    const { preview } = await import('./chunks/dep-b73c4a2f.js').then(function (n) { return n.E; });
     try {
         const server = await preview({
             root,

package/dist/node/index.js

@@ -1,4 +1,4 @@
-export { b as build, q as createFilter, v as createLogger, c as createServer, e as defineConfig, f as formatPostcssSourceMap, i as getDepOptimizationConfig, j as isDepsOptimizerEnabled, l as loadConfigFromFile, x as loadEnv, k as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, a as preprocessCSS, p as preview, h as resolveBaseUrl, g as resolveConfig, y as resolveEnvPrefix, d as resolvePackageData, r as resolvePackageEntry, w as searchForWorkspaceRoot, u as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-f5aa12ea.js';
+export { b as build, q as createFilter, v as createLogger, c as createServer, e as defineConfig, f as formatPostcssSourceMap, i as getDepOptimizationConfig, j as isDepsOptimizerEnabled, l as loadConfigFromFile, x as loadEnv, k as mergeAlias, m as mergeConfig, n as normalizePath, o as optimizeDeps, a as preprocessCSS, p as preview, h as resolveBaseUrl, g as resolveConfig, y as resolveEnvPrefix, d as resolvePackageData, r as resolvePackageEntry, w as searchForWorkspaceRoot, u as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-b73c4a2f.js';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 export { VERSION as rollupVersion } from 'rollup';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "4.0.0-alpha.3",
+  "version": "4.0.0-alpha.4",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",