STASH

Author: lobsterkatie

packages/nextjs/package.json

@@ -29,7 +29,7 @@
   },
   "devDependencies": {
     "@sentry/types": "6.13.3",
-    "@types/webpack": ">= 4.41.31",
+    "@types/webpack": "^4.41.31",
     "eslint": "7.20.0",
     "next": "10.1.3",
     "rimraf": "3.0.2"

packages/nextjs/src/config/webpack.ts

@@ -2,13 +2,15 @@ import { getSentryRelease } from '@sentry/node';
 import { dropUndefinedKeys, logger } from '@sentry/utils';
 import { default as SentryWebpackPlugin } from '@sentry/webpack-plugin';
 import * as fs from 'fs';
+import * as os from 'os';
 import * as path from 'path';
-import { DefinePlugin, WebpackPluginInstance } from 'webpack';
-import { default as InjectPlugin, ENTRY_ORDER } from 'webpack-inject-plugin';
+// import * as rimraf from 'rimraf';
+import { WebpackPluginInstance } from 'webpack';
 
+// import { DefinePlugin, WebpackPluginInstance } from 'webpack';
+// import { default as InjectPlugin, ENTRY_ORDER } from 'webpack-inject-plugin';
 import {
   BuildContext,
-  EntryPointValue,
   EntryPropertyObject,
   NextConfigObject,
   SentryWebpackPluginOptions,
@@ -19,6 +21,13 @@ import {
 
 export { SentryWebpackPlugin };
 
+// const REWRITE_FRAMES_HELPER = path.resolve(
+//   fs.mkdtempSync(path.resolve(os.tmpdir(), 'sentry-')),
+//   'rewriteFramesHelper.js',
+// );
+// console.log(REWRITE_FRAMES_HELPER);
+// debugger;
+
 // TODO: merge default SentryWebpackPlugin ignore with their SentryWebpackPlugin ignore or ignoreFile
 // TODO: merge default SentryWebpackPlugin include with their SentryWebpackPlugin include
 // TODO: drop merged keys from override check? `includeDefaults` option?
@@ -80,25 +89,27 @@ export function constructWebpackConfigFunction(
       };
     }
 
-    // Support non-default output directories by making the output path (easy to get here at build-time) available to
+    // Support non-default  output directories by making the output path (easy to get here at build-time) available to
     // the SDK's default `RewriteFrames` instance (which needs it at runtime).
-    const distDir = buildContext.config.distDir;
+    // const distDir = buildContext.config.distDir;
     newConfig.plugins = newConfig.plugins || [];
 
-    const definePluginInstance = findWebpackPlugin(newConfig, 'DefinePlugin') as DefinePlugin;
-
-    if (definePluginInstance) {
-      definePluginInstance.definitions['__rewriteFramesDistDir__'] = distDir;
-    } else {
-      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
-    );
+    //     const definePluginInstance = findWebpackPlugin(newConfig, 'DefinePlugin') as DefinePlugin;
+    //
+    //     if (definePluginInstance) {
+    //       definePluginInstance.definitions['__rewriteFramesDistDir__'] = distDir;
+    //     } else {
+    //       newConfig.plugins.push(new DefinePlugin({ __rewriteFramesDistDir__: distDir }));
+    //     }
+
+    // if (buildContext.isServer) {
+    //   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
@@ -149,16 +160,38 @@ async function addSentryToEntryProperty(
   const newEntryProperty =
     typeof currentEntryProperty === 'function' ? await currentEntryProperty() : { ...currentEntryProperty };
 
+  // `sentry.server.config.js` or `sentry.client.config.js` (or their TS equivalents)
   const userConfigFile = buildContext.isServer
     ? getUserConfigFile(buildContext.dir, 'server')
     : getUserConfigFile(buildContext.dir, 'client');
 
+  // we need to turn the filename into a path so webpack can find it
+  const filesToInject = [`./${userConfigFile}`];
+
+  if (buildContext.isServer) {
+    const rewriteFramesHelper = path.resolve(
+      fs.mkdtempSync(path.resolve(os.tmpdir(), 'sentry-')),
+      'rewriteFramesHelper.js',
+    );
+    debugger;
+    // Support non-default  output directories by making the output path (easy to get here at build-time) available to
+    // the server SDK's default `RewriteFrames` instance (which needs it at runtime).
+    fs.writeFileSync(rewriteFramesHelper, `global.__rewriteFramesDistDir__ = '${buildContext.config.distDir}';\n`);
+    filesToInject.push(rewriteFramesHelper);
+  }
+
   for (const entryPointName in newEntryProperty) {
     if (shouldAddSentryToEntryPoint(entryPointName)) {
-      // we need to turn the filename into a path so webpack can find it
-      addFileToExistingEntryPoint(newEntryProperty, entryPointName, `./${userConfigFile}`);
+      addFilesToExistingEntryPoint(newEntryProperty, entryPointName, filesToInject);
     }
   }
+  //
+  //   if (buildContext.isServer) {
+  //     debugger;
+  //     rimraf(path.dirname(REWRITE_FRAMES_HELPER), err =>
+  //       logger.warn(`Could not remove ${REWRITE_FRAMES_HELPER}. Received error: ${err}`),
+  //     );
+  //   }
 
   return newEntryProperty;
 }
@@ -184,51 +217,52 @@ export function getUserConfigFile(projectDir: string, platform: 'server' | 'clie
 }
 
 /**
- * Add a file to a specific element of the given `entry` webpack config property.
+ * Add files to a specific element of the given `entry` webpack config property.
  *
  * @param entryProperty The existing `entry` config object
  * @param entryPointName The key where the file should be injected
- * @param filepath The path to the injected file
+ * @param filepaths An array of paths to the injected files
  */
-function addFileToExistingEntryPoint(
+function addFilesToExistingEntryPoint(
   entryProperty: EntryPropertyObject,
   entryPointName: string,
-  filepath: string,
+  filepaths: string[],
 ): void {
   // can be a string, array of strings, or object whose `import` property is one of those two
   const currentEntryPoint = entryProperty[entryPointName];
-  let newEntryPoint: EntryPointValue;
+  let newEntryPoint = currentEntryPoint;
 
   if (typeof currentEntryPoint === 'string') {
-    newEntryPoint = [filepath, currentEntryPoint];
+    newEntryPoint = [...filepaths, currentEntryPoint];
   } else if (Array.isArray(currentEntryPoint)) {
-    newEntryPoint = [filepath, ...currentEntryPoint];
+    newEntryPoint = [...filepaths, ...currentEntryPoint];
   }
   // descriptor object (webpack 5+)
   else if (typeof currentEntryPoint === 'object' && 'import' in currentEntryPoint) {
     const currentImportValue = currentEntryPoint.import;
     let newImportValue;
 
     if (typeof currentImportValue === 'string') {
-      newImportValue = [filepath, currentImportValue];
+      newImportValue = [...filepaths, currentImportValue];
     } else {
-      newImportValue = [filepath, ...currentImportValue];
+      newImportValue = [...filepaths, ...currentImportValue];
     }
 
     newEntryPoint = {
       ...currentEntryPoint,
       import: newImportValue,
     };
-  } else {
-    // mimic the logger prefix in order to use `console.warn` (which will always be printed, regardless of SDK settings)
+  }
+  // malformed entry point (use `console.error` rather than `logger.error` because it will always be printed, regardless
+  // of SDK settings)
+  else {
     // eslint-disable-next-line no-console
     console.error(
       'Sentry Logger [Error]:',
-      `Could not inject SDK initialization code into entry point ${entryPointName}, as it is not a recognized format.\n`,
+      `Could not inject SDK initialization code into entry point ${entryPointName}, as its current value is not in a recognized format.\n`,
       `Expected: string | Array<string> | { [key:string]: any, import: string | Array<string> }\n`,
       `Got: ${currentEntryPoint}`,
     );
-    return;
   }
 
   entryProperty[entryPointName] = newEntryPoint;

packages/nextjs/src/index.server.ts

@@ -46,10 +46,15 @@ function sdkAlreadyInitialized(): boolean {
   return !!hub.getClient();
 }
 
-debugger;
+// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+// console.log((global as any).__rewriteFramesDistDir__);
+// debugger;
 
 // webpack will replace this placeholder at build time
-const SOURCEMAP_FILENAME_REGEX = new RegExp(escapeStringForRegex('__rewriteFramesDistDir__'));
+
+// FIXME
+// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+const SOURCEMAP_FILENAME_REGEX = new RegExp(escapeStringForRegex((global as any).__rewriteFramesDistDir__));
 
 const defaultRewriteFramesIntegration = new RewriteFrames({
   iteratee: frame => {

packages/nextjs/vercel/install-sentry-from-branch.sh

@@ -43,7 +43,7 @@ PACKAGES_DIR="$REPO_DIR/packages"
 # Escape all of the slashes in the path for use in sed
 ESCAPED_PACKAGES_DIR=$(echo $PACKAGES_DIR | sed s/'\/'/'\\\/'/g)
 
-PACKAGE_NAMES=$(ls PACKAGES_DIR)
+PACKAGE_NAMES=$(ls $PACKAGES_DIR)
 
 # Modify each package's package.json file by searching in it for sentry dependencies from the monorepo and, for each
 # sibling dependency found, replacing the version number with a file dependency pointing to the sibling itself (so

yarn.lock

@@ -3799,7 +3799,7 @@
     "@types/source-list-map" "*"
     source-map "^0.7.3"
 
-"@types/webpack@^4", "@types/webpack@^4.4.17":
+"@types/webpack@^4", "@types/webpack@^4.4.17", "@types/webpack@^4.41.31":
   version "4.41.31"
   resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.31.tgz#c35f252a3559ddf9c85c0d8b0b42019025e581aa"
   integrity sha512-/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ==
@@ -3811,15 +3811,6 @@
     anymatch "^3.0.0"
     source-map "^0.6.0"
 
-"@types/webpack@^5.28.0":
-  version "5.28.0"
-  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-5.28.0.tgz#78dde06212f038d77e54116cfe69e88ae9ed2c03"
-  integrity sha512-8cP0CzcxUiFuA9xGJkfeVpqmWTk9nx6CWwamRGCj95ph1SmlRRk9KlCZ6avhCbZd4L68LvYT6l1kpdEnQXrF8w==
-  dependencies:
-    "@types/node" "*"
-    tapable "^2.2.0"
-    webpack "^5"
-
 "@types/yargs-parser@*":
   version "20.2.0"
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz#dd3e6699ba3237f0348cd085e4698780204842f9"