diff options
Diffstat (limited to 'packages/integrations/solid')
| -rw-r--r-- | packages/integrations/solid/package.json | 6 | ||||
| -rw-r--r-- | packages/integrations/solid/src/index.ts | 34 |
2 files changed, 6 insertions, 34 deletions
diff --git a/packages/integrations/solid/package.json b/packages/integrations/solid/package.json index e6622296d..dd76b0618 100644 --- a/packages/integrations/solid/package.json +++ b/packages/integrations/solid/package.json @@ -1,6 +1,6 @@ { "name": "@astrojs/solid-js", - "version": "4.4.4", + "version": "4.4.4-beta.0", "description": "Use Solid components within Astro", "type": "module", "types": "./dist/index.d.ts", @@ -36,7 +36,7 @@ }, "dependencies": { "vite-plugin-solid": "^2.11.0", - "vite": "^5.4.11" + "vite": "^6.0.1" }, "devDependencies": { "astro": "workspace:*", @@ -53,7 +53,7 @@ } }, "engines": { - "node": "^18.17.1 || ^20.3.0 || >=21.0.0" + "node": "^18.17.1 || ^20.3.0 || >=22.0.0" }, "publishConfig": { "provenance": true diff --git a/packages/integrations/solid/src/index.ts b/packages/integrations/solid/src/index.ts index 001f3d6ab..60680ff9c 100644 --- a/packages/integrations/solid/src/index.ts +++ b/packages/integrations/solid/src/index.ts @@ -45,43 +45,15 @@ async function getDevtoolsPlugin(logger: AstroIntegrationLogger, retrieve: boole } } -async function getViteConfiguration( - isDev: boolean, +function getViteConfiguration( { include, exclude }: Options, devtoolsPlugin: DevtoolsPlugin | null, ) { - // https://github.com/solidjs/vite-plugin-solid - // We inject the dev mode only if the user explicitly wants it or if we are in dev (serve) mode - const nestedDeps = ['solid-js', 'solid-js/web', 'solid-js/store', 'solid-js/html', 'solid-js/h']; const config: UserConfig = { - resolve: { - conditions: ['solid', ...(isDev ? ['development'] : [])], - dedupe: nestedDeps, - alias: [{ find: /^solid-refresh$/, replacement: '/@solid-refresh' }], - }, optimizeDeps: { - include: [...nestedDeps], exclude: ['@astrojs/solid-js/server.js'], }, - plugins: [ - solid({ include, exclude, dev: isDev, ssr: true }), - { - name: '@astrojs/solid:config-overrides', - enforce: 'post', - config() { - return { - esbuild: { - // To support using alongside other JSX frameworks, still let - // esbuild compile stuff. Solid goes first anyways. - include: /\.(m?ts|[jt]sx)$/, - }, - }; - }, - }, - ], - ssr: { - external: ['babel-preset-solid'], - }, + plugins: [solid({ include, exclude, ssr: true })], }; if (devtoolsPlugin) { @@ -128,7 +100,7 @@ export default function (options: Options = {}): AstroIntegration { addRenderer(getRenderer()); updateConfig({ - vite: await getViteConfiguration(command === 'dev', options, devtoolsPlugin), + vite: getViteConfiguration(options, devtoolsPlugin), }); if (devtoolsPlugin) { |