Merge pull request #665 from Klimatbyran/staging

Release to production

.eslintrc.js

@@ -4,6 +4,7 @@ module.exports = {
     'airbnb/hooks',
     'plugin:@typescript-eslint/recommended',
     'plugin:jsx-a11y/recommended',
+    'plugin:@next/next/recommended',
   ],
   parser: '@typescript-eslint/parser',
   parserOptions: {

__tests__/components/CompanyView.test.tsx

@@ -6,6 +6,7 @@ import StartPage from '../../pages/index'
 import StyledComponentsWrapper from '../utils/StyledComponentsWrapper'
 
 vi.mock('../../public/icons/arrow-right-bold-green.svg', () => ({ default: () => 'svg' }))
+vi.mock('../../public/icons/lucide/external-link.svg', () => ({ default: () => 'svg' }))
 
 vi.mock('next-i18next', () => ({
   useTranslation: vi.fn(() => ({

__tests__/components/RegionalView.test.tsx

@@ -16,6 +16,7 @@ vi.mock('../../public/icons/map.svg', () => ({ default: () => 'svg' }))
 vi.mock('../../public/icons/arrow.svg', () => ({ default: () => 'svg' }))
 vi.mock('../../public/icons/arrow-down.svg', () => ({ default: () => 'svg' }))
 vi.mock('../../public/icons/arrow-right-bold-green.svg', () => ({ default: () => 'svg' }))
+vi.mock('../../public/icons/lucide/external-link.svg', () => ({ default: () => 'svg' }))
 
 vi.mock('next-i18next', () => ({
   useTranslation: vi.fn(() => ({

components/PageWrapper.tsx

@@ -29,7 +29,7 @@ const WrapInner = styled.div<{ compact?: boolean }>`
   `)}
 
   @media only screen and (${devices.tablet}) {
-    padding: 32px 24px;
+    padding: 0 24px 32px;
   }
 `
 

next.config.js

@@ -1,11 +1,12 @@
 const { i18n } = require('./next-i18next.config')
+require('dotenv').config()
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const withBundleAnalyzer = require('@next/bundle-analyzer')({
   enabled: process.env.ANALYZE === 'true',
 })
 
-const paths = [
+const datasetPaths = [
   'utslappen',
   'koldioxidbudgetarna',
   'klimatplanerna',
@@ -39,10 +40,19 @@ module.exports = withBundleAnalyzer({
 
   // Redirects configuration
   async redirects() {
-    return paths.map((path) => ({
-      source: `/${path}/:slug*`,
-      destination: '/',
-      permanent: true,
-    }))
+    // Use Vercel-defined base URL by default to get the correct base URL in preview deployments too.
+    const baseURL = process.env.NEXT_PUBLIC_BASE_URL ?? `https://${process.env.NEXT_PUBLIC_VERCEL_URL}`
+    return [
+      ...datasetPaths.map((path) => ({
+        source: `/${path}/:slug*`,
+        destination: '/',
+        permanent: true,
+      })),
+      {
+        source: '/bolagsklimatkollen',
+        destination: `${baseURL}/2024-06-Bolagsklimatkollen.pdf`,
+        permanent: false,
+      },
+    ]
   },
 })