chore: webpack and babel fixes

.babelrc

-{
-  "presets": [
-    "@babel/preset-env",
-    "@babel/preset-react"
-  ],
-  "plugins": [
-    "@babel/plugin-syntax-dynamic-import",
-    "@babel/plugin-syntax-import-meta",
-    "@babel/plugin-proposal-class-properties",
-    "@babel/plugin-proposal-json-strings",
-    [
-      "@babel/plugin-proposal-decorators",
-      {
-        "legacy": true
-      }
-    ],
-    "@babel/plugin-proposal-function-sent",
-    "@babel/plugin-proposal-export-namespace-from",
-    "@babel/plugin-proposal-numeric-separator",
-    "@babel/plugin-proposal-throw-expressions"
-  ]
-}

babel.config.js

+module.exports = {
+  presets: ['@babel/preset-env', '@babel/preset-react'],
+  plugins: [
+    'babel-plugin-styled-components',
+    '@babel/plugin-proposal-class-properties',
+  ],
+}

webpack/babel-includes.js

@@ -7,9 +7,9 @@ module.exports = [
   /pubsweet-[^/\\]+\/(?!node_modules)/,
   /@pubsweet\/[^/\\]+\/(?!node_modules)/,
   /xpub-[^/\\]+\/(?!node_modules)/,
-  /wax-[^/\\]+\/(?!node_modules)/,
+  // /wax-[^/\\]+\/(?!node_modules)/,
   // include other packages when this repo is mounted in a workspace
-  /components\/client\/[^/\\]+\/(?!node_modules)/,
-  /packages\/[^/\\]+\/(?!node_modules)/,
+  // /components\/client\/[^/\\]+\/(?!node_modules)/,
+  // /packages\/[^/\\]+\/(?!node_modules)/,
   /node_modules\/xpub-edit/,
 ]

webpack/common-rules.js

@@ -7,16 +7,8 @@ module.exports = [
     test: /\.js$|\.jsx$/,
     loader: 'babel-loader',
     query: {
-      presets: [
-        ['@babel/preset-env', { modules: false }],
-        '@babel/preset-react',
-      ],
-      plugins: [
-        'babel-plugin-styled-components',
-        require.resolve('react-hot-loader/babel'),
-        '@babel/plugin-proposal-class-properties',
-        // 'transform-decorators-legacy',
-      ],
+      presets: [['@babel/preset-env'], '@babel/preset-react'],
+      plugins: [require.resolve('react-hot-loader/babel')],
       env: {
         production: {
           /* bug requires mangle:false https://github.com/babel/minify/issues/556#issuecomment-339751209 */
@@ -39,39 +31,39 @@ module.exports = [
     ],
   },
   { test: /\.html$/, loader: 'html-loader' },
-  {
-    test: /\.css$|\.scss$/,
-    exclude: /\.local\.s?css$/, // Exclude local styles from global
-    loader: [
-      {
-        loader: 'style-loader',
-      },
-      {
-        loader: 'css-loader',
-      },
-    ],
-  },
-  {
-    test: /\.css$|\.scss$/,
-    include: /\.local\.s?css/, // Local styles
-    loader: [
-      {
-        loader: 'style-loader',
-      },
-      {
-        loader: MiniCssExtractPlugin.loader,
-        options: {
-          hmr: process.env.NODE_ENV === 'development',
-        },
-      },
-      {
-        loader: 'css-loader',
-        options: {
-          modules: true,
-          importLoaders: 1,
-          localIdentName: '[name]_[local]-[hash:base64:8]',
-        },
-      },
-    ],
-  },
+  // {
+  //   test: /\.css$|\.scss$/,
+  //   exclude: /\.local\.s?css$/, // Exclude local styles from global
+  //   loader: [
+  //     {
+  //       loader: 'style-loader',
+  //     },
+  //     {
+  //       loader: 'css-loader',
+  //     },
+  //   ],
+  // },
+  // {
+  //   test: /\.css$|\.scss$/,
+  //   include: /\.local\.s?css/, // Local styles
+  //   loader: [
+  //     {
+  //       loader: 'style-loader',
+  //     },
+  //     {
+  //       loader: MiniCssExtractPlugin.loader,
+  //       options: {
+  //         hmr: process.env.NODE_ENV === 'development',
+  //       },
+  //     },
+  //     {
+  //       loader: 'css-loader',
+  //       options: {
+  //         modules: true,
+  //         importLoaders: 1,
+  //         localIdentName: '[name]_[local]-[hash:base64:8]',
+  //       },
+  //     },
+  //   ],
+  // },
 ]

webpack/plugins.js

@@ -63,7 +63,7 @@ module.exports = (opts = {}) => {
     new webpack.optimize.AggressiveMergingPlugin(),
     new webpack.optimize.OccurrenceOrderPlugin(),
     new CompressionPlugin(),
-    new BundleAnalyzerPlugin(),
+    // new BundleAnalyzerPlugin(),
   )
 
   return plugins

webpack/webpack.config.js

@@ -2,6 +2,10 @@ const path = require('path')
 const fs = require('fs-extra')
 const config = require('config')
 const { pick } = require('lodash')
+
+const SpeedMeasurePlugin = require('speed-measure-webpack-plugin')
+const smp = new SpeedMeasurePlugin()
+
 const rules = require('./common-rules')
 
 const contentBase = path.resolve(__dirname, '..', '_build', 'assets')