vite 2.7.0-beta.9 → 2.7.0

package/dist/node/chunks/{dep-9aea22f6.js → dep-7e125991.js}

@@ -5981,7 +5981,7 @@ function assetFileNamesToFileName(assetFileNames, file, contentHash, content) {
     // placeholders for `assetFileNames`
     // `hash` is slightly different from the rollup's one
     const extname = path__default.extname(basename);
-    const ext = extname.substr(1);
+    const ext = extname.substring(1);
     const name = basename.slice(0, -extname.length);
     const hash = contentHash;
     if (typeof assetFileNames === 'function') {
@@ -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-f90ad7ac.js'); }).then(function (n) { return n.index; })).default({
+        postcssPlugins.unshift((await Promise.resolve().then(function () { return require('./dep-4619561c.js'); }).then(function (n) { return n.index; })).default({
             ...modulesOptions,
             getJSON(cssFileName, _modules, outputFileName) {
                 modules = _modules;
@@ -21374,7 +21374,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-ff5fc8ed.js'); }).then(function (n) { return n.compilerDom_cjs; });
+    const { parse, transform } = await Promise.resolve().then(function () { return require('./dep-1ce37657.js'); }).then(function (n) { return n.compilerDom_cjs; });
     // @vue/compiler-core doesn't like lowercase doctypes
     html = html.replace(/<!doctype\s/i, '<!DOCTYPE ');
     try {
@@ -30126,8 +30126,8 @@ function resolvePlugin(baseOptions) {
             // this is passed by @rollup/plugin-commonjs
             const isRequire = (_c = (_b = (_a = resolveOpts === null || resolveOpts === void 0 ? void 0 : resolveOpts.custom) === null || _a === void 0 ? void 0 : _a['node-resolve']) === null || _b === void 0 ? void 0 : _b.isRequire) !== null && _c !== void 0 ? _c : false;
             const options = {
-                ...baseOptions,
                 isRequire,
+                ...baseOptions,
                 isFromTsImporter: isTsRequest(importer !== null && importer !== void 0 ? importer : '')
             };
             let res;
@@ -30712,7 +30712,7 @@ function resolveSSRExternal(config, knownImports) {
         ssrExternals.add(id);
         seen.add(id);
     });
-    collectExternals(config.root, config.resolve.preserveSymlinks, ssrExternals, seen);
+    collectExternals(config.root, config.resolve.preserveSymlinks, ssrExternals, seen, config.logger);
     const importedDeps = knownImports.map(getNpmPackageName).filter(isDefined);
     for (const dep of importedDeps) {
         // Assume external if not yet seen
@@ -30732,16 +30732,16 @@ function resolveSSRExternal(config, knownImports) {
     return externals;
 }
 // do we need to do this ahead of time or could we do it lazily?
-function collectExternals(root, preserveSymlinks, ssrExternals, seen) {
+function collectExternals(root, preserveSymlinks, ssrExternals, seen, logger) {
     var _a;
-    const pkgContent = lookupFile(root, ['package.json']);
-    if (!pkgContent) {
+    const rootPkgContent = lookupFile(root, ['package.json']);
+    if (!rootPkgContent) {
         return;
     }
-    const pkg = JSON.parse(pkgContent);
+    const rootPkg = JSON.parse(rootPkgContent);
     const deps = {
-        ...pkg.devDependencies,
-        ...pkg.dependencies
+        ...rootPkg.devDependencies,
+        ...rootPkg.dependencies
     };
     const resolveOptions = {
         root,
@@ -30797,6 +30797,12 @@ function collectExternals(root, preserveSymlinks, ssrExternals, seen) {
         // or are there others like SystemJS / AMD that we'd need to handle?
         // for now, we'll just leave this as is
         else if (/\.m?js$/.test(esmEntry)) {
+            const pkgPath = resolveFrom$3(`${id}/package.json`, root);
+            const pkgContent = fs__default.readFileSync(pkgPath, 'utf-8');
+            if (!pkgContent) {
+                continue;
+            }
+            const pkg = JSON.parse(pkgContent);
             if (pkg.type === 'module' || esmEntry.endsWith('.mjs')) {
                 ssrExternals.add(id);
                 continue;
@@ -30805,11 +30811,13 @@ function collectExternals(root, preserveSymlinks, ssrExternals, seen) {
             const content = fs__default.readFileSync(esmEntry, 'utf-8');
             if (/\bmodule\.exports\b|\bexports[.\[]|\brequire\s*\(/.test(content)) {
                 ssrExternals.add(id);
+                continue;
             }
+            logger.warn(`${id} is incorrectly packaged. Please contact the package author to fix.`);
         }
     }
     for (const depRoot of depsToTrace) {
-        collectExternals(depRoot, preserveSymlinks, ssrExternals, seen);
+        collectExternals(depRoot, preserveSymlinks, ssrExternals, seen, logger);
     }
 }
 function shouldExternalizeForSSR(id, externals) {
@@ -43018,11 +43026,15 @@ function esbuildScanPlugin(config, container, depImports, missing, entries) {
                         const contextMatch = openTag.match(contextRE);
                         const context = contextMatch &&
                             (contextMatch[1] || contextMatch[2] || contextMatch[3]);
-                        if ((path.endsWith('.vue') && setupRE.test(raw)) ||
+                        if ((path.endsWith('.vue') && setupRE.test(openTag)) ||
                             (path.endsWith('.svelte') && context !== 'module')) {
+                            // append imports in TS to prevent esbuild from removing them
+                            // since they may be used in the template
+                            const localContent = content +
+                                (loader.startsWith('ts') ? extractImportPaths(content) : '');
                             localScripts[path] = {
                                 loader,
-                                contents: content
+                                contents: localContent
                             };
                             js += `import '${virtualModulePrefix}${path}';\n`;
                         }
@@ -43031,26 +43043,10 @@ function esbuildScanPlugin(config, container, depImports, missing, entries) {
                         }
                     }
                 }
-                // empty singleline & multiline comments to avoid matching comments
-                const code = js
-                    .replace(multilineCommentsRE, '/* */')
-                    .replace(singlelineCommentsRE, '');
-                if (loader.startsWith('ts') &&
-                    (path.endsWith('.svelte') ||
-                        (path.endsWith('.vue') && setupRE.test(raw)))) {
-                    // when using TS + (Vue + <script setup>) or Svelte, imports may seem
-                    // unused to esbuild and dropped in the build output, which prevents
-                    // esbuild from crawling further.
-                    // the solution is to add `import 'x'` for every source to force
-                    // esbuild to keep crawling due to potential side effects.
-                    let m;
-                    while ((m = importsRE.exec(code)) != null) {
-                        // This is necessary to avoid infinite loops with zero-width matches
-                        if (m.index === importsRE.lastIndex) {
-                            importsRE.lastIndex++;
-                        }
-                        js += `\nimport ${m[1]}`;
-                    }
+                // `<script>` in Svelte has imports that can be used in the template
+                // so we handle them here too
+                if (loader.startsWith('ts') && path.endsWith('.svelte')) {
+                    js += extractImportPaths(js);
                 }
                 // This will trigger incorrectly if `export default` is contained
                 // anywhere in a string. Svelte and Astro files can't have
@@ -43192,6 +43188,29 @@ async function transformGlob(source, importer, root, loader) {
     }
     return s.toString();
 }
+/**
+ * when using TS + (Vue + `<script setup>`) or Svelte, imports may seem
+ * unused to esbuild and dropped in the build output, which prevents
+ * esbuild from crawling further.
+ * the solution is to add `import 'x'` for every source to force
+ * esbuild to keep crawling due to potential side effects.
+ */
+function extractImportPaths(code) {
+    // empty singleline & multiline comments to avoid matching comments
+    code = code
+        .replace(multilineCommentsRE, '/* */')
+        .replace(singlelineCommentsRE, '');
+    let js = '';
+    let m;
+    while ((m = importsRE.exec(code)) != null) {
+        // This is necessary to avoid infinite loops with zero-width matches
+        if (m.index === importsRE.lastIndex) {
+            importsRE.lastIndex++;
+        }
+        js += `\nimport ${m[1]}`;
+    }
+    return js;
+}
 function shouldExternalizeDep(resolvedId, rawId) {
     // not a valid file path
     if (!path__default.isAbsolute(resolvedId)) {
@@ -43500,6 +43519,12 @@ async function doBuild(inlineConfig = {}) {
     };
     try {
         const buildOutputOptions = (output = {}) => {
+            // @ts-ignore
+            if (output.output) {
+                config.logger.warn(`You've set "rollupOptions.output.output" in your config. ` +
+                    `This is deprecated and will override all Vite.js default output options. ` +
+                    `Please use "rollupOptions.output" instead.`);
+            }
             return {
                 dir: outDir,
                 format: ssr ? 'cjs' : 'es',
@@ -49508,7 +49533,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-a2051654.js'); }).then(function (n) { return n.index; });
+    const { generate } = await Promise.resolve().then(function () { return require('./dep-4dd87a09.js'); }).then(function (n) { return n.index; });
     const pems = generate(null, {
         algorithm: 'sha256',
         days: 30,
@@ -57677,7 +57702,13 @@ const devHtmlHook = async (html, { path: htmlPath, server, originalUrl }) => {
                 // add HTML Proxy to Map
                 addToHTMLProxyCache(config, url, scriptModuleIndex, contents);
                 // inline js module. convert to src="proxy"
-                s.overwrite(node.loc.start.offset, node.loc.end.offset, `<script type="module" src="${config.base + url.slice(1)}?html-proxy&index=${scriptModuleIndex}.js"></script>`);
+                const modulePath = `${config.base + htmlPath.slice(1)}?html-proxy&index=${scriptModuleIndex}.js`;
+                // invalidate the module so the newly cached contents will be served
+                const module = server === null || server === void 0 ? void 0 : server.moduleGraph.getModuleById(modulePath);
+                if (module) {
+                    server === null || server === void 0 ? void 0 : server.moduleGraph.invalidateModule(module);
+                }
+                s.overwrite(node.loc.start.offset, node.loc.end.offset, `<script type="module" src="${modulePath}"></script>`);
             }
         }
         // elements with [href/src] attrs
@@ -63712,7 +63743,7 @@ ssr) {
     data.browserHash = require$$1$1.createHash('sha256')
         .update(data.hash + JSON.stringify(deps))
         .digest('hex')
-        .substr(0, 8);
+        .substring(0, 8);
     const missingIds = Object.keys(missing);
     if (missingIds.length) {
         throw new Error(`The following dependencies are imported but could not be resolved:\n\n  ${missingIds
@@ -63900,7 +63931,7 @@ function getDepHash(root, config) {
         }
         return value;
     });
-    return require$$1$1.createHash('sha256').update(content).digest('hex').substr(0, 8);
+    return require$$1$1.createHash('sha256').update(content).digest('hex').substring(0, 8);
 }
 
 var index$1 = {
@@ -67125,9 +67156,10 @@ function rebindErrorStacktrace(e, stacktrace) {
  * in development.
  */
 function ssrRequireHookPlugin(config) {
-    var _a;
+    var _a, _b;
     if (config.command !== 'build' ||
         !((_a = config.resolve.dedupe) === null || _a === void 0 ? void 0 : _a.length) ||
+        ((_b = config.ssr) === null || _b === void 0 ? void 0 : _b.noExternal) === true ||
         isBuildOutputEsm(config)) {
         return null;
     }
@@ -67350,19 +67382,24 @@ async function nodeImport(id, importer, resolveOptions) {
     }
     try {
         const mod = await dynamicImport(url);
-        return proxyESM(id, mod);
+        return proxyESM(mod);
     }
     finally {
         unhookNodeResolve();
     }
 }
 // rollup-style default import interop for cjs
-function proxyESM(id, mod) {
-    const defaultExport = mod.__esModule
-        ? mod.default
-        : mod.default
-            ? mod.default
-            : mod;
+function proxyESM(mod) {
+    // This is the only sensible option when the exports object is a primitve
+    if (isPrimitive(mod))
+        return { default: mod };
+    let defaultExport = 'default' in mod ? mod.default : mod;
+    if (!isPrimitive(defaultExport) && '__esModule' in defaultExport) {
+        mod = defaultExport;
+        if ('default' in defaultExport) {
+            defaultExport = defaultExport.default;
+        }
+    }
     return new Proxy(mod, {
         get(mod, prop) {
             var _a;
@@ -67372,6 +67409,9 @@ function proxyESM(id, mod) {
         }
     });
 }
+function isPrimitive(value) {
+    return !value || (typeof value !== 'object' && typeof value !== 'function');
+}
 
 /**
  * The amount to wait for requests to register newly found dependencies before triggering
@@ -67540,6 +67580,7 @@ async function createServer(inlineConfig = {}) {
         pluginContainer: container,
         ws,
         moduleGraph,
+        ssrTransform,
         transformWithEsbuild,
         transformRequest(url, options) {
             return transformRequest(url, server, options);
@@ -82416,4 +82457,4 @@ exports.send = send$1;
 exports.sortUserPlugins = sortUserPlugins;
 exports.source = source;
 exports.transformWithEsbuild = transformWithEsbuild;
-//# sourceMappingURL=dep-9aea22f6.js.map
+//# sourceMappingURL=dep-7e125991.js.map