File tree Expand file tree Collapse file tree 3 files changed +3
-8
lines changed
packages/@vue/cli-plugin-typescript Expand file tree Collapse file tree 3 files changed +3
-8
lines changed Original file line number Diff line number Diff 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
2322const creatorOptions = {
Original file line number Diff line number Diff 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 = / \. j s $ /
112- const e2eRE = / ^ t e s t \/ e 2 e \/ /
112+ const excludeRE = / ^ t e s t \/ e 2 e \/ | \. c o n f i g \. j s $ /
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 ] )
Original file line number Diff line number Diff 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 ( {
You can’t perform that action at this time.
0 commit comments