beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #289 from ente-io/rename-sentry-variables

Browse source 
Rename sentry variables
This commit is contained in:
abhinavkgrd 2022-01-09 18:00:30 +05:30 committed by GitHub
parent 5d3e284fcd 4b14427f36
commit cc67038b93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 50 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configUtil.js
View file

@ -1,5 +1,5 @@
const cp = require('child_process');
const { isSentryEnabled } = require('./sentryConfigUtil');
const { getIsSentryEnabled } = require('./sentryConfigUtil');
module.exports = {
COOP_COEP_HEADERS: {
@ -51,5 +51,5 @@ module.exports = {
cwd: __dirname,
encoding: 'utf8',
}),
isSentryEnabled: isSentryEnabled,
getIsSentryEnabled: getIsSentryEnabled,
};

71
next.config.js
View file

@ -4,6 +4,7 @@ const withBundleAnalyzer = require('@next/bundle-analyzer')({
const withWorkbox = require('@ente-io/next-with-workbox');
const { withSentryConfig } = require('@sentry/nextjs');
const { PHASE_DEVELOPMENT_SERVER } = require('next/constants');
const {
getGitSha,
@ -14,42 +15,46 @@ const {
CSP_DIRECTIVES,
WORKBOX_CONFIG,
ALL_ROUTES,
isSentryEnabled,
getIsSentryEnabled,
} = require('./configUtil');
const GIT_SHA = getGitSha();
const SENTRY_ENABLED = isSentryEnabled();
const IS_SENTRY_ENABLED = getIsSentryEnabled();
module.exports = withSentryConfig(
withWorkbox(
withBundleAnalyzer({
env: {
SENTRY_RELEASE: GIT_SHA,
},
workbox: WORKBOX_CONFIG,
module.exports = (phase) =>
withSentryConfig(
withWorkbox(
withBundleAnalyzer({
env: {
SENTRY_RELEASE: GIT_SHA,
},
workbox: WORKBOX_CONFIG,
headers() {
return [
{
// Apply these headers to all routes in your application....
source: ALL_ROUTES,
headers: convertToNextHeaderFormat({
...COOP_COEP_HEADERS,
...WEB_SECURITY_HEADERS,
...buildCSPHeader(CSP_DIRECTIVES),
}),
},
];
},
// https://dev.to/marcinwosinek/how-to-add-resolve-fallback-to-webpack-5-in-nextjs-10-i6j
webpack: (config, { isServer }) => {
if (!isServer) {
config.resolve.fallback.fs = false;
}
return config;
},
})
),
{ release: GIT_SHA, dryRun: !SENTRY_ENABLED }
);
headers() {
return [
{
// Apply these headers to all routes in your application....
source: ALL_ROUTES,
headers: convertToNextHeaderFormat({
...COOP_COEP_HEADERS,
...WEB_SECURITY_HEADERS,
...buildCSPHeader(CSP_DIRECTIVES),
}),
},
];
},
// https://dev.to/marcinwosinek/how-to-add-resolve-fallback-to-webpack-5-in-nextjs-10-i6j
webpack: (config, { isServer }) => {
if (!isServer) {
config.resolve.fallback.fs = false;
}
return config;
},
})
),
{
release: GIT_SHA,
dryRun: phase === PHASE_DEVELOPMENT_SERVER || !IS_SENTRY_ENABLED,
}
);

6
sentry.client.config.js
View file

@ -5,18 +5,18 @@ import {
getSentryDSN,
getSentryENV,
getSentryRelease,
isSentryEnabled,
getIsSentryEnabled,
} from 'constants/sentry';
const SENTRY_DSN = getSentryDSN();
const SENTRY_ENV = getSentryENV();
const SENTRY_RELEASE = getSentryRelease();
const ENABLED = isSentryEnabled();
const IS_ENABLED = getIsSentryEnabled();
Sentry.setUser({ id: getUserAnonymizedID() });
Sentry.init({
dsn: SENTRY_DSN,
enabled: ENABLED,
enabled: IS_ENABLED,
environment: SENTRY_ENV,
release: SENTRY_RELEASE,
attachStacktrace: true,

6
sentry.server.config.js
View file

@ -3,17 +3,17 @@ import {
getSentryDSN,
getSentryENV,
getSentryRelease,
isSentryEnabled,
getIsSentryEnabled,
} from 'constants/sentry';
const SENTRY_DSN = getSentryDSN();
const SENTRY_ENV = getSentryENV();
const SENTRY_RELEASE = getSentryRelease();
const ENABLED = isSentryEnabled();
const IS_ENABLED = getIsSentryEnabled();
Sentry.init({
dsn: SENTRY_DSN,
enabled: ENABLED,
enabled: IS_ENABLED,
environment: SENTRY_ENV,
release: SENTRY_RELEASE,
autoSessionTracking: false,

6
sentryConfigUtil.js
View file

@ -1,6 +1,6 @@
module.exports.isSentryEnabled = () => {
if (process.env.SENTRY_ENABLED) {
return process.env.SENTRY_ENABLED === 'yes';
module.exports.getIsSentryEnabled = () => {
if (process.env.NEXT_PUBLIC_IS_SENTRY_ENABLED) {
return process.env.NEXT_PUBLIC_IS_SENTRY_ENABLED === 'yes';
} else {
if (process.env.NEXT_PUBLIC_SENTRY_ENV) {
return process.env.NEXT_PUBLIC_SENTRY_ENV !== 'development';

2
src/constants/sentry/index.ts
View file

@ -7,4 +7,4 @@ export const getSentryENV = () =>
export const getSentryRelease = () => process.env.SENTRY_RELEASE;
export { isSentryEnabled } from '../../../sentryConfigUtil';
export { getIsSentryEnabled } from '../../../sentryConfigUtil';