vite 4.3.3 → 4.3.5

package/dist/node/chunks/{dep-3ea2db5b.js → dep-5673ffe5.js}

@@ -1,4 +1,4 @@
-import { E as getDefaultExportFromCjs } from './dep-a178814b.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-5728e8e9.js → dep-8989cf2a.js}

@@ -1,4 +1,4 @@
-import { F as commonjsGlobal, E as getDefaultExportFromCjs } from './dep-a178814b.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-a178814b.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);
             }
         };
@@ -32855,7 +32855,7 @@ function resolveEnd(end, offset, reqSpace, onError) {
 }
 
 const blockMsg = 'Block collections are not allowed within flow collections';
-const isBlock = (token) => token && (token.type === 'block-map' || token.type === 'block-seq');
+const isBlock$1 = (token) => token && (token.type === 'block-map' || token.type === 'block-seq');
 function resolveFlowCollection({ composeNode, composeEmptyNode }, ctx, fc, onError) {
     const isMap = fc.start.source === '{';
     const fcName = isMap ? 'flow map' : 'flow sequence';
@@ -32938,7 +32938,7 @@ function resolveFlowCollection({ composeNode, composeEmptyNode }, ctx, fc, onErr
                 : composeEmptyNode(ctx, props.end, sep, null, props, onError);
             coll.items.push(valueNode);
             offset = valueNode.range[2];
-            if (isBlock(value))
+            if (isBlock$1(value))
                 onError(valueNode.range, 'BLOCK_IN_FLOW', blockMsg);
         }
         else {
@@ -32948,7 +32948,7 @@ function resolveFlowCollection({ composeNode, composeEmptyNode }, ctx, fc, onErr
             const keyNode = key
                 ? composeNode(ctx, key, props, onError)
                 : composeEmptyNode(ctx, keyStart, start, null, props, onError);
-            if (isBlock(key))
+            if (isBlock$1(key))
                 onError(keyNode.range, 'BLOCK_IN_FLOW', blockMsg);
             // value properties
             const valueProps = resolveProps(sep ?? [], {
@@ -32987,7 +32987,7 @@ function resolveFlowCollection({ composeNode, composeEmptyNode }, ctx, fc, onErr
                     ? composeEmptyNode(ctx, valueProps.end, sep, null, valueProps, onError)
                     : null;
             if (valueNode) {
-                if (isBlock(value))
+                if (isBlock$1(value))
                     onError(valueNode.range, 'BLOCK_IN_FLOW', blockMsg);
             }
             else if (valueProps.comment) {
@@ -38574,8 +38574,8 @@ function createCachedImport(imp) {
         return cached;
     };
 }
-const importPostcssImport = createCachedImport(() => import('./dep-3ea2db5b.js').then(function (n) { return n.i; }));
-const importPostcssModules = createCachedImport(() => import('./dep-5728e8e9.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, '');
@@ -41550,13 +41551,7 @@ function definePlugin(config) {
         if (isBuild) {
             const match = key.match(metaEnvRe);
             if (match) {
-                userDefineEnv[match[1]] =
-                    // test if value is raw identifier to wrap with __vite__ so when
-                    // stringified for `import.meta.env`, we can remove the quotes and
-                    // retain being an identifier
-                    typeof val === 'string' && /^[\p{L}_$]/u.test(val.trim())
-                        ? `__vite__define__${val}`
-                        : val;
+                userDefineEnv[match[1]] = `__vite__define__${userDefine[key]}`;
             }
         }
     }
@@ -41575,7 +41570,7 @@ function definePlugin(config) {
                 ...config.env,
                 SSR: '__vite__ssr__',
                 ...userDefineEnv,
-            }).replace(/"__vite__define__(.+?)"/g, (_, val) => val),
+            }).replace(/"__vite__define__(.+?)"([,}])/g, (_, val, suffix) => `${val.replace(/(^\\")|(\\"$)/g, '"')}${suffix}`),
         });
     }
     function getImportMetaKeys(ssr) {
@@ -41817,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);
@@ -41826,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;
                         }
                     }
@@ -42544,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);
@@ -43087,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;
@@ -43178,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') ||
@@ -44896,7 +44904,7 @@ const isModernFlag = `__VITE_IS_MODERN__`;
 const preloadMethod = `__vitePreload`;
 const preloadMarker = `__VITE_PRELOAD__`;
 const preloadHelperId = '\0vite/preload-helper';
