Skip to content

Commit ab870b0

Browse files
committed
fix(dev): GitHub Actions CI x86 / arm64 mismatch in TypeScript Go checker WebPack plugin (pty shell spawn binary)
1 parent aa7adcf commit ab870b0

4 files changed

+4
-4
lines changed

webpack.config.main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ console.log(`MAIN nodeEnv: ${nodeEnv}`);
1313

1414
// https://github.com/edrlab/thorium-reader/issues/1097#issuecomment-643406149
1515
const useLegacyTypeScriptLoader = process.env.USE_LEGACY_TYPESCRIPT_LOADER ? true : false;
16-
const GoTsCheckerWebpackPlugin = require("./scripts/go-ts-checker-webpack-plugin");
1716
const ForkTsCheckerWebpackPlugin = require("fork-ts-checker-webpack-plugin");
1817
ForkTsCheckerWebpackPlugin.prototype[require("util").inspect.custom] = (_depth, _options) => {
1918
return "ForkTsCheckerWebpackPlugin";
@@ -256,6 +255,7 @@ config.plugins.push(new webpack.IgnorePlugin({ resourceRegExp: /^.\/runtime-fs$/
256255
config.plugins.push(new webpack.IgnorePlugin({ resourceRegExp: /^canvas$/ })); // pdfjs
257256

258257
if (checkTypeScriptSkip) {
258+
// const GoTsCheckerWebpackPlugin = require("./scripts/go-ts-checker-webpack-plugin");
259259
// config.plugins.push(
260260
// new GoTsCheckerWebpackPlugin({name: "MAIN"}),
261261
// );

webpack.config.renderer-library.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ console.log(`LIBRARY nodeEnv: ${nodeEnv}`);
3232

3333
// https://github.com/edrlab/thorium-reader/issues/1097#issuecomment-643406149
3434
const useLegacyTypeScriptLoader = process.env.USE_LEGACY_TYPESCRIPT_LOADER ? true : false;
35-
const GoTsCheckerWebpackPlugin = require("./scripts/go-ts-checker-webpack-plugin");
3635
const ForkTsCheckerWebpackPlugin = require("fork-ts-checker-webpack-plugin");
3736
ForkTsCheckerWebpackPlugin.prototype[require("util").inspect.custom] = (_depth, _options) => {
3837
return "ForkTsCheckerWebpackPlugin";
@@ -410,6 +409,7 @@ let config = Object.assign(
410409

411410

412411
if (checkTypeScriptSkip) {
412+
const GoTsCheckerWebpackPlugin = require("./scripts/go-ts-checker-webpack-plugin");
413413
config.plugins.push(
414414
new GoTsCheckerWebpackPlugin({name: "LIBRARY"}), // we use a single-pass fast-compile/typecheck in this LIBRARY watcher, no need in READER (and MAIN + PDF configs do not activate a watcher)
415415
);

webpack.config.renderer-pdf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ console.log(`PDF nodeEnv: ${nodeEnv}`);
2323

2424
// https://github.com/edrlab/thorium-reader/issues/1097#issuecomment-643406149
2525
const useLegacyTypeScriptLoader = process.env.USE_LEGACY_TYPESCRIPT_LOADER ? true : false;
26-
const GoTsCheckerWebpackPlugin = require("./scripts/go-ts-checker-webpack-plugin");
2726
const ForkTsCheckerWebpackPlugin = require("fork-ts-checker-webpack-plugin");
2827
ForkTsCheckerWebpackPlugin.prototype[require("util").inspect.custom] = (_depth, _options) => {
2928
return "ForkTsCheckerWebpackPlugin";
@@ -185,6 +184,7 @@ let config = Object.assign(
185184
);
186185

187186
if (checkTypeScriptSkip) {
187+
// const GoTsCheckerWebpackPlugin = require("./scripts/go-ts-checker-webpack-plugin");
188188
// config.plugins.push(
189189
// new GoTsCheckerWebpackPlugin({name: "PDF"}),
190190
// );

webpack.config.renderer-reader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ console.log(`READER nodeEnv: ${nodeEnv}`);
3333

3434
// https://github.com/edrlab/thorium-reader/issues/1097#issuecomment-643406149
3535
const useLegacyTypeScriptLoader = process.env.USE_LEGACY_TYPESCRIPT_LOADER ? true : false;
36-
const GoTsCheckerWebpackPlugin = require("./scripts/go-ts-checker-webpack-plugin");
3736
const ForkTsCheckerWebpackPlugin = require("fork-ts-checker-webpack-plugin");
3837
ForkTsCheckerWebpackPlugin.prototype[require("util").inspect.custom] = (_depth, _options) => {
3938
return "ForkTsCheckerWebpackPlugin";
@@ -396,6 +395,7 @@ let config = Object.assign(
396395
);
397396

398397
if (checkTypeScriptSkip) {
398+
// const GoTsCheckerWebpackPlugin = require("./scripts/go-ts-checker-webpack-plugin");
399399
// config.plugins.push(
400400
// new GoTsCheckerWebpackPlugin({name: "READER"}),
401401
// );

0 commit comments

Comments
 (0)