support lazy option

nuxt-community · Feb 17, 2021 · 3a83ee7 · 3a83ee7
1 parent ffb5938
commit 3a83ee7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/plugin.client.js b/lib/plugin.client.js
@@ -17,6 +17,7 @@ if (options.initialize) {
 import { Integrations as TracingIntegrations } from '@sentry/tracing'
 <% } %>
 
+// eslint-disable-next-line require-await
 export default async function (ctx, inject) {
   <% if (options.initialize) { %>
   /* eslint-disable object-curly-spacing, quote-props, quotes, key-spacing, comma-spacing */
@@ -55,14 +56,13 @@ export default async function (ctx, inject) {
     config.integrations.push(<%= `new TracingIntegrations.BrowserTracing(${serialize(options.tracing.browserOptions)})` %>)
   <% } %>
   <% if (options.customIntegrationsPlugin) { %>
-  const customIntegrations = await Promise.resolve(getCustomIntegrations(ctx))
+  const customIntegrations = await getCustomIntegrations(ctx)
   if (Array.isArray(customIntegrations)) {
     config.integrations.push(...customIntegrations)
   } else {
     console.warn('[@nuxtjs/sentry] Invalid value returned from custom integrations function (must be an array)')
   }
   <% } %>
-
   /* eslint-enable object-curly-spacing, quote-props, quotes, key-spacing, comma-spacing */
   Sentry.init(config)
   <% } %>

diff --git a/lib/plugin.lazy.js b/lib/plugin.lazy.js
@@ -111,6 +111,7 @@ async function loadSentry (ctx, inject) {
     magicComments.push('webpackPreload: true')
   }
   %>
+  <%if (options.customIntegrationsPlugin) {%>const getCustomIntegrations = await import(/* <%= magicComments.join(', ') %> */ '<%= options.customIntegrationsPlugin %>')<%}%>
   const Sentry = await import(/* <%= magicComments.join(', ') %> */ '@sentry/browser')
   <%
   if (options.initialize) {
@@ -145,6 +146,14 @@ async function loadSentry (ctx, inject) {
       return `new ${name}({${integrationOptions.join(',')}})`
     }).join(',\n    ')%>
   ]
+  <%if (options.customIntegrationsPlugin) {%>
+  const customIntegrations = await getCustomIntegrations(ctx)
+  if (Array.isArray(customIntegrations)) {
+    config.integrations.push(...customIntegrations)
+  } else {
+    console.warn('[@nuxtjs/sentry] Invalid value returned from custom integrations function (must be an array)')
+  }
+  <% } %>
   /* eslint-enable object-curly-spacing, quote-props, quotes, key-spacing, comma-spacing */
   Sentry.init(config)
   <% } %>