diff --git a/examples/solid/package-lock.json b/examples/solid/package-lock.json index d6bcb59..7fd21ff 100644 --- a/examples/solid/package-lock.json +++ b/examples/solid/package-lock.json @@ -6,7 +6,7 @@ "": { "dependencies": { "overlayscrollbars": "file:../../packages/overlayscrollbars/dist", - "overlayscrollbars-vue": "file:../../packages/overlayscrollbars-solid/dist", + "overlayscrollbars-solid": "file:../../packages/overlayscrollbars-solid/dist", "solid-js": "^1.5.1" }, "devDependencies": { @@ -26,7 +26,7 @@ }, "../../packages/overlayscrollbars/dist": { "name": "overlayscrollbars", - "version": "2.0.0", + "version": "2.0.1", "license": "MIT" }, "node_modules/@ampproject/remapping": { @@ -1265,7 +1265,7 @@ "resolved": "../../packages/overlayscrollbars/dist", "link": true }, - "node_modules/overlayscrollbars-vue": { + "node_modules/overlayscrollbars-solid": { "resolved": "../../packages/overlayscrollbars-solid/dist", "link": true }, @@ -2332,7 +2332,7 @@ "overlayscrollbars": { "version": "file:../../packages/overlayscrollbars/dist" }, - "overlayscrollbars-vue": { + "overlayscrollbars-solid": { "version": "file:../../packages/overlayscrollbars-solid/dist", "requires": {} }, diff --git a/examples/solid/package.json b/examples/solid/package.json index dd58adf..d50ae30 100644 --- a/examples/solid/package.json +++ b/examples/solid/package.json @@ -2,7 +2,7 @@ "private": true, "dependencies": { "overlayscrollbars": "file:../../packages/overlayscrollbars/dist", - "overlayscrollbars-vue": "file:../../packages/overlayscrollbars-solid/dist", + "overlayscrollbars-solid": "file:../../packages/overlayscrollbars-solid/dist", "solid-js": "^1.5.1" }, "devDependencies": { diff --git a/package-lock.json b/package-lock.json index 805293e..19eef3c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -28280,7 +28280,7 @@ } }, "packages/overlayscrollbars": { - "version": "2.0.0-beta.3", + "version": "2.0.1", "license": "MIT", "devDependencies": { "rollup-plugin-summary": "^1.4.3", @@ -28289,6 +28289,7 @@ }, "packages/overlayscrollbars-ngx": { "version": "0.4.0", + "license": "MIT", "dependencies": { "tslib": "^2.4.0" }, @@ -29837,7 +29838,7 @@ } }, "packages/overlayscrollbars-react": { - "version": "0.4.0", + "version": "0.5.0", "license": "MIT", "devDependencies": { "@testing-library/react": "^13.4.0", @@ -29879,6 +29880,7 @@ }, "packages/overlayscrollbars-svelte": { "version": "0.4.0", + "license": "MIT", "devDependencies": { "@sveltejs/adapter-auto": "next", "@sveltejs/kit": "next", @@ -30073,7 +30075,7 @@ } }, "packages/overlayscrollbars-vue": { - "version": "0.4.0", + "version": "0.5.0", "license": "MIT", "devDependencies": { "@testing-library/vue": "^6.6.1", @@ -30095,7 +30097,7 @@ }, "packages/overlayscrollbars/dist": { "name": "overlayscrollbars", - "version": "2.0.0-beta.3", + "version": "2.0.1", "dev": true, "license": "MIT" }, diff --git a/packages/overlayscrollbars-solid/package.json b/packages/overlayscrollbars-solid/package.json index 3fd97ea..a872913 100644 --- a/packages/overlayscrollbars-solid/package.json +++ b/packages/overlayscrollbars-solid/package.json @@ -42,7 +42,7 @@ }, "scripts": { "build": "run-p build-js build-types", - "build-js": "vite build", + "build-js": "vite build --config vite.config.client.js && vite build --config vite.config.server.js", "build-types": "tsc --emitDeclarationOnly -p tsconfig.types.json --composite false", "test": "vitest run --coverage" }, diff --git a/packages/overlayscrollbars-solid/vite.config.js b/packages/overlayscrollbars-solid/vite.config.base.js similarity index 91% rename from packages/overlayscrollbars-solid/vite.config.js rename to packages/overlayscrollbars-solid/vite.config.base.js index a7a0e84..1bfdc17 100644 --- a/packages/overlayscrollbars-solid/vite.config.js +++ b/packages/overlayscrollbars-solid/vite.config.base.js @@ -1,16 +1,14 @@ import { resolve } from 'node:path'; import { defineConfig } from 'vite'; import { esbuildResolve } from 'rollup-plugin-esbuild-resolve'; -import solidPlugin from 'vite-plugin-solid'; import rollupPluginPackageJson from '@~local/rollup/plugin/packageJson'; import rollupPluginCopy from '@~local/rollup/plugin/copy'; -export default defineConfig({ +export const base = defineConfig({ build: { sourcemap: true, outDir: 'dist', lib: { - formats: ['es', 'cjs'], entry: resolve(__dirname, 'src/overlayscrollbars-solid.ts'), name: 'OverlayScrollbarsSolid', fileName: (format) => `overlayscrollbars-solid.${format}.js`, @@ -58,5 +56,5 @@ export default defineConfig({ ], }, }, - plugins: [esbuildResolve(), solidPlugin()], + plugins: [esbuildResolve()], }); diff --git a/packages/overlayscrollbars-solid/vite.config.client.js b/packages/overlayscrollbars-solid/vite.config.client.js new file mode 100644 index 0000000..47c3222 --- /dev/null +++ b/packages/overlayscrollbars-solid/vite.config.client.js @@ -0,0 +1,19 @@ +import { mergeConfig } from 'vite'; +import solidPlugin from 'vite-plugin-solid'; +import { base } from './vite.config.base'; + +export default mergeConfig(base, { + build: { + lib: { + formats: ['es'], + }, + }, + plugins: [ + solidPlugin({ + solid: { + generate: 'dom', + hydratable: true, + }, + }), + ], +}); diff --git a/packages/overlayscrollbars-solid/vite.config.server.js b/packages/overlayscrollbars-solid/vite.config.server.js new file mode 100644 index 0000000..1fab59d --- /dev/null +++ b/packages/overlayscrollbars-solid/vite.config.server.js @@ -0,0 +1,20 @@ +import { mergeConfig } from 'vite'; +import solidPlugin from 'vite-plugin-solid'; +import { base } from './vite.config.base'; + +export default mergeConfig(base, { + build: { + emptyOutDir: false, + lib: { + formats: ['cjs'], + }, + }, + plugins: [ + solidPlugin({ + solid: { + generate: 'ssr', + hydratable: true, + }, + }), + ], +}); diff --git a/packages/overlayscrollbars-solid/vitest.config.js b/packages/overlayscrollbars-solid/vitest.config.js index bb12a57..5242291 100644 --- a/packages/overlayscrollbars-solid/vitest.config.js +++ b/packages/overlayscrollbars-solid/vitest.config.js @@ -1,6 +1,6 @@ import { mergeConfig } from 'vite'; import vitestConfig from '@~local/config/vitest'; -import viteConfig from './vite.config'; +import viteConfig from './vite.config.client'; export default mergeConfig( {