Skip to content

Commit 61f9952

Browse files
committed
Fix issue with getScriptFileNames (#71)
1 parent c1e47ce commit 61f9952

File tree

6 files changed

+20
-7
lines changed

6 files changed

+20
-7
lines changed

index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ function ensureTypeScriptInstance(options: Options, loader: any): { instance?: T
271271

272272
// Create the TypeScript language service
273273
var servicesHost = {
274-
getScriptFileNames: () => Object.keys(files),
274+
getScriptFileNames: () => Object.keys(files).filter(filePath => !!filePath.match(/(\.d)?\.tsx?$/)),
275275
getScriptVersion: fileName => {
276276
fileName = path.normalize(fileName);
277277
return files[fileName] && files[fileName].version.toString();

test/nodeResolution/app.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
import a = require('a');
2+
import b = require('./b');
23

3-
console.log(a);
4+
console.log(a);
5+
console.log(b);

test/nodeResolution/b.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export = 'b';

test/nodeResolution/expectedOutput/bundle.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@
4545
/***/ function(module, exports, __webpack_require__) {
4646

4747
var a = __webpack_require__(1);
48+
var b = __webpack_require__(2);
4849
console.log(a);
50+
console.log(b);
4951

5052

5153
/***/ },
@@ -54,5 +56,12 @@
5456

5557
module.exports = 'a';
5658

59+
/***/ },
60+
/* 2 */
61+
/***/ function(module, exports) {
62+
63+
module.exports = 'b';
64+
65+
5766
/***/ }
5867
/******/ ]);
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Asset Size Chunks Chunk Names
2-
bundle.js 1.53 kB 0 [emitted] main
3-
chunk {0} bundle.js (main) 59 bytes [rendered]
4-
[0] ./.test/nodeResolution/app.ts 38 bytes {0} [built]
5-
[1] ./.test/nodeResolution/~/a/index.js 21 bytes {0} [built]
2+
bundle.js 1.66 kB 0 [emitted] main
3+
chunk {0} bundle.js (main) 121 bytes [rendered]
4+
[0] ./.test/nodeResolution/app.ts 78 bytes {0} [built]
5+
[1] ./.test/nodeResolution/~/a/index.js 21 bytes {0} [built]
6+
[2] ./.test/nodeResolution/b.ts 22 bytes {0} [built]

test/nodeResolution/tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"compilerOptions": {
3-
3+
"noEmitOnError": true
44
},
55
"files": [
66
]

0 commit comments

Comments
 (0)