@forsakringskassan/vite-lib-config 5.1.8 → 5.2.0

package/bin/build-vue-lib.mjs

@@ -4,8 +4,9 @@ import { cli } from "../dist/cli.mjs";
 
 const argv = process.argv.slice(2);
 
-/* eslint-disable-next-line unicorn/prefer-top-level-await -- technical debt, this still runs as commonjs */
-cli(argv).catch((err) => {
+try {
+    await cli(argv);
+} catch (err) {
     console.error(err);
     process.exitCode = 1;
-});
+}

package/dist/api-extractor.mjs

@@ -2495,7 +2495,7 @@ import path from "node:path";
 import fs, { promises as fsPromises } from "node:fs";
 import { fileURLToPath } from "node:url";
 
-// node_modules/p-locate/node_modules/yocto-queue/index.js
+// node_modules/yocto-queue/index.js
 var Node = class {
   value;
   next;
@@ -2561,7 +2561,7 @@ var Queue = class {
   }
 };
 
-// node_modules/p-locate/node_modules/p-limit/index.js
+// node_modules/p-limit/index.js
 function pLimit(concurrency) {
   if (!((Number.isInteger(concurrency) || concurrency === Number.POSITIVE_INFINITY) && concurrency > 0)) {
     throw new TypeError("Expected `concurrency` to be a number from 1 and up");
@@ -5842,7 +5842,7 @@ function extractAugmentations(content) {
   const matches = content.matchAll(
     /^declare (?:module\s*"([^"]+)"|global)\s*\{([\s\S]+?)^\}/gm
   );
-  return Array.from(matches).map((it2) => {
+  return Array.from(matches, (it2) => {
     const [withDeclaration, name = "", withoutDeclaration] = it2;
     if (name.startsWith(".")) {
       const exported = withoutDeclaration.replaceAll(
@@ -5850,9 +5850,8 @@ function extractAugmentations(content) {
         "$1export interface"
       );
       return dedent_default(exported);
-    } else {
-      return withDeclaration;
     }
+    return withDeclaration;
   });
 }
 
@@ -5860,10 +5859,9 @@ function extractAugmentations(content) {
 async function getConfigFiles(configFiles) {
   if (configFiles.length > 0) {
     return configFiles.flatMap((it2) => ts(it2));
-  } else {
-    const result = await findUp("api-extractor.json");
-    return result ? [result] : [];
   }
+  const result = await findUp("api-extractor.json");
+  return result ? [result] : [];
 }
 async function findReferencedFiles(filename, visited) {
   if (visited.has(filename)) {
@@ -5917,9 +5915,9 @@ async function patchAugmentations(config) {
     "declaration files referenced by",
     mainEntryPointFilePath
   );
-  const augmentations = await Promise.all(
-    Array.from(files).map(extract)
-  ).then((it2) => it2.flat());
+  const promises = Array.from(files, (it2) => extract(it2));
+  const result = await Promise.all(promises);
+  const augmentations = result.flat();
   console.log("Found", augmentations.length, "module augmentation(s)");
   if (augmentations.length > 0) {
     console.log("Writing", publicTrimmedFilePath);
@@ -5957,7 +5955,6 @@ async function patchDeclareVarVls(declarationDir) {
 }
 async function run(argv) {
   const flags = new Set(argv.filter((it2) => it2.startsWith("--")));
-  const positional = argv.filter((it2) => !it2.startsWith("--"));
   if (flags.has("--help")) {
     console.log("usage: fk-api-extractor [OPTIONS..] [FILENAME..]");
     console.log(`
@@ -5975,6 +5972,7 @@ only.
 `);
     return;
   }
+  const positional = argv.filter((it2) => !it2.startsWith("--"));
   const configFiles = await getConfigFiles(positional);
   const numFiles = configFiles.length;
   const strFiles = `${String(numFiles)} file${numFiles === 1 ? "" : "s"}`;

package/dist/vite.config.cjs

@@ -1701,7 +1701,11 @@ var require_parse = __commonJS({
         }
       }
     };
-    var getStarExtglobSequenceOutput = (pattern) => {
+    var buildCharClassStar = (chars3) => {
+      const source = chars3.length === 1 ? utils.escapeRegex(chars3[0]) : `[${chars3.map((ch) => utils.escapeRegex(ch)).join("")}]`;
+      return `${source}*`;
+    };
+    var getStarExtglobSequenceChars = (pattern) => {
       let index = 0;
       const chars3 = [];
       while (index < pattern.length) {
@@ -1723,8 +1727,7 @@ var require_parse = __commonJS({
       if (chars3.length < 1) {
         return;
       }
-      const source = chars3.length === 1 ? utils.escapeRegex(chars3[0]) : `[${chars3.map((ch) => utils.escapeRegex(ch)).join("")}]`;
-      return `${source}*`;
+      return chars3;
     };
     var repeatedExtglobRecursion = (pattern) => {
       let depth = 0;
@@ -1748,15 +1751,29 @@ var require_parse = __commonJS({
           return { risky: true };
         }
       }
+      const safeChars = [];
+      let sawStarSequence = false;
+      let combinable = true;
       for (const branch of branches) {
-        const safeOutput = getStarExtglobSequenceOutput(branch);
-        if (safeOutput) {
-          return { risky: true, safeOutput };
+        const chars3 = getStarExtglobSequenceChars(branch);
+        if (chars3) {
+          sawStarSequence = true;
+          safeChars.push(...chars3);
+          continue;
+        }
+        const literal = normalizeSimpleBranch(branch);
+        if (literal && literal.length === 1) {
+          safeChars.push(literal);
+          continue;
         }
+        combinable = false;
         if (repeatedExtglobRecursion(branch) > max) {
           return { risky: true };
         }
       }
+      if (sawStarSequence) {
+        return combinable ? { risky: true, safeOutput: buildCharClassStar([...new Set(safeChars)]) } : { risky: true };
+      }
       return { risky: false };
     };
     var parse3 = (input, options) => {
@@ -2606,9 +2623,9 @@ var require_picomatch = __commonJS({
       }
       return { isMatch: Boolean(match), match, output };
     };
-    picomatch.matchBase = (input, glob, options) => {
+    picomatch.matchBase = (input, glob, options, posix = options && options.windows) => {
       const regex = glob instanceof RegExp ? glob : picomatch.makeRe(glob, options);
-      return regex.test(utils.basename(input));
+      return regex.test(utils.basename(input, { windows: posix }));
     };
     picomatch.isMatch = (str, patterns, options) => picomatch(patterns, options)(str);
     picomatch.parse = (pattern, options) => {
@@ -10904,8 +10921,11 @@ function customMappingPlugin() {
       const replacement = folder[format2];
       return {
         ...options,
-        dir: dir?.replace("[custom-format]", replacement),
-        entryFileNames: typeof entryFileNames === "string" ? entryFileNames.replace("[custom-format]", replacement) : entryFileNames
+        dir: dir?.replace("[custom-format]", () => replacement),
+        entryFileNames: typeof entryFileNames === "string" ? entryFileNames.replace(
+          "[custom-format]",
+          () => replacement
+        ) : entryFileNames
       };
     }
   };
@@ -11166,12 +11186,11 @@ ${indent}`);
 // src/utils/pretty-list.ts
 function prettyList(deps, predicate) {
   const filtered = predicate ? deps.filter(predicate) : deps;
-  filtered.sort();
+  filtered.sort((a, b) => a.localeCompare(b));
   if (filtered.length > 0) {
     return ["", ...filtered.map((it2) => `  - ${it2}`)].join("\n");
-  } else {
-    return "(none)";
   }
+  return "(none)";
 }
 
 // src/vite.config.ts

package/dist/vite.config.mjs

@@ -1699,7 +1699,11 @@ var require_parse = __commonJS({
         }
       }
     };
-    var getStarExtglobSequenceOutput = (pattern) => {
+    var buildCharClassStar = (chars3) => {
+      const source = chars3.length === 1 ? utils.escapeRegex(chars3[0]) : `[${chars3.map((ch) => utils.escapeRegex(ch)).join("")}]`;
+      return `${source}*`;
+    };
+    var getStarExtglobSequenceChars = (pattern) => {
       let index = 0;
       const chars3 = [];
       while (index < pattern.length) {
@@ -1721,8 +1725,7 @@ var require_parse = __commonJS({
       if (chars3.length < 1) {
         return;
       }
-      const source = chars3.length === 1 ? utils.escapeRegex(chars3[0]) : `[${chars3.map((ch) => utils.escapeRegex(ch)).join("")}]`;
-      return `${source}*`;
+      return chars3;
     };
     var repeatedExtglobRecursion = (pattern) => {
       let depth = 0;
@@ -1746,15 +1749,29 @@ var require_parse = __commonJS({
           return { risky: true };
         }
       }
+      const safeChars = [];
+      let sawStarSequence = false;
+      let combinable = true;
       for (const branch of branches) {
-        const safeOutput = getStarExtglobSequenceOutput(branch);
-        if (safeOutput) {
-          return { risky: true, safeOutput };
+        const chars3 = getStarExtglobSequenceChars(branch);
+        if (chars3) {
+          sawStarSequence = true;
+          safeChars.push(...chars3);
+          continue;
+        }
+        const literal = normalizeSimpleBranch(branch);
+        if (literal && literal.length === 1) {
+          safeChars.push(literal);
+          continue;
         }
+        combinable = false;
         if (repeatedExtglobRecursion(branch) > max) {
           return { risky: true };
         }
       }
+      if (sawStarSequence) {
+        return combinable ? { risky: true, safeOutput: buildCharClassStar([...new Set(safeChars)]) } : { risky: true };
+      }
       return { risky: false };
     };
     var parse3 = (input, options) => {
@@ -2604,9 +2621,9 @@ var require_picomatch = __commonJS({
       }
       return { isMatch: Boolean(match), match, output };
     };
-    picomatch.matchBase = (input, glob, options) => {
+    picomatch.matchBase = (input, glob, options, posix = options && options.windows) => {
       const regex = glob instanceof RegExp ? glob : picomatch.makeRe(glob, options);
-      return regex.test(utils.basename(input));
+      return regex.test(utils.basename(input, { windows: posix }));
     };
     picomatch.isMatch = (str, patterns, options) => picomatch(patterns, options)(str);
     picomatch.parse = (pattern, options) => {
@@ -10896,8 +10913,11 @@ function customMappingPlugin() {
       const replacement = folder[format2];
       return {
         ...options,
-        dir: dir?.replace("[custom-format]", replacement),
-        entryFileNames: typeof entryFileNames === "string" ? entryFileNames.replace("[custom-format]", replacement) : entryFileNames
+        dir: dir?.replace("[custom-format]", () => replacement),
+        entryFileNames: typeof entryFileNames === "string" ? entryFileNames.replace(
+          "[custom-format]",
+          () => replacement
+        ) : entryFileNames
       };
     }
   };
@@ -11158,12 +11178,11 @@ ${indent}`);
 // src/utils/pretty-list.ts
 function prettyList(deps, predicate) {
   const filtered = predicate ? deps.filter(predicate) : deps;
-  filtered.sort();
+  filtered.sort((a, b) => a.localeCompare(b));
   if (filtered.length > 0) {
     return ["", ...filtered.map((it2) => `  - ${it2}`)].join("\n");
-  } else {
-    return "(none)";
   }
+  return "(none)";
 }
 
 // src/vite.config.ts

package/dist/write-config.mjs

@@ -13,10 +13,10 @@ var __export = (target, all) => {
     __defProp(target, name, { get: all[name], enumerable: true });
 };
 
-// node_modules/p-locate/node_modules/yocto-queue/index.js
+// node_modules/yocto-queue/index.js
 var Node, Queue;
 var init_yocto_queue = __esm({
-  "node_modules/p-locate/node_modules/yocto-queue/index.js"() {
+  "node_modules/yocto-queue/index.js"() {
     Node = class {
       value;
       next;
@@ -84,7 +84,7 @@ var init_yocto_queue = __esm({
   }
 });
 
-// node_modules/p-locate/node_modules/p-limit/index.js
+// node_modules/p-limit/index.js
 function pLimit(concurrency) {
   if (!((Number.isInteger(concurrency) || concurrency === Number.POSITIVE_INFINITY) && concurrency > 0)) {
     throw new TypeError("Expected `concurrency` to be a number from 1 and up");
@@ -135,7 +135,7 @@ function pLimit(concurrency) {
   return generator;
 }
 var init_p_limit = __esm({
-  "node_modules/p-locate/node_modules/p-limit/index.js"() {
+  "node_modules/p-limit/index.js"() {
     init_yocto_queue();
   }
 });
@@ -491,11 +491,11 @@ var boilerplate = `/* This file was generated by @forsakringskassan/vite-lib-con
 function detectTestRunner(flags) {
   if (flags.has("--with-jest")) {
     return "jest";
-  } else if (flags.has("--with-vitest")) {
-    return "vitest";
-  } else {
+  }
+  if (flags.has("--with-vitest")) {
     return "vitest";
   }
+  return "vitest";
 }
 async function serializeJson(data) {
   const { format, resolveConfig } = await import("prettier");
@@ -649,7 +649,7 @@ async function run(cwd, argv) {
   console.log("Test runner:", testRunner);
   console.log();
   const written = /* @__PURE__ */ new Set();
-  for (const [filename, promise] of generated.entries()) {
+  for (const [filename, promise] of generated) {
     const content = await promise;
     if (content) {
       await writeJsonFile(cwd, filename, content);
@@ -658,10 +658,11 @@ async function run(cwd, argv) {
   }
   const entries = await fs3.readdir(cwd);
   for (const entry of entries) {
-    if (isTSConfigFile(entry) && !written.has(entry)) {
-      await fs3.unlink(path3.join(cwd, entry));
-      console.log(entry, "removed");
+    if (!isTSConfigFile(entry) || written.has(entry)) {
+      continue;
     }
+    await fs3.unlink(path3.join(cwd, entry));
+    console.log(entry, "removed");
   }
   console.groupEnd();
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forsakringskassan/vite-lib-config",
-  "version": "5.1.8",
+  "version": "5.2.0",
   "description": "Försäkringskassan toolchain to build libraries with Vite",
   "keywords": [
     "vite"
@@ -60,18 +60,12 @@
     "@fkui/tsconfig": ">= 6.3.0",
     "@forsakringskassan/apimock-express": "^1.1.0 || ^2.0.0 || ^3.0.0",
     "prettier": "^3.0.0",
-    "typescript": "^5.0.2 || ^6.0.2",
+    "typescript": "^5.0.2 || ^6.0.2 || ^7.0.0",
     "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0",
     "vue": "^3.0.0"
   },
   "engines": {
     "node": "^22.12.0 || >= 24",
     "npm": ">= 11.0.0"
-  },
-  "allowScripts": {
-    "core-js": false,
-    "esbuild": true,
-    "fsevents": false,
-    "unrs-resolver": true
   }
 }