From 548a40242c51f4b62f568aa7dd39f769a9796604 Mon Sep 17 00:00:00 2001 From: Andrei Borza Date: Fri, 6 Sep 2024 14:30:58 +0900 Subject: [PATCH 1/2] fix(nextjs): Use posix paths for sourcemap uploads Currently, we use `path.join` to provide sourcemap directories. On Windows, the resulting strings would use `\` which is an escape character for glob patterns and thus no sourcemaps would be found. This fix ensures we use posix paths which glob then handles correctly on Windows too. Closes: https://github.com/getsentry/sentry-javascript/issues/13270 Partly fixes: https://github.com/getsentry/sentry-javascript/issues/13288 --- .../nextjs/src/config/webpackPluginOptions.ts | 36 +++++++++++-------- .../webpack/webpackPluginOptions.test.ts | 18 +++++++++- 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/packages/nextjs/src/config/webpackPluginOptions.ts b/packages/nextjs/src/config/webpackPluginOptions.ts index 1bca9bff49b6..7b183047896a 100644 --- a/packages/nextjs/src/config/webpackPluginOptions.ts +++ b/packages/nextjs/src/config/webpackPluginOptions.ts @@ -11,37 +11,43 @@ export function getWebpackPluginOptions( buildContext: BuildContext, sentryBuildOptions: SentryBuildOptions, ): SentryWebpackPluginOptions { - const { buildId, isServer, config: userNextConfig, dir: projectDir, nextRuntime } = buildContext; + const { buildId, isServer, config: userNextConfig, dir, nextRuntime } = buildContext; const prefixInsert = !isServer ? 'Client' : nextRuntime === 'edge' ? 'Edge' : 'Node.js'; - const distDirAbsPath = path.join(projectDir, (userNextConfig as NextConfigObject).distDir || '.next'); // `.next` is the default directory + // We need to convert paths to posix because Glob patterns use `\` to escape + // glob characters. This clashes with Windows path separators. + // See: https://www.npmjs.com/package/glob + const projectDir = dir.replace(/\\/g, '/'); + // `.next` is the default directory + const distDir = (userNextConfig as NextConfigObject).distDir?.replace(/\\/g, '/') ?? '.next'; + const distDirAbsPath = path.posix.join(projectDir, distDir); let sourcemapUploadAssets: string[] = []; const sourcemapUploadIgnore: string[] = []; if (isServer) { sourcemapUploadAssets.push( - path.join(distDirAbsPath, 'server', '**'), // This is normally where Next.js outputs things - path.join(distDirAbsPath, 'serverless', '**'), // This was the output location for serverless Next.js + path.posix.join(distDirAbsPath, 'server', '**'), // This is normally where Next.js outputs things + path.posix.join(distDirAbsPath, 'serverless', '**'), // This was the output location for serverless Next.js ); } else { if (sentryBuildOptions.widenClientFileUpload) { - sourcemapUploadAssets.push(path.join(distDirAbsPath, 'static', 'chunks', '**')); + sourcemapUploadAssets.push(path.posix.join(distDirAbsPath, 'static', 'chunks', '**')); } else { sourcemapUploadAssets.push( - path.join(distDirAbsPath, 'static', 'chunks', 'pages', '**'), - path.join(distDirAbsPath, 'static', 'chunks', 'app', '**'), + path.posix.join(distDirAbsPath, 'static', 'chunks', 'pages', '**'), + path.posix.join(distDirAbsPath, 'static', 'chunks', 'app', '**'), ); } // TODO: We should think about uploading these when `widenClientFileUpload` is `true`. They may be useful in some situations. sourcemapUploadIgnore.push( - path.join(distDirAbsPath, 'static', 'chunks', 'framework-*'), - path.join(distDirAbsPath, 'static', 'chunks', 'framework.*'), - path.join(distDirAbsPath, 'static', 'chunks', 'main-*'), - path.join(distDirAbsPath, 'static', 'chunks', 'polyfills-*'), - path.join(distDirAbsPath, 'static', 'chunks', 'webpack-*'), + path.posix.join(distDirAbsPath, 'static', 'chunks', 'framework-*'), + path.posix.join(distDirAbsPath, 'static', 'chunks', 'framework.*'), + path.posix.join(distDirAbsPath, 'static', 'chunks', 'main-*'), + path.posix.join(distDirAbsPath, 'static', 'chunks', 'polyfills-*'), + path.posix.join(distDirAbsPath, 'static', 'chunks', 'webpack-*'), ); } @@ -79,9 +85,9 @@ export function getWebpackPluginOptions( // We only care to delete client bundle source maps because they would be the ones being served. // Removing the server source maps crashes Vercel builds for (thus far) unknown reasons: // https://github.com/getsentry/sentry-javascript/issues/13099 - path.join(distDirAbsPath, 'static', '**', '*.js.map'), - path.join(distDirAbsPath, 'static', '**', '*.mjs.map'), - path.join(distDirAbsPath, 'static', '**', '*.cjs.map'), + path.posix.join(distDirAbsPath, 'static', '**', '*.js.map'), + path.posix.join(distDirAbsPath, 'static', '**', '*.mjs.map'), + path.posix.join(distDirAbsPath, 'static', '**', '*.cjs.map'), ] : undefined, ...sentryBuildOptions.unstable_sentryWebpackPluginOptions?.sourcemaps, diff --git a/packages/nextjs/test/config/webpack/webpackPluginOptions.test.ts b/packages/nextjs/test/config/webpack/webpackPluginOptions.test.ts index 557859b2a7e1..135c36fc8835 100644 --- a/packages/nextjs/test/config/webpack/webpackPluginOptions.test.ts +++ b/packages/nextjs/test/config/webpack/webpackPluginOptions.test.ts @@ -2,6 +2,7 @@ import type { BuildContext, NextConfigObject } from '../../../src/config/types'; import { getWebpackPluginOptions } from '../../../src/config/webpackPluginOptions'; function generateBuildContext(overrides: { + dir?: string; isServer: boolean; nextjsConfig?: NextConfigObject; }): BuildContext { @@ -9,7 +10,7 @@ function generateBuildContext(overrides: { dev: false, // The plugin is not included in dev mode isServer: overrides.isServer, buildId: 'test-build-id', - dir: '/my/project/dir', + dir: overrides.dir ?? '/my/project/dir', config: overrides.nextjsConfig ?? {}, totalPages: 2, defaultLoaders: true, @@ -171,4 +172,19 @@ describe('getWebpackPluginOptions()', () => { assets: [], }); }); + + it('passes posix paths to the plugin', () => { + const buildContext = generateBuildContext({ dir: 'C:\\my\\windows\\project\\dir', isServer: false }); + const generatedPluginOptions = getWebpackPluginOptions(buildContext, { widenClientFileUpload: true }); + expect(generatedPluginOptions.sourcemaps).toMatchObject({ + assets: ['C:/my/windows/project/dir/.next/static/chunks/**'], + ignore: [ + 'C:/my/windows/project/dir/.next/static/chunks/framework-*', + 'C:/my/windows/project/dir/.next/static/chunks/framework.*', + 'C:/my/windows/project/dir/.next/static/chunks/main-*', + 'C:/my/windows/project/dir/.next/static/chunks/polyfills-*', + 'C:/my/windows/project/dir/.next/static/chunks/webpack-*', + ], + }); + }) }); From 714e451aabed43bddd94ba6437012c87a0a96c06 Mon Sep 17 00:00:00 2001 From: Andrei Borza Date: Fri, 6 Sep 2024 14:57:18 +0900 Subject: [PATCH 2/2] Test `distDir` as well --- .../webpack/webpackPluginOptions.test.ts | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/packages/nextjs/test/config/webpack/webpackPluginOptions.test.ts b/packages/nextjs/test/config/webpack/webpackPluginOptions.test.ts index 135c36fc8835..177077d2b5c4 100644 --- a/packages/nextjs/test/config/webpack/webpackPluginOptions.test.ts +++ b/packages/nextjs/test/config/webpack/webpackPluginOptions.test.ts @@ -174,17 +174,21 @@ describe('getWebpackPluginOptions()', () => { }); it('passes posix paths to the plugin', () => { - const buildContext = generateBuildContext({ dir: 'C:\\my\\windows\\project\\dir', isServer: false }); + const buildContext = generateBuildContext({ + dir: 'C:\\my\\windows\\project\\dir', + nextjsConfig: { distDir: '.dist\\v1' }, + isServer: false, + }); const generatedPluginOptions = getWebpackPluginOptions(buildContext, { widenClientFileUpload: true }); expect(generatedPluginOptions.sourcemaps).toMatchObject({ - assets: ['C:/my/windows/project/dir/.next/static/chunks/**'], + assets: ['C:/my/windows/project/dir/.dist/v1/static/chunks/**'], ignore: [ - 'C:/my/windows/project/dir/.next/static/chunks/framework-*', - 'C:/my/windows/project/dir/.next/static/chunks/framework.*', - 'C:/my/windows/project/dir/.next/static/chunks/main-*', - 'C:/my/windows/project/dir/.next/static/chunks/polyfills-*', - 'C:/my/windows/project/dir/.next/static/chunks/webpack-*', + 'C:/my/windows/project/dir/.dist/v1/static/chunks/framework-*', + 'C:/my/windows/project/dir/.dist/v1/static/chunks/framework.*', + 'C:/my/windows/project/dir/.dist/v1/static/chunks/main-*', + 'C:/my/windows/project/dir/.dist/v1/static/chunks/polyfills-*', + 'C:/my/windows/project/dir/.dist/v1/static/chunks/webpack-*', ], }); - }) + }); });