Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions .github/workflows/cr.yml
Original file line number Diff line number Diff line change
@@ -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 pkg-pr-new@0.0 publish
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
*.json
*.cjs
*.css
*.d.ts
pnpm-lock.yaml
examples/solid-docs
3 changes: 2 additions & 1 deletion biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"*/netlify/*",
"**/package.json",
"./examples/solid-docs",
"**/app.config.*.js"
"**/app.config.*.js",
"**/*.d.ts"
]
},
"vcs": {
Expand Down
2 changes: 1 addition & 1 deletion dev/app.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
});

Expand Down
3 changes: 1 addition & 2 deletions dev/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion dev/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"allowJs": true,
"strict": true,
"noEmit": true,
"types": ["vinxi/types/client"],
"isolatedModules": true,
"paths": {
"~/*": ["./src/*"]
Expand Down
11 changes: 6 additions & 5 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,18 @@
"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/solid-start/@solidjs/start@2039",
"@solidjs/vite-plugin-nitro-2": "https://pkg.pr.new/solidjs/solid-start/@solidjs/vite-plugin-nitro-2@2039",
"solid-js": "^1.9.9",
"vite": "^7.2.4"
},
"engines": {
"node": ">=18"
Expand Down
3 changes: 0 additions & 3 deletions docs/src/routes/guide/(3)structure.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import { defineConfig } from "@solidjs/start/config";

import { createWithSolidBase } from "@kobalte/solidbase";


export default defineConfig(
createWithSolidBase(theme)(
/* SolidStart options */
Expand All @@ -24,13 +23,11 @@ export default defineConfig(
crawlLinks: true,
},
},
...
},
/* SolidBase options */
{
title: "SolidBase",
description: "Fully featured, fully customisable static site generation for SolidStart",
...
}
)
);
Expand Down
1 change: 0 additions & 1 deletion docs/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"allowJs": true,
"strict": true,
"noEmit": true,
"types": ["vinxi/types/client"],
"isolatedModules": true,
"paths": {
"~/*": ["./src/*"]
Expand Down
52 changes: 30 additions & 22 deletions docs/app.config.ts → docs/vite.config.mts
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
import { vitePlugin as OGPlugin } from "@solid-mediakit/og/unplugin";
import { defineConfig } from "@solidjs/start/config";
import { solidStart } from "@solidjs/start/config";
import { nitroV2Plugin } from "@solidjs/vite-plugin-nitro-2";
import { defineConfig } from "vite";
import arraybuffer from "vite-plugin-arraybuffer";

import { createWithSolidBase, defineTheme } from "../src/config";
import { SidebarConfig, createFilesystemSidebar } from "../src/config/sidebar";
import defaultTheme, { DefaultThemeSidebarItem } from "../src/default-theme";
import { createSolidBase, defineTheme } from "../src/config";
import { createFilesystemSidebar } from "../src/config/sidebar";
import defaultTheme from "../src/default-theme";

const theme = defineTheme({
componentsPath: import.meta.resolve("./src/solidbase-theme"),
componentsPath: new URL(
"src/solidbase-theme",
`file://${import.meta.dirname}/`,
),
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",
Expand Down Expand Up @@ -98,10 +98,18 @@ export default defineConfig(
},
],
sidebar: {
"/guide": createFilesystemSidebar("/guide"),
"/reference": createFilesystemSidebar("/reference"),
"/guide": createFilesystemSidebar("./src/routes/guide"),
"/reference": createFilesystemSidebar("./src/routes/reference"),
},
},
},
),
);
}),
solidStart({
extensions: ["md", "mdx"],
ssr: true,
}),
nitroV2Plugin({
esbuild: { options: { target: "es2022" } },
preset: "node-server",
}),
],
});
40 changes: 19 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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": {
Expand All @@ -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": {
Expand All @@ -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"
}
}
},
Expand All @@ -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/solid-start/@solidjs/start@2039",
"@types/cross-spawn": "^6.0.6",
"@types/mdast": "^4.0.4",
"@types/resolve": "^1.20.6",
Expand All @@ -105,17 +106,14 @@
"glob": "^11.0.1",
"mdast": "^3.0.0",
"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.2.4"
},
"peerDependencies": {
"@solidjs/start": "^1.0.8",
"solid-js": "^1.9.1",
"vinxi": "^0.5.3",
"vite": "^6.1.1"
"vite": "^7.1.1"
},
"packageManager": "pnpm@10.6.2+sha512.47870716bea1572b53df34ad8647b42962bc790ce2bf4562ba0f643237d7302a3d6a8ecef9e4bdfc01d23af1969aa90485d4cebb0b9638fa5ef1daef656f6c1b",
"dependencies": {
Expand Down Expand Up @@ -163,7 +161,7 @@
"remark-directive": "^3.0.0",
"remark-frontmatter": "^5.0.0",
"remark-gfm": "^4.0.0",
"solid-mdx": "^0.0.7",
"rollup": "^4.53.3",
"source-map": "^0.7.6",
"toml": "^3.0.0",
"typescript": "^5.6.3",
Expand Down
Loading
Loading