Skip to content

Commit 062995e

Browse files
SaltyAomSaltyAom
authored
Merge pull request #173 from marclave/marc/update-scalar-elysia-theme
2 parents 9ed3168 + f5066d0 commit 062995e

File tree

5 files changed

+75
-267
lines changed

5 files changed

+75
-267
lines changed

‎bun.lockb‎

1.49 KB
Binary file not shown.

‎package.json‎

Lines changed: 69 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,76 @@
11
{
2-
"name": "@elysiajs/swagger",
3-
"version": "1.1.6",
4-
"description": "Plugin for Elysia to auto-generate Swagger page",
5-
"author": {
6-
"name": "saltyAom",
7-
"url": "https://github.com/SaltyAom",
8-
"email": "saltyaom@gmail.com"
2+
"name": "@elysiajs/swagger",
3+
"version": "1.1.6",
4+
"description": "Plugin for Elysia to auto-generate Swagger page",
5+
"author": {
6+
"name": "saltyAom",
7+
"url": "https://github.com/SaltyAom",
8+
"email": "saltyaom@gmail.com"
9+
},
10+
"main": "./dist/cjs/index.js",
11+
"module": "./dist/index.mjs",
12+
"types": "./dist/index.d.ts",
13+
"exports": {
14+
"./package.json": "./package.json",
15+
".": {
16+
"types": "./dist/index.d.ts",
17+
"import": "./dist/index.mjs",
18+
"require": "./dist/cjs/index.js"
919
},
10-
"main": "./dist/cjs/index.js",
11-
"module": "./dist/index.mjs",
12-
"types": "./dist/index.d.ts",
13-
"exports": {
14-
"./package.json": "./package.json",
15-
".": {
16-
"types": "./dist/index.d.ts",
17-
"import": "./dist/index.mjs",
18-
"require": "./dist/cjs/index.js"
19-
},
20-
"./types": {
21-
"types": "./dist/types.d.ts",
22-
"import": "./dist/types.mjs",
23-
"require": "./dist/cjs/types.js"
24-
},
25-
"./utils": {
26-
"types": "./dist/utils.d.ts",
27-
"import": "./dist/utils.mjs",
28-
"require": "./dist/cjs/utils.js"
29-
},
30-
"./scalar": {
31-
"types": "./dist/scalar/index.d.ts",
32-
"import": "./dist/scalar/index.mjs",
33-
"require": "./dist/cjs/scalar/index.js"
34-
},
35-
"./scalar/theme": {
36-
"types": "./dist/scalar/theme.d.ts",
37-
"import": "./dist/scalar/theme.mjs",
38-
"require": "./dist/cjs/scalar/theme.js"
39-
}
20+
"./types": {
21+
"types": "./dist/types.d.ts",
22+
"import": "./dist/types.mjs",
23+
"require": "./dist/cjs/types.js"
4024
},
41-
"keywords": [
42-
"elysia",
43-
"swagger"
44-
],
45-
"homepage": "https://github.com/elysiajs/elysia-swagger",
46-
"repository": {
47-
"type": "git",
48-
"url": "https://github.com/elysiajs/elysia-swagger"
25+
"./utils": {
26+
"types": "./dist/utils.d.ts",
27+
"import": "./dist/utils.mjs",
28+
"require": "./dist/cjs/utils.js"
4929
},
50-
"bugs": "https://github.com/elysiajs/elysia-swagger/issues",
51-
"license": "MIT",
52-
"scripts": {
53-
"dev": "bun run --watch example/index.ts",
54-
"test": "bun test && npm run test:node",
55-
"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",
56-
"build": "bun build.ts",
57-
"release": "npm run build && npm run test && npm publish --access public"
30+
"./scalar": {
31+
"types": "./dist/scalar/index.d.ts",
32+
"import": "./dist/scalar/index.mjs",
33+
"require": "./dist/cjs/scalar/index.js"
5834
},
59-
"peerDependencies": {
60-
"elysia": ">= 1.1.0"
61-
},
62-
"devDependencies": {
63-
"@apidevtools/swagger-parser": "^10.1.0",
64-
"@types/bun": "1.1.6",
65-
"elysia": "1.1.18",
66-
"eslint": "9.6.0",
67-
"tsup": "^8.1.0",
68-
"typescript": "^5.5.3"
69-
},
70-
"dependencies": {
71-
"@scalar/types": "^0.0.12",
72-
"openapi-types": "^12.1.3",
73-
"pathe": "^1.1.2"
35+
"./scalar/theme": {
36+
"types": "./dist/scalar/theme.d.ts",
37+
"import": "./dist/scalar/theme.mjs",
38+
"require": "./dist/cjs/scalar/theme.js"
7439
}
40+
},
41+
"keywords": [
42+
"elysia",
43+
"swagger"
44+
],
45+
"homepage": "https://github.com/elysiajs/elysia-swagger",
46+
"repository": {
47+
"type": "git",
48+
"url": "https://github.com/elysiajs/elysia-swagger"
49+
},
50+
"bugs": "https://github.com/elysiajs/elysia-swagger/issues",
51+
"license": "MIT",
52+
"scripts": {
53+
"dev": "bun run --watch example/index.ts",
54+
"test": "bun test && npm run test:node",
55+
"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",
56+
"build": "bun build.ts",
57+
"release": "npm run build && npm run test && npm publish --access public"
58+
},
59+
"peerDependencies": {
60+
"elysia": ">= 1.1.0"
61+
},
62+
"devDependencies": {
63+
"@apidevtools/swagger-parser": "^10.1.0",
64+
"@types/bun": "1.1.6",
65+
"elysia": "1.1.18",
66+
"eslint": "9.6.0",
67+
"tsup": "^8.1.0",
68+
"typescript": "^5.5.3"
69+
},
70+
"dependencies": {
71+
"@scalar/themes": "^0.9.52",
72+
"@scalar/types": "^0.0.12",
73+
"openapi-types": "^12.1.3",
74+
"pathe": "^1.1.2"
75+
}
7576
}

‎src/index.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,10 @@ export const swagger = async <Path extends string = '/swagger'>(
8585
...scalarConfig.spec,
8686
url: `/${relativePath}/json`
8787
},
88-
...scalarConfig
88+
...scalarConfig,
89+
// so we can showcase the elysia theme
90+
// @ts-expect-error
91+
_integration: 'elysiajs'
8992
}
9093

9194
return new Response(

‎src/scalar/index.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import scalarElysiaTheme from './theme'
1+
import { elysiajsTheme } from '@scalar/themes'
22
import type { OpenAPIV3 } from 'openapi-types'
33
import type { ReferenceConfiguration } from '@scalar/types'
44

@@ -29,7 +29,7 @@ export const ScalarRender = (
2929
}
3030
</style>
3131
<style>
32-
${config.customCss ?? scalarElysiaTheme}
32+
${config.customCss ?? elysiajsTheme}
3333
</style>
3434
</head>
3535
<body>

‎src/scalar/theme.ts‎

Lines changed: 0 additions & 196 deletions
This file was deleted.

0 commit comments

Comments
 (0)