@flareapp/vite 1.2.1 → 2.1.0

package/.oxlintrc.json

@@ -0,0 +1,7 @@
+{
+    "$schema": "../../node_modules/oxlint/configuration_schema.json",
+    "extends": ["../../.oxlintrc.json"],
+    "env": {
+        "node": true
+    }
+}

package/CHANGELOG.md

@@ -0,0 +1,22 @@
+## 2.0.0
+
+### Breaking changes
+
+- Renamed plugin function: `flareSourcemapUploader` -> `flareSourcemaps` (default export unchanged).
+- Renamed option: `key` -> `apiKey`.
+- Renamed type: `PluginConfig` -> `FlareVitePluginOptions`.
+- Renamed `Sourcemap` fields: `original_file` -> `originalFile`, `sourcemap_url` -> `sourcemapPath`.
+- Removed `fast-glob` dependency. Sourcemap discovery now uses Rollup's `bundle` parameter.
+- Replaced hand-rolled UUID with `crypto.randomUUID()`. Requires Node >= 18.
+- HTTP 429/5xx responses are now retried with exponential backoff. Non-retriable HTTP errors (4xx) throw immediately.
+- Failed uploads no longer abort remaining uploads (`Promise.allSettled` replaces `Promise.all`).
+- Sourcemaps are only deleted when `removeSourcemaps` is true AND the upload succeeded.
+
+### New
+
+- `enforce: 'post'` ensures the plugin runs after all other plugins.
+- Uses Vite's logger instead of bare `console.log`/`console.error`.
+- `define` values use `JSON.stringify` (fixes injection vulnerability with special characters in keys/versions).
+- Upload enable/disable now uses Vite's `mode` parameter instead of `process.env.NODE_ENV`.
+- `SKIP_SOURCEMAPS=true` env var disables uploads (useful for CI matrix jobs).
+- Added `engines: { node: ">=18" }` to package.json.

package/README.md

@@ -1,64 +1,36 @@
-# Vite plugin for sending sourcemaps to Flare
+# @flareapp/vite
 
