Revert CircleCI and some webpack changes to match upstream

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 796d6cf6e51c2af37642d0d97422f3516bc663ff..ff8eb485986f0a9bba3b091eb1c6ca895b3e5249 100644 (file)
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,7 +9,6 @@ aliases:
           DB_HOST: localhost
           DB_USER: root
           RAILS_ENV: test
-          NODE_ENV: test
           PARALLEL_TEST_PROCESSORS: 4
           ALLOW_NOPAM: true
           CONTINUOUS_INTEGRATION: true
@@ -122,10 +121,7 @@ jobs:
     steps:
       - *attach_workspace
       - *install_system_dependencies
-      - run:
-          name: Precompile assets
-          command: ./bin/rails assets:precompile
-          no_output_timeout: 40m
+      - run: ./bin/rails assets:precompile
       - persist_to_workspace:
           root: ~/projects/
           paths:

diff --git a/config/webpack/tests.js b/config/webpack/tests.js
index f912445876ca725afbc21c286c2e34799591e0a7..8b56eb92f29f37294e26df6f5ab1fda96d21d39f 100644 (file)
--- a/config/webpack/tests.js
+++ b/config/webpack/tests.js
@@ -5,7 +5,4 @@ const sharedConfig = require('./shared.js');
 
 module.exports = merge(sharedConfig, {
   mode: 'development',
-  optimization: {
-    minimize: false,
-  },
 });