Merge branch 'main' into LukasHirt-feat/migrate-to-sentry-7

* main:
  chore: release 6.0.2
  fix(tracing): merge user's tracing configuration (#463)

Author: rchl

CHANGELOG.md

@@ -1,5 +1,12 @@
 
 
+### [6.0.2](https://github.com/nuxt-community/sentry-module/compare/v6.0.1...v6.0.2) (2022-12-12)
+
+
+### Bug Fixes
+
+* **tracing:** merge user's tracing configuration ([#463](https://github.com/nuxt-community/sentry-module/issues/463)) ([a567f82](https://github.com/nuxt-community/sentry-module/commit/a567f82ace5a22425c63a807a9736408727227f2))
+
 ### [6.0.1](https://github.com/nuxt-community/sentry-module/compare/v6.0.0...v6.0.1) (2022-09-28)
 
 

lib/core/options.js

@@ -86,13 +86,14 @@ function resolveLazyOptions (options, apiMethods, logger) {
 }
 
 /**
- * @param {import('../../types/sentry').ModuleConfiguration['tracing']} tracing
+ * @param {import('../../types/sentry').ModuleConfiguration} options
  * @param {NonNullable<import('../../types/sentry').ModuleConfiguration['config']>} config
  */
-function resolveTracingOptions (tracing, config) {
-  if (!tracing) {
+function resolveTracingOptions (options, config) {
+  if (!options.tracing) {
     return
   }
+  const userOptions = typeof options.tracing === 'boolean' ? {} : options.tracing
   /** @type {NonNullable<import('../../types/sentry').TracingConfiguration>} */
   const tracingOptions = merge(
     {
@@ -101,11 +102,12 @@ function resolveTracingOptions (tracing, config) {
       trackComponents: true,
       tracePropagationTargets: ['localhost', /^\//],
     },
-    typeof tracing === 'boolean' ? {} : tracing,
+    userOptions,
   )
-  if (tracingOptions && !config.tracesSampleRate) {
+  if (!config.tracesSampleRate) {
     config.tracesSampleRate = tracingOptions.tracesSampleRate
   }
+  options.tracing = tracingOptions
 }
 
 /**
@@ -122,7 +124,7 @@ export async function resolveClientOptions (moduleContainer, moduleOptions, logg
 
   const apiMethods = await getApiMethods('@sentry/vue')
   resolveLazyOptions(options, apiMethods, logger)
-  resolveTracingOptions(options.tracing, options.config)
+  resolveTracingOptions(options, options.config)
 
   for (const name of Object.keys(options.clientIntegrations)) {
     if (!PLUGGABLE_INTEGRATIONS.includes(name) && !BROWSER_INTEGRATIONS.includes(name)) {
@@ -207,7 +209,7 @@ export async function resolveServerOptions (moduleContainer, moduleOptions, logg
 
   const apiMethods = await getApiMethods('@sentry/node')
   resolveLazyOptions(options, apiMethods, logger)
-  resolveTracingOptions(options.tracing, options.config)
+  resolveTracingOptions(options, options.config)
 
   return {
     config: options.config,

lib/plugin.client.js

@@ -1,6 +1,7 @@
 import Vue from 'vue'
 import merge from 'lodash.mergewith'
 import * as Sentry from '@sentry/vue'
+<% if (options.tracing) { %>import { BrowserTracing } from '@sentry/tracing'<% } %>
 <%
 if (options.initialize) {
   let integrations = options.PLUGGABLE_INTEGRATIONS.filter(key => key in options.integrations)
@@ -14,9 +15,6 @@ const { <%= integrations.join(', ') %> } = Sentry.Integrations
 <%}
 }
 %>
-<% if (options.tracing) { %>
-import { BrowserTracing } from "@sentry/tracing";
-<% } %>
 
 // eslint-disable-next-line require-await
 export default async function (ctx, inject) {
@@ -48,8 +46,7 @@ export default async function (ctx, inject) {
     }).join(',\n    ')%>,
   ]
   <% if (options.tracing) { %>
-    const { tracePropagationTargets, ...tracingOptions } = options.tracing
-
+    const { tracePropagationTargets, ...tracingOptions } = <%= serialize(options.tracing) %>
     config.integrations.push(new BrowserTracing({ tracePropagationTargets }))
     merge(config, tracingOptions)
   <% } %>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxtjs/sentry",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "description": "Sentry module for Nuxt.js",
   "repository": "nuxt-community/sentry-module",
   "license": "MIT",
@@ -22,7 +22,7 @@
   "main": "lib/module.js",
   "types": "types/index.d.ts",
   "scripts": {
-    "dev:fixture": "node ./node_modules/nuxt/bin/nuxt.js -c ./test/fixture/lazy/nuxt.config.js",
+    "dev:fixture": "node ./node_modules/nuxt/bin/nuxt.js -c ./test/fixture/default/nuxt.config.js",
     "dev:fixture:build": "node ./node_modules/nuxt/bin/nuxt.js build -c ./test/fixture/default/nuxt.config.js",
     "dev:fixture:start": "node ./node_modules/nuxt/bin/nuxt.js start -c ./test/fixture/default/nuxt.config.js",
     "dev:generate": "nuxt generate -c ./test/fixture/default/nuxt.config.js --force-build",

test/fixture/default/nuxt.config.js

@@ -15,11 +15,13 @@ const config = {
     SentryModule,
   ],
   sentry: {
+    dsn: 'https://[email protected]/1429779',
     clientIntegrations: {
       // Integration from @Sentry/browser package.
       TryCatch: { eventTarget: false },
     },
     customClientIntegrations: '~/config/custom-client-integrations.js',
+    tracing: true,
     publishRelease: {
       authToken: 'fakeToken',
       org: 'MyCompany',

yarn.lock

@@ -4746,20 +4746,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001228:
-  version "1.0.30001435"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001435.tgz#502c93dbd2f493bee73a408fe98e98fb1dad10b2"
-  integrity sha512-kdCkUTjR+v4YAJelyiDTqiu82BDr4W4CP5sgTA0ZBmqn30XfS2ZghPLMowik9TPhS+psWJiUNxsqLyurDbmutA==
-
-caniuse-lite@^1.0.30001332:
-  version "1.0.30001342"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001342.tgz#87152b1e3b950d1fbf0093e23f00b6c8e8f1da96"
-  integrity sha512-bn6sOCu7L7jcbBbyNhLg0qzXdJ/PMbybZTH/BA6Roet9wxYRm6Tr9D0s0uhLkOZ6MSG+QU6txUgdpr3MXIVqjA==
-
-caniuse-lite@^1.0.30001400:
-  version "1.0.30001412"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001412.tgz#30f67d55a865da43e0aeec003f073ea8764d5d7c"
-  integrity sha512-+TeEIee1gS5bYOiuf+PS/kp2mrXic37Hl66VY6EAfxasIk5fELTktK2oOezYed12H8w7jt3s512PpulQidPjwA==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001228, caniuse-lite@^1.0.30001332, caniuse-lite@^1.0.30001400:
+  version "1.0.30001439"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001439.tgz"
+  integrity sha512-1MgUzEkoMO6gKfXflStpYgZDlFM7M/ck/bgfVCACO5vnAf0fXoNVHdWtqGU+MYca+4bL9Z5bpOVmR33cWW9G2A==
 
 caseless@~0.12.0:
   version "0.12.0"