Skip to content

Commit e0d3d7e

Browse files
committed
feat(cli): use webpack5 filesystem cache
1 parent c1bf3d8 commit e0d3d7e

File tree

5 files changed

+5
-23
lines changed

5 files changed

+5
-23
lines changed

packages/@vue/cli-plugin-typescript/__tests__/tsPluginBabel.spec.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,8 @@ test('using correct loader', async () => {
1717
const config = service.resolveWebpackConfig()
1818
// eslint-disable-next-line no-shadow
1919
const rule = config.module.rules.find(rule => rule.test.test('foo.ts'))
20-
expect(rule.use[0].loader).toMatch(require.resolve('cache-loader'))
21-
expect(rule.use[1].loader).toMatch(require.resolve('babel-loader'))
22-
expect(rule.use[2].loader).toMatch(require.resolve('ts-loader'))
20+
expect(rule.use[0].loader).toMatch(require.resolve('babel-loader'))
21+
expect(rule.use[1].loader).toMatch(require.resolve('ts-loader'))
2322
})
2423

2524
const creatorOptions = {

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,6 @@ module.exports = (api, projectOptions) => {
3030
tsxRule.use(name).loader(loader).options(options)
3131
}
3232

33-
addLoader({
34-
name: 'cache-loader',
35-
loader: require.resolve('cache-loader'),
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')
41-
})
42-
4333
if (useThreads) {
4434
addLoader({
4535
name: 'thread-loader',

packages/@vue/cli-plugin-typescript/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
"@types/webpack-env": "^1.15.2",
2828
"@vue/cli-shared-utils": "^5.0.0-beta.3",
2929
"babel-loader": "^8.2.2",
30-
"cache-loader": "^4.1.0",
3130
"fork-ts-checker-webpack-plugin": "^6.1.0",
3231
"globby": "^11.0.2",
3332
"thread-loader": "^3.0.0",

packages/@vue/cli-service/lib/config/base.js

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ module.exports = (api, options) => {
1818
.rule('esm')
1919
.test(/\.m?jsx?$/)
2020
.resolve.set('fullySpecified', false)
21+
22+
webpackConfig
23+
.cache({ type: 'filesystem' })
2124
}
2225

2326
webpackConfig
@@ -75,10 +78,6 @@ module.exports = (api, options) => {
7578
webpackConfig.module
7679
.rule('vue')
7780
.test(/\.vue$/)
78-
.use('cache-loader')
79-
.loader(require.resolve('cache-loader'))
80-
.options(vueLoaderCacheConfig)
81-
.end()
8281
.use('vue-loader')
8382
.loader(require.resolve('@vue/vue-loader-v15'))
8483
.options(Object.assign({
@@ -118,10 +117,6 @@ module.exports = (api, options) => {
118117
webpackConfig.module
119118
.rule('vue')
120119
.test(/\.vue$/)
121-
.use('cache-loader')
122-
.loader(require.resolve('cache-loader'))
123-
.options(vueLoaderCacheConfig)
124-
.end()
125120
.use('vue-loader')
126121
.loader(require.resolve('vue-loader'))
127122
.options({

packages/@vue/cli-service/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
"address": "^1.1.2",
4141
"autoprefixer": "^10.2.4",
4242
"browserslist": "^4.16.3",
43-
"cache-loader": "^4.1.0",
4443
"case-sensitive-paths-webpack-plugin": "^2.3.0",
4544
"cli-highlight": "^2.1.10",
4645
"clipboardy": "^2.3.0",

0 commit comments

Comments
 (0)