Merge pull request elysiajs#173 from marclave/marc/update-scalar-elys…

…ia-theme
hzmifork · Nov 28, 2024 · 062995e · 062995e
2 parents 9ed3168 + f5066d0
commit 062995e
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 267 deletions.
diff --git a/bun.lockb b/bun.lockb
diff --git a/package.json b/package.json
@@ -1,75 +1,76 @@
 {
-    "name": "@elysiajs/swagger",
-    "version": "1.1.6",
-    "description": "Plugin for Elysia to auto-generate Swagger page",
-    "author": {
-        "name": "saltyAom",
-        "url": "https://github.com/SaltyAom",
-        "email": "[email protected]"
+  "name": "@elysiajs/swagger",
+  "version": "1.1.6",
+  "description": "Plugin for Elysia to auto-generate Swagger page",
+  "author": {
+    "name": "saltyAom",
+    "url": "https://github.com/SaltyAom",
+    "email": "[email protected]"
+  },
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    "./package.json": "./package.json",
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs",
+      "require": "./dist/cjs/index.js"
     },
-    "main": "./dist/cjs/index.js",
-    "module": "./dist/index.mjs",
-    "types": "./dist/index.d.ts",
-    "exports": {
-        "./package.json": "./package.json",
-        ".": {
-            "types": "./dist/index.d.ts",
-            "import": "./dist/index.mjs",
-            "require": "./dist/cjs/index.js"
-        },
-        "./types": {
-            "types": "./dist/types.d.ts",
-            "import": "./dist/types.mjs",
-            "require": "./dist/cjs/types.js"
-        },
-        "./utils": {
-            "types": "./dist/utils.d.ts",
-            "import": "./dist/utils.mjs",
-            "require": "./dist/cjs/utils.js"
-        },
-        "./scalar": {
-            "types": "./dist/scalar/index.d.ts",
-            "import": "./dist/scalar/index.mjs",
-            "require": "./dist/cjs/scalar/index.js"
-        },
-        "./scalar/theme": {
-            "types": "./dist/scalar/theme.d.ts",
-            "import": "./dist/scalar/theme.mjs",
-            "require": "./dist/cjs/scalar/theme.js"
-        }
+    "./types": {
+      "types": "./dist/types.d.ts",
+      "import": "./dist/types.mjs",
+      "require": "./dist/cjs/types.js"
     },
-    "keywords": [
-        "elysia",
-        "swagger"
-    ],
-    "homepage": "https://github.com/elysiajs/elysia-swagger",
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/elysiajs/elysia-swagger"
+    "./utils": {
+      "types": "./dist/utils.d.ts",
+      "import": "./dist/utils.mjs",
+      "require": "./dist/cjs/utils.js"
     },
-    "bugs": "https://github.com/elysiajs/elysia-swagger/issues",
-    "license": "MIT",
-    "scripts": {
-        "dev": "bun run --watch example/index.ts",
-        "test": "bun test && npm run test:node",
-        "test:node": "npm install --prefix ./test/node/cjs/ && npm install --prefix ./test/node/esm/ && node ./test/node/cjs/index.js && node ./test/node/esm/index.js",
-        "build": "bun build.ts",
-        "release": "npm run build && npm run test && npm publish --access public"
+    "./scalar": {
+      "types": "./dist/scalar/index.d.ts",
+      "import": "./dist/scalar/index.mjs",
+      "require": "./dist/cjs/scalar/index.js"
     },
-    "peerDependencies": {
-        "elysia": ">= 1.1.0"
-    },
-    "devDependencies": {
-        "@apidevtools/swagger-parser": "^10.1.0",
-        "@types/bun": "1.1.6",
-        "elysia": "1.1.18",
-        "eslint": "9.6.0",
-        "tsup": "^8.1.0",
-        "typescript": "^5.5.3"
-    },
-    "dependencies": {
-        "@scalar/types": "^0.0.12",
-        "openapi-types": "^12.1.3",
-        "pathe": "^1.1.2"
+    "./scalar/theme": {
+      "types": "./dist/scalar/theme.d.ts",
+      "import": "./dist/scalar/theme.mjs",
+      "require": "./dist/cjs/scalar/theme.js"
     }
+  },
+  "keywords": [
+    "elysia",
+    "swagger"
+  ],
+  "homepage": "https://github.com/elysiajs/elysia-swagger",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/elysiajs/elysia-swagger"
+  },
+  "bugs": "https://github.com/elysiajs/elysia-swagger/issues",
+  "license": "MIT",
+  "scripts": {
+    "dev": "bun run --watch example/index.ts",
+    "test": "bun test && npm run test:node",
+    "test:node": "npm install --prefix ./test/node/cjs/ && npm install --prefix ./test/node/esm/ && node ./test/node/cjs/index.js && node ./test/node/esm/index.js",
+    "build": "bun build.ts",
+    "release": "npm run build && npm run test && npm publish --access public"
+  },
+  "peerDependencies": {
+    "elysia": ">= 1.1.0"
+  },
+  "devDependencies": {
+    "@apidevtools/swagger-parser": "^10.1.0",
+    "@types/bun": "1.1.6",
+    "elysia": "1.1.18",
+    "eslint": "9.6.0",
+    "tsup": "^8.1.0",
+    "typescript": "^5.5.3"
+  },
+  "dependencies": {
+    "@scalar/themes": "^0.9.52",
+    "@scalar/types": "^0.0.12",
+    "openapi-types": "^12.1.3",
+    "pathe": "^1.1.2"
+  }
 }
diff --git a/src/index.ts b/src/index.ts
@@ -85,7 +85,10 @@ export const swagger = async <Path extends string = '/swagger'>(
 				...scalarConfig.spec,
 				url: `/${relativePath}/json`
 			},
-			...scalarConfig
+			...scalarConfig,
+			// so we can showcase the elysia theme
+			// @ts-expect-error
+			_integration: 'elysiajs'
 		}
 
 		return new Response(

diff --git a/src/scalar/index.ts b/src/scalar/index.ts
@@ -1,4 +1,4 @@
-import scalarElysiaTheme from './theme'
+import { elysiajsTheme } from '@scalar/themes'
 import type { OpenAPIV3 } from 'openapi-types'
 import type { ReferenceConfiguration } from '@scalar/types'
 
@@ -29,7 +29,7 @@ export const ScalarRender = (
       }
     </style>
     <style>
-      ${config.customCss ?? scalarElysiaTheme}
+      ${config.customCss ?? elysiajsTheme}
     </style>
   </head>
   <body>

diff --git a/src/scalar/theme.ts b/src/scalar/theme.ts