Skip to content

Commit 4200bfe

Browse files
authored
Merge pull request #613 from UTDNebula/develop
chore: Sync with `develop`
2 parents 3bcc73a + 34aaf27 commit 4200bfe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+2894
-16159
lines changed

.env.example

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,7 @@ NODE_ENV=
2828

2929
# Umami: self-hosted analytics service
3030
NEXT_PUBLIC_UMAMI_URL=
31-
NEXT_PUBLIC_UMAMI_WEBSITE_ID=
31+
NEXT_PUBLIC_UMAMI_WEBSITE_ID=
32+
33+
NEXT_PUBLIC_SENTRY_DSN=
34+
SENTRY_DSN=

.github/workflows/build.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ on:
55
pull_request:
66
branches:
77
- 'develop'
8-
- 'release/**'
9-
- 'master'
8+
- 'main'
109

1110
jobs:
1211
release:

.github/workflows/format.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ name: Lint
22

33
on:
44
workflow_dispatch:
5-
# Trigger the workflow on push or pull request,
6-
# but only for the main branch
75
pull_request:
8-
type: [ready_for_review]
6+
types: [ready_for_review]
97

108
jobs:
119
run-linters:

.github/workflows/tests.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ on:
55
pull_request:
66
branches:
77
- 'develop'
8-
- 'release/**'
9-
- 'master'
8+
- 'main'
109

1110
jobs:
1211
integration-tests:
@@ -57,7 +56,7 @@ jobs:
5756
- name: Prisma generate and push
5857
run: |
5958
npm run prisma:generate &&
60-
npx prisma db push
59+
npm run prisma:migrate:deploy
6160
6261
- name: Run Cypress e2e tests
6362
run: |

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,6 @@ prisma/generated
5252

5353
# Storybook
5454
/storybook-static
55+
56+
# Sentry
57+
.sentryclirc

next.config.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
/* eslint-disable @typescript-eslint/no-var-requires */
2+
const { withSentryConfig } = require('@sentry/nextjs');
3+
14
/* eslint-disable @typescript-eslint/no-var-requires */
25

36
const withBundleAnalyzer = require('@next/bundle-analyzer')({
@@ -26,4 +29,10 @@ const nextConfig = withBundleAnalyzer({
2629
},
2730
});
2831

29-
module.exports = nextConfig;
32+
module.exports = withSentryConfig(
33+
nextConfig,
34+
{ silent: true },
35+
// tunnelRoute set to bypass adblockers.
36+
// See: https://docs.sentry.io/platforms/javascript/guides/nextjs/manual-setup/#configure-tunneling-to-avoid-ad-blockers.
37+
{ hideSourcemaps: false, tunnelRoute: '/sentry-tunnel' },
38+
);

0 commit comments

Comments
 (0)