@bigbertha/sdk 0.1.4 → 0.1.6

package/README.md

@@ -55,14 +55,20 @@ import { withBertha } from "@bigbertha/sdk/next/config"
 export default withBertha({ /* your config */ })
 ```
 
-`withBertha` options: `release`, `keepMaps` (default false), `disableUpload`. It also
-stamps the environment, so a Vercel preview reports as staging.
+`withBertha` options: `release`, `keepMaps`, `disableUpload`. It removes the maps under
+`.next/static` (the ones browsers can fetch) and keeps the server's, which aren't served
+and which Vercel's build output can need. `keepMaps` takes `true`, `false` or a function
+of the path inside `.next`. It also stamps the environment, so a Vercel preview reports
+as staging.
 
 For your own options (`beforeSend`, `tags`, `sampleRate`), call `init` from
 `@bigbertha/sdk/browser` in `instrumentation-client.ts` instead of importing
 `next/client`, and `init` from `@bigbertha/sdk/node` in `register()`. The build plugin
 works the same either way, and it keeps the debug ids another tool (such as Sentry's
-plugin) already gave the bundles, so both can run side by side.
+plugin) already gave the bundles, so both can run side by side. Wrap it inside
+`withSentryConfig` and set Sentry's `sourcemaps.deleteSourcemapsAfterUpload: false`:
+Sentry's plugin runs first, and the maps it deletes never reach bertha. bertha removes
+the served ones afterwards.
 
 ## Vite (browser)
 

package/dist/build/index.d.ts

@@ -24,7 +24,7 @@ export interface Report {
     files: Processed[];
     uploaded: number;
     failed: number;
-    /** Leftover .js.map files removed because no bundle referenced them. */
+    /** Other .js.map and .css.map files removed: no bundle referenced them, or they map CSS. */
     removedOrphans: number;
     /** Why nothing was uploaded, when nothing was. */
     skipped?: string;

package/dist/build/index.js

@@ -13,7 +13,9 @@ import { dirname, join, relative, resolve, sep } from "node:path";
 import { gzipSync } from "node:zlib";
 export { detectRelease, lastCommit } from "./release.js";
 const JS = /\.(?:m|c)?js$/;
-const ORPHAN_MAP = /\.(?:m|c)?js\.map$/;
+const ORPHAN_MAP = /\.(?:(?:m|c)?js|css)\.map$/;
+const CSS = /\.css$/;
+const CSS_MAP_COMMENT = /\n?\/\*# sourceMappingURL=\S+ ?\*\/\s*$/;
 const MAP_COMMENT = /\n?\/\/[#@] sourceMappingURL=(\S+)[ \t]*\r?\n?$/;
 const DEBUG_ID_COMMENT = /\/\/# debugId=([0-9a-fA-F-]{36})/;
 /** In every bundle this step has already stamped, so a second run changes nothing. */
@@ -71,16 +73,22 @@ export async function processDirectory(o) {
         }
         report.files.push(entry);
     });
-    // Maps no bundle points at (renamed polyfills and the like) are source code too.
+    // Maps no bundle points at (renamed polyfills and the like) are source code too,
+    // and so are CSS maps (Next writes them once browser source maps are on).
     if (o.keepMaps !== true) {
         const keepFn = typeof o.keepMaps === "function" ? o.keepMaps : undefined;
+        const kept = (f) => !!keepFn?.(relative(root, f).split(sep).join("/"));
         for (const f of await walk(root, skip)) {
-            if (!ORPHAN_MAP.test(f) || !existsSync(f))
-                continue;
-            if (keepFn?.(relative(root, f.replace(/\.map$/, "")).split(sep).join("/")))
-                continue;
-            await rm(f, { force: true });
-            report.removedOrphans++;
+            if (CSS.test(f) && !kept(f)) {
+                const css = await readFile(f, "utf8");
+                const stripped = css.replace(CSS_MAP_COMMENT, "\n");
+                if (stripped !== css)
+                    await writeFile(f, stripped);
+            }
+            else if (ORPHAN_MAP.test(f) && existsSync(f) && !kept(f.replace(/\.map$/, ""))) {
+                await rm(f, { force: true });
+                report.removedOrphans++;
+            }
         }
     }
     report.files.sort((a, b) => a.file.localeCompare(b.file));

package/dist/core/version.d.ts

@@ -1 +1 @@
-export declare const VERSION = "0.1.4";
+export declare const VERSION = "0.1.6";

package/dist/core/version.js

@@ -1 +1 @@
-export const VERSION = "0.1.4";
+export const VERSION = "0.1.6";

package/dist/next/config.d.ts

@@ -1,8 +1,13 @@
 export interface BerthaNextOptions {
     release?: string;
-    /** Keep .map files in `.next` after uploading. Default false. */
-    keepMaps?: boolean;
+    /**
+     * Which .map files stay in `.next` after uploading, by path inside it. Defaults to
+     * the server's: only `static/` is served to browsers, and removing server maps can
+     * break Vercel's build output (getsentry/sentry-javascript#13099).
+     */
+    keepMaps?: boolean | ((file: string) => boolean);
     /** Skip the post-build step entirely (the release is still stamped). */
     disableUpload?: boolean;
 }
+export declare const keepServerMaps: (file: string) => boolean;
 export declare function withBertha<C extends object>(config?: C, options?: BerthaNextOptions): C;

package/dist/next/config.js

@@ -6,6 +6,7 @@
 import { join } from "node:path";
 import { detectRelease, processDirectory } from "../build/index.js";
 import { firstEnv } from "../core/env.js";
+export const keepServerMaps = (file) => !file.startsWith("static/");
 export function withBertha(config = {}, options = {}) {
     const c = config;
     const release = options.release ?? detectRelease();
@@ -31,7 +32,7 @@ export function withBertha(config = {}, options = {}) {
                     release,
                     url: firstEnv("BERTHA_URL", "NEXT_PUBLIC_BERTHA_URL"),
                     uploadKey: firstEnv("BERTHA_UPLOAD_KEY"),
-                    keepMaps: options.keepMaps,
+                    keepMaps: options.keepMaps ?? keepServerMaps,
                     skip: ["cache", "standalone", "types"],
                     log: (m) => console.log(`[bertha] ${m}`),
                 }).catch((e) => console.warn(`[bertha] Source maps weren't processed: ${String(e)}`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bigbertha/sdk",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "Error reporting for bertha: browser, Node, edge and Next.js, with source maps by debug id.",
   "license": "MIT",
   "repository": {
@@ -40,6 +40,34 @@
     "./build": "./dist/build/index.js",
     "./package.json": "./package.json"
   },
+  "typesVersions": {
+    "*": {
+      "browser": [
+        "dist/browser/index.d.ts"
+      ],
+      "node": [
+        "dist/node/index.d.ts"
+      ],
+      "edge": [
+        "dist/edge/index.d.ts"
+      ],
+      "next": [
+        "dist/next/index.d.ts"
+      ],
+      "next/client": [
+        "dist/next/client.d.ts"
+      ],
+      "next/config": [
+        "dist/next/config.d.ts"
+      ],
+      "vite": [
+        "dist/vite/index.d.ts"
+      ],
+      "build": [
+        "dist/build/index.d.ts"
+      ]
+    }
+  },
   "engines": {
     "node": ">=20"
   },