vite 2.7.2 → 2.7.3

package/CHANGELOG.md

@@ -1,3 +1,18 @@
+## [2.7.3](https://github.com/vitejs/vite/compare/v2.7.2...v2.7.3) (2021-12-16)
+
+
+### Bug Fixes
+
+* do not overwrite rollupOptions.input in dev ([#6025](https://github.com/vitejs/vite/issues/6025)) ([6cdf13a](https://github.com/vitejs/vite/commit/6cdf13ae808a99b7aca6d278bee2ebe6e51d0846))
+* Improve post-build asset update check ([#6113](https://github.com/vitejs/vite/issues/6113)) ([611fa03](https://github.com/vitejs/vite/commit/611fa037a72a1179c27794353ffad6ed27e10d1a))
+* improve warning message for malformed packages ([#6086](https://github.com/vitejs/vite/issues/6086)) ([717cb08](https://github.com/vitejs/vite/commit/717cb08f8611fd1a15cfd614d346185ffe8a61fd))
+* pending reload never timeout ([#6120](https://github.com/vitejs/vite/issues/6120)) ([e002f4f](https://github.com/vitejs/vite/commit/e002f4f4a578ae63156e756abac0487f42b4cdcd))
+* respect new port when change the config file ([#6075](https://github.com/vitejs/vite/issues/6075)) ([3ceffcc](https://github.com/vitejs/vite/commit/3ceffcca66311f9a7d71612a596b84888c3f843b))
+* **ssr:** robust regexp to check cjs content ([#6053](https://github.com/vitejs/vite/issues/6053)) ([0373441](https://github.com/vitejs/vite/commit/03734417cde10807ab2dd0d71b08c26081aac0b7))
+* terminate WebSocket connections before closing WebSocket server ([#6115](https://github.com/vitejs/vite/issues/6115)) ([b9871bb](https://github.com/vitejs/vite/commit/b9871bbed57c5964b3393e798b0ef2526471d692))
+
+
+
 ## [2.7.2](https://github.com/vitejs/vite/compare/v2.7.1...v2.7.2) (2021-12-13)
 
 

package/dist/node/build.d.ts

@@ -186,7 +186,7 @@ export interface LibraryOptions {
 }
 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): ResolvedBuildOptions;
+export declare function resolveBuildOptions(root: string, raw?: BuildOptions, isBuild?: boolean): ResolvedBuildOptions;
 export declare function resolveBuildPlugins(config: ResolvedConfig): {
     pre: Plugin[];
     post: Plugin[];

package/dist/node/chunks/{dep-7817f5b4.js → dep-5496817b.js}

@@ -20396,7 +20396,7 @@ async function compileCSS(id, code, config, urlReplacer, atImportResolvers, serv
         replacer: urlReplacer
     }));
     if (isModule) {
-        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-fffc0487.js'); }).then(function (n) { return n.index; })).default({
+        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-cf2decec.js'); }).then(function (n) { return n.index; })).default({
             ...modulesOptions,
             getJSON(cssFileName, _modules, outputFileName) {
                 modules = _modules;
@@ -21401,7 +21401,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-93096c54.js'); }).then(function (n) { return n.compilerDom_cjs; });
+    const { parse, transform } = await Promise.resolve().then(function () { return require('./dep-66abeb03.js'); }).then(function (n) { return n.compilerDom_cjs; });
     // @vue/compiler-core doesn't like lowercase doctypes
     html = html.replace(/<!doctype\s/i, '<!DOCTYPE ');
     try {
@@ -21467,6 +21467,7 @@ function buildHtmlPlugin(config) {
             isAsyncScriptMap.set(config, new Map());
         },
         async transform(html, id) {
+            var _a, _b;
             if (id.endsWith('.html')) {
                 const publicPath = `/${slash$3(path__default.relative(config.root, id))}`;
                 // pre-transform
@@ -21557,20 +21558,26 @@ function buildHtmlPlugin(config) {
                     config.logger.warn(`\nMixed async and defer script modules in ${id}, output script will fallback to defer. Every script, including inline ones, need to be marked as async for your output script to be async.`);
                 }
                 // for each encountered asset url, rewrite original html so that it
-                // references the post-build location.
+                // references the post-build location, ignoring empty attributes and
+                // attributes that directly reference named output.
+                const namedOutput = Object.keys(((_b = (_a = config === null || config === void 0 ? void 0 : config.build) === null || _a === void 0 ? void 0 : _a.rollupOptions) === null || _b === void 0 ? void 0 : _b.input) || {});
                 for (const attr of assetUrls) {
                     const value = attr.value;
-                    try {
-                        const url = attr.name === 'srcset'
-                            ? await processSrcSet(value.content, ({ url }) => urlToBuiltUrl(url, id, config, this))
-                            : await urlToBuiltUrl(value.content, id, config, this);
-                        s.overwrite(value.loc.start.offset, value.loc.end.offset, `"${url}"`);
-                    }
-                    catch (e) {
-                        // #1885 preload may be pointing to urls that do not exist
-                        // locally on disk
-                        if (e.code !== 'ENOENT') {
-                            throw e;
+                    const content = value.content;
+                    if (content !== '' && // Empty attribute
+                        !namedOutput.includes(content) && // Direct reference to named output
+                        !namedOutput.includes(content.replace(/^\//, '')) // Allow for absolute references as named output can't be an absolute path
+                    ) {
+                        try {
+                            const url = attr.name === 'srcset'
+                                ? await processSrcSet(content, ({ url }) => urlToBuiltUrl(url, id, config, this))
+                                : await urlToBuiltUrl(content, id, config, this);
+                            s.overwrite(value.loc.start.offset, value.loc.end.offset, `"${url}"`);
+                        }
+                        catch (e) {
+                            if (e.code !== 'ENOENT') {
+                                throw e;
+                            }
                         }
                     }
                 }
@@ -30758,6 +30765,7 @@ function resolveSSRExternal(config, knownImports) {
     }
     return externals;
 }
+const CJS_CONTENT_RE = /\bmodule\.exports\b|\bexports[.\[]|\brequire\s*\(|\bObject\.(defineProperty|defineProperties|assign)\s*\(\s*exports\b/;
 // do we need to do this ahead of time or could we do it lazily?
 function collectExternals(root, preserveSymlinks, ssrExternals, seen, logger) {
     var _a;
@@ -30836,11 +30844,11 @@ function collectExternals(root, preserveSymlinks, ssrExternals, seen, logger) {
             }
             // check if the entry is cjs
             const content = fs__default.readFileSync(esmEntry, 'utf-8');
-            if (/\bmodule\.exports\b|\bexports[.\[]|\brequire\s*\(/.test(content)) {
+            if (CJS_CONTENT_RE.test(content)) {
                 ssrExternals.add(id);
                 continue;
             }
-            logger.warn(`${id} is incorrectly packaged. Please contact the package author to fix.`);
+            logger.warn(`${id} doesn't appear to be written in CJS, but also doesn't appear to be a valid ES module (i.e. it doesn't have "type": "module" or an .mjs extension for the entry point). Please contact the package author to fix.`);
         }
     }
     for (const depRoot of depsToTrace) {
@@ -43349,7 +43357,7 @@ function loadFallbackPlugin() {
     };
 }
 
-function resolveBuildOptions(root, raw) {
+function resolveBuildOptions(root, raw, isBuild) {
     var _a;
     const resolved = {
         target: 'modules',
@@ -43398,18 +43406,22 @@ function resolveBuildOptions(root, raw) {
                 ]))
                 : resolve(raw.rollupOptions.input);
     }
-    else {
-        input = resolve((raw === null || raw === void 0 ? void 0 : raw.lib)
-            ? raw.lib.entry
-            : typeof (raw === null || raw === void 0 ? void 0 : raw.ssr) === 'string'
-                ? raw.ssr
-                : 'index.html');
+    else if ((raw === null || raw === void 0 ? void 0 : raw.lib) && isBuild) {
+        input = resolve(raw.lib.entry);
+    }
+    else if (typeof (raw === null || raw === void 0 ? void 0 : raw.ssr) === 'string') {
+        input = resolve(raw.ssr);
+    }
+    else if (isBuild) {
+        input = resolve('index.html');
     }
     if (!!(raw === null || raw === void 0 ? void 0 : raw.ssr) && typeof input === 'string' && input.endsWith('.html')) {
         throw new Error(`rollupOptions.input should not be an html file when building for SSR. ` +
             `Please specify a dedicated SSR entry.`);
     }
-    resolved.rollupOptions.input = input;
+    if (input) {
+        resolved.rollupOptions.input = input;
+    }
     // handle special build targets
     if (resolved.target === 'modules') {
         // Support browserslist
@@ -43449,7 +43461,7 @@ function resolveBuildPlugins(config) {
             dynamicImportVariables(options.dynamicImportVarsOptions),
             assetImportMetaUrlPlugin(config),
             ...(options.rollupOptions.plugins
-                ? options.rollupOptions.plugins.filter((p) => !!p)
+                ? options.rollupOptions.plugins.filter(Boolean)
                 : [])
         ],
         post: [
@@ -49560,7 +49572,7 @@ function readFileIfExists(value) {
  * https://github.com/webpack/webpack-dev-server/blob/master/LICENSE
  */
 async function createCertificate() {
-    const { generate } = await Promise.resolve().then(function () { return require('./dep-453486e7.js'); }).then(function (n) { return n.index; });
+    const { generate } = await Promise.resolve().then(function () { return require('./dep-df937e9b.js'); }).then(function (n) { return n.index; });
     const pems = generate(null, {
         algorithm: 'sha256',
         days: 30,
@@ -53835,6 +53847,9 @@ function createWebSocketServer(server, config, httpsOptions) {
         },
         close() {
             return new Promise((resolve, reject) => {
+                wss.clients.forEach((client) => {
+                    client.terminate();
+                });
                 wss.close((err) => {
                     if (err) {
                         reject(err);
@@ -57641,21 +57656,26 @@ function transformMiddleware(server) {
             // always allow vite client requests so that it can trigger page reload
             !((_a = req.url) === null || _a === void 0 ? void 0 : _a.startsWith(CLIENT_PUBLIC_PATH)) &&
             !((_b = req.url) === null || _b === void 0 ? void 0 : _b.includes('vite/dist/client'))) {
-            // missing dep pending reload, hold request until reload happens
-            server._pendingReload.then(() => 
-            // If the refresh has not happened after timeout, Vite considers
-            // something unexpected has happened. In this case, Vite
-            // returns an empty response that will error.
-            setTimeout(() => {
+            try {
+                // missing dep pending reload, hold request until reload happens
+                await Promise.race([
+                    server._pendingReload,
+                    // If the refresh has not happened after timeout, Vite considers
+                    // something unexpected has happened. In this case, Vite
+                    // returns an empty response that will error.
+                    new Promise((_, reject) => setTimeout(reject, NEW_DEPENDENCY_BUILD_TIMEOUT))
+                ]);
+            }
+            catch {
                 // Don't do anything if response has already been sent
-                if (res.writableEnded)
-                    return;
-                // status code request timeout
-                res.statusCode = 408;
-                res.end(`<h1>[vite] Something unexpected happened while optimizing "${req.url}"<h1>` +
-                    `<p>The current page should have reloaded by now</p>`);
-            }, NEW_DEPENDENCY_BUILD_TIMEOUT));
-            return;
+                if (!res.writableEnded) {
+                    // status code request timeout
+                    res.statusCode = 408;
+                    res.end(`<h1>[vite] Something unexpected happened while optimizing "${req.url}"<h1>` +
+                        `<p>The current page should have reloaded by now</p>`);
+                }
+                return;
+            }
         }
         let url = decodeURI(removeTimestampQuery(req.url)).replace(NULL_BYTE_PLACEHOLDER, '\0');
         const withoutQuery = cleanUrl(url);
@@ -58055,7 +58075,12 @@ async function handleHMRUpdate(file, server) {
         // auto restart server
         debugHmr(`[config change] ${source.dim(shortFile)}`);
         config.logger.info(source.green(`${path__default.relative(process.cwd(), file)} changed, restarting server...`), { clear: true, timestamp: true });
-        await server.restart();
+        try {
+            await server.restart();
+        }
+        catch (e) {
+            config.logger.error(source.red(e));
+        }
         return;
     }
     debugHmr(`[file change] ${source.dim(shortFile)}`);
@@ -67991,7 +68016,7 @@ function resolveServerOptions(root, raw) {
 async function restartServer(server) {
     // @ts-ignore
     global.__vite_start_time = perf_hooks.performance.now();
-    const { port } = server.config.server;
+    const { port: prevPort, host: prevHost } = server.config.server;
     await server.close();
     let newServer = null;
     try {
@@ -68009,11 +68034,17 @@ async function restartServer(server) {
             server[key] = newServer[key];
         }
     }
-    if (!server.config.server.middlewareMode) {
+    const { logger, server: { port, host, middlewareMode } } = server.config;
+    if (!middlewareMode) {
         await server.listen(port, true);
+        logger.info('server restarted.', { timestamp: true });
+        if (port !== prevPort || host !== prevHost) {
+            logger.info('\n');
+            server.printUrls();
+        }
     }
     else {
-        server.config.logger.info('server restarted.', { timestamp: true });
+        logger.info('server restarted.', { timestamp: true });
     }
 }
 
@@ -82030,7 +82061,7 @@ async function resolveConfig(inlineConfig, command, defaultMode = 'development')
     }
     // resolve public base url
     const BASE_URL = resolveBaseUrl(config.base, command === 'build', logger);
-    const resolvedBuildOptions = resolveBuildOptions(resolvedRoot, config.build);
+    const resolvedBuildOptions = resolveBuildOptions(resolvedRoot, config.build, command === 'build');
     // resolve cache directory
     const pkgPath = lookupFile(resolvedRoot, [`package.json`], true /* pathOnly */);
     const cacheDir = config.cacheDir
@@ -82555,4 +82586,4 @@ exports.send = send$1;
 exports.sortUserPlugins = sortUserPlugins;
 exports.source = source;
 exports.transformWithEsbuild = transformWithEsbuild;
-//# sourceMappingURL=dep-7817f5b4.js.map
+//# sourceMappingURL=dep-5496817b.js.map