v3.3.12

CHANGELOG.md

@@ -11,6 +11,16 @@
 
 _Note: Gaps between patch versions are faulty/broken releases._
 
+## 3.3.12
+
+ * **Bug Fix**
+  * Don't override `MemberExpression`s with `core-js` in `selfContaiend` if a local binding exists.
+
+## 3.3.11
+
+ * **Bug Fix**
+  * Fix the require cache.
+
 ## 3.3.10
 
  * **Internal**

lib/6to5/generation/generators/jsx.js

@@ -75,6 +75,4 @@ exports.JSXClosingElement = function (node, print) {
   this.push(">");
 };
 
-exports.JSXEmptyExpression = function () {
-
-};
+exports.JSXEmptyExpression = function () {};

lib/6to5/register-cache.js

@@ -12,14 +12,6 @@ exports.save = function () {
 };
 
 exports.load = function () {
-  if (!fs.existsSync(FILENAME)) return;
-
-  try {
-    data = JSON.parse(fs.readFileSync(FILENAME));
-  } catch (err) {
-    return;
-  }
-
   process.on("exit", exports.save);
 
   var sigint = function () {
@@ -29,6 +21,14 @@ exports.load = function () {
   };
 
   process.on("SIGINT", sigint);
+
+  if (!fs.existsSync(FILENAME)) return;
+
+  try {
+    data = JSON.parse(fs.readFileSync(FILENAME));
+  } catch (err) {
+    return;
+  }
 };
 
 exports.get = function () {

lib/6to5/transformation/transformers/other/self-contained.js

@@ -30,7 +30,7 @@ var astVisitor = {
 
       if (!t.isReferenced(obj, node)) return;
 
-      if (!node.computed && coreHas(obj) && has(core[obj.name], prop.name)) {
+      if (!node.computed && coreHas(obj) && has(core[obj.name], prop.name) && !scope.getBinding(obj.name)) {
         context.skip();
         return t.prependToMemberExpression(node, file.get("coreIdentifier"));
       }
@@ -60,6 +60,10 @@ var astVisitor = {
 
 exports.optional = true;
 
+exports.manipulateOptions = function (opts) {
+  if (opts.whitelist.length) opts.whitelist.push("es6.modules");
+};
+
 exports.ast = {
   enter: function (ast, file) {
     file.setDynamic("runtimeIdentifier", function () {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "6to5",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "3.3.10",
+  "version": "3.3.12",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://6to5.org/",
   "repository": "6to5/6to5",

packages/6to5-runtime/package.json

@@ -1,7 +1,7 @@
 {
   "name": "6to5-runtime",
   "description": "6to5 selfContained runtime",
-  "version": "3.3.9",
+  "version": "3.3.11",
   "repository": "6to5/6to5",
   "author": "Sebastian McKenzie <sebmck@gmail.com>"
 }