Skip to content

Commit 63c8f65

Browse files
committed
fix: cache-loader doesnt seem to work well with ts-loader
1 parent 8f37ebe commit 63c8f65

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ test('using correct loader', () => {
1616
const rule = config.module.rules.find(rule => rule.test.test('foo.ts'))
1717
expect(rule.use[0].loader).toMatch('cache-loader')
1818
expect(rule.use[1].loader).toMatch('babel-loader')
19-
expect(rule.use[2].loader).toMatch('cache-loader')
20-
expect(rule.use[3].loader).toMatch('ts-loader')
19+
expect(rule.use[2].loader).toMatch('ts-loader')
2120
})
2221

2322
const creatorOptions = {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,11 @@ module.exports = (api, {
109109
// delete all js files that have a ts file of the same name
110110
// and simply rename other js files to ts
111111
const jsRE = /\.js$/
112-
const e2eRE = /^test\/e2e\//
112+
const excludeRE = /^test\/e2e\/|\.config\.js$/
113113
const convertLintFlags = require('../lib/convertLintFlags')
114114
api.postProcessFiles(files => {
115115
for (const file in files) {
116-
if (jsRE.test(file) && !e2eRE.test(file)) {
116+
if (jsRE.test(file) && !excludeRE.test(file)) {
117117
const tsFile = file.replace(jsRE, '.ts')
118118
if (!files[tsFile]) {
119119
files[tsFile] = convertLintFlags(files[file])

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,6 @@ module.exports = (api, options) => {
4848
.loader('babel-loader')
4949
}
5050
tsRule
51-
.use('cache-loader-2')
52-
.loader('cache-loader')
53-
.options({ cacheDirectory })
54-
.end()
5551
.use('ts-loader')
5652
.loader('ts-loader')
5753
.options({

0 commit comments

Comments
 (0)