Skip to content

Commit c8d7c05

Browse files
author
wangxing
committed
构建 editor 时,增加 jsonpFunction 避免和vue页面webpack冲突
1 parent fd86a73 commit c8d7c05

36 files changed

+41
-25
lines changed

react/config/webpack.base.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ module.exports = function (targetDir){
227227
}),
228228
new MonacoPlugin({
229229
languages: ['json'],
230-
filename: 'react/wjs/[name].worker.js'
230+
filename: targetDir + '/wjs/[name].worker.js'
231231
}),
232232
]
233233
}

react/config/webpack.editor.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ module.exports = {
1212
},
1313
mode: 'production',
1414
output: {
15+
jsonpFunction: 'adminTemplateEditor',
1516
path: outputPath,
1617
filename: 'editor/js/[name].system.bundle.js',
1718
chunkFilename: 'editor/js/[name].[hash].bundle.js',

vue2/public/editor/js/0.710381663a34dff11c53.bundle.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

vue2/public/editor/js/0.f80767ef280c7bd96500.bundle.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vue2/public/editor/js/1.710381663a34dff11c53.bundle.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)