Fix Issue 939 (#942)

* initial commit adding test and fix

* PR feedback, test fixes

* changelog, requeue

.travis.yml

@@ -14,6 +14,7 @@ install:
   - yarn lint
   - yarn add $TYPESCRIPT
 env:
+  - [email protected]
   - [email protected]
   - TYPESCRIPT=typescript@next
   - [email protected]

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v6.0.2
+* [Set configFilePath when reading config file](https://github.com/TypeStrong/ts-loader/pull/942) (#939) - thanks @konpikwastaken!
+
 ## v6.0.1
 
 * [Fix issue with `resolveTypeReferenceDirective` causing errors like `Cannot find name 'it'` with Jest](https://github.com/TypeStrong/ts-loader/pull/936) (#934) (#919) - thanks @andrewbranch!

appveyor.yml

@@ -3,6 +3,7 @@ environment:
   FORCE_COLOR: 1
   nodejs_version: "10"
   matrix:
+  - TYPESCRIPT: [email protected]
   - TYPESCRIPT: [email protected]
   - TYPESCRIPT: typescript@next
   - TYPESCRIPT: [email protected]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-loader",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "description": "TypeScript loader for webpack",
   "main": "index.js",
   "types": "dist/types/index.d.ts",

src/config.ts

@@ -1,5 +1,6 @@
 import { Chalk } from 'chalk';
 import * as path from 'path';
+import * as semver from 'semver';
 import * as typescript from 'typescript';
 import * as webpack from 'webpack';
 
@@ -125,13 +126,21 @@ function findConfigFile(
 export function getConfigParseResult(
   compiler: typeof typescript,
   configFile: ConfigFile,
-  basePath: string
+  basePath: string,
+  configFilePath: string | undefined
 ) {
   const configParseResult = compiler.parseJsonConfigFileContent(
     configFile.config,
     compiler.sys,
     basePath
   );
 
+  if (semver.gte(compiler.version, '3.5.0')) {
+    // set internal options.configFilePath flag on options to denote that we read this from a file
+    configParseResult.options = Object.assign({}, configParseResult.options, {
+      configFilePath
+    });
+  }
+
   return configParseResult;
 }

src/instances.ts

@@ -99,7 +99,8 @@ function successfulTypeScriptInstance(
   const configParseResult = getConfigParseResult(
     compiler,
     configFile,
-    basePath
+    basePath,
+    configFilePath
   );
 
   if (configParseResult.errors.length > 0 && !loaderOptions.happyPackMode) {

test/execution-tests/3.5.1_incremental/karma.conf.js

@@ -0,0 +1,17 @@
+/* eslint-disable no-var, strict */
+'use strict';
+var webpackConfig = require('./webpack.config.js');
+var makeKarmaConfig = require('../../karmaConfig');
+
+module.exports = function(config) {
+  config.set(
+    makeKarmaConfig({
+      config,
+      webpackConfig,
+      files: [
+        // This ensures we have the es6 shims in place from babel and then loads all the tests
+        'main.js'
+      ]
+    })
+  );
+};

test/execution-tests/3.5.1_incremental/main.js

@@ -0,0 +1,2 @@
+const testsContext = require.context('./', true, /\.tests\.ts(x?)$/);
+testsContext.keys().forEach(testsContext);

test/execution-tests/3.5.1_incremental/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "3.5.0_incremental",
+  "license": "MIT",
+  "version": "1.0.0",
+  "main": "index.js",
+  "devDependencies": {
+    "@types/jasmine": "^2.5.35",
+    "jasmine-core": "^2.3.4"
+  }
+}

test/execution-tests/3.5.1_incremental/src/main.ts

@@ -0,0 +1,11 @@
+class Foo {
+    private message: string;
+    constructor() {
+        this.message = 'hello world';
+    }
+    public write() {
+        // tslint:disable-next-line:no-console
+        console.log(this.message);
+    }
+}
+export default Foo;

test/execution-tests/3.5.1_incremental/test/main.tests.ts

@@ -0,0 +1,8 @@
+import main from '../src/main';
+
+describe("main", () => {
+  it("should compile successfully", () => {
+    // blank expectation, actual failure is in build
+    expect(main).not.toBeNull();
+  });
+});

test/execution-tests/3.5.1_incremental/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+	"noEmitOnError": true,
+	"noErrorTruncation": true,
+    "incremental": true,
+	"outDir": "./dist",
+	"target": "es5",
+	"module": "es6"
+  }
+}

test/execution-tests/3.5.1_incremental/webpack.config.js

@@ -0,0 +1,34 @@
+/* eslint-disable no-var, strict, prefer-arrow-callback */
+'use strict';
+
+var path = require('path');
+var webpack = require('webpack');
+var path = require('path');
+
+module.exports = {
+  mode: 'development',
+  entry: './src/main.ts',
+  output: {
+    filename: 'bundle.js'
+  },
+  module: {
+    rules: [{
+      test: /\.ts(x?)$/,
+      exclude: /node_modules/,
+      use: [{
+        loader: 'ts-loader',
+      }]
+    }]
+  },
+  resolve: {
+    // Add `.ts` and `.tsx` as a resolvable extension.
+    extensions: ['.ts', '.tsx', '.js']
+  },
+};
+
+// for test harness purposes only, you would not need this in a normal project
+module.exports.resolveLoader = {
+  alias: {
+    'ts-loader': path.join(__dirname, "../../../index.js")
+  }
+}

test/execution-tests/3.5.1_incremental/yarn.lock

@@ -0,0 +1,11 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@types/jasmine@^2.5.35":
+  version "2.8.16"
+  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.16.tgz#a6cb24b1149d65293bd616923500014838e14e7d"
+
+jasmine-core@^2.3.4:
+  version "2.99.1"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.99.1.tgz#e6400df1e6b56e130b61c4bcd093daa7f6e8ca15"