vite 3.0.0-alpha.6 → 3.0.0-alpha.7

package/dist/node/chunks/{dep-8bed6f50.js → dep-16fa9be9.js}

@@ -1,5 +1,5 @@
 import require$$0 from 'postcss';
-import { w as commonjsGlobal } from './dep-52974b5a.js';
+import { w as commonjsGlobal } from './dep-e214e00e.js';
 import path$2 from 'path';
 import require$$1 from 'crypto';
 import fs__default from 'fs';

package/dist/node/chunks/{dep-a4f17494.js → dep-395deadd.js}

@@ -1,4 +1,4 @@
-import { w as commonjsGlobal } from './dep-52974b5a.js';
+import { w as commonjsGlobal } from './dep-e214e00e.js';
 import require$$1 from 'crypto';
 import 'fs';
 import 'path';

package/dist/node/chunks/{dep-b4474709.js → dep-3a62832d.js}

@@ -1,4 +1,4 @@
-import { x as getAugmentedNamespace, y as getDefaultExportFromCjs } from './dep-52974b5a.js';
+import { x as getAugmentedNamespace, y as getDefaultExportFromCjs } from './dep-e214e00e.js';
 
 import { fileURLToPath as __cjs_fileURLToPath } from 'url';
 import { dirname as __cjs_dirname } from 'path';

package/dist/node/chunks/{dep-52974b5a.js → dep-e214e00e.js}

@@ -15464,9 +15464,8 @@ function esbuildDepPlugin(qualified, exportsData, config) {
                     relativePath = `./${relativePath}`;
                 }
                 let contents = '';
