Merge branch 'master' into merge-master

# Conflicts: # lerna.json # packages/babel-cli/package.json # packages/babel-core/package.json # packages/babel-generator/package.json # packages/babel-helper-builder-react-jsx/package.json # packages/babel-helper-function-name/package.json # packages/babel-helper-optimise-call-expression/package.json # packages/babel-helper-replace-supers/package.json # packages/babel-helper-transform-fixture-test-runner/package.json # packages/babel-helpers/package.json # packages/babel-plugin-transform-class-properties/package.json # packages/babel-plugin-transform-es2015-block-scoping/package.json # packages/babel-plugin-transform-es2015-classes/package.json # packages/babel-plugin-transform-es2015-modules-commonjs/package.json # packages/babel-plugin-transform-es2015-modules-systemjs/package.json # packages/babel-plugin-transform-es2015-modules-umd/package.json # packages/babel-plugin-transform-es2015-parameters/package.json # packages/babel-plugin-transform-react-jsx/package.json # packages/babel-register/package.json # packages/babel-template/package.json # packages/babel-traverse/package.json # packages/babel/package.json
2017-02-14 12:46:11 +01:00
parent dde70c0a04 11cf0e0b50
commit 6c03cb0783
87 changed files with 830 additions and 256 deletions
--- a/packages/babel-plugin-transform-es2015-modules-commonjs/package.json
+++ b/packages/babel-plugin-transform-es2015-modules-commonjs/package.json
@@ -1,13 +1,13 @@
 {
  "name": "babel-plugin-transform-es2015-modules-commonjs",
-  "version": "6.22.0",
+  "version": "6.23.0",
  "description": "This plugin transforms ES2015 modules to CommonJS",
  "repository": "https://github.com/babel/babel/tree/master/packages/babel-plugin-transform-es2015-modules-commonjs",
  "license": "MIT",
  "main": "lib/index.js",
  "dependencies": {
-    "babel-types": "^6.22.0",
-    "babel-template": "^6.22.0",
+    "babel-types": "^6.23.0",
+    "babel-template": "^6.23.0",
    "babel-plugin-transform-strict-mode": "^6.22.0"
  },
  "keywords": [