File tree Expand file tree Collapse file tree 3 files changed +14
-22
lines changed
packages/@vue/cli-service Expand file tree Collapse file tree 3 files changed +14
-22
lines changed Original file line number Diff line number Diff line change @@ -3,7 +3,6 @@ module.exports = (api, options) => {
3
3
const resolveLocal = require ( '../util/resolveLocal' )
4
4
const getAssetPath = require ( '../util/getAssetPath' )
5
5
const inlineLimit = 10000
6
- const useThreads = process . env . NODE_ENV === 'production' && options . parallel
7
6
8
7
webpackConfig
9
8
. context ( api . service . context )
@@ -44,29 +43,22 @@ module.exports = (api, options) => {
44
43
// vue-loader --------------------------------------------------------------
45
44
46
45
const { genCacheConfig } = require ( '@vue/cli-shared-utils' )
46
+ const vueLoaderCacheConfig = genCacheConfig ( api , options , 'vue-loader' )
47
47
48
- const vueRule = webpackConfig . module
48
+ webpackConfig . module
49
49
. rule ( 'vue' )
50
50
. test ( / \. v u e $ / )
51
51
. use ( 'cache-loader' )
52
52
. loader ( 'cache-loader' )
53
- . options ( genCacheConfig ( api , options , 'vue-loader' ) )
53
+ . options ( vueLoaderCacheConfig )
54
54
. end ( )
55
-
56
- if ( useThreads ) {
57
- vueRule
58
- . use ( 'thread-loader' )
59
- . loader ( 'thread-loader' )
60
- }
61
-
62
- vueRule
63
- . use ( 'vue-loader' )
64
- . loader ( 'vue-loader' )
65
- . options ( {
66
- compilerOptions : {
67
- preserveWhitespace : false
68
- }
69
- } )
55
+ . use ( 'vue-loader' )
56
+ . loader ( 'vue-loader' )
57
+ . options ( Object . assign ( {
58
+ compilerOptions : {
59
+ preserveWhitespace : false
60
+ }
61
+ } , vueLoaderCacheConfig ) )
70
62
71
63
webpackConfig
72
64
. plugin ( 'vue-loader' )
Original file line number Diff line number Diff line change 56
56
"thread-loader" : " ^1.1.5" ,
57
57
"uglifyjs-webpack-plugin" : " ^1.2.5" ,
58
58
"url-loader" : " ^1.0.1" ,
59
- "vue-loader" : " ^15.1 .0" ,
59
+ "vue-loader" : " ^15.2 .0" ,
60
60
"vue-template-compiler" : " ^2.5.16" ,
61
61
"webpack" : " ^4.8.2" ,
62
62
"webpack-chain" : " ^4.8.0" ,
Original file line number Diff line number Diff line change @@ -10669,9 +10669,9 @@ vue-jest@^2.6.0:
10669
10669
tsconfig "^7.0.0"
10670
10670
vue-template-es2015-compiler "^1.6.0"
10671
10671
10672
- vue-loader@^15.1 .0 :
10673
- version "15.1 .0"
10674
- resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.1 .0.tgz#82a2a5c310951aba17ad5d8680fe016c77d37e80 "
10672
+ vue-loader@^15.2 .0 :
10673
+ version "15.2 .0"
10674
+ resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.2 .0.tgz#5a8138e490a1040942d2f10ae68fa72b5a923364 "
10675
10675
dependencies :
10676
10676
" @vue/component-compiler-utils" " ^1.2.1"
10677
10677
hash-sum "^1.0.2"
You can’t perform that action at this time.
0 commit comments