v5.6.13

.travis.yml

@@ -12,3 +12,19 @@ script: "make test-travis"
 
 notifications:
   slack: babeljs:5Wy4QX13KVkGy9CnU0rmvgeK
+
+before_deploy:
+ - make prepublish
+
+after_deploy:
+ - make publish-cli
+ - make publish-runtime
+
+deploy:
+  provider: npm
+  email: sebmck@gmail.com
+  api_key:
+    secure: BCS0BJ3gjs/fyAj5GrMIj4ZAs/S3Odr/FaCAGo8+mT1+Ayinq5uQb8n07k+TqLRQC+Bm1nkjUGg97UZwBmE6NkkNA9rJkC4HCzuXkwOUmE1MxActB2Jeo1tbl3VbbcMNVBo8oTckh1oBaXN2ZbvvPaQIXMAC+0oZwaeXT5dTzQc=
+  on:
+    tags: true
+    repo: babel/babel

CHANGELOG.md

@@ -13,6 +13,11 @@ _Note: Gaps between patch versions are faulty/broken releases._
 
 See [CHANGELOG - 6to5](CHANGELOG-6to5.md) for the pre-4.0.0 version changelog.
 
+## 5.6.12
+
+ * **Bug Fix**
+  * Fix finding parent for top-level shadowed functions.
+
 ## 5.6.11
 
  ** **Internal**

Makefile

@@ -9,7 +9,7 @@ BROWSERIFY_IGNORE = -i esprima-fb
 
 export NODE_ENV = test
 
-.PHONY: clean test test-cov test-clean test-travis test-simple test-all test-browser test-parser publish build bootstrap publish-core publish-runtime build-core watch-core build-core-test clean-core
+.PHONY: clean test test-cov test-clean test-travis test-simple test-all test-browser test-parser publish build bootstrap publish-core publish-runtime build-core watch-core build-core-test clean-core prepublish
 
 build-core: clean-core
 	node $(BABEL_CMD) src --out-dir lib --copy-files
@@ -81,34 +81,20 @@ test-browser:
 
 publish: lint
 	git pull --rebase
-
 	make test
-
 	read -p "Version: " version; \
 	npm version $$version --message "v%s"
-
-	make build
-
-	cp dist/browser.js browser.js
-	cp dist/browser.min.js browser.min.js
-
-	cp dist/polyfill.js browser-polyfill.js
-	cp dist/polyfill.min.js browser-polyfill.min.js
-
-	cp dist/external-helpers.js external-helpers.js
-	cp dist/external-helpers.min.js external-helpers.min.js
-
-	node tools/cache-templates
-	test -f templates.json
-
-	npm publish
-
 	git push --follow-tags
 
-	make publish-cli
-	make publish-runtime
-
-	rm -rf templates.json browser.js browser.min.js browser-polyfill.js browser-polyfill.min.js external-helpers.js external-helpers.min.js
+prepublish: build
+	cp dist/browser.js browser.js
+	cp dist/browser.min.js browser.min.js
+	cp dist/polyfill.js browser-polyfill.js
+	cp dist/polyfill.min.js browser-polyfill.min.js
+	cp dist/external-helpers.js external-helpers.js
+	cp dist/external-helpers.min.js external-helpers.min.js
+	node tools/cache-templates
+	test -f templates.json
 
 publish-runtime:
 	cd packages; \

README.md

@@ -9,11 +9,17 @@
 </p>
 
 <p align="center">
-  For questions and support please visit the <a href="https://babel-slack.herokuapp.com">slack channel</a> or <a href="http://stackoverflow.com/questions/tagged/babeljs">StackOverflow</a>. The Babel issue tracker is <strong>exclusively</strong> for bug reports and feature requests.
+  <a href="https://travis-ci.org/babel/babel"><img alt="Build Status" src="https://img.shields.io/travis/babel/babel.svg?style=flat"></a>
+  <a href="http://issuestats.com/github/babel/babel"><img alt="Issue Stats" src="http://issuestats.com/github/babel/babel/badge/pr?style=flat"></a>
+  <a href="http://issuestats.com/github/babel/babel"><img alt="Issue Stats" src="http://issuestats.com/github/babel/babel/badge/issue?style=flat"></a>
+  <a href="http://badge.fury.io/js/babel-core"><img alt="npm version" src="https://badge.fury.io/js/babel-core.svg"></a>
+  <a href="https://npmjs.org/package/babel-core"><img alt="Downloads" src="http://img.shields.io/npm/dm/babel-core.svg"></a>
 </p>
 
+----
+
 <p align="center">
-  Issues without instructions to reproduce <strong>will be immediately closed<strong>.
+  For questions and support please visit the <a href="https://babel-slack.herokuapp.com">slack channel</a> or <a href="http://stackoverflow.com/questions/tagged/babeljs">StackOverflow</a>. The Babel issue tracker is <strong>exclusively</strong> for bug reports and feature requests.
 </p>
 
 <p align="center">

package.json

@@ -1,7 +1,7 @@
 {
   "name": "babel-core",
   "description": "A compiler for writing next generation JavaScript",
-  "version": "5.6.11",
+  "version": "5.6.13",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
   "license": "MIT",

packages/babel-cli/package.json

@@ -1,14 +1,13 @@
 {
   "name": "babel",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "5.6.10",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
   "license": "MIT",
   "repository": "babel/babel",
   "preferGlobal": true,
   "dependencies": {
-    "babel-core": "^5.6.10",
+    "babel-core": "^5.6.12",
     "chokidar": "^1.0.0",
     "commander": "^2.6.0",
     "convert-source-map": "^1.1.0",
@@ -27,4 +26,4 @@
     "babel-external-helpers": "./bin/babel-external-helpers",
     "babel-plugin": "./bin/babel-plugin/index.js"
   }
-}
+}

packages/babel-runtime/package.json

@@ -1,11 +1,10 @@
 {
   "name": "babel-runtime",
   "description": "babel selfContained runtime",
-  "version": "5.6.10",
   "license": "MIT",
   "repository": "babel/babel",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "dependencies": {
     "core-js": "^0.9.0"
   }
-}
+}

src/babel/transformation/transformers/internal/shadow-functions.js

@@ -8,27 +8,26 @@ function remap(path, key, create) {
   // ensure that we're shadowed
   if (!path.inShadow()) return;
 
-  var shadowed = path.node._shadowedFunctionLiteral;
+  var shadowFunction = path.node._shadowedFunctionLiteral;
   var currentFunction;
 
   var fnPath = path.findParent(function (path) {
-    if (shadowed) {
-      // only match our shadowed function parent
-      if (path === shadowed) {
-        // found our target reference function
-        currentFunction = path;
-        return true;
-      } else {
-        return false;
-      }
-    } else if (path.isFunction() || path.isProgram()) {
-      // catch current function in case this is the shadowed one
-      if (!currentFunction) currentFunction = path;
-
-      return !path.is("shadow");
-    } else {
-      return false;
+    if (path.isProgram() || path.isFunction()) {
+      // catch current function in case this is the shadowed one and we can ignore it
+      currentFunction = currentFunction || path;
     }
+
+    if (path.isProgram()) {
+      return true;
+    } else if (path.isFunction()) {
+      if (shadowFunction) {
+        return path === shadowFunction || path.node === shadowFunction.node;
+      } else {
+        return !path.is("shadow");
+      }
+    }
+
+    return false;
   });
 
   // no point in realiasing if we're in this function