From 0578d4eabe246de69498fd8c733e87d0b61f97cb Mon Sep 17 00:00:00 2001 From: marvin-j97 Date: Thu, 7 Dec 2023 00:14:25 +0100 Subject: [PATCH 1/6] update solidjs dependency --- .changeset/moody-years-worry.md | 5 +++++ packages/integrations/solid/package.json | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .changeset/moody-years-worry.md diff --git a/.changeset/moody-years-worry.md b/.changeset/moody-years-worry.md new file mode 100644 index 000000000000..a6ab88af1399 --- /dev/null +++ b/.changeset/moody-years-worry.md @@ -0,0 +1,5 @@ +--- +'@astrojs/solid-js': patch +--- + +Update solid-js dependency to 1.8.7 diff --git a/packages/integrations/solid/package.json b/packages/integrations/solid/package.json index 407d5d870625..7ac758f54f6e 100644 --- a/packages/integrations/solid/package.json +++ b/packages/integrations/solid/package.json @@ -40,10 +40,10 @@ "devDependencies": { "astro": "workspace:*", "astro-scripts": "workspace:*", - "solid-js": "^1.8.5" + "solid-js": "^1.8.7" }, "peerDependencies": { - "solid-js": "^1.4.3" + "solid-js": "^1.8.7" }, "engines": { "node": ">=18.14.1" From a28485183417c7fa7a17bc4d1107beaf5e6b4dcb Mon Sep 17 00:00:00 2001 From: marvin-j97 Date: Thu, 7 Dec 2023 00:22:06 +0100 Subject: [PATCH 2/6] update lockfile --- pnpm-lock.yaml | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9b42c6504f62..c81414b51720 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4523,7 +4523,7 @@ importers: dependencies: vite-plugin-solid: specifier: ^2.7.0 - version: 2.7.2(solid-js@1.8.5) + version: 2.7.2(solid-js@1.8.7) devDependencies: astro: specifier: workspace:* @@ -4532,8 +4532,8 @@ importers: specifier: workspace:* version: link:../../../scripts solid-js: - specifier: ^1.8.5 - version: 1.8.5 + specifier: ^1.8.7 + version: 1.8.7 packages/integrations/svelte: dependencies: @@ -14368,6 +14368,10 @@ packages: resolution: {integrity: sha512-JIsZHp98o+okpYN8HEPyI9Blr0gxAUPIGvg3waXrEMFjPz9obiLYMz0uFiUGezKiCK8loosYbn8WsqO8WtAJUA==} engines: {node: '>=10'} + /seroval@0.15.1: + resolution: {integrity: sha512-OPVtf0qmeC7RW+ScVX+7aOS+xoIM7pWcZ0jOWg2aTZigCydgRB04adfteBRbecZnnrO1WuGQ+C3tLeBBzX2zSQ==} + engines: {node: '>=10'} + /serve-static@1.15.0: resolution: {integrity: sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==} engines: {node: '>= 0.8.0'} @@ -14591,7 +14595,13 @@ packages: csstype: 3.1.2 seroval: 0.12.4 - /solid-refresh@0.5.3(solid-js@1.8.5): + /solid-js@1.8.7: + resolution: {integrity: sha512-9dzrSVieh2zj3SnJ02II6xZkonR6c+j/91b7XZUNcC6xSaldlqjjGh98F1fk5cRJ8ZTkzqF5fPIWDxEOs6QZXA==} + dependencies: + csstype: 3.1.2 + seroval: 0.15.1 + + /solid-refresh@0.5.3(solid-js@1.8.7): resolution: {integrity: sha512-Otg5it5sjOdZbQZJnvo99TEBAr6J7PQ5AubZLNU6szZzg3RQQ5MX04oteBIIGDs0y2Qv8aXKm9e44V8z+UnFdw==} peerDependencies: solid-js: ^1.3 @@ -14599,7 +14609,7 @@ packages: '@babel/generator': 7.23.3 '@babel/helper-module-imports': 7.22.15 '@babel/types': 7.23.3 - solid-js: 1.8.5 + solid-js: 1.8.7 dev: false /sort-keys@5.0.0: @@ -15802,7 +15812,7 @@ packages: - terser dev: false - /vite-plugin-solid@2.7.2(solid-js@1.8.5): + /vite-plugin-solid@2.7.2(solid-js@1.8.7): resolution: {integrity: sha512-GV2SMLAibOoXe76i02AsjAg7sbm/0lngBlERvJKVN67HOrJsHcWgkt0R6sfGLDJuFkv2aBe14Zm4vJcNME+7zw==} peerDependencies: solid-js: ^1.7.2 @@ -15816,8 +15826,8 @@ packages: '@types/babel__core': 7.20.4 babel-preset-solid: 1.8.2(@babel/core@7.23.3) merge-anything: 5.1.7 - solid-js: 1.8.5 - solid-refresh: 0.5.3(solid-js@1.8.5) + solid-js: 1.8.7 + solid-refresh: 0.5.3(solid-js@1.8.7) vitefu: 0.2.5(vite@5.0.0) transitivePeerDependencies: - supports-color From 1554c3683363d7f4d9396860f0e92393d1a55424 Mon Sep 17 00:00:00 2001 From: marvin-j97 Date: Fri, 8 Dec 2023 03:24:19 +0100 Subject: [PATCH 3/6] solidjs integration: update vite-plugin-solid --- packages/integrations/solid/package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/integrations/solid/package.json b/packages/integrations/solid/package.json index 7ac758f54f6e..6216894461da 100644 --- a/packages/integrations/solid/package.json +++ b/packages/integrations/solid/package.json @@ -35,15 +35,15 @@ "dev": "astro-scripts dev \"src/**/*.ts\"" }, "dependencies": { - "vite-plugin-solid": "^2.7.0" + "vite-plugin-solid": "^2.8.0" }, "devDependencies": { "astro": "workspace:*", "astro-scripts": "workspace:*", - "solid-js": "^1.8.7" + "solid-js": "^1.8.5" }, "peerDependencies": { - "solid-js": "^1.8.7" + "solid-js": "^1.8.5" }, "engines": { "node": ">=18.14.1" From 59791954c132b6a604d97f16bb0172799178b31e Mon Sep 17 00:00:00 2001 From: marvin-j97 Date: Fri, 8 Dec 2023 03:25:20 +0100 Subject: [PATCH 4/6] update lockfile --- .changeset/moody-years-worry.md | 2 +- pnpm-lock.yaml | 51 +++++++++++++++++++++------------ 2 files changed, 33 insertions(+), 20 deletions(-) diff --git a/.changeset/moody-years-worry.md b/.changeset/moody-years-worry.md index a6ab88af1399..e3eb42bc0c3b 100644 --- a/.changeset/moody-years-worry.md +++ b/.changeset/moody-years-worry.md @@ -2,4 +2,4 @@ '@astrojs/solid-js': patch --- -Update solid-js dependency to 1.8.7 +Update vite-plugin-solid dependency to ^2.8.0, bumping solid-js to ^1.8.5 diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c81414b51720..33e69cc69223 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4522,8 +4522,8 @@ importers: packages/integrations/solid: dependencies: vite-plugin-solid: - specifier: ^2.7.0 - version: 2.7.2(solid-js@1.8.7) + specifier: ^2.8.0 + version: 2.8.0(solid-js@1.8.7) devDependencies: astro: specifier: workspace:* @@ -4532,7 +4532,7 @@ importers: specifier: workspace:* version: link:../../../scripts solid-js: - specifier: ^1.8.7 + specifier: ^1.8.5 version: 1.8.7 packages/integrations/svelte: @@ -5489,6 +5489,19 @@ packages: '@babel/helper-plugin-utils': 7.22.5 dev: false + /@babel/plugin-syntax-jsx@7.23.3(@babel/core@7.23.3): + resolution: {integrity: sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==} + engines: {node: '>=6.9.0'} + peerDependencies: + '@babel/core': ^7.0.0-0 + peerDependenciesMeta: + '@babel/core': + optional: true + dependencies: + '@babel/core': 7.23.3 + '@babel/helper-plugin-utils': 7.22.5 + dev: false + /@babel/plugin-syntax-typescript@7.23.3(@babel/core@7.23.3): resolution: {integrity: sha512-9EiNjVJOMwCO+43TqoTrgQ8jMwcAd0sWyXi9RPfIsLTj4R2MADDDQXELhffaUx/uJv2AYcxBgPwH6j4TIA4ytQ==} engines: {node: '>=6.9.0'} @@ -5502,8 +5515,8 @@ packages: '@babel/helper-plugin-utils': 7.22.5 dev: false - /@babel/plugin-transform-modules-commonjs@7.23.0(@babel/core@7.23.3): - resolution: {integrity: sha512-32Xzss14/UVc7k9g775yMIvkVK8xwKE0DPdP5JTapr3+Z9w4tzeOuLNY6BXDQR6BdnzIlXnCGAzsk/ICHBLVWQ==} + /@babel/plugin-transform-modules-commonjs@7.23.3(@babel/core@7.23.3): + resolution: {integrity: sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -5588,8 +5601,8 @@ packages: '@babel/plugin-syntax-typescript': 7.23.3(@babel/core@7.23.3) dev: false - /@babel/preset-typescript@7.23.2(@babel/core@7.23.3): - resolution: {integrity: sha512-u4UJc1XsS1GhIGteM8rnGiIvf9rJpiVgMEeCnwlLA7WJPC+jcXWJAGxYmeqs5hOZD8BbAfnV5ezBOxQbb4OUxA==} + /@babel/preset-typescript@7.23.3(@babel/core@7.23.3): + resolution: {integrity: sha512-17oIGVlqz6CchO9RFYn5U6ZpWRZIngayYCtrPRSgANSwC2V1Jb+iP74nVxzzXJte8b8BYxrL1yY96xfhTBrNNQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -5600,8 +5613,8 @@ packages: '@babel/core': 7.23.3 '@babel/helper-plugin-utils': 7.22.5 '@babel/helper-validator-option': 7.22.15 - '@babel/plugin-syntax-jsx': 7.22.5(@babel/core@7.23.3) - '@babel/plugin-transform-modules-commonjs': 7.23.0(@babel/core@7.23.3) + '@babel/plugin-syntax-jsx': 7.23.3(@babel/core@7.23.3) + '@babel/plugin-transform-modules-commonjs': 7.23.3(@babel/core@7.23.3) '@babel/plugin-transform-typescript': 7.23.3(@babel/core@7.23.3) dev: false @@ -8394,8 +8407,8 @@ packages: dev: false optional: true - /babel-plugin-jsx-dom-expressions@0.37.2(@babel/core@7.23.3): - resolution: {integrity: sha512-u3VKB+On86cYSLAbw9j0m0X8ZejL4MR7oG7TRlrMQ/y1mauR/ZpM2xkiOPZEUlzHLo1GYGlTdP9s5D3XuA6iSQ==} + /babel-plugin-jsx-dom-expressions@0.37.9(@babel/core@7.23.3): + resolution: {integrity: sha512-6w+zs2i14fVanj4e1hXCU5cp+x0U0LJ5jScknpMZZUteHhwFRGJflHMVJ+xAcW7ku41FYjr7DgtK9mnc2SXlJg==} peerDependencies: '@babel/core': ^7.20.12 peerDependenciesMeta: @@ -8419,8 +8432,8 @@ packages: optional: true dev: false - /babel-preset-solid@1.8.2(@babel/core@7.23.3): - resolution: {integrity: sha512-hEIy4K1CGPQwCekFJ9NV3T92fezS4GQV0SQXEGVe9dyo+7iI7Fjuu6OKIdE5z/S4IfMEL6gCU+1AZ3yK6PnGMg==} + /babel-preset-solid@1.8.6(@babel/core@7.23.3): + resolution: {integrity: sha512-Ened42CHjU4EFkvNeS042/3Pm21yvMWn8p4G4ddzQTlKaMwSGGD1VciA/e7EshBVHJCcBj9vHiUd/r3A4qLPZA==} peerDependencies: '@babel/core': ^7.0.0 peerDependenciesMeta: @@ -8428,7 +8441,7 @@ packages: optional: true dependencies: '@babel/core': 7.23.3 - babel-plugin-jsx-dom-expressions: 0.37.2(@babel/core@7.23.3) + babel-plugin-jsx-dom-expressions: 0.37.9(@babel/core@7.23.3) dev: false /bail@2.0.2: @@ -15812,19 +15825,19 @@ packages: - terser dev: false - /vite-plugin-solid@2.7.2(solid-js@1.8.7): - resolution: {integrity: sha512-GV2SMLAibOoXe76i02AsjAg7sbm/0lngBlERvJKVN67HOrJsHcWgkt0R6sfGLDJuFkv2aBe14Zm4vJcNME+7zw==} + /vite-plugin-solid@2.8.0(solid-js@1.8.7): + resolution: {integrity: sha512-n5FAm7ZmTl94VWUoiJCgG7bouF2NlC9CA1wY/qbVnkFbYDWk++bFWyNoU48aLJ+lMtzNeYzJypJXOHzFKxL9xA==} peerDependencies: solid-js: ^1.7.2 - vite: ^3.0.0 || ^4.0.0 + vite: ^3.0.0 || ^4.0.0 || ^5.0.0 peerDependenciesMeta: vite: optional: true dependencies: '@babel/core': 7.23.3 - '@babel/preset-typescript': 7.23.2(@babel/core@7.23.3) + '@babel/preset-typescript': 7.23.3(@babel/core@7.23.3) '@types/babel__core': 7.20.4 - babel-preset-solid: 1.8.2(@babel/core@7.23.3) + babel-preset-solid: 1.8.6(@babel/core@7.23.3) merge-anything: 5.1.7 solid-js: 1.8.7 solid-refresh: 0.5.3(solid-js@1.8.7) From c5cc1b3d70107d6c745312be39ef4575172857f3 Mon Sep 17 00:00:00 2001 From: marvin-j97 Date: Fri, 8 Dec 2023 03:26:33 +0100 Subject: [PATCH 5/6] solidjs integration: decrease required version to match vite plugin --- .changeset/moody-years-worry.md | 2 +- packages/integrations/solid/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.changeset/moody-years-worry.md b/.changeset/moody-years-worry.md index e3eb42bc0c3b..77b2ae73f0aa 100644 --- a/.changeset/moody-years-worry.md +++ b/.changeset/moody-years-worry.md @@ -2,4 +2,4 @@ '@astrojs/solid-js': patch --- -Update vite-plugin-solid dependency to ^2.8.0, bumping solid-js to ^1.8.5 +Update vite-plugin-solid dependency to ^2.8.0, bumping solid-js to ^1.7.2 diff --git a/packages/integrations/solid/package.json b/packages/integrations/solid/package.json index 6216894461da..e3a904a0a0be 100644 --- a/packages/integrations/solid/package.json +++ b/packages/integrations/solid/package.json @@ -43,7 +43,7 @@ "solid-js": "^1.8.5" }, "peerDependencies": { - "solid-js": "^1.8.5" + "solid-js": "^1.7.2" }, "engines": { "node": ">=18.14.1" From 00ab7d443eb77fe06c8b336256a971ccd8b14bef Mon Sep 17 00:00:00 2001 From: Florian Lefebvre Date: Thu, 4 Jan 2024 14:13:24 +0100 Subject: [PATCH 6/6] Update moody-years-worry.md --- .changeset/moody-years-worry.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/moody-years-worry.md b/.changeset/moody-years-worry.md index 77b2ae73f0aa..485261514b71 100644 --- a/.changeset/moody-years-worry.md +++ b/.changeset/moody-years-worry.md @@ -2,4 +2,4 @@ '@astrojs/solid-js': patch --- -Update vite-plugin-solid dependency to ^2.8.0, bumping solid-js to ^1.7.2 +Upgrades `vite-plugin-solid` to `^2.8.0`