From 7ff1888a7273618bf9b9a937031d3732dc3045f3 Mon Sep 17 00:00:00 2001 From: Seppe Dekeyser Date: Mon, 27 Jan 2025 13:15:43 +0100 Subject: [PATCH 1/3] Fix peerdependencies after vite 6 merge --- packages/adapter-static/package.json | 2 +- packages/houdini/package.json | 3 +- .../plugin-svelte-global-stores/package.json | 2 +- pnpm-lock.yaml | 50 ++++--------------- 4 files changed, 12 insertions(+), 45 deletions(-) diff --git a/packages/adapter-static/package.json b/packages/adapter-static/package.json index 150635bcb..8eaec3abb 100644 --- a/packages/adapter-static/package.json +++ b/packages/adapter-static/package.json @@ -34,7 +34,7 @@ "react-dom": "^19.0.0" }, "peerDependencies": { - "vite": "^5.3.3" + "vite": "^6.0.3" }, "files": [ "build" diff --git a/packages/houdini/package.json b/packages/houdini/package.json index ee1012fd0..f039ecc51 100644 --- a/packages/houdini/package.json +++ b/packages/houdini/package.json @@ -30,7 +30,6 @@ "prettier": "^2.8.3", "rollup": "^4.28.1", "scripts": "workspace:^", - "vite": "^6.0.3", "vitest": "^1.6.0" }, "dependencies": { @@ -61,7 +60,7 @@ "vite-plugin-watch-and-run": "^1.7.0" }, "peerDependencies": { - "vite": "^5.3.3" + "vite": "^6.0.3" }, "files": [ "build" diff --git a/packages/plugin-svelte-global-stores/package.json b/packages/plugin-svelte-global-stores/package.json index 1efddf732..ac78381c0 100644 --- a/packages/plugin-svelte-global-stores/package.json +++ b/packages/plugin-svelte-global-stores/package.json @@ -32,7 +32,7 @@ "recast": "^0.23.1" }, "peerDependencies": { - "@sveltejs/kit": "^2.5.3", + "@sveltejs/kit": "^2.9.0", "svelte": "^5.0.0" }, "files": [ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 663b873b4..97003ca33 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -420,8 +420,8 @@ importers: specifier: ^19.0.0 version: 19.0.0(react@19.0.0) vite: - specifier: ^5.3.3 - version: 5.3.3(@types/node@18.11.15)(terser@5.16.1) + specifier: ^6.0.3 + version: 6.0.7(@types/node@18.11.15)(terser@5.16.1) devDependencies: '@types/node': specifier: ^18.7.23 @@ -538,6 +538,9 @@ importers: recast: specifier: ^0.23.1 version: 0.23.1 + vite: + specifier: ^6.0.3 + version: 6.0.7(@types/node@18.11.15)(terser@5.16.1) vite-plugin-watch-and-run: specifier: ^1.7.0 version: 1.7.0 @@ -572,9 +575,6 @@ importers: scripts: specifier: workspace:^ version: link:../_scripts - vite: - specifier: ^6.0.3 - version: 6.0.7(@types/node@18.11.15)(terser@5.16.1) vitest: specifier: ^1.6.0 version: 1.6.0(@types/node@18.11.15)(@vitest/ui@1.6.0)(terser@5.16.1) @@ -707,8 +707,8 @@ importers: packages/plugin-svelte-global-stores: dependencies: '@sveltejs/kit': - specifier: ^2.5.3 - version: 2.5.24(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.0.2)(vite@6.0.7(@types/node@18.11.15)(terser@5.16.1)))(svelte@5.0.2)(vite@6.0.7(@types/node@18.11.15)(terser@5.16.1)) + specifier: ^2.9.0 + version: 2.16.0(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.0.2)(vite@6.0.7(@types/node@18.11.15)(terser@5.16.1)))(svelte@5.0.2)(vite@6.0.7(@types/node@18.11.15)(terser@5.16.1)) houdini: specifier: workspace:^ version: link:../houdini @@ -2468,15 +2468,6 @@ packages: svelte: ^4.0.0 || ^5.0.0-next.0 vite: ^5.0.3 || ^6.0.0 - '@sveltejs/kit@2.5.24': - resolution: {integrity: sha512-Nr2oxsCsDfEkdS/zzQQQbsPYTbu692Qs3/iE3L7VHzCVjG2+WujF9oMUozWI7GuX98KxYSoPMlAsfmDLSg44hQ==} - engines: {node: '>=18.13'} - hasBin: true - peerDependencies: - '@sveltejs/vite-plugin-svelte': ^3.0.0 || ^4.0.0-next.1 - svelte: ^4.0.0 || ^5.0.0-next.0 - vite: ^5.0.3 - '@sveltejs/vite-plugin-svelte-inspector@1.0.4': resolution: {integrity: sha512-zjiuZ3yydBtwpF3bj0kQNV0YXe+iKE545QGZVTaylW3eAzFr+pJ/cwK8lZEaRp4JtaJXhD5DyWAV4AxLh6DgaQ==} engines: {node: ^14.18.0 || >= 16} @@ -3819,9 +3810,6 @@ packages: devalue@4.3.0: resolution: {integrity: sha512-n94yQo4LI3w7erwf84mhRUkUJfhLoCZiLyoOZ/QFsDbcWNZePrLwbQpvZBUG2TNxwV3VjCKPxkiiQA6pe3TrTA==} - devalue@5.0.0: - resolution: {integrity: sha512-gO+/OMXF7488D+u3ue+G7Y4AA3ZmUnB3eHJXmBTgNHvr4ZNzl36A0ZtG+XCRNYCkYx/bFmw4qtkoFLa+wSrwAA==} - devalue@5.1.1: resolution: {integrity: sha512-maua5KUiapvEwiEAe+XnlZ3Rh0GD+qI1J/nb9vrJc3muPXvcF/8gXYTWF76+5DAqHyDUtOIImEuo0YKE9mshVw==} @@ -9433,24 +9421,6 @@ snapshots: svelte: 5.19.0 vite: 6.0.7(@types/node@18.11.15)(terser@5.16.1) - '@sveltejs/kit@2.5.24(@sveltejs/vite-plugin-svelte@5.0.3(svelte@5.0.2)(vite@6.0.7(@types/node@18.11.15)(terser@5.16.1)))(svelte@5.0.2)(vite@6.0.7(@types/node@18.11.15)(terser@5.16.1))': - dependencies: - '@sveltejs/vite-plugin-svelte': 5.0.3(svelte@5.0.2)(vite@6.0.7(@types/node@18.11.15)(terser@5.16.1)) - '@types/cookie': 0.6.0 - cookie: 0.6.0 - devalue: 5.0.0 - esm-env: 1.0.0 - import-meta-resolve: 4.1.0 - kleur: 4.1.5 - magic-string: 0.30.10 - mrmime: 2.0.0 - sade: 1.8.1 - set-cookie-parser: 2.6.0 - sirv: 2.0.4 - svelte: 5.0.2 - tiny-glob: 0.2.9 - vite: 6.0.7(@types/node@18.11.15)(terser@5.16.1) - '@sveltejs/vite-plugin-svelte-inspector@1.0.4(@sveltejs/vite-plugin-svelte@2.5.3(svelte@3.57.0)(vite@4.1.1(@types/node@18.11.15)(terser@5.16.1)))(svelte@3.57.0)(vite@4.1.1(@types/node@18.11.15)(terser@5.16.1))': dependencies: '@sveltejs/vite-plugin-svelte': 2.5.3(svelte@3.57.0)(vite@4.1.1(@types/node@18.11.15)(terser@5.16.1)) @@ -11123,8 +11093,6 @@ snapshots: devalue@4.3.0: {} - devalue@5.0.0: {} - devalue@5.1.1: {} didyoumean@1.2.2: {} @@ -13723,9 +13691,9 @@ snapshots: mlly@1.6.1: dependencies: - acorn: 8.12.1 + acorn: 8.14.0 pathe: 1.1.2 - pkg-types: 1.0.3 + pkg-types: 1.3.1 ufo: 1.5.4 mlly@1.7.4: From 621f6c0a9a96e0e384887acb52ef685c22c41b29 Mon Sep 17 00:00:00 2001 From: Seppe Dekeyser Date: Mon, 27 Jan 2025 13:16:55 +0100 Subject: [PATCH 2/3] Add changeset --- .changeset/new-planets-sing.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .changeset/new-planets-sing.md diff --git a/.changeset/new-planets-sing.md b/.changeset/new-planets-sing.md new file mode 100644 index 000000000..2162764d6 --- /dev/null +++ b/.changeset/new-planets-sing.md @@ -0,0 +1,7 @@ +--- +'houdini-plugin-svelte-global-stores': patch +'houdini-adapter-static': patch +'houdini': patch +--- + +Fix vite peerdependency versions From 1dce74c5dac61a8137ec524cb2c2cca477841050 Mon Sep 17 00:00:00 2001 From: Seppe Dekeyser Date: Mon, 27 Jan 2025 17:43:05 +0100 Subject: [PATCH 3/3] Fix backcompat with vite 5 --- .changeset/new-planets-sing.md | 6 +++--- packages/adapter-static/package.json | 2 +- packages/houdini-svelte/package.json | 2 +- packages/houdini/package.json | 2 +- pnpm-lock.yaml | 16 ++++++++-------- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.changeset/new-planets-sing.md b/.changeset/new-planets-sing.md index 2162764d6..04f16cc30 100644 --- a/.changeset/new-planets-sing.md +++ b/.changeset/new-planets-sing.md @@ -1,7 +1,7 @@ --- -'houdini-plugin-svelte-global-stores': patch -'houdini-adapter-static': patch -'houdini': patch +'houdini-plugin-svelte-global-stores': minor +'houdini-adapter-static': minor +'houdini': minor --- Fix vite peerdependency versions diff --git a/packages/adapter-static/package.json b/packages/adapter-static/package.json index 8eaec3abb..ffa4e86d1 100644 --- a/packages/adapter-static/package.json +++ b/packages/adapter-static/package.json @@ -34,7 +34,7 @@ "react-dom": "^19.0.0" }, "peerDependencies": { - "vite": "^6.0.3" + "vite": "^5.3.3 || ^6.0.3" }, "files": [ "build" diff --git a/packages/houdini-svelte/package.json b/packages/houdini-svelte/package.json index e3e255356..aecf0a3be 100644 --- a/packages/houdini-svelte/package.json +++ b/packages/houdini-svelte/package.json @@ -40,7 +40,7 @@ "peerDependencies": { "@sveltejs/kit": "^2.9.0", "svelte": "^5.0.0", - "vite": "^6.0.3" + "vite": "^5.3.3 || ^6.0.3" }, "files": [ "build" diff --git a/packages/houdini/package.json b/packages/houdini/package.json index f039ecc51..8df8ef14f 100644 --- a/packages/houdini/package.json +++ b/packages/houdini/package.json @@ -60,7 +60,7 @@ "vite-plugin-watch-and-run": "^1.7.0" }, "peerDependencies": { - "vite": "^6.0.3" + "vite": "^5.3.3 || ^6.0.3" }, "files": [ "build" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 97003ca33..4dddcbb98 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -420,7 +420,7 @@ importers: specifier: ^19.0.0 version: 19.0.0(react@19.0.0) vite: - specifier: ^6.0.3 + specifier: ^5.3.3 || ^6.0.3 version: 6.0.7(@types/node@18.11.15)(terser@5.16.1) devDependencies: '@types/node': @@ -539,7 +539,7 @@ importers: specifier: ^0.23.1 version: 0.23.1 vite: - specifier: ^6.0.3 + specifier: ^5.3.3 || ^6.0.3 version: 6.0.7(@types/node@18.11.15)(terser@5.16.1) vite-plugin-watch-and-run: specifier: ^1.7.0 @@ -688,7 +688,7 @@ importers: specifier: ^5.0.0 version: 5.0.2 vite: - specifier: ^6.0.3 + specifier: ^5.3.3 || ^6.0.3 version: 6.0.7(@types/node@18.11.15)(terser@5.16.1) devDependencies: '@types/minimatch': @@ -11982,8 +11982,8 @@ snapshots: espree@9.4.1: dependencies: - acorn: 8.12.1 - acorn-jsx: 5.3.2(acorn@8.12.1) + acorn: 8.14.0 + acorn-jsx: 5.3.2(acorn@8.14.0) eslint-visitor-keys: 3.4.3 espree@9.6.1: @@ -13219,7 +13219,7 @@ snapshots: dependencies: '@babel/parser': 7.24.6 '@babel/types': 7.24.6 - source-map-js: 1.2.0 + source-map-js: 1.2.1 make-dir@3.1.0: dependencies: @@ -15603,13 +15603,13 @@ snapshots: dependencies: browserslist: 4.21.4 escalade: 3.1.1 - picocolors: 1.0.1 + picocolors: 1.1.1 update-browserslist-db@1.0.13(browserslist@4.22.1): dependencies: browserslist: 4.22.1 escalade: 3.1.1 - picocolors: 1.0.0 + picocolors: 1.1.1 uri-js@4.4.1: dependencies: