Merge pull request #23 from power-assert-js/babel7

Babel7

Author: twada

README.md

@@ -81,17 +81,17 @@ HOW TO USE
 $ babel /path/to/test/some_test.js > /path/to/build/some_test.js
 ```
 
-For example, with `babel-register` module and `.babelrc` above, you can run mocha without code generation steps.
+For example, with `@babel/register` module and `.babelrc` above, you can run mocha without code generation steps.
 
 ```
-$ $(npm bin)/mocha --require babel-register test/some_test.js
+$ $(npm bin)/mocha --require @babel/register test/some_test.js
 ```
 
 
 ### via [Babel API](https://babeljs.io/docs/usage/api/)
 
 ```javascript
-var babel = require('babel-core');
+var babel = require('@babel/core');
 var jsCode = fs.readFileSync('/path/to/test/some_test.js');
 var transformed = babel.transform(jsCode, {
     presets: [...],
@@ -104,7 +104,7 @@ console.log(transformed.code);
 ### via [Babel Require Hook](https://babeljs.io/docs/usage/require/)
 
 ```javascript
-require('babel-register')({
+require('@babel/register')({
     presets: [...],
     plugins: ['babel-plugin-espower']
 });
@@ -231,10 +231,10 @@ prepare `babel_hook.js` to transform tests.
 }
 ```
 
-Run `mocha` with `--require babel-register` option. You will see the power-assert output appears.
+Run `mocha` with `--require @babel/register` option. You will see the power-assert output appears.
 
 ```
-$ $(npm bin)/mocha --require babel-register test/demo_test.js
+$ $(npm bin)/mocha --require @babel/register test/demo_test.js
 
   ES6 demo
     1) Destructuring and TemplateLiteral
@@ -328,7 +328,7 @@ You can customize configs such as assertion patterns via [.babelrc](https://babe
 You can customize configs such as assertion patterns via [Babel API](https://babeljs.io/docs/usage/api/),
 
 ```javascript
-var babel = require('babel-core');
+var babel = require('@babel/core');
 var createEspowerPlugin = require('babel-plugin-espower/create');
 var jsCode = fs.readFileSync('/path/to/test/some_test.js');
 var transformed = babel.transform(jsCode, {
@@ -351,7 +351,7 @@ or via [Require Hook](https://babeljs.io/docs/usage/require/).
 
 ```javascript
 var createEspowerPlugin = require('babel-plugin-espower/create');
-require('babel-register')({
+require('@babel/register')({
     presets: [...],
     plugins: [
         createEspowerPlugin(babel, {
@@ -393,7 +393,7 @@ Configuration options for `babel-plugin-espower`. If not passed, default options
     astWhiteList: babel.types.BUILDER_KEYS,
     sourceRoot: process.cwd(),
     path: file.opts.filename,
-    sourceMap: file.opts.inputSourceMap
+    sourceMap: file.inputMap ? file.inputMap.toObject() : false
 }
 ```
 

index.js

@@ -12,6 +12,6 @@
 
 var createEspowerPlugin = require('./create');
 
-module.exports = function (babel) {
-    return createEspowerPlugin(babel);
+module.exports = function (babel, options) {
+    return createEspowerPlugin(babel, options);
 };

lib/babel-assertion-visitor.js

@@ -4,7 +4,7 @@ var EspowerLocationDetector = require('espower-location-detector');
 var estraverse = require('estraverse');
 var cloneWithWhitelist = require('espurify').cloneWithWhitelist;
 var babylon = require('babylon');
-var babelgen = require('babel-generator');
+var babelgen = require('@babel/generator');
 var assign = require('core-js/library/fn/object/assign');
 var define = require('./define-properties');
 var toBeCaptured = require('./to-be-captured');
@@ -163,7 +163,7 @@ BabelAssertionVisitor.prototype.parseCanonicalCode = function (file, code) {
 
     function doParse(wrapper) {
         var content = wrapper ? wrapper(code) : code;
-        var output = babylon.parse(content, assign({}, file.parserOpts, {tokens: true}));
+        var output = babylon.parse(content, assign({}, file.opts.parserOpts, {tokens: true}));
         if (wrapper) {
             ast = output.program.body[0].body;
             tokens = output.tokens.slice(6, -2);

lib/babel-espower-visitor.js

@@ -37,7 +37,7 @@ BabelEspowerVisitor.prototype.enter = function (nodePath) {
             // entering assertion
             var espowerOptions = assign({
                 path: file.opts.filename, // or opts.sourceFileName?
-                sourceMap: file.opts.inputSourceMap
+                sourceMap: file.inputMap ? file.inputMap.toObject() : false
             }, this.options);
             assertionVisitor = new BabelAssertionVisitor(this.babel, matcher, espowerOptions);
             assertionVisitor.enter(nodePath);

lib/create-espower-visitor.js

@@ -7,12 +7,12 @@ var BabelEspowerVisitor = require('./babel-espower-visitor');
 module.exports = function createEspowerVisitor (babel, options) {
     return {
         visitor: {
-            Program: function (path, state) {
+            Program: function (path) {
                 var opts = assign(defaultOptions(), {
                     astWhiteList: babel.types.BUILDER_KEYS,
                     visitorKeys: babel.types.VISITOR_KEYS,
                     sourceRoot: process.cwd()
-                }, options, state.opts);
+                }, options);
                 var espowerVisitor = new BabelEspowerVisitor(babel, opts);
                 var innerVisitor = Object.keys(opts.visitorKeys).reduce(function (handlers, nodeType) {
                     handlers[nodeType] = {
@@ -25,7 +25,7 @@ module.exports = function createEspowerVisitor (babel, options) {
                     };
                     return handlers;
                 }, {});
-                path.traverse(innerVisitor, state);
+                path.traverse(innerVisitor);
             }
         }
     };

package.json

@@ -15,19 +15,19 @@
     }
   ],
   "dependencies": {
-    "babel-generator": "^6.1.0",
-    "babylon": "^6.1.0",
+    "@babel/generator": "^7.0.0-beta.34",
+    "babylon": "^7.0.0-beta.34",
     "call-matcher": "^1.0.0",
     "core-js": "^2.0.0",
     "espower-location-detector": "^1.0.0",
     "espurify": "^1.6.0",
     "estraverse": "^4.1.1"
   },
   "devDependencies": {
-    "babel-core": "^6.1.0",
-    "babel-preset-es2015": "^6.1.2",
-    "babel-preset-react": "^6.1.2",
-    "babel-preset-stage-2": "^6.1.2",
+    "@babel/core": "^7.0.0-beta.34",
+    "@babel/preset-es2015": "^7.0.0-beta.34",
+    "@babel/preset-react": "^7.0.0-beta.34",
+    "@babel/preset-stage-2": "^7.0.0-beta.34",
     "mocha": "^3.0.0"
   },
   "directories": {

test/fixtures-with-presets-test.js

@@ -1,7 +1,7 @@
 var assert = require('assert');
 var fs = require('fs');
 var path = require('path');
-var babel = require('babel-core');
+var babel = require('@babel/core');
 var assign = require('core-js/library/fn/object/assign');
 var createEspowerPlugin = require('../create');
 
@@ -13,9 +13,9 @@ function testTransform (fixtureName, extraSuffix, extraOptions) {
         var actualFilepath = path.resolve(__dirname, 'fixtures', fixtureName, 'actual' + suffix + '.js');
         var result = babel.transformFileSync(fixtureFilepath, assign({
             presets: [
-                'es2015',
-                'stage-2',
-                'react'
+                '@babel/es2015',
+                '@babel/stage-2',
+                '@babel/react'
             ],
             plugins: [
                 createEspowerPlugin(babel, {