@forsakringskassan/vite-lib-config 4.6.3 → 4.6.4

package/dist/vite.config.cjs

@@ -4658,7 +4658,7 @@ var import_node_path = __toESM(require("node:path"), 1);
 var import_node_crypto = __toESM(require("node:crypto"), 1);
 var import_node_tty = require("node:tty");
 var import_node_util = require("node:util");
-var version = "6.0.5";
+var version = "6.0.6";
 function resolveCompiler(root) {
   const compiler = tryResolveCompiler(root) || tryResolveCompiler();
   if (!compiler) throw new Error("Failed to resolve vue/compiler-sfc.\n@vitejs/plugin-vue requires vue (>=3.2.25) to be present in the dependency tree.");
@@ -4778,6 +4778,8 @@ function createRollupError(id, error) {
 async function transformTemplateAsModule(code, filename, descriptor, options, pluginContext, ssr, customElement) {
   const result = compile(code, filename, descriptor, options, pluginContext, ssr, customElement);
   let returnCode = result.code;
+  returnCode += `
+export const multiRoot = ${JSON.stringify(result.multiRoot)}`;
   if (options.devServer && options.devServer.config.server.hmr !== false && !ssr && !options.isProduction) returnCode += `
 import.meta.hot.accept(({ render }) => {
       __VUE_HMR_RUNTIME__.rerender(${JSON.stringify(descriptor.id)}, render)
@@ -5902,11 +5904,14 @@ async function transformMain(code, filename, options, pluginContext, ssr, custom
   }
   const attachedProps = [];
   const hasScoped = descriptor.styles.some((s) => s.scoped);
+  const isTemplateOnlyVapor = !descriptor.script && !descriptor.scriptSetup && descriptor.vapor;
   const { code: scriptCode, map: scriptMap } = await genScriptCode(descriptor, options, pluginContext, ssr, customElement);
   const hasTemplateImport = descriptor.template && !isUseInlineTemplate(descriptor, options);
+  const isTemplateInlined = !!descriptor.template && (!descriptor.template.lang || descriptor.template.lang === "html") && !descriptor.template.src;
   let templateCode = "";
   let templateMap = void 0;
-  if (hasTemplateImport) ({ code: templateCode, map: templateMap } = await genTemplateCode(descriptor, options, pluginContext, ssr, customElement));
+  let templateMultiRoot;
+  if (hasTemplateImport) ({ code: templateCode, map: templateMap, multiRoot: templateMultiRoot } = await genTemplateCode(descriptor, options, pluginContext, ssr, customElement));
   if (hasTemplateImport) attachedProps.push(ssr ? ["ssrRender", "_sfc_ssrRender"] : ["render", "_sfc_render"]);
   else if (prevDescriptor && !isEqualBlock(descriptor.template, prevDescriptor.template)) attachedProps.push([ssr ? "ssrRender" : "render", "() => {}"]);
   const stylesCode = await genStyleCode(descriptor, pluginContext, customElement, attachedProps);
@@ -5914,6 +5919,7 @@ async function transformMain(code, filename, options, pluginContext, ssr, custom
   const output = [
     scriptCode,
     templateCode,
+    isTemplateOnlyVapor ? `${scriptIdentifier}.__multiRoot = ${isTemplateInlined ? templateMultiRoot : "_sfc_multiRoot"}` : "",
     stylesCode,
     customBlocksCode
   ];
@@ -5995,15 +6001,21 @@ async function transformMain(code, filename, options, pluginContext, ssr, custom
 async function genTemplateCode(descriptor, options, pluginContext, ssr, customElement) {
   const template = descriptor.template;
   const hasScoped = descriptor.styles.some((style) => style.scoped);
-  if ((!template.lang || template.lang === "html") && !template.src) return transformTemplateInMain(template.content, descriptor, options, pluginContext, ssr, customElement);
-  else {
+  const needsMultiRoot = !descriptor.script && !descriptor.scriptSetup && descriptor.vapor;
+  if ((!template.lang || template.lang === "html") && !template.src) {
+    const result = transformTemplateInMain(template.content, descriptor, options, pluginContext, ssr, customElement);
+    return {
+      ...result,
+      multiRoot: needsMultiRoot ? result.multiRoot : void 0
+    };
+  } else {
     if (template.src) await linkSrcToDescriptor(template.src, descriptor, pluginContext, hasScoped);
     const src = template.src || descriptor.filename;
     const query = `?vue&type=template${template.src ? hasScoped ? `&src=${descriptor.id}` : "&src=true" : ""}${hasScoped ? `&scoped=${descriptor.id}` : ``}${attrsToQuery(template.attrs, "js", true)}`;
     const request = JSON.stringify(src + query);
     const renderFnName = ssr ? "ssrRender" : "render";
     return {
-      code: `import { ${renderFnName} as _sfc_${renderFnName} } from ${request}`,
+      code: `import { ${renderFnName} as _sfc_${renderFnName}${needsMultiRoot ? ", multiRoot as _sfc_multiRoot" : ""} } from ${request}`,
       map: void 0
     };
   }
@@ -6264,14 +6276,14 @@ function vuePlugin(rawOptions = {}) {
     resolveId: {
       filter: { id: [exactRegex(EXPORT_HELPER_ID), /[?&]vue\b/] },
       handler(id) {
-        if (id === EXPORT_HELPER_ID) return id;
+        if (id === "\0plugin-vue:export-helper") return id;
         if (parseVueRequest(id).query.vue) return id;
       }
     },
     load: {
       filter: { id: [exactRegex(EXPORT_HELPER_ID), /[?&]vue\b/] },
       handler(id, opt) {
-        if (id === EXPORT_HELPER_ID) return helperCode;
+        if (id === "\0plugin-vue:export-helper") return helperCode;
         const ssr = opt?.ssr === true;
         const { filename, query } = parseVueRequest(id);
         if (query.vue) {

package/dist/vite.config.mjs

@@ -4648,7 +4648,7 @@ import path from "node:path";
 import crypto from "node:crypto";
 import { isatty } from "node:tty";
 import { formatWithOptions, inspect } from "node:util";
-var version = "6.0.5";
+var version = "6.0.6";
 function resolveCompiler(root) {
   const compiler = tryResolveCompiler(root) || tryResolveCompiler();
   if (!compiler) throw new Error("Failed to resolve vue/compiler-sfc.\n@vitejs/plugin-vue requires vue (>=3.2.25) to be present in the dependency tree.");
@@ -4768,6 +4768,8 @@ function createRollupError(id, error) {
 async function transformTemplateAsModule(code, filename, descriptor, options, pluginContext, ssr, customElement) {
   const result = compile(code, filename, descriptor, options, pluginContext, ssr, customElement);
   let returnCode = result.code;
+  returnCode += `
+export const multiRoot = ${JSON.stringify(result.multiRoot)}`;
   if (options.devServer && options.devServer.config.server.hmr !== false && !ssr && !options.isProduction) returnCode += `
 import.meta.hot.accept(({ render }) => {
       __VUE_HMR_RUNTIME__.rerender(${JSON.stringify(descriptor.id)}, render)
@@ -5892,11 +5894,14 @@ async function transformMain(code, filename, options, pluginContext, ssr, custom
   }
   const attachedProps = [];
   const hasScoped = descriptor.styles.some((s) => s.scoped);
+  const isTemplateOnlyVapor = !descriptor.script && !descriptor.scriptSetup && descriptor.vapor;
   const { code: scriptCode, map: scriptMap } = await genScriptCode(descriptor, options, pluginContext, ssr, customElement);
   const hasTemplateImport = descriptor.template && !isUseInlineTemplate(descriptor, options);
+  const isTemplateInlined = !!descriptor.template && (!descriptor.template.lang || descriptor.template.lang === "html") && !descriptor.template.src;
   let templateCode = "";
   let templateMap = void 0;
-  if (hasTemplateImport) ({ code: templateCode, map: templateMap } = await genTemplateCode(descriptor, options, pluginContext, ssr, customElement));
+  let templateMultiRoot;
+  if (hasTemplateImport) ({ code: templateCode, map: templateMap, multiRoot: templateMultiRoot } = await genTemplateCode(descriptor, options, pluginContext, ssr, customElement));
   if (hasTemplateImport) attachedProps.push(ssr ? ["ssrRender", "_sfc_ssrRender"] : ["render", "_sfc_render"]);
   else if (prevDescriptor && !isEqualBlock(descriptor.template, prevDescriptor.template)) attachedProps.push([ssr ? "ssrRender" : "render", "() => {}"]);
   const stylesCode = await genStyleCode(descriptor, pluginContext, customElement, attachedProps);
@@ -5904,6 +5909,7 @@ async function transformMain(code, filename, options, pluginContext, ssr, custom
   const output = [
     scriptCode,
     templateCode,
+    isTemplateOnlyVapor ? `${scriptIdentifier}.__multiRoot = ${isTemplateInlined ? templateMultiRoot : "_sfc_multiRoot"}` : "",
     stylesCode,
     customBlocksCode
   ];
@@ -5985,15 +5991,21 @@ async function transformMain(code, filename, options, pluginContext, ssr, custom
 async function genTemplateCode(descriptor, options, pluginContext, ssr, customElement) {
   const template = descriptor.template;
   const hasScoped = descriptor.styles.some((style) => style.scoped);
-  if ((!template.lang || template.lang === "html") && !template.src) return transformTemplateInMain(template.content, descriptor, options, pluginContext, ssr, customElement);
-  else {
+  const needsMultiRoot = !descriptor.script && !descriptor.scriptSetup && descriptor.vapor;
+  if ((!template.lang || template.lang === "html") && !template.src) {
+    const result = transformTemplateInMain(template.content, descriptor, options, pluginContext, ssr, customElement);
+    return {
+      ...result,
+      multiRoot: needsMultiRoot ? result.multiRoot : void 0
+    };
+  } else {
     if (template.src) await linkSrcToDescriptor(template.src, descriptor, pluginContext, hasScoped);
     const src = template.src || descriptor.filename;
     const query = `?vue&type=template${template.src ? hasScoped ? `&src=${descriptor.id}` : "&src=true" : ""}${hasScoped ? `&scoped=${descriptor.id}` : ``}${attrsToQuery(template.attrs, "js", true)}`;
     const request = JSON.stringify(src + query);
     const renderFnName = ssr ? "ssrRender" : "render";
     return {
-      code: `import { ${renderFnName} as _sfc_${renderFnName} } from ${request}`,
+      code: `import { ${renderFnName} as _sfc_${renderFnName}${needsMultiRoot ? ", multiRoot as _sfc_multiRoot" : ""} } from ${request}`,
       map: void 0
     };
   }
@@ -6254,14 +6266,14 @@ function vuePlugin(rawOptions = {}) {
     resolveId: {
       filter: { id: [exactRegex(EXPORT_HELPER_ID), /[?&]vue\b/] },
       handler(id) {
-        if (id === EXPORT_HELPER_ID) return id;
+        if (id === "\0plugin-vue:export-helper") return id;
         if (parseVueRequest(id).query.vue) return id;
       }
     },
     load: {
       filter: { id: [exactRegex(EXPORT_HELPER_ID), /[?&]vue\b/] },
       handler(id, opt) {
-        if (id === EXPORT_HELPER_ID) return helperCode;
+        if (id === "\0plugin-vue:export-helper") return helperCode;
         const ssr = opt?.ssr === true;
         const { filename, query } = parseVueRequest(id);
         if (query.vue) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forsakringskassan/vite-lib-config",
-  "version": "4.6.3",
+  "version": "4.6.4",
   "description": "Försäkringskassan toolchain to build libraries with Vite",
   "keywords": [
     "vite"