@@ -140,31 +140,33 @@ pri.project.onCreateEntry((analyseInfo: IResult, entry) => {
140
140
141
141
entry . pipeAppComponent ( async entryComponent => {
142
142
return `
143
- ${ ( await Promise . all (
144
- analyseInfo . projectAnalysePages . pages
145
- . filter ( page => ! ! page . file )
146
- . map ( async page => {
147
- const pageRequirePath = normalizePath (
148
- path . relative ( path . join ( pri . projectRootPath , tempPath . dir ) , path . join ( page . file . dir , page . file . name ) ) ,
149
- ) ;
150
-
151
- const importCode = `import(/* webpackChunkName: "${
152
- page . chunkName
153
- } " */ "${ pageRequirePath } ").then(code => {
143
+ ${ (
144
+ await Promise . all (
145
+ analyseInfo . projectAnalysePages . pages
146
+ . filter ( page => ! ! page . file )
147
+ . map ( async page => {
148
+ const pageRequirePath = normalizePath (
149
+ path . relative ( path . join ( pri . projectRootPath , tempPath . dir ) , path . join ( page . file . dir , page . file . name ) ) ,
150
+ ) ;
151
+
152
+ const importCode = `import(/* webpackChunkName: "${
153
+ page . chunkName
154
+ } " */ "${ pageRequirePath } ").then(code => {
154
155
const filePath = "${ path . format ( page . file ) } "
155
156
156
157
${ await entry . pipe . get ( 'afterPageLoad' , '' ) }
157
158
${ await entry . pipe . get ( 'returnPageInstance' , 'return code.default' ) }
158
159
})` ;
159
160
160
- return `
161
+ return `
161
162
const ${ page . componentName } = Loadable<any, any>({
162
163
loader: () => ${ importCode } ,
163
164
loading: (): any => null
164
165
})\n
165
166
` ;
166
- } ) ,
167
- ) ) . join ( '\n' ) }
167
+ } ) ,
168
+ )
169
+ ) . join ( '\n' ) }
168
170
${ entryComponent }
169
171
` ;
170
172
} ) ;
@@ -184,22 +186,24 @@ pri.project.onCreateEntry((analyseInfo: IResult, entry) => {
184
186
185
187
entry . pipeAppRoutes ( async renderRoutes => {
186
188
return `
187
- ${ ( await Promise . all (
188
- analyseInfo . projectAnalysePages . pages . map ( async page => {
189
- if ( page . file ) {
190
- return `
189
+ ${ (
190
+ await Promise . all (
191
+ analyseInfo . projectAnalysePages . pages . map ( async page => {
192
+ if ( page . file ) {
193
+ return `
191
194
<${ await entry . pipe . get ( 'commonRoute' , 'Route' ) } exact path="${ page . routerPath } " component={${
192
- page . componentName
193
- } } />\n
195
+ page . componentName
196
+ } } />\n
194
197
` ;
195
- }
196
- if ( page . redirect ) {
197
- return `
198
+ }
199
+ if ( page . redirect ) {
200
+ return `
198
201
<Redirect from="${ page . routerPath } " to="${ page . redirect } " />\n
199
202
` ;
200
- }
201
- } ) ,
202
- ) ) . join ( '\n' ) }
203
+ }
204
+ } ) ,
205
+ )
206
+ ) . join ( '\n' ) }
203
207
${ renderRoutes }
204
208
` ;
205
209
} ) ;
0 commit comments