refactor(vike-solid-query): Build everything using rollup

vikejs · Sep 27, 2024 · 7eff3a7 · 7eff3a7
1 parent 21483db
commit 7eff3a7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 227 deletions.
diff --git a/packages/vike-solid-query/package.json b/packages/vike-solid-query/package.json
@@ -16,13 +16,12 @@
       "default": "./dist/src/index.js",
       "types": "./dist/src/index.d.ts"
     },
-    "./config": "./dist/integration/+config.js",
-    "./__internal/integration/Wrapper": "./dist/integration/Wrapper.jsx"
+    "./config": "./dist/integration/+config.js"
   },
   "scripts": {
     "dev": "rollup -c rollup.config.js --watch",
     "dev:typecheck": "tsc --noEmit --watch",
-    "build": "rollup -c rollup.config.js && tsc",
+    "build": "tsc --noEmit && rollup -c rollup.config.js",
     "release": "LANG=en_US release-me patch",
     "release:minor": "LANG=en_US release-me minor",
     "release:commit": "LANG=en_US release-me commit"
@@ -37,7 +36,6 @@
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-node-resolve": "^15.2.4",
     "@tanstack/solid-query": "^5.56.2",
-    "rimraf": "^6.0.1",
     "rollup": "^4.22.4",
     "rollup-plugin-dts": "^6.1.1",
     "solid-js": "^1.8.22",

diff --git a/packages/vike-solid-query/rollup.config.js b/packages/vike-solid-query/rollup.config.js
@@ -5,9 +5,11 @@ export default [
   withSolid({
     input: {
       "src/server": "./src/index.ts",
+      "integration/+config": "./integration/+config.ts",
+      "integration/Wrapper": "./integration/Wrapper.tsx",
     },
     ssr: true,
-    external: [],
+    external: ["vike-solid/usePageContext"],
   }),
   withSolid({
     input: {
@@ -17,8 +19,8 @@ export default [
     external: [],
   }),
   {
-    input: ["./src/index.ts"],
-    output: [{ dir: "dist/src", format: "es", sanitizeFileName: false }],
+    input: ["./src/index.ts", "./integration/+config.ts", "./integration/Wrapper.tsx"],
+    output: [{ dir: "dist", format: "es", sanitizeFileName: false }],
     plugins: [dts()],
   },
 ];
diff --git a/packages/vike-solid-query/tsconfig.json b/packages/vike-solid-query/tsconfig.json
@@ -1,8 +1,9 @@
 {
   "compilerOptions": {
-    "target": "ESNext",
+    "target": "ES2021",
     "module": "ESNext",
-    "moduleResolution": "node",
+    "moduleResolution": "Bundler",
+    "lib": ["DOM", "DOM.Iterable", "ESNext"],
     "strict": true,
     "noUncheckedIndexedAccess": true,
     "allowSyntheticDefaultImports": true,
@@ -13,8 +14,6 @@
     "isolatedModules": true,
     "outDir": "./dist",
     "declaration": true,
-    "skipLibCheck": true,
-    "rootDir": "./"
-  },
-  "include": ["integration/", "types.d.ts"]
+    "skipLibCheck": true
+  }
 }