Skip to content

Commit

Permalink
Merge pull request #613 from UTDNebula/develop
Browse files Browse the repository at this point in the history
chore: Sync with `develop`
  • Loading branch information
jasonappah authored Jul 24, 2023
2 parents 3bcc73a + 34aaf27 commit 4200bfe
Show file tree
Hide file tree
Showing 46 changed files with 2,894 additions and 16,159 deletions.
5 changes: 4 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,7 @@ NODE_ENV=

# Umami: self-hosted analytics service
NEXT_PUBLIC_UMAMI_URL=
NEXT_PUBLIC_UMAMI_WEBSITE_ID=
NEXT_PUBLIC_UMAMI_WEBSITE_ID=

NEXT_PUBLIC_SENTRY_DSN=
SENTRY_DSN=
3 changes: 1 addition & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ on:
pull_request:
branches:
- 'develop'
- 'release/**'
- 'master'
- 'main'

jobs:
release:
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ name: Lint

on:
workflow_dispatch:
# Trigger the workflow on push or pull request,
# but only for the main branch
pull_request:
type: [ready_for_review]
types: [ready_for_review]

jobs:
run-linters:
Expand Down
5 changes: 2 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ on:
pull_request:
branches:
- 'develop'
- 'release/**'
- 'master'
- 'main'

jobs:
integration-tests:
Expand Down Expand Up @@ -57,7 +56,7 @@ jobs:
- name: Prisma generate and push
run: |
npm run prisma:generate &&
npx prisma db push
npm run prisma:migrate:deploy
- name: Run Cypress e2e tests
run: |
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,6 @@ prisma/generated

# Storybook
/storybook-static

# Sentry
.sentryclirc
11 changes: 10 additions & 1 deletion next.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
/* eslint-disable @typescript-eslint/no-var-requires */
const { withSentryConfig } = require('@sentry/nextjs');

/* eslint-disable @typescript-eslint/no-var-requires */

const withBundleAnalyzer = require('@next/bundle-analyzer')({
Expand Down Expand Up @@ -26,4 +29,10 @@ const nextConfig = withBundleAnalyzer({
},
});

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

1 comment on commit 4200bfe

@vercel
Copy link

@vercel vercel bot commented on 4200bfe Jul 24, 2023

Choose a reason for hiding this comment

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

Successfully deployed to the following URLs:

planner – ./

planner-git-main-utdnebula.vercel.app
planner-utdnebula.vercel.app
planner.utdnebula.com

Please sign in to comment.