Merge branch 'master' into develop

scripts/webpack/webpack.hot.js

@@ -52,14 +52,23 @@ module.exports = merge(common, {
             options: {
               cacheDirectory: true,
               babelrc: false,
-              plugins: ['syntax-dynamic-import', 'react-hot-loader/babel'],
-            },
-          },
-          {
-            loader: 'ts-loader',
-            options: {
-              transpileOnly: true,
-              experimentalWatchApi: true,
+              plugins: [
+                [require('@rtsao/plugin-proposal-class-properties'), { loose: true }],
+                'angularjs-annotate',
+                'syntax-dynamic-import', // needed for `() => import()` in routes.ts
+                'react-hot-loader/babel',
+              ],
+              presets: [
+                [
+                  '@babel/preset-env',
+                  {
+                    targets: { browsers: 'last 3 versions' },
+                    useBuiltIns: 'entry',
+                  },
+                ],
+                '@babel/preset-typescript',
+                '@babel/preset-react',
+              ],
             },
           },
         ],