cleanup

Author: lobsterkatie

packages/nextjs/src/config/webpack.ts

@@ -89,28 +89,6 @@ export function constructWebpackConfigFunction(
       };
     }
 
-    // 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;
-    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 }));
-    //     }
-
-    // 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
       ? !userNextConfig.sentry?.disableServerWebpackPlugin
@@ -127,6 +105,7 @@ export function constructWebpackConfigFunction(
         newConfig.devtool = 'source-map';
       }
 
+      newConfig.plugins = newConfig.plugins || [];
       newConfig.plugins.push(
         new SentryWebpackPlugin(getWebpackPluginOptions(buildContext, userSentryWebpackPluginOptions)),
       );
@@ -168,30 +147,24 @@ async function addSentryToEntryProperty(
   // we need to turn the filename into a path so webpack can find it
   const filesToInject = [`./${userConfigFile}`];
 
+  // 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).
   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);
+    const buildDirAbsPath = path.resolve(buildContext.dir, buildContext.config.distDir);
+    fs.writeFileSync(rewriteFramesHelper, `global.__rewriteFramesDistDir__ = '${buildDirAbsPath}';\n`);
+    filesToInject.unshift(rewriteFramesHelper);
   }
 
+  //
   for (const entryPointName in newEntryProperty) {
     if (shouldAddSentryToEntryPoint(entryPointName)) {
       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;
 }