chore: migrate to babel-preset-env (trivago#50)

ayusharma · Aug 16, 2018 · 7b207df · 7b207df
1 parent 06fb3b4
commit 7b207df
Show file tree

Hide file tree

Showing 6 changed files with 215 additions and 231 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,24 +1,50 @@
 {
     "plugins": [
         "transform-flow-strip-types",
+        "transform-object-rest-spread",
         "lodash"
     ],
     "env": {
         "development": {
-            "presets": [["es2015", {modules: false, loose: true}], "stage-1", "react"],
+            "presets": [
+                [
+                    "env",
+                    {
+                        "modules": false,
+                        "loose": true
+                    }
+                ],
+                "react"
+            ]
         },
         "production": {
-            "presets": [["es2015", {modules: false, loose: true}], "stage-1", "react"],
+            "presets": [
+                [
+                    "env",
+                    {
+                        "modules": false,
+                        "loose": true
+                    }
+                ],
+                "react"
+            ],
             "plugins": ["transform-inline-environment-variables"]
         },
         "release": {
-            "presets": [["es2015", {modules: false, loose: true}], "stage-1", "react"],
+            "presets": [
+                [
+                    "env",
+                    {
+                        "modules": false,
+                        "loose": true
+                    }
+                ],
+                "react"
+            ]
         },
         "test": {
-            "presets": ["node6", "stage-1"],
-            "plugins": [
-                "transform-inline-environment-variables"
-            ]
+            "presets": ["env"],
+            "plugins": ["transform-inline-environment-variables"]
         }
     }
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 - Added PR template
 - Fix rollup config to generate esm properly [#42](https://github.com/trivago/melody/pull/42)
 - Added `testURL` in Jest config. [#49](https://github.com/trivago/melody/pull/49)
+- Migation to `babel-preset-env`. [#50](https://github.com/trivago/melody/issues/50)
 
 ## 1.1.0
 

diff --git a/package.json b/package.json
@@ -35,19 +35,18 @@
         "@types/lodash": "^4.14.54",
         "@types/node": "^7.0.7",
         "babel-cli": "^6.23.0",
+        "babel-core": "^6.26.3",
         "babel-eslint": "^7.1.1",
         "babel-jest": "^22.0.6",
+        "babel-plugin-external-helpers": "^6.22.0",
         "babel-plugin-lodash": "^3.2.11",
         "babel-plugin-transform-flow-strip-types": "^6.22.0",
         "babel-plugin-transform-inline-environment-variables": "^6.8.0",
+        "babel-plugin-transform-object-rest-spread": "^6.26.0",
         "babel-plugin-transform-runtime": "^6.23.0",
         "babel-polyfill": "^6.16.0",
-        "babel-preset-es2015": "^6.22.0",
-        "babel-preset-es2015-loose": "8.0.0",
-        "babel-preset-es2015-minimal-rollup": "^2.1.1",
-        "babel-preset-node6": "^11.0.0",
+        "babel-preset-env": "^1.7.0",
         "babel-preset-react": "^6.23.0",
-        "babel-preset-stage-1": "^6.22.0",
         "babel-register": "^6.23.0",
         "bundlesize": "^0.13.2",
         "chai": "^3.0.0",
@@ -71,9 +70,9 @@
         "redux-thunk": "^2.2.0",
         "rimraf": "^2.6.1",
         "rollup": "^0.63.5",
-        "rollup-plugin-babel": "^2.7.1",
-        "rollup-plugin-json": "^2.1.0",
-        "rollup-plugin-uglify": "^2.0.1",
+        "rollup-plugin-babel": "^3.0.7",
+        "rollup-plugin-json": "^3.0.0",
+        "rollup-plugin-uglify": "^4.0.0",
         "sinon": "^1.17.7",
         "sinon-chai": "^2.8.0",
         "source-map": "^0.5.6",

diff --git a/packages/melody-jest-transform/__tests__/customTransformSpec.js b/packages/melody-jest-transform/__tests__/customTransformSpec.js
@@ -24,7 +24,16 @@ jest.mock('find-babel-config', () => ({
         config: {
             env: {
                 test: {
-                    presets: ['node6', 'stage-1'],
+                    presets: [
+                        [
+                            'env',
+                            {
+                                targets: {
+                                    node: '6',
+                                },
+                            },
+                        ],
+                    ],
                     plugins: ['transform-inline-environment-variables'],
                 },
             },
@@ -67,7 +76,16 @@ describe('Custom transformer', () => {
         const babel = {
             env: {
                 test: {
-                    presets: ['node6', 'stage-1'],
+                    presets: [
+                        [
+                            'env',
+                            {
+                                targets: {
+                                    node: '6',
+                                },
+                            },
+                        ],
+                    ],
                     plugins: ['transform-inline-environment-variables'],
                 },
             },

diff --git a/rollup.config.js b/rollup.config.js
@@ -18,7 +18,13 @@ const config = {
             format: 'cjs',
         },
     ],
-    plugins: [json(), babel()],
+    plugins: [
+        json(),
+        babel({
+            exclude: 'node_modules/**',
+            plugins: ['external-helpers'],
+        }),
+    ],
     external: [
         ...Object.keys(pkgJSON.dependencies || {}),
         ...Object.keys(pkgJSON.peerDependencies || {}),