Skip to content

Commit 5b1fa26

Browse files
authored
Merge branch 'main' into lkostrowski/replace-deprecated-attrs
2 parents 9a867d9 + 88a1969 commit 5b1fa26

39 files changed

Lines changed: 80 additions & 109 deletions

File tree

.changeset/grumpy-planes-build.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"saleor-dashboard": patch
3+
---
4+
5+
Bumped Node to v24 in Dockerfiles (Github Actions, Docker, Devcontainers)

.devcontainer/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/devcontainers/typescript-node:22 AS pnpm
1+
FROM mcr.microsoft.com/devcontainers/typescript-node:24 AS pnpm
22

33
RUN corepack enable
44

@@ -9,7 +9,7 @@ RUN corepack prepare pnpm@10 --activate
99

1010
FROM pnpm AS deps
1111

12-
COPY --chown=1000:1000 ./package.json ./pnpm-lock.yaml ./.npmrc /app/
12+
COPY --chown=1000:1000 ./package.json ./pnpm-lock.yaml ./pnpm-workspace.yaml ./.npmrc /app/
1313
RUN --mount=type=cache,mode=0700,uid=1000,gid=1000,target=/pnpm/store \
1414
pnpm install --frozen-lockfile
1515

.knip.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"enumMembers": "off",
66
"files": "warn",
77
"exports": "warn",
8-
"duplicates": "warn",
8+
"duplicates": "off",
99
"classMembers": "warn",
1010
"nsTypes": "warn",
1111
"unresolved": "warn",
@@ -24,7 +24,8 @@
2424
"src/**/fragments/*.ts",
2525
"src/searches/*.ts",
2626
"src/**/fixtures.ts",
27-
"scripts/**"
27+
"scripts/**",
28+
"storybookUtils/**"
2829
],
2930
"project": ["**/*.{js,ts,tsx,jsx}"],
3031
"jest": true,

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:22-alpine AS builder
1+
FROM node:24-alpine AS builder
22
RUN apk --no-cache add bash
33
RUN corepack enable && corepack prepare pnpm@10 --activate
44
WORKDIR /app

jest.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ const config = {
3232
"@dashboard(.*)$": "<rootDir>/src/$1",
3333
"@test/(.*)$": "<rootDir>/testUtils/$1",
3434
"^@material-ui/core$": "<rootDir>/node_modules/@material-ui/core",
35-
"^@material-ui/icons$": "<rootDir>/node_modules/@material-ui/icons",
3635
"^@material-ui/styles$": "<rootDir>/node_modules/@material-ui/styles",
3736
"^react$": "<rootDir>/node_modules/react",
3837
"^react-dom$": "<rootDir>/node_modules/react-dom",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@
239239
},
240240
"packageManager": "pnpm@10.28.1",
241241
"engines": {
242-
"node": ">=22.15 <23",
242+
"node": ">=24 <25",
243243
"pnpm": ">=10"
244244
}
245245
}

src/attributes/components/AttributeListDatagrid/AttributeListDatagrid.stories.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ import { AttributeListDatagrid } from "./AttributeListDatagrid";
77
const meta: Meta<typeof AttributeListDatagrid> = {
88
title: "Attributes/AttributeListDatagrid",
99
component: AttributeListDatagrid,
10+
parameters: {
11+
chromatic: { diffThreshold: 0.3, delay: 500 },
12+
},
1013
args: {
1114
attributes,
1215
disabled: false,

src/categories/components/CategoryListDatagrid/CategoryListDatagrid.stories.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ import { CategoryListDatagrid } from "./CategoryListDatagrid";
77
const meta: Meta<typeof CategoryListDatagrid> = {
88
title: "Categories/CategoryListDatagrid",
99
component: CategoryListDatagrid,
10+
parameters: {
11+
chromatic: { diffThreshold: 0.3, delay: 500 },
12+
},
1013
args: {
1114
categories,
1215
disabled: false,

src/categories/components/CategoryProductListDatagrid/CategoryProductListDatagrid.stories.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ const mockProducts: RelayToFlat<NonNullable<CategoryDetailsQuery["category"]>["p
2323
const meta: Meta<typeof CategoryProductListDatagrid> = {
2424
title: "Categories/CategoryProductListDatagrid",
2525
component: CategoryProductListDatagrid,
26+
parameters: {
27+
chromatic: { diffThreshold: 0.3, delay: 500 },
28+
},
2629
args: {
2730
products: mockProducts,
2831
disabled: false,

src/channels/components/ChannelForm/automatic-checkout-complete/utils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { type IntlShape } from "react-intl";
22

3-
export type RelativeTimeUnit = "day" | "hour" | "minute";
3+
type RelativeTimeUnit = "day" | "hour" | "minute";
44

5-
export interface RelativeTimeValue {
5+
interface RelativeTimeValue {
66
value: number;
77
unit: RelativeTimeUnit;
88
}

0 commit comments

Comments
 (0)