feat(nuxt): Add server config to root folder - #13583

Merged
s1gr1d merged 8 commits into
developfrom
sig/server-config-nuxt
Sep 9, 2024
Merged

feat(nuxt): Add server config to root folder#13583
s1gr1d merged 8 commits into
developfrom
sig/server-config-nuxt

Conversation

@s1gr1d

Copy link
Copy Markdown
Member

This is a draft PR as this approach leads to an error as hook.mjs is not included in the node_modules. This has been fixed upstream but was not yet released for nuxt.

Makes it possible to include a sentry.server.config.ts file in the root folder alongside sentry.client.config.ts. Currently, it has to be added in the public folder which is not 100% ideal.

@s1gr1ds1gr1d mentioned this pull request Sep 4, 2024
@github-actions

github-actionsBot commented Sep 4, 2024

Copy link
Copy Markdown
Contributor

size-limit report 📦

⚠️Warning: Base artifact is not the latest one, because the latest workflow run is not done yet. This may lead to incorrect results. Try to re-run all tests to get up to date results.

PathSize% ChangeChange
@sentry/browser22.52 KB--
@sentry/browser - with treeshaking flags21.3 KB--
@sentry/browser (incl. Tracing)34.78 KB--
@sentry/browser (incl. Tracing, Replay)71.23 KB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags61.67 KB--
@sentry/browser (incl. Tracing, Replay with Canvas)75.57 KB--
@sentry/browser (incl. Tracing, Replay, Feedback)88.3 KB--
@sentry/browser (incl. Tracing, Replay, Feedback, metrics)90.14 KB--
@sentry/browser (incl. metrics)26.83 KB--
@sentry/browser (incl. Feedback)39.6 KB--
@sentry/browser (incl. sendFeedback)27.19 KB--
@sentry/browser (incl. FeedbackAsync)31.9 KB--
@sentry/react25.28 KB--
@sentry/react (incl. Tracing)37.74 KB--
@sentry/vue26.67 KB--
@sentry/vue (incl. Tracing)36.61 KB--
@sentry/svelte22.65 KB--
CDN Bundle23.77 KB--
CDN Bundle (incl. Tracing)36.49 KB--
CDN Bundle (incl. Tracing, Replay)70.91 KB--
CDN Bundle (incl. Tracing, Replay, Feedback)76.22 KB--
CDN Bundle - uncompressed69.63 KB--
CDN Bundle (incl. Tracing) - uncompressed108.21 KB--
CDN Bundle (incl. Tracing, Replay) - uncompressed219.87 KB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed233.07 KB--
@sentry/nextjs (client)37.51 KB--
@sentry/sveltekit (client)35.35 KB--
@sentry/node126.36 KB+1.11%+1.38 KB 🔺
@sentry/node - without tracing98.84 KB+3.5%+3.34 KB 🔺
@sentry/aws-serverless109.1 KB+1.48%+1.58 KB 🔺

View base workflow run

@s1gr1d
s1gr1dforce-pushed the sig/server-config-nuxt branch from 6cd63cb to ea95e37CompareSeptember 5, 2024 11:42
@nandi95

Copy link
Copy Markdown

This indeed would be helpful as I have a project which a merge of a laravel a nuxt project. Nuxt project is in the folder nuxt and I have the srcDir in the nuxt config set. This module should respect that and the rootDir configuration of nuxt.

? path.join(cwd,'public',`instrument.${type}.${e}`)

This indeed

@s1gr1d
s1gr1d marked this pull request as ready for review September 6, 2024 14:12
@s1gr1d

Copy link
Copy Markdown
MemberAuthor

@nandi95 If I understand you correctly, you are defining a curstom rootDir in the nuxt config?

@s1gr1d
s1gr1d requested a review from Lms24September 6, 2024 14:14
@nandi95

Copy link
Copy Markdown

I only meant to say that I define a srcDir so it's not the default expected nuxt directory structure.
And remind that there's also a rootDir option.
This will especially be importent when nuxt 4 comes out and has a different folder structure.

