zudoku 0.0.0-fa903e7 → 0.0.0-fc5c03b
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/client.d.ts +7 -0
- package/dist/app/entry.client.d.ts +1 -0
- package/dist/app/entry.client.js +13 -0
- package/dist/app/entry.client.js.map +1 -1
- package/dist/app/entry.server.d.ts +1 -0
- package/dist/app/entry.server.js +1 -0
- package/dist/app/entry.server.js.map +1 -1
- package/dist/app/main.js +2 -1
- package/dist/app/main.js.map +1 -1
- package/dist/app/sentry.d.ts +3 -0
- package/dist/app/sentry.js +19 -0
- package/dist/app/sentry.js.map +1 -0
- package/dist/app/tailwind.d.ts +2 -1
- package/dist/app/tailwind.js +64 -52
- package/dist/app/tailwind.js.map +1 -1
- package/dist/cli/cli.js +0 -2
- package/dist/cli/cli.js.map +1 -1
- package/dist/cli/common/outdated.js +2 -1
- package/dist/cli/common/outdated.js.map +1 -1
- package/dist/config/common.d.ts +8 -0
- package/dist/config/common.js +2 -0
- package/dist/config/common.js.map +1 -0
- package/dist/config/config.d.ts +3 -2
- package/dist/config/loader.d.ts +20 -0
- package/dist/config/loader.js +154 -0
- package/dist/config/loader.js.map +1 -0
- package/dist/config/validators/InputSidebarSchema.d.ts +14 -13
- package/dist/config/validators/InputSidebarSchema.js.map +1 -1
- package/dist/config/validators/common.d.ts +4911 -0
- package/dist/config/validators/common.js +276 -0
- package/dist/config/validators/common.js.map +1 -0
- package/dist/config/validators/icon-types.d.ts +1 -0
- package/dist/config/validators/icon-types.js +2 -0
- package/dist/config/validators/icon-types.js.map +1 -0
- package/dist/config/validators/validate.d.ts +760 -524
- package/dist/config/validators/validate.js +9 -234
- package/dist/config/validators/validate.js.map +1 -1
- package/dist/lib/authentication/providers/openid.js +7 -2
- package/dist/lib/authentication/providers/openid.js.map +1 -1
- package/dist/lib/components/Heading.d.ts +4 -4
- package/dist/lib/components/Heading.js +1 -1
- package/dist/lib/components/Heading.js.map +1 -1
- package/dist/lib/components/Layout.js +3 -2
- package/dist/lib/components/Layout.js.map +1 -1
- package/dist/lib/components/Markdown.js +1 -1
- package/dist/lib/components/Markdown.js.map +1 -1
- package/dist/lib/components/MobileTopNavigation.js +1 -1
- package/dist/lib/components/MobileTopNavigation.js.map +1 -1
- package/dist/lib/components/ReactMarkdown.d.ts +29 -0
- package/dist/lib/components/ReactMarkdown.js +182 -0
- package/dist/lib/components/ReactMarkdown.js.map +1 -0
- package/dist/lib/components/Search.d.ts +3 -1
- package/dist/lib/components/Search.js +3 -3
- package/dist/lib/components/Search.js.map +1 -1
- package/dist/lib/components/SyntaxHighlight.js +0 -4
- package/dist/lib/components/SyntaxHighlight.js.map +1 -1
- package/dist/lib/components/TopNavigation.d.ts +1 -1
- package/dist/lib/components/navigation/Sidebar.d.ts +3 -1
- package/dist/lib/components/navigation/Sidebar.js +2 -2
- package/dist/lib/components/navigation/Sidebar.js.map +1 -1
- package/dist/lib/components/navigation/SidebarCategory.d.ts +2 -2
- package/dist/lib/components/navigation/SidebarCategory.js +3 -4
- package/dist/lib/components/navigation/SidebarCategory.js.map +1 -1
- package/dist/lib/components/navigation/SidebarItem.d.ts +2 -4
- package/dist/lib/components/navigation/SidebarItem.js +5 -10
- package/dist/lib/components/navigation/SidebarItem.js.map +1 -1
- package/dist/lib/components/navigation/SidebarWrapper.js +1 -1
- package/dist/lib/components/navigation/SidebarWrapper.js.map +1 -1
- package/dist/lib/core/ZudokuContext.d.ts +1 -1
- package/dist/lib/oas/graphql/index.js +4 -1
- package/dist/lib/oas/graphql/index.js.map +1 -1
- package/dist/lib/plugins/api-catalog/Catalog.d.ts +6 -0
- package/dist/lib/plugins/api-catalog/Catalog.js +29 -0
- package/dist/lib/plugins/api-catalog/Catalog.js.map +1 -0
- package/dist/lib/plugins/api-catalog/index.d.ts +23 -0
- package/dist/lib/plugins/api-catalog/index.js +15 -0
- package/dist/lib/plugins/api-catalog/index.js.map +1 -0
- package/dist/lib/plugins/markdown/MdxPage.d.ts +1 -1
- package/dist/lib/plugins/markdown/MdxPage.js +2 -2
- package/dist/lib/plugins/markdown/MdxPage.js.map +1 -1
- package/dist/lib/plugins/markdown/index.d.ts +2 -1
- package/dist/lib/plugins/markdown/index.js.map +1 -1
- package/dist/lib/plugins/markdown/resolver.js.map +1 -1
- package/dist/lib/plugins/openapi/OperationList.js +47 -2
- package/dist/lib/plugins/openapi/OperationList.js.map +1 -1
- package/dist/lib/plugins/openapi/graphql/gql.d.ts +1 -1
- package/dist/lib/plugins/openapi/graphql/gql.js +1 -1
- package/dist/lib/plugins/openapi/graphql/gql.js.map +1 -1
- package/dist/lib/plugins/openapi/graphql/graphql.d.ts +2 -0
- package/dist/lib/plugins/openapi/graphql/graphql.js +1 -0
- package/dist/lib/plugins/openapi/graphql/graphql.js.map +1 -1
- package/dist/lib/plugins/openapi/playground/PathParams.js +1 -1
- package/dist/lib/plugins/openapi/playground/PathParams.js.map +1 -1
- package/dist/lib/plugins/redirect/index.d.ts +1 -1
- package/dist/lib/ui/Button.d.ts +1 -1
- package/dist/lib/ui/Command.d.ts +1 -1
- package/dist/lib/util/MdxComponents.d.ts +2 -3
- package/dist/lib/util/MdxComponents.js.map +1 -1
- package/dist/vite/build.js +15 -3
- package/dist/vite/build.js.map +1 -1
- package/dist/vite/config.d.ts +6 -4
- package/dist/vite/config.js +42 -15
- package/dist/vite/config.js.map +1 -1
- package/dist/vite/config.test.js +4 -1
- package/dist/vite/config.test.js.map +1 -1
- package/dist/vite/dev-server.js +12 -3
- package/dist/vite/dev-server.js.map +1 -1
- package/dist/vite/output.d.ts +1 -1
- package/dist/vite/output.js +25 -16
- package/dist/vite/output.js.map +1 -1
- package/dist/vite/plugin-api.js +44 -1
- package/dist/vite/plugin-api.js.map +1 -1
- package/dist/vite/plugin-component.js +1 -0
- package/dist/vite/plugin-component.js.map +1 -1
- package/dist/vite/plugin-config-reload.d.ts +1 -2
- package/dist/vite/plugin-config-reload.js.map +1 -1
- package/dist/vite/plugin-config.js +20 -0
- package/dist/vite/plugin-config.js.map +1 -1
- package/dist/vite/plugin-mdx.js +48 -1
- package/dist/vite/plugin-mdx.js.map +1 -1
- package/dist/vite/{plugin-custom-css.d.ts → plugin-theme-css.d.ts} +2 -2
- package/dist/vite/{plugin-custom-css.js → plugin-theme-css.js} +10 -3
- package/dist/vite/plugin-theme-css.js.map +1 -0
- package/dist/vite/plugin.d.ts +1 -2
- package/dist/vite/plugin.js +2 -2
- package/dist/vite/plugin.js.map +1 -1
- package/dist/vite/prerender.d.ts +2 -1
- package/dist/vite/prerender.js +2 -2
- package/dist/vite/prerender.js.map +1 -1
- package/dist/vite/sitemap.d.ts +1 -1
- package/dist/zuplo/env.d.ts +6 -0
- package/dist/zuplo/env.js +9 -0
- package/dist/zuplo/env.js.map +1 -0
- package/dist/zuplo/with-zuplo.d.ts +2 -2
- package/dist/zuplo/with-zuplo.js.map +1 -1
- package/lib/AnchorLink-BR0MvI7n.js +35 -0
- package/lib/AnchorLink-BR0MvI7n.js.map +1 -0
- package/lib/{Markdown-ievDDhFT.js → Markdown-CRsmPPfY.js} +13084 -13096
- package/lib/Markdown-CRsmPPfY.js.map +1 -0
- package/lib/{MdxPage-B2FpJ9KC.js → MdxPage-Wp8QU0-q.js} +85 -80
- package/lib/MdxPage-Wp8QU0-q.js.map +1 -0
- package/lib/{OperationList-BkNQEsNs.js → OperationList-u8xHU9-b.js} +982 -969
- package/lib/{OperationList-BkNQEsNs.js.map → OperationList-u8xHU9-b.js.map} +1 -1
- package/lib/{SlotletProvider-DyomlzGx.js → SlotletProvider-BgvYIPQe.js} +2 -2
- package/lib/{SlotletProvider-DyomlzGx.js.map → SlotletProvider-BgvYIPQe.js.map} +1 -1
- package/lib/{SyntaxHighlight-DkLOsjHS.js → SyntaxHighlight-C31iouiO.js} +1 -3
- package/lib/{SyntaxHighlight-DkLOsjHS.js.map → SyntaxHighlight-C31iouiO.js.map} +1 -1
- package/lib/assets/{worker-BHClFO3A.js → worker-C_2va8B8.js} +435 -432
- package/lib/assets/{worker-BHClFO3A.js.map → worker-C_2va8B8.js.map} +1 -1
- package/lib/{createServer-CpJlUPtn.js → createServer-BCAHdrpE.js} +5 -2
- package/lib/{createServer-CpJlUPtn.js.map → createServer-BCAHdrpE.js.map} +1 -1
- package/lib/{index-C7SaIME0.js → index-CmdLGbbk.js} +7 -5
- package/lib/index-CmdLGbbk.js.map +1 -0
- package/lib/{AnchorLink-CDlhr8gL.js → index.esm-Bm8pj-bc.js} +223 -254
- package/lib/index.esm-Bm8pj-bc.js.map +1 -0
- package/lib/ui/Drawer.js +79 -79
- package/lib/ui/Drawer.js.map +1 -1
- package/lib/zudoku.auth-openid.js +42 -37
- package/lib/zudoku.auth-openid.js.map +1 -1
- package/lib/zudoku.components.js +386 -367
- package/lib/zudoku.components.js.map +1 -1
- package/lib/zudoku.openapi-worker.js +1 -1
- package/lib/zudoku.plugin-api-catalog.js +121 -0
- package/lib/zudoku.plugin-api-catalog.js.map +1 -0
- package/lib/zudoku.plugin-api-keys.js +1 -1
- package/lib/zudoku.plugin-custom-pages.js +1 -1
- package/lib/zudoku.plugin-markdown.js +1 -1
- package/lib/zudoku.plugin-markdown.js.map +1 -1
- package/lib/zudoku.plugin-openapi.js +1 -1
- package/lib/zudoku.plugin-redirect.js.map +1 -1
- package/package.json +19 -6
- package/src/app/entry.client.tsx +15 -0
- package/src/app/entry.server.tsx +1 -0
- package/src/app/main.tsx +5 -1
- package/src/app/sentry.ts +24 -0
- package/src/app/tailwind.ts +67 -52
- package/src/lib/authentication/providers/openid.tsx +7 -2
- package/src/lib/components/Heading.tsx +13 -13
- package/src/lib/components/Layout.tsx +8 -3
- package/src/lib/components/Markdown.tsx +1 -1
- package/src/lib/components/MobileTopNavigation.tsx +18 -18
- package/src/lib/components/ReactMarkdown.license.txt +21 -0
- package/src/lib/components/ReactMarkdown.tsx +264 -0
- package/src/lib/components/Search.tsx +3 -3
- package/src/lib/components/SyntaxHighlight.tsx +0 -4
- package/src/lib/components/TopNavigation.tsx +1 -1
- package/src/lib/components/navigation/Sidebar.tsx +18 -8
- package/src/lib/components/navigation/SidebarCategory.tsx +10 -9
- package/src/lib/components/navigation/SidebarItem.tsx +10 -13
- package/src/lib/components/navigation/SidebarWrapper.tsx +1 -1
- package/src/lib/core/ZudokuContext.ts +1 -1
- package/src/lib/oas/graphql/index.ts +4 -1
- package/src/lib/plugins/api-catalog/Catalog.tsx +124 -0
- package/src/lib/plugins/api-catalog/index.tsx +50 -0
- package/src/lib/plugins/markdown/MdxPage.tsx +2 -0
- package/src/lib/plugins/markdown/index.tsx +2 -1
- package/src/lib/plugins/markdown/resolver.ts +2 -4
- package/src/lib/plugins/openapi/OperationList.tsx +64 -3
- package/src/lib/plugins/openapi/graphql/gql.ts +2 -2
- package/src/lib/plugins/openapi/graphql/graphql.ts +3 -0
- package/src/lib/plugins/openapi/playground/PathParams.tsx +1 -0
- package/src/lib/plugins/redirect/index.tsx +1 -1
- package/src/lib/util/MdxComponents.tsx +2 -5
- package/dist/vite/plugin-custom-css.js.map +0 -1
- package/lib/AnchorLink-CDlhr8gL.js.map +0 -1
- package/lib/Markdown-ievDDhFT.js.map +0 -1
- package/lib/MdxPage-B2FpJ9KC.js.map +0 -1
- package/lib/index-C7SaIME0.js.map +0 -1
- package/lib/prism-markup-templating-DZrrEs0A.js +0 -62
- package/lib/prism-markup-templating-DZrrEs0A.js.map +0 -1
- package/lib/prism-php.min-o7FpoMP_.js +0 -11
- package/lib/prism-php.min-o7FpoMP_.js.map +0 -1
package/dist/vite/config.js
CHANGED
|
@@ -1,17 +1,16 @@
|
|
|
1
1
|
import { vitePluginSsrCss } from "@hiogawa/vite-plugin-ssr-css";
|
|
2
|
-
import { loadZudokuConfig as loadZudokuConfigInner, } from "@zudoku/config";
|
|
3
2
|
import autoprefixer from "autoprefixer";
|
|
4
3
|
import path from "node:path";
|
|
5
4
|
import { fileURLToPath } from "node:url";
|
|
6
5
|
import colors from "picocolors";
|
|
7
6
|
import tailwindcss from "tailwindcss";
|
|
8
|
-
import { loadConfigFromFile, mergeConfig, } from "vite";
|
|
7
|
+
import { loadConfigFromFile, mergeConfig, loadEnv as viteLoadEnv, } from "vite";
|
|
9
8
|
import tailwindConfig from "../app/tailwind.js";
|
|
10
9
|
import { logger } from "../cli/common/logger.js";
|
|
11
10
|
import { isPortAvailable } from "../cli/common/utils/ports.js";
|
|
12
|
-
import {
|
|
11
|
+
import { tryLoadZudokuConfig } from "../config/loader.js";
|
|
12
|
+
import { ZuploEnv } from "../zuplo/env.js";
|
|
13
13
|
import vitePlugin from "./plugin.js";
|
|
14
|
-
let config;
|
|
15
14
|
const getDocsConfigFiles = (docsConfig, baseDir) => {
|
|
16
15
|
if (!docsConfig)
|
|
17
16
|
return [];
|
|
@@ -29,19 +28,44 @@ const registerApiFileImportDependencies = (config, rootDir) => {
|
|
|
29
28
|
.map((c) => path.posix.join(rootDir, c.input));
|
|
30
29
|
config.__meta.registerDependency(...files);
|
|
31
30
|
};
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
31
|
+
function loadEnv(configEnv, rootDir) {
|
|
32
|
+
const envPrefix = [
|
|
33
|
+
...(ZuploEnv.isZuplo ? ["ZUPLO_PUBLIC_"] : []),
|
|
34
|
+
"ZUDOKU_PUBLIC_",
|
|
35
|
+
];
|
|
36
|
+
const localEnv = viteLoadEnv(configEnv.mode, rootDir, envPrefix);
|
|
37
|
+
process.env = { ...localEnv, ...process.env };
|
|
38
|
+
const publicEnv = Object.entries(process.env).reduce((val, [key]) => {
|
|
39
|
+
if (envPrefix.some((prefix) => key.startsWith(prefix))) {
|
|
40
|
+
val[key] = JSON.stringify(process.env[key]);
|
|
41
|
+
}
|
|
42
|
+
return val;
|
|
43
|
+
}, {});
|
|
44
|
+
return { publicEnv, envPrefix };
|
|
45
|
+
}
|
|
46
|
+
let config;
|
|
47
|
+
let envPrefix;
|
|
48
|
+
let publicEnv;
|
|
49
|
+
export async function loadZudokuConfig(configEnv, rootDir, forceReload) {
|
|
50
|
+
if (!forceReload && config && envPrefix && publicEnv) {
|
|
51
|
+
return { config, envPrefix, publicEnv };
|
|
35
52
|
}
|
|
53
|
+
({ publicEnv, envPrefix } = loadEnv(configEnv, rootDir));
|
|
36
54
|
try {
|
|
37
|
-
const
|
|
55
|
+
const envVars = {};
|
|
56
|
+
for (const key in process.env) {
|
|
57
|
+
if (envPrefix.some((prefix) => key.startsWith(prefix))) {
|
|
58
|
+
envVars[key] = process.env[key];
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
const loadedConfig = await tryLoadZudokuConfig(rootDir, envVars);
|
|
38
62
|
registerApiFileImportDependencies(loadedConfig, rootDir);
|
|
39
63
|
logger.info(colors.yellow(`loaded config file `) +
|
|
40
64
|
colors.dim(loadedConfig.__meta.path), {
|
|
41
65
|
timestamp: true,
|
|
42
66
|
});
|
|
43
67
|
config = loadedConfig;
|
|
44
|
-
return
|
|
68
|
+
return { config, envPrefix, publicEnv };
|
|
45
69
|
}
|
|
46
70
|
catch (error) {
|
|
47
71
|
logger.error(colors.red(`Error loading Zudoku config`), {
|
|
@@ -83,13 +107,12 @@ export function getPluginOptions({ dir, mode, }) {
|
|
|
83
107
|
};
|
|
84
108
|
}
|
|
85
109
|
export async function getViteConfig(dir, configEnv, onConfigChange) {
|
|
86
|
-
const config = await loadZudokuConfig(dir);
|
|
110
|
+
const { config, publicEnv, envPrefix } = await loadZudokuConfig(configEnv, dir);
|
|
87
111
|
const handleConfigChange = async () => {
|
|
88
|
-
const config = await loadZudokuConfig(dir, true);
|
|
112
|
+
const { config } = await loadZudokuConfig(configEnv, dir, true);
|
|
89
113
|
onConfigChange?.(config);
|
|
90
114
|
return config;
|
|
91
115
|
};
|
|
92
|
-
validateConfig(config);
|
|
93
116
|
let websocketPort = 9800;
|
|
94
117
|
while (!(await isPortAvailable("localhost", websocketPort)) &&
|
|
95
118
|
websocketPort < 9999) {
|
|
@@ -107,10 +130,14 @@ export async function getViteConfig(dir, configEnv, onConfigChange) {
|
|
|
107
130
|
clearScreen: false,
|
|
108
131
|
logLevel: (process.env.LOG_LEVEL ?? "info"),
|
|
109
132
|
customLogger: logger,
|
|
110
|
-
envPrefix
|
|
133
|
+
envPrefix,
|
|
111
134
|
worker: {
|
|
112
135
|
format: "es",
|
|
113
136
|
},
|
|
137
|
+
define: {
|
|
138
|
+
"process.env.SENTRY_DSN": JSON.stringify(process.env.SENTRY_DSN),
|
|
139
|
+
...publicEnv,
|
|
140
|
+
},
|
|
114
141
|
ssr: {
|
|
115
142
|
target: "node",
|
|
116
143
|
noExternal: [],
|
|
@@ -150,7 +177,7 @@ export async function getViteConfig(dir, configEnv, onConfigChange) {
|
|
|
150
177
|
? getAppServerEntryPath()
|
|
151
178
|
: getAppClientEntryPath(),
|
|
152
179
|
],
|
|
153
|
-
include: ["react-dom/client"],
|
|
180
|
+
include: ["react-dom/client", "@sentry/react"],
|
|
154
181
|
exclude: [
|
|
155
182
|
// Vite does not like optimizing the worker dependency
|
|
156
183
|
"zudoku/openapi-worker",
|
|
@@ -168,7 +195,7 @@ export async function getViteConfig(dir, configEnv, onConfigChange) {
|
|
|
168
195
|
postcss: {
|
|
169
196
|
plugins: [
|
|
170
197
|
tailwindcss({
|
|
171
|
-
...tailwindConfig,
|
|
198
|
+
...tailwindConfig(config),
|
|
172
199
|
content: [
|
|
173
200
|
// Zudoku components and styles
|
|
174
201
|
// Tailwind seems to crash if it tries to parse compiled .js files
|
package/dist/vite/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/vite/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/vite/config.ts"],"names":[],"mappings":"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"}
|
package/dist/vite/config.test.js
CHANGED
|
@@ -3,7 +3,10 @@ import { expect, it } from "vitest";
|
|
|
3
3
|
import { loadZudokuConfig } from "./config.js";
|
|
4
4
|
it("Should correctly load zudoku.config.ts file", async () => {
|
|
5
5
|
const rootPath = path.resolve("../../examples/with-config/");
|
|
6
|
-
const config = await loadZudokuConfig(
|
|
6
|
+
const { config } = await loadZudokuConfig({
|
|
7
|
+
mode: "development",
|
|
8
|
+
command: "serve",
|
|
9
|
+
}, rootPath);
|
|
7
10
|
expect(config.__meta.path).includes("/with-config/zudoku.config.");
|
|
8
11
|
});
|
|
9
12
|
//# sourceMappingURL=config.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.test.js","sourceRoot":"","sources":["../../src/vite/config.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;IAC3D,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC;IAC7D,MAAM,MAAM,GAAG,MAAM,gBAAgB,
|
|
1
|
+
{"version":3,"file":"config.test.js","sourceRoot":"","sources":["../../src/vite/config.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C,EAAE,CAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;IAC3D,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC;IAC7D,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,gBAAgB,CACvC;QACE,IAAI,EAAE,aAAa;QACnB,OAAO,EAAE,OAAO;KACjB,EACD,QAAQ,CACT,CAAC;IACF,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,6BAA6B,CAAC,CAAC;AACrE,CAAC,CAAC,CAAC"}
|
package/dist/vite/dev-server.js
CHANGED
|
@@ -18,17 +18,26 @@ export class DevServer {
|
|
|
18
18
|
}
|
|
19
19
|
async start() {
|
|
20
20
|
const app = express();
|
|
21
|
-
const
|
|
21
|
+
const configEnv = {
|
|
22
22
|
mode: "development",
|
|
23
23
|
command: "serve",
|
|
24
24
|
isSsrBuild: this.options.ssr,
|
|
25
|
-
}
|
|
25
|
+
};
|
|
26
|
+
const viteConfig = await getViteConfig(this.options.dir, configEnv, (zudokuConfig) => (this.currentConfig = zudokuConfig));
|
|
26
27
|
const vite = await createViteServer(viteConfig);
|
|
27
|
-
|
|
28
|
+
const { config } = await loadZudokuConfig(configEnv, this.options.dir);
|
|
29
|
+
this.currentConfig = config;
|
|
28
30
|
const graphql = createGraphQLServer({
|
|
29
31
|
graphqlEndpoint: "/__z/graphql",
|
|
30
32
|
});
|
|
31
33
|
const proxiedEntryClientPath = path.posix.join(vite.config.base, "/__z/entry.client.tsx");
|
|
34
|
+
app.use((req, res, next) => {
|
|
35
|
+
const base = this.currentConfig?.basePath;
|
|
36
|
+
if (req.method.toLowerCase() === "get" && req.url === "/" && base) {
|
|
37
|
+
return res.redirect(307, base);
|
|
38
|
+
}
|
|
39
|
+
next();
|
|
40
|
+
});
|
|
32
41
|
app.use(graphql.graphqlEndpoint, graphql);
|
|
33
42
|
app.use(proxiedEntryClientPath, async (_req, res) => {
|
|
34
43
|
const transformed = await vite.transformRequest(getAppClientEntryPath());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-server.js","sourceRoot":"","sources":["../../src/vite/dev-server.ts"],"names":[],"mappings":"AAAA,OAAO,OAAyB,MAAM,SAAS,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAkB,MAAM,iBAAiB,CAAC;AAEvE,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,YAAY,IAAI,gBAAgB,EAAsB,MAAM,MAAM,CAAC;AAE5E,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"dev-server.js","sourceRoot":"","sources":["../../src/vite/dev-server.ts"],"names":[],"mappings":"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"}
|
package/dist/vite/output.d.ts
CHANGED
package/dist/vite/output.js
CHANGED
|
@@ -7,25 +7,20 @@ const __dirname = path.dirname(fileURLToPath(import.meta.url));
|
|
|
7
7
|
const pkgJsonPath = path.join(__dirname, "../../package.json");
|
|
8
8
|
const pkgJson = JSON.parse(await readFile(pkgJsonPath, "utf-8"));
|
|
9
9
|
export function generateOutput(config) {
|
|
10
|
-
const
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
},
|
|
15
|
-
routes: config.redirects?.map((redirect) => {
|
|
16
|
-
return {
|
|
10
|
+
const routes = [];
|
|
11
|
+
if (config.redirects) {
|
|
12
|
+
for (const redirect of config.redirects) {
|
|
13
|
+
routes.push({
|
|
17
14
|
src: joinPath(config.basePath, redirect.from),
|
|
18
15
|
dest: joinPath(config.basePath, redirect.to),
|
|
19
16
|
status: 301,
|
|
20
17
|
headers: { Location: joinPath(config.basePath, redirect.to) },
|
|
21
|
-
};
|
|
22
|
-
}
|
|
23
|
-
}
|
|
18
|
+
});
|
|
19
|
+
}
|
|
20
|
+
}
|
|
24
21
|
if (process.env.VERCEL_SKEW_PROTECTION_ENABLED) {
|
|
25
22
|
assert(process.env.VERCEL_DEPLOYMENT_ID);
|
|
26
|
-
|
|
27
|
-
output.routes ??= [];
|
|
28
|
-
output.routes.push({
|
|
23
|
+
routes.push({
|
|
29
24
|
src: "/.*",
|
|
30
25
|
has: [
|
|
31
26
|
{
|
|
@@ -35,19 +30,33 @@ export function generateOutput(config) {
|
|
|
35
30
|
},
|
|
36
31
|
],
|
|
37
32
|
headers: {
|
|
38
|
-
"Set-Cookie": `__vdpl=${process.env.VERCEL_DEPLOYMENT_ID}; Path=${
|
|
33
|
+
"Set-Cookie": `__vdpl=${process.env.VERCEL_DEPLOYMENT_ID}; Path=${joinPath(config.basePath)}; SameSite=Strict; Secure; HttpOnly`,
|
|
39
34
|
},
|
|
40
35
|
continue: true,
|
|
41
36
|
});
|
|
42
37
|
}
|
|
38
|
+
const output = {
|
|
39
|
+
version: 3,
|
|
40
|
+
framework: {
|
|
41
|
+
version: pkgJson.version,
|
|
42
|
+
},
|
|
43
|
+
routes,
|
|
44
|
+
};
|
|
43
45
|
return output;
|
|
44
46
|
}
|
|
45
47
|
export async function writeOutput(dir, config) {
|
|
46
48
|
const output = generateOutput(config);
|
|
47
49
|
// For now we are putting this in the dist folder, eventually we can
|
|
48
50
|
// expand this to support the full vercel build output API
|
|
49
|
-
const outputDir =
|
|
51
|
+
const outputDir = process.env.VERCEL
|
|
52
|
+
? path.join(dir, ".vercel/output")
|
|
53
|
+
: path.join(dir, "dist/.output");
|
|
50
54
|
await mkdir(outputDir, { recursive: true });
|
|
51
|
-
|
|
55
|
+
const outputFile = path.join(outputDir, "config.json");
|
|
56
|
+
await writeFile(outputFile, JSON.stringify(output, null, 2), "utf-8");
|
|
57
|
+
if (process.env.VERCEL) {
|
|
58
|
+
// eslint-disable-next-line no-console
|
|
59
|
+
console.log("Wrote Vercel output to", outputDir);
|
|
60
|
+
}
|
|
52
61
|
}
|
|
53
62
|
//# sourceMappingURL=output.js.map
|
package/dist/vite/output.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/vite/output.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"output.js","sourceRoot":"","sources":["../../src/vite/output.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AAEnD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC/D,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AAE/D,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;AAkIjE,MAAM,UAAU,cAAc,CAAC,MAAoB;IACjD,MAAM,MAAM,GAAY,EAAE,CAAC;IAE3B,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QACrB,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;YACxC,MAAM,CAAC,IAAI,CAAC;gBACV,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC;gBAC7C,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC;gBAC5C,MAAM,EAAE,GAAG;gBACX,OAAO,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,CAAC,EAAE;aAC9D,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,IAAI,OAAO,CAAC,GAAG,CAAC,8BAA8B,EAAE,CAAC;QAC/C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAEzC,MAAM,CAAC,IAAI,CAAC;YACV,GAAG,EAAE,KAAK;YACV,GAAG,EAAE;gBACH;oBACE,IAAI,EAAE,QAAQ;oBACd,GAAG,EAAE,gBAAgB;oBACrB,KAAK,EAAE,UAAU;iBAClB;aACF;YACD,OAAO,EAAE;gBACP,YAAY,EAAE,UAAU,OAAO,CAAC,GAAG,CAAC,oBAAoB,UAAU,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,qCAAqC;aACjI;YACD,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;IACL,CAAC;IAED,MAAM,MAAM,GAAW;QACrB,OAAO,EAAE,CAAC;QACV,SAAS,EAAE;YACT,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB;QACD,MAAM;KACP,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,GAAW,EAAE,MAAoB;IACjE,MAAM,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;IACtC,oEAAoE;IACpE,0DAA0D;IAE1D,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM;QAClC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,gBAAgB,CAAC;QAClC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;IAEnC,MAAM,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;IACvD,MAAM,SAAS,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IAEtE,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;QACvB,sCAAsC;QACtC,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE,SAAS,CAAC,CAAC;IACnD,CAAC;AACH,CAAC"}
|
package/dist/vite/plugin-api.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import fs from "node:fs/promises";
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import yaml from "yaml";
|
|
4
|
+
import { validate } from "../lib/oas/parser/index.js";
|
|
4
5
|
const viteApiPlugin = (getConfig) => {
|
|
5
6
|
const virtualModuleId = "virtual:zudoku-api-plugins";
|
|
6
7
|
const resolvedVirtualModuleId = "\0" + virtualModuleId;
|
|
@@ -16,13 +17,30 @@ const viteApiPlugin = (getConfig) => {
|
|
|
16
17
|
const config = getConfig();
|
|
17
18
|
const code = [
|
|
18
19
|
`import { openApiPlugin } from "zudoku/plugins/openapi";`,
|
|
20
|
+
`import { apiCatalogPlugin } from "zudoku/plugins/api-catalog";`,
|
|
19
21
|
`const configuredApiPlugins = [];`,
|
|
22
|
+
`const configuredApiCatalogPlugins = [];`,
|
|
20
23
|
];
|
|
21
24
|
if (config.apis) {
|
|
22
25
|
const apis = Array.isArray(config.apis) ? config.apis : [config.apis];
|
|
26
|
+
const catalogs = Array.isArray(config.catalog)
|
|
27
|
+
? config.catalog
|
|
28
|
+
: [config.catalog];
|
|
29
|
+
const categories = apis
|
|
30
|
+
.flatMap((api) => api.categories ?? [])
|
|
31
|
+
.reduce((acc, catalog) => {
|
|
32
|
+
if (!acc.has(catalog.label)) {
|
|
33
|
+
acc.set(catalog.label, new Set(catalog.tags));
|
|
34
|
+
}
|
|
35
|
+
for (const tag of catalog.tags) {
|
|
36
|
+
acc.get(catalog.label)?.add(tag);
|
|
37
|
+
}
|
|
38
|
+
return acc;
|
|
39
|
+
}, new Map());
|
|
23
40
|
const tmpDir = path.posix.join(config.rootDir, "node_modules/.zudoku/processed");
|
|
24
41
|
await fs.rm(tmpDir, { recursive: true, force: true });
|
|
25
42
|
await fs.mkdir(tmpDir, { recursive: true });
|
|
43
|
+
const apiMetadata = [];
|
|
26
44
|
for (const apiConfig of apis) {
|
|
27
45
|
if (apiConfig.type === "file") {
|
|
28
46
|
const fileContent = await fs.readFile(apiConfig.input, "utf-8");
|
|
@@ -32,6 +50,15 @@ const viteApiPlugin = (getConfig) => {
|
|
|
32
50
|
for (const postProcessor of apiConfig.postProcessors ?? []) {
|
|
33
51
|
schema = await postProcessor(schema);
|
|
34
52
|
}
|
|
53
|
+
const openAPISchema = await validate(schema);
|
|
54
|
+
if (apiConfig.navigationId) {
|
|
55
|
+
apiMetadata.push({
|
|
56
|
+
path: apiConfig.navigationId,
|
|
57
|
+
label: openAPISchema.info.title,
|
|
58
|
+
description: openAPISchema.info.description ?? "",
|
|
59
|
+
categories: apiConfig.categories ?? [],
|
|
60
|
+
});
|
|
61
|
+
}
|
|
35
62
|
const processedFilePath = path.posix.join(tmpDir, `${path.basename(apiConfig.input)}.json`);
|
|
36
63
|
await fs.writeFile(processedFilePath, JSON.stringify(schema));
|
|
37
64
|
code.push("configuredApiPlugins.push(openApiPlugin({", ' type: "file",', ` input: () => import("${processedFilePath}"),`, ` navigationId: "${apiConfig.navigationId}",`, "}));");
|
|
@@ -44,8 +71,24 @@ const viteApiPlugin = (getConfig) => {
|
|
|
44
71
|
})}));`);
|
|
45
72
|
}
|
|
46
73
|
}
|
|
74
|
+
const categoriesx = Array.from(categories.entries()).map(([label, tags]) => ({
|
|
75
|
+
label,
|
|
76
|
+
tags: Array.from(tags),
|
|
77
|
+
}));
|
|
78
|
+
for (const catalog of catalogs) {
|
|
79
|
+
if (!catalog) {
|
|
80
|
+
continue;
|
|
81
|
+
}
|
|
82
|
+
const apiCatalogConfig = {
|
|
83
|
+
...catalog,
|
|
84
|
+
items: apiMetadata,
|
|
85
|
+
label: catalog.label,
|
|
86
|
+
categories: categoriesx,
|
|
87
|
+
};
|
|
88
|
+
code.push(`configuredApiCatalogPlugins.push(apiCatalogPlugin(${JSON.stringify(apiCatalogConfig)}));`);
|
|
89
|
+
}
|
|
47
90
|
}
|
|
48
|
-
code.push(`export { configuredApiPlugins };`);
|
|
91
|
+
code.push(`export { configuredApiPlugins, configuredApiCatalogPlugins };`);
|
|
49
92
|
return code.join("\n");
|
|
50
93
|
}
|
|
51
94
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-api.js","sourceRoot":"","sources":["../../src/vite/plugin-api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,IAAI,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"plugin-api.js","sourceRoot":"","sources":["../../src/vite/plugin-api.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ const viteAliasPlugin = (getConfig) => {
|
|
|
8
8
|
["zudoku/openapi-worker", "src/lib/plugins/openapi-worker.ts"],
|
|
9
9
|
["zudoku/components", "src/lib/components/index.ts"],
|
|
10
10
|
["zudoku/plugins/openapi", "src/lib/plugins/openapi/index.tsx"],
|
|
11
|
+
["zudoku/plugins/api-catalog", "src/lib/plugins/api-catalog/index.tsx"],
|
|
11
12
|
[
|
|
12
13
|
"zudoku/plugins/search-inkeep",
|
|
13
14
|
"src/lib/plugins/search-inkeep/index.tsx",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-component.js","sourceRoot":"","sources":["../../src/vite/plugin-component.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAI7B,MAAM,eAAe,GAAG,CAAC,SAAoC,EAAU,EAAE;IACvE,OAAO;QACL,IAAI,EAAE,yBAAyB;QAC/B,MAAM,EAAE,GAAG,EAAE;YACX,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;YAE3B,MAAM,YAAY,GAAG;gBACnB,CAAC,uBAAuB,EAAE,mCAAmC,CAAC;gBAC9D,CAAC,mBAAmB,EAAE,6BAA6B,CAAC;gBACpD,CAAC,wBAAwB,EAAE,mCAAmC,CAAC;gBAC/D;oBACE,8BAA8B;oBAC9B,yCAAyC;iBAC1C;gBACD,CAAC,uBAAuB,EAAE,mBAAmB,CAAC;aACtC,CAAC;YAEX,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC;gBACzD,IAAI;gBACJ,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC;aAC5D,CAAC,CAAC,CAAC;YAEJ,OAAO,MAAM,CAAC,IAAI,KAAK,UAAU,IAAI,MAAM,CAAC,IAAI,KAAK,YAAY;gBAC/D,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;gBACjC,CAAC,CAAC,SAAS,CAAC;QAChB,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,eAAe,CAAC"}
|
|
1
|
+
{"version":3,"file":"plugin-component.js","sourceRoot":"","sources":["../../src/vite/plugin-component.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAI7B,MAAM,eAAe,GAAG,CAAC,SAAoC,EAAU,EAAE;IACvE,OAAO;QACL,IAAI,EAAE,yBAAyB;QAC/B,MAAM,EAAE,GAAG,EAAE;YACX,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;YAE3B,MAAM,YAAY,GAAG;gBACnB,CAAC,uBAAuB,EAAE,mCAAmC,CAAC;gBAC9D,CAAC,mBAAmB,EAAE,6BAA6B,CAAC;gBACpD,CAAC,wBAAwB,EAAE,mCAAmC,CAAC;gBAC/D,CAAC,4BAA4B,EAAE,uCAAuC,CAAC;gBACvE;oBACE,8BAA8B;oBAC9B,yCAAyC;iBAC1C;gBACD,CAAC,uBAAuB,EAAE,mBAAmB,CAAC;aACtC,CAAC;YAEX,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC;gBACzD,IAAI;gBACJ,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC;aAC5D,CAAC,CAAC,CAAC;YAEJ,OAAO,MAAM,CAAC,IAAI,KAAK,UAAU,IAAI,MAAM,CAAC,IAAI,KAAK,YAAY;gBAC/D,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;gBACjC,CAAC,CAAC,SAAS,CAAC;QAChB,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,eAAe,CAAC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
1
|
import { type Plugin } from "vite";
|
|
2
|
-
import { type ZudokuPluginOptions } from "../config/config.js";
|
|
3
|
-
import { type LoadedConfig } from "./config.js";
|
|
2
|
+
import { LoadedConfig, type ZudokuPluginOptions } from "../config/config.js";
|
|
4
3
|
export declare const createConfigReloadPlugin: (initialConfig: ZudokuPluginOptions, onConfigChange?: () => Promise<LoadedConfig>) => [Plugin, () => ZudokuPluginOptions];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-config-reload.js","sourceRoot":"","sources":["../../src/vite/plugin-config-reload.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"plugin-config-reload.js","sourceRoot":"","sources":["../../src/vite/plugin-config-reload.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAGpE,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,aAAkC,EAClC,cAA4C,EACP,EAAE;IACvC,IAAI,aAAa,GAAG,aAAa,CAAC;IAClC,IAAI,kBAAkB,GAAG,aAAa,CAAC,MAAM,CAAC,YAAY,CAAC;IAE3D,MAAM,MAAM,GAAW;QACrB,IAAI,EAAE,sBAAsB;QAC5B,eAAe,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE;YACxC,IAAI,CAAC,cAAc;gBAAE,OAAO;YAE5B,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;gBAClC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC;oBAAE,OAAO;gBAE/C,MAAM,SAAS,GAAG,MAAM,cAAc,EAAE,CAAC;gBACzC,aAAa,GAAG,EAAE,GAAG,aAAa,EAAE,GAAG,SAAS,EAAE,CAAC;gBAEnD,kBAAkB,GAAG,SAAS,CAAC,MAAM,CAAC,YAAY,CAAC;gBAEnD,kFAAkF;gBAClF,IAAI,IAAI,KAAK,SAAS,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;oBAAE,OAAO;gBAEpE,MAAM,OAAO,EAAE,CAAC;gBAChB,yBAAyB,CACvB,IAAI,IAAI,IAAI,EAAE,CAAC,kBAAkB,EAAE,aAAa,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,6BAA6B,CACtH,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;IAEF,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,aAAa,CAAU,CAAC;AAChD,CAAC,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
const viteConfigPlugin = (getConfig) => {
|
|
2
2
|
const virtualModuleId = "virtual:zudoku-config";
|
|
3
|
+
let viteConfig;
|
|
3
4
|
return {
|
|
4
5
|
name: "zudoku-config-plugin",
|
|
5
6
|
resolveId(id) {
|
|
@@ -7,6 +8,25 @@ const viteConfigPlugin = (getConfig) => {
|
|
|
7
8
|
return getConfig().__meta.path;
|
|
8
9
|
}
|
|
9
10
|
},
|
|
11
|
+
configResolved(resolvedConfig) {
|
|
12
|
+
viteConfig = resolvedConfig;
|
|
13
|
+
},
|
|
14
|
+
async transform(code, id) {
|
|
15
|
+
if (id !== getConfig().__meta.path)
|
|
16
|
+
return;
|
|
17
|
+
return code.replaceAll(/process\.env\.([a-z_][a-z0-9_]*)/gi, (_, envVar) => {
|
|
18
|
+
if (!envVar.startsWith(viteConfig.envPrefix)) {
|
|
19
|
+
viteConfig.logger.warn(`Warning: process.env.${envVar} is not prefixed with ${viteConfig.envPrefix}.`);
|
|
20
|
+
return "undefined";
|
|
21
|
+
}
|
|
22
|
+
const value = viteConfig.define?.[envVar];
|
|
23
|
+
if (value === undefined) {
|
|
24
|
+
viteConfig.logger.warn(`Warning: process.env.${envVar} is not defined.`);
|
|
25
|
+
return "undefined";
|
|
26
|
+
}
|
|
27
|
+
return value;
|
|
28
|
+
});
|
|
29
|
+
},
|
|
10
30
|
};
|
|
11
31
|
};
|
|
12
32
|
export default viteConfigPlugin;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-config.js","sourceRoot":"","sources":["../../src/vite/plugin-config.ts"],"names":[],"mappings":"AAGA,MAAM,gBAAgB,GAAG,CAAC,SAAoC,EAAU,EAAE;IACxE,MAAM,eAAe,GAAG,uBAAuB,CAAC;IAEhD,OAAO;QACL,IAAI,EAAE,sBAAsB;QAC5B,SAAS,CAAC,EAAE;YACV,IAAI,EAAE,KAAK,eAAe,EAAE,CAAC;gBAC3B,OAAO,SAAS,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;YACjC,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
|
|
1
|
+
{"version":3,"file":"plugin-config.js","sourceRoot":"","sources":["../../src/vite/plugin-config.ts"],"names":[],"mappings":"AAGA,MAAM,gBAAgB,GAAG,CAAC,SAAoC,EAAU,EAAE;IACxE,MAAM,eAAe,GAAG,uBAAuB,CAAC;IAEhD,IAAI,UAA0B,CAAC;IAE/B,OAAO;QACL,IAAI,EAAE,sBAAsB;QAC5B,SAAS,CAAC,EAAE;YACV,IAAI,EAAE,KAAK,eAAe,EAAE,CAAC;gBAC3B,OAAO,SAAS,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;YACjC,CAAC;QACH,CAAC;QACD,cAAc,CAAC,cAAc;YAC3B,UAAU,GAAG,cAAc,CAAC;QAC9B,CAAC;QACD,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE;YACtB,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC,MAAM,CAAC,IAAI;gBAAE,OAAO;YAE3C,OAAO,IAAI,CAAC,UAAU,CACpB,oCAAoC,EACpC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;gBACZ,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;oBAC7C,UAAU,CAAC,MAAM,CAAC,IAAI,CACpB,wBAAwB,MAAM,yBAAyB,UAAU,CAAC,SAAS,GAAG,CAC/E,CAAC;oBACF,OAAO,WAAW,CAAC;gBACrB,CAAC;gBAED,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,CAAC;gBAC1C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;oBACxB,UAAU,CAAC,MAAM,CAAC,IAAI,CACpB,wBAAwB,MAAM,kBAAkB,CACjD,CAAC;oBACF,OAAO,WAAW,CAAC;gBACrB,CAAC;gBAED,OAAO,KAAK,CAAC;YACf,CAAC,CACF,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
|
package/dist/vite/plugin-mdx.js
CHANGED
|
@@ -2,6 +2,7 @@ import rehypeMetaAsAttributes from "@lekoarts/rehype-meta-as-attributes";
|
|
|
2
2
|
import mdx from "@mdx-js/rollup";
|
|
3
3
|
import withToc from "@stefanprobst/rehype-extract-toc";
|
|
4
4
|
import withTocExport from "@stefanprobst/rehype-extract-toc/mdx";
|
|
5
|
+
import { toString as hastToString } from "hast-util-to-string";
|
|
5
6
|
import path from "node:path";
|
|
6
7
|
import rehypeSlug from "rehype-slug";
|
|
7
8
|
import remarkComment from "remark-comment";
|
|
@@ -10,7 +11,7 @@ import remarkDirectiveRehype from "remark-directive-rehype";
|
|
|
10
11
|
import remarkFrontmatter from "remark-frontmatter";
|
|
11
12
|
import remarkGfm from "remark-gfm";
|
|
12
13
|
import remarkMdxFrontmatter from "remark-mdx-frontmatter";
|
|
13
|
-
import { visit } from "unist-util-visit";
|
|
14
|
+
import { EXIT, visit } from "unist-util-visit";
|
|
14
15
|
import { remarkStaticGeneration } from "./remarkStaticGeneration.js";
|
|
15
16
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
16
17
|
const rehypeCodeBlockPlugin = () => (tree) => {
|
|
@@ -50,6 +51,51 @@ const rehypeMediaBasePath = (basePath = "") =>
|
|
|
50
51
|
}
|
|
51
52
|
});
|
|
52
53
|
};
|
|
54
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
55
|
+
const rehypeExcerptWithMdxExport = () => (tree, _vfile) => {
|
|
56
|
+
let excerpt;
|
|
57
|
+
visit(tree, "element", (node) => {
|
|
58
|
+
if (node.tagName !== "p")
|
|
59
|
+
return;
|
|
60
|
+
excerpt = hastToString(node);
|
|
61
|
+
return EXIT;
|
|
62
|
+
});
|
|
63
|
+
if (!excerpt)
|
|
64
|
+
return;
|
|
65
|
+
// Inject the excerpt as a named export into the MDX AST
|
|
66
|
+
// Injection code taken from @stefanprobst/rehype-extract-toc/mdx
|
|
67
|
+
tree.children.unshift({
|
|
68
|
+
type: "mdxjsEsm",
|
|
69
|
+
data: {
|
|
70
|
+
estree: {
|
|
71
|
+
type: "Program",
|
|
72
|
+
sourceType: "module",
|
|
73
|
+
body: [
|
|
74
|
+
{
|
|
75
|
+
type: "ExportNamedDeclaration",
|
|
76
|
+
source: null,
|
|
77
|
+
specifiers: [],
|
|
78
|
+
declaration: {
|
|
79
|
+
type: "VariableDeclaration",
|
|
80
|
+
kind: "const",
|
|
81
|
+
declarations: [
|
|
82
|
+
{
|
|
83
|
+
type: "VariableDeclarator",
|
|
84
|
+
id: { name: "excerpt", type: "Identifier" },
|
|
85
|
+
init: {
|
|
86
|
+
type: "Literal",
|
|
87
|
+
value: excerpt,
|
|
88
|
+
raw: JSON.stringify(excerpt),
|
|
89
|
+
},
|
|
90
|
+
},
|
|
91
|
+
],
|
|
92
|
+
},
|
|
93
|
+
},
|
|
94
|
+
],
|
|
95
|
+
},
|
|
96
|
+
},
|
|
97
|
+
});
|
|
98
|
+
};
|
|
53
99
|
const viteMdxPlugin = (getConfig) => {
|
|
54
100
|
const config = getConfig();
|
|
55
101
|
return {
|
|
@@ -79,6 +125,7 @@ const viteMdxPlugin = (getConfig) => {
|
|
|
79
125
|
[rehypeMediaBasePath, config.basePath],
|
|
80
126
|
withToc,
|
|
81
127
|
withTocExport,
|
|
128
|
+
rehypeExcerptWithMdxExport,
|
|
82
129
|
...(config.build?.rehypePlugins ?? []),
|
|
83
130
|
],
|
|
84
131
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-mdx.js","sourceRoot":"","sources":["../../src/vite/plugin-mdx.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,MAAM,qCAAqC,CAAC;AACzE,OAAO,GAAG,MAAM,gBAAgB,CAAC;AACjC,OAAO,OAAO,MAAM,kCAAkC,CAAC;AACvD,OAAO,aAAa,MAAM,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"plugin-mdx.js","sourceRoot":"","sources":["../../src/vite/plugin-mdx.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,5 +2,5 @@ import { type Plugin } from "vite";
|
|
|
2
2
|
import { type ZudokuPluginOptions } from "../config/config.js";
|
|
3
3
|
declare const THEME_VARIABLES: readonly ["background", "foreground", "card", "cardForeground", "popover", "popoverForeground", "primary", "primaryForeground", "secondary", "secondaryForeground", "muted", "mutedForeground", "accent", "accentForeground", "destructive", "destructiveForeground", "border", "input", "ring", "radius"];
|
|
4
4
|
export type Theme = Partial<Record<(typeof THEME_VARIABLES)[number], string>>;
|
|
5
|
-
declare const
|
|
6
|
-
export
|
|
5
|
+
export declare const viteThemeCss: (getConfig: () => ZudokuPluginOptions) => Plugin;
|
|
6
|
+
export {};
|
|
@@ -26,7 +26,7 @@ const generateCss = (theme) => objectEntries(theme)
|
|
|
26
26
|
.filter(([key]) => THEME_VARIABLES.includes(key))
|
|
27
27
|
.map(([key, value]) => `--${uncamelize(key)}:${value};`)
|
|
28
28
|
.join("\n");
|
|
29
|
-
const
|
|
29
|
+
export const viteThemeCss = (getConfig) => {
|
|
30
30
|
const virtualModuleId = "virtual:zudoku-theme.css";
|
|
31
31
|
const resolvedVirtualModuleId = "\0" + virtualModuleId;
|
|
32
32
|
return {
|
|
@@ -41,6 +41,14 @@ const viteCustomCss = (getConfig) => {
|
|
|
41
41
|
return;
|
|
42
42
|
const config = getConfig();
|
|
43
43
|
const cssParts = [];
|
|
44
|
+
// It's important that @import statements come first:
|
|
45
|
+
// > "@import must precede all other statements (besides @charset or empty @layer)"
|
|
46
|
+
if (config.theme?.fonts?.sans) {
|
|
47
|
+
cssParts.push(`@import url('${config.theme.fonts.sans.url}');`);
|
|
48
|
+
}
|
|
49
|
+
if (config.theme?.fonts?.mono) {
|
|
50
|
+
cssParts.push(`@import url('${config.theme.fonts.mono.url}');`);
|
|
51
|
+
}
|
|
44
52
|
if (config.theme?.light) {
|
|
45
53
|
cssParts.push(`:root:root { ${generateCss(config.theme.light)} }`);
|
|
46
54
|
}
|
|
@@ -51,5 +59,4 @@ const viteCustomCss = (getConfig) => {
|
|
|
51
59
|
},
|
|
52
60
|
};
|
|
53
61
|
};
|
|
54
|
-
|
|
55
|
-
//# sourceMappingURL=plugin-custom-css.js.map
|
|
62
|
+
//# sourceMappingURL=plugin-theme-css.js.map
|