diff --git a/api b/api index f99c777b4..b733e7c2c 160000 --- a/api +++ b/api @@ -1 +1 @@ -Subproject commit f99c777b46d78b09eb01e427387ef09d5f7fc75e +Subproject commit b733e7c2cd1d904f4117acb4238d1baba52094a4 diff --git a/extensions/changelog-dashlet b/extensions/changelog-dashlet index 5bd677927..17af39c83 160000 --- a/extensions/changelog-dashlet +++ b/extensions/changelog-dashlet @@ -1 +1 @@ -Subproject commit 5bd677927fcb52cb9d2a1ff6e69c433c9d310d32 +Subproject commit 17af39c83d164af371bedd89265037295cc8376b diff --git a/extensions/documentation b/extensions/documentation index 30e00255e..d05b2d15a 160000 --- a/extensions/documentation +++ b/extensions/documentation @@ -1 +1 @@ -Subproject commit 30e00255e4ef96a122ec1cb437a48dc7825daa7b +Subproject commit d05b2d15ad383f9edc6cdc1bb4820c64cb71acde diff --git a/extensions/feedback b/extensions/feedback index 4130ddcd8..05e4ee1a6 160000 --- a/extensions/feedback +++ b/extensions/feedback @@ -1 +1 @@ -Subproject commit 4130ddcd8dedbc6c1b916b0fe72d9a41bb7d6843 +Subproject commit 05e4ee1a687cdf306668d391d0e617aaf5563c81 diff --git a/extensions/fnis-integration b/extensions/fnis-integration index 0a83e70f4..673328c4e 160000 --- a/extensions/fnis-integration +++ b/extensions/fnis-integration @@ -1 +1 @@ -Subproject commit 0a83e70f4ae5c769e3190be93ebec5b617b18b79 +Subproject commit 673328c4ecb2f880e1d3de5f50b2f2eebc193989 diff --git a/extensions/game-pillarsofeternity2 b/extensions/game-pillarsofeternity2 index 62367dab9..1f13fff57 160000 --- a/extensions/game-pillarsofeternity2 +++ b/extensions/game-pillarsofeternity2 @@ -1 +1 @@ -Subproject commit 62367dab97e4508053da8656e8345017ccd9f713 +Subproject commit 1f13fff5712f769896fa8ae54ac88a6f38be0d15 diff --git a/extensions/gamebryo-archive-invalidation b/extensions/gamebryo-archive-invalidation index 3e6912c2e..960b81fb6 160000 --- a/extensions/gamebryo-archive-invalidation +++ b/extensions/gamebryo-archive-invalidation @@ -1 +1 @@ -Subproject commit 3e6912c2e33443ab0980a0f781b12e07d88f8adc +Subproject commit 960b81fb6334583845e13ff9a922bd897ba965f8 diff --git a/extensions/gamebryo-ba2-support b/extensions/gamebryo-ba2-support index fac57e045..4ccafa312 160000 --- a/extensions/gamebryo-ba2-support +++ b/extensions/gamebryo-ba2-support @@ -1 +1 @@ -Subproject commit fac57e045933c8d43f37d22823ccb732b87267ff +Subproject commit 4ccafa312923a9de29f03bd6e48164abfa98a06b diff --git a/extensions/gamebryo-bsa-support b/extensions/gamebryo-bsa-support index 55e008dc4..a9dd75b13 160000 --- a/extensions/gamebryo-bsa-support +++ b/extensions/gamebryo-bsa-support @@ -1 +1 @@ -Subproject commit 55e008dc4fa6ab111877711ffd44487c53b8bbf1 +Subproject commit a9dd75b130d8c24b18847adbc1e1462b3891e9dc diff --git a/extensions/gamebryo-plugin-indexlock b/extensions/gamebryo-plugin-indexlock index c2de6194c..8ba7d38e7 160000 --- a/extensions/gamebryo-plugin-indexlock +++ b/extensions/gamebryo-plugin-indexlock @@ -1 +1 @@ -Subproject commit c2de6194c8c91f46613e2949268dabc62b0b02d5 +Subproject commit 8ba7d38e7fe9d67feb4e28008f98d1f78be788df diff --git a/extensions/gamebryo-plugin-management b/extensions/gamebryo-plugin-management index 4d016e05c..bf090c58f 160000 --- a/extensions/gamebryo-plugin-management +++ b/extensions/gamebryo-plugin-management @@ -1 +1 @@ -Subproject commit 4d016e05c4b4e08548cd20411932e06df80c6797 +Subproject commit bf090c58f1b78effb59b4e19c2aac4d25d4562d2 diff --git a/extensions/gamebryo-savegame-management b/extensions/gamebryo-savegame-management index 04401ecbc..73ee7b07a 160000 --- a/extensions/gamebryo-savegame-management +++ b/extensions/gamebryo-savegame-management @@ -1 +1 @@ -Subproject commit 04401ecbc461b24028b0b3ae5c5e6a16015a1cc8 +Subproject commit 73ee7b07a5dc100f8aba2af74020c22c547bbf41 diff --git a/extensions/gamebryo-test-settings b/extensions/gamebryo-test-settings index 551bb5eab..5ed204cfc 160000 --- a/extensions/gamebryo-test-settings +++ b/extensions/gamebryo-test-settings @@ -1 +1 @@ -Subproject commit 551bb5eabfb86013ddab264e3d86d796952c98a1 +Subproject commit 5ed204cfc891d7538fe5359232c95044884d34ab diff --git a/extensions/gameinfo-steam b/extensions/gameinfo-steam index 2762c533b..af334c260 160000 --- a/extensions/gameinfo-steam +++ b/extensions/gameinfo-steam @@ -1 +1 @@ -Subproject commit 2762c533b35c517e1115d482aad5dfe220511eee +Subproject commit af334c26005817178f02ffd5902367344d9fb899 diff --git a/extensions/gamestore-gog b/extensions/gamestore-gog index 130013533..29ce6f26a 160000 --- a/extensions/gamestore-gog +++ b/extensions/gamestore-gog @@ -1 +1 @@ -Subproject commit 130013533ae7715d605b5a587bc8b68f0dc9ff0f +Subproject commit 29ce6f26a857578d9594d912c2ee5a33637c3db0 diff --git a/extensions/gamestore-origin b/extensions/gamestore-origin index e3a069ab8..4d41fbee3 160000 --- a/extensions/gamestore-origin +++ b/extensions/gamestore-origin @@ -1 +1 @@ -Subproject commit e3a069ab84ce8c174373399b29cf185c301ec067 +Subproject commit 4d41fbee30a3ed83a4ed34cd6fff459e415cd034 diff --git a/extensions/gamestore-uplay b/extensions/gamestore-uplay index a98043877..80cd5b2d9 160000 --- a/extensions/gamestore-uplay +++ b/extensions/gamestore-uplay @@ -1 +1 @@ -Subproject commit a9804387719da49b8335281836bbf1fe89f210c4 +Subproject commit 80cd5b2d9b8e8c5cb50f1b555b01b363e98cd11a diff --git a/extensions/gamestore-xbox b/extensions/gamestore-xbox index 005c3706c..c563dbfec 160000 --- a/extensions/gamestore-xbox +++ b/extensions/gamestore-xbox @@ -1 +1 @@ -Subproject commit 005c3706c5815a864687faaf0e04da72089143d7 +Subproject commit c563dbfec9ebc06a2a4fa442c73b608aab39663d diff --git a/extensions/issue-tracker b/extensions/issue-tracker index e3cbcfaf8..21080de0f 160000 --- a/extensions/issue-tracker +++ b/extensions/issue-tracker @@ -1 +1 @@ -Subproject commit e3cbcfaf8dda8c8cce1e1d0b0af567984670d7d4 +Subproject commit 21080de0f43a76fa5849a55f77748b68649e5dd0 diff --git a/extensions/meta-editor b/extensions/meta-editor index 1867864d0..8a7fa0d53 160000 --- a/extensions/meta-editor +++ b/extensions/meta-editor @@ -1 +1 @@ -Subproject commit 1867864d00f7b35ee8507d88b11dbb25cc6188bb +Subproject commit 8a7fa0d5396224e64d06225bd97b4460836aec11 diff --git a/extensions/mo-import b/extensions/mo-import index d588d663f..b180ebdcb 160000 --- a/extensions/mo-import +++ b/extensions/mo-import @@ -1 +1 @@ -Subproject commit d588d663f48c16bd97ba6e4b3c4a77c31a4a353e +Subproject commit b180ebdcba2475613271e8c765989e8ca4b0b8ba diff --git a/extensions/mod-highlight b/extensions/mod-highlight index c593322ab..a69ffdbce 160000 --- a/extensions/mod-highlight +++ b/extensions/mod-highlight @@ -1 +1 @@ -Subproject commit c593322aba20ff5b62a0fbc244fb4095f2681d43 +Subproject commit a69ffdbce2fe011af3ebd24361aa207510ae2c70 diff --git a/extensions/modtype-dazip b/extensions/modtype-dazip index 4305b26c0..4e6557573 160000 --- a/extensions/modtype-dazip +++ b/extensions/modtype-dazip @@ -1 +1 @@ -Subproject commit 4305b26c0565a50ee08fd9a29635d5470fe62262 +Subproject commit 4e655757307f2ff08358e76259ddef81835e8eb5 diff --git a/extensions/modtype-dinput b/extensions/modtype-dinput index 04c016da6..aad1d464b 160000 --- a/extensions/modtype-dinput +++ b/extensions/modtype-dinput @@ -1 +1 @@ -Subproject commit 04c016da6f67b13d279e8cadf1109466aaba42a1 +Subproject commit aad1d464bfdb4131f054674fb63c5052f4c1f77c diff --git a/extensions/modtype-harmony-patcher b/extensions/modtype-harmony-patcher index 04092355c..f390f481d 160000 --- a/extensions/modtype-harmony-patcher +++ b/extensions/modtype-harmony-patcher @@ -1 +1 @@ -Subproject commit 04092355cd22bb15a3eddee801d253d5f4e23457 +Subproject commit f390f481d125e5603ad7c1e9ae28e0a03ac0d2a5 diff --git a/extensions/modtype-umm b/extensions/modtype-umm index 6d3efdbdd..3959af5df 160000 --- a/extensions/modtype-umm +++ b/extensions/modtype-umm @@ -1 +1 @@ -Subproject commit 6d3efdbdd88cdf99e5b72bd93be44fa1e176a205 +Subproject commit 3959af5dfeb7f055cf2fe1ad7dede8dd294a9783 diff --git a/extensions/mtframework-arc-support b/extensions/mtframework-arc-support index 4eb6927a3..f2dd7779b 160000 --- a/extensions/mtframework-arc-support +++ b/extensions/mtframework-arc-support @@ -1 +1 @@ -Subproject commit 4eb6927a31d8d7682b9c66f0c099bc3ef6b850af +Subproject commit f2dd7779b3f50146318273fb08d98102055bb564 diff --git a/extensions/new-file-monitor b/extensions/new-file-monitor index 442b8408b..cede0a4db 160000 --- a/extensions/new-file-monitor +++ b/extensions/new-file-monitor @@ -1 +1 @@ -Subproject commit 442b8408bbd9b2901d27571dc4287a9838634aca +Subproject commit cede0a4dbfe2d80768557cf542ee3ffed21ce546 diff --git a/extensions/nmm-import-tool b/extensions/nmm-import-tool index 2e1102d68..cf52c24cf 160000 --- a/extensions/nmm-import-tool +++ b/extensions/nmm-import-tool @@ -1 +1 @@ -Subproject commit 2e1102d684b8e7b40a607fadd20a174ed704fdf2 +Subproject commit cf52c24cfda30c68a2b6104672a2cd2ee81c5cfd diff --git a/extensions/open-directory b/extensions/open-directory index dedf17915..ab5620080 160000 --- a/extensions/open-directory +++ b/extensions/open-directory @@ -1 +1 @@ -Subproject commit dedf179157cfb17f22743a537920ea99b7a4fdf5 +Subproject commit ab562008061456ee074fe906241275e53b2b818d diff --git a/extensions/quickbms-support b/extensions/quickbms-support index ba75e75ba..3a7b3d8b4 160000 --- a/extensions/quickbms-support +++ b/extensions/quickbms-support @@ -1 +1 @@ -Subproject commit ba75e75ba7af125ead4ace16c2c4c2d942e0e3c4 +Subproject commit 3a7b3d8b4e0d1cbdd95d1f9c37f2aa704518707b diff --git a/extensions/script-extender-error-check b/extensions/script-extender-error-check index 1c25262bc..9eecaedb8 160000 --- a/extensions/script-extender-error-check +++ b/extensions/script-extender-error-check @@ -1 +1 @@ -Subproject commit 1c25262bc555f9f29ebb89b09d62d194acec8123 +Subproject commit 9eecaedb8416eec61bec3bb711324718fadc9be5 diff --git a/extensions/test-gameversion b/extensions/test-gameversion index 0f5a676e0..223fe07ad 160000 --- a/extensions/test-gameversion +++ b/extensions/test-gameversion @@ -1 +1 @@ -Subproject commit 0f5a676e07fab11aaeb821328d38af72983ca9ec +Subproject commit 223fe07ad7ee4b93209c309ab19064352ac4adac diff --git a/extensions/theme-switcher b/extensions/theme-switcher index 7fd35c6d5..82d4bc1db 160000 --- a/extensions/theme-switcher +++ b/extensions/theme-switcher @@ -1 +1 @@ -Subproject commit 7fd35c6d5e723db15ba4def7676eddd3aede0ef7 +Subproject commit 82d4bc1db52f3fc4e88c2f03a85605a510842aaa diff --git a/package.json b/package.json index 0e4b28b0b..e9cf19f1f 100644 --- a/package.json +++ b/package.json @@ -157,6 +157,7 @@ "electron-rebuild": "^1.8.8", "enzyme": "^3.10.0", "enzyme-adapter-react-16": "^1.15.1", + "fork-ts-checker-webpack-plugin": "^4.1.3", "jest": "^24.9.0", "jest-cli": "^24.9.0", "json-loader": "^0.5.7", diff --git a/webpack.main.config.js b/webpack.main.config.js index e512743c9..c9e869b09 100644 --- a/webpack.main.config.js +++ b/webpack.main.config.js @@ -1,9 +1,21 @@ const webpack = require('webpack'); const nodeExternals = require('webpack-node-externals'); const TerserPlugin = require('terser-webpack-plugin'); +const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin'); const mode = 'production'; +const transpileOnly = (ForkTsCheckerWebpackPlugin !== undefined) + || (process.env['BUILD_QUICK_AND_DIRTY'] !== undefined); + +const plugins = [ + new webpack.DefinePlugin({ 'process.env.NODE_ENV': JSON.stringify('production') }), +]; + +if ((ForkTsCheckerWebpackPlugin !== undefined) && (process.env['BUILD_QUICK_AND_DIRTY'] === undefined)) { + plugins.push(new ForkTsCheckerWebpackPlugin()); +} + module.exports = { entry: './src/main.ts', target: 'electron-main', @@ -20,7 +32,7 @@ module.exports = { loader: 'ts-loader', exclude: /node_modules/, options: { - transpileOnly: process.env['BUILD_QUICK_AND_DIRTY'] !== undefined, + transpileOnly, compilerOptions: { sourceMap: true, inlineSourceMap: false, @@ -31,11 +43,7 @@ module.exports = { ], }, resolve: { extensions: ['.js', '.jsx', '.ts', '.tsx', '.json'] }, - plugins: [ - new webpack.DefinePlugin({ - 'process.env.NODE_ENV': JSON.stringify('production'), - }), - ], + plugins, devtool: 'source-map', optimization: { minimizer: [ diff --git a/webpack.renderer.config.js b/webpack.renderer.config.js index 6c0dda8fd..4c0ddc326 100644 --- a/webpack.renderer.config.js +++ b/webpack.renderer.config.js @@ -2,8 +2,22 @@ var webpack = require('webpack'); var nodeExternals = require('webpack-node-externals'); const TerserPlugin = require('terser-webpack-plugin') +const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin'); + const mode = 'production'; +const transpileOnly = (ForkTsCheckerWebpackPlugin !== undefined) + || (process.env['BUILD_QUICK_AND_DIRTY'] !== undefined); + +const plugins = [ + new webpack.DefinePlugin({ 'process.env.NODE_ENV': JSON.stringify('production') }), +]; + +if ((ForkTsCheckerWebpackPlugin !== undefined) && (process.env['BUILD_QUICK_AND_DIRTY'] === undefined)) { + plugins.push(new ForkTsCheckerWebpackPlugin()); +} + + module.exports = { entry: './src/renderer.tsx', target: 'electron-renderer', @@ -20,7 +34,7 @@ module.exports = { loader: 'ts-loader', exclude: /node_modules/, options: { - transpileOnly: process.env['BUILD_QUICK_AND_DIRTY'] !== undefined, + transpileOnly, compilerOptions: { sourceMap: true, inlineSourceMap: false, @@ -31,11 +45,7 @@ module.exports = { ] }, resolve: { extensions: ['.js', '.jsx', '.ts', '.tsx', '.json'] }, - plugins: [ - new webpack.DefinePlugin({ - 'process.env.NODE_ENV': JSON.stringify('production'), - }), - ], + plugins, optimization: { minimizer: [ new TerserPlugin({