Skip to content

Commit e4f24db

Browse files
committed
fix: web config
1 parent 89d0b00 commit e4f24db

File tree

7 files changed

+14
-17
lines changed

7 files changed

+14
-17
lines changed

src/generators/jsx-ast/index.mjs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ export default createLazyGenerator({
1818

1919
defaultConfiguration: {
2020
ref: 'main',
21-
remoteConfig: 'https://nodejs.org/site.json',
2221
},
2322

2423
hasParallelProcessor: true,

src/generators/web/index.mjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ export default createLazyGenerator({
3232
title: 'Node.js',
3333
editURL: `${GITHUB_EDIT_URL}/doc/api{path}.md`,
3434
pageURL: '{baseURL}/latest-{version}/api{path}.html',
35+
remoteConfig: 'https://nodejs.org/site.json',
3536
imports: {
3637
'#theme/Logo': '@node-core/ui-components/Common/NodejsLogo',
3738
'#theme/Navigation': join(import.meta.dirname, './ui/components/NavBar'),

src/generators/web/ui/components/AnnouncementBanner/index.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ const RemoteLoadableBanner = ({ remoteConfig, versionMajor }) => {
1919

2020
return { default: () => <AnnouncementBanner banners={active} /> };
2121
}),
22+
// eslint-disable-next-line react-x/exhaustive-deps
2223
[]
2324
);
2425

src/generators/web/ui/components/Layout/index.jsx

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import Article from '@node-core/ui-components/Containers/Article';
33

44
import RemoteLoadableBanner from '../AnnouncementBanner';
55

6+
import { remoteConfig, versionMajor } from '#theme/config';
67
import Footer from '#theme/Footer';
78
import MetaBar from '#theme/Metabar';
89
import NavBar from '#theme/Navigation';
@@ -15,23 +16,14 @@ import SideBar from '#theme/Sidebar';
1516
* main content, meta bar, and footer. Override via `#theme/Layout` in your
1617
* configuration's `imports` to customize the entire page structure.
1718
*
18-
* @param {{
19-
* metadata: import('../../types').SerializedMetadata,
20-
* headings: Array,
21-
* readingTime: string,
22-
* children: import('preact').ComponentChildren,
23-
* announcementBannerProps: object
24-
* }} props
19+
* @param {{ metadata: import('../../types').SerializedMetadata, headings: Array, readingTime: string, children: import('preact').ComponentChildren }} props
2520
*/
26-
export default ({
27-
metadata,
28-
headings,
29-
readingTime,
30-
announcementBannerProps,
31-
children,
32-
}) => (
21+
export default ({ metadata, headings, readingTime, children }) => (
3322
<>
34-
<RemoteLoadableBanner {...announcementBannerProps} />
23+
<RemoteLoadableBanner
24+
remoteConfig={remoteConfig}
25+
versionMajor={versionMajor}
26+
/>
3527
<NavBar />
3628
<Article>
3729
<SideBar metadata={metadata} />

src/generators/web/ui/types.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,15 @@ declare module '#theme/config' {
99
export const title: string;
1010
export const repository: string;
1111
export const version: string;
12+
export const versionMajor: number;
1213
export const versions: Array<{
1314
url: string;
1415
label: string;
1516
major: number;
1617
}>;
1718
export const editURL: string;
1819
export const pages: Array<[string, string]>;
20+
export const remoteConfig: string;
1921
export const languageDisplayNameMap: Map<string, string>;
2022
}
2123

src/generators/web/utils/config.mjs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,11 @@ export default function createConfigSource(input) {
9595
`export const title = ${JSON.stringify(config.title)};`,
9696
`export const repository = ${JSON.stringify(config.repository)};`,
9797
`export const version = ${JSON.stringify(currentVersion)};`,
98+
`export const versionMajor = ${config.version.major};`,
9899
`export const versions = ${JSON.stringify(versions)};`,
99100
`export const editURL = ${JSON.stringify(editURL)};`,
100101
`export const pages = ${JSON.stringify(pages)};`,
102+
`export const remoteConfig = ${JSON.stringify(config.remoteConfig)};`,
101103
`export const languageDisplayNameMap = new Map(${JSON.stringify(shikiDisplayNameMap)});`,
102104
].join('\n');
103105
}

src/generators/web/utils/processing.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ async function executeServerCode(serverCodeMap, requireFn, virtualImports) {
6666
// Execute each bundled entry and collect dehydrated HTML results
6767
for (const chunk of entryChunks) {
6868
const executedFunction = new Function('require', chunk.code);
69-
pages.set(chunk.fileName, executedFunction(enhancedRequire));
69+
pages.set(chunk.fileName, await executedFunction(enhancedRequire));
7070
}
7171

7272
return { pages, css };

0 commit comments

Comments
 (0)