vite 4.3.4 → 4.3.5

package/dist/node/chunks/{dep-524177e3.js → dep-5673ffe5.js}

@@ -1,4 +1,4 @@
-import { E as getDefaultExportFromCjs } from './dep-f7d05e3f.js';
+import { E as getDefaultExportFromCjs } from './dep-934dbc7c.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-53740c38.js → dep-8989cf2a.js}

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

package/dist/node/chunks/{dep-f7d05e3f.js → dep-934dbc7c.js}

@@ -11876,7 +11876,7 @@ function createDebugger(namespace, options = {}) {
     }
     if (enabled) {
         return (...args) => {
-            if (!filter || args.some((a) => a?.includes(filter))) {
+            if (!filter || args.some((a) => a?.includes?.(filter))) {
                 log(...args);
             }
         };
@@ -38574,8 +38574,8 @@ function createCachedImport(imp) {
         return cached;
     };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-524177e3.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-53740c38.js').then(function (n) { return n.i; }));
+const importPostcssImport = createCachedImport(() => import('./dep-5673ffe5.js').then(function (n) { return n.i; }));
+const importPostcssModules = createCachedImport(() => import('./dep-8989cf2a.js').then(function (n) { return n.i; }));
 const importPostcss = createCachedImport(() => import('postcss'));
 /**
  * @experimental
@@ -38875,6 +38875,7 @@ function cleanScssBugUrl(url) {
     if (
     // check bug via `window` and `location` global
     typeof window !== 'undefined' &&
+        typeof location !== 'undefined' &&
         typeof location?.href === 'string') {
         const prefix = location.href.replace(/\/$/, '');
         return url.replace(prefix, '');
@@ -41811,7 +41812,12 @@ function assetImportMetaUrlPlugin(config) {
                         s = new MagicString(code);
                     // potential dynamic template string
                     if (rawUrl[0] === '`' && rawUrl.includes('${')) {
-                        const ast = this.parse(rawUrl);
+                        let [pureUrl, queryString = ''] = rawUrl.split('?');
+                        if (queryString) {
+                            pureUrl += '`';
+                            queryString = '?' + queryString.slice(0, -1);
+                        }
+                        const ast = this.parse(pureUrl);
                         const templateLiteral = ast.body[0].expression;
                         if (templateLiteral.expressions.length) {
                             const pattern = buildGlobPattern(templateLiteral);
@@ -41820,11 +41826,17 @@ function assetImportMetaUrlPlugin(config) {
                                 // because users won't intend to do that in most cases
                                 continue;
                             }
+                            const globOptions = {
+                                eager: true,
+                                import: 'default',
+                                // A hack to allow 'as' & 'query' exist at the same time
+                                query: injectQuery(queryString, 'url'),
+                            };
                             // Note: native import.meta.url is not supported in the baseline
                             // target so we use the global location here. It can be
                             // window.location or self.location in case it is used in a Web Worker.
                             // @see https://developer.mozilla.org/en-US/docs/Web/API/Window/self
-                            s.update(index, index + exp.length, `new URL((import.meta.glob(${JSON.stringify(pattern)}, { eager: true, import: 'default', as: 'url' }))[${rawUrl}], self.location)`);
+                            s.update(index, index + exp.length, `new URL((import.meta.glob(${JSON.stringify(pattern)}, ${JSON.stringify(globOptions)}))[${pureUrl}], self.location)`);
                             continue;
                         }
                     }
@@ -42538,7 +42550,7 @@ async function createPluginContainer(config, moduleGraph, watcher) {
         }
         async load(options) {
             // We may not have added this to our module graph yet, so ensure it exists
-            await moduleGraph?.ensureEntryFromUrl(options.id);
+            await moduleGraph?.ensureEntryFromUrl(unwrapId(options.id), this.ssr);
             // Not all options passed to this function make sense in the context of loading individual files,
             // but we can at least update the module info properties we support
             updateModuleInfo(options.id, options);
@@ -43081,8 +43093,7 @@ function globEntries(pattern, config) {
         suppressErrors: true, // suppress EACCES errors
     });
 }
-const scriptModuleRE = /(<script\b[^>]+type\s*=\s*(?:"module"|'module')[^>]*>)(.*?)<\/script>/gis;
-const scriptRE = /(<script(?:\s[^>]*>|>))(.*?)<\/script>/gis;
+const scriptRE = /(<script(?:\s+[a-z_:][-\w:]*(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^"'<>=\s]+))?)*\s*>)(.*?)<\/script>/gis;
 const commentRE = /<!--.*?-->/gs;
 const srcRE = /\bsrc\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/i;
 const typeRE = /\btype\s*=\s*(?:"([^"]+)"|'([^']+)'|([^\s'">]+))/i;
@@ -43172,17 +43183,20 @@ function esbuildScanPlugin(config, container, depImports, missing, entries) {
                 // Avoid matching the content of the comment
                 raw = raw.replace(commentRE, '<!---->');
                 const isHtml = path.endsWith('.html');
-                const regex = isHtml ? scriptModuleRE : scriptRE;
-                regex.lastIndex = 0;
+                scriptRE.lastIndex = 0;
                 let js = '';
                 let scriptId = 0;
                 let match;
-                while ((match = regex.exec(raw))) {
+                while ((match = scriptRE.exec(raw))) {
                     const [, openTag, content] = match;
                     const typeMatch = openTag.match(typeRE);
                     const type = typeMatch && (typeMatch[1] || typeMatch[2] || typeMatch[3]);
                     const langMatch = openTag.match(langRE);
                     const lang = langMatch && (langMatch[1] || langMatch[2] || langMatch[3]);
+                    // skip non type module script
+                    if (isHtml && type !== 'module') {
+                        continue;
+                    }
                     // skip type="application/ld+json" and other non-JS types
                     if (type &&
                         !(type.includes('javascript') ||
@@ -54318,7 +54332,7 @@ async function instantiateModule(url, server, context = { global }, urlStack = [
     };
     function ssrExportAll(sourceModule) {
         for (const key in sourceModule) {
-            if (key !== 'default') {
+            if (key !== 'default' && key !== '__esModule') {
                 Object.defineProperty(ssrModule, key, {
                     enumerable: true,
                     configurable: true,

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-f7d05e3f.js';
+import { C as colors, D as bindShortcuts, x as createLogger, h as resolveConfig } from './chunks/dep-934dbc7c.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-f7d05e3f.js').then(function (n) { return n.I; });
+    const { createServer } = await import('./chunks/dep-934dbc7c.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-f7d05e3f.js').then(function (n) { return n.H; });
+    const { build } = await import('./chunks/dep-934dbc7c.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-f7d05e3f.js').then(function (n) { return n.G; });
+    const { optimizeDeps } = await import('./chunks/dep-934dbc7c.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-f7d05e3f.js').then(function (n) { return n.J; });
+    const { preview } = await import('./chunks/dep-934dbc7c.js').then(function (n) { return n.J; });
     try {
         const server = await preview({
             root,

package/dist/node/index.js

@@ -1,5 +1,5 @@
-import { i as isInNodeModules } from './chunks/dep-f7d05e3f.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-f7d05e3f.js';
+import { i as isInNodeModules } from './chunks/dep-934dbc7c.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-934dbc7c.js';
 export { VERSION as version } from './constants.js';
 export { version as esbuildVersion } from 'esbuild';
 export { VERSION as rollupVersion } from 'rollup';

package/dist/node-cjs/publicUtils.cjs

@@ -3306,7 +3306,7 @@ function createDebugger(namespace, options = {}) {
     }
     if (enabled) {
         return (...args) => {
-            if (!filter || args.some((a) => a?.includes(filter))) {
+            if (!filter || args.some((a) => a?.includes?.(filter))) {
                 log(...args);
             }
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "4.3.4",
+  "version": "4.3.5",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",