wip

ChenYFan · Feb 29, 2024 · 8593a0c · 8593a0c
1 parent ca91c47
commit 8593a0c
Show file tree

Hide file tree

Showing 40 changed files with 1,494 additions and 1,028 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ lib-cov
 logs
 node_modules
 temp
+docs/.vitepress/cache
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,4 +1,7 @@
 {
 	"typescript.tsdk": "node_modules/typescript/lib",
-	"eslint.experimental.useFlatConfig": true
+	"eslint.experimental.useFlatConfig": true,
+	"yaml.schemas": {
+		"./schema/config.schema.json": "/config.yaml"
+	}
 }
diff --git a/doc/.gitignore b/doc/.gitignore
diff --git a/doc/package.json b/doc/package.json
diff --git a/doc/docs/.vitepress/config.js → docs/.vitepress/config.js b/doc/docs/.vitepress/config.js → docs/.vitepress/config.js
@@ -1,5 +1,3 @@
-import cwpkgjson from "../../../package.json";
-
 export default {
 	title: "ClientWorker",
 	description: "一个基于规则的前端路由拦截器",
@@ -26,7 +24,7 @@ export default {
 		[
 			"script",
 			{
-				src: `https://npmm/clientworker@${cwpkgjson.version}/dist/autoupdate.js`,
+				src: "/autoupdate.js",
 			},
 		],
 	],

diff --git a/doc/docs/example/autoupdate.md → docs/example/autoupdate.md b/doc/docs/example/autoupdate.md → docs/example/autoupdate.md
diff --git a/doc/docs/example/autowebp.md → docs/example/autowebp.md b/doc/docs/example/autowebp.md → docs/example/autowebp.md
diff --git a/doc/docs/example/forward.md → docs/example/forward.md b/doc/docs/example/forward.md → docs/example/forward.md
diff --git a/doc/docs/example/parallelcdn.md → docs/example/parallelcdn.md b/doc/docs/example/parallelcdn.md → docs/example/parallelcdn.md
diff --git a/doc/docs/ext/api.md → docs/ext/api.md b/doc/docs/ext/api.md → docs/ext/api.md
diff --git a/doc/docs/ext/autoclean.md → docs/ext/autoclean.md b/doc/docs/ext/autoclean.md → docs/ext/autoclean.md
diff --git a/doc/docs/ext/engine.md → docs/ext/engine.md b/doc/docs/ext/engine.md → docs/ext/engine.md
diff --git a/doc/docs/ext/hotupdate.md → docs/ext/hotupdate.md b/doc/docs/ext/hotupdate.md → docs/ext/hotupdate.md
diff --git a/doc/docs/index.md → docs/index.md b/doc/docs/index.md → docs/index.md
diff --git a/static/404.html → docs/public/404.html b/static/404.html → docs/public/404.html
diff --git a/static/autoupdate.js → docs/public/autoupdate.js b/static/autoupdate.js → docs/public/autoupdate.js
@@ -29,7 +29,7 @@
 		}
 	}
 	async function updateConfig() {
-		await fetch("/cw-cgi/api?type=config")
+		await fetch("/cw-cgi/api/config")
 			.then((res) => res.text())
 			.then((res) => {
 				if (res === "ok") {

diff --git a/static/config.yaml → docs/public/config.yaml b/static/config.yaml → docs/public/config.yaml
diff --git a/docs/public/cw.js b/docs/public/cw.js
diff --git a/doc/docs/rule/fetch.md → docs/rule/fetch.md b/doc/docs/rule/fetch.md → docs/rule/fetch.md
diff --git a/doc/docs/rule/header.md → docs/rule/header.md b/doc/docs/rule/header.md → docs/rule/header.md
diff --git a/doc/docs/rule/index.md → docs/rule/index.md b/doc/docs/rule/index.md → docs/rule/index.md
diff --git a/doc/docs/rule/redirect.md → docs/rule/redirect.md b/doc/docs/rule/redirect.md → docs/rule/redirect.md
diff --git a/doc/docs/rule/replace.md → docs/rule/replace.md b/doc/docs/rule/replace.md → docs/rule/replace.md
diff --git a/doc/docs/rule/return.md → docs/rule/return.md b/doc/docs/rule/return.md → docs/rule/return.md
diff --git a/doc/docs/rule/script.md → docs/rule/script.md b/doc/docs/rule/script.md → docs/rule/script.md
diff --git a/doc/docs/rule/skip.md → docs/rule/skip.md b/doc/docs/rule/skip.md → docs/rule/skip.md
diff --git a/doc/docs/start.md → docs/start.md b/doc/docs/start.md → docs/start.md
diff --git a/doc/docs/timefunction.md → docs/timefunction.md b/doc/docs/timefunction.md → docs/timefunction.md
diff --git a/eslint.config.js b/eslint.config.js
@@ -1,6 +1,6 @@
-const { so1ve } = require("@so1ve/eslint-config");
+import { so1ve } from "@so1ve/eslint-config";
 
-module.exports = so1ve({
+export default so1ve({
 	yaml: {
 		overrides: {
 			"yaml/no-empty-key": "off",

diff --git a/package.json b/package.json
@@ -49,9 +49,13 @@
 		"access": "public"
 	},
 	"scripts": {
-		"build": "rimraf dist && tsup && nr build:minify",
+		"build": "rimraf dist && tsup && nr build:minify && nr copy-cw",
 		"build:minify": "tsup --minify",
 		"build:schema": "tsx scripts/build-schema.ts",
+		"copy-cw": "rm ./docs/public/cw.js && cp ./dist/with-yaml.min.js ./docs/public/cw.js",
+		"docs:build": "vitepress build docs",
+		"docs:dev": "vitepress dev docs --host 0.0.0.0",
+		"docs:serve": "vitepress serve docs",
 		"lint": "eslint . && prettier . --check",
 		"lint:fix": "eslint . --fix && prettier . --write",
 		"prepublishOnly": "nr build",
@@ -62,8 +66,8 @@
 	},
 	"devDependencies": {
 		"@antfu/ni": "^0.21.8",
-		"@so1ve/eslint-config": "^1.4.0",
-		"@so1ve/prettier-config": "^1.4.0",
+		"@so1ve/eslint-config": "^1.5.2",
+		"@so1ve/prettier-config": "^1.5.2",
 		"@types/js-yaml": "^4.0.9",
 		"@types/node": "^20.8.3",
 		"bumpp": "^9.2.0",
@@ -75,9 +79,9 @@
 		"ts-json-schema-generator": "^1.5.0",
 		"tsup": "^8.0.2",
 		"tsx": "^3.13.0",
-		"type-fest": "^4.10.3",
 		"typescript": "^5.2.2",
 		"vite": "^4.4.11",
+		"vitepress": "1.0.0-rc.44",
 		"vitest": "^0.34.6"
 	}
 }