Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4,138 changes: 2,735 additions & 1,403 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@
"@types/prettier": "^2.7.2",
"@types/source-map-support": "^0.5.10",
"@types/tar-fs": "^2.0.1",
"@vitest/coverage-v8": "^1.0.4",
"@vitest/coverage-v8": "^3.2.4",
"devtools-protocol": "^0.0.1177611",
"esbuild": "*",
"fast-glob": "^3.2.12",
"flame-chart-js": "2.3.2",
"get-port": "^7.0.0",
"type-fest": "^4.33.0",
"vite": "^6.2.4",
"vitest": "^1.0.4"
"vitest": "^3.2.4"
},
"dependencies": {
"@ast-grep/napi": "0.33.0",
Expand Down
1 change: 1 addition & 0 deletions packages/cli/vitest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ export default defineConfig({
test: {
globalSetup: './vitest.setup.ts',
coverage: {
provider: 'v8',
all: true,
include: ['src/**'],
exclude: [
Expand Down
3 changes: 2 additions & 1 deletion packages/create-hydrogen/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"@ast-grep/napi": "0.34.1"
},
"devDependencies": {
"tempy": "3.1.0"
"tempy": "3.1.0",
"vitest": "^3.2.4"
},
"bin": "dist/create-app.js",
"files": [
Expand Down
2 changes: 1 addition & 1 deletion packages/hydrogen-codegen/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@graphql-codegen/plugin-helpers": "^5.1.0",
"dts-bundle-generator": "^9.5.1",
"type-fest": "^4.33.0",
"vitest": "^1.0.4"
"vitest": "^3.2.4"
},
"dependencies": {
"@shopify/graphql-codegen": "^0.1.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/hydrogen-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
"@testing-library/user-event": "^14.6.1",
"@types/jest": "^29.5.14",
"@vitejs/plugin-react": "^4.3.4",
"@vitest/coverage-v8": "^1.0.4",
"@vitest/coverage-v8": "^3.2.4",
"cpy-cli": "^5.0.0",
"eslint": "^9.18.0",
"eslint-config-prettier": "^10.0.1",
Expand All @@ -166,7 +166,7 @@
"ts-expect": "^1.3.0",
"typescript": "^5.7.3",
"vite": "^6.2.4",
"vitest": "^1.0.4"
"vitest": "^3.2.4"
},
"peerDependencies": {
"react": "^18.0.0",
Expand Down
4 changes: 1 addition & 3 deletions packages/hydrogen-react/src/Image.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,5 @@ describe('<Image />', () => {
});

function getWarnings(): string[] {
return (console.warn as Mock<[string]>).mock.calls.map(
([message]) => message,
);
return (console.warn as Mock).mock.calls.map((args) => args[0] as string);
}
2 changes: 1 addition & 1 deletion packages/hydrogen-react/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"declaration": true,
"declarationDir": "./dist/types",
"jsx": "react-jsx",
"types": ["jest", "@testing-library/jest-dom"]
"types": ["vitest/globals", "jest", "@testing-library/jest-dom"]
},
"include": ["src/**/*", "globals.d.ts"],
"exclude": [
Expand Down
3 changes: 3 additions & 0 deletions packages/hydrogen-react/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@ export default defineConfig(({mode, isSsrBuild}) => {
environment: 'happy-dom',
setupFiles: './vitest.setup.ts',
restoreMocks: true,
coverage: {
provider: 'v8',
},
},
};
});
Expand Down
2 changes: 1 addition & 1 deletion packages/hydrogen/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"happy-dom": "^17.0.0",
"react": "^18.2.0",
"schema-dts": "^1.1.2",
"vitest": "^1.0.4"
"vitest": "^3.2.4"
},
"peerDependencies": {
"react-router": "7.6.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/hydrogen/src/customer/auth.helpers.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ describe('auth.helpers', () => {
describe('refreshToken', () => {
beforeEach(() => {
session = {
commit: vi.fn(() => new Promise((resolve) => resolve('cookie'))),
commit: vi.fn(() => Promise.resolve('cookie')),
get: vi.fn(),
set: vi.fn(),
unset: vi.fn(),
Expand Down Expand Up @@ -153,7 +153,7 @@ describe('auth.helpers', () => {
describe('clearSession', () => {
beforeEach(() => {
session = {
commit: vi.fn(() => new Promise((resolve) => resolve('cookie'))),
commit: vi.fn(() => Promise.resolve('cookie')),
get: vi.fn(),
set: vi.fn(),
unset: vi.fn(),
Expand All @@ -173,7 +173,7 @@ describe('auth.helpers', () => {
describe('checkExpires', () => {
beforeEach(() => {
session = {
commit: vi.fn(() => new Promise((resolve) => resolve('cookie'))),
commit: vi.fn(() => Promise.resolve('cookie')),
get: vi.fn(),
set: vi.fn(),
unset: vi.fn(),
Expand Down
10 changes: 5 additions & 5 deletions packages/hydrogen/src/customer/customer.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const mockBuyerSession = {
describe('customer', () => {
beforeEach(() => {
session = {
commit: vi.fn(() => new Promise((resolve) => resolve('cookie'))),
commit: vi.fn(() => Promise.resolve('cookie')),
get: vi.fn(() => {
return {...mockCustomerAccountSession, ...mockBuyerSession};
}) as HydrogenSession['get'],
Expand Down Expand Up @@ -352,7 +352,7 @@ describe('customer', () => {
it('Redirects to app origin when customer is not login by default', async () => {
const origin = 'https://shop123.com';
const mockSession: HydrogenSession = {
commit: vi.fn(() => new Promise((resolve) => resolve('cookie'))),
commit: vi.fn(() => Promise.resolve('cookie')),
get: vi.fn(() => undefined) as HydrogenSession['get'],
set: vi.fn(),
unset: vi.fn(),
Expand Down Expand Up @@ -383,7 +383,7 @@ describe('customer', () => {
const postLogoutRedirectUri = '/post-logout-landing-page';

const mockSession: HydrogenSession = {
commit: vi.fn(() => new Promise((resolve) => resolve('cookie'))),
commit: vi.fn(() => Promise.resolve('cookie')),
get: vi.fn(() => undefined) as HydrogenSession['get'],
set: vi.fn(),
unset: vi.fn(),
Expand Down Expand Up @@ -417,7 +417,7 @@ describe('customer', () => {
'https://something-bad.com/post-logout-landing-page';

const mockSession: HydrogenSession = {
commit: vi.fn(() => new Promise((resolve) => resolve('cookie'))),
commit: vi.fn(() => Promise.resolve('cookie')),
get: vi.fn(() => undefined) as HydrogenSession['get'],
set: vi.fn(),
unset: vi.fn(),
Expand Down Expand Up @@ -746,7 +746,7 @@ describe('customer', () => {
it('Redirects to redirectPath on successful authorization and updates session', async () => {
const redirectPath = '/account/orders';
session = {
commit: vi.fn(() => new Promise((resolve) => resolve('cookie'))),
commit: vi.fn(() => Promise.resolve('cookie')),
get: vi.fn(() => {
return {...mockCustomerAccountSession, redirectPath};
}) as HydrogenSession['get'],
Expand Down
2 changes: 1 addition & 1 deletion packages/hydrogen/src/storefront.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ vi.mock('./cache/server-fetch.ts', async () => {
...original,
fetchWithServerCache: vi.fn(() =>
Promise.resolve(['' as any, new Response('ok')]),
),
) as any,
} satisfies typeof original;
});

Expand Down
8 changes: 7 additions & 1 deletion packages/hydrogen/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@
"include": ["src", "dev.env.d.ts"],
"compilerOptions": {
"jsx": "react-jsx",
"types": ["node", "vite/client", "jest", "@testing-library/jest-dom"],
"types": [
"node",
"vite/client",
"vitest/globals",
"jest",
"@testing-library/jest-dom"
],
"paths": {
"@shopify/hydrogen": ["./src"],
"~/mini-oxygen/*": ["../mini-oxygen/src/*"]
Expand Down
2 changes: 1 addition & 1 deletion packages/mini-oxygen/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"devtools-protocol": "^0.0.1412693",
"eventsource": "^3.0.5",
"tempy": "3.1.0",
"vitest": "^1.0.4"
"vitest": "^3.2.4"
},
"peerDependencies": {
"vite": "^6.2.1"
Expand Down
Loading