fix build issues and add typedoc

1 files changed, 5 insertions, 2 deletions

diff --git a/node_modules/ts-loader/dist/instances.js b/node_modules/ts-loader/dist/instances.js
index fc9c13cc5..10227547a 100644
--- a/node_modules/ts-loader/dist/instances.js
+++ b/node_modules/ts-loader/dist/instances.js
@@ -32,7 +32,7 @@ function getTypeScriptInstance(loaderOptions, loader) {
         return { error: configFileError };
     }
     var configParseResult = config.getConfigParseResult(compiler, configFile, configFilePath);
-    if (configParseResult.errors.length) {
+    if (configParseResult.errors.length && !loaderOptions.happyPackMode) {
         utils.registerWebpackErrors(loader._module.errors, utils.formatErrors(configParseResult.errors, loaderOptions, compiler, { file: configFilePath }));
         return { error: utils.makeError({ rawMessage: 'error while parsing tsconfig.json', file: configFilePath }) };
     }
@@ -43,7 +43,10 @@ function getTypeScriptInstance(loaderOptions, loader) {
         // we do need to check for any issues with TS options though
         var program = compiler.createProgram([], compilerOptions);
         var diagnostics = program.getOptionsDiagnostics();
-        utils.registerWebpackErrors(loader._module.errors, utils.formatErrors(diagnostics, loaderOptions, compiler, { file: configFilePath || 'tsconfig.json' }));
+        // happypack does not have _module.errors - see https://github.com/TypeStrong/ts-loader/issues/336
+        if (!loaderOptions.happyPackMode) {
+            utils.registerWebpackErrors(loader._module.errors, utils.formatErrors(diagnostics, loaderOptions, compiler, { file: configFilePath || 'tsconfig.json' }));
+        }
         return { instance: instances[loaderOptions.instance] = { compiler: compiler, compilerOptions: compilerOptions, loaderOptions: loaderOptions, files: files, dependencyGraph: {}, reverseDependencyGraph: {} } };
     }
     // Load initial files (core lib files, any files specified in tsconfig.json)