fiks sentry source maps

.github/workflows/build.yml

@@ -88,13 +88,7 @@ jobs:
         run: yarn ci --filter=@navikt/${{ inputs.app }}
         env:
           VITE_SENTRY_RELEASE: ${{ steps.sentry_release_key.outputs.SENTRY_RELEASE }}
-
-      - name: Opprett release med Sentry
-        if: inputs.push-image
-        run: yarn sentry-release
-        env:
-          SENTRY_RELEASE: ${{ steps.sentry_release_key.outputs.SENTRY_RELEASE }}
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          VITE_SENTRY_AUTH_TOKEN: ${{ inputs.push-image && secrets.SENTRY_AUTH_TOKEN || '' }}
 
       - name: Bygg server
         run: cd ./server && yarn install --immutable && yarn build

apps/fp-avdelingsleder/package.json

@@ -38,6 +38,7 @@
     "@navikt/ft-form-validators": "4.2.14",
     "@navikt/ft-ui-komponenter": "6.2.11",
     "@navikt/ft-utils": "3.8.13",
+    "@sentry/vite-plugin": "4.6.0",
     "@tanstack/react-query": "5.90.6",
     "@tanstack/react-query-devtools": "5.90.2",
     "dayjs": "1.11.19",

apps/fp-avdelingsleder/src/main.tsx

@@ -17,7 +17,7 @@ if (app === null) {
   throw new Error('No app element');
 }
 
-initSentry();
+initSentry('fp-avdelingsleder');
 
 const root = createRoot(app);
 

apps/fp-avdelingsleder/vite.config.ts

@@ -1,5 +1,6 @@
 /// <reference types="vitest" />
 import { mergeConfig } from 'vite';
+import { sentryVitePlugin } from '@sentry/vite-plugin';
 
 import { createSharedAppConfig } from '@navikt/fp-config-vite';
 
@@ -27,4 +28,17 @@ export default mergeConfig(createSharedAppConfig(), {
       },
     },
   },
+  plugins: [
+    // Put the Sentry vite plugin after all other plugins
+    sentryVitePlugin({
+      authToken: process.env.VITE_SENTRY_AUTH_TOKEN, // Kommer fra Github organization secrets
+      disable: !process.env.VITE_SENTRY_AUTH_TOKEN, // Ikke last opp source maps hvis token ikke er satt. Token er bare satt når det bygges fra master branch
+      org: 'nav',
+      project: 'fp-avdelingsleder',
+      url: 'https://sentry.gc.nav.no',
+      release: {
+        name: process.env.VITE_SENTRY_RELEASE,
+      },
+    }),
+  ],
 });

apps/fp-frontend/package.json

@@ -112,6 +112,7 @@
     "@navikt/ft-ui-komponenter": "6.2.11",
     "@navikt/ft-utils": "3.8.13",
     "@popperjs/core": "2.11.8",
+    "@sentry/vite-plugin": "4.6.0",
     "@tanstack/react-query": "5.90.6",
     "@tanstack/react-query-devtools": "5.90.2",
     "classnames": "2.5.1",

apps/fp-frontend/src/main.tsx

@@ -17,7 +17,7 @@ if (app === null) {
   throw new Error('No app element');
 }
 
-initSentry();
+initSentry('fp-frontend');
 
 const root = createRoot(app);
 

apps/fp-frontend/vite.config.ts

@@ -1,5 +1,6 @@
 /// <reference types="vitest" />
 import { mergeConfig } from 'vite';
+import { sentryVitePlugin } from '@sentry/vite-plugin';
 
 import { createSharedAppConfig } from '@navikt/fp-config-vite';
 
@@ -38,4 +39,17 @@ export default mergeConfig(createSharedAppConfig(), {
       },
     },
   },
+  plugins: [
+    // Put the Sentry vite plugin after all other plugins
+    sentryVitePlugin({
+      authToken: process.env.VITE_SENTRY_AUTH_TOKEN, // Kommer fra Github organization secrets
+      disable: !process.env.VITE_SENTRY_AUTH_TOKEN, // Ikke last opp source maps hvis token ikke er satt. Token er bare satt når det bygges fra master branch
+      org: 'nav',
+      project: 'fp-frontend',
+      url: 'https://sentry.gc.nav.no',
+      release: {
+        name: process.env.VITE_SENTRY_RELEASE,
+      },
+    }),
+  ],
 });

apps/fp-journalforing/package.json