-                const data = exportsData[id];
-                const [imports, exports] = data;
-                if (!imports.length && !exports.length) {
+                const { hasImports, exports, hasReExports } = exportsData[id];
+                if (!hasImports && !exports.length) {
                     // cjs
                     contents += `export default require("${relativePath}");`;
                 }
@@ -15474,9 +15473,7 @@ function esbuildDepPlugin(qualified, exportsData, config) {
                     if (exports.includes('default')) {
                         contents += `import d from "${relativePath}";export default d;`;
                     }
-                    if (data.hasReExports ||
-                        exports.length > 1 ||
-                        exports[0] !== 'default') {
+                    if (hasReExports || exports.length > 1 || exports[0] !== 'default') {
                         contents += `\nexport * from "${relativePath}"`;
                     }
                 }
@@ -27520,7 +27517,7 @@ async function runOptimizeDeps(resolvedConfig, depsInfo) {
         splitting: true,
         sourcemap: true,
         outdir: processingCacheDir,
-        ignoreAnnotations: true,
+        ignoreAnnotations: resolvedConfig.command !== 'build',
         metafile: true,
         define,
         plugins: [
@@ -27708,7 +27705,6 @@ function esbuildOutputFromId(outputs, id, cacheDirOutputPath) {
 }
 async function extractExportsData(filePath, config) {
     await init;
-    let exportsData;
     const esbuildOptions = config.optimizeDeps?.esbuildOptions ?? {};
     if (config.optimizeDeps.extensions?.some((ext) => filePath.endsWith(ext))) {
         // For custom supported extensions, build the entry file to transform it into JS,
@@ -27720,35 +27716,45 @@ async function extractExportsData(filePath, config) {
             write: false,
             format: 'esm'
         });
-        exportsData = parse$h(result.outputFiles[0].text);
+        const [imports, exports, facade] = parse$h(result.outputFiles[0].text);
+        return {
+            hasImports: imports.length > 0,
+            exports,
+            facade
+        };
     }
-    else {
-        const entryContent = fs__default.readFileSync(filePath, 'utf-8');
-        try {
-            exportsData = parse$h(entryContent);
-        }
-        catch {
-            const loader = esbuildOptions.loader?.[path$p.extname(filePath)] || 'jsx';
-            debug$a(`Unable to parse: ${filePath}.\n Trying again with a ${loader} transform.`);
-            const transformed = await transformWithEsbuild(entryContent, filePath, {
-                loader
-            });
-            // Ensure that optimization won't fail by defaulting '.js' to the JSX parser.
-            // This is useful for packages such as Gatsby.
-            esbuildOptions.loader = {
-                '.js': 'jsx',
-                ...esbuildOptions.loader
-            };
-            exportsData = parse$h(transformed.code);
-            exportsData.jsxLoader = true;
-        }
-        for (const { ss, se } of exportsData[0]) {
-            const exp = entryContent.slice(ss, se);
-            if (/export\s+\*\s+from/.test(exp)) {
-                exportsData.hasReExports = true;
-            }
-        }
+    let parseResult;
+    let usedJsxLoader = false;
+    const entryContent = fs__default.readFileSync(filePath, 'utf-8');
+    try {
+        parseResult = parse$h(entryContent);
+    }
+    catch {
+        const loader = esbuildOptions.loader?.[path$p.extname(filePath)] || 'jsx';
+        debug$a(`Unable to parse: ${filePath}.\n Trying again with a ${loader} transform.`);
+        const transformed = await transformWithEsbuild(entryContent, filePath, {
+            loader
+        });
+        // Ensure that optimization won't fail by defaulting '.js' to the JSX parser.
+        // This is useful for packages such as Gatsby.
+        esbuildOptions.loader = {
+            '.js': 'jsx',
+            ...esbuildOptions.loader
+        };
+        parseResult = parse$h(transformed.code);
+        usedJsxLoader = true;
     }
+    const [imports, exports, facade] = parseResult;
+    const exportsData = {
+        hasImports: imports.length > 0,
+        exports,
+        facade,
+        hasReExports: imports.some(({ ss, se }) => {
+            const exp = entryContent.slice(ss, se);
+            return /export\s+\*\s+from/.test(exp);
+        }),
+        jsxLoader: usedJsxLoader
+    };
     return exportsData;
 }
 // https://github.com/vitejs/vite/issues/1724#issuecomment-767619642
@@ -27760,9 +27766,9 @@ function needsInterop(config, id, exportsData, output) {
         KNOWN_INTEROP_IDS.has(id)) {
         return true;
     }
-    const [imports, exports] = exportsData;
+    const { hasImports, exports } = exportsData;
     // entry has no ESM syntax - likely CJS or UMD
-    if (!exports.length && !imports.length) {
+    if (!exports.length && !hasImports) {
         return true;
     }
     if (output) {
@@ -35872,7 +35878,7 @@ const assetAttrsConfig = {
 const isAsyncScriptMap = new WeakMap();
 async function traverseHtml(html, filePath, visitor) {
     // lazy load compiler
-    const { parse, transform } = await import('./dep-b4474709.js').then(function (n) { return n.c; });
+    const { parse, transform } = await import('./dep-3a62832d.js').then(function (n) { return n.c; });
     // @vue/compiler-core doesn't like lowercase doctypes
     html = html.replace(/<!doctype\s/i, '<!DOCTYPE ');
     try {
@@ -36977,7 +36983,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         logger: config.logger
     }));
     if (isModule) {
-        postcssPlugins.unshift((await import('./dep-8bed6f50.js').then(function (n) { return n.i; })).default({
+        postcssPlugins.unshift((await import('./dep-16fa9be9.js').then(function (n) { return n.i; })).default({
             ...modulesOptions,
             getJSON(cssFileName, _modules, outputFileName) {
                 modules = _modules;
@@ -47634,7 +47640,7 @@ async function getCertificate(cacheDir) {
         return content;
     }
     catch {
-        const content = (await import('./dep-a4f17494.js')).createCertificate();
+        const content = (await import('./dep-395deadd.js')).createCertificate();
         promises
             .mkdir(cacheDir, { recursive: true })
             .then(() => promises.writeFile(cachePath, content))

package/dist/node/cli.js

@@ -1,6 +1,6 @@
 import { performance } from 'perf_hooks';
 import { EventEmitter } from 'events';
-import { v as colors, j as createLogger, e as resolveConfig } from './chunks/dep-52974b5a.js';
+import { v as colors, j as createLogger, e as resolveConfig } from './chunks/dep-e214e00e.js';
 import { VERSION } from './constants.js';
 import 'fs';
 import 'path';
@@ -682,7 +682,7 @@ cli
     .action(async (root, options) => {
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await import('./chunks/dep-52974b5a.js').then(function (n) { return n.B; });
+    const { createServer } = await import('./chunks/dep-e214e00e.js').then(function (n) { return n.B; });
     try {
         const server = await createServer({
             root,
@@ -728,7 +728,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-52974b5a.js').then(function (n) { return n.A; });
+    const { build } = await import('./chunks/dep-e214e00e.js').then(function (n) { return n.A; });
     const buildOptions = cleanOptions(options);
     try {
         await build({
@@ -752,7 +752,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-52974b5a.js').then(function (n) { return n.z; });
+    const { optimizeDeps } = await import('./chunks/dep-e214e00e.js').then(function (n) { return n.z; });
     try {
         const config = await resolveConfig({
             root,
@@ -775,7 +775,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-52974b5a.js').then(function (n) { return n.C; });
+    const { preview } = await import('./chunks/dep-e214e00e.js').then(function (n) { return n.C; });
     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.6";
+var version = "3.0.0-alpha.7";
 
 const VERSION = version;
 const DEFAULT_MAIN_FIELDS = [

package/dist/node/index.d.ts

@@ -645,77 +645,6 @@ export declare type ESBuildTransformResult = Omit<TransformResult_3, 'map'> & {
     map: SourceMap;
 };
 
-export declare interface EsModuleLexerImportSpecifier {
-    /**
-     * Module name
-     *
-     * To handle escape sequences in specifier strings, the .n field of imported specifiers will be provided where possible.
-     *
-     * For dynamic import expressions, this field will be empty if not a valid JS string.
-     *
-     * @example
-     * const [imports1, exports1] = parse(String.raw`import './\u0061\u0062.js'`);
-     * imports1[0].n;
-     * // Returns "./ab.js"
-     *
-     * const [imports2, exports2] = parse(`import("./ab.js")`);
-     * imports2[0].n;
-     * // Returns "./ab.js"
-     *
-     * const [imports3, exports3] = parse(`import("./" + "ab.js")`);
-     * imports3[0].n;
-     * // Returns undefined
-     */
-    readonly n: string | undefined
-    /**
-     * Start of module specifier
-     *
-     * @example
-     * const source = `import { a } from 'asdf'`;
-     * const [imports, exports] = parse(source);
-     * source.substring(imports[0].s, imports[0].e);
-     * // Returns "asdf"
-     */
-    readonly s: number
-    /**
-     * End of module specifier
-     */
-    readonly e: number
-
-    /**
-     * Start of import statement
-     *
-     * @example
-     * const source = `import { a } from 'asdf'`;
-     * const [imports, exports] = parse(source);
-     * source.substring(imports[0].ss, imports[0].se);
-     * // Returns `"import { a } from 'asdf';"`
-     */
-    readonly ss: number
-    /**
-     * End of import statement
-     */
-    readonly se: number
-
-    /**
-     * If this import statement is a dynamic import, this is the start value.
-     * Otherwise this is `-1`.
-     */
-    readonly d: number
-
-    /**
-     * If this import has an import assertion, this is the start value.
-     * Otherwise this is `-1`.
-     */
-    readonly a: number
-}
-
-export declare type EsModuleLexerParseReturnType = readonly [
-imports: ReadonlyArray<EsModuleLexerImportSpecifier>,
-exports: ReadonlyArray<string>,
-facade: boolean
-];
-
 export declare interface ExperimentalOptions {
     /**
      * Append fake `&lang.(ext)` when queries are specified, to preseve the file extension for following plugins to process.
@@ -726,9 +655,12 @@ export declare interface ExperimentalOptions {
     importGlobRestoreExtension?: boolean;
 }
 
-export declare type ExportsData = EsModuleLexerParseReturnType & {
-    hasReExports?: true;
-    jsxLoader?: true;
+export declare type ExportsData = {
+    hasImports: boolean;
+    exports: readonly string[];
+    facade: boolean;
+    hasReExports?: boolean;
+    jsxLoader?: boolean;
 };
 
 export declare interface FileSystemServeOptions {

package/dist/node/index.js

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

package/package.json

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

package/types/es-module-lexer.d.ts

@@ -1,90 +0,0 @@
-// Modified and inlined to avoid extra dependency
-// Source: https://github.com/guybedford/es-module-lexer/blob/main/types/lexer.d.ts
-// MIT Licensed https://github.com/guybedford/es-module-lexer/blob/main/LICENSE
-
-export interface ImportSpecifier {
-  /**
-   * Module name
-   *
-   * To handle escape sequences in specifier strings, the .n field of imported specifiers will be provided where possible.
-   *
-   * For dynamic import expressions, this field will be empty if not a valid JS string.
-   *
-   * @example
-   * const [imports1, exports1] = parse(String.raw`import './\u0061\u0062.js'`);
-   * imports1[0].n;
-   * // Returns "./ab.js"
-   *
-   * const [imports2, exports2] = parse(`import("./ab.js")`);
-   * imports2[0].n;
-   * // Returns "./ab.js"
-   *
-   * const [imports3, exports3] = parse(`import("./" + "ab.js")`);
-   * imports3[0].n;
-   * // Returns undefined
-   */
-  readonly n: string | undefined
-  /**
-   * Start of module specifier
-   *
-   * @example
-   * const source = `import { a } from 'asdf'`;
-   * const [imports, exports] = parse(source);
-   * source.substring(imports[0].s, imports[0].e);
-   * // Returns "asdf"
-   */
-  readonly s: number
-  /**
-   * End of module specifier
-   */
-  readonly e: number
-
-  /**
-   * Start of import statement
-   *
-   * @example
-   * const source = `import { a } from 'asdf'`;
-   * const [imports, exports] = parse(source);
-   * source.substring(imports[0].ss, imports[0].se);
-   * // Returns `"import { a } from 'asdf';"`
-   */
-  readonly ss: number
-  /**
-   * End of import statement
-   */
-  readonly se: number
-
-  /**
-   * If this import statement is a dynamic import, this is the start value.
-   * Otherwise this is `-1`.
-   */
-  readonly d: number
-
-  /**
-   * If this import has an import assertion, this is the start value.
-   * Otherwise this is `-1`.
-   */
-  readonly a: number
-}
-
-/**
- * Wait for init to resolve before calling `parse`.
- */
-export const init: Promise<void>
-
-/**
- * Outputs the list of exports and locations of import specifiers,
- * including dynamic import and import meta handling.
- *
- * @param source - Source code to parser
- * @param name - Optional sourcename
- * @returns Tuple contaning imports list and exports list.
- */
-export function parse(
-  source: string,
-  name?: string
-): readonly [
-  imports: ReadonlyArray<ImportSpecifier>,
-  exports: ReadonlyArray<string>,
-  facade: boolean
-]