Skip to content

Commit 5fa7df1

Browse files
committed
chore: reduce diff
1 parent 5e91d93 commit 5fa7df1

File tree

1 file changed

+35
-42
lines changed
  • packages/@vue/cli-plugin-typescript

1 file changed

+35
-42
lines changed

packages/@vue/cli-plugin-typescript/index.js

Lines changed: 35 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
11
const path = require('path')
22

33
module.exports = (api, projectOptions) => {
4-
const useThreads =
5-
process.env.NODE_ENV === 'production' && !!projectOptions.parallel
4+
const useThreads = process.env.NODE_ENV === 'production' && !!projectOptions.parallel
65

76
const { semver, loadModule } = require('@vue/cli-shared-utils')
87
const vue = loadModule('vue', api.service.context)
9-
const isVue3 = vue && semver.major(vue.version) === 3
8+
const isVue3 = (vue && semver.major(vue.version) === 3)
109

11-
api.chainWebpack((config) => {
10+
api.chainWebpack(config => {
1211
config.resolveLoader.modules.prepend(path.join(__dirname, 'node_modules'))
1312

1413
if (!projectOptions.pages) {
15-
config.entry('app').clear().add('./src/main.ts')
14+
config.entry('app')
15+
.clear()
16+
.add('./src/main.ts')
1617
}
1718

18-
config.resolve.extensions.prepend('.ts').prepend('.tsx')
19+
config.resolve
20+
.extensions
21+
.prepend('.ts')
22+
.prepend('.tsx')
1923

2024
const tsRule = config.module.rule('ts').test(/\.ts$/)
2125
const tsxRule = config.module.rule('tsx').test(/\.tsx$/)
@@ -29,15 +33,11 @@ module.exports = (api, projectOptions) => {
2933
addLoader({
3034
name: 'cache-loader',
3135
loader: require.resolve('cache-loader'),
32-
options: api.genCacheConfig(
33-
'ts-loader',
34-
{
35-
'ts-loader': require('ts-loader/package.json').version,
36-
typescript: require('typescript/package.json').version,
37-
modern: !!process.env.VUE_CLI_MODERN_BUILD
38-
},
39-
'tsconfig.json'
40-
)
36+
options: api.genCacheConfig('ts-loader', {
37+
'ts-loader': require('ts-loader/package.json').version,
38+
'typescript': require('typescript/package.json').version,
39+
modern: !!process.env.VUE_CLI_MODERN_BUILD
40+
}, 'tsconfig.json')
4141
})
4242

4343
if (useThreads) {
@@ -72,50 +72,43 @@ module.exports = (api, projectOptions) => {
7272
}
7373
})
7474
// make sure to append TSX suffix
75-
tsxRule
76-
.use('ts-loader')
77-
.loader(require.resolve('ts-loader'))
78-
.tap((options) => {
79-
options = Object.assign({}, options)
80-
delete options.appendTsSuffixTo
81-
options.appendTsxSuffixTo = ['\\.vue$']
82-
return options
83-
})
75+
tsxRule.use('ts-loader').loader(require.resolve('ts-loader')).tap(options => {
76+
options = Object.assign({}, options)
77+
delete options.appendTsSuffixTo
78+
options.appendTsxSuffixTo = ['\\.vue$']
79+
return options
80+
})
8481

8582
// this plugin does not play well with jest + cypress setup (tsPluginE2e.spec.js) somehow
8683
// so temporarily disabled for vue-cli tests
8784
if (!process.env.VUE_CLI_TEST) {
8885
if (isVue3) {
8986
config
9087
.plugin('fork-ts-checker')
91-
.use(require('fork-ts-checker-webpack-plugin-v5'), [
92-
{
93-
typescript: {
94-
extensions: {
95-
vue: {
96-
enabled: true,
97-
compiler: '@vue/compiler-sfc'
98-
}
99-
},
100-
diagnosticOptions: {
101-
semantic: true,
102-
// https://github.com/TypeStrong/ts-loader#happypackmode
103-
syntactic: useThreads
88+
.use(require('fork-ts-checker-webpack-plugin-v5'), [{
89+
typescript: {
90+
extensions: {
91+
vue: {
92+
enabled: true,
93+
compiler: '@vue/compiler-sfc'
10494
}
95+
},
96+
diagnosticOptions: {
97+
semantic: true,
98+
// https://github.com/TypeStrong/ts-loader#happypackmode
99+
syntactic: useThreads
105100
}
106101
}
107-
])
102+
}])
108103
} else {
109104
config
110105
.plugin('fork-ts-checker')
111-
.use(require('fork-ts-checker-webpack-plugin'), [
112-
{
106+
.use(require('fork-ts-checker-webpack-plugin'), [{
113107
vue: { enabled: true, compiler: 'vue-template-compiler' },
114108
formatter: 'codeframe',
115109
// https://github.com/TypeStrong/ts-loader#happypackmode-boolean-defaultfalse
116110
checkSyntacticErrors: useThreads
117-
}
118-
])
111+
}])
119112
}
120113
}
121114
})

0 commit comments

Comments
 (0)