use babel-preset-env instead of plugins, update istanbul plugin and f…

…ix fixtures for babel 6
michalkvasnicak · Jan 6, 2018 · 2c5cdc6 · 2c5cdc6
1 parent 26d8cc5
commit 2c5cdc6
Show file tree

Hide file tree

Showing 9 changed files with 503 additions and 362 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,13 +1,9 @@
 {
-  "presets": ["es2015"],
+  "presets": [
+    ["env", { "targets": { "node": "6.12" }}]
+  ],
   "plugins": [
-    "transform-strict-mode",
-    "transform-es2015-parameters",
-    "transform-es2015-destructuring",
-    "transform-es2015-modules-commonjs",
-    "transform-object-rest-spread",
-    "transform-es2015-spread",
-    "transform-export-extensions"
+    "transform-object-rest-spread"
   ],
   "env": {
     "test": {

diff --git a/.nycrc b/.nycrc
@@ -1,6 +1,6 @@
 {
   "require": [
-    "babel-core/register"
+    "babel-register"
   ],
   "sourceMap": false,
   "instrument": false

diff --git a/circle.yml b/circle.yml
@@ -2,7 +2,7 @@ machine:
   environment:
     PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin"
   node:
-    version: 6.1.0
+    version: 6.12.3
 
 dependencies:
   cache_directories:
@@ -15,3 +15,6 @@ dependencies:
 test:
   override:
     - yarn test
+    # test with babel 7
+    - yarn add -D babel-cli@^7.0.0-beta.3 babel-core@^7.0.0-beta.3 babel-register@^7.0.0-beta.3 babel-preset-env@^7.0.0-beta.3 @babel/core babel-plugin-transform-object-rest-spread@^7.0.0-beta.3 gulp-babel@7.0.0
+    - yarn test
diff --git a/package.json b/package.json
@@ -30,24 +30,18 @@
     "mkdirp": "^0.5.1"
   },
   "devDependencies": {
-    "babel-cli": "^6.22.2",
-    "babel-core": "^6.22.1",
+    "babel-cli": "^6.26.0",
+    "babel-core": "^6.26.0",
     "babel-eslint": "^7.1.1",
     "babel-plugin-istanbul": "^4.1.3",
-    "babel-plugin-transform-es2015-block-scoping": "^6.22.0",
-    "babel-plugin-transform-es2015-destructuring": "^6.22.0",
-    "babel-plugin-transform-es2015-modules-commonjs": "^6.22.0",
-    "babel-plugin-transform-es2015-parameters": "^6.22.0",
-    "babel-plugin-transform-es2015-spread": "^6.22.0",
-    "babel-plugin-transform-export-extensions": "^6.22.0",
-    "babel-plugin-transform-object-rest-spread": "^6.22.0",
-    "babel-plugin-transform-strict-mode": "^6.22.0",
-    "babel-preset-es2015": "^6.22.0",
+    "babel-plugin-transform-object-rest-spread": "^6.26.0",
+    "babel-preset-env": "^1.6.1",
+    "babel-register": "^6.26.0",
     "chai": "^3.4.1",
     "cross-env": "^5.0.0",
     "eslint": "^1.9.0",
     "eslint-config-airbnb-lite": "^1.0.0",
-    "gulp-babel": "^6.1.2",
+    "gulp-babel": "7.0.0",
     "gulp-util": "^3.0.7",
     "mocha": "^3.4.2",
     "nyc": "^10.3.2",

diff --git a/test/fixtures/require.expected.js b/test/fixtures/require.expected.js
@@ -1,5 +1,5 @@
 'use strict';
 
-var styles = {
+const styles = {
   'className': 'styles__className___385m0 parent__block___33Sxl child__line___3fweh'
 };
diff --git a/test/fixtures/require.ignored.expected.js b/test/fixtures/require.ignored.expected.js
@@ -1,3 +1,3 @@
 'use strict';
 
-var styles = {};
+const styles = {};
diff --git a/test/index.spec.js b/test/index.spec.js
@@ -13,15 +13,10 @@ describe('babel-plugin-css-modules-transform', () => {
 
         return babel.transformFileSync(resolve(__dirname, path), {
             babelrc: false,
+            presets: [['env', { targets: { node: '6.12'} }]],
             plugins: [
-                'transform-es2015-block-scoping',
-                'transform-strict-mode',
-                'transform-es2015-parameters',
-                'transform-es2015-destructuring',
                 'transform-object-rest-spread',
-                'transform-es2015-spread',
-                'transform-export-extensions',
-                ['../../src/index.js', configuration]
+                ['@babel/../../src/index.js', configuration]
             ]
         });
     }
@@ -34,15 +29,10 @@ describe('babel-plugin-css-modules-transform', () => {
         if (configuration && !('devMode' in configuration)) configuration.devMode = true;
 
         return gulpBabel({
+            presets: [['env', { targets: { node: '6.12'} }]],
             plugins: [
-                'transform-es2015-block-scoping',
-                'transform-strict-mode',
-                'transform-es2015-parameters',
-                'transform-es2015-destructuring',
                 'transform-object-rest-spread',
-                'transform-es2015-spread',
-                'transform-export-extensions',
-                ['../../src/index.js', configuration]
+                ['@babel/../../src/index.js', configuration]
             ]
         });
     }
@@ -308,15 +298,10 @@ describe('babel-plugin-css-modules-transform', () => {
             const babel = require('babel-core');
             const result = babel.transformFileSync(resolve(__dirname, 'fixtures/import.js'), {
                 babelrc: false,
+                presets: [['env', { targets: { node: '6.12'} }]],
                 plugins: [
-                    'transform-es2015-block-scoping',
-                    'transform-strict-mode',
-                    'transform-es2015-parameters',
-                    'transform-es2015-destructuring',
                     'transform-object-rest-spread',
-                    'transform-es2015-spread',
-                    'transform-export-extensions',
-                    '../../src/index.js'
+                    '@babel/../../src/index.js'
                 ]
             });
 

diff --git a/test/mocha.opts b/test/mocha.opts
@@ -1,2 +1,2 @@
---compilers js:babel-core/register
+--compilers js:babel-register
 test/**/*.spec.js