-The Flare Vite plugin helps you send sourcemaps of your compiled JavaScript code to Flare. This way, reports sent using the `@flareapp/js` will be formatted correctly.
+Vite build plugin for [Flare](https://flareapp.io) that uploads sourcemaps after each build. With sourcemaps, error reports sent by `@flareapp/js` will show the original source code instead of minified output.
 
-Additionally, it automatically passes the Flare API key to `@flareapp/js`. This way, `flare.light()` works without any additional configuration.
-
-Check the JavaScript error tracking section in [the Flare documentation](https://flareapp.io/docs/javascript-error-tracking/installation) for more information.
+The plugin also injects the Flare API key and a sourcemap version identifier into your build, so `flare.light()` works without any additional configuration.
 
 ## Installation
 
-Install the plugin using NPM or Yarn:
-
 ```bash
-yarn add @flareapp/vite
-# or
 npm install @flareapp/vite
 ```
-Next, add the plugin to your `vite.config.js` file:
 
-```js
+## Quick start
+
+Add the plugin to your `vite.config.ts`:
+
+```ts
 import { defineConfig } from 'vite';
-import flareSourcemapUploader from '@flareapp/vite';
+import flareSourcemaps from '@flareapp/vite';
 
 export default defineConfig({
     plugins: [
-        flareSourcemapUploader({
-            key: 'YOUR API KEY HERE'
+        flareSourcemaps({
+            apiKey: 'YOUR_FLARE_API_KEY',
         }),
     ],
 });
 ```
 
-Run the `vite build` command to make sure the sourcemaps are generated. You should see the following lines in the output:
-
-```bash
-@flareapp/flare-vite-plugin-sourcemaps: Uploading 12 sourcemap files to Flare.
-@flareapp/flare-vite-plugin-sourcemaps: Successfully uploaded sourcemaps to Flare.
-```
-
-## Configuration
-
-- `key: string` **(required)**: the Flare API key 
-- `base: string`: the base path of built output (defaults to Vite's base path)
-- `runInDevelopment: boolean`: whether to upload sourcemaps when `NODE_ENV=development` or when running the dev server (defaults to `false`)
-- `version: string`: the sourcemap version (defaults to a fresh `uuid` per build)
-- `removeSourcemaps: boolean`: whether to remove the sourcemaps after uploading them (defaults to `false`). Comes in handy when you want to upload sourcemaps to Flare but don't want them published in your build.
-
-## development
-
-Publish a new release: 
-
-```bash
-npm version patch
-npm publish
-```
+## Documentation
 
-Tag the release:
+Full documentation on configuration options, sourcemap resolution, and more is available at [flareapp.io/docs/javascript/general/resolving-bundled-code](https://flareapp.io/docs/javascript/general/resolving-bundled-code).
 
-<pre>
-git tag <var>VERSION</var>
-git push origin <var>VERSION</var>
-</pre>
+## License
 
-Replace <var>VERSION</var> with `v` + the version from `package.json` — for example, `v1.0.2` 
+The MIT License (MIT). Please see [License File](../../LICENSE.md) for more information.

package/dist/index.cjs

@@ -0,0 +1,146 @@
+let node_crypto = require("node:crypto");
+let node_fs = require("node:fs");
+let node_path = require("node:path");
+let node_zlib = require("node:zlib");
+
+//#region ../flare-api/dist/index.mjs
+var FlareApiError = class extends Error {
+	constructor(message) {
+		super(message);
+		this.name = "FlareApiError";
+	}
+};
+const RETRIABLE_STATUS_CODES = new Set([
+	429,
+	502,
+	503,
+	504
+]);
+var FlareApi = class {
+	constructor(endpoint, key, version) {
+		this.endpoint = endpoint;
+		this.key = key;
+		this.version = version;
+	}
+	uploadSourcemap(sourcemap) {
+		const base64GzipSourcemap = (0, node_zlib.deflateRawSync)(sourcemap.content).toString("base64");
+		return this.postWithRetry({
+			key: this.key,
+			version_id: this.version,
+			relative_filename: sourcemap.originalFile,
+			sourcemap: base64GzipSourcemap
+		});
+	}
+	async postWithRetry(data, maxRetries = 3) {
+		for (let attempt = 1; attempt <= maxRetries; attempt++) {
+			try {
+				const response = await fetch(this.endpoint, {
+					method: "POST",
+					headers: { "Content-Type": "application/json" },
+					body: JSON.stringify(data)
+				});
+				if (response.ok) return;
+				if (!RETRIABLE_STATUS_CODES.has(response.status)) {
+					const body = await response.text();
+					throw new FlareApiError(`Flare API returned ${response.status}: ${body}`);
+				}
+				if (attempt === maxRetries) throw new FlareApiError(`Flare API returned ${response.status} after ${maxRetries} attempts`);
+			} catch (error) {
+				if (error instanceof FlareApiError) throw error;
+				if (attempt === maxRetries) {
+					const message = error instanceof Error ? error.message : String(error);
+					throw new Error(`Network error after ${maxRetries} attempts: ${message}`, { cause: error });
+				}
+			}
+			await this.delay(Math.pow(2, attempt - 1) * 1e3);
+		}
+	}
+	delay(ms) {
+		return new Promise((resolve) => setTimeout(resolve, ms));
+	}
+};
+
+//#endregion
+//#region src/index.ts
+function flareSourcemaps({ apiKey, base, apiEndpoint = "https://flareapp.io/api/sourcemaps", runInDevelopment = false, version = (0, node_crypto.randomUUID)(), removeSourcemaps = false }) {
+	let logger = null;
+	let resolvedBase = base ?? "/";
+	let enableUpload = false;
+	let isSsrBuild = false;
+	const flare = new FlareApi(apiEndpoint, apiKey, version);
+	function log(message, isError = false) {
+		const formatted = `@flareapp/vite: ${message}`;
+		if (isError) if (logger) logger.error(formatted);
+		else console.error(formatted);
+		else if (logger) logger.info(formatted);
+		else console.log(formatted);
+	}
+	if (!apiKey) console.warn("@flareapp/vite: No Flare API key provided, sourcemap upload disabled.");
+	return {
+		name: "flare-vite-plugin",
+		apply: "build",
+		enforce: "post",
+		config(_userConfig, { mode }) {
+			enableUpload = !!apiKey && (mode !== "development" || runInDevelopment) && process.env.SKIP_SOURCEMAPS !== "true";
+			return {
+				define: {
+					FLARE_SOURCEMAP_VERSION: JSON.stringify(version),
+					FLARE_JS_KEY: JSON.stringify(apiKey)
+				},
+				build: { sourcemap: enableUpload ? "hidden" : void 0 }
+			};
+		},
+		configResolved(config) {
+			logger = config.logger;
+			isSsrBuild = !!config.build?.ssr;
+			if (!base) resolvedBase = config.base;
+			if (!resolvedBase.endsWith("/")) resolvedBase += "/";
+		},
+		async writeBundle(outputOptions, bundle) {
+			if (!enableUpload) return;
+			const outputDir = outputOptions.dir || "";
+			const sourcemaps = [];
+			for (const fileName of Object.keys(bundle)) {
+				if (!fileName.endsWith(".map")) continue;
+				const sourceFileName = fileName.replace(/\.map$/, "");
+				if (!(0, node_fs.existsSync)((0, node_path.resolve)(outputDir, sourceFileName))) {
+					log(`No corresponding source found for "${fileName}"`, true);
+					continue;
+				}
+				const sourcemapPath = (0, node_path.resolve)(outputDir, fileName);
+				try {
+					const originalFile = isSsrBuild ? sourceFileName : `${resolvedBase}${sourceFileName}`;
+					sourcemaps.push({
+						content: (0, node_fs.readFileSync)(sourcemapPath, "utf8"),
+						sourcemapPath,
+						originalFile
+					});
+				} catch (error) {
+					log(`Error reading sourcemap ${sourcemapPath}: ${error}`, true);
+				}
+			}
+			if (!sourcemaps.length) return;
+			log(`Uploading ${sourcemaps.length} sourcemap(s) to Flare.`);
+			const results = await Promise.allSettled(sourcemaps.map((sourcemap) => flare.uploadSourcemap(sourcemap)));
+			const failed = results.filter((r) => r.status === "rejected");
+			if (failed.length > 0) {
+				for (const result of failed) log(`Upload failed: ${result.reason}`, true);
+				log(`${failed.length}/${sourcemaps.length} sourcemap upload(s) failed.`, true);
+			} else log("Successfully uploaded all sourcemaps to Flare.");
+			if (removeSourcemaps) {
+				for (let i = 0; i < sourcemaps.length; i++) {
+					if (results[i].status === "rejected") continue;
+					try {
+						(0, node_fs.unlinkSync)(sourcemaps[i].sourcemapPath);
+					} catch (error) {
+						log(`Error removing ${sourcemaps[i].sourcemapPath}: ${error}`, true);
+					}
+				}
+				log("Removed sourcemap files from build output.");
+			}
+		}
+	};
+}
+
+//#endregion
+module.exports = flareSourcemaps;

package/dist/index.d.cts

@@ -0,0 +1,28 @@
+import { Plugin } from "vite";
+
+//#region src/types.d.ts
+type FlareVitePluginOptions = {
+  apiKey: string;
+  base?: string;
+  apiEndpoint?: string;
+  runInDevelopment?: boolean;
+  version?: string;
+  removeSourcemaps?: boolean;
+};
+type Sourcemap = {
+  originalFile: string;
+  content: string;
+  sourcemapPath: string;
+};
+//#endregion
+//#region src/index.d.ts
+declare function flareSourcemaps({
+  apiKey,
+  base,
+  apiEndpoint,
+  runInDevelopment,
+  version,
+  removeSourcemaps
+}: FlareVitePluginOptions): Plugin;
+//#endregion
+export { type FlareVitePluginOptions, type Sourcemap, flareSourcemaps as default };

package/dist/index.d.mts

@@ -1,18 +1,28 @@
-import { Plugin } from 'vite';
+import { Plugin } from "vite";
 
-type PluginConfig = {
-    key: string;
-    base?: string;
-    apiEndpoint?: string;
-    runInDevelopment?: boolean;
-    version?: string;
-    removeSourcemaps?: boolean;
+//#region src/types.d.ts
+type FlareVitePluginOptions = {
+  apiKey: string;
+  base?: string;
+  apiEndpoint?: string;
+  runInDevelopment?: boolean;
+  version?: string;
+  removeSourcemaps?: boolean;
 };
 type Sourcemap = {
-    original_file: string;
-    content: string;
-    sourcemap_url: string;
+  originalFile: string;
+  content: string;
+  sourcemapPath: string;
 };
-declare function flareSourcemapUploader({ key, base, apiEndpoint, runInDevelopment, version, removeSourcemaps, }: PluginConfig): Plugin;
-
-export { type PluginConfig, type Sourcemap, flareSourcemapUploader as default };
+//#endregion
+//#region src/index.d.ts
+declare function flareSourcemaps({
+  apiKey,
+  base,
+  apiEndpoint,
+  runInDevelopment,
+  version,
+  removeSourcemaps
+}: FlareVitePluginOptions): Plugin;
+//#endregion
+export { type FlareVitePluginOptions, type Sourcemap, flareSourcemaps as default };

package/dist/index.mjs

@@ -1,138 +1,146 @@
-// src/index.ts
-import glob from "fast-glob";
-import { existsSync, readFileSync, unlinkSync } from "fs";
-import { resolve } from "path";
+import { randomUUID } from "node:crypto";
+import { existsSync, readFileSync, unlinkSync } from "node:fs";
+import { resolve } from "node:path";
+import { deflateRawSync } from "node:zlib";
 
-// src/flareApi.ts
-import axios from "axios";
-import { deflateRawSync } from "zlib";
+//#region ../flare-api/dist/index.mjs
+var FlareApiError = class extends Error {
+	constructor(message) {
+		super(message);
+		this.name = "FlareApiError";
+	}
+};
+const RETRIABLE_STATUS_CODES = new Set([
+	429,
+	502,
+	503,
+	504
+]);
 var FlareApi = class {
-  constructor(endpoint, key, version) {
-    this.endpoint = endpoint;
-    this.key = key;
-    this.version = version;
-  }
-  uploadSourcemap(sourcemap) {
-    return new Promise((resolve2, reject) => {
-      const base64GzipSourcemap = deflateRawSync(sourcemap.content).toString("base64");
-      axios.post(this.endpoint, {
-        key: this.key,
-        version_id: this.version,
-        relative_filename: sourcemap.original_file,
-        sourcemap: base64GzipSourcemap
-      }).then(resolve2).catch((error) => {
-        return reject(`${error.response.status}: ${JSON.stringify(error.response.data)}`);
-      });
-    });
-  }
+	constructor(endpoint, key, version) {
+		this.endpoint = endpoint;
+		this.key = key;
+		this.version = version;
+	}
+	uploadSourcemap(sourcemap) {
+		const base64GzipSourcemap = deflateRawSync(sourcemap.content).toString("base64");
+		return this.postWithRetry({
+			key: this.key,
+			version_id: this.version,
+			relative_filename: sourcemap.originalFile,
+			sourcemap: base64GzipSourcemap
+		});
+	}
+	async postWithRetry(data, maxRetries = 3) {
+		for (let attempt = 1; attempt <= maxRetries; attempt++) {
+			try {
+				const response = await fetch(this.endpoint, {
+					method: "POST",
+					headers: { "Content-Type": "application/json" },
+					body: JSON.stringify(data)
+				});
+				if (response.ok) return;
+				if (!RETRIABLE_STATUS_CODES.has(response.status)) {
+					const body = await response.text();
+					throw new FlareApiError(`Flare API returned ${response.status}: ${body}`);
+				}
+				if (attempt === maxRetries) throw new FlareApiError(`Flare API returned ${response.status} after ${maxRetries} attempts`);
+			} catch (error) {
+				if (error instanceof FlareApiError) throw error;
+				if (attempt === maxRetries) {
+					const message = error instanceof Error ? error.message : String(error);
+					throw new Error(`Network error after ${maxRetries} attempts: ${message}`, { cause: error });
+				}
+			}
+			await this.delay(Math.pow(2, attempt - 1) * 1e3);
+		}
+	}
+	delay(ms) {
+		return new Promise((resolve) => setTimeout(resolve, ms));
+	}
 };
 
-// src/util.ts
-function uuid() {
-  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
-    const r = Math.random() * 16 | 0;
-    const v = c == "x" ? r : r & 3 | 8;
-    return v.toString(16);
-  });
+//#endregion
+//#region src/index.ts
+function flareSourcemaps({ apiKey, base, apiEndpoint = "https://flareapp.io/api/sourcemaps", runInDevelopment = false, version = randomUUID(), removeSourcemaps = false }) {
+	let logger = null;
+	let resolvedBase = base ?? "/";
+	let enableUpload = false;
+	let isSsrBuild = false;
+	const flare = new FlareApi(apiEndpoint, apiKey, version);
+	function log(message, isError = false) {
+		const formatted = `@flareapp/vite: ${message}`;
+		if (isError) if (logger) logger.error(formatted);
+		else console.error(formatted);
+		else if (logger) logger.info(formatted);
+		else console.log(formatted);
+	}
+	if (!apiKey) console.warn("@flareapp/vite: No Flare API key provided, sourcemap upload disabled.");
+	return {
+		name: "flare-vite-plugin",
+		apply: "build",
+		enforce: "post",
+		config(_userConfig, { mode }) {
+			enableUpload = !!apiKey && (mode !== "development" || runInDevelopment) && process.env.SKIP_SOURCEMAPS !== "true";
+			return {
+				define: {
+					FLARE_SOURCEMAP_VERSION: JSON.stringify(version),
+					FLARE_JS_KEY: JSON.stringify(apiKey)
+				},
+				build: { sourcemap: enableUpload ? "hidden" : void 0 }
+			};
+		},
+		configResolved(config) {
+			logger = config.logger;
+			isSsrBuild = !!config.build?.ssr;
+			if (!base) resolvedBase = config.base;
+			if (!resolvedBase.endsWith("/")) resolvedBase += "/";
+		},
+		async writeBundle(outputOptions, bundle) {
+			if (!enableUpload) return;
+			const outputDir = outputOptions.dir || "";
+			const sourcemaps = [];
+			for (const fileName of Object.keys(bundle)) {
+				if (!fileName.endsWith(".map")) continue;
+				const sourceFileName = fileName.replace(/\.map$/, "");
+				if (!existsSync(resolve(outputDir, sourceFileName))) {
+					log(`No corresponding source found for "${fileName}"`, true);
+					continue;
+				}
+				const sourcemapPath = resolve(outputDir, fileName);
+				try {
+					const originalFile = isSsrBuild ? sourceFileName : `${resolvedBase}${sourceFileName}`;
+					sourcemaps.push({
+						content: readFileSync(sourcemapPath, "utf8"),
+						sourcemapPath,
+						originalFile
+					});
+				} catch (error) {
+					log(`Error reading sourcemap ${sourcemapPath}: ${error}`, true);
+				}
+			}
+			if (!sourcemaps.length) return;
+			log(`Uploading ${sourcemaps.length} sourcemap(s) to Flare.`);
+			const results = await Promise.allSettled(sourcemaps.map((sourcemap) => flare.uploadSourcemap(sourcemap)));
+			const failed = results.filter((r) => r.status === "rejected");
+			if (failed.length > 0) {
+				for (const result of failed) log(`Upload failed: ${result.reason}`, true);
+				log(`${failed.length}/${sourcemaps.length} sourcemap upload(s) failed.`, true);
+			} else log("Successfully uploaded all sourcemaps to Flare.");
+			if (removeSourcemaps) {
+				for (let i = 0; i < sourcemaps.length; i++) {
+					if (results[i].status === "rejected") continue;
+					try {
+						unlinkSync(sourcemaps[i].sourcemapPath);
+					} catch (error) {
+						log(`Error removing ${sourcemaps[i].sourcemapPath}: ${error}`, true);
+					}
+				}
+				log("Removed sourcemap files from build output.");
+			}
+		}
+	};
 }
 
-// src/index.ts
-function flareSourcemapUploader({
-  key,
-  base,
-  apiEndpoint = "https://flareapp.io/api/sourcemaps",
-  runInDevelopment = false,
-  version = uuid(),
-  removeSourcemaps = false
-}) {
-  if (!key) {
-    flareLog("No Flare API key was provided, not uploading sourcemaps to Flare.");
-  }
-  const flare = new FlareApi(apiEndpoint, key, version);
-  const enableUploadingSourcemaps = key && (process.env.NODE_ENV !== "development" || runInDevelopment) && process.env.SKIP_SOURCEMAPS !== "true";
-  return {
-    name: "flare-vite-plugin",
-    apply: "build",
-    config({ build }, { mode }) {
-      return {
-        // Set FLARE_SOURCEMAP_VERSION and API key so the Flare JS client can read it
-        define: {
-          FLARE_SOURCEMAP_VERSION: `'${version}'`,
-          FLARE_JS_KEY: `'${key}'`
-        },
-        build: {
-          sourcemap: (() => {
-            if (build?.sourcemap !== void 0) return build.sourcemap;
-            const enableSourcemaps = enableUploadingSourcemaps && mode !== "development";
-            if (enableSourcemaps) return "hidden";
-            return false;
-          })()
-        }
-      };
-    },
-    configResolved(config) {
-      base = base || config.base;
-      base += base.endsWith("/") ? "" : "/";
-    },
-    async writeBundle(outputConfig) {
-      if (!enableUploadingSourcemaps) {
-        return;
-      }
-      const outputDir = outputConfig.dir || "";
-      const files = await glob("./**/*.map", { cwd: outputDir });
-      const sourcemaps = files.map((file) => {
-        const sourcePath = file.replace(/\.map$/, "");
-        const sourceFilename = resolve(outputDir, sourcePath);
-        if (!existsSync(sourceFilename)) {
-          flareLog(`no corresponding source found for "${file}"`, true);
-          return null;
-        }
-        const sourcemapLocation = resolve(outputDir, file);
-        try {
-          return {
-            content: readFileSync(sourcemapLocation, "utf8"),
-            sourcemap_url: sourcemapLocation,
-            original_file: `${base}${sourcePath}`
-          };
-        } catch (error) {
-          flareLog("Error reading sourcemap file " + sourcemapLocation + ": " + error, true);
-          return null;
-        }
-      }).filter((sourcemap) => sourcemap !== null);
-      if (!sourcemaps.length) {
-        return;
-      }
-      flareLog(`Uploading ${sourcemaps.length} sourcemap files to Flare.`);
-      const pendingUploads = sourcemaps.map((sourcemap) => () => flare.uploadSourcemap(sourcemap));
-      try {
-        while (pendingUploads.length) {
-          await Promise.all(pendingUploads.splice(0, 10).map((f) => f()));
-        }
-        flareLog("Successfully uploaded sourcemaps to Flare.");
-      } catch (error) {
-        flareLog(`Something went wrong while uploading the sourcemaps to Flare: ${error}`, true);
-      }
-      if (removeSourcemaps) {
-        sourcemaps.forEach(({ sourcemap_url }) => {
-          try {
-            unlinkSync(sourcemap_url);
-          } catch (error) {
-            console.error("Error removing sourcemap file", sourcemap_url, ": ", error);
-          }
-        });
-        flareLog("Successfully removed sourcemaps.");
-      }
-    }
-  };
-}
-function flareLog(message, isError = false) {
-  const formattedMessage = "@flareapp/vite: " + message;
-  if (isError) {
-    console.error(formattedMessage);
-    return;
-  }
-  console.log(formattedMessage);
-}
-export {
-  flareSourcemapUploader as default
-};
+//#endregion
+export { flareSourcemaps as default };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@flareapp/vite",
-    "version": "1.2.1",
+    "version": "2.1.0",
     "description": "Vite plugin for flareapp.io",
     "homepage": "https://flareapp.io",
     "bugs": "https://github.com/spatie/flare-client-js/issues",
@@ -9,33 +9,52 @@
         "url": "git+https://github.com/spatie/flare-client-js.git"
     },
     "license": "MIT",
-    "author": "adriaan@spatie.be",
-    "main": "./dist/index.js",
+    "author": {
+        "name": "Spatie",
+        "email": "info@spatie.be"
+    },
+    "contributors": [
+        "Adriaan Marain <adriaan@spatie.be>",
+        "Alex Vanderbist <alex@spatie.be>",
+        "Dries Heyninck <dries@spatie.be>",
+        "Freek Van der Herten <freek@spatie.be>",
+        "Sebastian De Deyne <sebastian@spatie.be>",
+        "Sébastien Henau <seba@spatie.be>"
+    ],
+    "main": "./dist/index.cjs",
     "module": "./dist/index.mjs",
-    "types": "./dist/index.d.ts",
+    "types": "./dist/index.d.cts",
     "exports": {
         ".": {
-            "require": "./dist/index.js",
-            "import": "./dist/index.mjs"
+            "import": {
+                "types": "./dist/index.d.mts",
+                "default": "./dist/index.mjs"
+            },
+            "require": {
+                "types": "./dist/index.d.cts",
+                "default": "./dist/index.cjs"
+            }
         }
     },
+    "engines": {
+        "node": ">=18"
+    },
     "scripts": {
         "prepublishOnly": "npm run build",
-        "build": "tsup src/index.ts --format cjs,esm --dts --clean",
-        "typescript": "tsc",
-        "release": "npx release-it"
-    },
-    "dependencies": {
-        "axios": "^1.2.1",
-        "fast-glob": "^3.2.12"
+        "build": "tsdown src/index.ts --format cjs,esm --dts --clean --noExternal @flareapp/flare-api",
+        "test": "vitest run",
+        "typescript": "tsc --noEmit",
+        "release": "release-it"
     },
     "devDependencies": {
-        "@types/node": "^18.11.17",
-        "typescript": "^5.3.3",
-        "vite": "^4.0.0||^5.0.0||^6.0.0"
+        "@flareapp/flare-api": "*",
+        "tsdown": "^0.20.3",
+        "typescript": "^5.7.0",
+        "vite": "^5.0.0||^6.0.0||^7.0.0||^8.0.0",
+        "vitest": "^4.0.0"
     },
     "peerDependencies": {
-        "vite": "^4.0.0||^5.0.0||^6.0.0||^7.0.0||^8.0.0"
+        "vite": "^5.0.0||^6.0.0||^7.0.0||^8.0.0"
     },
     "publishConfig": {
         "access": "public"

package/.release-it.json

@@ -1,16 +0,0 @@
-{
-    "git": {
-        "commitMessage": "Release @flareapp/vite v${version}",
-        "tagName": "@flareapp/vite@${version}",
-        "tagAnnotation": "Release @flareapp/vite v${version}"
-    },
-    "github": {
-        "release": false
-    },
-    "npm": {
-        "publish": true
-    },
-    "hooks": {
-        "after:bump": "npm run build"
-    }
-}

package/dist/index.d.ts

@@ -1,18 +0,0 @@
-import { Plugin } from 'vite';
-
-type PluginConfig = {
-    key: string;
-    base?: string;
-    apiEndpoint?: string;
-    runInDevelopment?: boolean;
-    version?: string;
-    removeSourcemaps?: boolean;
-};
-type Sourcemap = {
-    original_file: string;
-    content: string;
-    sourcemap_url: string;
-};
-declare function flareSourcemapUploader({ key, base, apiEndpoint, runInDevelopment, version, removeSourcemaps, }: PluginConfig): Plugin;
-
-export { type PluginConfig, type Sourcemap, flareSourcemapUploader as default };

package/dist/index.js

@@ -1,169 +0,0 @@
-"use strict";
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/index.ts
-var index_exports = {};
-__export(index_exports, {
-  default: () => flareSourcemapUploader
-});
-module.exports = __toCommonJS(index_exports);
-var import_fast_glob = __toESM(require("fast-glob"));
-var import_fs = require("fs");
-var import_path = require("path");
-
-// src/flareApi.ts
-var import_axios = __toESM(require("axios"));
-var import_zlib = require("zlib");
-var FlareApi = class {
-  constructor(endpoint, key, version) {
-    this.endpoint = endpoint;
-    this.key = key;
-    this.version = version;
-  }
-  uploadSourcemap(sourcemap) {
-    return new Promise((resolve2, reject) => {
-      const base64GzipSourcemap = (0, import_zlib.deflateRawSync)(sourcemap.content).toString("base64");
-      import_axios.default.post(this.endpoint, {
-        key: this.key,
-        version_id: this.version,
-        relative_filename: sourcemap.original_file,
-        sourcemap: base64GzipSourcemap
-      }).then(resolve2).catch((error) => {
-        return reject(`${error.response.status}: ${JSON.stringify(error.response.data)}`);
-      });
-    });
-  }
-};
-
-// src/util.ts
-function uuid() {
-  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) {
-    const r = Math.random() * 16 | 0;
-    const v = c == "x" ? r : r & 3 | 8;
-    return v.toString(16);
-  });
-}
-
-// src/index.ts
-function flareSourcemapUploader({
-  key,
-  base,
-  apiEndpoint = "https://flareapp.io/api/sourcemaps",
-  runInDevelopment = false,
-  version = uuid(),
-  removeSourcemaps = false
-}) {
-  if (!key) {
-    flareLog("No Flare API key was provided, not uploading sourcemaps to Flare.");
-  }
-  const flare = new FlareApi(apiEndpoint, key, version);
-  const enableUploadingSourcemaps = key && (process.env.NODE_ENV !== "development" || runInDevelopment) && process.env.SKIP_SOURCEMAPS !== "true";
-  return {
-    name: "flare-vite-plugin",
-    apply: "build",
-    config({ build }, { mode }) {
-      return {
-        // Set FLARE_SOURCEMAP_VERSION and API key so the Flare JS client can read it
-        define: {
-          FLARE_SOURCEMAP_VERSION: `'${version}'`,
-          FLARE_JS_KEY: `'${key}'`
-        },
-        build: {
-          sourcemap: (() => {
-            if (build?.sourcemap !== void 0) return build.sourcemap;
-            const enableSourcemaps = enableUploadingSourcemaps && mode !== "development";
-            if (enableSourcemaps) return "hidden";
-            return false;
-          })()
-        }
-      };
-    },
-    configResolved(config) {
-      base = base || config.base;
-      base += base.endsWith("/") ? "" : "/";
-    },
-    async writeBundle(outputConfig) {
-      if (!enableUploadingSourcemaps) {
-        return;
-      }
-      const outputDir = outputConfig.dir || "";
-      const files = await (0, import_fast_glob.default)("./**/*.map", { cwd: outputDir });
-      const sourcemaps = files.map((file) => {
-        const sourcePath = file.replace(/\.map$/, "");
-        const sourceFilename = (0, import_path.resolve)(outputDir, sourcePath);
-        if (!(0, import_fs.existsSync)(sourceFilename)) {
-          flareLog(`no corresponding source found for "${file}"`, true);
-          return null;
-        }
-        const sourcemapLocation = (0, import_path.resolve)(outputDir, file);
-        try {
-          return {
-            content: (0, import_fs.readFileSync)(sourcemapLocation, "utf8"),
-            sourcemap_url: sourcemapLocation,
-            original_file: `${base}${sourcePath}`
-          };
-        } catch (error) {
-          flareLog("Error reading sourcemap file " + sourcemapLocation + ": " + error, true);
-          return null;
-        }
-      }).filter((sourcemap) => sourcemap !== null);
-      if (!sourcemaps.length) {
-        return;
-      }
-      flareLog(`Uploading ${sourcemaps.length} sourcemap files to Flare.`);
-      const pendingUploads = sourcemaps.map((sourcemap) => () => flare.uploadSourcemap(sourcemap));
-      try {
-        while (pendingUploads.length) {
-          await Promise.all(pendingUploads.splice(0, 10).map((f) => f()));
-        }
-        flareLog("Successfully uploaded sourcemaps to Flare.");
-      } catch (error) {
-        flareLog(`Something went wrong while uploading the sourcemaps to Flare: ${error}`, true);
-      }
-      if (removeSourcemaps) {
-        sourcemaps.forEach(({ sourcemap_url }) => {
-          try {
-            (0, import_fs.unlinkSync)(sourcemap_url);
-          } catch (error) {
-            console.error("Error removing sourcemap file", sourcemap_url, ": ", error);
-          }
-        });
-        flareLog("Successfully removed sourcemaps.");
-      }
-    }
-  };
-}
-function flareLog(message, isError = false) {
-  const formattedMessage = "@flareapp/vite: " + message;
-  if (isError) {
-    console.error(formattedMessage);
-    return;
-  }
-  console.log(formattedMessage);
-}

package/src/flareApi.ts

@@ -1,34 +0,0 @@
-import axios from 'axios';
-import { deflateRawSync } from 'zlib';
-
-import { Sourcemap } from './index';
-
-export default class FlareApi {
-    endpoint: string;
-    key: string;
-    version: string;
-
-    constructor(endpoint: string, key: string, version: string) {
-        this.endpoint = endpoint;
-        this.key = key;
-        this.version = version;
-    }
-
-    uploadSourcemap(sourcemap: Sourcemap) {
-        return new Promise((resolve, reject) => {
-            const base64GzipSourcemap = deflateRawSync(sourcemap.content).toString('base64');
-
-            axios
-                .post(this.endpoint, {
-                    key: this.key,
-                    version_id: this.version,
-                    relative_filename: sourcemap.original_file,
-                    sourcemap: base64GzipSourcemap,
-                })
-                .then(resolve)
-                .catch((error) => {
-                    return reject(`${error.response.status}: ${JSON.stringify(error.response.data)}`);
-                });
-        });
-    }
-}

package/src/index.ts

@@ -1,145 +0,0 @@
-import glob from 'fast-glob';
-import { existsSync, readFileSync, unlinkSync } from 'fs';
-import { resolve } from 'path';
-import { OutputOptions } from 'rollup';
-import { Plugin, ResolvedConfig, UserConfig } from 'vite';
-
-import FlareApi from './flareApi';
-import { uuid } from './util';
-
-export type PluginConfig = {
-    key: string;
-    base?: string;
-    apiEndpoint?: string;
-    runInDevelopment?: boolean;
-    version?: string;
-    removeSourcemaps?: boolean;
-};
-
-export type Sourcemap = {
-    original_file: string;
-    content: string;
-    sourcemap_url: string;
-};
-
-export default function flareSourcemapUploader({
-    key,
-    base,
-    apiEndpoint = 'https://flareapp.io/api/sourcemaps',
-    runInDevelopment = false,
-    version = uuid(),
-    removeSourcemaps = false,
-}: PluginConfig): Plugin {
-    if (!key) {
-        flareLog('No Flare API key was provided, not uploading sourcemaps to Flare.');
-    }
-
-    const flare = new FlareApi(apiEndpoint, key, version);
-
-    const enableUploadingSourcemaps =
-        key && (process.env.NODE_ENV !== 'development' || runInDevelopment) && process.env.SKIP_SOURCEMAPS !== 'true';
-
-    return {
-        name: 'flare-vite-plugin',
-        apply: 'build',
-
-        config({ build }: UserConfig, { mode }: { mode: string }) {
-            return {
-                // Set FLARE_SOURCEMAP_VERSION and API key so the Flare JS client can read it
-                define: {
-                    FLARE_SOURCEMAP_VERSION: `'${version}'`,
-                    FLARE_JS_KEY: `'${key}'`,
-                },
-                build: {
-                    sourcemap: (() => {
-                        if (build?.sourcemap !== undefined) return build.sourcemap;
-                        const enableSourcemaps = enableUploadingSourcemaps && mode !== 'development';
-                        if (enableSourcemaps) return 'hidden';
-                        return false;
-                    })(),
-                },
-            };
-        },
-
-        configResolved(config: ResolvedConfig) {
-            base = base || config.base;
-            base += base.endsWith('/') ? '' : '/';
-        },
-
-        async writeBundle(outputConfig: OutputOptions) {
-            if (!enableUploadingSourcemaps) {
-                return;
-            }
-
-            const outputDir = outputConfig.dir || '';
-
-            const files = await glob('./**/*.map', { cwd: outputDir });
-            const sourcemaps = files
-                .map((file): Sourcemap | null => {
-                    const sourcePath = file.replace(/\.map$/, '');
-                    const sourceFilename = resolve(outputDir, sourcePath);
-
-                    if (!existsSync(sourceFilename)) {
-                        flareLog(`no corresponding source found for "${file}"`, true);
-                        return null;
-                    }
-
-                    const sourcemapLocation = resolve(outputDir, file);
-
-                    try {
-                        return {
-                            content: readFileSync(sourcemapLocation, 'utf8'),
-                            sourcemap_url: sourcemapLocation,
-                            original_file: `${base}${sourcePath}`,
-                        };
-                    } catch (error) {
-                        flareLog('Error reading sourcemap file ' + sourcemapLocation + ': ' + error, true);
-                        return null;
-                    }
-                })
-                .filter((sourcemap) => sourcemap !== null) as Sourcemap[];
-
-            if (!sourcemaps.length) {
-                return;
-            }
-
-            flareLog(`Uploading ${sourcemaps.length} sourcemap files to Flare.`);
-
-            const pendingUploads = sourcemaps.map((sourcemap) => () => flare.uploadSourcemap(sourcemap));
-
-            try {
-                while (pendingUploads.length) {
-                    // Maximum 10 at once https://stackoverflow.com/a/58686835
-                    await Promise.all(pendingUploads.splice(0, 10).map((f) => f()));
-                }
-
-                flareLog('Successfully uploaded sourcemaps to Flare.');
-            } catch (error) {
-                flareLog(`Something went wrong while uploading the sourcemaps to Flare: ${error}`, true);
-            }
-
-            if (removeSourcemaps) {
-                sourcemaps.forEach(({ sourcemap_url }) => {
-                    try {
-                        unlinkSync(sourcemap_url);
-                    } catch (error) {
-                        console.error('Error removing sourcemap file', sourcemap_url, ': ', error);
-                    }
-                });
-
-                flareLog('Successfully removed sourcemaps.');
-            }
-        },
-    };
-}
-
-function flareLog(message: string, isError = false) {
-    const formattedMessage = '@flareapp/vite: ' + message;
-
-    if (isError) {
-        console.error(formattedMessage);
-        return;
-    }
-
-    console.log(formattedMessage);
-}

package/src/util.ts

@@ -1,8 +0,0 @@
-export function uuid() {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-        const r = (Math.random() * 16) | 0;
-        const v = c == 'x' ? r : (r & 0x3) | 0x8;
-
-        return v.toString(16);
-    });
-}

package/tsconfig.json

@@ -1,4 +0,0 @@
-{
-    "extends": "../../tsconfig.json",
-    "include": ["src"]
-}