8000 refactor: remove `ssr` as param · unplugin/unplugin-vue@8415325 · GitHub
[go: up one dir, main page]
Skip to content

Commit 8415325

Browse files
sxzzsxzz
committed
refactor: remove ssr as param
1 parent 2fddb14 commit 8415325

File tree

5 files changed

+10
-34
lines changed

5 files changed

+10
-34
lines changed

‎src/core/handleHotUpdate.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ export async function handleHotUpdate(
4444
const templateModule = modules.find((m) => /type=template/.test(m.url))
4545

4646
// trigger resolveScript for descriptor so that we'll have the AST ready
47-
resolveScript('vite', descriptor, options, false, customElement)
47+
resolveScript('vite', descriptor, { ...options, ssr: false }, customElement)
4848
const scriptChanged = hasScriptChanged(prevDescriptor, descriptor)
4949
if (scriptChanged) {
5050
affectedModules.add(getScriptModule(modules) || mainModule)

‎src/core/index.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,6 @@ export const plugin: UnpluginInstance<Options | undefined, false> =
352352
},
353353

354354
load(id) {
355-
const ssr = options.value.ssr
356355
if (id === EXPORT_HELPER_ID) {
357356
return helperCode
358357
}
@@ -371,7 +370,6 @@ export const plugin: UnpluginInstance<Options | undefined, false> =
371370
meta.framework,
372371
descriptor,
373372
options.value,
374-
ssr,
375373
customElementFilter.value(filename),
376374
)
377375
} else if (query.type === 'template') {
@@ -399,7 +397,6 @@ export const plugin: UnpluginInstance<Options | undefined, false> =
399397
},
400398

