Skip to content

Commit 548d148

Browse files
committed
fix: #562 添加默认 script 标签
1 parent cd718a1 commit 548d148

File tree

3 files changed

+23
-17
lines changed

3 files changed

+23
-17
lines changed

lib/loader.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var hasBuble = !!tryRequire('buble-loader')
2424

2525
// for mp js
2626
var { compileMP, compileMPScript } = require('./mp-compiler')
27-
var { defaultStylePart } = require('./mp-compiler/util')
27+
var { defaultPart } = require('./mp-compiler/util')
2828

2929
var rewriterInjectRE = /\b(css(?:-loader)?(?:\?[^!]+)?)(?:!|$)/
3030

@@ -103,7 +103,11 @@ module.exports = function (content) {
103103

104104
// fix #153: 根组件没有 style 模块,不生成页面的 wxss,补齐内容方便加载 vendor.wxss
105105
if (!parts.styles.length) {
106-
parts.styles.push(defaultStylePart)
106+
parts.styles.push(defaultPart('style'))
107+
}
108+
// fix #562: 组件没有 script 模块,会阻塞编译
109+
if (!parts.script) {
110+
parts.script = defaultPart('script')
107111
}
108112

109113
var hasScoped = parts.styles.some(function (s) { return s.scoped })

lib/mp-compiler/util.js

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -128,23 +128,25 @@ function getPathPrefix (src) {
128128
return `${'../'.repeat(length)}`
129129
}
130130

131-
const defaultStylePart = {
132-
type: 'style',
133-
content: '\n',
134-
start: 0,
135-
attrs: {},
136-
end: 1,
137-
map: {
138-
version: 3,
139-
sources: [],
140-
names: [],
141-
mappings: '',
142-
sourcesContent: []
131+
const defaultPart = type => {
132+
return {
133+
type,
134+
content: '\n',
135+
start: 0,
136+
attrs: {},
137+
end: 1,
138+
map: {
139+
version: 3,
140+
sources: [],
141+
names: [],
142+
mappings: '',
143+
sourcesContent: []
144+
}
143145
}
144146
}
145147

146148
module.exports = {
147-
defaultStylePart,
149+
defaultPart,
148150
cacheFileInfo,
149151
getFileInfo,
150152
getCompNameAndSrc,

lib/selector.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
var path = require('path')
66
var parse = require('./parser')
77
var loaderUtils = require('loader-utils')
8-
var { defaultStylePart } = require('./mp-compiler/util')
8+
var { defaultPart } = require('./mp-compiler/util')
99

1010
module.exports = function (content) {
1111
this.cacheable()
@@ -17,6 +17,6 @@ module.exports = function (content) {
1717
if (Array.isArray(part)) {
1818
part = part[query.index]
1919
}
20-
part = part || defaultStylePart
20+
part = part || defaultPart('style')
2121
this.callback(null, part.content, part.map)
2222
}

0 commit comments

Comments
 (0)