From b808960fa18a929388e66dcc31aeb02a01173638 Mon Sep 17 00:00:00 2001 From: James Mockett <1166188+jamesmockett@users.noreply.github.com> Date: Wed, 8 May 2024 14:46:07 +0100 Subject: [PATCH 01/11] Use common Space type across components --- .../src/columns/Columns.tsx | 9 +++---- .../src/columns/styles.ts | 18 ++----------- .../src/stack/Stack.tsx | 7 +++-- .../src/stack/styles.ts | 26 ++----------------- 4 files changed, 11 insertions(+), 49 deletions(-) diff --git a/libs/@guardian/source-react-components/src/columns/Columns.tsx b/libs/@guardian/source-react-components/src/columns/Columns.tsx index 993ea3e71..6657fe841 100644 --- a/libs/@guardian/source-react-components/src/columns/Columns.tsx +++ b/libs/@guardian/source-react-components/src/columns/Columns.tsx @@ -2,11 +2,12 @@ import type { SerializedStyles } from '@emotion/react'; import type { Breakpoint } from '@guardian/source-foundations'; import type { HTMLAttributes } from 'react'; import type { Props } from '../@types/Props'; +import type { Space } from '../@types/Space'; import { collapseBelowColumnsCSS, collapseBelowDesktop, collapseBelowleftCol, - collapseBelowSpaceY, + collapseBelowSpaceYCSS, collapseBelowTablet, collapseBelowWide, columns, @@ -22,8 +23,6 @@ export type CollapseBreakpoint = Extract< 'tablet' | 'desktop' | 'leftCol' | 'wide' >; -export type ColumnsSpaceY = 1 | 2 | 3 | 4 | 5 | 6 | 9 | 12 | 24; - const collapseBelowMap: { [key in CollapseBreakpoint]: SerializedStyles } = { tablet: collapseBelowTablet, desktop: collapseBelowDesktop, @@ -60,7 +59,7 @@ export interface ColumnsProps extends HTMLAttributes, Props { * space](https://www.theguardian.design/2a1e5182b/p/449bd5-space) between * between columns vertically when collapsed (one unit is 4px). */ - spaceY?: ColumnsSpaceY; + spaceY?: Space; } /** @@ -90,7 +89,7 @@ export const Columns = ({ columns, collapseUntil ? collapseBelowColumnsMap[collapseUntil] : '', collapseUntil ? collapseBelowMap[collapseUntil] : '', - spaceY ? collapseBelowSpaceY[spaceY] : '', + spaceY ? collapseBelowSpaceYCSS(spaceY) : '', cssOverrides, ]} {...props} diff --git a/libs/@guardian/source-react-components/src/columns/styles.ts b/libs/@guardian/source-react-components/src/columns/styles.ts index bd21f4a9f..cf5375435 100644 --- a/libs/@guardian/source-react-components/src/columns/styles.ts +++ b/libs/@guardian/source-react-components/src/columns/styles.ts @@ -2,7 +2,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import type { Breakpoint } from '@guardian/source-foundations'; import { between, from, space, until } from '@guardian/source-foundations'; -import type { ColumnsSpaceY } from './Columns'; +import type { Space } from '../@types/Space'; type ColumnBreakpoint = { totalColumns: number; @@ -30,27 +30,13 @@ export const collapseBelowColumnsCSS = ( } `; -const collapseBelowSpaceYCSS = (spaceY: ColumnsSpaceY): SerializedStyles => css` +export const collapseBelowSpaceYCSS = (spaceY: Space): SerializedStyles => css` margin-bottom: ${-space[spaceY]}px; & > * { margin-bottom: ${space[spaceY]}px; } `; -export const collapseBelowSpaceY: { - [key in ColumnsSpaceY]: SerializedStyles; -} = { - 1: collapseBelowSpaceYCSS(1), - 2: collapseBelowSpaceYCSS(2), - 3: collapseBelowSpaceYCSS(3), - 4: collapseBelowSpaceYCSS(4), - 5: collapseBelowSpaceYCSS(5), - 6: collapseBelowSpaceYCSS(6), - 9: collapseBelowSpaceYCSS(9), - 12: collapseBelowSpaceYCSS(12), - 24: collapseBelowSpaceYCSS(24), -}; - const collapseBelowWidth = css` width: 100% !important; `; diff --git a/libs/@guardian/source-react-components/src/stack/Stack.tsx b/libs/@guardian/source-react-components/src/stack/Stack.tsx index dea5bc0e7..883348de9 100644 --- a/libs/@guardian/source-react-components/src/stack/Stack.tsx +++ b/libs/@guardian/source-react-components/src/stack/Stack.tsx @@ -1,14 +1,13 @@ import type { HTMLAttributes } from 'react'; import type { Props } from '../@types/Props'; +import type { Space } from '../@types/Space'; import { stack, stackSpace } from './styles'; -export type StackSpace = 1 | 2 | 3 | 4 | 5 | 6 | 9 | 12 | 24; - export interface StackProps extends HTMLAttributes, Props { /** * [Units of space](https://www.theguardian.design/2a1e5182b/p/449bd5-space) between inline items (one unit is 4px). */ - space?: StackSpace; + space?: Space; } /** @@ -26,7 +25,7 @@ export const Stack = ({ ...props }: StackProps) => { return ( -
+
{children}
); diff --git a/libs/@guardian/source-react-components/src/stack/styles.ts b/libs/@guardian/source-react-components/src/stack/styles.ts index a47cc37d9..70932c0ae 100644 --- a/libs/@guardian/source-react-components/src/stack/styles.ts +++ b/libs/@guardian/source-react-components/src/stack/styles.ts @@ -1,7 +1,7 @@ import type { SerializedStyles } from '@emotion/react'; import { css } from '@emotion/react'; import { space } from '@guardian/source-foundations'; -import type { StackSpace } from './Stack'; +import type { Space } from '../@types/Space'; export const stack = css` & > * { @@ -9,30 +9,8 @@ export const stack = css` } `; -const stackSpaceStyle = (number: StackSpace): SerializedStyles => css` +export const stackSpace = (number: Space): SerializedStyles => css` & > * + * { margin-top: ${space[number]}px; } `; - -export const stackSpace: { - 1: SerializedStyles; - 2: SerializedStyles; - 3: SerializedStyles; - 4: SerializedStyles; - 5: SerializedStyles; - 6: SerializedStyles; - 9: SerializedStyles; - 12: SerializedStyles; - 24: SerializedStyles; -} = { - 1: stackSpaceStyle(1), - 2: stackSpaceStyle(2), - 3: stackSpaceStyle(3), - 4: stackSpaceStyle(4), - 5: stackSpaceStyle(5), - 6: stackSpaceStyle(6), - 9: stackSpaceStyle(9), - 12: stackSpaceStyle(12), - 24: stackSpaceStyle(24), -}; From b9f9fa9aab57d482ade2402044a4ce12c29d4dfa Mon Sep 17 00:00:00 2001 From: James Mockett <1166188+jamesmockett@users.noreply.github.com> Date: Wed, 8 May 2024 15:21:37 +0100 Subject: [PATCH 02/11] Update Stack stories to better show spacing --- .../src/stack/Stack.stories.tsx | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/libs/@guardian/source-react-components/src/stack/Stack.stories.tsx b/libs/@guardian/source-react-components/src/stack/Stack.stories.tsx index 8bd276d5e..ed98ad97f 100644 --- a/libs/@guardian/source-react-components/src/stack/Stack.stories.tsx +++ b/libs/@guardian/source-react-components/src/stack/Stack.stories.tsx @@ -1,3 +1,5 @@ +import { css } from '@emotion/react'; +import { palette, space } from '@guardian/source-foundations'; import type { Meta, StoryFn } from '@storybook/react'; import type { StackProps } from './Stack'; import { Stack } from './Stack'; @@ -9,12 +11,25 @@ const meta: Meta = { export default meta; +const wrapper = css` + outline: 1px dashed ${palette.neutral[46]}; +`; + +const box = css` + display: grid; + place-items: center; + height: ${space[12]}px; + background: ${palette.news[600]}; +`; + const Template: StoryFn = (args: StackProps) => ( - -
Item 1
-
Item 2
-
Item 3
- +
+ +
1
+
2
+
3
+ +
); export const Default: StoryFn = Template.bind({}); From a1455ff9e14ad38e33f4c7905991696dd12a0265 Mon Sep 17 00:00:00 2001 From: James Mockett <1166188+jamesmockett@users.noreply.github.com> Date: Thu, 9 May 2024 17:19:56 +0100 Subject: [PATCH 03/11] Explciitly test if space props are undefined --- .../source-react-components/package.json | 1 + .../src/columns/Columns.tsx | 3 ++- .../src/inline/Inline.tsx | 7 ++++++- .../source-react-components/src/stack/Stack.tsx | 6 +++++- pnpm-lock.yaml | 16 ++++++++++++++++ 5 files changed, 30 insertions(+), 3 deletions(-) diff --git a/libs/@guardian/source-react-components/package.json b/libs/@guardian/source-react-components/package.json index 3800a67b8..c4640d192 100644 --- a/libs/@guardian/source-react-components/package.json +++ b/libs/@guardian/source-react-components/package.json @@ -28,6 +28,7 @@ "devDependencies": { "@babel/core": "7.24.0", "@emotion/react": "11.11.1", + "@guardian/libs": "16.1.3", "@guardian/source-foundations": "16.0.0", "@svgr/babel-preset": "8.1.0", "@svgr/core": "8.1.0", diff --git a/libs/@guardian/source-react-components/src/columns/Columns.tsx b/libs/@guardian/source-react-components/src/columns/Columns.tsx index 6657fe841..c8fdb12be 100644 --- a/libs/@guardian/source-react-components/src/columns/Columns.tsx +++ b/libs/@guardian/source-react-components/src/columns/Columns.tsx @@ -1,4 +1,5 @@ import type { SerializedStyles } from '@emotion/react'; +import { isUndefined } from '@guardian/libs'; import type { Breakpoint } from '@guardian/source-foundations'; import type { HTMLAttributes } from 'react'; import type { Props } from '../@types/Props'; @@ -89,7 +90,7 @@ export const Columns = ({ columns, collapseUntil ? collapseBelowColumnsMap[collapseUntil] : '', collapseUntil ? collapseBelowMap[collapseUntil] : '', - spaceY ? collapseBelowSpaceYCSS(spaceY) : '', + isUndefined(spaceY) ? '' : collapseBelowSpaceYCSS(spaceY), cssOverrides, ]} {...props} diff --git a/libs/@guardian/source-react-components/src/inline/Inline.tsx b/libs/@guardian/source-react-components/src/inline/Inline.tsx index c34934404..771165bf0 100644 --- a/libs/@guardian/source-react-components/src/inline/Inline.tsx +++ b/libs/@guardian/source-react-components/src/inline/Inline.tsx @@ -1,3 +1,4 @@ +import { isUndefined } from '@guardian/libs'; import type { HTMLAttributes } from 'react'; import type { Props } from '../@types/Props'; import type { Space } from '../@types/Space'; @@ -28,7 +29,11 @@ export const Inline = ({ return (
{children} diff --git a/libs/@guardian/source-react-components/src/stack/Stack.tsx b/libs/@guardian/source-react-components/src/stack/Stack.tsx index 883348de9..80c54e0f2 100644 --- a/libs/@guardian/source-react-components/src/stack/Stack.tsx +++ b/libs/@guardian/source-react-components/src/stack/Stack.tsx @@ -1,3 +1,4 @@ +import { isUndefined } from '@guardian/libs'; import type { HTMLAttributes } from 'react'; import type { Props } from '../@types/Props'; import type { Space } from '../@types/Space'; @@ -25,7 +26,10 @@ export const Stack = ({ ...props }: StackProps) => { return ( -
+
{children}
); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 81fbc6399..6306874b0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -735,6 +735,9 @@ importers: '@emotion/react': specifier: 11.11.1 version: 11.11.1(@types/react@18.2.11)(react@18.2.0) + '@guardian/libs': + specifier: 16.1.3 + version: 16.1.3(tslib@2.6.2)(typescript@5.3.3) '@guardian/source-foundations': specifier: 16.0.0 version: link:../source-foundations @@ -3533,6 +3536,19 @@ packages: typescript: 5.3.3 dev: true + /@guardian/libs@16.1.3(tslib@2.6.2)(typescript@5.3.3): + resolution: {integrity: sha512-n8iv8De6lGSGcIyagbK79gv5tK5o+bRbsWSsYH+v6ob2HNwjVSkwY+Ang+snQWp6DPed+iHvnQQK5pWXnXMfOA==} + peerDependencies: + tslib: ^2.6.2 + typescript: ~5.3.3 + peerDependenciesMeta: + typescript: + optional: true + dependencies: + tslib: 2.6.2 + typescript: 5.3.3 + dev: true + /@guardian/source-foundations@14.1.4(tslib@2.6.2)(typescript@5.3.3): resolution: {integrity: sha512-SHkFVBxsE2dSNTKfzmGY1hD9BA7qJ2+bGY1plrUJlYJBCRQdno/YuNummO+wm0Q+kMgxRT0iz5md2DjKYERzQw==} peerDependencies: From 168b6102451095d281e8d3edbd4e2b7e667a3dc5 Mon Sep 17 00:00:00 2001 From: James Mockett <1166188+jamesmockett@users.noreply.github.com> Date: Thu, 9 May 2024 17:25:21 +0100 Subject: [PATCH 04/11] Update stories to include examples of all spacing units --- .../src/inline/Inline.stories.tsx | 42 +++++++++++++++++++ .../src/stack/Stack.stories.tsx | 42 +++++++++++++++++++ 2 files changed, 84 insertions(+) diff --git a/libs/@guardian/source-react-components/src/inline/Inline.stories.tsx b/libs/@guardian/source-react-components/src/inline/Inline.stories.tsx index ced0e49e6..2abc89a9d 100644 --- a/libs/@guardian/source-react-components/src/inline/Inline.stories.tsx +++ b/libs/@guardian/source-react-components/src/inline/Inline.stories.tsx @@ -41,6 +41,13 @@ export const NoSpace: StoryFn = Template.bind({}); // ***************************************************************************** +export const Space0: StoryFn = Template.bind({}); +Space0.args = { + space: 0, +}; + +// ***************************************************************************** + export const Space1: StoryFn = Template.bind({}); Space1.args = { space: 1, @@ -83,6 +90,13 @@ Space6.args = { // ***************************************************************************** +export const Space8: StoryFn = Template.bind({}); +Space8.args = { + space: 8, +}; + +// ***************************************************************************** + export const Space9: StoryFn = Template.bind({}); Space9.args = { space: 9, @@ -90,6 +104,13 @@ Space9.args = { // ***************************************************************************** +export const Space10: StoryFn = Template.bind({}); +Space10.args = { + space: 10, +}; + +// ***************************************************************************** + export const Space12: StoryFn = Template.bind({}); Space12.args = { space: 12, @@ -97,6 +118,27 @@ Space12.args = { // ***************************************************************************** +export const Space14: StoryFn = Template.bind({}); +Space14.args = { + space: 14, +}; + +// ***************************************************************************** + +export const Space16: StoryFn = Template.bind({}); +Space16.args = { + space: 16, +}; + +// ***************************************************************************** + +export const Space18: StoryFn = Template.bind({}); +Space18.args = { + space: 18, +}; + +// ***************************************************************************** + export const Space24: StoryFn = Template.bind({}); Space24.args = { space: 24, diff --git a/libs/@guardian/source-react-components/src/stack/Stack.stories.tsx b/libs/@guardian/source-react-components/src/stack/Stack.stories.tsx index ed98ad97f..42ed5e6b6 100644 --- a/libs/@guardian/source-react-components/src/stack/Stack.stories.tsx +++ b/libs/@guardian/source-react-components/src/stack/Stack.stories.tsx @@ -36,6 +36,13 @@ export const Default: StoryFn = Template.bind({}); // ***************************************************************************** +export const Space0: StoryFn = Template.bind({}); +Space0.args = { + space: 0, +}; + +// ***************************************************************************** + export const Space1: StoryFn = Template.bind({}); Space1.args = { space: 1, @@ -78,6 +85,13 @@ Space6.args = { // ***************************************************************************** +export const Space8: StoryFn = Template.bind({}); +Space8.args = { + space: 8, +}; + +// ***************************************************************************** + export const Space9: StoryFn = Template.bind({}); Space9.args = { space: 9, @@ -85,6 +99,13 @@ Space9.args = { // ***************************************************************************** +export const Space10: StoryFn = Template.bind({}); +Space10.args = { + space: 10, +}; + +// ***************************************************************************** + export const Space12: StoryFn = Template.bind({}); Space12.args = { space: 12, @@ -92,6 +113,27 @@ Space12.args = { // ***************************************************************************** +export const Space14: StoryFn = Template.bind({}); +Space14.args = { + space: 14, +}; + +// ***************************************************************************** + +export const Space16: StoryFn = Template.bind({}); +Space16.args = { + space: 16, +}; + +// ***************************************************************************** + +export const Space18: StoryFn = Template.bind({}); +Space18.args = { + space: 18, +}; + +// ***************************************************************************** + export const Space24: StoryFn = Template.bind({}); Space24.args = { space: 24, From c891f94e4b3dd2c8507cdbeef79c36a49eb10cda Mon Sep 17 00:00:00 2001 From: James Mockett <1166188+jamesmockett@users.noreply.github.com> Date: Thu, 16 May 2024 15:10:30 +0100 Subject: [PATCH 05/11] Add `libs` as a build dependency --- libs/@guardian/source-react-components/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/@guardian/source-react-components/package.json b/libs/@guardian/source-react-components/package.json index c4640d192..ad8b3837f 100644 --- a/libs/@guardian/source-react-components/package.json +++ b/libs/@guardian/source-react-components/package.json @@ -70,6 +70,7 @@ "wireit": { "_deps": { "dependencies": [ + "../libs:build", "../source-foundations:build" ] }, From 1921d8cb5a40b8216546a54db5ba4bac67e2de87 Mon Sep 17 00:00:00 2001 From: James Mockett <1166188+jamesmockett@users.noreply.github.com> Date: Thu, 16 May 2024 15:16:06 +0100 Subject: [PATCH 06/11] Add changeset --- .changeset/forty-comics-scream.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/forty-comics-scream.md diff --git a/.changeset/forty-comics-scream.md b/.changeset/forty-comics-scream.md new file mode 100644 index 000000000..2b56e9179 --- /dev/null +++ b/.changeset/forty-comics-scream.md @@ -0,0 +1,5 @@ +--- +'@guardian/source-react-components': patch +--- + +Fixes bug where `space.0` was not applied to `Inline` layouts and updates `Column` and `Stack` to support all spacing units From fb2f807f32d546aa21a654f514fe65219e670634 Mon Sep 17 00:00:00 2001 From: James Mockett <1166188+jamesmockett@users.noreply.github.com> Date: Thu, 16 May 2024 15:56:30 +0100 Subject: [PATCH 07/11] Add as dependency to single Source package --- libs/@guardian/source/package.json | 2 ++ pnpm-lock.yaml | 18 ++++-------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/libs/@guardian/source/package.json b/libs/@guardian/source/package.json index bdc42189b..ae86a5545 100644 --- a/libs/@guardian/source/package.json +++ b/libs/@guardian/source/package.json @@ -40,6 +40,7 @@ "@babel/core": "7.24.0", "@emotion/react": "11.11.1", "@guardian/design-tokens": "workspace:*", + "@guardian/libs": "workspace:*", "@rollup/plugin-alias": "5.1.0", "@svgr/babel-preset": "8.1.0", "@svgr/core": "8.1.0", @@ -81,6 +82,7 @@ "wireit": { "_deps": { "dependencies": [ + "../libs:build", "../source-foundations:build", "../source-react-components:build" ] diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6306874b0..5e13d142f 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -620,6 +620,9 @@ importers: '@guardian/design-tokens': specifier: workspace:* version: link:../design-tokens + '@guardian/libs': + specifier: workspace:* + version: link:../libs '@rollup/plugin-alias': specifier: 5.1.0 version: 5.1.0(rollup@4.17.2) @@ -737,7 +740,7 @@ importers: version: 11.11.1(@types/react@18.2.11)(react@18.2.0) '@guardian/libs': specifier: 16.1.3 - version: 16.1.3(tslib@2.6.2)(typescript@5.3.3) + version: link:../libs '@guardian/source-foundations': specifier: 16.0.0 version: link:../source-foundations @@ -3536,19 +3539,6 @@ packages: typescript: 5.3.3 dev: true - /@guardian/libs@16.1.3(tslib@2.6.2)(typescript@5.3.3): - resolution: {integrity: sha512-n8iv8De6lGSGcIyagbK79gv5tK5o+bRbsWSsYH+v6ob2HNwjVSkwY+Ang+snQWp6DPed+iHvnQQK5pWXnXMfOA==} - peerDependencies: - tslib: ^2.6.2 - typescript: ~5.3.3 - peerDependenciesMeta: - typescript: - optional: true - dependencies: - tslib: 2.6.2 - typescript: 5.3.3 - dev: true - /@guardian/source-foundations@14.1.4(tslib@2.6.2)(typescript@5.3.3): resolution: {integrity: sha512-SHkFVBxsE2dSNTKfzmGY1hD9BA7qJ2+bGY1plrUJlYJBCRQdno/YuNummO+wm0Q+kMgxRT0iz5md2DjKYERzQw==} peerDependencies: From e675057f3f20ecd8f04dcce91f0e3430cfe78b69 Mon Sep 17 00:00:00 2001 From: James Mockett <1166188+jamesmockett@users.noreply.github.com> Date: Fri, 17 May 2024 12:55:36 +0100 Subject: [PATCH 08/11] Use specific version of rather than local workspace copy --- libs/@guardian/source/package.json | 2 +- pnpm-lock.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/@guardian/source/package.json b/libs/@guardian/source/package.json index ae86a5545..c2a9a9928 100644 --- a/libs/@guardian/source/package.json +++ b/libs/@guardian/source/package.json @@ -40,7 +40,7 @@ "@babel/core": "7.24.0", "@emotion/react": "11.11.1", "@guardian/design-tokens": "workspace:*", - "@guardian/libs": "workspace:*", + "@guardian/libs": "16.1.3", "@rollup/plugin-alias": "5.1.0", "@svgr/babel-preset": "8.1.0", "@svgr/core": "8.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5e13d142f..2c20bcdf3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -621,7 +621,7 @@ importers: specifier: workspace:* version: link:../design-tokens '@guardian/libs': - specifier: workspace:* + specifier: 16.1.3 version: link:../libs '@rollup/plugin-alias': specifier: 5.1.0 From 89022b9bfa1c5a41035f3fed2931a63d2ab0b60b Mon Sep 17 00:00:00 2001 From: James Mockett <1166188+jamesmockett@users.noreply.github.com> Date: Thu, 23 May 2024 17:57:59 +0100 Subject: [PATCH 09/11] Revert change to dev kitchen --- .../source-development-kitchen/react-components/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/@guardian/source-development-kitchen/react-components/package.json b/libs/@guardian/source-development-kitchen/react-components/package.json index a4e8144e9..2d5dfd9b9 100644 --- a/libs/@guardian/source-development-kitchen/react-components/package.json +++ b/libs/@guardian/source-development-kitchen/react-components/package.json @@ -1,6 +1,6 @@ { + "//": "sub-package to match the `exports` field in the parent package.json", "private": true, "type": "module", - "main": "../dist/react-components.js", - "//": "sub-package to match the `exports` field in the parent package.json" + "main": "../dist/react-components.js" } From 1d8ff16dfc643a0f05ecd9e19c8b9e28b057542f Mon Sep 17 00:00:00 2001 From: James Mockett <1166188+jamesmockett@users.noreply.github.com> Date: Thu, 23 May 2024 18:03:43 +0100 Subject: [PATCH 10/11] Update Jest config --- configs/jest.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/jest.config.js b/configs/jest.config.js index 97e536de0..e05fc4082 100644 --- a/configs/jest.config.js +++ b/configs/jest.config.js @@ -3,7 +3,7 @@ export const config = { clearMocks: true, moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'], testPathIgnorePatterns: ['/node_modules/', '/.wireit/'], - transformIgnorePatterns: ['node_modules/(?!@guardian)'], + transformIgnorePatterns: ['node_modules/.pnpm/(?!@guardian)'], transform: { '^.+\\.[tj]sx?$': [ 'ts-jest', From 30200813fcd4a4736c034e5df06370cdf47f4e24 Mon Sep 17 00:00:00 2001 From: James Mockett <1166188+jamesmockett@users.noreply.github.com> Date: Fri, 24 May 2024 11:38:29 +0100 Subject: [PATCH 11/11] Update package name in changeset --- .changeset/forty-comics-scream.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/forty-comics-scream.md b/.changeset/forty-comics-scream.md index 2b56e9179..f14d1867d 100644 --- a/.changeset/forty-comics-scream.md +++ b/.changeset/forty-comics-scream.md @@ -1,5 +1,5 @@ --- -'@guardian/source-react-components': patch +'@guardian/source': patch --- Fixes bug where `space.0` was not applied to `Inline` layouts and updates `Column` and `Stack` to support all spacing units