@@ -99,20 +99,23 @@ export class SFCCompiler {
99
99
? hash ( path . basename ( filename ) + source )
100
100
: hash ( filename + source ) )
101
101
102
- const template =
103
- descriptor . template && this . compileTemplate ( filename , descriptor . template )
102
+ const template = descriptor . template
103
+ ? this . compileTemplate ( filename , descriptor . template )
104
+ : undefined
104
105
105
106
const styles = descriptor . styles . map ( style =>
106
107
this . compileStyle ( filename , scopeId , style )
107
108
)
108
109
109
110
const { script : rawScript , customBlocks } = descriptor
110
- const script = rawScript && {
111
- code : rawScript . src
112
- ? this . read ( rawScript . src , filename )
113
- : rawScript . content ,
114
- map : rawScript . map
115
- }
111
+ const script = rawScript
112
+ ? {
113
+ code : rawScript . src
114
+ ? this . read ( rawScript . src , filename )
115
+ : rawScript . content ,
116
+ map : rawScript . map
117
+ }
118
+ : undefined
116
119
117
120
return {
118
121
scopeId,
@@ -140,8 +143,9 @@ export class SFCCompiler {
140
143
? hash ( path . basename ( filename ) + source )
141
144
: hash ( filename + source ) )
142
145
143
- const template =
144
- descriptor . template && this . compileTemplate ( filename , descriptor . template )
146
+ const template = descriptor . template
147
+ ? this . compileTemplate ( filename , descriptor . template )
148
+ : undefined
145
149
146
150
const styles = await Promise . all (
147
151
descriptor . styles . map ( style =>
@@ -150,12 +154,14 @@ export class SFCCompiler {
150
154
)
151
155
152
156
const { script : rawScript , customBlocks } = descriptor
153
- const script = rawScript && {
154
- code : rawScript . src
155
- ? this . read ( rawScript . src , filename )
156
- : rawScript . content ,
157
- map : rawScript . map
158
- }
157
+ const script = rawScript
158
+ ? {
159
+ code : rawScript . src
160
+ ? this . read ( rawScript . src , filename )
161
+ : rawScript . content ,
162
+ map : rawScript . map
163
+ }
164
+ : undefined
159
165
160
166
return {
161
167
scopeId,
@@ -260,7 +266,7 @@ export class SFCCompiler {
260
266
} ,
261
267
262
268
prepare : result => ( {
263
- media : style . attrs . media ,
269
+ media : typeof style . attrs . media === 'string' ? style . attrs . media : undefined ,
264
270
scoped : style . scoped ,
265
271
moduleName : style . module === true ? '$style' : < any > style . module ,
266
272
module : tokens ,
0 commit comments