Use options instead of separate tsconfig

code-asher · kylecarbs · commit 777f4609573b · 2019-02-05T11:15:53.000-06:00
Negates the need to duplicate the HappyPack config.
diff --git a/packages/server/src/server.ts b/packages/server/src/server.ts
@@ -35,7 +35,7 @@ export const createApp = (registerMiddleware?: (app: express.Application) => voi
 				try {
 					ws.send(data);
 				} catch (error) {
-					logger.error(error.message, field("error", error));
+					logger.error(error.message);
 				}
 			},
 			onClose: (cb): void => ws.addEventListener("close", () => cb()),
diff --git a/packages/web/tsconfig.json b/packages/web/tsconfig.json
diff --git a/packages/web/webpack.common.config.js b/packages/web/webpack.common.config.js
@@ -2,7 +2,6 @@ const path = require("path");
 const HtmlWebpackPlugin = require("html-webpack-plugin");
 const { BundleAnalyzerPlugin } = require("webpack-bundle-analyzer");
 const PreloadWebpackPlugin = require("preload-webpack-plugin");
-const HappyPack = require("happypack");
 const root = path.resolve(__dirname, "..", "..");
 const fills = path.join(root, "packages", "ide", "src", "fill");
 const vsFills = path.join(root, "packages", "vscode", "src", "fill");
@@ -96,17 +95,12 @@ module.exports = merge({
 			rel: "preload",
 			as: "script",
 		}),
-		new HappyPack({
-			id: "ts",
-			threads: 2,
-			loaders: [{
-				path: "ts-loader",
-				query: {
-					happyPackMode: true,
-					configFile: path.join(__dirname, "tsconfig.json"),
-				},
-			}],
-		}),
 	],
 	target: "web",
-}, require(path.join(root, "scripts", "webpack.general.config.js"))());
+}, require(path.join(root, "scripts", "webpack.general.config.js"))({
+	typescriptCompilerOptions: {
+		"target": "es5",
+		"lib": ["dom", "esnext"],
+		"importHelpers": true,
+	},
+}));

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ export const createApp = (registerMiddleware?: (app: express.Application) => voi`
`35`	`35`	`try {`
`36`	`36`	`ws.send(data);`
`37`	`37`	`} catch (error) {`
`38`		`- logger.error(error.message, field("error", error));`
	`38`	`+ logger.error(error.message);`
`39`	`39`	`}`
`40`	`40`	`},`
`41`	`41`	`onClose: (cb): void => ws.addEventListener("close", () => cb()),`