STASH

Author: lobsterkatie

package.json

@@ -60,7 +60,7 @@
     "jest": "^24.7.1",
     "karma-browserstack-launcher": "^1.5.1",
     "karma-firefox-launcher": "^1.1.0",
-    "lerna": "3.13.4",
+    "lerna": "^4.0.0",
     "madge": "4.0.2",
     "mocha": "^6.1.4",
     "npm-run-all": "^4.1.2",

packages/browser/package.json

@@ -51,7 +51,7 @@
     "rollup-plugin-typescript2": "^0.21.0",
     "sinon": "^7.3.2",
     "typescript": "3.7.5",
-    "webpack": "^4.30.0"
+    "webpack": "^5"
   },
   "scripts": {
     "build": "run-s build:es5 build:esm build:bundle",

packages/nextjs/package.json

@@ -24,11 +24,12 @@
     "@sentry/tracing": "6.13.3",
     "@sentry/utils": "6.13.3",
     "@sentry/webpack-plugin": "1.17.3",
-    "tslib": "^1.9.3"
+    "tslib": "^1.9.3",
+    "webpack-inject-plugin": "1.5.4"
   },
   "devDependencies": {
     "@sentry/types": "6.13.3",
-    "@types/webpack": "^5.28.0",
+    "@types/webpack": ">= 4.41.31",
     "eslint": "7.20.0",
     "next": "10.1.3",
     "rimraf": "3.0.2"

packages/nextjs/src/config/webpack.ts

@@ -4,6 +4,7 @@ import { default as SentryWebpackPlugin } from '@sentry/webpack-plugin';
 import * as fs from 'fs';
 import * as path from 'path';
 import { DefinePlugin, WebpackPluginInstance } from 'webpack';
+import { default as InjectPlugin, ENTRY_ORDER } from 'webpack-inject-plugin';
 
 import {
   BuildContext,
@@ -92,6 +93,13 @@ export function constructWebpackConfigFunction(
       newConfig.plugins.push(new DefinePlugin({ __rewriteFramesDistDir__: distDir }));
     }
 
+    newConfig.plugins.push(
+      (new InjectPlugin(() => `global.__rewriteFramesDistDir__ = ${distDir};`, {
+        entryName: shouldAddSentryToEntryPoint, //  Limit the injected code to only the entry w/ this name
+        entryOrder: ENTRY_ORDER.First, //  Make the injected code be the first entry point
+      }) as unknown) as WebpackPluginInstance, // necessary because of a mismatch in @types/webpack versions between this plugin
+    );
+
     // Enable the Sentry plugin (which uploads source maps to Sentry when not in dev) by default
     const enableWebpackPlugin = buildContext.isServer
       ? !userNextConfig.sentry?.disableServerWebpackPlugin

packages/nextjs/src/index.server.ts

@@ -46,6 +46,8 @@ function sdkAlreadyInitialized(): boolean {
   return !!hub.getClient();
 }
 
+debugger;
+
 // webpack will replace this placeholder at build time
 const SOURCEMAP_FILENAME_REGEX = new RegExp(escapeStringForRegex('__rewriteFramesDistDir__'));
 

packages/nextjs/test/config.test.ts

@@ -353,6 +353,7 @@ describe('webpack config', () => {
             incomingWebpackBuildContext: getBuildContext('server', mightHaveDistDir),
           });
 
+          // testing this separately from the definition values so that if this tests fails, it's clear why
           expect(finalWebpackConfig.plugins).toEqual(expect.arrayContaining([expect.any(DefinePlugin)]));
 
           const definePluginInstance = findWebpackPlugin(finalWebpackConfig, 'DefinePlugin') as DefinePlugin;