401399
transform(code, id) {
402-
const ssr = options.value.ssr
403400
const { filename, query } = parseVueRequest(id)
404401
const context = Object.assign({}, this, meta)
405402

@@ -410,7 +407,6 @@ export const plugin: UnpluginInstance<Options | undefined, false> =
410407
filename,
411408
options.value,
412409
context,
413-
ssr,
414410
customElementFilter.value(filename),
415411
)
416412
} else {
@@ -426,7 +422,6 @@ export const plugin: UnpluginInstance<Options | undefined, false> =
426422
descriptor,
427423
options.value,
428424
context,
429-
ssr,
430425
customElementFilter.value(filename),
431426
)
432427
} else if (query.type === 'style') {

‎src/core/main.ts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,9 @@ export async function transformMain(
3838
filename: string,
3939
options: ResolvedOptions,
4040
pluginContext: Context,
41-
ssr: boolean,
4241
customElement: boolean,
4342
): Promise<{ code: string; map: any; meta: any } | null> {
44-
const { devServer, isProduction, devToolsEnabled } = options
43+
const { devServer, isProduction, devToolsEnabled, ssr } = options
4544

4645
const prevDescriptor = getPrevDescriptor(filename)
4746
const { descriptor, errors } = createDescriptor(filename, code, options)
@@ -77,7 +76,6 @@ export async function transformMain(
7776
descriptor,
7877
options,
7978
pluginContext,
80-
ssr,
8179
customElement,
8280
)
8381

@@ -92,7 +90,6 @@ export async function transformMain(
9290
descriptor,
9391
options,
9492
pluginContext,
95-
ssr,
9693
customElement,
9794
))
9895
}
@@ -290,7 +287,6 @@ async function genTemplateCode(
290287
descriptor: SFCDescriptor,
291288
options: ResolvedOptions,
292289
pluginContext: Context,
293-
ssr: boolean,
294290
customElement: boolean,
295291
) {
296292
const template = descriptor.template!
@@ -305,7 +301,6 @@ async function genTemplateCode(
305301
descriptor,
306302
options,
307303
pluginContext,
308-
ssr,
309304
customElement,
310305
)
311306
} else {
@@ -327,7 +322,7 @@ async function genTemplateCode(
327322
const attrsQuery = attrsToQuery(template.attrs, 'js', true)
328323
const query = `?vue&type=template${srcQuery}${scopedQuery}${attrsQuery}`
329324
const request = JSON.stringify(src + query)
330-
const renderFnName = ssr ? 'ssrRender' : 'render'
325+
const renderFnName = options.ssr ? 'ssrRender' : 'render'
331326
return {
332327
code: `import { ${renderFnName} as _sfc_${renderFnName} } from ${request}`,
333328
map: undefined,
@@ -339,7 +334,6 @@ async function genScriptCode(
339334
descriptor: SFCDescriptor,
340335
options: ResolvedOptions,
341336
pluginContext: Context,
342-
ssr: boolean,
343337
customElement: boolean,
344338
): Promise<{
345339
code: string
@@ -352,7 +346,6 @@ async function genScriptCode(
352346
pluginContext.framework,
353347
descriptor,
354348
options,
355-
ssr,
356349
customElement,
357350
)
358351
if (script) {

‎src/core/script.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,13 @@ export function resolveScript(
6060
framework: UnpluginContextMeta['framework'],
6161
descriptor: SFCDescriptor,
6262
options: ResolvedOptions,
63-
ssr: boolean,
6463
customElement: boolean,
6564
): SFCScriptBlock | null {
6665
if (!descriptor.script && !descriptor.scriptSetup) {
6766
return null
6867
}
6968

69+
const { ssr } = options
7070
const cached = getResolvedScript(descriptor, ssr)
7171
if (cached) {
7272
return cached
@@ -77,7 +77,7 @@ export function resolveScript(
7777
id: descriptor.id,
7878
isProd: options.isProduction,
7979
inlineTemplate: isUseInlineTemplate(descriptor, options),
80-
templateOptions: resolveTemplateCompilerOptions(descriptor, options, ssr),
80+
templateOptions: resolveTemplateCompilerOptions(descriptor, options),
8181
sourceMap: options.sourceMap,
8282
genDefaultAs: canInlineMain(framework, descriptor, options)
8383
? scriptIdentifier

‎src/core/template.ts

Lines changed: 5 additions & 17 deletions
F987
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ export async function transformTemplateAsModule(
1616
descriptor: SFCDescriptor,
1717
options: ResolvedOptions,
1818
pluginContext: Context,
19-
ssr: boolean,
2019
customElement: boolean,
2120
): Promise<{
2221
code: string
@@ -27,15 +26,14 @@ export async function transformTemplateAsModule(
2726
descriptor,
2827
options,
2928
pluginContext,
30-
ssr,
3129
customElement,
3230
)
3331

3432
let returnCode = result.code
3533
if (
3634
options.devServer &&
3735
options.devServer.config.server.hmr !== false &&
38-
!ssr &&
36+
!options.ssr &&
3937
!options.isProduction
4038
) {
4139
returnCode += `\nimport.meta.hot.accept(({ render }) => {
@@ -57,15 +55,13 @@ export function transformTemplateInMain(
5755
descriptor: SFCDescriptor,
5856
options: ResolvedOptions,
5957
pluginContext: Context,
60-
ssr: boolean,
6158
customElement: boolean,
6259
): SFCTemplateCompileResults {
6360
const result = compile(
6461
code,
6562
descriptor,
6663
options,
6764
pluginContext,
68-
ssr,
6965
customElement,
7066
)
7167
return {
@@ -82,19 +78,12 @@ export function compile(
8278
descriptor: SFCDescriptor,
8379
options: ResolvedOptions,
8480
pluginContext: Context,
85-
ssr: boolean,
8681
customElement: boolean,
8782
): SFCTemplateCompileResults {
8883
const filename = descriptor.filename
89-
resolveScript(
90-
pluginContext.framework,
91-
descriptor,
92-
options,
93-
ssr,
94-
customElement,
95-
)
84+
resolveScript(pluginContext.framework, descriptor, options, customElement)
9685
const result = options.compiler.compileTemplate({
97-
...resolveTemplateCompilerOptions(descriptor, options, ssr)!,
86+
...resolveTemplateCompilerOptions(descriptor, options)!,
9887
source: code,
9988
})
10089

@@ -119,13 +108,12 @@ export function compile(
119108
export function resolveTemplateCompilerOptions(
120109
descriptor: SFCDescriptor,
121110
options: ResolvedOptions,
122-
ssr: boolean,
123111
): Omit<SFCTemplateCompileOptions, 'source'> | undefined {
124112
const block = descriptor.template
125113
if (!block) {
126114
return
127115
}
128-
const resolvedScript = getResolvedScript(descriptor, ssr)
116+
const resolvedScript = getResolvedScript(descriptor, options.ssr)
129117
const hasScoped = descriptor.styles.some((s) => s.scoped)
130118
const { id, filename, cssVars } = descriptor
131119

@@ -199,7 +187,7 @@ export function resolveTemplateCompilerOptions(
199187
slotted: descriptor.slotted,
200188
isProd: options.isProduction,
201189
inMap: block.src ? undefined : block.map,
202-
ssr,
190+
ssr: options.ssr,
203191
ssrCssVars: cssVars,
204192
transformAssetUrls,
205193
preprocessLang: block.lang === 'html' ? undefined : block.lang,

0 commit comments

Comments
 (0)
0