@@ -36,6 +36,7 @@
     "@navikt/ft-form-validators": "4.2.14",
     "@navikt/ft-ui-komponenter": "6.2.11",
     "@navikt/ft-utils": "3.8.13",
+    "@sentry/vite-plugin": "4.6.0",
     "@tanstack/react-query": "5.90.6",
     "@tanstack/react-query-devtools": "5.90.2",
     "dayjs": "1.11.19",

apps/fp-journalforing/src/main.tsx

@@ -16,7 +16,7 @@ const app = document.getElementById('root');
 if (app === null) {
   throw new Error('No app element');
 }
-initSentry();
+initSentry('fp-journalforing');
 
 const root = createRoot(app);
 

apps/fp-journalforing/vite.config.ts

@@ -1,5 +1,6 @@
 /// <reference types="vitest" />
 import { mergeConfig } from 'vite';
+import { sentryVitePlugin } from '@sentry/vite-plugin';
 
 import { createSharedAppConfig } from '@navikt/fp-config-vite';
 
@@ -27,4 +28,17 @@ export default mergeConfig(createSharedAppConfig(), {
       },
     },
   },
+  plugins: [
+    // Put the Sentry vite plugin after all other plugins
+    sentryVitePlugin({
+      authToken: process.env.VITE_SENTRY_AUTH_TOKEN, // Kommer fra Github organization secrets
+      disable: !process.env.VITE_SENTRY_AUTH_TOKEN, // Ikke last opp source maps hvis token ikke er satt. Token er bare satt når det bygges fra master branch
+      org: 'nav',
+      project: 'fp-journalforing',
+      url: 'https://sentry.gc.nav.no',
+      release: {
+        name: process.env.VITE_SENTRY_RELEASE,
+      },
+    }),
+  ],
 });

package.json

@@ -29,7 +29,6 @@
     "remove-node-modules": "find . -name \"node_modules\" -exec rm -rf '{}' +",
     "build:storybook": "turbo run build-storybook && yarn storybook-create-deploy-folder",
     "storybook-create-deploy-folder": "node scripts/create-storybook-index.cjs",
-    "sentry-release": "node ./scripts/sentry-release.cjs",
     "prepare": "husky install",
     "update-swagger": "node scripts/hent-openapi-spec.js",
     "generate:local": "yarn update-swagger lokal && openapi-ts",
@@ -42,7 +41,6 @@
   "devDependencies": {
     "@hey-api/openapi-ts": "0.86.11",
     "@navikt/aksel-stylelint": "7.33.0",
-    "@sentry/cli": "2.57.0",
     "@storybook/addon-a11y": "10.0.2",
     "@storybook/addon-links": "10.0.2",
     "@storybook/react": "10.0.2",

packages/app-felles/src/initSentry.ts

@@ -1,12 +1,23 @@
 import { breadcrumbsIntegration, init } from '@sentry/browser';
 
-export const initSentry = () => {
+export const initSentry = (app: 'fp-frontend' | 'fp-journalforing' | 'fp-avdelingsleder') => {
   init({
-    dsn: 'https://d1b7de8cc42949569da03849b47d3ea1@sentry.gc.nav.no/17',
+    dsn: getDsn(app),
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     release: import.meta.env['VITE_SENTRY_RELEASE'] ?? 'unknown',
     environment: globalThis.location.hostname,
     enabled: import.meta.env.MODE !== 'development',
     integrations: [breadcrumbsIntegration({ console: false })],
   });
 };
+
+const getDsn = (app: 'fp-frontend' | 'fp-journalforing' | 'fp-avdelingsleder') => {
+  switch (app) {
+    case 'fp-frontend':
+      return 'https://d1b7de8cc42949569da03849b47d3ea1@sentry.gc.nav.no/17';
+    case 'fp-avdelingsleder':
+      return 'https://acfe5c7d102b49aa1b622345dc6cd0c0@sentry.gc.nav.no/184';
+    case 'fp-journalforing':
+      return 'https://e3fbcf06855a6a4caf8d9c8e1e92479b@sentry.gc.nav.no/185';
+  }
+};

turbo.json

@@ -1,6 +1,6 @@
 {
   "$schema": "https://turbo.build/schema.json",
-  "globalPassThroughEnv": ["VITE_SENTRY_RELEASE"],
+  "globalPassThroughEnv": ["VITE_SENTRY_RELEASE", "VITE_SENTRY_AUTH_TOKEN "],
   "globalDependencies": [
     "turbo.json",
     "yarn.lock",