-const preloadMarkerWithQuote = `"${preloadMarker}"`;
+const preloadMarkerWithQuote = new RegExp(`['"]${preloadMarker}['"]`);
 const dynamicImportPrefixRE = /import\s*\(/;
 // TODO: abstract
 const optimizedDepChunkRE = /\/chunk-[A-Z\d]{8}\.js/;
@@ -44905,6 +44913,13 @@ function toRelativePath(filename, importer) {
     const relPath = path$o.relative(path$o.dirname(importer), filename);
     return relPath[0] === '.' ? relPath : `./${relPath}`;
 }
+function indexOfMatchInSlice(str, reg, pos = 0) {
+    if (pos !== 0) {
+        str = str.slice(pos);
+    }
+    const matcher = str.match(reg);
+    return matcher?.index !== undefined ? matcher.index + pos : -1;
+}
 /**
  * Helper for preloading CSS and direct imports of async chunks in parallel to
  * the async chunk itself.
@@ -45252,10 +45267,10 @@ function buildImportAnalysisPlugin(config) {
                                 };
                                 addDeps(normalizedFile);
                             }
-                            let markerStartPos = code.indexOf(preloadMarkerWithQuote, end);
+                            let markerStartPos = indexOfMatchInSlice(code, preloadMarkerWithQuote, end);
                             // fix issue #3051
                             if (markerStartPos === -1 && imports.length === 1) {
-                                markerStartPos = code.indexOf(preloadMarkerWithQuote);
+                                markerStartPos = indexOfMatchInSlice(code, preloadMarkerWithQuote);
                             }
                             if (markerStartPos > 0) {
                                 // the dep list includes the main chunk, so only need to reload when there are actual other deps.
@@ -45304,19 +45319,19 @@ function buildImportAnalysisPlugin(config) {
                                         ? toRelativePath(d, file)
                                         : d));
                                 }
-                                s.update(markerStartPos, markerStartPos + preloadMarkerWithQuote.length, `[${renderedDeps.join(',')}]`);
+                                s.update(markerStartPos, markerStartPos + preloadMarker.length + 2, `[${renderedDeps.join(',')}]`);
                                 rewroteMarkerStartPos.add(markerStartPos);
                             }
                         }
                     }
                     // there may still be markers due to inlined dynamic imports, remove
                     // all the markers regardless
-                    let markerStartPos = code.indexOf(preloadMarkerWithQuote);
+                    let markerStartPos = indexOfMatchInSlice(code, preloadMarkerWithQuote);
                     while (markerStartPos >= 0) {
                         if (!rewroteMarkerStartPos.has(markerStartPos)) {
-                            s.update(markerStartPos, markerStartPos + preloadMarkerWithQuote.length, 'void 0');
+                            s.update(markerStartPos, markerStartPos + preloadMarker.length + 2, 'void 0');
                         }
-                        markerStartPos = code.indexOf(preloadMarkerWithQuote, markerStartPos + preloadMarkerWithQuote.length);
+                        markerStartPos = indexOfMatchInSlice(code, preloadMarkerWithQuote, markerStartPos + preloadMarker.length + 2);
                     }
                     if (s.hasChanged()) {
                         chunk.code = s.toString();
@@ -54116,11 +54131,12 @@ const functionNodeTypeRE = /Function(?:Expression|Declaration)$|Method$/;
 function isFunction(node) {
     return functionNodeTypeRE.test(node.type);
 }
+const blockNodeTypeRE = /^BlockStatement$|^For(?:In|Of)?Statement$/;
+function isBlock(node) {
+    return blockNodeTypeRE.test(node.type);
+}
 function findParentScope(parentStack, isVar = false) {
-    const predicate = isVar
-        ? isFunction
-        : (node) => node.type === 'BlockStatement';
-    return parentStack.find(predicate);
+    return parentStack.find(isVar ? isFunction : isBlock);
 }
 function isInDestructuringAssignment(parent, parentStack) {
     if (parent &&
@@ -54316,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,
@@ -63452,6 +63468,8 @@ async function _createServer(inlineConfig = {}, options) {
         const listen = httpServer.listen.bind(httpServer);
         httpServer.listen = (async (port, ...args) => {
             try {
+                // ensure ws server started
+                ws.listen();
                 await initServer();
             }
             catch (e) {

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-a178814b.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-a178814b.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-a178814b.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-a178814b.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-a178814b.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-a178814b.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-a178814b.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.3",
+  "version": "4.3.5",
   "type": "module",
   "license": "MIT",
   "author": "Evan You",