From 67d1624d0d68522c6e15ca7538a721b69262d1cd Mon Sep 17 00:00:00 2001 From: "Malin J." Date: Wed, 12 Feb 2025 09:49:11 +0100 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=94=A8=20Add=20tailwind=20purge=20and?= =?UTF-8?q?=20swcMinify=20#2827?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/next.config.js | 1 + web/tailwind.config.cjs | 1 + 2 files changed, 2 insertions(+) diff --git a/web/next.config.js b/web/next.config.js index e957be184..812fe7cab 100644 --- a/web/next.config.js +++ b/web/next.config.js @@ -46,6 +46,7 @@ export default withBundle({ 'video.js', ], }, + swcMinify: true, transpilePackages: ['friendly-challenge'], eslint: { // Warning: Dangerously allow production builds to successfully complete even if diff --git a/web/tailwind.config.cjs b/web/tailwind.config.cjs index e94accd5f..45363af01 100644 --- a/web/tailwind.config.cjs +++ b/web/tailwind.config.cjs @@ -12,6 +12,7 @@ const round = (num) => const em = (px, base) => `${round(px / base)}em` module.exports = { + purge: ['./pages/**/*.{js,ts,jsx,tsx}', './components/**/*.{js,ts,jsx,tsx}'], content: [ './components/**/*.{js,ts,tsx}', './pageComponents/**/*.{js,ts,tsx}', From 7cc276429b8e90c09a629393a38f8cf7997227c3 Mon Sep 17 00:00:00 2001 From: "Malin J." Date: Wed, 12 Feb 2025 09:49:54 +0100 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=94=A8=20Cache=20fonts=201=20week=20#?= =?UTF-8?q?2827?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/next.config.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/web/next.config.js b/web/next.config.js index 812fe7cab..7019bd7d1 100644 --- a/web/next.config.js +++ b/web/next.config.js @@ -95,6 +95,15 @@ export default withBundle({ source: '/:path*', headers: securityHeaders, }, + { + source: '/fonts/(.*)', + headers: [ + { + key: 'Cache-Control', + value: 'public, max-age=604800, immutable', + }, + ], + }, ].filter((e) => e) }, async redirects() { From a2c5e34950594cd3ba01ce7f65716b74c9d16da1 Mon Sep 17 00:00:00 2001 From: "Malin J." Date: Wed, 12 Feb 2025 10:43:38 +0100 Subject: [PATCH 3/4] Do not need purge with next config changes #2827 --- web/tailwind.config.cjs | 1 - 1 file changed, 1 deletion(-) diff --git a/web/tailwind.config.cjs b/web/tailwind.config.cjs index 45363af01..e94accd5f 100644 --- a/web/tailwind.config.cjs +++ b/web/tailwind.config.cjs @@ -12,7 +12,6 @@ const round = (num) => const em = (px, base) => `${round(px / base)}em` module.exports = { - purge: ['./pages/**/*.{js,ts,jsx,tsx}', './components/**/*.{js,ts,jsx,tsx}'], content: [ './components/**/*.{js,ts,tsx}', './pageComponents/**/*.{js,ts,tsx}', From 8ae435b94de1d190b899b3a03a50abd97cc1cc71 Mon Sep 17 00:00:00 2001 From: "Malin J." Date: Thu, 13 Feb 2025 12:29:30 +0100 Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=A7=B9=20Remove=20unused=20block=20co?= =?UTF-8?q?mponent=20#2827?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/components/src/Quote/BlockQuote.tsx | 45 ------------------- web/components/src/Quote/index.ts | 2 - .../stories/typography/Typography.tsx | 10 +---- 3 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 web/components/src/Quote/BlockQuote.tsx diff --git a/web/components/src/Quote/BlockQuote.tsx b/web/components/src/Quote/BlockQuote.tsx deleted file mode 100644 index 9f872f802..000000000 --- a/web/components/src/Quote/BlockQuote.tsx +++ /dev/null @@ -1,45 +0,0 @@ -import { forwardRef } from 'react' -import styled from 'styled-components' - -const Container = styled.div` - display: flex; - align-items: row; -` - -const Quote = styled.blockquote` - background: none; - margin: 0; - color: var(--color-on-background); -` - -const Author = styled.figcaption` - text-align: right; - margin-top: var(--space-medium); - font-style: italic; -` - -export type BlockQuoteProps = { - quote: string - author: string - image?: string | null // url -} - -export const BlockQuote = forwardRef(function BlockQuote( - { quote, author, image = null }, - ref, -) { - return ( - -
- {quote} - {author} -
- {image ? ( - <> - {/* eslint-disable-next-line @next/next/no-img-element */} - - - ) : null} - - ) -}) diff --git a/web/components/src/Quote/index.ts b/web/components/src/Quote/index.ts index a40eb4293..3e8d3c03e 100644 --- a/web/components/src/Quote/index.ts +++ b/web/components/src/Quote/index.ts @@ -17,5 +17,3 @@ PullQuote.Quote = Quote export { PullQuote } export type { PullQuoteProps } - -export * from './BlockQuote' diff --git a/web/components/stories/typography/Typography.tsx b/web/components/stories/typography/Typography.tsx index 5e56e2bb4..5e0b15bec 100644 --- a/web/components/stories/typography/Typography.tsx +++ b/web/components/stories/typography/Typography.tsx @@ -43,8 +43,7 @@ const Article = styled.article` /* spacing */ - figure, - blockquote { + figure { margin: 0; } @@ -112,13 +111,6 @@ export const Typography: React.FC = () => ( supply chain partners. The findings from this initial exploratory phase will form the basis for subsequent decisions.

-
-

- “Panasonic’s plan for expanding its footprint in the European lithium-ion battery market Mototsugu Sato, - Executive Vice President of Panasonic, says the company sees the strategic partnership with Equinor and Hydro as - a potential basis for future development and growth in the energy/battery sector in the European region.” -

-

“This collaboration combines Panasonic’s position as an innovative technology company and leader in lithium-ion batteries, with the deep industrial experience of Equinor and Hydro, both strong global players, to potentially