Merge 0e3ee4d into e8bb95f

fkhadra · Aug 29, 2018 · dd0127d · dd0127d
2 parents e8bb95f + 0e3ee4d
commit dd0127d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,6 +1,12 @@
 {
     "presets": [
-        "@babel/preset-env",
+        [
+            "@babel/preset-env",
+            {
+                "modules": false,
+                "loose": true
+            }
+        ],
         "@babel/preset-react"
     ],
     "plugins": [
@@ -14,16 +20,9 @@
         "@babel/plugin-transform-spread"
     ],
     "env": {
-        "production": {
-            "presets": [
-                [
-                    "@babel/preset-env",
-                    {
-                        "modules": false,
-                        "loose": true
-                    }
-                ],
-                "@babel/preset-react"
+        "test": {
+            "plugins": [
+                "@babel/transform-modules-commonjs"
             ]
         }
     }

diff --git a/package.json b/package.json
@@ -22,8 +22,8 @@
   ],
   "scripts": {
     "start": "npm run sass && webpack-dev-server --config ./webpack.config.dev.js",
-    "test": "jest",
-    "test:coverage": "jest --coverage && cat ./coverage/lcov.info | coveralls",
+    "test": "cross-env NODE_ENV=test jest",
+    "test:coverage": "cross-env NODE_ENV=test jest --coverage && cat ./coverage/lcov.info | coveralls",
     "lint": "eslint src/",
     "lint:fix": "eslint --fix src/",
     "prettier-all": "prettier --single-quote --write 'src/**/*.js'",
@@ -63,13 +63,14 @@
     "@babel/cli": "^7.0.0",
     "@babel/core": "^7.0.0",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "@babel/plugin-transform-modules-commonjs": "^7.0.0",
     "@babel/plugin-transform-object-assign": "^7.0.0",
     "@babel/plugin-transform-spread": "^7.0.0",
     "@babel/preset-env": "^7.0.0",
     "@babel/preset-react": "^7.0.0",
     "@types/react": "^16.4.12",
     "@types/react-transition-group": "^2.0.13",
-    "babel-core": "^6.26.3",
+    "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "^9.0.0",
     "babel-jest": "^23.4.2",
     "babel-loader": "^8.0.0",

diff --git a/yarn.lock b/yarn.lock
@@ -1178,7 +1178,11 @@ babel-code-frame@^6.26.0:
     esutils "^2.0.2"
     js-tokens "^3.0.2"
 
-babel-core@^6.0.0, babel-core@^6.26.0, babel-core@^6.26.3:
+babel-core@7.0.0-bridge.0:
+  version "7.0.0-bridge.0"
+  resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece"
+
+babel-core@^6.0.0, babel-core@^6.26.0:
   version "6.26.3"
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207"
   dependencies: