@forsakringskassan/vite-lib-config 5.2.0 → 5.3.0

package/dist/vite.config.cjs

@@ -4732,7 +4732,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.7";
+var version = "6.0.8";
 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.");
@@ -4849,6 +4849,18 @@ function createRollupError(id2, error) {
   };
   return rollupError;
 }
+function isVaporMode(descriptor, options) {
+  if (descriptor.vapor) return true;
+  if (options.features?.vapor) return canForceVaporMode(descriptor);
+  return false;
+}
+function canForceVaporMode(descriptor) {
+  if (descriptor.filename.endsWith(".vue")) {
+    if (descriptor.scriptSetup) return true;
+    if (descriptor.script) return false;
+  }
+  return true;
+}
 async function transformTemplateAsModule(code2, filename, descriptor, options, pluginContext, ssr, customElement) {
   const result = compile(code2, filename, descriptor, options, pluginContext, ssr, customElement);
   let returnCode = result.code;
@@ -4923,7 +4935,7 @@ function resolveTemplateCompilerOptions(descriptor, options, filename, ssr) {
   if (lang && /tsx?$/.test(lang) && !expressionPlugins.includes("typescript")) expressionPlugins.push("typescript");
   return {
     ...options.template,
-    vapor: descriptor.vapor,
+    vapor: isVaporMode(descriptor, options),
     id: id2,
     ast: canReuseAST(options.compiler.version) ? descriptor.template?.ast : void 0,
     filename,
@@ -4989,6 +5001,7 @@ function resolveScript(descriptor, options, ssr, customElement) {
     sourceMap: options.sourceMap,
     genDefaultAs: canInlineMain(descriptor, options) ? scriptIdentifier : void 0,
     customElement,
+    vapor: isVaporMode(descriptor, options),
     propsDestructure: options.features?.propsDestructure ?? options.script?.propsDestructure
   });
   if (!options.isProduction && resolved?.deps) {
@@ -5012,8 +5025,8 @@ function canInlineMain(descriptor, options) {
 var comma = ",".charCodeAt(0);
 var semicolon = ";".charCodeAt(0);
 var chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-var intToChar = new Uint8Array(64);
-var charToInt = new Uint8Array(128);
+var intToChar = /* @__PURE__ */ new Uint8Array(64);
+var charToInt = /* @__PURE__ */ new Uint8Array(128);
 for (let i = 0; i < chars.length; i++) {
   const c = chars.charCodeAt(i);
   intToChar[i] = c;
@@ -5624,8 +5637,8 @@ function createDebug$1(namespace, options) {
     options.formatArgs.call(debug2, diff, args);
     debug2.log(...args);
   };
-  debug2.extend = function(namespace$1, delimiter = ":") {
-    return createDebug$1(this.namespace + delimiter + namespace$1, {
+  debug2.extend = function(namespace2, delimiter = ":") {
+    return createDebug$1(this.namespace + delimiter + namespace2, {
       useColors: this.useColors,
       color: this.color,
       formatArgs: this.formatArgs,
@@ -5656,8 +5669,8 @@ function createDebug$1(namespace, options) {
 }
 var names = [];
 var skips = [];
-function enable(namespaces$1) {
-  globalNamespaces = namespaces$1;
+function enable(namespaces) {
+  globalNamespaces = namespaces;
   names = [];
   skips = [];
   const split = globalNamespaces.trim().replace(/\s+/g, ",").split(",").filter(Boolean);
@@ -5764,7 +5777,7 @@ var inspectOpts = Object.keys(process.env).filter((key) => /^debug_/i.test(key))
   else value = Number(value);
   obj[prop] = value;
   return obj;
-}, {});
+}, /* @__PURE__ */ Object.create(null));
 function useColors() {
   return "colors" in inspectOpts ? Boolean(inspectOpts.colors) : (0, import_node_tty.isatty)(process.stderr.fd);
 }
@@ -5773,8 +5786,8 @@ function getDate() {
   return `${(/* @__PURE__ */ new Date()).toISOString()} `;
 }
 function formatArgs(diff, args) {
-  const { namespace: name, useColors: useColors$1 } = this;
-  if (useColors$1) {
+  const { namespace: name, useColors: useColors2 } = this;
+  if (useColors2) {
     const c = this.color;
     const colorCode = `\x1B[3${c < 8 ? c : `8;5;${c}`}`;
     const prefix = `  ${colorCode};1m${name} \x1B[0m`;
@@ -5791,10 +5804,16 @@ var defaultOptions = {
   useColors: useColors(),
   formatArgs,
   formatters: {
+    /**
+    * Map %o to `util.inspect()`, all on a single line.
+    */
     o(v2) {
       this.inspectOpts.colors = this.useColors;
       return (0, import_node_util.inspect)(v2, this.inspectOpts).split("\n").map((str) => str.trim()).join(" ");
     },
+    /**
+    * Map %O to `util.inspect()`, allowing multiple lines if needed.
+    */
     O(v2) {
       this.inspectOpts.colors = this.useColors;
       return (0, import_node_util.inspect)(v2, this.inspectOpts);
@@ -5973,7 +5992,7 @@ async function transformMain(code2, filename, options, pluginContext, ssr, custo
   }
   const attachedProps = [];
   const hasScoped = descriptor.styles.some((s) => s.scoped);
-  const isTemplateOnlyVapor = !descriptor.script && !descriptor.scriptSetup && descriptor.vapor;
+  const isTemplateOnlyVapor = !descriptor.script && !descriptor.scriptSetup && isVaporMode(descriptor, options);
   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;
@@ -6070,7 +6089,7 @@ async function transformMain(code2, filename, options, pluginContext, ssr, custo
 async function genTemplateCode(descriptor, options, pluginContext, ssr, customElement) {
   const template = descriptor.template;
   const hasScoped = descriptor.styles.some((style) => style.scoped);
-  const needsMultiRoot = !descriptor.script && !descriptor.scriptSetup && descriptor.vapor;
+  const needsMultiRoot = !descriptor.script && !descriptor.scriptSetup && isVaporMode(descriptor, options);
   if ((!template.lang || template.lang === "html") && !template.src) {
     const result = transformTemplateInMain(template.content, descriptor, options, pluginContext, ssr, customElement);
     return {
@@ -6090,7 +6109,7 @@ async function genTemplateCode(descriptor, options, pluginContext, ssr, customEl
   }
 }
 async function genScriptCode(descriptor, options, pluginContext, ssr, customElement) {
-  let scriptCode = `const ${scriptIdentifier} = { ${descriptor.vapor ? "__vapor: true" : ""} }`;
+  let scriptCode = `const ${scriptIdentifier} = { ${isVaporMode(descriptor, options) ? "__vapor: true" : ""} }`;
   let map;
   const script = resolveScript(descriptor, options, ssr, customElement);
   if (script) if (canInlineMain(descriptor, options)) {

package/dist/vite.config.mjs

@@ -4724,7 +4724,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.7";
+var version = "6.0.8";
 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.");
@@ -4841,6 +4841,18 @@ function createRollupError(id2, error) {
   };
   return rollupError;
 }
+function isVaporMode(descriptor, options) {
+  if (descriptor.vapor) return true;
+  if (options.features?.vapor) return canForceVaporMode(descriptor);
+  return false;
+}
+function canForceVaporMode(descriptor) {
+  if (descriptor.filename.endsWith(".vue")) {
+    if (descriptor.scriptSetup) return true;
+    if (descriptor.script) return false;
+  }
+  return true;
+}
 async function transformTemplateAsModule(code2, filename, descriptor, options, pluginContext, ssr, customElement) {
   const result = compile(code2, filename, descriptor, options, pluginContext, ssr, customElement);
   let returnCode = result.code;
@@ -4915,7 +4927,7 @@ function resolveTemplateCompilerOptions(descriptor, options, filename, ssr) {
   if (lang && /tsx?$/.test(lang) && !expressionPlugins.includes("typescript")) expressionPlugins.push("typescript");
   return {
     ...options.template,
-    vapor: descriptor.vapor,
+    vapor: isVaporMode(descriptor, options),
     id: id2,
     ast: canReuseAST(options.compiler.version) ? descriptor.template?.ast : void 0,
     filename,
@@ -4981,6 +4993,7 @@ function resolveScript(descriptor, options, ssr, customElement) {
     sourceMap: options.sourceMap,
     genDefaultAs: canInlineMain(descriptor, options) ? scriptIdentifier : void 0,
     customElement,
+    vapor: isVaporMode(descriptor, options),
     propsDestructure: options.features?.propsDestructure ?? options.script?.propsDestructure
   });
   if (!options.isProduction && resolved?.deps) {
@@ -5004,8 +5017,8 @@ function canInlineMain(descriptor, options) {
 var comma = ",".charCodeAt(0);
 var semicolon = ";".charCodeAt(0);
 var chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-var intToChar = new Uint8Array(64);
-var charToInt = new Uint8Array(128);
+var intToChar = /* @__PURE__ */ new Uint8Array(64);
+var charToInt = /* @__PURE__ */ new Uint8Array(128);
 for (let i = 0; i < chars.length; i++) {
   const c = chars.charCodeAt(i);
   intToChar[i] = c;
@@ -5616,8 +5629,8 @@ function createDebug$1(namespace, options) {
     options.formatArgs.call(debug2, diff, args);
     debug2.log(...args);
   };
-  debug2.extend = function(namespace$1, delimiter = ":") {
-    return createDebug$1(this.namespace + delimiter + namespace$1, {
+  debug2.extend = function(namespace2, delimiter = ":") {
+    return createDebug$1(this.namespace + delimiter + namespace2, {
       useColors: this.useColors,
       color: this.color,
       formatArgs: this.formatArgs,
@@ -5648,8 +5661,8 @@ function createDebug$1(namespace, options) {
 }
 var names = [];
 var skips = [];
-function enable(namespaces$1) {
-  globalNamespaces = namespaces$1;
+function enable(namespaces) {
+  globalNamespaces = namespaces;
   names = [];
   skips = [];
   const split = globalNamespaces.trim().replace(/\s+/g, ",").split(",").filter(Boolean);
@@ -5756,7 +5769,7 @@ var inspectOpts = Object.keys(process.env).filter((key) => /^debug_/i.test(key))
   else value = Number(value);
   obj[prop] = value;
   return obj;
-}, {});
+}, /* @__PURE__ */ Object.create(null));
 function useColors() {
   return "colors" in inspectOpts ? Boolean(inspectOpts.colors) : isatty(process.stderr.fd);
 }
@@ -5765,8 +5778,8 @@ function getDate() {
   return `${(/* @__PURE__ */ new Date()).toISOString()} `;
 }
 function formatArgs(diff, args) {
-  const { namespace: name, useColors: useColors$1 } = this;
-  if (useColors$1) {
+  const { namespace: name, useColors: useColors2 } = this;
+  if (useColors2) {
     const c = this.color;
     const colorCode = `\x1B[3${c < 8 ? c : `8;5;${c}`}`;
     const prefix = `  ${colorCode};1m${name} \x1B[0m`;
@@ -5783,10 +5796,16 @@ var defaultOptions = {
   useColors: useColors(),
   formatArgs,
   formatters: {
+    /**
+    * Map %o to `util.inspect()`, all on a single line.
+    */
     o(v2) {
       this.inspectOpts.colors = this.useColors;
       return inspect(v2, this.inspectOpts).split("\n").map((str) => str.trim()).join(" ");
     },
+    /**
+    * Map %O to `util.inspect()`, allowing multiple lines if needed.
+    */
     O(v2) {
       this.inspectOpts.colors = this.useColors;
       return inspect(v2, this.inspectOpts);
@@ -5965,7 +5984,7 @@ async function transformMain(code2, filename, options, pluginContext, ssr, custo
   }
   const attachedProps = [];
   const hasScoped = descriptor.styles.some((s) => s.scoped);
-  const isTemplateOnlyVapor = !descriptor.script && !descriptor.scriptSetup && descriptor.vapor;
+  const isTemplateOnlyVapor = !descriptor.script && !descriptor.scriptSetup && isVaporMode(descriptor, options);
   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;
@@ -6062,7 +6081,7 @@ async function transformMain(code2, filename, options, pluginContext, ssr, custo
 async function genTemplateCode(descriptor, options, pluginContext, ssr, customElement) {
   const template = descriptor.template;
   const hasScoped = descriptor.styles.some((style) => style.scoped);
-  const needsMultiRoot = !descriptor.script && !descriptor.scriptSetup && descriptor.vapor;
+  const needsMultiRoot = !descriptor.script && !descriptor.scriptSetup && isVaporMode(descriptor, options);
   if ((!template.lang || template.lang === "html") && !template.src) {
     const result = transformTemplateInMain(template.content, descriptor, options, pluginContext, ssr, customElement);
     return {
@@ -6082,7 +6101,7 @@ async function genTemplateCode(descriptor, options, pluginContext, ssr, customEl
   }
 }
 async function genScriptCode(descriptor, options, pluginContext, ssr, customElement) {
-  let scriptCode = `const ${scriptIdentifier} = { ${descriptor.vapor ? "__vapor: true" : ""} }`;
+  let scriptCode = `const ${scriptIdentifier} = { ${isVaporMode(descriptor, options) ? "__vapor: true" : ""} }`;
   let map;
   const script = resolveScript(descriptor, options, ssr, customElement);
   if (script) if (canInlineMain(descriptor, options)) {

package/dist/write-config.mjs

@@ -485,8 +485,112 @@ var init_find_up = __esm({
 });
 
 // src/write-config.ts
+import { existsSync } from "node:fs";
 import fs3 from "node:fs/promises";
 import path3 from "node:path";
+import { styleText } from "node:util";
+
+// node_modules/detect-indent/index.js
+var INDENT_REGEX = /^(?:( )+|\t+)/;
+var INDENT_TYPE_SPACE = "space";
+var INDENT_TYPE_TAB = "tab";
+function shouldIgnoreSingleSpace(ignoreSingleSpaces, indentType, value) {
+  return ignoreSingleSpaces && indentType === INDENT_TYPE_SPACE && value === 1;
+}
+function makeIndentsMap(string, ignoreSingleSpaces) {
+  const indents = /* @__PURE__ */ new Map();
+  let previousSize = 0;
+  let previousIndentType;
+  let key;
+  for (const line of string.split(/\n/g)) {
+    if (!line) {
+      continue;
+    }
+    const matches = line.match(INDENT_REGEX);
+    if (matches === null) {
+      previousSize = 0;
+      previousIndentType = "";
+    } else {
+      const indent = matches[0].length;
+      const indentType = matches[1] ? INDENT_TYPE_SPACE : INDENT_TYPE_TAB;
+      if (shouldIgnoreSingleSpace(ignoreSingleSpaces, indentType, indent)) {
+        continue;
+      }
+      if (indentType !== previousIndentType) {
+        previousSize = 0;
+      }
+      previousIndentType = indentType;
+      let use = 1;
+      let weight = 0;
+      const indentDifference = indent - previousSize;
+      previousSize = indent;
+      if (indentDifference === 0) {
+        use = 0;
+        weight = 1;
+      } else {
+        const absoluteIndentDifference = Math.abs(indentDifference);
+        if (shouldIgnoreSingleSpace(ignoreSingleSpaces, indentType, absoluteIndentDifference)) {
+          continue;
+        }
+        key = encodeIndentsKey(indentType, absoluteIndentDifference);
+      }
+      const entry = indents.get(key);
+      indents.set(key, entry === void 0 ? [1, 0] : [entry[0] + use, entry[1] + weight]);
+    }
+  }
+  return indents;
+}
+function encodeIndentsKey(indentType, indentAmount) {
+  const typeCharacter = indentType === INDENT_TYPE_SPACE ? "s" : "t";
+  return typeCharacter + String(indentAmount);
+}
+function decodeIndentsKey(indentsKey) {
+  const keyHasTypeSpace = indentsKey[0] === "s";
+  const type = keyHasTypeSpace ? INDENT_TYPE_SPACE : INDENT_TYPE_TAB;
+  const amount = Number(indentsKey.slice(1));
+  return { type, amount };
+}
+function getMostUsedKey(indents) {
+  let result;
+  let maxUsed = 0;
+  let maxWeight = 0;
+  for (const [key, [usedCount, weight]] of indents) {
+    if (usedCount > maxUsed || usedCount === maxUsed && weight > maxWeight) {
+      maxUsed = usedCount;
+      maxWeight = weight;
+      result = key;
+    }
+  }
+  return result;
+}
+function makeIndentString(type, amount) {
+  const indentCharacter = type === INDENT_TYPE_SPACE ? " " : "	";
+  return indentCharacter.repeat(amount);
+}
+function detectIndent(string) {
+  if (typeof string !== "string") {
+    throw new TypeError("Expected a string");
+  }
+  let indents = makeIndentsMap(string, true);
+  if (indents.size === 0) {
+    indents = makeIndentsMap(string, false);
+  }
+  const keyOfMostUsedIndent = getMostUsedKey(indents);
+  let type;
+  let amount = 0;
+  let indent = "";
+  if (keyOfMostUsedIndent !== void 0) {
+    ({ type, amount } = decodeIndentsKey(keyOfMostUsedIndent));
+    indent = makeIndentString(type, amount);
+  }
+  return {
+    amount,
+    type,
+    indent
+  };
+}
+
+// src/write-config.ts
 var boilerplate = `/* This file was generated by @forsakringskassan/vite-lib-config. Changes may be overwritten! */`;
 function detectTestRunner(flags) {
   if (flags.has("--with-jest")) {
@@ -497,6 +601,11 @@ function detectTestRunner(flags) {
   }
   return "vitest";
 }
+function detectApiExtractor(cwd) {
+  const haveBaseConfig = existsSync(path3.join(cwd, "api-extractor.json"));
+  const haveLibConfig = existsSync(path3.join(cwd, "api-extractor.lib.json"));
+  return haveBaseConfig || haveLibConfig;
+}
 async function serializeJson(data) {
   const { format, resolveConfig } = await import("prettier");
   const content = JSON.stringify(data, null, 4);
@@ -590,15 +699,44 @@ async function generateTsconfigPageobjects(options) {
   };
   return [boilerplate, await serializeJson(config)].join("\n\n");
 }
-async function readJsonFile(filePath) {
+async function readJsonFile(cwd, filename) {
+  const filePath = path3.join(cwd, filename);
   const content = await fs3.readFile(filePath, "utf8");
-  return JSON.parse(content);
+  const data = JSON.parse(content);
+  const { indent } = detectIndent(content);
+  return { data, indent };
 }
 async function writeJsonFile(cwd, filename, content) {
   const filePath = path3.join(cwd, filename);
   await fs3.writeFile(filePath, content, "utf8");
   console.log(filename, "written");
 }
+function updateBuildScripts(pkg, options) {
+  const result = { ...pkg, scripts: { ...pkg.scripts } };
+  result.scripts.build = [
+    "run-s",
+    "build:lib",
+    options.enableSelectors ? "build:selectors" : null,
+    "build:dts",
+    options.enableApiExtractor ? "build:api" : null
+  ].filter(Boolean).join(" ");
+  result.scripts["build:api"] = options.enableApiExtractor ? "fk-api-extractor api-extractor.*.json" : void 0;
+  result.scripts["build:dts"] = "vue-tsc -b";
+  result.scripts["build:lib"] = "fk-build-vue-lib";
+  result.scripts["build:selectors"] = options.enableSelectors ? "fk-build-selectors" : void 0;
+  delete result.scripts["build:pageobject"];
+  return result;
+}
+async function writeBuildScripts(cwd, options) {
+  const result = await readJsonFile(cwd, "package.json");
+  const { data: pkg, indent } = result;
+  const updated = JSON.stringify(
+    updateBuildScripts(pkg, options),
+    void 0,
+    indent
+  );
+  await writeJsonFile(cwd, "package.json", updated);
+}
 async function findCypressConfigPath(cwd) {
   const { findUp: findUp2 } = await Promise.resolve().then(() => (init_find_up(), find_up_exports));
   const absolutePath = await findUp2("cypress/tsconfig.json", { cwd });
@@ -610,6 +748,9 @@ async function findCypressConfigPath(cwd) {
 function isTSConfigFile(filename) {
   return filename.startsWith("tsconfig.") && filename.endsWith(".json");
 }
+function flagEnabled(value) {
+  return value ? styleText("green", "enabled") : styleText("red", "disabled");
+}
 async function run(cwd, argv) {
   const flags = new Set(argv.filter((it) => it.startsWith("--")));
   if (flags.has("--help")) {
@@ -621,7 +762,7 @@ async function run(cwd, argv) {
 `);
     return;
   }
-  const pkg = await readJsonFile(path3.join(cwd, "package.json"));
+  const { data: pkg } = await readJsonFile(cwd, "package.json");
   if (!pkg.devDependencies?.["@forsakringskassan/vite-lib-config"]) {
     console.error(
       `The "${pkg.name}" does not use "@forsakringskassan/vite-lib-config".`
@@ -631,10 +772,12 @@ async function run(cwd, argv) {
   }
   const cypressConfigPath = await findCypressConfigPath(cwd);
   const testRunner = detectTestRunner(flags);
+  const enableApiExtractor = detectApiExtractor(cwd);
   const options = {
     name: pkg.name,
     cypressConfigPath,
     testRunner,
+    enableApiExtractor,
     enablePageobjects: Boolean(pkg.exports?.["./cypress"]),
     enableSelectors: Boolean(pkg.exports?.["./selectors"])
   };
@@ -646,7 +789,7 @@ async function run(cwd, argv) {
     ["tsconfig.pageobjects.json", generateTsconfigPageobjects(options)]
   ]);
   console.group("Writing TypeScript configuration");
-  console.log("Test runner:", testRunner);
+  console.log("Test runner:", styleText("cyan", testRunner));
   console.log();
   const written = /* @__PURE__ */ new Set();
   for (const [filename, promise] of generated) {
@@ -665,6 +808,14 @@ async function run(cwd, argv) {
     console.log(entry, "removed");
   }
   console.groupEnd();
+  console.log();
+  console.group("Writing package.json scripts");
+  console.log("API Extractor:", flagEnabled(options.enableApiExtractor));
+  console.log("Selector objects:", flagEnabled(options.enableSelectors));
+  console.log();
+  await writeBuildScripts(cwd, options);
+  console.groupEnd();
+  console.log();
 }
 export {
   generateTsconfig,
@@ -672,5 +823,6 @@ export {
   generateTsconfigLib,
   generateTsconfigPageobjects,
   generateTsconfigSelectors,
-  run
+  run,
+  updateBuildScripts
 };

package/package.json

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