Skip to content

Commit 09a2919

Browse files
committed
Merge branch 'main' into fix/line-discounts-discoverabilty
2 parents f5ab4d5 + 03674f6 commit 09a2919

121 files changed

Lines changed: 3673 additions & 1133 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.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)

.changeset/perky-pens-smash.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+
Updated Vite bundler to 7.3.1 (from 6.4.1). This is a dev/build-time dependency update; no user-facing changes are expected.

.changeset/slimy-areas-appear.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+
Fix datagrid header selection color (regression)

.changeset/tangy-friends-follow.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"saleor-dashboard": minor
3+
---
4+
5+
Add password login mode setting to Site Settings, allowing administrators to control whether password-based authentication is enabled, restricted to customers only, or fully disabled. The Sign In page now respects this setting — when password login is disabled or restricted to customers only, the email/password form is hidden and only external authentication methods (e.g. SSO) are shown.

.changeset/tidy-candles-appear.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+
Fixed dynamic fetching of categories (Combobox) in the Product Page (assign product to category)

.changeset/warm-ducks-lead.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"saleor-dashboard": minor
3+
---
4+
5+
Support REFUNDED_IN_ORDER event in gift card history

.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,

.storybook/preview.tsx

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import { MemoryRouter } from "react-router-dom";
77
import { configure } from "storybook/test";
88
import { LocaleContext } from "../src/components/Locale/Locale";
99
import { apolloClient } from "../src/graphql/client";
10+
import { PaginatorContext } from "../src/hooks/usePaginator";
1011
import "../src/index.css";
1112
import { ThemeProvider } from "../src/theme";
1213
import { paletteOverrides, themeOverrides } from "../src/themeOverrides";
@@ -23,7 +24,17 @@ const preview: Preview = {
2324
{/* @ts-expect-error legacy types */}
2425
<LegacyThemeProvider overrides={themeOverrides} palettes={paletteOverrides}>
2526
<ThemeProvider>
26-
<Story />
27+
<PaginatorContext.Provider
28+
value={{
29+
hasNextPage: false,
30+
hasPreviousPage: false,
31+
paginatorType: "link",
32+
nextHref: undefined,
33+
prevHref: undefined,
34+
}}
35+
>
36+
<Story />
37+
</PaginatorContext.Provider>
2738
</ThemeProvider>
2839
</LegacyThemeProvider>
2940
</IntlProvider>
@@ -33,6 +44,16 @@ const preview: Preview = {
3344
),
3445
],
3546
parameters: {
47+
chromatic: {
48+
/**
49+
* Tweaking values, mostly to get rid of false negatives from Datagrid (canvas)
50+
* We can try to tweak this value, also on a component level
51+
*
52+
* https://www.chromatic.com/docs/threshold/
53+
*/
54+
diffThreshold: 0.8,
55+
delay: 500,
56+
},
3657
controls: {
3758
matchers: {
3859
color: /(background|color)$/i,

AGENTS.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,10 @@ This frontend connects to a Saleor GraphQL backend:
180180

181181
When modifying `package.json`, always run `pnpm install` to update `pnpm-lock.yaml` and node_modules.
182182

183+
### Dependency Overrides
184+
185+
Dependency overrides (for security patches, version pinning, etc.) must be placed in `pnpm-workspace.yaml` under the `overrides:` key — **not** in `package.json` under `pnpm.overrides`. The workspace file is the single source of truth for overrides in this project.
186+
183187
## Contributing
184188

185189
### Changesets

0 commit comments

Comments
 (0)