fix: proper initial fileNames injection, refs #205

Author: s-panferov

package.json

@@ -10,8 +10,9 @@
     "watch:ts": "npm run build:ts -- --watch --diagnostics",
     "watch:babel": "babel dist --watch --out-dir dist.babel",
     "prebuild": "npm run lint",
-    "build": "npm run build:ts",
+    "build": "npm run build:ts && npm run build:tests && npm run build:babel",
     "build:ts": "tsc -p src --pretty",
+    "build:tests": "cd src/test && tsc --pretty",
     "build:babel": "babel dist --out-dir dist.babel",
     "lint": "tslint src/*.ts",
     "release": "standard-version"

src/defines.d.ts

@@ -0,0 +1,2 @@
+/// <reference path='../node_modules/typescript/lib/typescriptServices.d.ts' />
+/// <reference path='../typings/tsd.d.ts' />

src/index.ts

@@ -1,6 +1,4 @@
-/// <reference path='../node_modules/typescript/lib/typescriptServices.d.ts' />
-/// <reference path="./defines.d.ts"/>
-/// <reference path='../typings/tsd.d.ts' />
+/// <reference path="./defines.d.ts" />
 
 import * as _ from 'lodash';
 import * as path from 'path';
@@ -201,6 +199,7 @@ function transform(webpack: IWebPack, instance: ICompilerInstance, fileName: str
 
 function invokeKnownFilesOneTime(instance: ICompilerInstance) {
      if (instance.loaderConfig.externals && !instance.externalsInvoked) {
+
         instance.loaderConfig.externals
             .filter(isTypeDeclaration)
             .forEach(ext => instance.tsState.fileAnalyzer.checkDependencies(ext));

src/instance.ts

@@ -142,7 +142,7 @@ export function ensureInstance(webpack: IWebPack, query: QueryOptions, instanceN
 
     let { configFilePath, compilerConfig, loaderConfig } = readConfigFile(process.cwd(), query, tsImpl);
 
-    applyDefaults(compilerConfig, loaderConfig);
+    applyDefaults(configFilePath, compilerConfig, loaderConfig);
     let babelImpl = setupBabel(loaderConfig);
     let cacheIdentifier = setupCache(loaderConfig, tsImpl, webpack, babelImpl);
 
@@ -262,9 +262,10 @@ function setupBabel(loaderConfig: LoaderConfig): any {
     return babelImpl;
 }
 
-function applyDefaults(compilerConfig: TsConfig, loaderConfig: LoaderConfig) {
+function applyDefaults(configFilePath: string, compilerConfig: TsConfig, loaderConfig: LoaderConfig) {
     compilerConfig.typingOptions.exclude = compilerConfig.typingOptions.exclude || [];
-    let initialFiles = compilerConfig.fileNames;
+    let configDirname = path.dirname(configFilePath);
+    let initialFiles = compilerConfig.fileNames.map(f => path.join(configDirname, f));
 
     _.defaults(compilerConfig.options, {
         sourceMap: true,
@@ -310,7 +311,7 @@ export function readConfigFile(baseDir: string, query: QueryOptions, tsImpl: typ
 
     if (!configFilePath || query.tsconfigContent) {
         return {
-            configFilePath: configFilePath || process.cwd(),
+            configFilePath: configFilePath || path.join(process.cwd(), 'tsconfig.json'),
             compilerConfig: tsImpl.parseJsonConfigFileContent(
                 query.tsconfigContent || {},
                 tsImpl.sys,
@@ -332,6 +333,8 @@ export function readConfigFile(baseDir: string, query: QueryOptions, tsImpl: typ
         configFilePath
     );
 
+    configFilePath = path.join(process.cwd(), configFilePath);
+
     return {
         configFilePath,
         compilerConfig,

src/test/tsconfig.json

@@ -3,9 +3,11 @@
         "target": "es6",
         "moduleResolution": "node",
         "sourceMap": true,
+        "outDir": "../../dist/test",
         "lib": [ "es6", "dom" ]
     },
     "exclude": [
-        "*"
+        "fixtures",
+        "output"
     ]
 }

src/test/utils.ts

@@ -1,3 +1,5 @@
+/// <reference path="../defines.d.ts" />
+
 import * as path from 'path';
 import * as fs from 'fs';
 import * as _ from 'lodash';