Merge branch 'release/8.13.0'

Frojd · Oct 24, 2023 · 88a090d · 88a090d
2 parents e72adb4 + 8422c2a
commit 88a090d
Show file tree

Hide file tree

Showing 33 changed files with 9,302 additions and 47,034 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,31 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 ### Removed
 
+## [8.13.0] - 2023-10-24
+### Added
+- Add wt/sentry-debug/ endpoint for verifying Sentry integration (@mikaelengstrom)
+- Add Sentry sample rate (@mikaelengstrom)
+
+### Fixed
+- Upgrade Sentry SDK and use django extra (@mikaelengstrom)
+- Improve Sentry Next.js integration (@mikaelengstrom)
+- Upgrade Wagtail to 5.2 (@marteinn)
+- Upgrade Next.js to 13.5.6 (@marteinn)
+- Upgrade psycopg to 3.1.12
+- Upgrade Django to 4.2.6
+- Upgrade wagtail_headless_preview to 0.7.0
+- Upgrade django-stubs to 4.2.6 and remove unused ignores (@marteinn)
+- Upgrade djangorestframework-stubs to 3.14.4
+- Upgrade @swc/core to 1.3.95
+- Upgrade @types/react to 18.2.31
+- Upgrade @sentry/nextjs to 7.75.0
+- Upgrade eslint to 8.52.0
+- Upgrade eslint-config-next to 13.5.6
+- Upgrade testing-library/jest-dom to 6.1.4
+- Upgrade i18next to 23.6.0
+- Upgrade next-i18next to 14.0.0
+- Upgrade storybook to 7.5.1
+
 ## [8.12.3] - 2023-08-22
 
 ### Fixed
@@ -21,6 +46,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 - Remove deprecated wagtail.contrib.modeladmin app from INSTALLED_APPS (@marteinn)
 
+
 ## [8.12.2] - 2023-08-16
 
 ### Changed

diff --git a/Company-Project/.circleci/config.yml b/Company-Project/.circleci/config.yml
@@ -80,7 +80,19 @@ jobs:
             mkdir -p test-results/jest
             cd frontend
             npm run test:ci
+
             echo "NEXT_PUBLIC_SENTRY_DSN=$NEXT_PUBLIC_SENTRY_DSN" >> .env
+
+            if [ "${CIRCLE_BRANCH}" == "develop" ]; then
+              echo "SENTRY_ENVIRONMENT=stage" >> .env
+              echo "SENTRY_RELEASE=develop-${CIRCLE_BRANCH}" >> .env
+            fi
+
+            if [ "${CIRCLE_TAG}" ]; then
+              echo "SENTRY_ENVIRONMENT=prod" >> .env
+              echo "SENTRY_RELEASE=${CIRCLE_TAG}" >> .env
+            fi
+
             npm run build
             npm run build-storybook
             # So we don't copy the gigantic node_modules on each deploy

diff --git a/Company-Project/frontend/next.config.js b/Company-Project/frontend/next.config.js
@@ -11,27 +11,50 @@ let nextConfig = {
     i18n,
 };
 
-const SentryWebpackPluginOptions = {
-    // Additional config options for the Sentry Webpack plugin. Keep in mind that
-    // the following options are set automatically, and overriding them is not
-    // recommended:
-    //   release, url, org, project, authToken, configFile, stripPrefix,
-    //   urlPrefix, include, ignore
+// nextConfig = withSentryConfig(nextConfig, SentryWebpackPluginOptions);
+
+// const withBundleAnalyzer = require('@next/bundle-analyzer')({
+//     enabled: process.env.ANALYZE === 'true',
+// });
 
+const sentryWebpackPluginOptions = {
+    // For all available options, see:
+    // https://github.com/getsentry/sentry-webpack-plugin#options
+
+    // Suppresses source map uploading logs during build
     silent: true,
     dryRun: process.env.IGNORE_SENTRY ? true : false,
-    // For all available options, see:
-    // https://github.com/getsentry/sentry-webpack-plugin#options.
+
+    org: 'your-sentry-organization',
+    project: 'your-sentry-project',
 };
 
-// nextConfig = withSentryConfig(nextConfig, SentryWebpackPluginOptions);
+const sentryOptions = {
+    // For all available options, see:
+    // https://docs.sentry.io/platforms/javascript/guides/nextjs/manual-setup/
 
-// const withBundleAnalyzer = require('@next/bundle-analyzer')({
-//     enabled: process.env.ANALYZE === 'true',
-// });
+    // Upload a larger set of source maps for prettier stack traces (increases build time)
+    widenClientFileUpload: true,
+
+    // Transpiles SDK to be compatible with IE11 (increases bundle size)
+    transpileClientSDK: false,
+
+    // Routes browser requests to Sentry through a Next.js rewrite to circumvent ad-blockers (increases server load)
+    tunnelRoute: '/monitoring',
+
+    // Hides source maps from generated client bundles
+    hideSourceMaps: true,
+
+    // Automatically tree-shake Sentry logger statements to reduce bundle size
+    disableLogger: true,
+};
+
+const withSentry = (cnf) =>
+    withSentryConfig(cnf, sentryWebpackPluginOptions, sentryOptions);
 
 module.exports = () => {
-    const plugins = [];
+    // Sentry must be last
+    const plugins = []; // withSentry];
     return plugins.reduce((acc, plugin) => plugin(acc), {
         ...nextConfig,
     });