vite 4.3.7 → 4.3.9

package/dist/node/chunks/{dep-a6949a9d.js → dep-8124a809.js}

@@ -1,4 +1,4 @@
-import { F as commonjsGlobal, E as getDefaultExportFromCjs } from './dep-1f986b87.js';
+import { F as commonjsGlobal, E as getDefaultExportFromCjs } from './dep-e8f070e8.js';
 import require$$0__default from 'fs';
 import require$$0 from 'postcss';
 import require$$0$1 from 'path';

package/dist/node/chunks/{dep-7c975f20.js → dep-93197d47.js}

@@ -1,4 +1,4 @@
-import { E as getDefaultExportFromCjs } from './dep-1f986b87.js';
+import { E as getDefaultExportFromCjs } from './dep-e8f070e8.js';
 import require$$0 from 'path';
 import require$$0__default from 'fs';
 import { l as lib } from './dep-c423598f.js';

package/dist/node/chunks/{dep-1f986b87.js → dep-e8f070e8.js}

@@ -28718,12 +28718,12 @@ function optimizedDepsBuildPlugin(config) {
                     ...options,
                     skipSelf: true,
                 });
-                if (resolved) {
+                if (resolved && !resolved.external) {
                     depsOptimizer.delayDepsOptimizerUntil(resolved.id, async () => {
                         await this.load(resolved);
                     });
-                    return resolved;
                 }
+                return resolved;
             }
         },
         async load(id) {
@@ -38206,10 +38206,9 @@ function cssPostPlugin(config) {
                         `${style}.textContent = ${cssString};` +
                         `document.head.appendChild(${style});`;
                     const wrapIdx = code.indexOf('System.register');
-                    const insertMark = "'use strict';";
-                    const insertIdx = code.indexOf(insertMark, wrapIdx);
+                    const executeFnStart = code.indexOf('{', code.indexOf('execute:', wrapIdx)) + 1;
                     const s = new MagicString(code);
-                    s.appendLeft(insertIdx + insertMark.length, injectCode);
+                    s.appendRight(executeFnStart, injectCode);
                     if (config.build.sourcemap) {
                         // resolve public URL from CSS paths, we need to use absolute paths
                         return {
@@ -38471,6 +38470,7 @@ async function compileCSS(id, code, config, urlReplacer) {
         return {
             code,
             map: preprocessorMap,
+            deps,
         };
     }
     let postcssResult;
@@ -38572,8 +38572,8 @@ function createCachedImport(imp) {
         return cached;
     };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-7c975f20.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-a6949a9d.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-93197d47.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-8124a809.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 /**
  * @experimental
@@ -40453,9 +40453,9 @@ function importAnalysisPlugin(config) {
             // since we are already in the transform phase of the importer, it must
             // have been loaded so its entry is guaranteed in the module graph.
             const importerModule = moduleGraph.getModuleById(importer);
-            if (!importerModule && depsOptimizer?.isOptimizedDepFile(importer)) {
-                // Ids of optimized deps could be invalidated and removed from the graph
-                // Return without transforming, this request is no longer valid, a full reload
+            if (!importerModule) {
+                // When the server is restarted, the module graph is cleared, so we
+                // return without transforming. This request is no longer valid, a full reload
                 // is going to request this id again. Throwing an outdated error so we
                 // properly finish the request with a 504 sent to the browser.
                 throwOutdatedRequest(importer);
@@ -46065,7 +46065,7 @@ function serveStaticMiddleware(dir, server) {
             isInternalRequest(req.url)) {
             return next();
         }
-        const url = new URL(req.url, 'http://example.com');
+        const url = new URL(req.url.replace(/^\/+/, '/'), 'http://example.com');
         const pathname = decodeURIComponent(url.pathname);
         // apply aliases to static requests as well
         let redirectedPathname;
@@ -46104,7 +46104,7 @@ function serveRawFsMiddleware(server) {
     const serveFromRoot = sirv('/', sirvOptions({ headers: server.config.server.headers }));
     // Keep the named function. The name is visible in debug logs via `DEBUG=connect:dispatcher ...`
     return function viteServeRawFsMiddleware(req, res, next) {
-        const url = new URL(req.url, 'http://example.com');
+        const url = new URL(req.url.replace(/^\/+/, '/'), 'http://example.com');
         // In some cases (e.g. linked monorepos) files outside of root will
         // reference assets that are also out of served root. In such cases
         // the paths are rewritten to `/@fs/` prefixed paths and must be served by
@@ -54183,17 +54183,23 @@ function isInDestructuringAssignment(parent, parentStack) {
 }
 
 let offset;
-try {
-    new Function('throw new Error(1)')();
-}
-catch (e) {
-    // in Node 12, stack traces account for the function wrapper.
-    // in Node 13 and later, the function wrapper adds two lines,
-    // which must be subtracted to generate a valid mapping
-    const match = /:(\d+):\d+\)$/.exec(e.stack.split('\n')[1]);
-    offset = match ? +match[1] - 1 : 0;
+function calculateOffsetOnce() {
+    if (offset !== undefined) {
+        return;
+    }
+    try {
+        new Function('throw new Error(1)')();
+    }
+    catch (e) {
+        // in Node 12, stack traces account for the function wrapper.
+        // in Node 13 and later, the function wrapper adds two lines,
+        // which must be subtracted to generate a valid mapping
+        const match = /:(\d+):\d+\)$/.exec(e.stack.split('\n')[1]);
+        offset = match ? +match[1] - 1 : 0;
+    }
 }
 function ssrRewriteStacktrace(stack, moduleGraph) {
+    calculateOffsetOnce();
     return stack
         .split('\n')
         .map((line) => {
@@ -61611,6 +61617,9 @@ function getHtmlFilename(url, server) {
         return decodeURIComponent(normalizePath$3(path$o.join(server.config.root, url.slice(1))));
     }
 }
+function shouldPreTransform(url, config) {
+    return (!checkPublicFile(url, config) && (isJSRequest(url) || isCSSRequest(url)));
+}
 const processNodeUrl = (attr, sourceCodeLocation, s, config, htmlPath, originalUrl, server) => {
     let url = attr.value || '';
     if (server?.moduleGraph) {
@@ -61624,7 +61633,7 @@ const processNodeUrl = (attr, sourceCodeLocation, s, config, htmlPath, originalU
         // prefix with base (dev only, base is never relative)
         const fullUrl = path$o.posix.join(devBase, url);
         overwriteAttrValue(s, sourceCodeLocation, fullUrl);
-        if (server && !checkPublicFile(url, config)) {
+        if (server && shouldPreTransform(url, config)) {
             preTransformRequest(server, fullUrl, devBase);
         }
     }
@@ -61635,7 +61644,7 @@ const processNodeUrl = (attr, sourceCodeLocation, s, config, htmlPath, originalU
         // prefix with base (dev only, base is never relative)
         const replacer = (url) => {
             const fullUrl = path$o.posix.join(devBase, url);
-            if (server && !checkPublicFile(url, config)) {
+            if (server && shouldPreTransform(url, config)) {
                 preTransformRequest(server, fullUrl, devBase);
             }
             return fullUrl;
@@ -63305,7 +63314,9 @@ async function _createServer(inlineConfig = {}, options) {
             if (isDepsOptimizerEnabled(config, true)) {
                 await initDevSsrDepsOptimizer(config, server);
             }
-            await updateCjsSsrExternals(server);
+            if (config.legacy?.buildSsrCjsExternalHeuristics) {
+                await updateCjsSsrExternals(server);
+            }
             return ssrLoadModule(url, server, undefined, undefined, opts?.fixStacktrace);
         },
         ssrFixStacktrace(e) {
@@ -63933,17 +63944,8 @@ var preview$1 = {
 function resolveSSROptions(ssr, preserveSymlinks, buildSsrCjsExternalHeuristics) {
     ssr ?? (ssr = {});
     const optimizeDeps = ssr.optimizeDeps ?? {};
-    let format = 'esm';
-    let target = 'node';
-    if (buildSsrCjsExternalHeuristics) {
-        if (ssr) {
-            format = 'cjs';
-        }
-        else {
-            target = 'node';
-            format = 'cjs';
-        }
-    }
+    const format = buildSsrCjsExternalHeuristics ? 'cjs' : 'esm';
+    const target = 'node';
     return {
         format,
         target,
@@ -64022,7 +64024,10 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development',
     // run config hooks
     const userPlugins = [...prePlugins, ...normalPlugins, ...postPlugins];
     config = await runConfigHook(config, userPlugins, configEnv);
-    if (process.env.VITE_TEST_WITHOUT_PLUGIN_COMMONJS) {
+    // If there are custom commonjsOptions, don't force optimized deps for this test
+    // even if the env var is set as it would interfere with the playground specs.
+    if (!config.build?.commonjsOptions &&
+        process.env.VITE_TEST_WITHOUT_PLUGIN_COMMONJS) {
         config = mergeConfig(config, {
             optimizeDeps: { disabled: false },
             ssr: { optimizeDeps: { disabled: false } },

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 { C as colors, D as bindShortcuts, x as createLogger, h as resolveConfig } from './chunks/dep-1f986b87.js';
+import { C as colors, D as bindShortcuts, x as createLogger, h as resolveConfig } from './chunks/dep-e8f070e8.js';
 import { VERSION } from './constants.js';
 import 'node:fs/promises';
 import 'node:url';
@@ -728,7 +728,7 @@ cli
     filterDuplicateOptions(options);
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-1f986b87.js').then(function (n) { return n.I; });
+    const { createServer } = await import('./chunks/dep-e8f070e8.js').then(function (n) { return n.I; });
     try {
         const server = await createServer({
             root,
@@ -806,7 +806,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-1f986b87.js').then(function (n) { return n.H; });
+    const { build } = await import('./chunks/dep-e8f070e8.js').then(function (n) { return n.H; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -834,7 +834,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-1f986b87.js').then(function (n) { return n.G; });
+    const { optimizeDeps } = await import('./chunks/dep-e8f070e8.js').then(function (n) { return n.G; });
     try {
         const config = await resolveConfig({
             root,
@@ -860,7 +860,7 @@ cli
     .option('--outDir <dir>', `[string] output directory (default: dist)`)
     .action(async (root, options) => {
     filterDuplicateOptions(options);
-    const { preview } = await import('./chunks/dep-1f986b87.js').then(function (n) { return n.J; });
+    const { preview } = await import('./chunks/dep-e8f070e8.js').then(function (n) { return n.J; });
     try {
         const server = await preview({
             root,

package/dist/node/index.d.ts

@@ -564,7 +564,7 @@ export declare interface DepOptimizationConfig {
      */
     exclude?: string[];
     /**
-     * Force ESM interop when importing for these dependencies. Some legacy
+     * Forces ESM interop when importing these dependencies. Some legacy
      * packages advertise themselves as ESM but use `require` internally
      * @experimental
      */

package/dist/node/index.js

@@ -1,5 +1,5 @@
-import { i as isInNodeModules } from './chunks/dep-1f986b87.js';
-export { b as build, e as buildErrorMessage, v as createFilter, x as createLogger, c as createServer, g as defineConfig, f as formatPostcssSourceMap, k as getDepOptimizationConfig, m as isDepsOptimizerEnabled, z as isFileServingAllowed, l as loadConfigFromFile, A as loadEnv, u as mergeAlias, q as mergeConfig, n as normalizePath, o as optimizeDeps, a as preprocessCSS, p as preview, j as resolveBaseUrl, h as resolveConfig, B as resolveEnvPrefix, d as resolvePackageData, r as resolvePackageEntry, y as searchForWorkspaceRoot, w as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-1f986b87.js';
+import { i as isInNodeModules } from './chunks/dep-e8f070e8.js';
+export { b as build, e as buildErrorMessage, v as createFilter, x as createLogger, c as createServer, g as defineConfig, f as formatPostcssSourceMap, k as getDepOptimizationConfig, m as isDepsOptimizerEnabled, z as isFileServingAllowed, l as loadConfigFromFile, A as loadEnv, u as mergeAlias, q as mergeConfig, n as normalizePath, o as optimizeDeps, a as preprocessCSS, p as preview, j as resolveBaseUrl, h as resolveConfig, B as resolveEnvPrefix, d as resolvePackageData, r as resolvePackageEntry, y as searchForWorkspaceRoot, w as send, s as sortUserPlugins, t as transformWithEsbuild } from './chunks/dep-e8f070e8.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.3.7",
+  "version": "4.3.9",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",