Skip to content

Commit c081a74

Browse files
committed
chore: bump pnpm to 11.22.0
- packageManager: pnpm@10.20.0 -> 11.22.0 - move overrides/patchedDependencies from package.json's now-inert "pnpm" field into pnpm-workspace.yaml (pnpm 11 only reads settings from there) - add minimumReleaseAgeExclude for @changesets/cli and @changesets/write: both were published <24h ago (pnpm 11's new default 24h supply-chain policy blocked the lockfile), but are already-vetted devDependency-only build tooling from the changesets v2->v3 migration (PR #5337) - pnpm-lock.yaml churn is from autoInstallPeers defaulting to true in pnpm 11 (resolves previously-unmet optional peers); no dependency version changes - fix biome.json's $schema version notice (2.5.6 -> 2.5.8, matching the installed Biome version) Also migrate cookbooks/portal-analytics off the deprecated, no-longer- supported @equinor/fusion-react-progress-indicator: EquinorLoader now uses EDS's Progress.Star (already a workspace dependency) with a visible Typography caption plus an aria-label on the spinner. Verified: full biome check, fusion-lint, affected build (81/81, excluding the pre-existing, unrelated cli-plugin-copilot failure already on main pending a separate fix), and test suite (86/86 files, 825/825 tests) all pass.
1 parent ba6e8bb commit c081a74

7 files changed

Lines changed: 1189 additions & 1175 deletions

File tree

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
"portal-analytics": patch
3+
---
4+
5+
Replace the deprecated `@equinor/fusion-react-progress-indicator` dependency with EDS's
6+
`Progress.Star` (`@equinor/eds-core-react`) in `EquinorLoader`. The loading text is now
7+
rendered as a visible `Typography` caption alongside an `aria-label` on the spinner,
8+
matching EDS's own accessible loading-indicator pattern.

biome.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://biomejs.dev/schemas/2.5.6/schema.json",
2+
"$schema": "https://biomejs.dev/schemas/2.5.8/schema.json",
33
"vcs": {
44
"enabled": true,
55
"clientKind": "git",

cookbooks/portal-analytics/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
"@equinor/fusion-query": "workspace:*",
3535
"@equinor/fusion-react-context-selector": "^2.0.1",
3636
"@equinor/fusion-react-date": "^1.0.0",
37-
"@equinor/fusion-react-progress-indicator": "^0.3.0",
3837
"@equinor/fusion-react-side-sheet": "^2.0.0",
3938
"react": "^19.2.1",
4039
"@equinor/fusion-framework-react-router": "workspace:*",

cookbooks/portal-analytics/src/components/EquinorLoader.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
import type React from 'react';
2-
import { StarProgress } from '@equinor/fusion-react-progress-indicator';
2+
import { Progress, Typography } from '@equinor/eds-core-react';
33
import styled from 'styled-components';
44

55
const Styled = {
66
Wrapper: styled.div`
77
display: flex;
8+
flex-direction: column;
89
justify-content: center;
910
align-items: center;
11+
gap: 1rem;
1012
width: 100vw;
1113
height: 100vh;
1214
overflow: hidden;
@@ -22,7 +24,9 @@ export const EquinorLoader = ({
2224
}: React.PropsWithChildren<{ readonly text: string }>): JSX.Element => {
2325
return (
2426
<Styled.Wrapper>
25-
<StarProgress text={text}>{children}</StarProgress>
27+
<Progress.Star aria-label={text} />
28+
<Typography aria-hidden="true">{text}</Typography>
29+
{children}
2630
</Styled.Wrapper>
2731
);
2832
};

package.json

Lines changed: 1 addition & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"yarn": "please-use-pnpm",
1111
"pnpm": ">=10"
1212
},
13-
"packageManager": "pnpm@10.20.0",
13+
"packageManager": "pnpm@11.22.0",
1414
"scripts": {
1515
"install": "pnpm -r exec genversion --es6 --semi src/version.ts",
1616
"install:clean": "pnpm clean && pnpm install",
@@ -94,43 +94,6 @@
9494
"vue-press"
9595
]
9696
},
97-
"pnpm": {
98-
"patchedDependencies": {
99-
"vscode-jsonrpc@8.2.1": "patches/vscode-jsonrpc@8.2.1.patch"
100-
},
101-
"overrides": {
102-
"form-data@>=4.0.0 <4.0.6": "4.0.6",
103-
"immutable@>=5.0.0 <5.1.5": "5.1.5",
104-
"markdown-it@>=13.0.0 <14.2.0": "14.2.0",
105-
"linkify-it@<5.0.1": "5.0.1",
106-
"js-yaml@>=3.0.0 <3.15.0": "3.15.0",
107-
"js-yaml@>=4.0.0 <4.3.0": "4.3.0",
108-
"qs@<=6.15.1": "6.15.2",
109-
"undici@>=7.0.0 <7.29.0": "7.29.0",
110-
"undici@>=8.0.0 <8.5.0": "8.5.0",
111-
"ws@>=7.0.0 <7.5.11": "7.5.11",
112-
"brace-expansion@>=2.0.0 <2.1.4": "2.1.4",
113-
"brace-expansion@>=3.0.0 <=5.0.7": "5.0.8",
114-
"dompurify@>=3.1.3 <=3.4.11": "3.4.12",
115-
"follow-redirects@<=1.15.11": "1.16.0",
116-
"handlebars@>=4.0.0 <=4.7.8": "4.7.9",
117-
"langsmith@>=0.4.0 <0.6.0": "0.8.3",
118-
"lodash@>=4.0.0 <=4.17.23": "4.18.1",
119-
"lodash-es@>=4.0.0 <=4.17.23": "4.18.1",
120-
"minimatch@>=5.0.0 <5.1.8": "5.1.8",
121-
"minimatch@>=9.0.0 <9.0.7": "9.0.7",
122-
"minimatch@<3.1.3": "3.1.5",
123-
"path-to-regexp@>=8.0.0 <8.4.0": "8.4.0",
124-
"serialize-javascript@<=7.0.4": "7.0.5",
125-
"yaml@>=2.0.0 <2.8.3": "2.8.3",
126-
"postcss@>=8.0.0 <=8.5.22": "8.5.23",
127-
"valibot@<=1.4.1": "1.4.2",
128-
"fast-uri@>=3.0.0 <=3.1.4": "3.1.5",
129-
"@babel/core@<=7.29.0": "7.29.6",
130-
"esbuild@>=0.27.3 <0.28.1": "0.28.1",
131-
"zod": "4.4.3"
132-
}
133-
},
13497
"dependencies": {
13598
"@equinor/fusion-framework-cli": "workspace:*",
13699
"@equinor/fusion-framework-cli-plugin-ai-index": "workspace:*",

0 commit comments

Comments
 (0)