Skip to content
This repository was archived by the owner on Jul 6, 2025. It is now read-only.

Commit 1a78e5b

Browse files
author
Je
committed
refactor: cleanup
1 parent 9bafed7 commit 1a78e5b

File tree

3 files changed

+11
-17
lines changed

3 files changed

+11
-17
lines changed

app.ts

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -191,14 +191,10 @@ export async function bootstrap({
191191
baseUrl,
192192
defaultLocale,
193193
locales,
194-
dataModule,
195-
appModule,
196-
e404Module,
194+
keyModules,
197195
pageModules
198196
}: AppManifest & {
199-
dataModule: Module | null
200-
appModule: Module | null
201-
e404Module: Module | null
197+
keyModules: Record<string, Module>
202198
pageModules: Record<string, Module>
203199
}) {
204200
const { document } = window as any
@@ -231,9 +227,9 @@ export async function bootstrap({
231227
{ default: E404Component },
232228
{ default: PageComponent }
233229
] = await Promise.all([
234-
dataModule ? import(getModuleImportUrl(baseUrl, dataModule)) : Promise.resolve({ default: {} }),
235-
appModule ? import(getModuleImportUrl(baseUrl, appModule)) : Promise.resolve({}),
236-
e404Module ? import(getModuleImportUrl(baseUrl, e404Module)) : Promise.resolve({}),
230+
keyModules.data ? import(getModuleImportUrl(baseUrl, keyModules.data)) : Promise.resolve({ default: {} }),
231+
keyModules.app ? import(getModuleImportUrl(baseUrl, keyModules.app)) : Promise.resolve({}),
232+
keyModules['404'] ? import(getModuleImportUrl(baseUrl, keyModules['404'])) : Promise.resolve({}),
237233
pageModule ? import(getModuleImportUrl(baseUrl, pageModule)) : Promise.resolve({}),
238234
])
239235
const el = React.createElement(

error.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ const e501AppEl = React.createElement(
55
ErrorPage,
66
{
77
status: 501,
8-
text: 'app module should default as a react component',
8+
text: 'app module should export default as a react component',
99
refreshButton: true
1010
}
1111
)
1212
const e501PageEl = React.createElement(
1313
ErrorPage,
1414
{
1515
status: 501,
16-
text: 'page module should default as a react component',
16+
text: 'page module should export default as a react component',
1717
refreshButton: true
1818
}
1919
)

project.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -567,9 +567,7 @@ export default class Project {
567567
baseUrl,
568568
defaultLocale,
569569
locales: {},
570-
dataModule: null,
571-
appModule: null,
572-
e404Module: null,
570+
keyModules: {},
573571
pageModules: {}
574572
}
575573
const module = this._parseUrl('./main.js')
@@ -583,23 +581,23 @@ export default class Project {
583581
}))
584582
if (this.#modules.has('./data.js') || this.#modules.has('./data/index.js')) {
585583
const { id, url, hash } = this.#modules.get('./data.js') || this.#modules.get('./data/index.js')!
586-
config.dataModule = {
584+
config.keyModules.data = {
587585
moduleId: id,
588586
hash
589587
}
590588
deps.push({ url, hash })
591589
}
592590
if (this.#modules.has('./app.js')) {
593591
const { url, hash } = this.#modules.get('./app.js')!
594-
config.appModule = {
592+
config.keyModules.app = {
595593
moduleId: './app.js',
596594
hash
597595
}
598596
deps.push({ url, hash })
599597
}
600598
if (this.#modules.has('./404.js')) {
601599
const { url, hash } = this.#modules.get('./404.js')!
602-
config.e404Module = {
600+
config.keyModules['404'] = {
603601
moduleId: './404.js',
604602
hash
605603
}

0 commit comments

Comments
 (0)