Skip to content

Commit 2c5cdc6

Browse files
use babel-preset-env instead of plugins, update istanbul plugin and fix fixtures for babel 6
1 parent 26d8cc5 commit 2c5cdc6

9 files changed

+503
-362
lines changed

.babelrc

+4-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
{
2-
"presets": ["es2015"],
2+
"presets": [
3+
["env", { "targets": { "node": "6.12" }}]
4+
],
35
"plugins": [
4-
"transform-strict-mode",
5-
"transform-es2015-parameters",
6-
"transform-es2015-destructuring",
7-
"transform-es2015-modules-commonjs",
8-
"transform-object-rest-spread",
9-
"transform-es2015-spread",
10-
"transform-export-extensions"
6+
"transform-object-rest-spread"
117
],
128
"env": {
139
"test": {

.nycrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"require": [
3-
"babel-core/register"
3+
"babel-register"
44
],
55
"sourceMap": false,
66
"instrument": false

circle.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ machine:
22
environment:
33
PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin"
44
node:
5-
version: 6.1.0
5+
version: 6.12.3
66

77
dependencies:
88
cache_directories:
@@ -15,3 +15,6 @@ dependencies:
1515
test:
1616
override:
1717
- yarn test
18+
# test with babel 7
19+
- 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
20+
- yarn test

package.json

+6-12
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,18 @@
3030
"mkdirp": "^0.5.1"
3131
},
3232
"devDependencies": {
33-
"babel-cli": "^6.22.2",
34-
"babel-core": "^6.22.1",
33+
"babel-cli": "^6.26.0",
34+
"babel-core": "^6.26.0",
3535
"babel-eslint": "^7.1.1",
3636
"babel-plugin-istanbul": "^4.1.3",
37-
"babel-plugin-transform-es2015-block-scoping": "^6.22.0",
38-
"babel-plugin-transform-es2015-destructuring": "^6.22.0",
39-
"babel-plugin-transform-es2015-modules-commonjs": "^6.22.0",
40-
"babel-plugin-transform-es2015-parameters": "^6.22.0",
41-
"babel-plugin-transform-es2015-spread": "^6.22.0",
42-
"babel-plugin-transform-export-extensions": "^6.22.0",
43-
"babel-plugin-transform-object-rest-spread": "^6.22.0",
44-
"babel-plugin-transform-strict-mode": "^6.22.0",
45-
"babel-preset-es2015": "^6.22.0",
37+
"babel-plugin-transform-object-rest-spread": "^6.26.0",
38+
"babel-preset-env": "^1.6.1",
39+
"babel-register": "^6.26.0",
4640
"chai": "^3.4.1",
4741
"cross-env": "^5.0.0",
4842
"eslint": "^1.9.0",
4943
"eslint-config-airbnb-lite": "^1.0.0",
50-
"gulp-babel": "^6.1.2",
44+
"gulp-babel": "7.0.0",
5145
"gulp-util": "^3.0.7",
5246
"mocha": "^3.4.2",
5347
"nyc": "^10.3.2",

test/fixtures/require.expected.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

3-
var styles = {
3+
const styles = {
44
'className': 'styles__className___385m0 parent__block___33Sxl child__line___3fweh'
55
};
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
'use strict';
22

3-
var styles = {};
3+
const styles = {};

test/index.spec.js

+6-21
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,10 @@ describe('babel-plugin-css-modules-transform', () => {
1313

1414
return babel.transformFileSync(resolve(__dirname, path), {
1515
babelrc: false,
16+
presets: [['env', { targets: { node: '6.12'} }]],
1617
plugins: [
17-
'transform-es2015-block-scoping',
18-
'transform-strict-mode',
19-
'transform-es2015-parameters',
20-
'transform-es2015-destructuring',
2118
'transform-object-rest-spread',
22-
'transform-es2015-spread',
23-
'transform-export-extensions',
24-
['../../src/index.js', configuration]
19+
['@babel/../../src/index.js', configuration]
2520
]
2621
});
2722
}
@@ -34,15 +29,10 @@ describe('babel-plugin-css-modules-transform', () => {
3429
if (configuration && !('devMode' in configuration)) configuration.devMode = true;
3530

3631
return gulpBabel({
32+
presets: [['env', { targets: { node: '6.12'} }]],
3733
plugins: [
38-
'transform-es2015-block-scoping',
39-
'transform-strict-mode',
40-
'transform-es2015-parameters',
41-
'transform-es2015-destructuring',
4234
'transform-object-rest-spread',
43-
'transform-es2015-spread',
44-
'transform-export-extensions',
45-
['../../src/index.js', configuration]
35+
['@babel/../../src/index.js', configuration]
4636
]
4737
});
4838
}
@@ -308,15 +298,10 @@ describe('babel-plugin-css-modules-transform', () => {
308298
const babel = require('babel-core');
309299
const result = babel.transformFileSync(resolve(__dirname, 'fixtures/import.js'), {
310300
babelrc: false,
301+
presets: [['env', { targets: { node: '6.12'} }]],
311302
plugins: [
312-
'transform-es2015-block-scoping',
313-
'transform-strict-mode',
314-
'transform-es2015-parameters',
315-
'transform-es2015-destructuring',
316303
'transform-object-rest-spread',
317-
'transform-es2015-spread',
318-
'transform-export-extensions',
319-
'../../src/index.js'
304+
'@babel/../../src/index.js'
320305
]
321306
});
322307

test/mocha.opts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
--compilers js:babel-core/register
1+
--compilers js:babel-register
22
test/**/*.spec.js

0 commit comments

Comments
 (0)