From a3b5dcabb8d1e1c6c1662d9fedeee4377a774a1b Mon Sep 17 00:00:00 2001 From: s1gr1d Date: Wed, 25 Sep 2024 15:32:17 +0200 Subject: [PATCH 1/2] fix(nuxt): Use absolute path for client config --- packages/nuxt/src/vite/utils.ts | 2 +- packages/nuxt/test/vite/utils.test.ts | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/nuxt/src/vite/utils.ts b/packages/nuxt/src/vite/utils.ts index 7d794e807fd7..d3c4f814bc8e 100644 --- a/packages/nuxt/src/vite/utils.ts +++ b/packages/nuxt/src/vite/utils.ts @@ -24,5 +24,5 @@ export function findDefaultSdkInitFile(type: 'server' | 'client'): string | unde const filePath = filePaths.find(filename => fs.existsSync(filename)); - return filePath ? path.basename(filePath) : undefined; + return filePath ? filePath : undefined; } diff --git a/packages/nuxt/test/vite/utils.test.ts b/packages/nuxt/test/vite/utils.test.ts index 0ca81b3e2986..5115742be0f0 100644 --- a/packages/nuxt/test/vite/utils.test.ts +++ b/packages/nuxt/test/vite/utils.test.ts @@ -10,26 +10,26 @@ describe('findDefaultSdkInitFile', () => { }); it.each(['ts', 'js', 'mjs', 'cjs', 'mts', 'cts'])( - 'should return the server file with .%s extension if it exists', + 'should return the server file path with .%s extension if it exists', ext => { vi.spyOn(fs, 'existsSync').mockImplementation(filePath => { return !(filePath instanceof URL) && filePath.includes(`sentry.server.config.${ext}`); }); const result = findDefaultSdkInitFile('server'); - expect(result).toBe(`sentry.server.config.${ext}`); + expect(result).toMatch(`packages/nuxt/sentry.server.config.${ext}`); }, ); it.each(['ts', 'js', 'mjs', 'cjs', 'mts', 'cts'])( - 'should return the client file with .%s extension if it exists', + 'should return the client file path with .%s extension if it exists', ext => { vi.spyOn(fs, 'existsSync').mockImplementation(filePath => { return !(filePath instanceof URL) && filePath.includes(`sentry.client.config.${ext}`); }); const result = findDefaultSdkInitFile('client'); - expect(result).toBe(`sentry.client.config.${ext}`); + expect(result).toMatch(`packages/nuxt/sentry.client.config.${ext}`); }, ); @@ -47,7 +47,7 @@ describe('findDefaultSdkInitFile', () => { expect(result).toBeUndefined(); }); - it('should return the server config file if server.config and instrument exist', () => { + it('should return the server config file path if server.config and instrument exist', () => { vi.spyOn(fs, 'existsSync').mockImplementation(filePath => { return ( !(filePath instanceof URL) && @@ -56,6 +56,6 @@ describe('findDefaultSdkInitFile', () => { }); const result = findDefaultSdkInitFile('server'); - expect(result).toBe('sentry.server.config.js'); + expect(result).toMatch('packages/nuxt/sentry.server.config.js'); }); }); From ccb74e0bea64a133fe32c348f02c2ce0cf164c93 Mon Sep 17 00:00:00 2001 From: s1gr1d Date: Thu, 26 Sep 2024 09:38:09 +0200 Subject: [PATCH 2/2] review comments --- packages/nuxt/src/vite/utils.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/nuxt/src/vite/utils.ts b/packages/nuxt/src/vite/utils.ts index d3c4f814bc8e..e41d3fb06cab 100644 --- a/packages/nuxt/src/vite/utils.ts +++ b/packages/nuxt/src/vite/utils.ts @@ -22,7 +22,5 @@ export function findDefaultSdkInitFile(type: 'server' | 'client'): string | unde } } - const filePath = filePaths.find(filename => fs.existsSync(filename)); - - return filePath ? filePath : undefined; + return filePaths.find(filename => fs.existsSync(filename)); }