if (moduleOptions.debug) {
// eslint-disable-next-line no-console
console.log(
'[Sentry] Using your `sentry.server.config` file for the server-side Sentry configuration. In case you have a `public/instrument.server` file, it will be ignored.',

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(...) it will be ignored

This reads a bit confusing, which of the two files are being ignored?

I think we could check here for the existence of the file and log explicitly if that file is getting ignored, wdyt?

Also, we are ignoring the public file here but users will still potentially --import it. This log makes it sound like it's completely ignored.

@Lms24Lms24Sep 9, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this log should be split up.

1st part (public): can we log a warning if we detect the file in public instead of the first part of this message? Otherwise, I don't think we need to bother users with it, right?

To the second part: Can we instead print the exact import command? Something like

"Make sure to add --import ./.output/sentry.server.config.mjs to your NODE_OPTIONS env variable"

if (moduleOptions.debug) {
// eslint-disable-next-line no-console
console.log(
'[Sentry] Successfully added the content of the `sentry.server.config` file as `instrument-sentry.mjs` to the `.output/server` directory',

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: Maybe we can use destination here?

Comment threadpackages/nuxt/src/module.ts

@Lms24Lms24 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work! Other than the console log, this looks good to me!

We can follow up with the e2e tests after this is merged, given we hit some road blocks there

Comment on lines +49 to +65
it('should return the server file with .ts extension if it exists', () => {
vi.spyOn(fs, 'existsSync').mockImplementation(filePath => {
return !(filePath instanceof URL) && filePath.includes('sentry.server.config.ts');
});

const result = findDefaultSdkInitFile('server');
expect(result).toBe('sentry.server.config.ts');
});

it('should return the client file with .mjs extension if it exists', () => {
vi.spyOn(fs, 'existsSync').mockImplementation(filePath => {
return !(filePath instanceof URL) && filePath.includes('sentry.client.config.mjs');
});

const result = findDefaultSdkInitFile('client');
expect(result).toBe('sentry.client.config.mjs');
});

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: For some test extra credit (feel free to disregard) - we could use an it.each to test against all file types we search for.

@s1gr1d
s1gr1d merged commit 45156d2 into developSep 9, 2024
@s1gr1d
s1gr1d deleted the sig/server-config-nuxt branch September 9, 2024 10:18
@wanderowski

Copy link
Copy Markdown

Hello! Thank you for the work you have done!

Could you please clarify, should we somehow modify the command for running the project on server in package.json? I see that now we can put sentry.server.config.ts in the root folder, but did not find any instructions on how to modify starting command. Previously, it was required to paste this:

{
"scripts": {
"preview": "NODE_OPTIONS='--import ./public/instrument.server.mjs' nuxt preview",
"start": "node --import .output/public/instrument.server.mjs .output/server/index.mjs"
}
}

If i put my config file in the root folder and deleted instrument.server.mjs from public folder, should I modify these commands as well?

@s1gr1d

s1gr1d commented Sep 10, 2024

Copy link
Copy Markdown
MemberAuthor

@wanderowski This PR is not released yet and more elaborate docs on this are still coming for the official docs page.

The file can be added like this:

"start": "node --import ./.output/server/sentry.server.config.mjs .output/server/index.mjs",

As it only affects the server, it can only be added to the start script. The preview script attempts to load data from the .nuxt folder as well and this would not work. It worked with the public folder as this folder is the same during development and in production.

However, it could be that your environment variables from the .env file are not yet loaded. You can explicitly include them with --env-file=.env (like described here).

@wanderowski

Copy link
Copy Markdown

@s1gr1d Thanks!

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@s1gr1d@nandi95@wanderowski@Lms24@andreiborza
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

feat(nuxt): Add server config to root folder - #13583

Merged
s1gr1d merged 8 commits into
developfrom
sig/server-config-nuxt
Sep 9, 2024
Merged

feat(nuxt): Add server config to root folder#13583
s1gr1d merged 8 commits into
developfrom
sig/server-config-nuxt

Conversation

@s1gr1d

Copy link
Copy Markdown
Member

This is a draft PR as this approach leads to an error as hook.mjs is not included in the node_modules. This has been fixed upstream but was not yet released for nuxt.

Makes it possible to include a sentry.server.config.ts file in the root folder alongside sentry.client.config.ts. Currently, it has to be added in the public folder which is not 100% ideal.

@s1gr1ds1gr1d mentioned this pull request Sep 4, 2024
@github-actions

github-actionsBot commented Sep 4, 2024

Copy link
Copy Markdown
Contributor

size-limit report 📦

⚠️Warning: Base artifact is not the latest one, because the latest workflow run is not done yet. This may lead to incorrect results. Try to re-run all tests to get up to date results.

PathSize% ChangeChange
@sentry/browser22.52 KB--
@sentry/browser - with treeshaking flags21.3 KB--
@sentry/browser (incl. Tracing)34.78 KB--
@sentry/browser (incl. Tracing, Replay)71.23 KB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags61.67 KB--
@sentry/browser (incl. Tracing, Replay with Canvas)75.57 KB--
@sentry/browser (incl. Tracing, Replay, Feedback)88.3 KB--
@sentry/browser (incl. Tracing, Replay, Feedback, metrics)90.14 KB--
@sentry/browser (incl. metrics)26.83 KB--
@sentry/browser (incl. Feedback)39.6 KB--
@sentry/browser (incl. sendFeedback)27.19 KB--
@sentry/browser (incl. FeedbackAsync)31.9 KB--
@sentry/react25.28 KB--
@sentry/react (incl. Tracing)37.74 KB--
@sentry/vue26.67 KB--
@sentry/vue (incl. Tracing)36.61 KB--
@sentry/svelte22.65 KB--
CDN Bundle23.77 KB--
CDN Bundle (incl. Tracing)36.49 KB--
CDN Bundle (incl. Tracing, Replay)70.91 KB--
CDN Bundle (incl. Tracing, Replay, Feedback)76.22 KB--
CDN Bundle - uncompressed69.63 KB--
CDN Bundle (incl. Tracing) - uncompressed108.21 KB--
CDN Bundle (incl. Tracing, Replay) - uncompressed219.87 KB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed233.07 KB--
@sentry/nextjs (client)37.51 KB--
@sentry/sveltekit (client)35.35 KB--
@sentry/node126.36 KB+1.11%+1.38 KB 🔺
@sentry/node - without tracing98.84 KB+3.5%+3.34 KB 🔺
@sentry/aws-serverless109.1 KB+1.48%+1.58 KB 🔺

View base workflow run

@s1gr1d
s1gr1dforce-pushed the sig/server-config-nuxt branch from 6cd63cb to ea95e37CompareSeptember 5, 2024 11:42
@nandi95

Copy link
Copy Markdown

This indeed would be helpful as I have a project which a merge of a laravel a nuxt project. Nuxt project is in the folder nuxt and I have the srcDir in the nuxt config set. This module should respect that and the rootDir configuration of nuxt.

? path.join(cwd,'public',`instrument.${type}.${e}`)

This indeed

@s1gr1d
s1gr1d marked this pull request as ready for review September 6, 2024 14:12
@s1gr1d

Copy link
Copy Markdown
MemberAuthor

@nandi95 If I understand you correctly, you are defining a curstom rootDir in the nuxt config?

@s1gr1d
s1gr1d requested a review from Lms24September 6, 2024 14:14
@nandi95

Copy link
Copy Markdown

I only meant to say that I define a srcDir so it's not the default expected nuxt directory structure.
And remind that there's also a rootDir option.
This will especially be importent when nuxt 4 comes out and has a different folder structure.

if (moduleOptions.debug) {
// eslint-disable-next-line no-console
console.log(
'[Sentry] Using your `sentry.server.config` file for the server-side Sentry configuration. In case you have a `public/instrument.server` file, it will be ignored.',

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(...) it will be ignored

This reads a bit confusing, which of the two files are being ignored?

I think we could check here for the existence of the file and log explicitly if that file is getting ignored, wdyt?

Also, we are ignoring the public file here but users will still potentially --import it. This log makes it sound like it's completely ignored.

@Lms24Lms24Sep 9, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this log should be split up.

1st part (public): can we log a warning if we detect the file in public instead of the first part of this message? Otherwise, I don't think we need to bother users with it, right?

To the second part: Can we instead print the exact import command? Something like

"Make sure to add --import ./.output/sentry.server.config.mjs to your NODE_OPTIONS env variable"

if (moduleOptions.debug) {
// eslint-disable-next-line no-console
console.log(
'[Sentry] Successfully added the content of the `sentry.server.config` file as `instrument-sentry.mjs` to the `.output/server` directory',

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: Maybe we can use destination here?

Comment threadpackages/nuxt/src/module.ts

@Lms24Lms24 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work! Other than the console log, this looks good to me!

We can follow up with the e2e tests after this is merged, given we hit some road blocks there

Comment on lines +49 to +65
it('should return the server file with .ts extension if it exists', () => {
vi.spyOn(fs, 'existsSync').mockImplementation(filePath => {
return !(filePath instanceof URL) && filePath.includes('sentry.server.config.ts');
});

const result = findDefaultSdkInitFile('server');
expect(result).toBe('sentry.server.config.ts');
});

it('should return the client file with .mjs extension if it exists', () => {
vi.spyOn(fs, 'existsSync').mockImplementation(filePath => {
return !(filePath instanceof URL) && filePath.includes('sentry.client.config.mjs');
});

const result = findDefaultSdkInitFile('client');
expect(result).toBe('sentry.client.config.mjs');
});

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: For some test extra credit (feel free to disregard) - we could use an it.each to test against all file types we search for.

@s1gr1d
s1gr1d merged commit 45156d2 into developSep 9, 2024
@s1gr1d
s1gr1d deleted the sig/server-config-nuxt branch September 9, 2024 10:18
@wanderowski

Copy link
Copy Markdown

Hello! Thank you for the work you have done!

Could you please clarify, should we somehow modify the command for running the project on server in package.json? I see that now we can put sentry.server.config.ts in the root folder, but did not find any instructions on how to modify starting command. Previously, it was required to paste this:

{
"scripts": {
"preview": "NODE_OPTIONS='--import ./public/instrument.server.mjs' nuxt preview",
"start": "node --import .output/public/instrument.server.mjs .output/server/index.mjs"
}
}

If i put my config file in the root folder and deleted instrument.server.mjs from public folder, should I modify these commands as well?

@s1gr1d

s1gr1d commented Sep 10, 2024

Copy link
Copy Markdown
MemberAuthor

@wanderowski This PR is not released yet and more elaborate docs on this are still coming for the official docs page.

The file can be added like this:

"start": "node --import ./.output/server/sentry.server.config.mjs .output/server/index.mjs",

As it only affects the server, it can only be added to the start script. The preview script attempts to load data from the .nuxt folder as well and this would not work. It worked with the public folder as this folder is the same during development and in production.

However, it could be that your environment variables from the .env file are not yet loaded. You can explicitly include them with --env-file=.env (like described here).

@wanderowski

Copy link
Copy Markdown

@s1gr1d Thanks!

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@s1gr1d@nandi95@wanderowski@Lms24@andreiborza
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(nuxt): Add server config to root folder - #13583

Merged
s1gr1d merged 8 commits into
developfrom
sig/server-config-nuxt
Sep 9, 2024
Merged

feat(nuxt): Add server config to root folder#13583
s1gr1d merged 8 commits into
developfrom
sig/server-config-nuxt

Conversation

@s1gr1d

Copy link
Copy Markdown
Member

This is a draft PR as this approach leads to an error as hook.mjs is not included in the node_modules. This has been fixed upstream but was not yet released for nuxt.

Makes it possible to include a sentry.server.config.ts file in the root folder alongside sentry.client.config.ts. Currently, it has to be added in the public folder which is not 100% ideal.

@s1gr1ds1gr1d mentioned this pull request Sep 4, 2024
@github-actions

github-actionsBot commented Sep 4, 2024

Copy link
Copy Markdown
Contributor

size-limit report 📦

⚠️Warning: Base artifact is not the latest one, because the latest workflow run is not done yet. This may lead to incorrect results. Try to re-run all tests to get up to date results.

PathSize% ChangeChange
@sentry/browser22.52 KB--
@sentry/browser - with treeshaking flags21.3 KB--
@sentry/browser (incl. Tracing)34.78 KB--
@sentry/browser (incl. Tracing, Replay)71.23 KB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags61.67 KB--
@sentry/browser (incl. Tracing, Replay with Canvas)75.57 KB--
@sentry/browser (incl. Tracing, Replay, Feedback)88.3 KB--
@sentry/browser (incl. Tracing, Replay, Feedback, metrics)90.14 KB--
@sentry/browser (incl. metrics)26.83 KB--
@sentry/browser (incl. Feedback)39.6 KB--
@sentry/browser (incl. sendFeedback)27.19 KB--
@sentry/browser (incl. FeedbackAsync)31.9 KB--
@sentry/react25.28 KB--
@sentry/react (incl. Tracing)37.74 KB--
@sentry/vue26.67 KB--
@sentry/vue (incl. Tracing)36.61 KB--
@sentry/svelte22.65 KB--
CDN Bundle23.77 KB--
CDN Bundle (incl. Tracing)36.49 KB--
CDN Bundle (incl. Tracing, Replay)70.91 KB--
CDN Bundle (incl. Tracing, Replay, Feedback)76.22 KB--
CDN Bundle - uncompressed69.63 KB--
CDN Bundle (incl. Tracing) - uncompressed108.21 KB--
CDN Bundle (incl. Tracing, Replay) - uncompressed219.87 KB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed233.07 KB--
@sentry/nextjs (client)37.51 KB--
@sentry/sveltekit (client)35.35 KB--
@sentry/node126.36 KB+1.11%+1.38 KB 🔺
@sentry/node - without tracing98.84 KB+3.5%+3.34 KB 🔺
@sentry/aws-serverless109.1 KB+1.48%+1.58 KB 🔺

View base workflow run

@s1gr1d
s1gr1dforce-pushed the sig/server-config-nuxt branch from 6cd63cb to ea95e37CompareSeptember 5, 2024 11:42
@nandi95

Copy link
Copy Markdown

This indeed would be helpful as I have a project which a merge of a laravel a nuxt project. Nuxt project is in the folder nuxt and I have the srcDir in the nuxt config set. This module should respect that and the rootDir configuration of nuxt.

? path.join(cwd,'public',`instrument.${type}.${e}`)

This indeed

@s1gr1d
s1gr1d marked this pull request as ready for review September 6, 2024 14:12
@s1gr1d

Copy link
Copy Markdown
MemberAuthor

@nandi95 If I understand you correctly, you are defining a curstom rootDir in the nuxt config?

@s1gr1d
s1gr1d requested a review from Lms24September 6, 2024 14:14
@nandi95

Copy link
Copy Markdown

I only meant to say that I define a srcDir so it's not the default expected nuxt directory structure.
And remind that there's also a rootDir option.
This will especially be importent when nuxt 4 comes out and has a different folder structure.

if (moduleOptions.debug) {
// eslint-disable-next-line no-console
console.log(
'[Sentry] Using your `sentry.server.config` file for the server-side Sentry configuration. In case you have a `public/instrument.server` file, it will be ignored.',

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(...) it will be ignored

This reads a bit confusing, which of the two files are being ignored?

I think we could check here for the existence of the file and log explicitly if that file is getting ignored, wdyt?

Also, we are ignoring the public file here but users will still potentially --import it. This log makes it sound like it's completely ignored.

@Lms24Lms24Sep 9, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this log should be split up.

1st part (public): can we log a warning if we detect the file in public instead of the first part of this message? Otherwise, I don't think we need to bother users with it, right?

To the second part: Can we instead print the exact import command? Something like

"Make sure to add --import ./.output/sentry.server.config.mjs to your NODE_OPTIONS env variable"

if (moduleOptions.debug) {
// eslint-disable-next-line no-console
console.log(
'[Sentry] Successfully added the content of the `sentry.server.config` file as `instrument-sentry.mjs` to the `.output/server` directory',

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: Maybe we can use destination here?

Comment threadpackages/nuxt/src/module.ts

@Lms24Lms24 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work! Other than the console log, this looks good to me!

We can follow up with the e2e tests after this is merged, given we hit some road blocks there

Comment on lines +49 to +65
it('should return the server file with .ts extension if it exists', () => {
vi.spyOn(fs, 'existsSync').mockImplementation(filePath => {
return !(filePath instanceof URL) && filePath.includes('sentry.server.config.ts');
});

const result = findDefaultSdkInitFile('server');
expect(result).toBe('sentry.server.config.ts');
});

it('should return the client file with .mjs extension if it exists', () => {
vi.spyOn(fs, 'existsSync').mockImplementation(filePath => {
return !(filePath instanceof URL) && filePath.includes('sentry.client.config.mjs');
});

const result = findDefaultSdkInitFile('client');
expect(result).toBe('sentry.client.config.mjs');
});

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: For some test extra credit (feel free to disregard) - we could use an it.each to test against all file types we search for.

@s1gr1d
s1gr1d merged commit 45156d2 into developSep 9, 2024
@s1gr1d
s1gr1d deleted the sig/server-config-nuxt branch September 9, 2024 10:18
@wanderowski

Copy link
Copy Markdown

Hello! Thank you for the work you have done!

Could you please clarify, should we somehow modify the command for running the project on server in package.json? I see that now we can put sentry.server.config.ts in the root folder, but did not find any instructions on how to modify starting command. Previously, it was required to paste this:

{
"scripts": {
"preview": "NODE_OPTIONS='--import ./public/instrument.server.mjs' nuxt preview",
"start": "node --import .output/public/instrument.server.mjs .output/server/index.mjs"
}
}

If i put my config file in the root folder and deleted instrument.server.mjs from public folder, should I modify these commands as well?

@s1gr1d

s1gr1d commented Sep 10, 2024

Copy link
Copy Markdown
MemberAuthor

@wanderowski This PR is not released yet and more elaborate docs on this are still coming for the official docs page.

The file can be added like this:

"start": "node --import ./.output/server/sentry.server.config.mjs .output/server/index.mjs",

As it only affects the server, it can only be added to the start script. The preview script attempts to load data from the .nuxt folder as well and this would not work. It worked with the public folder as this folder is the same during development and in production.

However, it could be that your environment variables from the .env file are not yet loaded. You can explicitly include them with --env-file=.env (like described here).

@wanderowski

Copy link
Copy Markdown

@s1gr1d Thanks!

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@s1gr1d@nandi95@wanderowski@Lms24@andreiborza
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(nuxt): Add server config to root folder - #13583

Merged
s1gr1d merged 8 commits into
developfrom
sig/server-config-nuxt
Sep 9, 2024
Merged

feat(nuxt): Add server config to root folder#13583
s1gr1d merged 8 commits into
developfrom
sig/server-config-nuxt

Conversation

@s1gr1d

Copy link
Copy Markdown
Member

This is a draft PR as this approach leads to an error as hook.mjs is not included in the node_modules. This has been fixed upstream but was not yet released for nuxt.

Makes it possible to include a sentry.server.config.ts file in the root folder alongside sentry.client.config.ts. Currently, it has to be added in the public folder which is not 100% ideal.

@s1gr1ds1gr1d mentioned this pull request Sep 4, 2024
@github-actions

github-actionsBot commented Sep 4, 2024

Copy link
Copy Markdown
Contributor

size-limit report 📦

⚠️Warning: Base artifact is not the latest one, because the latest workflow run is not done yet. This may lead to incorrect results. Try to re-run all tests to get up to date results.

PathSize% ChangeChange
@sentry/browser22.52 KB--
@sentry/browser - with treeshaking flags21.3 KB--
@sentry/browser (incl. Tracing)34.78 KB--
@sentry/browser (incl. Tracing, Replay)71.23 KB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags61.67 KB--
@sentry/browser (incl. Tracing, Replay with Canvas)75.57 KB--
@sentry/browser (incl. Tracing, Replay, Feedback)88.3 KB--
@sentry/browser (incl. Tracing, Replay, Feedback, metrics)90.14 KB--
@sentry/browser (incl. metrics)26.83 KB--
@sentry/browser (incl. Feedback)39.6 KB--
@sentry/browser (incl. sendFeedback)27.19 KB--
@sentry/browser (incl. FeedbackAsync)31.9 KB--
@sentry/react25.28 KB--
@sentry/react (incl. Tracing)37.74 KB--
@sentry/vue26.67 KB--
@sentry/vue (incl. Tracing)36.61 KB--
@sentry/svelte22.65 KB--
CDN Bundle23.77 KB--
CDN Bundle (incl. Tracing)36.49 KB--
CDN Bundle (incl. Tracing, Replay)70.91 KB--
CDN Bundle (incl. Tracing, Replay, Feedback)76.22 KB--
CDN Bundle - uncompressed69.63 KB--
CDN Bundle (incl. Tracing) - uncompressed108.21 KB--
CDN Bundle (incl. Tracing, Replay) - uncompressed219.87 KB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed233.07 KB--
@sentry/nextjs (client)37.51 KB--
@sentry/sveltekit (client)35.35 KB--
@sentry/node126.36 KB+1.11%+1.38 KB 🔺
@sentry/node - without tracing98.84 KB+3.5%+3.34 KB 🔺
@sentry/aws-serverless109.1 KB+1.48%+1.58 KB 🔺

View base workflow run

@s1gr1d
s1gr1dforce-pushed the sig/server-config-nuxt branch from 6cd63cb to ea95e37CompareSeptember 5, 2024 11:42
@nandi95

Copy link
Copy Markdown

This indeed would be helpful as I have a project which a merge of a laravel a nuxt project. Nuxt project is in the folder nuxt and I have the srcDir in the nuxt config set. This module should respect that and the rootDir configuration of nuxt.

? path.join(cwd,'public',`instrument.${type}.${e}`)

This indeed

@s1gr1d
s1gr1d marked this pull request as ready for review September 6, 2024 14:12
@s1gr1d

Copy link
Copy Markdown
MemberAuthor

@nandi95 If I understand you correctly, you are defining a curstom rootDir in the nuxt config?

@s1gr1d
s1gr1d requested a review from Lms24September 6, 2024 14:14
@nandi95

Copy link
Copy Markdown

I only meant to say that I define a srcDir so it's not the default expected nuxt directory structure.
And remind that there's also a rootDir option.
This will especially be importent when nuxt 4 comes out and has a different folder structure.

if (moduleOptions.debug) {
// eslint-disable-next-line no-console
console.log(
'[Sentry] Using your `sentry.server.config` file for the server-side Sentry configuration. In case you have a `public/instrument.server` file, it will be ignored.',

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(...) it will be ignored

This reads a bit confusing, which of the two files are being ignored?

I think we could check here for the existence of the file and log explicitly if that file is getting ignored, wdyt?

Also, we are ignoring the public file here but users will still potentially --import it. This log makes it sound like it's completely ignored.

@Lms24Lms24Sep 9, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this log should be split up.

1st part (public): can we log a warning if we detect the file in public instead of the first part of this message? Otherwise, I don't think we need to bother users with it, right?

To the second part: Can we instead print the exact import command? Something like

"Make sure to add --import ./.output/sentry.server.config.mjs to your NODE_OPTIONS env variable"

if (moduleOptions.debug) {
// eslint-disable-next-line no-console
console.log(
'[Sentry] Successfully added the content of the `sentry.server.config` file as `instrument-sentry.mjs` to the `.output/server` directory',

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: Maybe we can use destination here?

Comment threadpackages/nuxt/src/module.ts

@Lms24Lms24 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work! Other than the console log, this looks good to me!

We can follow up with the e2e tests after this is merged, given we hit some road blocks there

Comment on lines +49 to +65
it('should return the server file with .ts extension if it exists', () => {
vi.spyOn(fs, 'existsSync').mockImplementation(filePath => {
return !(filePath instanceof URL) && filePath.includes('sentry.server.config.ts');
});

const result = findDefaultSdkInitFile('server');
expect(result).toBe('sentry.server.config.ts');
});

it('should return the client file with .mjs extension if it exists', () => {
vi.spyOn(fs, 'existsSync').mockImplementation(filePath => {
return !(filePath instanceof URL) && filePath.includes('sentry.client.config.mjs');
});

const result = findDefaultSdkInitFile('client');
expect(result).toBe('sentry.client.config.mjs');
});

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: For some test extra credit (feel free to disregard) - we could use an it.each to test against all file types we search for.

@s1gr1d
s1gr1d merged commit 45156d2 into developSep 9, 2024
@s1gr1d
s1gr1d deleted the sig/server-config-nuxt branch September 9, 2024 10:18
@wanderowski

Copy link
Copy Markdown

Hello! Thank you for the work you have done!

Could you please clarify, should we somehow modify the command for running the project on server in package.json? I see that now we can put sentry.server.config.ts in the root folder, but did not find any instructions on how to modify starting command. Previously, it was required to paste this:

{
"scripts": {
"preview": "NODE_OPTIONS='--import ./public/instrument.server.mjs' nuxt preview",
"start": "node --import .output/public/instrument.server.mjs .output/server/index.mjs"
}
}

If i put my config file in the root folder and deleted instrument.server.mjs from public folder, should I modify these commands as well?

@s1gr1d

s1gr1d commented Sep 10, 2024

Copy link
Copy Markdown
MemberAuthor

@wanderowski This PR is not released yet and more elaborate docs on this are still coming for the official docs page.

The file can be added like this:

"start": "node --import ./.output/server/sentry.server.config.mjs .output/server/index.mjs",

As it only affects the server, it can only be added to the start script. The preview script attempts to load data from the .nuxt folder as well and this would not work. It worked with the public folder as this folder is the same during development and in production.

However, it could be that your environment variables from the .env file are not yet loaded. You can explicitly include them with --env-file=.env (like described here).

@wanderowski

Copy link
Copy Markdown

@s1gr1d Thanks!

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@s1gr1d@nandi95@wanderowski@Lms24@andreiborza
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

feat(nuxt): Add server config to root folder - #13583

Merged
s1gr1d merged 8 commits into
developfrom
sig/server-config-nuxt
Sep 9, 2024
Merged

feat(nuxt): Add server config to root folder#13583
s1gr1d merged 8 commits into
developfrom
sig/server-config-nuxt

Conversation

@s1gr1d

Copy link
Copy Markdown
Member

This is a draft PR as this approach leads to an error as hook.mjs is not included in the node_modules. This has been fixed upstream but was not yet released for nuxt.

Makes it possible to include a sentry.server.config.ts file in the root folder alongside sentry.client.config.ts. Currently, it has to be added in the public folder which is not 100% ideal.

@s1gr1ds1gr1d mentioned this pull request Sep 4, 2024
@github-actions

github-actionsBot commented Sep 4, 2024

Copy link
Copy Markdown
Contributor

size-limit report 📦

⚠️Warning: Base artifact is not the latest one, because the latest workflow run is not done yet. This may lead to incorrect results. Try to re-run all tests to get up to date results.

PathSize% ChangeChange
@sentry/browser22.52 KB--
@sentry/browser - with treeshaking flags21.3 KB--
@sentry/browser (incl. Tracing)34.78 KB--
@sentry/browser (incl. Tracing, Replay)71.23 KB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags61.67 KB--
@sentry/browser (incl. Tracing, Replay with Canvas)75.57 KB--
@sentry/browser (incl. Tracing, Replay, Feedback)88.3 KB--
@sentry/browser (incl. Tracing, Replay, Feedback, metrics)90.14 KB--
@sentry/browser (incl. metrics)26.83 KB--
@sentry/browser (incl. Feedback)39.6 KB--
@sentry/browser (incl. sendFeedback)27.19 KB--
@sentry/browser (incl. FeedbackAsync)31.9 KB--
@sentry/react25.28 KB--
@sentry/react (incl. Tracing)37.74 KB--
@sentry/vue26.67 KB--
@sentry/vue (incl. Tracing)36.61 KB--
@sentry/svelte22.65 KB--
CDN Bundle23.77 KB--
CDN Bundle (incl. Tracing)36.49 KB--
CDN Bundle (incl. Tracing, Replay)70.91 KB--
CDN Bundle (incl. Tracing, Replay, Feedback)76.22 KB--
CDN Bundle - uncompressed69.63 KB--
CDN Bundle (incl. Tracing) - uncompressed108.21 KB--
CDN Bundle (incl. Tracing, Replay) - uncompressed219.87 KB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed233.07 KB--
@sentry/nextjs (client)37.51 KB--
@sentry/sveltekit (client)35.35 KB--
@sentry/node126.36 KB+1.11%+1.38 KB 🔺
@sentry/node - without tracing98.84 KB+3.5%+3.34 KB 🔺
@sentry/aws-serverless109.1 KB+1.48%+1.58 KB 🔺

View base workflow run

@s1gr1d
s1gr1dforce-pushed the sig/server-config-nuxt branch from 6cd63cb to ea95e37CompareSeptember 5, 2024 11:42
@nandi95

Copy link
Copy Markdown

This indeed would be helpful as I have a project which a merge of a laravel a nuxt project. Nuxt project is in the folder nuxt and I have the srcDir in the nuxt config set. This module should respect that and the rootDir configuration of nuxt.

? path.join(cwd,'public',`instrument.${type}.${e}`)

This indeed

@s1gr1d
s1gr1d marked this pull request as ready for review September 6, 2024 14:12
@s1gr1d

Copy link
Copy Markdown
MemberAuthor

@nandi95 If I understand you correctly, you are defining a curstom rootDir in the nuxt config?

@s1gr1d
s1gr1d requested a review from Lms24September 6, 2024 14:14
@nandi95

Copy link
Copy Markdown

I only meant to say that I define a srcDir so it's not the default expected nuxt directory structure.
And remind that there's also a rootDir option.
This will especially be importent when nuxt 4 comes out and has a different folder structure.

if (moduleOptions.debug) {
// eslint-disable-next-line no-console
console.log(
'[Sentry] Using your `sentry.server.config` file for the server-side Sentry configuration. In case you have a `public/instrument.server` file, it will be ignored.',

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(...) it will be ignored

This reads a bit confusing, which of the two files are being ignored?

I think we could check here for the existence of the file and log explicitly if that file is getting ignored, wdyt?

Also, we are ignoring the public file here but users will still potentially --import it. This log makes it sound like it's completely ignored.

@Lms24Lms24Sep 9, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this log should be split up.

1st part (public): can we log a warning if we detect the file in public instead of the first part of this message? Otherwise, I don't think we need to bother users with it, right?

To the second part: Can we instead print the exact import command? Something like

"Make sure to add --import ./.output/sentry.server.config.mjs to your NODE_OPTIONS env variable"

if (moduleOptions.debug) {
// eslint-disable-next-line no-console
console.log(
'[Sentry] Successfully added the content of the `sentry.server.config` file as `instrument-sentry.mjs` to the `.output/server` directory',

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: Maybe we can use destination here?

Comment threadpackages/nuxt/src/module.ts

@Lms24Lms24 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work! Other than the console log, this looks good to me!

We can follow up with the e2e tests after this is merged, given we hit some road blocks there

Comment on lines +49 to +65
it('should return the server file with .ts extension if it exists', () => {
vi.spyOn(fs, 'existsSync').mockImplementation(filePath => {
return !(filePath instanceof URL) && filePath.includes('sentry.server.config.ts');
});

const result = findDefaultSdkInitFile('server');
expect(result).toBe('sentry.server.config.ts');
});

it('should return the client file with .mjs extension if it exists', () => {
vi.spyOn(fs, 'existsSync').mockImplementation(filePath => {
return !(filePath instanceof URL) && filePath.includes('sentry.client.config.mjs');
});

const result = findDefaultSdkInitFile('client');
expect(result).toBe('sentry.client.config.mjs');
});

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: For some test extra credit (feel free to disregard) - we could use an it.each to test against all file types we search for.

@s1gr1d
s1gr1d merged commit 45156d2 into developSep 9, 2024
@s1gr1d
s1gr1d deleted the sig/server-config-nuxt branch September 9, 2024 10:18
@wanderowski

Copy link
Copy Markdown

Hello! Thank you for the work you have done!

Could you please clarify, should we somehow modify the command for running the project on server in package.json? I see that now we can put sentry.server.config.ts in the root folder, but did not find any instructions on how to modify starting command. Previously, it was required to paste this:

{
"scripts": {
"preview": "NODE_OPTIONS='--import ./public/instrument.server.mjs' nuxt preview",
"start": "node --import .output/public/instrument.server.mjs .output/server/index.mjs"
}
}

If i put my config file in the root folder and deleted instrument.server.mjs from public folder, should I modify these commands as well?

@s1gr1d

s1gr1d commented Sep 10, 2024

Copy link
Copy Markdown
MemberAuthor

@wanderowski This PR is not released yet and more elaborate docs on this are still coming for the official docs page.

The file can be added like this:

"start": "node --import ./.output/server/sentry.server.config.mjs .output/server/index.mjs",

As it only affects the server, it can only be added to the start script. The preview script attempts to load data from the .nuxt folder as well and this would not work. It worked with the public folder as this folder is the same during development and in production.

However, it could be that your environment variables from the .env file are not yet loaded. You can explicitly include them with --env-file=.env (like described here).

@wanderowski

Copy link
Copy Markdown

@s1gr1d Thanks!

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@s1gr1d@nandi95@wanderowski@Lms24@andreiborza
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(nuxt): Add server config to root folder - #13583

Merged
s1gr1d merged 8 commits into
developfrom
sig/server-config-nuxt
Sep 9, 2024
Merged

feat(nuxt): Add server config to root folder#13583
s1gr1d merged 8 commits into
developfrom
sig/server-config-nuxt

Conversation

@s1gr1d

Copy link
Copy Markdown
Member

This is a draft PR as this approach leads to an error as hook.mjs is not included in the node_modules. This has been fixed upstream but was not yet released for nuxt.

Makes it possible to include a sentry.server.config.ts file in the root folder alongside sentry.client.config.ts. Currently, it has to be added in the public folder which is not 100% ideal.

@s1gr1ds1gr1d mentioned this pull request Sep 4, 2024
@github-actions

github-actionsBot commented Sep 4, 2024

Copy link
Copy Markdown
Contributor

size-limit report 📦

⚠️Warning: Base artifact is not the latest one, because the latest workflow run is not done yet. This may lead to incorrect results. Try to re-run all tests to get up to date results.

PathSize% ChangeChange
@sentry/browser22.52 KB--
@sentry/browser - with treeshaking flags21.3 KB--
@sentry/browser (incl. Tracing)34.78 KB--
@sentry/browser (incl. Tracing, Replay)71.23 KB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags61.67 KB--
@sentry/browser (incl. Tracing, Replay with Canvas)75.57 KB--
@sentry/browser (incl. Tracing, Replay, Feedback)88.3 KB--
@sentry/browser (incl. Tracing, Replay, Feedback, metrics)90.14 KB--
@sentry/browser (incl. metrics)26.83 KB--
@sentry/browser (incl. Feedback)39.6 KB--
@sentry/browser (incl. sendFeedback)27.19 KB--
@sentry/browser (incl. FeedbackAsync)31.9 KB--
@sentry/react25.28 KB--
@sentry/react (incl. Tracing)37.74 KB--
@sentry/vue26.67 KB--
@sentry/vue (incl. Tracing)36.61 KB--
@sentry/svelte22.65 KB--
CDN Bundle23.77 KB--
CDN Bundle (incl. Tracing)36.49 KB--
CDN Bundle (incl. Tracing, Replay)70.91 KB--
CDN Bundle (incl. Tracing, Replay, Feedback)76.22 KB--
CDN Bundle - uncompressed69.63 KB--
CDN Bundle (incl. Tracing) - uncompressed108.21 KB--
CDN Bundle (incl. Tracing, Replay) - uncompressed219.87 KB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed233.07 KB--
@sentry/nextjs (client)37.51 KB--
@sentry/sveltekit (client)35.35 KB--
@sentry/node126.36 KB+1.11%+1.38 KB 🔺
@sentry/node - without tracing98.84 KB+3.5%+3.34 KB 🔺
@sentry/aws-serverless109.1 KB+1.48%+1.58 KB 🔺

View base workflow run

@s1gr1d
s1gr1dforce-pushed the sig/server-config-nuxt branch from 6cd63cb to ea95e37CompareSeptember 5, 2024 11:42
@nandi95

Copy link
Copy Markdown

This indeed would be helpful as I have a project which a merge of a laravel a nuxt project. Nuxt project is in the folder nuxt and I have the srcDir in the nuxt config set. This module should respect that and the rootDir configuration of nuxt.

? path.join(cwd,'public',`instrument.${type}.${e}`)

This indeed

@s1gr1d
s1gr1d marked this pull request as ready for review September 6, 2024 14:12
@s1gr1d

Copy link
Copy Markdown
MemberAuthor

@nandi95 If I understand you correctly, you are defining a curstom rootDir in the nuxt config?

@s1gr1d
s1gr1d requested a review from Lms24September 6, 2024 14:14
@nandi95

Copy link
Copy Markdown

I only meant to say that I define a srcDir so it's not the default expected nuxt directory structure.
And remind that there's also a rootDir option.
This will especially be importent when nuxt 4 comes out and has a different folder structure.

if (moduleOptions.debug) {
// eslint-disable-next-line no-console
console.log(
'[Sentry] Using your `sentry.server.config` file for the server-side Sentry configuration. In case you have a `public/instrument.server` file, it will be ignored.',

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(...) it will be ignored

This reads a bit confusing, which of the two files are being ignored?

I think we could check here for the existence of the file and log explicitly if that file is getting ignored, wdyt?

Also, we are ignoring the public file here but users will still potentially --import it. This log makes it sound like it's completely ignored.

@Lms24Lms24Sep 9, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this log should be split up.

1st part (public): can we log a warning if we detect the file in public instead of the first part of this message? Otherwise, I don't think we need to bother users with it, right?

To the second part: Can we instead print the exact import command? Something like

"Make sure to add --import ./.output/sentry.server.config.mjs to your NODE_OPTIONS env variable"

if (moduleOptions.debug) {
// eslint-disable-next-line no-console
console.log(
'[Sentry] Successfully added the content of the `sentry.server.config` file as `instrument-sentry.mjs` to the `.output/server` directory',

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: Maybe we can use destination here?

Comment threadpackages/nuxt/src/module.ts

@Lms24Lms24 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work! Other than the console log, this looks good to me!

We can follow up with the e2e tests after this is merged, given we hit some road blocks there

Comment on lines +49 to +65
it('should return the server file with .ts extension if it exists', () => {
vi.spyOn(fs, 'existsSync').mockImplementation(filePath => {
return !(filePath instanceof URL) && filePath.includes('sentry.server.config.ts');
});

const result = findDefaultSdkInitFile('server');
expect(result).toBe('sentry.server.config.ts');
});

it('should return the client file with .mjs extension if it exists', () => {
vi.spyOn(fs, 'existsSync').mockImplementation(filePath => {
return !(filePath instanceof URL) && filePath.includes('sentry.client.config.mjs');
});

const result = findDefaultSdkInitFile('client');
expect(result).toBe('sentry.client.config.mjs');
});

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: For some test extra credit (feel free to disregard) - we could use an it.each to test against all file types we search for.

@s1gr1d
s1gr1d merged commit 45156d2 into developSep 9, 2024
@s1gr1d
s1gr1d deleted the sig/server-config-nuxt branch September 9, 2024 10:18
@wanderowski

Copy link
Copy Markdown

Hello! Thank you for the work you have done!

Could you please clarify, should we somehow modify the command for running the project on server in package.json? I see that now we can put sentry.server.config.ts in the root folder, but did not find any instructions on how to modify starting command. Previously, it was required to paste this:

{
"scripts": {
"preview": "NODE_OPTIONS='--import ./public/instrument.server.mjs' nuxt preview",
"start": "node --import .output/public/instrument.server.mjs .output/server/index.mjs"
}
}

If i put my config file in the root folder and deleted instrument.server.mjs from public folder, should I modify these commands as well?

@s1gr1d

s1gr1d commented Sep 10, 2024

Copy link
Copy Markdown
MemberAuthor

@wanderowski This PR is not released yet and more elaborate docs on this are still coming for the official docs page.

The file can be added like this:

"start": "node --import ./.output/server/sentry.server.config.mjs .output/server/index.mjs",

As it only affects the server, it can only be added to the start script. The preview script attempts to load data from the .nuxt folder as well and this would not work. It worked with the public folder as this folder is the same during development and in production.

However, it could be that your environment variables from the .env file are not yet loaded. You can explicitly include them with --env-file=.env (like described here).

@wanderowski

Copy link
Copy Markdown

@s1gr1d Thanks!

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@s1gr1d@nandi95@wanderowski@Lms24@andreiborza
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(nuxt): Add server config to root folder - #13583

Merged
s1gr1d merged 8 commits into
developfrom
sig/server-config-nuxt
Sep 9, 2024
Merged

feat(nuxt): Add server config to root folder#13583
s1gr1d merged 8 commits into
developfrom
sig/server-config-nuxt

Conversation

@s1gr1d

Copy link
Copy Markdown
Member

This is a draft PR as this approach leads to an error as hook.mjs is not included in the node_modules. This has been fixed upstream but was not yet released for nuxt.

Makes it possible to include a sentry.server.config.ts file in the root folder alongside sentry.client.config.ts. Currently, it has to be added in the public folder which is not 100% ideal.

@s1gr1ds1gr1d mentioned this pull request Sep 4, 2024
@github-actions

github-actionsBot commented Sep 4, 2024

Copy link
Copy Markdown
Contributor

size-limit report 📦

⚠️Warning: Base artifact is not the latest one, because the latest workflow run is not done yet. This may lead to incorrect results. Try to re-run all tests to get up to date results.

PathSize% ChangeChange
@sentry/browser22.52 KB--
@sentry/browser - with treeshaking flags21.3 KB--
@sentry/browser (incl. Tracing)34.78 KB--
@sentry/browser (incl. Tracing, Replay)71.23 KB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags61.67 KB--
@sentry/browser (incl. Tracing, Replay with Canvas)75.57 KB--
@sentry/browser (incl. Tracing, Replay, Feedback)88.3 KB--
@sentry/browser (incl. Tracing, Replay, Feedback, metrics)90.14 KB--
@sentry/browser (incl. metrics)26.83 KB--
@sentry/browser (incl. Feedback)39.6 KB--
@sentry/browser (incl. sendFeedback)27.19 KB--
@sentry/browser (incl. FeedbackAsync)31.9 KB--
@sentry/react25.28 KB--
@sentry/react (incl. Tracing)37.74 KB--
@sentry/vue26.67 KB--
@sentry/vue (incl. Tracing)36.61 KB--
@sentry/svelte22.65 KB--
CDN Bundle23.77 KB--
CDN Bundle (incl. Tracing)36.49 KB--
CDN Bundle (incl. Tracing, Replay)70.91 KB--
CDN Bundle (incl. Tracing, Replay, Feedback)76.22 KB--
CDN Bundle - uncompressed69.63 KB--
CDN Bundle (incl. Tracing) - uncompressed108.21 KB--
CDN Bundle (incl. Tracing, Replay) - uncompressed219.87 KB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed233.07 KB--
@sentry/nextjs (client)37.51 KB--
@sentry/sveltekit (client)35.35 KB--
@sentry/node126.36 KB+1.11%+1.38 KB 🔺
@sentry/node - without tracing98.84 KB+3.5%+3.34 KB 🔺
@sentry/aws-serverless109.1 KB+1.48%+1.58 KB 🔺

View base workflow run

@s1gr1d
s1gr1dforce-pushed the sig/server-config-nuxt branch from 6cd63cb to ea95e37CompareSeptember 5, 2024 11:42
@nandi95

Copy link
Copy Markdown

This indeed would be helpful as I have a project which a merge of a laravel a nuxt project. Nuxt project is in the folder nuxt and I have the srcDir in the nuxt config set. This module should respect that and the rootDir configuration of nuxt.

? path.join(cwd,'public',`instrument.${type}.${e}`)

This indeed

@s1gr1d
s1gr1d marked this pull request as ready for review September 6, 2024 14:12
@s1gr1d

Copy link
Copy Markdown
MemberAuthor

@nandi95 If I understand you correctly, you are defining a curstom rootDir in the nuxt config?

@s1gr1d
s1gr1d requested a review from Lms24September 6, 2024 14:14
@nandi95

Copy link
Copy Markdown

I only meant to say that I define a srcDir so it's not the default expected nuxt directory structure.
And remind that there's also a rootDir option.
This will especially be importent when nuxt 4 comes out and has a different folder structure.

if (moduleOptions.debug) {
// eslint-disable-next-line no-console
console.log(
'[Sentry] Using your `sentry.server.config` file for the server-side Sentry configuration. In case you have a `public/instrument.server` file, it will be ignored.',

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(...) it will be ignored

This reads a bit confusing, which of the two files are being ignored?

I think we could check here for the existence of the file and log explicitly if that file is getting ignored, wdyt?

Also, we are ignoring the public file here but users will still potentially --import it. This log makes it sound like it's completely ignored.

@Lms24Lms24Sep 9, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this log should be split up.

1st part (public): can we log a warning if we detect the file in public instead of the first part of this message? Otherwise, I don't think we need to bother users with it, right?

To the second part: Can we instead print the exact import command? Something like

"Make sure to add --import ./.output/sentry.server.config.mjs to your NODE_OPTIONS env variable"

if (moduleOptions.debug) {
// eslint-disable-next-line no-console
console.log(
'[Sentry] Successfully added the content of the `sentry.server.config` file as `instrument-sentry.mjs` to the `.output/server` directory',

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: Maybe we can use destination here?

Comment threadpackages/nuxt/src/module.ts

@Lms24Lms24 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work! Other than the console log, this looks good to me!

We can follow up with the e2e tests after this is merged, given we hit some road blocks there

Comment on lines +49 to +65
it('should return the server file with .ts extension if it exists', () => {
vi.spyOn(fs, 'existsSync').mockImplementation(filePath => {
return !(filePath instanceof URL) && filePath.includes('sentry.server.config.ts');
});

const result = findDefaultSdkInitFile('server');
expect(result).toBe('sentry.server.config.ts');
});

it('should return the client file with .mjs extension if it exists', () => {
vi.spyOn(fs, 'existsSync').mockImplementation(filePath => {
return !(filePath instanceof URL) && filePath.includes('sentry.client.config.mjs');
});

const result = findDefaultSdkInitFile('client');
expect(result).toBe('sentry.client.config.mjs');
});

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: For some test extra credit (feel free to disregard) - we could use an it.each to test against all file types we search for.

@s1gr1d
s1gr1d merged commit 45156d2 into developSep 9, 2024
@s1gr1d
s1gr1d deleted the sig/server-config-nuxt branch September 9, 2024 10:18
@wanderowski

Copy link
Copy Markdown

Hello! Thank you for the work you have done!

Could you please clarify, should we somehow modify the command for running the project on server in package.json? I see that now we can put sentry.server.config.ts in the root folder, but did not find any instructions on how to modify starting command. Previously, it was required to paste this:

{
"scripts": {
"preview": "NODE_OPTIONS='--import ./public/instrument.server.mjs' nuxt preview",
"start": "node --import .output/public/instrument.server.mjs .output/server/index.mjs"
}
}

If i put my config file in the root folder and deleted instrument.server.mjs from public folder, should I modify these commands as well?

@s1gr1d

s1gr1d commented Sep 10, 2024

Copy link
Copy Markdown
MemberAuthor

@wanderowski This PR is not released yet and more elaborate docs on this are still coming for the official docs page.

The file can be added like this:

"start": "node --import ./.output/server/sentry.server.config.mjs .output/server/index.mjs",

As it only affects the server, it can only be added to the start script. The preview script attempts to load data from the .nuxt folder as well and this would not work. It worked with the public folder as this folder is the same during development and in production.

However, it could be that your environment variables from the .env file are not yet loaded. You can explicitly include them with --env-file=.env (like described here).

@wanderowski

Copy link
Copy Markdown

@s1gr1d Thanks!

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@s1gr1d@nandi95@wanderowski@Lms24@andreiborza
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

feat(nuxt): Add server config to root folder - #13583

Merged
s1gr1d merged 8 commits into
developfrom
sig/server-config-nuxt
Sep 9, 2024
Merged

feat(nuxt): Add server config to root folder#13583
s1gr1d merged 8 commits into
developfrom
sig/server-config-nuxt

Conversation

@s1gr1d

Copy link
Copy Markdown
Member

This is a draft PR as this approach leads to an error as hook.mjs is not included in the node_modules. This has been fixed upstream but was not yet released for nuxt.

Makes it possible to include a sentry.server.config.ts file in the root folder alongside sentry.client.config.ts. Currently, it has to be added in the public folder which is not 100% ideal.

@s1gr1ds1gr1d mentioned this pull request Sep 4, 2024
@github-actions

github-actionsBot commented Sep 4, 2024

Copy link
Copy Markdown
Contributor

size-limit report 📦

⚠️Warning: Base artifact is not the latest one, because the latest workflow run is not done yet. This may lead to incorrect results. Try to re-run all tests to get up to date results.

PathSize% ChangeChange
@sentry/browser22.52 KB--
@sentry/browser - with treeshaking flags21.3 KB--
@sentry/browser (incl. Tracing)34.78 KB--
@sentry/browser (incl. Tracing, Replay)71.23 KB--
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags61.67 KB--
@sentry/browser (incl. Tracing, Replay with Canvas)75.57 KB--
@sentry/browser (incl. Tracing, Replay, Feedback)88.3 KB--
@sentry/browser (incl. Tracing, Replay, Feedback, metrics)90.14 KB--
@sentry/browser (incl. metrics)26.83 KB--
@sentry/browser (incl. Feedback)39.6 KB--
@sentry/browser (incl. sendFeedback)27.19 KB--
@sentry/browser (incl. FeedbackAsync)31.9 KB--
@sentry/react25.28 KB--
@sentry/react (incl. Tracing)37.74 KB--
@sentry/vue26.67 KB--
@sentry/vue (incl. Tracing)36.61 KB--
@sentry/svelte22.65 KB--
CDN Bundle23.77 KB--
CDN Bundle (incl. Tracing)36.49 KB--
CDN Bundle (incl. Tracing, Replay)70.91 KB--
CDN Bundle (incl. Tracing, Replay, Feedback)76.22 KB--
CDN Bundle - uncompressed69.63 KB--
CDN Bundle (incl. Tracing) - uncompressed108.21 KB--
CDN Bundle (incl. Tracing, Replay) - uncompressed219.87 KB--
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed233.07 KB--
@sentry/nextjs (client)37.51 KB--
@sentry/sveltekit (client)35.35 KB--
@sentry/node126.36 KB+1.11%+1.38 KB 🔺
@sentry/node - without tracing98.84 KB+3.5%+3.34 KB 🔺
@sentry/aws-serverless109.1 KB+1.48%+1.58 KB 🔺

View base workflow run

@s1gr1d
s1gr1dforce-pushed the sig/server-config-nuxt branch from 6cd63cb to ea95e37CompareSeptember 5, 2024 11:42
@nandi95

Copy link
Copy Markdown

This indeed would be helpful as I have a project which a merge of a laravel a nuxt project. Nuxt project is in the folder nuxt and I have the srcDir in the nuxt config set. This module should respect that and the rootDir configuration of nuxt.

? path.join(cwd,'public',`instrument.${type}.${e}`)

This indeed

@s1gr1d
s1gr1d marked this pull request as ready for review September 6, 2024 14:12
@s1gr1d

Copy link
Copy Markdown
MemberAuthor

@nandi95 If I understand you correctly, you are defining a curstom rootDir in the nuxt config?

@s1gr1d
s1gr1d requested a review from Lms24September 6, 2024 14:14
@nandi95

Copy link
Copy Markdown

I only meant to say that I define a srcDir so it's not the default expected nuxt directory structure.
And remind that there's also a rootDir option.
This will especially be importent when nuxt 4 comes out and has a different folder structure.

if (moduleOptions.debug) {
// eslint-disable-next-line no-console
console.log(
'[Sentry] Using your `sentry.server.config` file for the server-side Sentry configuration. In case you have a `public/instrument.server` file, it will be ignored.',

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(...) it will be ignored

This reads a bit confusing, which of the two files are being ignored?

I think we could check here for the existence of the file and log explicitly if that file is getting ignored, wdyt?

Also, we are ignoring the public file here but users will still potentially --import it. This log makes it sound like it's completely ignored.

@Lms24Lms24Sep 9, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this log should be split up.

1st part (public): can we log a warning if we detect the file in public instead of the first part of this message? Otherwise, I don't think we need to bother users with it, right?

To the second part: Can we instead print the exact import command? Something like

"Make sure to add --import ./.output/sentry.server.config.mjs to your NODE_OPTIONS env variable"

if (moduleOptions.debug) {
// eslint-disable-next-line no-console
console.log(
'[Sentry] Successfully added the content of the `sentry.server.config` file as `instrument-sentry.mjs` to the `.output/server` directory',

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: Maybe we can use destination here?

Comment threadpackages/nuxt/src/module.ts

@Lms24Lms24 left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work! Other than the console log, this looks good to me!

We can follow up with the e2e tests after this is merged, given we hit some road blocks there

Comment on lines +49 to +65
it('should return the server file with .ts extension if it exists', () => {
vi.spyOn(fs, 'existsSync').mockImplementation(filePath => {
return !(filePath instanceof URL) && filePath.includes('sentry.server.config.ts');
});

const result = findDefaultSdkInitFile('server');
expect(result).toBe('sentry.server.config.ts');
});

it('should return the client file with .mjs extension if it exists', () => {
vi.spyOn(fs, 'existsSync').mockImplementation(filePath => {
return !(filePath instanceof URL) && filePath.includes('sentry.client.config.mjs');
});

const result = findDefaultSdkInitFile('client');
expect(result).toBe('sentry.client.config.mjs');
});

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: For some test extra credit (feel free to disregard) - we could use an it.each to test against all file types we search for.

@s1gr1d
s1gr1d merged commit 45156d2 into developSep 9, 2024
@s1gr1d
s1gr1d deleted the sig/server-config-nuxt branch September 9, 2024 10:18
@wanderowski

Copy link
Copy Markdown

Hello! Thank you for the work you have done!

Could you please clarify, should we somehow modify the command for running the project on server in package.json? I see that now we can put sentry.server.config.ts in the root folder, but did not find any instructions on how to modify starting command. Previously, it was required to paste this:

{
"scripts": {
"preview": "NODE_OPTIONS='--import ./public/instrument.server.mjs' nuxt preview",
"start": "node --import .output/public/instrument.server.mjs .output/server/index.mjs"
}
}

If i put my config file in the root folder and deleted instrument.server.mjs from public folder, should I modify these commands as well?

@s1gr1d

s1gr1d commented Sep 10, 2024

Copy link
Copy Markdown
MemberAuthor

@wanderowski This PR is not released yet and more elaborate docs on this are still coming for the official docs page.

The file can be added like this:

"start": "node --import ./.output/server/sentry.server.config.mjs .output/server/index.mjs",

As it only affects the server, it can only be added to the start script. The preview script attempts to load data from the .nuxt folder as well and this would not work. It worked with the public folder as this folder is the same during development and in production.

However, it could be that your environment variables from the .env file are not yet loaded. You can explicitly include them with --env-file=.env (like described here).

@wanderowski

Copy link
Copy Markdown

@s1gr1d Thanks!

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@s1gr1d@nandi95@wanderowski@Lms24@andreiborza