Devinxi

.github/workflows/cr.yml

@@ -0,0 +1,37 @@
+name: ⚡️ Continuous Releases
+
+on:
+  push:
+    branches:
+      - main
+  merge_group:
+  pull_request:
+
+jobs:
+  cr:
+    name: "⚡️ Continuous Releases"
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v3
+
+      - name: Use Node.js from .nvmrc
+        uses: actions/setup-node@v4
+        with:
+          registry-url: "https://registry.npmjs.org"
+          cache: "pnpm"
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Build start
+        run: pnpm run build
+
+      - name: Rewrite exports
+        run: echo $(cat package.json | jq '.exports = .publishConfig.exports') > package.json
+
+      - name: Release
+        run: pnpm dlx [email protected] publish

.prettierignore

@@ -5,5 +5,6 @@
 *.json
 *.cjs
 *.css
+*.d.ts
 pnpm-lock.yaml
 examples/solid-docs

biome.json

@@ -6,7 +6,8 @@
 			"*/netlify/*",
 			"**/package.json",
 			"./examples/solid-docs",
-			"**/app.config.*.js"
+			"**/app.config.*.js",
+			"**/*.d.ts"
 		]
 	},
 	"vcs": {

dev/app.config.ts

@@ -4,7 +4,7 @@ import { createWithSolidBase, defineTheme } from "../src/config";
 import defaultTheme from "../src/default-theme";
 
 const customTheme = defineTheme({
-	componentsPath: import.meta.resolve("./src/solidbase-theme"),
+	componentsPath: new URL("./src/solidbase-theme", import.meta.url),
 	extends: defaultTheme,
 });
 

dev/package.json

@@ -11,8 +11,7 @@
     "@kobalte/solidbase": "workspace:*",
     "@solidjs/router": "^0.15.3",
     "@solidjs/start": "^1.1.1",
-    "solid-js": "^1.9.5",
-    "vinxi": "^0.5.3"
+    "solid-js": "^1.9.9"
   },
   "engines": {
     "node": ">=18"

dev/tsconfig.json

@@ -10,7 +10,6 @@
     "allowJs": true,
     "strict": true,
     "noEmit": true,
-    "types": ["vinxi/types/client"],
     "isolatedModules": true,
     "paths": {
       "~/*": ["./src/*"]

docs/package.json

@@ -3,17 +3,17 @@
   "type": "module",
   "private": "true",
   "scripts": {
-    "dev": "cross-env NODE_OPTIONS=\"--max-old-space-size=8192\" VITE_SOLIDBASE_DEV=true vinxi dev",
-    "build": "cross-env NODE_OPTIONS=\"--max-old-space-size=8192\" vinxi build",
+    "dev": "cross-env NODE_OPTIONS=\"--max-old-space-size=8192\" VITE_SOLIDBASE_DEV=true vite dev",
+    "build": "cross-env NODE_OPTIONS=\"--max-old-space-size=8192\" vite build",
     "start": "vinxi start"
   },
   "dependencies": {
     "@kobalte/solidbase": "workspace:*",
     "@solid-mediakit/og": "0.4.1",
     "@solidjs/router": "^0.15.3",
-    "@solidjs/start": "^1.1.3",
-    "solid-js": "^1.9.5",
-    "vinxi": "^0.5.3"
+    "@solidjs/start": "https://pkg.pr.new/@solidjs/start@fb192f6",
+    "solid-js": "^1.9.9",
+    "vite": "^7.1.3"
   },
   "engines": {
     "node": ">=18"

docs/tsconfig.json

@@ -10,7 +10,6 @@
     "allowJs": true,
     "strict": true,
     "noEmit": true,
-    "types": ["vinxi/types/client"],
     "isolatedModules": true,
     "paths": {
       "~/*": ["./src/*"]

docs/app.config.ts → docs/vite.config.ts

@@ -1,27 +1,23 @@
 import { vitePlugin as OGPlugin } from "@solid-mediakit/og/unplugin";
-import { defineConfig } from "@solidjs/start/config";
+import { solidStart } from "@solidjs/start/config";
+import { defineConfig } from "vite";
 import arraybuffer from "vite-plugin-arraybuffer";
 
-import { createWithSolidBase, defineTheme } from "../src/config";
+import { createSolidBase, defineTheme } from "../src/config";
 import defaultTheme from "../src/default-theme";
 
 const theme = defineTheme({
-	componentsPath: import.meta.resolve("./src/solidbase-theme"),
+	componentsPath: new URL("./src/solidbase-theme", import.meta.url),
 	extends: defaultTheme,
 });
 
-export default defineConfig(
-	createWithSolidBase(theme)(
-		{
-			ssr: true,
-			server: {
-				esbuild: { options: { target: "es2022" } },
-			},
-			vite: {
-				plugins: [OGPlugin(), arraybuffer()],
-			},
-		},
-		{
+const solidBase = createSolidBase(theme);
+
+export default defineConfig({
+	plugins: [
+		OGPlugin(),
+		arraybuffer(),
+		solidBase({
 			title: "SolidBase",
 			description:
 				"Fully featured, fully customisable static site generation for SolidStart",
@@ -201,6 +197,14 @@ export default defineConfig(
 					],
 				},
 			},
-		},
-	),
-);
+		}),
+		solidStart({
+			extensions: ["md", "mdx"],
+			ssr: true,
+			server: {
+				esbuild: { options: { target: "es2022" } },
+				preset: "netlify",
+			},
+		}),
+	],
+});

package.json

@@ -3,6 +3,7 @@
   "version": "0.0.0-dev",
   "description": "Fully featured, fully customisable static site generation for SolidStart",
   "type": "module",
+  "sideEffects": true,
   "scripts": {
     "dev": "pnpm -F @kobalte/solidbase-dev dev",
     "dev:docs": "pnpm -F @kobalte/solidbase-docs dev",
@@ -33,9 +34,9 @@
       "types": "./src/client/index.tsx"
     },
     "./server": {
-      "solid": "./src/server.ts",
-      "import": "./src/server.ts",
-      "types": "./src/server.ts"
+      "solid": "./src/server.tsx",
+      "import": "./src/server.tsx",
+      "types": "./src/server.tsx"
     },
     "./default-theme": {
       "solid": "./src/default-theme/index.ts",
@@ -47,10 +48,10 @@
       "import": "./src/default-theme/*",
       "types": "./src/default-theme/*"
     },
-    "./solid-mdx": {
-      "solid": "./src/solid-mdx.ts",
-      "import": "./src/solid-mdx.ts",
-      "types": "./src/solid-mdx.ts"
+    "./mdx": {
+      "solid": "./src/mdx.ts",
+      "import": "./src/mdx.ts",
+      "types": "./src/mdx.ts"
     }
   },
   "publishConfig": {
@@ -67,8 +68,8 @@
         "types": "./dist/config/index.d.ts"
       },
       "./server": {
-        "solid": "./dist/server.js",
-        "import": "./dist/server.js",
+        "solid": "./dist/server.jsx",
+        "import": "./dist/server.jsx",
         "types": "./dist/server.d.ts"
       },
       "./default-theme": {
@@ -81,10 +82,10 @@
         "import": "./dist/default-theme/*",
         "types": "./dist/default-theme/*"
       },
-      "./solid-mdx": {
-        "solid": "./dist/solid-mdx.js",
-        "import": "./dist/solid-mdx.js",
-        "types": "./dist/solid-mdx.d.ts"
+      "./mdx": {
+        "solid": "./dist/mdx.js",
+        "import": "./dist/mdx.js",
+        "types": "./dist/mdx.d.ts"
       }
     }
   },
@@ -95,7 +96,7 @@
   "devDependencies": {
     "@biomejs/biome": "^1.9.4",
     "@octokit/core": "^6.1.4",
-    "@solidjs/start": "^1.1.3",
+    "@solidjs/start": "https://pkg.pr.new/@solidjs/start@fb192f6",
     "@types/cross-spawn": "^6.0.6",
     "@types/mdast": "^4.0.4",
     "@types/resolve": "^1.20.6",
@@ -106,17 +107,14 @@
     "mdast": "^3.0.0",
     "prettier": "4.0.0-alpha.10",
     "resolve": "^1.22.10",
-    "solid-js": "^1.9.5",
+    "solid-js": "^1.9.9",
     "tsx": "^4.19.3",
     "vfile": "^6.0.3",
-    "vinxi": "^0.5.3",
-    "vite": "^6.1.1"
+    "vite": "^7.1.2"
   },
   "peerDependencies": {
-    "@solidjs/start": "^1.0.8",
     "solid-js": "^1.9.1",
-    "vinxi": "^0.5.3",
-    "vite": "^6.1.1"
+    "vite": "^7.1.1"
   },
   "packageManager": "[email protected]+sha512.47870716bea1572b53df34ad8647b42962bc790ce2bf4562ba0f643237d7302a3d6a8ecef9e4bdfc01d23af1969aa90485d4cebb0b9638fa5ef1daef656f6c1b",
   "dependencies": {
@@ -149,6 +147,7 @@
     "expressive-code-twoslash": "=0.4.0",
     "gray-matter": "^4.0.3",
     "hastscript": "^9.0.0",
+    "magic-string": "^0.30.18",
     "mdast-util-find-and-replace": "^3.0.1",
     "mdast-util-mdx-jsx": "^3.2.0",
     "mdast-util-to-string": "^4.0.0",
@@ -160,7 +159,6 @@
     "remark-directive": "^3.0.0",
     "remark-frontmatter": "^5.0.0",
     "remark-gfm": "^4.0.0",
-    "solid-mdx": "^0.0.7",
     "toml": "^3.0.0",
     "typescript": "^5.6.3",
     "unified": "^11.0.5",

patches/vite-plugin-solid.patch

@@ -0,0 +1,14 @@
+diff --git a/dist/esm/index.mjs b/dist/esm/index.mjs
+index 735444a825e6940d0f5f5df0240fe25a0e9a48bb..2ab390b6fc6a61a0180399735cd5b54eaddfcbcd 100644
+--- a/dist/esm/index.mjs
++++ b/dist/esm/index.mjs
+@@ -134,6 +134,9 @@ function solidPlugin(options = {}) {
+         }
+       }
+       config.resolve.conditions = ['solid', ...(replaceDev ? ['development'] : []), ...(isTestMode && !opts.isSsrTargetWebworker ? ['browser'] : []), ...config.resolve.conditions];
++      config.resolve.externalConditions ??= [];
++      config.resolve.externalConditions.push("solid");
++      config.resolve.externalConditions.push("node");
+     },
+     configResolved(config) {
+       needHmr = config.command === 'serve' && config.mode !== 'production' && options.hot !== false;