vite 2.8.0-beta.1 → 2.8.0-beta.2

package/dist/node/chunks/{dep-e4dc9ea2.js → dep-8a5fd784.js}

@@ -18916,7 +18916,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         replacer: urlReplacer
     }));
     if (isModule) {
-        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-e4a9e288.js'); }).then(function (n) { return n.index; })).default({
+        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-a68f5a28.js'); }).then(function (n) { return n.index; })).default({
             ...modulesOptions,
             getJSON(cssFileName, _modules, outputFileName) {
                 modules = _modules;
@@ -19400,7 +19400,8 @@ async function transformImportGlob(source, pos, importer, importIndex, root, nor
     }
     const files = out.sync(pattern, {
         cwd: base,
-        ignore: ['**/node_modules/**']
+        // Ignore node_modules by default unless explicitly indicated in the pattern
+        ignore: /(^|\/)node_modules\//.test(pattern) ? [] : ['**/node_modules/**']
     });
     const imports = [];
     let importsString = ``;
@@ -19939,7 +19940,7 @@ const assetAttrsConfig = {
 const isAsyncScriptMap = new WeakMap();
 async function traverseHtml(html, filePath, visitor) {
     // lazy load compiler
-    const { parse, transform } = await Promise.resolve().then(function () { return require('./dep-51191982.js'); }).then(function (n) { return n.compilerDom_cjs; });
+    const { parse, transform } = await Promise.resolve().then(function () { return require('./dep-91aeb93b.js'); }).then(function (n) { return n.compilerDom_cjs; });
     // @vue/compiler-core doesn't like lowercase doctypes
     html = html.replace(/<!doctype\s/i, '<!DOCTYPE ');
     try {
@@ -20007,11 +20008,30 @@ function buildHtmlPlugin(config) {
         checkPublicFile(url, config);
     // Same reason with `htmlInlineProxyPlugin`
     isAsyncScriptMap.set(config, new Map());
+    const inputFiles = new Set();
     return {
         name: 'vite:build-html',
+        buildStart({ input }) {
+            isAsyncScriptMap.set(config, new Map());
+            let allInputs;
+            if (typeof input === 'string') {
+                allInputs = [input];
+            }
+            else if (Array.isArray(input)) {
+                allInputs = input;
+            }
+            else {
+                allInputs = Object.values(input);
+            }
+            for (const filename of allInputs) {
+                if (filename.endsWith('.html')) {
+                    inputFiles.add(normalizePath$4(filename));
+                }
+            }
+        },
         async transform(html, id) {
             var _a, _b;
-            if (id.endsWith('.html')) {
+            if (inputFiles.has(id)) {
                 const publicPath = `/${slash$1(path__default.relative(config.root, id))}`;
                 // pre-transform
                 html = await applyHtmlTransforms(html, preHooks, {
@@ -44442,7 +44462,7 @@ function readFileIfExists(value) {
     return value;
 }
 async function createCertificateLazily() {
-    const { createCertificate } = await Promise.resolve().then(function () { return require('./dep-fccf00e1.js'); });
+    const { createCertificate } = await Promise.resolve().then(function () { return require('./dep-8072b56e.js'); });
     return createCertificate();
 }
 async function getCertificate(cacheDir) {
@@ -51667,6 +51687,37 @@ function walk(root, { onIdentifier, onImportMeta, onDynamicImport }) {
     function isInScope(name, parents) {
         return parents.some((node) => { var _a; return node && ((_a = scopeMap.get(node)) === null || _a === void 0 ? void 0 : _a.has(name)); });
     }
+    function handlePattern(p, parentFunction) {
+        if (p.type === 'Identifier') {
+            setScope(parentFunction, p.name);
+        }
+        else if (p.type === 'RestElement') {
+            handlePattern(p.argument, parentFunction);
+        }
+        else if (p.type === 'ObjectPattern') {
+            p.properties.forEach((property) => {
+                if (property.type === 'RestElement') {
+                    setScope(parentFunction, property.argument.name);
+                }
+                else {
+                    handlePattern(property.value, parentFunction);
+                }
+            });
+        }
+        else if (p.type === 'ArrayPattern') {
+            p.elements.forEach((element) => {
+                if (element) {
+                    handlePattern(element, parentFunction);
+                }
+            });
+        }
+        else if (p.type === 'AssignmentPattern') {
+            handlePattern(p.left, parentFunction);
+        }
+        else {
+            setScope(parentFunction, p.name);
+        }
+    }
     walk$1(root, {
         enter(node, parent) {
             if (node.type === 'ImportDeclaration') {
@@ -51697,25 +51748,31 @@ function walk(root, { onIdentifier, onImportMeta, onDynamicImport }) {
                 }
                 // walk function expressions and add its arguments to known identifiers
                 // so that we don't prefix them
-                node.params.forEach((p) => walk$1(p.type === 'AssignmentPattern' ? p.left : p, {
-                    enter(child, parent) {
-                        if (child.type !== 'Identifier')
-                            return;
-                        // do not record as scope variable if is a destructuring keyword
-                        if (isStaticPropertyKey(child, parent))
-                            return;
-                        // do not record if this is a default value
-                        // assignment of a destructuring variable
-                        if (((parent === null || parent === void 0 ? void 0 : parent.type) === 'AssignmentPattern' &&
-                            (parent === null || parent === void 0 ? void 0 : parent.right) === child) ||
-                            ((parent === null || parent === void 0 ? void 0 : parent.type) === 'TemplateLiteral' &&
-                                (parent === null || parent === void 0 ? void 0 : parent.expressions.includes(child))) ||
-                            ((parent === null || parent === void 0 ? void 0 : parent.type) === 'CallExpression' && (parent === null || parent === void 0 ? void 0 : parent.callee) === child)) {
-                            return;
-                        }
-                        setScope(node, child.name);
+                node.params.forEach((p) => {
+                    if (p.type === 'ObjectPattern' || p.type === 'ArrayPattern') {
+                        handlePattern(p, node);
+                        return;
                     }
-                }));
+                    walk$1(p.type === 'AssignmentPattern' ? p.left : p, {
+                        enter(child, parent) {
+                            if (child.type !== 'Identifier')
+                                return;
+                            // do not record as scope variable if is a destructuring keyword
+                            if (isStaticPropertyKey(child, parent))
+                                return;
+                            // do not record if this is a default value
+                            // assignment of a destructuring variable
+                            if (((parent === null || parent === void 0 ? void 0 : parent.type) === 'AssignmentPattern' &&
+                                (parent === null || parent === void 0 ? void 0 : parent.right) === child) ||
+                                ((parent === null || parent === void 0 ? void 0 : parent.type) === 'TemplateLiteral' &&
+                                    (parent === null || parent === void 0 ? void 0 : parent.expressions.includes(child))) ||
+                                ((parent === null || parent === void 0 ? void 0 : parent.type) === 'CallExpression' && (parent === null || parent === void 0 ? void 0 : parent.callee) === child)) {
+                                return;
+                            }
+                            setScope(node, child.name);
+                        }
+                    });
+                });
             }
             else if (node.type === 'Property' && parent.type === 'ObjectPattern') {
                 node.inPattern = true;
@@ -51723,36 +51780,7 @@ function walk(root, { onIdentifier, onImportMeta, onDynamicImport }) {
             else if (node.type === 'VariableDeclarator') {
                 const parentFunction = findParentFunction(parentStack);
                 if (parentFunction) {
-                    const handlePattern = (p) => {
-                        if (p.type === 'Identifier') {
-                            setScope(parentFunction, p.name);
-                        }
-                        else if (p.type === 'RestElement') {
-                            handlePattern(p.argument);
-                        }
-                        else if (p.type === 'ObjectPattern') {
-                            p.properties.forEach((property) => {
-                                if (property.type === 'RestElement') {
-                                    setScope(parentFunction, property.argument.name);
-                                }
-                                else
-                                    handlePattern(property.value);
-                            });
-                        }
-                        else if (p.type === 'ArrayPattern') {
-                            p.elements.forEach((element) => {
-                                if (element)
-                                    handlePattern(element);
-                            });
-                        }
-                        else if (p.type === 'AssignmentPattern') {
-                            handlePattern(p.left);
-                        }
-                        else {
-                            setScope(parentFunction, p.name);
-                        }
-                    };
-                    handlePattern(node.id);
+                    handlePattern(node.id, parentFunction);
                 }
             }
         },
@@ -55752,7 +55780,7 @@ async function createServer(inlineConfig = {}) {
     const config = await resolveConfig(inlineConfig, 'serve', 'development');
     const root = config.root;
     const serverConfig = config.server;
-    const httpsOptions = await resolveHttpsConfig(config.server.https);
+    const httpsOptions = await resolveHttpsConfig(config.server.https, config.cacheDir);
     let { middlewareMode } = serverConfig;
     if (middlewareMode === true) {
         middlewareMode = 'ssr';
@@ -70467,14 +70495,6 @@ function mergeConfigRecursively(defaults, overrides, rootPath) {
             continue;
         }
         const existing = merged[key];
-        if (Array.isArray(existing) && Array.isArray(value)) {
-            merged[key] = [...existing, ...value];
-            continue;
-        }
-        if (isObject$3(existing) && isObject$3(value)) {
-            merged[key] = mergeConfigRecursively(existing, value, rootPath ? `${rootPath}.${key}` : key);
-            continue;
-        }
         // fields that require special handling
         if (existing != null) {
             if (key === 'alias' && (rootPath === 'resolve' || rootPath === '')) {
@@ -70489,6 +70509,14 @@ function mergeConfigRecursively(defaults, overrides, rootPath) {
                 continue;
             }
         }
+        if (Array.isArray(existing) || Array.isArray(value)) {
+            merged[key] = [...arraify(existing), ...arraify(value)];
+            continue;
+        }
+        if (isObject$3(existing) && isObject$3(value)) {
+            merged[key] = mergeConfigRecursively(existing, value, rootPath ? `${rootPath}.${key}` : key);
+            continue;
+        }
         merged[key] = value;
     }
     return merged;
@@ -70509,14 +70537,21 @@ function normalizeAlias(o) {
 }
 // https://github.com/vitejs/vite/issues/1363
 // work around https://github.com/rollup/plugins/issues/759
-function normalizeSingleAlias({ find, replacement }) {
+function normalizeSingleAlias({ find, replacement, customResolver }) {
     if (typeof find === 'string' &&
         find.endsWith('/') &&
         replacement.endsWith('/')) {
         find = find.slice(0, find.length - 1);
         replacement = replacement.slice(0, replacement.length - 1);
     }
-    return { find, replacement };
+    const alias = {
+        find,
+        replacement
+    };
+    if (customResolver) {
+        alias.customResolver = customResolver;
+    }
+    return alias;
 }
 function sortUserPlugins(plugins) {
     const prePlugins = [];
@@ -70787,4 +70822,3 @@ exports.searchForWorkspaceRoot = searchForWorkspaceRoot;
 exports.send = send$1;
 exports.sortUserPlugins = sortUserPlugins;
 exports.transformWithEsbuild = transformWithEsbuild;
-//# sourceMappingURL=dep-e4dc9ea2.js.map

package/dist/node/chunks/{dep-51191982.js → dep-91aeb93b.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var build = require('./dep-e4dc9ea2.js');
+var build = require('./dep-8a5fd784.js');
 
 function _mergeNamespaces(n, m) {
     for (var i = 0; i < m.length; i++) {
@@ -8738,4 +8738,3 @@ var compilerDom_cjs$1 = /*#__PURE__*/_mergeNamespaces({
 }, [compilerDom_cjs$2]);
 
 exports.compilerDom_cjs = compilerDom_cjs$1;
-//# sourceMappingURL=dep-51191982.js.map

package/dist/node/chunks/{dep-e4a9e288.js → dep-a68f5a28.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var require$$0 = require('postcss');
-var build$2 = require('./dep-e4dc9ea2.js');
+var build$2 = require('./dep-8a5fd784.js');
 var path$2 = require('path');
 var require$$1 = require('crypto');
 var fs = require('fs');
@@ -7505,4 +7505,3 @@ var index = /*#__PURE__*/_mergeNamespaces({
 }, [build$1.exports]);
 
 exports.index = index;
-//# sourceMappingURL=dep-e4a9e288.js.map

package/dist/node/cli.js

@@ -1,7 +1,7 @@
 'use strict';
 
 var require$$0 = require('events');
-var build = require('./chunks/dep-e4dc9ea2.js');
+var build = require('./chunks/dep-8a5fd784.js');
 var perf_hooks = require('perf_hooks');
 require('fs');
 require('path');
@@ -684,7 +684,7 @@ cli
     .action(async (root, options) => {
     // output structure is preserved even after bundling so require()
     // is ok here
-    const { createServer } = await Promise.resolve().then(function () { return require('./chunks/dep-e4dc9ea2.js'); }).then(function (n) { return n.index$1; });
+    const { createServer } = await Promise.resolve().then(function () { return require('./chunks/dep-8a5fd784.js'); }).then(function (n) { return n.index$1; });
     try {
         const server = await createServer({
             root,
@@ -733,7 +733,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: build$1 } = await Promise.resolve().then(function () { return require('./chunks/dep-e4dc9ea2.js'); }).then(function (n) { return n.build$1; });
+    const { build: build$1 } = await Promise.resolve().then(function () { return require('./chunks/dep-8a5fd784.js'); }).then(function (n) { return n.build$1; });
     const buildOptions = cleanOptions(options);
     try {
         await build$1({
@@ -756,7 +756,7 @@ cli
     .command('optimize [root]')
     .option('--force', `[boolean] force the optimizer to ignore the cache and re-bundle`)
     .action(async (root, options) => {
-    const { optimizeDeps } = await Promise.resolve().then(function () { return require('./chunks/dep-e4dc9ea2.js'); }).then(function (n) { return n.index; });
+    const { optimizeDeps } = await Promise.resolve().then(function () { return require('./chunks/dep-8a5fd784.js'); }).then(function (n) { return n.index; });
     try {
         const config = await build.resolveConfig({
             root,
@@ -804,4 +804,3 @@ cli
 cli.help();
 cli.version(require('../../package.json').version);
 cli.parse();
-//# sourceMappingURL=cli.js.map

package/dist/node/index.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var build = require('./chunks/dep-e4dc9ea2.js');
+var build = require('./chunks/dep-8a5fd784.js');
 require('fs');
 require('path');
 require('tty');
@@ -50,4 +50,3 @@ exports.searchForWorkspaceRoot = build.searchForWorkspaceRoot;
 exports.send = build.send;
 exports.sortUserPlugins = build.sortUserPlugins;
 exports.transformWithEsbuild = build.transformWithEsbuild;
-//# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "2.8.0-beta.1",
+  "version": "2.8.0-beta.2",
   "license": "MIT",
   "author": "Evan You",
   "description": "Native-ESM powered web dev build tool",
@@ -99,7 +99,7 @@
     "magic-string": "^0.25.7",
     "micromatch": "^4.0.4",
     "mrmime": "^1.0.0",
-    "node-forge": "^0.10.0",
+    "node-forge": "^1.2.0",
     "okie": "^1.0.1",
     "open": "^8.4.0",
     "periscopic": "^2.0.3",

package/types/importMeta.d.ts

@@ -50,14 +50,20 @@ interface ImportMeta {
 
   readonly env: ImportMetaEnv
 
-  glob(pattern: string): Record<
+  glob(
+    pattern: string,
+    options?: import('../src/node/importGlob').AssertOptions
+  ): Record<
     string,
     () => Promise<{
       [key: string]: any
     }>
   >
 
-  globEager(pattern: string): Record<
+  globEager(
+    pattern: string,
+    options?: import('../src/node/importGlob').AssertOptions
+  ): Record<
     string,
     {
       [key: string]: any

package/dist/node/build.d.ts

@@ -1,200 +0,0 @@
-import type { InlineConfig, ResolvedConfig } from './config';
-import type { Plugin, RollupOptions, RollupWarning, WarningHandler, RollupOutput, WatcherOptions, RollupWatcher, ModuleFormat } from 'rollup';
-import type { Terser } from 'types/terser';
-import type { RollupCommonJSOptions } from 'types/commonjs';
-import type { RollupDynamicImportVarsOptions } from 'types/dynamicImportVars';
-import type { TransformOptions } from 'esbuild';
-export interface BuildOptions {
-    /**
-     * Base public path when served in production.
-     * @deprecated `base` is now a root-level config option.
-     */
-    base?: string;
-    /**
-     * Compatibility transform target. The transform is performed with esbuild
-     * and the lowest supported target is es2015/es6. Note this only handles
-     * syntax transformation and does not cover polyfills (except for dynamic
-     * import)
-     *
-     * Default: 'modules' - Similar to `@babel/preset-env`'s targets.esmodules,
-     * transpile targeting browsers that natively support dynamic es module imports.
-     * https://caniuse.com/es6-module-dynamic-import
-     *
-     * Another special value is 'esnext' - which only performs minimal transpiling
-     * (for minification compat) and assumes native dynamic imports support.
-     *
-     * For custom targets, see https://esbuild.github.io/api/#target and
-     * https://esbuild.github.io/content-types/#javascript for more details.
-     */
-    target?: 'modules' | TransformOptions['target'] | false;
-    /**
-     * whether to inject module preload polyfill.
-     * Note: does not apply to library mode.
-     * @default true
-     */
-    polyfillModulePreload?: boolean;
-    /**
-     * whether to inject dynamic import polyfill.
-     * Note: does not apply to library mode.
-     * @default false
-     * @deprecated use plugin-legacy for browsers that don't support dynamic import
-     */
-    polyfillDynamicImport?: boolean;
-    /**
-     * Directory relative from `root` where build output will be placed. If the
-     * directory exists, it will be removed before the build.
-     * @default 'dist'
-     */
-    outDir?: string;
-    /**
-     * Directory relative from `outDir` where the built js/css/image assets will
-     * be placed.
-     * @default 'assets'
-     */
-    assetsDir?: string;
-    /**
-     * Static asset files smaller than this number (in bytes) will be inlined as
-     * base64 strings. Default limit is `4096` (4kb). Set to `0` to disable.
-     * @default 4096
-     */
-    assetsInlineLimit?: number;
-    /**
-     * Whether to code-split CSS. When enabled, CSS in async chunks will be
-     * inlined as strings in the chunk and inserted via dynamically created
-     * style tags when the chunk is loaded.
-     * @default true
-     */
-    cssCodeSplit?: boolean;
-    /**
-     * An optional separate target for CSS minification.
-     * As esbuild only supports configuring targets to mainstream
-     * browsers, users may need this option when they are targeting
-     * a niche browser that comes with most modern JavaScript features
-     * but has poor CSS support, e.g. Android WeChat WebView, which
-     * doesn't support the #RGBA syntax.
-     */
-    cssTarget?: TransformOptions['target'] | false;
-    /**
-     * If `true`, a separate sourcemap file will be created. If 'inline', the
-     * sourcemap will be appended to the resulting output file as data URI.
-     * 'hidden' works like `true` except that the corresponding sourcemap
-     * comments in the bundled files are suppressed.
-     * @default false
-     */
-    sourcemap?: boolean | 'inline' | 'hidden';
-    /**
-     * Set to `false` to disable minification, or specify the minifier to use.
-     * Available options are 'terser' or 'esbuild'.
-     * @default 'esbuild'
-     */
-    minify?: boolean | 'terser' | 'esbuild';
-    /**
-     * Options for terser
-     * https://terser.org/docs/api-reference#minify-options
-     */
-    terserOptions?: Terser.MinifyOptions;
-    /**
-     * @deprecated Vite now uses esbuild for CSS minification.
-     */
-    cleanCssOptions?: any;
-    /**
-     * Will be merged with internal rollup options.
-     * https://rollupjs.org/guide/en/#big-list-of-options
-     */
-    rollupOptions?: RollupOptions;
-    /**
-     * Options to pass on to `@rollup/plugin-commonjs`
-     */
-    commonjsOptions?: RollupCommonJSOptions;
-    /**
-     * Options to pass on to `@rollup/plugin-dynamic-import-vars`
-     */
-    dynamicImportVarsOptions?: RollupDynamicImportVarsOptions;
-    /**
-     * Whether to write bundle to disk
-     * @default true
-     */
-    write?: boolean;
-    /**
-     * Empty outDir on write.
-     * @default true when outDir is a sub directory of project root
-     */
-    emptyOutDir?: boolean | null;
-    /**
-     * Whether to emit a manifest.json under assets dir to map hash-less filenames
-     * to their hashed versions. Useful when you want to generate your own HTML
-     * instead of using the one generated by Vite.
-     *
-     * Example:
-     *
-     * ```json
-     * {
-     *   "main.js": {
-     *     "file": "main.68fe3fad.js",
-     *     "css": "main.e6b63442.css",
-     *     "imports": [...],
-     *     "dynamicImports": [...]
-     *   }
-     * }
-     * ```
-     * @default false
-     */
-    manifest?: boolean;
-    /**
-     * Build in library mode. The value should be the global name of the lib in
-     * UMD mode. This will produce esm + cjs + umd bundle formats with default
-     * configurations that are suitable for distributing libraries.
-     */
-    lib?: LibraryOptions | false;
-    /**
-     * Produce SSR oriented build. Note this requires specifying SSR entry via
-     * `rollupOptions.input`.
-     */
-    ssr?: boolean | string;
-    /**
-     * Generate SSR manifest for determining style links and asset preload
-     * directives in production.
-     */
-    ssrManifest?: boolean;
-    /**
-     * Set to false to disable reporting compressed chunk sizes.
-     * Can slightly improve build speed.
-     */
-    reportCompressedSize?: boolean;
-    /**
-     * Set to false to disable brotli compressed size reporting for build.
-     * Can slightly improve build speed.
-     * @deprecated use `build.reportCompressedSize` instead.
-     */
-    brotliSize?: boolean;
-    /**
-     * Adjust chunk size warning limit (in kbs).
-     * @default 500
-     */
-    chunkSizeWarningLimit?: number;
-    /**
-     * Rollup watch options
-     * https://rollupjs.org/guide/en/#watchoptions
-     */
-    watch?: WatcherOptions | null;
-}
-export interface LibraryOptions {
-    entry: string;
-    name?: string;
-    formats?: LibraryFormats[];
-    fileName?: string | ((format: ModuleFormat) => string);
-}
-export declare type LibraryFormats = 'es' | 'cjs' | 'umd' | 'iife';
-export declare type ResolvedBuildOptions = Required<Omit<BuildOptions, 'base' | 'cleanCssOptions' | 'polyfillDynamicImport' | 'brotliSize'>>;
-export declare function resolveBuildOptions(root: string, raw?: BuildOptions, isBuild?: boolean): ResolvedBuildOptions;
-export declare function resolveBuildPlugins(config: ResolvedConfig): {
-    pre: Plugin[];
-    post: Plugin[];
-};
-/**
- * Bundles the app for production.
- * Returns a Promise containing the build result.
- */
-export declare function build(inlineConfig?: InlineConfig): Promise<RollupOutput | RollupOutput[] | RollupWatcher>;
-export declare function resolveLibFilename(libOptions: LibraryOptions, format: ModuleFormat, root: string): string;
-export declare function onRollupWarning(warning: RollupWarning, warn: WarningHandler, config: ResolvedConfig): void;

package/dist/node/certificate.d.ts

@@ -1,2 +0,0 @@
-import 'node-forge/lib/pki';
-export declare function createCertificate(): string;