@forsakringskassan/vite-lib-config 4.3.7 → 4.4.0

package/bin/api-extractor.js

@@ -3,6 +3,8 @@
 const { run } = require("../dist/api-extractor");
 
 const argv = process.argv.slice(2);
+
+/* eslint-disable-next-line unicorn/prefer-top-level-await -- technical debt, this still runs as commonjs */
 run(argv).catch((err) => {
     console.error(err);
     process.exitCode = 1;

package/bin/build-vue-lib.mjs

@@ -3,6 +3,8 @@
 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) => {
     console.error(err);
     process.exitCode = 1;

package/dist/api-extractor.js

@@ -39,6 +39,11 @@ var require_vendors = __commonJS({
         env: "AGOLA_GIT_REF",
         pr: "AGOLA_PULL_REQUEST_ID"
       },
+      {
+        name: "Alpic",
+        constant: "ALPIC",
+        env: "ALPIC_HOST"
+      },
       {
         name: "Appcircle",
         constant: "APPCIRCLE",
@@ -119,6 +124,16 @@ var require_vendors = __commonJS({
         env: "CIRRUS_CI",
         pr: "CIRRUS_PR"
       },
+      {
+        name: "Cloudflare Pages",
+        constant: "CLOUDFLARE_PAGES",
+        env: "CF_PAGES"
+      },
+      {
+        name: "Cloudflare Workers",
+        constant: "CLOUDFLARE_WORKERS",
+        env: "WORKERS_CI"
+      },
       {
         name: "Codefresh",
         constant: "CODEFRESH",
@@ -397,23 +412,25 @@ var require_ci_info = __commonJS({
     exports2.name = null;
     exports2.isPR = null;
     exports2.id = null;
-    vendors.forEach(function(vendor) {
-      const envs = Array.isArray(vendor.env) ? vendor.env : [vendor.env];
-      const isCI2 = envs.every(function(obj) {
-        return checkEnv(obj);
+    if (env.CI !== "false") {
+      vendors.forEach(function(vendor) {
+        const envs = Array.isArray(vendor.env) ? vendor.env : [vendor.env];
+        const isCI2 = envs.every(function(obj) {
+          return checkEnv(obj);
+        });
+        exports2[vendor.constant] = isCI2;
+        if (!isCI2) {
+          return;
+        }
+        exports2.name = vendor.name;
+        exports2.isPR = checkPR(vendor);
+        exports2.id = vendor.constant;
       });
-      exports2[vendor.constant] = isCI2;
-      if (!isCI2) {
-        return;
-      }
-      exports2.name = vendor.name;
-      exports2.isPR = checkPR(vendor);
-      exports2.id = vendor.constant;
-    });
+    }
     exports2.isCI = !!(env.CI !== "false" && // Bypass all checks if CI env is explicitly set to 'false'
     (env.BUILD_ID || // Jenkins, Cloudbees
     env.BUILD_NUMBER || // Jenkins, TeamCity
-    env.CI || // Travis CI, CircleCI, Cirrus CI, Gitlab CI, Appveyor, CodeShip, dsari
+    env.CI || // Travis CI, CircleCI, Cirrus CI, Gitlab CI, Appveyor, CodeShip, dsari, Cloudflare Pages/Workers
     env.CI_APP_ID || // Appflow
     env.CI_BUILD_ID || // Appflow
     env.CI_BUILD_NUMBER || // Appflow
@@ -2453,8 +2470,17 @@ var Queue = class {
     }
     this.#head = this.#head.next;
     this.#size--;
+    if (!this.#head) {
+      this.#tail = void 0;
+    }
     return current.value;
   }
+  peek() {
+    if (!this.#head) {
+      return;
+    }
+    return this.#head.value;
+  }
   clear() {
     this.#head = void 0;
     this.#tail = void 0;
@@ -2470,6 +2496,11 @@ var Queue = class {
       current = current.next;
     }
   }
+  *drain() {
+    while (this.#head) {
+      yield this.dequeue();
+    }
+  }
 };
 
 // node_modules/p-locate/node_modules/p-limit/index.js
@@ -5756,7 +5787,7 @@ function extractAugmentations(content) {
   return Array.from(matches).map((it2) => {
     const [withDeclaration, name = "", withoutDeclaration] = it2;
     if (name.startsWith(".")) {
-      const exported = withoutDeclaration.replace(
+      const exported = withoutDeclaration.replaceAll(
         /^(\s*)interface/g,
         "$1export interface"
       );
@@ -5770,7 +5801,7 @@ function extractAugmentations(content) {
 // src/api-extractor.ts
 async function getConfigFiles(configFiles) {
   if (configFiles.length > 0) {
-    return configFiles.map((it2) => ts(it2)).flat();
+    return configFiles.flatMap((it2) => ts(it2));
   } else {
     const result = await findUp("api-extractor.json");
     return result ? [result] : [];
@@ -5781,7 +5812,7 @@ async function findReferencedFiles(filename, visited) {
     return;
   }
   visited.add(filename);
-  const content = await import_promises2.default.readFile(filename, "utf-8");
+  const content = await import_promises2.default.readFile(filename, "utf8");
   const matches = content.matchAll(/^(?:import|export)[^"]*"([^"]+)";?$/gm);
   for (const match of Array.from(matches)) {
     const modname = match[1];
@@ -5810,13 +5841,13 @@ async function patchAugmentations(config) {
     return;
   }
   async function extract(filename) {
-    const content = await import_promises2.default.readFile(filename, "utf-8");
+    const content = await import_promises2.default.readFile(filename, "utf8");
     return extractAugmentations(content);
   }
   async function patch(filename, augmentations2) {
-    const content = await import_promises2.default.readFile(filename, "utf-8");
+    const content = await import_promises2.default.readFile(filename, "utf8");
     const patched = [content, ...augmentations2].join("\n\n");
-    await import_promises2.default.writeFile(filename, patched, "utf-8");
+    await import_promises2.default.writeFile(filename, patched, "utf8");
   }
   console.log();
   console.group("Patching module augmentations");
@@ -5848,13 +5879,13 @@ async function patchDeclareVarVls(declarationDir) {
   const filenames = await Ze("**/*.vue.d.ts", { cwd: declarationDir });
   const promises = filenames.map(async (filename) => {
     const filePath = import_node_path4.default.join(declarationDir, filename);
-    const content = await import_promises2.default.readFile(filePath, "utf-8");
+    const content = await import_promises2.default.readFile(filePath, "utf8");
     const updated = content.replace(
       /declare var (__VLS_\d+)/,
       "declare const $1"
     );
     if (content !== updated) {
-      await import_promises2.default.writeFile(filePath, updated, "utf-8");
+      await import_promises2.default.writeFile(filePath, updated, "utf8");
       numPatchedFiles++;
       console.log(filename);
     }
@@ -5867,9 +5898,9 @@ async function patchDeclareVarVls(declarationDir) {
   );
 }
 async function run(argv) {
-  const flags = argv.filter((it2) => it2.startsWith("--"));
+  const flags = new Set(argv.filter((it2) => it2.startsWith("--")));
   const positional = argv.filter((it2) => !it2.startsWith("--"));
-  if (flags.includes("--help")) {
+  if (flags.has("--help")) {
     console.log("usage: fk-api-extractor [OPTIONS..] [FILENAME..]");
     console.log(`
   --help                     Show this help.
@@ -5898,7 +5929,7 @@ only.
   }
   console.groupEnd();
   console.log();
-  if (flags.includes("--patch-declare-var-vls")) {
+  if (flags.has("--patch-declare-var-vls")) {
     await patchDeclareVarVls("temp/types");
   }
   for (const filePath of configFiles) {
@@ -5919,7 +5950,7 @@ only.
       );
       process.exitCode = 1;
     }
-    if (flags.includes("--patch-augmentations")) {
+    if (flags.has("--patch-augmentations")) {
       await patchAugmentations(config);
     }
   }

package/dist/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.57.6"
+      "packageVersion": "7.57.7"
     }
   ]
 }

package/dist/vite.config.cjs

@@ -2908,7 +2908,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.4";
+var version = "6.0.5";
 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.");
@@ -7594,19 +7594,17 @@ var folder = {
 function customMappingPlugin() {
   return {
     name: "fk:custom-mapping",
-    renderStart(options) {
-      const { format } = options;
+    outputOptions(options) {
+      const { format, dir, entryFileNames } = options;
       if (format !== "es" && format !== "cjs") {
         return;
       }
       const replacement = folder[format];
-      options.dir = options.dir?.replace("[custom-format]", replacement);
-      if (typeof options.entryFileNames === "string") {
-        options.entryFileNames = options.entryFileNames.replace(
-          "[custom-format]",
-          replacement
-        );
-      }
+      return {
+        ...options,
+        dir: dir?.replace("[custom-format]", replacement),
+        entryFileNames: typeof entryFileNames === "string" ? entryFileNames.replace("[custom-format]", replacement) : entryFileNames
+      };
     }
   };
 }
@@ -7615,7 +7613,7 @@ function customMappingPlugin() {
 var import_promises2 = __toESM(require("node:fs/promises"));
 var import_node_path3 = __toESM(require("node:path"));
 
-// src/utils/lookupFile.ts
+// src/utils/lookup-file.ts
 var import_node_fs2 = __toESM(require("node:fs"));
 var extensions = ["ts", "mts", "mjs", "js"];
 function lookupFile(nameWithoutExtension) {
@@ -7680,10 +7678,14 @@ function indexHtmlPlugin() {
     transformIndexHtml: {
       order: "pre",
       async handler() {
-        const content = await import_promises2.default.readFile(templateFile, "utf-8");
-        return content.replace(/{{([^}]+)}}/g, (match, key) => {
-          return templateData[key.trim()] ?? match;
-        });
+        const content = await import_promises2.default.readFile(templateFile, "utf8");
+        return content.replaceAll(
+          /* eslint-disable-next-line sonarjs/slow-regex -- technical debt */
+          /{{([^}]+)}}/g,
+          (match, key) => {
+            return templateData[key.trim()] ?? match;
+          }
+        );
       }
     },
     config(config) {
@@ -7725,7 +7727,7 @@ function packageJsonPlugin() {
 // src/utils/read-json-file.ts
 var import_node_fs3 = __toESM(require("node:fs"));
 function readJsonFile(filename) {
-  return JSON.parse(import_node_fs3.default.readFileSync(filename, "utf-8"));
+  return JSON.parse(import_node_fs3.default.readFileSync(filename, "utf8"));
 }
 
 // src/utils/detect-vue-major.ts
@@ -7944,7 +7946,9 @@ var packageJson = readJsonFile("package.json");
 var dependencies = Object.keys(packageJson.dependencies ?? {});
 var peerDependencies = Object.keys(packageJson.peerDependencies ?? {});
 var externalDependencies = packageJson.externalDependencies;
-var allDependencies = [...dependencies, ...peerDependencies].sort();
+var allDependencies = [...dependencies, ...peerDependencies].toSorted(
+  (a, b) => a.localeCompare(b)
+);
 var external = /* @__PURE__ */ new Set([
   ...externalDependencies ?? dependencies,
   ...peerDependencies
@@ -8016,7 +8020,8 @@ async function defineConfig(config = {}) {
     result = defaultConfig;
   }
   const { build } = result;
-  const external2 = build?.rollupOptions?.external;
+  const external2 = build?.rolldownOptions?.external ?? /* eslint-disable-next-line @typescript-eslint/no-deprecated -- for backwards compatibility */
+  build?.rollupOptions?.external ?? [];
   console.group(import_picocolors.default.bold("Configuration:"));
   console.log(
     "Internal dependencies:",

package/dist/vite.config.mjs

@@ -2898,7 +2898,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.4";
+var version = "6.0.5";
 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.");
@@ -7584,19 +7584,17 @@ var folder = {
 function customMappingPlugin() {
   return {
     name: "fk:custom-mapping",
-    renderStart(options) {
-      const { format } = options;
+    outputOptions(options) {
+      const { format, dir, entryFileNames } = options;
       if (format !== "es" && format !== "cjs") {
         return;
       }
       const replacement = folder[format];
-      options.dir = options.dir?.replace("[custom-format]", replacement);
-      if (typeof options.entryFileNames === "string") {
-        options.entryFileNames = options.entryFileNames.replace(
-          "[custom-format]",
-          replacement
-        );
-      }
+      return {
+        ...options,
+        dir: dir?.replace("[custom-format]", replacement),
+        entryFileNames: typeof entryFileNames === "string" ? entryFileNames.replace("[custom-format]", replacement) : entryFileNames
+      };
     }
   };
 }
@@ -7605,7 +7603,7 @@ function customMappingPlugin() {
 import fs4 from "node:fs/promises";
 import path2 from "node:path";
 
-// src/utils/lookupFile.ts
+// src/utils/lookup-file.ts
 import fs3 from "node:fs";
 var extensions = ["ts", "mts", "mjs", "js"];
 function lookupFile(nameWithoutExtension) {
@@ -7670,10 +7668,14 @@ function indexHtmlPlugin() {
     transformIndexHtml: {
       order: "pre",
       async handler() {
-        const content = await fs4.readFile(templateFile, "utf-8");
-        return content.replace(/{{([^}]+)}}/g, (match, key) => {
-          return templateData[key.trim()] ?? match;
-        });
+        const content = await fs4.readFile(templateFile, "utf8");
+        return content.replaceAll(
+          /* eslint-disable-next-line sonarjs/slow-regex -- technical debt */
+          /{{([^}]+)}}/g,
+          (match, key) => {
+            return templateData[key.trim()] ?? match;
+          }
+        );
       }
     },
     config(config) {
@@ -7715,7 +7717,7 @@ function packageJsonPlugin() {
 // src/utils/read-json-file.ts
 import fs5 from "node:fs";
 function readJsonFile(filename) {
-  return JSON.parse(fs5.readFileSync(filename, "utf-8"));
+  return JSON.parse(fs5.readFileSync(filename, "utf8"));
 }
 
 // src/utils/detect-vue-major.ts
@@ -7936,7 +7938,9 @@ var packageJson = readJsonFile("package.json");
 var dependencies = Object.keys(packageJson.dependencies ?? {});
 var peerDependencies = Object.keys(packageJson.peerDependencies ?? {});
 var externalDependencies = packageJson.externalDependencies;
-var allDependencies = [...dependencies, ...peerDependencies].sort();
+var allDependencies = [...dependencies, ...peerDependencies].toSorted(
+  (a, b) => a.localeCompare(b)
+);
 var external = /* @__PURE__ */ new Set([
   ...externalDependencies ?? dependencies,
   ...peerDependencies
@@ -8008,7 +8012,8 @@ async function defineConfig(config = {}) {
     result = defaultConfig;
   }
   const { build } = result;
-  const external2 = build?.rollupOptions?.external;
+  const external2 = build?.rolldownOptions?.external ?? /* eslint-disable-next-line @typescript-eslint/no-deprecated -- for backwards compatibility */
+  build?.rollupOptions?.external ?? [];
   console.group(import_picocolors.default.bold("Configuration:"));
   console.log(
     "Internal dependencies:",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forsakringskassan/vite-lib-config",
-  "version": "4.3.7",
+  "version": "4.4.0",
   "description": "Försäkringskassan toolchain to build libraries with Vite",
   "keywords": [
     "vite"
@@ -42,7 +42,7 @@
     "dist"
   ],
   "dependencies": {
-    "@microsoft/api-extractor": "7.57.6",
+    "@microsoft/api-extractor": "7.57.7",
     "@vue/babel-preset-app": "5.0.9"
   },
   "peerDependencies": {
@@ -50,7 +50,7 @@
     "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.0",
     "@forsakringskassan/apimock-express": "^1.1.0 || ^2.0.0",
     "typescript": "^5.0.2",
-    "vite": "^5.0.0 || ^6.0.0 || ^7.0.0",
+    "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0",
     "vue": "^3.0.0"
   },
   "engines": {