Skip to content

fix(nuxt): Use absolute path for client config #13798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 26, 2024
Merged

fix(nuxt): Use absolute path for client config #13798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3b5dca
fix(nuxt): Use absolute path for client config
s1gr1d Sep 25, 2024
ccb74e0
review comments
s1gr1d Sep 26, 2024
9f461e9
Merge branch 'develop' into sig/init-file-path
s1gr1d Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions packages/nuxt/src/vite/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,5 @@ export function findDefaultSdkInitFile(type: 'server' | 'client'): string | unde
}
}

const filePath = filePaths.find(filename => fs.existsSync(filename));

return filePath ? path.basename(filePath) : undefined;
return filePaths.find(filename => fs.existsSync(filename));
}
12 changes: 6 additions & 6 deletions packages/nuxt/test/vite/utils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}`);
},
);

Expand All @@ -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) &&
Expand All @@ -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');
});
});
Loading