v2.9.0

Add --indent option to change indent width

.gitignore

@@ -10,3 +10,4 @@ test/tmp
 /runtime.js
 coverage
 dist
+.package.json

.gitmodules

@@ -4,3 +4,6 @@
 [submodule "vendor/regenerator"]
 	path = vendor/regenerator
 	url = https://github.com/facebook/regenerator
+[submodule "vendor/test262"]
+	path = vendor/test262
+	url = https://github.com/tc39/test262

.npmignore

@@ -9,3 +9,4 @@ Makefile
 dist
 tests.json
 CHANGELOG.md
+.package.json

CHANGELOG.md

@@ -11,6 +11,49 @@
 
 _Note: Gaps between patch versions are faulty/broken releases._
 
+## 2.9.0
+
+ * **Internal**
+  * Upgrade `acorn-6to5`.
+    * Now supports destructuring shorthand properties.
+
+## 2.8.1
+
+ * **Bug Fix**
+  * Fix computed accessors on object literals.
+
+## 2.8.0
+
+ * **New Feature**
+  * Add `commonStrict`, `amdStrict` and `umdStrict` module formatters that remove `module.exports` interop assignment.
+  * Add `--indent` option to the 6to5 CLI.
+
+## 2.7.4
+
+ * **Polish**
+  * Inherit assignments from their declaration in destructuring.
+  * Properly align multi-declarator variable declarations.
+
+## 2.7.3
+
+ * **Polish**
+  * Indent and add newlines to `React.createElement` calls in `react` transformer.
+  * Remove `Object.assign` calls and replace it with an `extends` helper.
+
+## 2.7.1
+
+ * **New Feature**
+  * Expose `version` on browser and node API.
+ * **Internal**
+  * Upgrade `core-js` to 0.4.1
+
+## 2.7.0
+
+ * **Spec Compliancy**
+  * Disallow reassignments of imports.
+ * **New Feature**
+  * `reactCompat` option to enable pre-v0.12 react components.
+
 ## 2.6.3
 
  * **Bug Fix**

Makefile

@@ -6,7 +6,7 @@ MOCHA_CMD = node_modules/mocha/bin/_mocha
 
 export NODE_ENV = test
 
-.PHONY: clean test test-cov test-clean lint test-travis test-spec test-browser publish bench build bootstrap
+.PHONY: clean test test-cov test-clean lint test-travis test-simple test-all test-browser publish build bootstrap publish-core
 
 build:
 	mkdir -p dist
@@ -27,12 +27,8 @@ build:
 clean:
 	rm -rf coverage templates.json test/tmp dist
 
-bench:
-	npm install es6-transpiler traceur esnext es6now jstransform
-	node node_modules/matcha/bin/_matcha
-
 lint:
-	$(JSHINT_CMD) --reporter node_modules/jshint-stylish/stylish.js lib bin benchmark/index.js
+	$(JSHINT_CMD) --reporter node_modules/jshint-stylish/stylish.js lib bin
 
 test-clean:
 	rm -rf test/tmp
@@ -41,14 +37,23 @@ test: lint
 	$(MOCHA_CMD)
 	make test-clean
 
+test-simple:
+	# excludes test262
+	export SIMPLE_6TO5_TESTS=1
+	make test
+
+test-all:
+	# includes traceur, esnext, regenerator
+	export ALL_6TO5_TESTS=1
+	make test
+
 test-cov:
+	export SIMPLE_6TO5_TESTS=1
 	rm -rf coverage
 	node $(ISTANBUL_CMD) $(MOCHA_CMD) --
 
-test-spec:
-	node $(ISTANBUL_CMD) $(MOCHA_CMD) -- --reporter spec
-
-test-travis: test-spec
+test-travis: bootstrap
+	node $(ISTANBUL_CMD) $(MOCHA_CMD) --
 	if test -n "$$CODECLIMATE_REPO_TOKEN"; then codeclimate < coverage/lcov.info; fi
 
 test-browser:
@@ -80,6 +85,17 @@ publish:
 
 	git push --follow-tags
 
+	# generate
+	bin/generate-core-package-json >package2.json
+	mv package.json .package.json
+	mv package2.json package.json
+
+	npm publish
+
+	# restore
+	rm -rf package.json
+	mv .package.json package.json
+
 	rm -rf templates.json browser.js runtime.js browser-polyfill.js
 
 bootstrap:

NOTES.md

@@ -1,8 +1,9 @@
 # Notes
 
- * Wildcard exports/imports wont normalise if `export default` is a non-object.
+ * Wildcard exports/imports wont normalise if `export default` is a non-object. See [#224](https://github.com/6to5/6to5/issues/224).
 
 ## 3.0.0 breaking changes
 
  * Remove `allowImportExportEverywhere` option from acorn.
  * Remove this shorthand from playground.
+ * Remove `super()` inside non-constructors - add descriptive error message.

benchmark/fixtures/all.js

@@ -1,99 +0,0 @@
-var arr = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
-var obj = {};
-var foo = "foo";
-var bar = "bar";
-
-// constants
-const MULTIPLIER = 5;
-
-// classes
-class Foo {
-  constructor() {
-    this.foo = "bar";
-  }
-}
-
-class Bar extends Foo {
-  constructor() {
-    super();
-  }
-
-  // default parameters
-  go(foo = "bar", bar = "foo") {
-
-  }
-
-  // not supported by jstransform
-  //get foo() {
-  //  return this._foo;
-  //}
-  //set foo(val) {
-  //  this._foo = val + " foo!";
-  //}
-}
-
-// arrow functions
-arr.map(x => x * x);
-
-// block binding
-for (let key in arr) {
-  let val = arr[key];
-  console.log(key, val);
-}
-
-// computed property names
-obj = {
-  ["foo" + bar]: "foobar"
-};
-
-// destructuring
-var [a, [b], c, d] = ["hello", [", ", "junk"], ["world"]];
-console.log(a + b + c);
-
-// array comprehension
-// [for (i of [1, 2, 3]) i * i]; // not supported by es6now
-
-// for-of
-for (var i of [1, 2, 3]) {
-  console.log(i * i);
-}
-
-// property method assignment
-obj = {
-  foo() {
-    return "foobar";
-  },
-
-  get bar() {
-    return this._bar;
-  },
-
-  set bar(val) {
-    this._bar = val;
-  }
-};
-
-// property name shorthand
-function f(x, y) {
-  return { x, y };
-}
-
-// rest parameters
-function printList(name, ...items) {
-  console.log("list %s has the following items", name);
-  items.forEach(function (item) {
-    console.log(item);
-  });
-}
-
-// spread
-function add(x, y) {
-  return x + y;
-}
-var numbers = [5, 10];
-add(...numbers);
-
-// template literals
-var x = 5;
-var y = 10;
-console.log(`${x} + ${y} = ${x + y}`);

benchmark/index.js

@@ -1,168 +0,0 @@
-Error.stackTraceLimit = Infinity;
-
-var jsTrans = require("jstransform");
-var traceur = require("traceur");
-//var es6tr   = require("es6-transpiler");
-var es6now  = require("es6now");
-//var esnext  = require("esnext");
-var to5     = require("../lib/6to5");
-
-//var uglify  = require("uglify-js");
-var matcha  = require("matcha");
-var path    = require("path");
-var fs      = require("fs");
-var _       = require("lodash");
-
-var readResolve = function (filename) {
-  try {
-    filename = require.resolve(filename);
-  } catch (err) {
-    return null;
-  }
-  return fs.readFileSync(filename, "utf8");
-};
-
-var getVersion = function (name) {
-  return require(name + "/package.json").version;
-};
-
-var jsTransVisitors = [];
-
-_.each([
-  "arrow-function-visitors", "class-visitors", "destructuring-visitors",
-  "object-concise-method-visitors", "object-short-notation-visitors",
-  "rest-param-visitors", "template-visitors"
-], function (name) {
-  var mod = require("jstransform/visitors/es6-" + name);
-  jsTransVisitors = jsTransVisitors.concat(mod.visitorList);
-});
-
-
-var compilers = {
-  "6to5": {
-    version: getVersion(".."),
-    compile: function (code, filename) {
-      return to5.transform(code, { filename: filename }).code;
-    }
-  },
-
-  traceur: {
-    runtime: readResolve("traceur/bin/traceur-runtime.js"),
-    compile: function (code) {
-      return traceur.compile(code, {
-        modules: "commonjs",
-        experimental: true
-      });
-    }
-  },
-
-  /*esnext: {
-    runtime: readResolve("esnext/node_modules/regenerator/runtime.js") || readResolve("regenerator/runtime.js"),
-    compile: function (code) {
-      return esnext.compile(code).code;
-    }
-  },*/
-
-  es6now: {
-    runtime: readResolve("es6now/runtime/ES6.js"),
-    compile: function (code) {
-      return es6now.translate(code);
-    }
-  },
-
-  /*"es6-transpiler": {
-    compile: function (code) {
-      var result = es6tr.run({ src: code });
-      if (result.errors.length) throw new Error(result.join("; "));
-      return result.src;
-    }
-  },*/
-
-  jstransform: {
-    compile: function (code) {
-      return jsTrans.transform(jsTransVisitors, code).code;
-    }
-  }
-};
-
-// versions
-
-//var uglifyTitle = "uglify v" + getVersion("uglify-js");
-
-_.each(compilers, function (compiler, name) {
-  compiler.title = name + " v" + (compiler.version || getVersion(name));
-});
-
-//
-
-var sizeBenchmark = function (code, loc, name, compiler) {
-  var log = function (output, title) {
-    title = [compiler.title].concat(title || []).join(" + ");
-
-    var text;
-    var color;
-    if (output.stack) {
-      text = "error";
-      color = "red";
-    } else {
-      var kilo  = (output.length / 1024).toFixed(2);
-      text = kilo + "KB";
-      color = "cyan";
-    }
-
-    text = matcha.utils.color(matcha.utils.padBefore(text, 22), color);
-
-    console.log(text, matcha.utils.color("» " + title, "gray"));
-
-    if (output.stack) {
-      console.error(output.stack);
-    }
-  };
-
-  var go = function (getOutput, title) {
-    var code;
-    try {
-      code = getOutput();
-    } catch (err) {
-      log(err, title);
-      return;
-    }
-
-    log(code, title);
-  };
-
-  var output;
-  go(function () {
-    return output = compiler.compile(code, loc);
-  });
-  if (!output) return;
-
-  //go(function () {
-  //  return uglify.minify(output, { fromString: true }).code;
-  //}, uglifyTitle);
-};
-
-//
-
-_.each(fs.readdirSync(__dirname + "/fixtures"), function (name) {
-  var alias = path.basename(name, path.extname(name));
-
-  suite(alias, function () {
-    set("delay", 0);
-
-    var loc  = __dirname + "/fixtures/" + name;
-    var code = fs.readFileSync(loc, "utf8");
-
-    before(function () {
-      _.each(compilers, function (compiler, name) {
-        sizeBenchmark(code, loc, name, compiler);
-      });
-    });
-
-    _.each(compilers, function (compiler) {
-      bench(compiler.title, function () {
-        compiler.compile(code, loc);
-      });
-    });
-  });
-});

bin/6to5/index.js

@@ -21,6 +21,7 @@ commander.option("-i, --optional [list]", "List of optional transformers to enab
 commander.option("-o, --out-file [out]", "Compile all input files into a single file");
 commander.option("-d, --out-dir [out]", "Compile an input directory of modules into an output directory");
 commander.option("-c, --remove-comments", "Remove comments from the compiled code", false);
+commander.option("-I, --indent [width]", "Indent width [2]", 2);
 commander.option("-a, --amd-module-ids", "Insert module id in AMD modules", false); // todo: remove in 3.0.0
 commander.option("-m, --module-ids", "Insert module id in modules", false);
 
@@ -108,7 +109,12 @@ exports.opts = {
   optional:      commander.optional,
   comments:      !commander.removeComments,
   runtime:       commander.runtime,
-  modules:       commander.modules
+  modules:       commander.modules,
+  format: {
+    indent: {
+      style:     util.repeat(parseInt(commander.indent))
+    }
+  }
 };
 
 var fn;

bin/generate-core-package-json

@@ -0,0 +1,11 @@
+#!/usr/bin/env node
+
+var pkg = require("../package.json");
+pkg.name += "-core";
+delete pkg.dependencies.chokidar;
+delete pkg.optionalDependencies;
+delete pkg.devDependencies;
+delete pkg.preferGlobal;
+delete pkg.scripts;
+delete pkg.bin;
+console.log(JSON.stringify(pkg, null, "  "));

lib/6to5/browser.js

@@ -1,5 +1,7 @@
 var transform = module.exports = require("./transformation/transform");
 
+transform.version = require("../../package").version;
+
 transform.transform = transform;
 
 transform.run = function (code, opts) {

lib/6to5/file.js

@@ -35,7 +35,8 @@ File.helpers = [
   "async-to-generator",
   "interop-require-wildcard",
   "typeof",
-  "exports-wildcard"
+  "exports-wildcard",
+  "extends"
 ];
 
 File.excludeHelpersFromRuntime = [
@@ -48,6 +49,7 @@ File.normaliseOptions = function (opts) {
 
   _.defaults(opts, {
     experimental: false,
+    reactCompat:  false,
     playground:   false,
     whitespace:   true,
     moduleIds:    opts.amdModuleIds || false,

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

@@ -57,8 +57,28 @@ exports.ThisExpression = function () {
 
 exports.CallExpression = function (node, print) {
   print(node.callee);
+
   this.push("(");
-  print.join(node.arguments, { separator: ", " });
+
+  var separator = ",";
+
+  if (node._prettyCall) {
+    separator += "\n";
+    this.newline();
+    this.indent();
+  } else {
+    separator += " ";
+  }
+
+  print.join(node.arguments, {
+    separator: separator
+  });
+
+  if (node._prettyCall) {
+    this.newline();
+    this.dedent();
+  }
+
   this.push(")");
 };
 

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

@@ -1,4 +1,5 @@
-var t = require("../../types");
+var util = require("../../util");
+var t    = require("../../types");
 
 exports.WithStatement = function (node, print) {
   this.keyword("with");
@@ -157,7 +158,24 @@ exports.DebuggerStatement = function () {
 exports.VariableDeclaration = function (node, print, parent) {
   this.push(node.kind + " ");
 
-  print.join(node.declarations, { separator: ", " });
+  var inits = 0;
+  var noInits = 0;
+  for (var i in node.declarations) {
+    if (node.declarations[i].init) {
+      inits++;
+    } else {
+      noInits++;
+    }
+  }
+
+  var sep = ",";
+  if (inits > noInits) { // more inits than noinits
+    sep += "\n" + util.repeat(node.kind.length + 1);
+  } else {
+    sep += " ";
+  }
+
+  print.join(node.declarations, { separator: sep });
 
   if (!t.isFor(parent)) {
     this.semicolon();

lib/6to5/index.js

@@ -3,6 +3,8 @@ var util      = require("./util");
 var fs        = require("fs");
 var _         = require("lodash");
 
+exports.version = require("../../package").version;
+
 exports.types = require("./types");
 
 exports.runtime = require("./runtime-generator");

lib/6to5/transformation/modules/_default.js

@@ -9,7 +9,11 @@ function DefaultFormatter(file) {
   this.file = file;
 
   this.localExports = this.getLocalExports();
+  this.localImports = this.getLocalImports();
+
   this.remapAssignments();
+
+  //this.checkCollisions();
 }
 
 DefaultFormatter.prototype.getLocalExports = function () {
@@ -27,6 +31,53 @@ DefaultFormatter.prototype.getLocalExports = function () {
   return localExports;
 };
 
+DefaultFormatter.prototype.getLocalImports = function () {
+  var localImports = {};
+
+  traverse(this.file.ast, {
+    enter: function (node) {
+      if (t.isImportDeclaration(node)) {
+        _.extend(localImports, t.getIds(node, true));
+      }
+    }
+  });
+
+  return localImports;
+};
+
+DefaultFormatter.prototype.checkCollisions = function () {
+  // todo: all check export collissions
+
+  var localImports = this.localImports;
+  var file = this.file;
+
+  var isLocalReference = function (node) {
+    return t.isIdentifier(node) && _.has(localImports, node.name) && localImports[node.name] !== node;
+  };
+
+  var check = function (node) {
+    if (isLocalReference(node)) {
+      throw file.errorWithNode(node, "Illegal assignment of module import");
+    }
+  };
+
+  traverse(file.ast, {
+    enter: function (node) {
+      if (t.isAssignmentExpression(node)) {
+
+        var left = node.left;
+        if (t.isMemberExpression(left)) {
+          while (left.object) left = left.object;
+        }
+
+        check(left);
+      } else if (t.isDeclaration(node)) {
+        _.each(t.getIds(node, true), check);
+      }
+    }
+  });
+};
+
 DefaultFormatter.prototype.remapExportAssignment = function (node) {
   return t.assignmentExpression(
     "=",
@@ -110,6 +161,9 @@ DefaultFormatter.prototype.getModuleName = function () {
 
   moduleName += filenameRelative;
 
+  // normalise path separators
+  moduleName = moduleName.replace(/\\/g, "/");
+
   return moduleName;
 };
 

lib/6to5/transformation/modules/_strict.js

@@ -0,0 +1,12 @@
+var util = require("../../util");
+
+module.exports = function (Parent) {
+  var Constructor = function () {
+    this.noInteropExport = true;
+    Parent.apply(this, arguments);
+  };
+
+  util.inherits(Constructor, Parent);
+
+  return Constructor;
+};

lib/6to5/transformation/modules/amd-strict.js

@@ -0,0 +1 @@
+module.exports = require("./_strict")(require("./amd"));

lib/6to5/transformation/modules/amd.js

@@ -1,13 +1,14 @@
 module.exports = AMDFormatter;
 
 var DefaultFormatter = require("./_default");
+var CommonFormatter  = require("./common");
 var util             = require("../../util");
 var t                = require("../../types");
 var _                = require("lodash");
 
 function AMDFormatter() {
-  DefaultFormatter.apply(this, arguments);
-  this.ids  = {};
+  CommonFormatter.apply(this, arguments);
+  this.ids = {};
 }
 
 util.inherits(AMDFormatter, DefaultFormatter);
@@ -30,12 +31,15 @@ AMDFormatter.prototype.transform = function (ast) {
 
   // build an array of module names
 
-  var names = [t.literal("exports")].concat(this.buildDependencyLiterals());
+  var names = [t.literal("exports")];
+  if (this.passModuleArg) names.push(t.literal("module"));
+  names = names.concat(this.buildDependencyLiterals());
   names = t.arrayExpression(names);
 
   // build up define container
 
   var params = _.values(this.ids);
+  if (this.passModuleArg) params.unshift(t.identifier("module"));
   params.unshift(t.identifier("exports"));
 
   var container = t.functionExpression(null, params, t.blockStatement(body));
@@ -96,6 +100,14 @@ AMDFormatter.prototype.importSpecifier = function (specifier, node, nodes) {
   ]));
 };
 
+AMDFormatter.prototype.exportDeclaration = function (node) {
+  if (node.default && !this.noInteropExport) {
+    this.passModuleArg = true;
+  }
+
+  CommonFormatter.prototype.exportDeclaration.apply(this, arguments);
+};
+
 AMDFormatter.prototype.exportSpecifier = function (specifier, node, nodes) {
   var self = this;
   return this._exportSpecifier(function () {

lib/6to5/transformation/modules/common-strict.js

@@ -0,0 +1 @@
+module.exports = require("./_strict")(require("./common"));

lib/6to5/transformation/modules/common.js

@@ -61,7 +61,7 @@ CommonJSFormatter.prototype.importDeclaration = function (node, nodes) {
 };
 
 CommonJSFormatter.prototype.exportDeclaration = function (node, nodes) {
-  if (node.default) {
+  if (node.default && !this.noInteropRequire && !this.noInteropExport) {
     var declar = node.declaration;
     var assign;
 
@@ -83,10 +83,12 @@ CommonJSFormatter.prototype.exportDeclaration = function (node, nodes) {
       // this export isn't a function so we can't hoist it to the top so we need to set it
       // at the very end of the file with something like:
       //
-      //   module.exports = Object.assign(exports["default"], exports)
+      //   module.exports = _extends(exports["default"], exports)
       //
 
-      assign = util.template("common-export-default-assign", true);
+      assign = util.template("common-export-default-assign", {
+        EXTENDS_HELPER: this.file.addHelper("extends")
+      }, true);
       assign._blockHoist = 0;
 
       nodes.push(assign);

lib/6to5/transformation/modules/umd-strict.js

@@ -0,0 +1 @@
+module.exports = require("./_strict")(require("./umd"));

lib/6to5/transformation/modules/umd.js

@@ -25,22 +25,36 @@ UMDFormatter.prototype.transform = function (ast) {
   // factory
 
   var ids  = _.values(this.ids);
-  var args = [t.identifier("exports")].concat(ids);
+  var args = [t.identifier("exports")];
+  if (this.passModuleArg) args.push(t.identifier("module"));
+  args = args.concat(ids);
 
   var factory = t.functionExpression(null, args, t.blockStatement(body));
 
   // runner
 
-  var defineArgs = [t.arrayExpression([t.literal("exports")].concat(names))];
+  var defineArgs = [t.literal("exports")];
+  if (this.passModuleArg) defineArgs.push(t.literal("module"));
+  defineArgs = defineArgs.concat(names);
+  defineArgs = [t.arrayExpression(defineArgs)];
+
+  var testExports = util.template("test-exports");
+  var testModule = util.template("test-module");
+  var commonTests = this.passModuleArg ? t.logicalExpression("&&", testExports, testModule) : testExports;
+
+  var commonArgs = [t.identifier("exports")];
+  if (this.passModuleArg) commonArgs.push(t.identifier("module"));
+  commonArgs = commonArgs.concat(names.map(function (name) {
+    return t.callExpression(t.identifier("require"), [name]);
+  }));
+
   var moduleName = this.getModuleName();
   if (moduleName) defineArgs.unshift(t.literal(moduleName));
 
   var runner = util.template("umd-runner-body", {
     AMD_ARGUMENTS: defineArgs,
-
-    COMMON_ARGUMENTS: names.map(function (name) {
-      return t.callExpression(t.identifier("require"), [name]);
-    })
+    COMMON_TEST: commonTests,
+    COMMON_ARGUMENTS: commonArgs
   });
 
   //

lib/6to5/transformation/templates/common-export-default-assign.js

@@ -1 +1 @@
-module.exports = Object.assign(exports["default"], exports);
+module.exports = EXTENDS_HELPER(exports["default"], exports);

lib/6to5/transformation/templates/extends.js

@@ -0,0 +1,9 @@
+(function (target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = arguments[i];
+    for (var key in source) {
+      target[key] = source[key];
+    }
+  }
+  return target;
+})

lib/6to5/transformation/templates/test-exports.js

@@ -0,0 +1 @@
+typeof exports !== "undefined"

lib/6to5/transformation/templates/test-module.js

@@ -0,0 +1 @@
+typeof module !== "undefined"

lib/6to5/transformation/templates/umd-runner-body.js

@@ -1,7 +1,7 @@
 (function (factory) {
   if (typeof define === "function" && define.amd) {
     define(AMD_ARGUMENTS, factory);
-  } else if (typeof exports !== "undefined") {
-    factory(exports, COMMON_ARGUMENTS);
+  } else if (COMMON_TEST) {
+    factory(COMMON_ARGUMENTS);
   }
 });

lib/6to5/transformation/transform.js

@@ -31,14 +31,19 @@ transform._ensureTransformerNames = function (type, keys) {
 transform.transformers = {};
 
 transform.moduleFormatters = {
-  common: require("./modules/common"),
-  system: require("./modules/system"),
-  ignore: require("./modules/ignore"),
-  amd:    require("./modules/amd"),
-  umd:    require("./modules/umd")
+  commonStrict: require("./modules/common-strict"),
+  umdStrict:    require("./modules/umd-strict"),
+  amdStrict:    require("./modules/amd-strict"),
+  common:       require("./modules/common"),
+  system:       require("./modules/system"),
+  ignore:       require("./modules/ignore"),
+  amd:          require("./modules/amd"),
+  umd:          require("./modules/umd")
 };
 
 _.each({
+  specNoForInOfAssignment:   require("./transformers/spec-no-for-in-of-assignment"),
+
   // playground
   methodBinding:             require("./transformers/playground-method-binding"),
   memoizationOperator:       require("./transformers/playground-memoization-operator"),
@@ -55,13 +60,12 @@ _.each({
   arrowFunctions:            require("./transformers/es6-arrow-functions"),
   classes:                   require("./transformers/es6-classes"),
 
-  computedPropertyNames:     require("./transformers/es6-computed-property-names"),
-
   objectSpread:              require("./transformers/es7-object-spread"),
   exponentiationOperator:    require("./transformers/es7-exponentiation-operator"),
   spread:                    require("./transformers/es6-spread"),
   templateLiterals:          require("./transformers/es6-template-literals"),
   propertyMethodAssignment:  require("./transformers/es6-property-method-assignment"),
+  computedPropertyNames:     require("./transformers/es6-computed-property-names"),
   destructuring:             require("./transformers/es6-destructuring"),
   defaultParameters:         require("./transformers/es6-default-parameters"),
   forOf:                     require("./transformers/es6-for-of"),

lib/6to5/transformation/transformers/es6-classes.js

@@ -210,7 +210,7 @@ Class.prototype.pushMethod = function (node) {
     } else {
       this.hasInstanceMutators = true;
     }
-    util.pushMutatorMap(mutatorMap, methodName, kind, node);
+    util.pushMutatorMap(mutatorMap, methodName, kind, node.computed, node);
   }
 };
 

lib/6to5/transformation/transformers/es6-computed-property-names.js

@@ -7,7 +7,7 @@ exports.ObjectExpression = function (node, parent, file, scope) {
   var i;
 
   for (i in node.properties) {
-    hasComputed = t.isProperty(node.properties[i], { computed: true });
+    hasComputed = t.isProperty(node.properties[i], { computed: true, kind: "init" });
     if (hasComputed) break;
   }
 
@@ -25,6 +25,8 @@ exports.ObjectExpression = function (node, parent, file, scope) {
 
   for (i in props) {
     prop = props[i];
+    if (prop.kind !== "init") continue;
+
     key = prop.key;
 
     if (!prop.computed && t.isIdentifier(key)) {
@@ -44,7 +46,7 @@ exports.ObjectExpression = function (node, parent, file, scope) {
       broken = true;
     }
 
-    if (!broken || t.isLiteral(t.toComputedKey(prop, prop.key), { value: "__proto__" })) {
+    if (prop.kind !== "init" || !broken || t.isLiteral(t.toComputedKey(prop, prop.key), { value: "__proto__" })) {
       initProps.push(prop);
       props[i] = null;
     }

lib/6to5/transformation/transformers/es6-destructuring.js

@@ -300,10 +300,17 @@ exports.VariableDeclaration = function (node, parent, file, scope) {
       file:    file,
       scope:   scope
     };
+
     if (t.isPattern(pattern) && patternId) {
       pushPattern(opts);
+
+      if (+i !== node.declarations.length - 1) {
+        // we aren't the last declarator so let's just make the
+        // last transformed node inherit from us
+        t.inherits(nodes[nodes.length - 1], declar);
+      }
     } else {
-      nodes.push(buildVariableAssign(opts, declar.id, declar.init));
+      nodes.push(t.inherits(buildVariableAssign(opts, declar.id, declar.init), declar));
     }
   }
 

lib/6to5/transformation/transformers/es6-property-method-assignment.js

@@ -53,7 +53,7 @@ exports.ObjectExpression = function (node, parent, file, scope) {
   node.properties = node.properties.filter(function (prop) {
     if (prop.kind === "get" || prop.kind === "set") {
       hasAny = true;
-      util.pushMutatorMap(mutatorMap, prop.key, prop.kind, prop.value);
+      util.pushMutatorMap(mutatorMap, prop.key, prop.kind, prop.computed, prop.value);
       return false;
     } else {
       return true;

lib/6to5/transformation/transformers/es7-object-spread.js

@@ -4,7 +4,7 @@ var t = require("../../types");
 
 exports.experimental = true;
 
-exports.ObjectExpression = function (node) {
+exports.ObjectExpression = function (node, parent, file) {
   var hasSpread = false;
   var i;
   var prop;
@@ -42,5 +42,5 @@ exports.ObjectExpression = function (node) {
     args.unshift(t.objectExpression([]));
   }
 
-  return t.callExpression(t.memberExpression(t.identifier("Object"), t.identifier("assign")), args);
+  return t.callExpression(file.addHelper("extends"), args);
 };

lib/6to5/transformation/transformers/optional-proto-to-assign.js

@@ -1,8 +1,6 @@
 var t = require("../../types");
 var _ = require("lodash");
 
-var OBJECT_ASSIGN_MEMBER = t.memberExpression(t.identifier("Object"), t.identifier("assign"));
-
 var isProtoKey = function (node) {
   return t.isLiteral(t.toComputedKey(node, node.key), { value: "__proto__" });
 };
@@ -43,7 +41,7 @@ exports.ExpressionStatement = function (node, parent, file) {
   }
 };
 
-exports.ObjectExpression = function (node) {
+exports.ObjectExpression = function (node, parent, file) {
   var proto;
 
   for (var i in node.properties) {
@@ -58,6 +56,6 @@ exports.ObjectExpression = function (node) {
   if (proto) {
     var args = [t.objectExpression([]), proto];
     if (node.properties.length) args.push(node);
-    return t.callExpression(OBJECT_ASSIGN_MEMBER, args);
+    return t.callExpression(file.addHelper("extends"), args);
   }
 };

lib/6to5/transformation/transformers/react.js

@@ -32,12 +32,17 @@ exports.XJSExpressionContainer = function (node) {
 exports.XJSAttribute = {
   exit: function (node) {
     var value = node.value || t.literal(true);
-    return t.property("init", node.name, value);
+    return t.inherits(t.property("init", node.name, value), node);
   }
 };
 
+var isTag = function(tagName) {
+  return (/^[a-z]|\-/).test(tagName);
+};
+
 exports.XJSOpeningElement = {
-  exit: function (node) {
+  exit: function (node, parent, file) {
+    var reactCompat = file.opts.reactCompat;
     var tagExpr = node.name;
     var args = [];
 
@@ -48,10 +53,12 @@ exports.XJSOpeningElement = {
       tagName = tagExpr.value;
     }
 
-    if (tagName && (/[a-z]/.exec(tagName[0]) || tagName.indexOf("-") >= 0)) {
-      args.push(t.literal(tagName));
-    } else {
-      args.push(tagExpr);
+    if (!reactCompat) {
+      if (tagName && isTag(tagName)) {
+        args.push(t.literal(tagName));
+      } else {
+        args.push(tagExpr);
+      }
     }
 
     var props = node.attributes;
@@ -96,7 +103,21 @@ exports.XJSOpeningElement = {
 
     args.push(props);
 
-    tagExpr = t.memberExpression(t.identifier("React"), t.identifier("createElement"));
+    if (reactCompat) {
+      if (tagName && isTag(tagName)) {
+        return t.callExpression(
+          t.memberExpression(
+            t.memberExpression(t.identifier("React"), t.identifier("DOM")),
+            tagExpr,
+            t.isLiteral(tagExpr)
+          ),
+          args
+        );
+      }
+    } else {
+      tagExpr = t.memberExpression(t.identifier("React"), t.identifier("createElement"));
+    }
+
     return t.callExpression(tagExpr, args);
   }
 };
@@ -119,16 +140,16 @@ exports.XJSElement = {
           var isLastLine = +i === lines.length - 1;
 
           // replace rendered whitespace tabs with spaces
-          var trimmedLine = line.replace(/\t/g, ' ');
+          var trimmedLine = line.replace(/\t/g, " ");
 
           // trim whitespace touching a newline
           if (!isFirstLine) {
-            trimmedLine = trimmedLine.replace(/^[ ]+/, '');
+            trimmedLine = trimmedLine.replace(/^[ ]+/, "");
           }
 
           // trim whitespace touching an endline
           if (!isLastLine) {
-            trimmedLine = trimmedLine.replace(/[ ]+$/, '');
+            trimmedLine = trimmedLine.replace(/[ ]+$/, "");
           }
 
           if (trimmedLine) {
@@ -144,6 +165,10 @@ exports.XJSElement = {
       callExpr.arguments.push(child);
     }
 
+    if (callExpr.arguments.length >= 3) {
+      callExpr._prettyCall = true;
+    }
+
     return t.inherits(callExpr, node);
   }
 };

lib/6to5/transformation/transformers/spec-no-for-in-of-assignment.js

@@ -0,0 +1,10 @@
+var t = require("../../types");
+
+exports.ForInStatement =
+exports.ForOfStatement = function (node, parent, file) {
+  var left = node.left;
+  if (t.isVariableDeclaration(left)) {
+    var declar = left.declarations[0];
+    if (declar.init) throw file.errorWithNode(declar, "No assignments allowed in for-in/of head");
+  }
+};

lib/6to5/types/index.js

@@ -355,16 +355,24 @@ t.getIds = function (node, map, ignoreTypes) {
     if (!id) continue;
     if (_.contains(ignoreTypes, id.type)) continue;
 
-    var nodeKey = t.getIds.nodes[id.type];
+    var nodeKeys = t.getIds.nodes[id.type];
     var arrKeys  = t.getIds.arrays[id.type];
 
+    var i, key;
+
     if (t.isIdentifier(id)) {
       ids[id.name] = id;
-    } else if (nodeKey) {
-      if (id[nodeKey]) search.push(id[nodeKey]);
+    } else if (nodeKeys) {
+      for (i in nodeKeys) {
+        key = nodeKeys[i];
+        if (id[key]) {
+          search.push(id[key]);
+          break;
+        }
+      }
     } else if (arrKeys) {
-      for (var i in arrKeys) {
-        var key = arrKeys[i];
+      for (i in arrKeys) {
+        key = arrKeys[i];
         search = search.concat(id[key] || []);
       }
     }
@@ -375,15 +383,16 @@ t.getIds = function (node, map, ignoreTypes) {
 };
 
 t.getIds.nodes = {
-  AssignmentExpression: "left",
-  ImportSpecifier: "name",
-  ExportSpecifier: "name",
-  VariableDeclarator: "id",
-  FunctionDeclaration: "id",
-  ClassDeclaration: "id",
-  MemeberExpression: "object",
-  SpreadElement: "argument",
-  Property: "value"
+  AssignmentExpression: ["left"],
+  ImportBatchSpecifier: ["name"],
+  ImportSpecifier: ["name", "id"],
+  ExportSpecifier: ["name", "id"],
+  VariableDeclarator: ["id"],
+  FunctionDeclaration: ["id"],
+  ClassDeclaration: ["id"],
+  MemeberExpression: ["object"],
+  SpreadElement: ["argument"],
+  Property: ["value"]
 };
 
 t.getIds.arrays = {

lib/6to5/util.js

@@ -65,12 +65,12 @@ exports.sourceMapToComment = function (map) {
   return "//# sourceMappingURL=data:application/json;base64," + base64;
 };
 
-exports.pushMutatorMap = function (mutatorMap, key, kind, method) {
+exports.pushMutatorMap = function (mutatorMap, key, kind, computed, method) {
   var alias;
 
   if (t.isIdentifier(key)) {
     alias = key.name;
-    if (method.computed) alias = "computed:" + alias;
+    if (computed) alias = "computed:" + alias;
   } else if (t.isLiteral(key)) {
     alias = String(key.value);
   } else {
@@ -86,7 +86,7 @@ exports.pushMutatorMap = function (mutatorMap, key, kind, method) {
   mutatorMap[alias] = map;
 
   map._key = key;
-  if (method.computed) {
+  if (computed) {
     map._computed = true;
   }
 
@@ -146,10 +146,10 @@ exports.template = function (name, nodes, keepExpression) {
   var node = template.body[0];
 
   if (!keepExpression && t.isExpressionStatement(node)) {
-    node = node.expression;
+    return node.expression;
+  } else {
+    return node;
   }
-
-  return node;
 };
 
 exports.codeFrame = function (lines, lineNumber, colNumber) {
@@ -256,7 +256,7 @@ var loadTemplates = function () {
   if (!fs.existsSync(templatesLoc)) {
     throw new Error("no templates directory - this is most likely the " +
                     "result of a broken `npm publish`. Please report to " +
-                    "https://githut.com/6to5/6to5/issues");
+                    "https://github.com/6to5/6to5/issues");
   }
 
   _.each(fs.readdirSync(templatesLoc), function (name) {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "6to5",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "2.6.3",
+  "version": "2.9.0",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://github.com/6to5/6to5",
   "repository": {
@@ -39,11 +39,11 @@
     "test": "make test"
   },
   "dependencies": {
-    "acorn-6to5": "0.11.1-11",
+    "acorn-6to5": "0.11.1-12",
     "ast-types": "~0.6.1",
     "chokidar": "0.11.1",
     "commander": "2.5.0",
-    "core-js": "^0.4.0",
+    "core-js": "^0.4.1",
     "estraverse": "1.8.0",
     "esutils": "1.1.6",
     "esvalid": "^1.1.0",

test/fixtures/generation/comments/computed-property-comments-2/expected.js

@@ -7,4 +7,5 @@ var test = {
     * Inside bracket init
     */
   "b"]: "2"
-}, ok = 42;
+},
+    ok = 42;

test/fixtures/generation/comments/variable-declarator-line-comment/expected.js

@@ -3,6 +3,7 @@ function test() {
   // Leading to VariableDeclarator
   // Leading to VariableDeclarator
   i = 20,
+
   // Leading to VariableDeclarator
   // Leading to VariableDeclarator
   j = 20;

test/fixtures/generation/comments/variable-declarator-multi-comment/expected.js

@@ -5,6 +5,7 @@ function test() {
    * Leading to VariableDeclarator
    */
   i = 20,
+
   /*
    * Leading to VariableDeclarator
    * Leading to VariableDeclarator

test/fixtures/generation/harmony-edgecase/yield-precedence/expected.js

@@ -1,5 +1,6 @@
 function* foo() {
-  var a = yield wat(), b = 2;
+  var a = yield wat(),
+      b = 2;
   var c = yield a = b;
   yield a, yield b;
   yield a = b;

test/fixtures/generation/types/VariableDeclaration-VariableDeclarator/expected.js

@@ -8,6 +8,9 @@ const foo = "foo";
 let foo, bar = "bar";
 var foo, bar = "bar";
 
-let foo = "foo", bar = "bar";
-var foo = "foo", bar = "bar";
-const foo = "foo", bar = "bar";
+let foo = "foo",
+    bar = "bar";
+var foo = "foo",
+    bar = "bar";
+const foo = "foo",
+      bar = "bar";

test/fixtures/transformation/es6-destructuring/multiple/actual.js

@@ -1 +1,2 @@
-var { x, y } = coords, foo = "bar";
+var { x, y } = coords,
+    foo = "bar";

test/fixtures/transformation/es6-modules-amd-strict/exports-default/actual.js

@@ -0,0 +1,8 @@
+export default 42;
+export default {};
+export default [];
+export default foo;
+export default function () {}
+export default class {}
+export default function foo () {}
+export default class Foo {}

test/fixtures/transformation/es6-modules-amd-strict/exports-default/expected.js

@@ -0,0 +1,17 @@
+define(["exports"], function (exports) {
+  "use strict";
+
+  exports["default"] = foo;
+  exports["default"] = 42;
+  exports["default"] = {};
+  exports["default"] = [];
+  exports["default"] = foo;
+  exports["default"] = function () {};
+
+  exports["default"] = function () {};
+
+  function foo() {}
+  var Foo = function Foo() {};
+
+  exports["default"] = Foo;
+});

test/fixtures/transformation/es6-modules-amd-strict/exports-from/actual.js

@@ -0,0 +1,6 @@
+export * from "foo";
+export {foo} from "foo";
+export {foo, bar} from "foo";
+export {foo as bar} from "foo";
+export {foo as default} from "foo";
+export {foo as default, bar} from "foo";

test/fixtures/transformation/es6-modules-amd-strict/exports-from/expected.js

@@ -0,0 +1,27 @@
+define(["exports", "foo"], function (exports, _foo) {
+  "use strict";
+
+  var _interopRequireWildcard = function (obj) {
+    return obj && obj.constructor === Object ? obj : {
+      "default": obj
+    };
+  };
+
+  var _exportsWildcard = function (obj) {
+    for (var i in obj) {
+      if (exports[i] !== undefined) {
+        exports[i] = obj[i];
+      }
+    }
+  };
+
+  _exportsWildcard(_interopRequireWildcard(_foo));
+
+  exports.foo = _foo.foo;
+  exports.foo = _foo.foo;
+  exports.bar = _foo.bar;
+  exports.bar = _foo.foo;
+  exports["default"] = _foo.foo;
+  exports["default"] = _foo.foo;
+  exports.bar = _foo.bar;
+});

test/fixtures/transformation/es6-modules-amd-strict/exports-named/actual.js

@@ -0,0 +1,5 @@
+export {foo};
+export {foo, bar};
+export {foo as bar};
+export {foo as default};
+export {foo as default, bar};

test/fixtures/transformation/es6-modules-amd-strict/exports-named/expected.js

@@ -0,0 +1,11 @@
+define(["exports"], function (exports) {
+  "use strict";
+
+  exports.foo = foo;
+  exports.foo = foo;
+  exports.bar = bar;
+  exports.bar = foo;
+  exports["default"] = foo;
+  exports["default"] = foo;
+  exports.bar = bar;
+});

test/fixtures/transformation/es6-modules-amd-strict/exports-variable/actual.js

@@ -0,0 +1,9 @@
+export var foo = 1;
+export var foo = 1, bar = 2;
+export var foo2 = function () {};
+export var foo3;
+export let foo4 = 2;
+export let foo5;
+export const foo6 = 3;
+export function foo7 () {}
+export class foo8 {}

test/fixtures/transformation/es6-modules-amd-strict/exports-variable/expected.js

@@ -0,0 +1,17 @@
+define(["exports"], function (exports) {
+  "use strict";
+
+  exports.foo7 = foo7;
+  var foo = exports.foo = 1;
+  var foo = exports.foo = 1;
+  var bar = exports.bar = 2;
+  var foo2 = exports.foo2 = function () {};
+  var foo3 = exports.foo3 = undefined;
+  var foo4 = exports.foo4 = 2;
+  var foo5 = exports.foo5 = undefined;
+  var foo6 = exports.foo6 = 3;
+  function foo7() {}
+  var foo8 = function foo8() {};
+
+  exports.foo8 = foo8;
+});

test/fixtures/transformation/es6-modules-amd-strict/hoist-function-exports/actual.js

@@ -0,0 +1,11 @@
+import { isEven } from "./evens";
+
+export function nextOdd(n) {
+  return isEven(n) ? n + 1 : n + 2;
+}
+
+export var isOdd = (function (isEven) {
+  return function (n) {
+    return !isEven(n);
+  };
+})(isEven);

test/fixtures/transformation/es6-modules-amd-strict/hoist-function-exports/expected.js

@@ -0,0 +1,15 @@
+define(["exports", "./evens"], function (exports, _evens) {
+  "use strict";
+
+  exports.nextOdd = nextOdd;
+  var isEven = _evens.isEven;
+  function nextOdd(n) {
+    return isEven(n) ? n + 1 : n + 2;
+  }
+
+  var isOdd = exports.isOdd = (function (isEven) {
+    return function (n) {
+      return !isEven(n);
+    };
+  })(isEven);
+});

test/fixtures/transformation/es6-modules-amd-strict/imports-default/actual.js

@@ -0,0 +1,2 @@
+import foo from "foo";
+import {default as foo2} from "foo";

test/fixtures/transformation/es6-modules-amd-strict/imports-default/expected.js

@@ -0,0 +1,11 @@
+define(["exports", "foo"], function (exports, _foo) {
+  "use strict";
+
+  var _interopRequire = function (obj) {
+    return obj && (obj["default"] || obj);
+  };
+
+  var foo = _interopRequire(_foo);
+
+  var foo2 = _interopRequire(_foo);
+});

test/fixtures/transformation/es6-modules-amd-strict/imports-glob/actual.js

@@ -0,0 +1 @@
+import * as foo from "foo";

test/fixtures/transformation/es6-modules-amd-strict/imports-glob/expected.js

@@ -0,0 +1,5 @@
+define(["exports", "foo"], function (exports, _foo) {
+  "use strict";
+
+  var foo = _foo;
+});

test/fixtures/transformation/es6-modules-amd-strict/imports-mixing/actual.js

@@ -0,0 +1 @@
+import foo, {baz as xyz} from "foo";

test/fixtures/transformation/es6-modules-amd-strict/imports-mixing/expected.js

@@ -0,0 +1,11 @@
+define(["exports", "foo"], function (exports, _foo) {
+  "use strict";
+
+  var _interopRequire = function (obj) {
+    return obj && (obj["default"] || obj);
+  };
+
+  var foo = _interopRequire(_foo);
+
+  var xyz = _foo.baz;
+});

test/fixtures/transformation/es6-modules-amd-strict/imports-named/actual.js

@@ -0,0 +1,4 @@
+import {bar} from "foo";
+import {bar2, baz} from "foo";
+import {bar as baz2} from "foo";
+import {bar as baz3, xyz} from "foo";

test/fixtures/transformation/es6-modules-amd-strict/imports-named/expected.js

@@ -0,0 +1,10 @@
+define(["exports", "foo"], function (exports, _foo) {
+  "use strict";
+
+  var bar = _foo.bar;
+  var bar2 = _foo.bar2;
+  var baz = _foo.baz;
+  var baz2 = _foo.bar;
+  var baz3 = _foo.bar;
+  var xyz = _foo.xyz;
+});

test/fixtures/transformation/es6-modules-amd-strict/imports/actual.js

@@ -0,0 +1,3 @@
+import "foo";
+import "foo-bar";
+import "./directory/foo-bar";

test/fixtures/transformation/es6-modules-amd-strict/imports/expected.js

@@ -0,0 +1,3 @@
+define(["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports, _foo, _fooBar, _directoryFooBar) {
+  "use strict";
+});

test/fixtures/transformation/es6-modules-amd-strict/module-name/actual.js

@@ -0,0 +1 @@
+foobar();

test/fixtures/transformation/es6-modules-amd-strict/module-name/expected.js

@@ -0,0 +1,5 @@
+define("es6-modules-amd-strict/module-name/expected", ["exports"], function (exports) {
+  "use strict";
+
+  foobar();
+});

test/fixtures/transformation/es6-modules-amd-strict/module-name/options.json

@@ -0,0 +1,3 @@
+{
+  "amdModuleIds": true
+}

test/fixtures/transformation/es6-modules-amd-strict/options.json

@@ -0,0 +1,3 @@
+{
+  "modules": "amdStrict"
+}

test/fixtures/transformation/es6-modules-amd-strict/overview/actual.js

@@ -0,0 +1,12 @@
+import "foo";
+import "foo-bar";
+import "./directory/foo-bar";
+import foo from "foo";
+import * as foo2 from "foo";
+import {bar} from "foo";
+import {foo as bar2} from "foo";
+
+export {test};
+export var test2 = 5;
+
+export default test;

test/fixtures/transformation/es6-modules-amd-strict/overview/expected.js

@@ -0,0 +1,17 @@
+define(["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports, _foo, _fooBar, _directoryFooBar) {
+  "use strict";
+
+  var _interopRequire = function (obj) {
+    return obj && (obj["default"] || obj);
+  };
+
+  var foo = _interopRequire(_foo);
+
+  var foo2 = _foo;
+  var bar = _foo.bar;
+  var bar2 = _foo.foo;
+  exports.test = test;
+  var test2 = exports.test2 = 5;
+
+  exports["default"] = test;
+});

test/fixtures/transformation/es6-modules-amd-strict/remap/actual.js

@@ -0,0 +1,9 @@
+export var test = 2;
+test = 5;
+test++;
+
+(function () {
+  var test = 2;
+  test = 3;
+  test++;
+})();

test/fixtures/transformation/es6-modules-amd-strict/remap/expected.js

@@ -0,0 +1,13 @@
+define(["exports"], function (exports) {
+  "use strict";
+
+  var test = exports.test = 2;
+  test = exports.test = 5;
+  test = exports.test += 1;
+
+  (function () {
+    var test = 2;
+    test = 3;
+    test++;
+  })();
+});

test/fixtures/transformation/es6-modules-amd/exports-default/expected.js

@@ -1,17 +1,17 @@
-define(["exports"], function (exports) {
+define(["exports", "module"], function (exports, module) {
   "use strict";
 
-  exports["default"] = foo;
-  exports["default"] = 42;
-  exports["default"] = {};
-  exports["default"] = [];
-  exports["default"] = foo;
-  exports["default"] = function () {};
+  module.exports = foo;
+  module.exports = 42;
+  module.exports = {};
+  module.exports = [];
+  module.exports = foo;
+  module.exports = function () {};
 
-  exports["default"] = function () {};
+  module.exports = function () {};
 
   function foo() {}
   var Foo = function Foo() {};
 
-  exports["default"] = Foo;
-});
+  module.exports = Foo;
+});

test/fixtures/transformation/es6-modules-amd/imports-default/actual.js

@@ -1,2 +1,2 @@
 import foo from "foo";
-import {default as foo} from "foo";
+import {default as foo2} from "foo";

test/fixtures/transformation/es6-modules-amd/imports-default/expected.js

@@ -7,5 +7,5 @@ define(["exports", "foo"], function (exports, _foo) {
 
   var foo = _interopRequire(_foo);
 
-  var foo = _interopRequire(_foo);
-});
+  var foo2 = _interopRequire(_foo);
+});

test/fixtures/transformation/es6-modules-amd/imports-named/actual.js

@@ -1,4 +1,4 @@
 import {bar} from "foo";
-import {bar, baz} from "foo";
-import {bar as baz} from "foo";
-import {bar as baz, xyz} from "foo";
+import {bar2, baz} from "foo";
+import {bar as baz2} from "foo";
+import {bar as baz3, xyz} from "foo";

test/fixtures/transformation/es6-modules-amd/imports-named/expected.js

@@ -2,9 +2,9 @@ define(["exports", "foo"], function (exports, _foo) {
   "use strict";
 
   var bar = _foo.bar;
-  var bar = _foo.bar;
+  var bar2 = _foo.bar2;
   var baz = _foo.baz;
-  var baz = _foo.bar;
-  var baz = _foo.bar;
+  var baz2 = _foo.bar;
+  var baz3 = _foo.bar;
   var xyz = _foo.xyz;
-});
+});

test/fixtures/transformation/es6-modules-amd/overview/actual.js

@@ -2,11 +2,11 @@ import "foo";
 import "foo-bar";
 import "./directory/foo-bar";
 import foo from "foo";
-import * as foo from "foo";
+import * as foo2 from "foo";
 import {bar} from "foo";
-import {foo as bar} from "foo";
+import {foo as bar2} from "foo";
 
 export {test};
-export var test = 5;
+export var test2 = 5;
 
 export default test;

test/fixtures/transformation/es6-modules-amd/overview/expected.js

@@ -1,17 +1,29 @@
-define(["exports", "foo", "foo-bar", "./directory/foo-bar"], function (exports, _foo, _fooBar, _directoryFooBar) {
+define(["exports", "module", "foo", "foo-bar", "./directory/foo-bar"], function (exports, module, _foo, _fooBar, _directoryFooBar) {
   "use strict";
 
+  var _extends = function (target) {
+    for (var i = 1; i < arguments.length; i++) {
+      var source = arguments[i];
+      for (var key in source) {
+        target[key] = source[key];
+      }
+    }
+
+    return target;
+  };
+
   var _interopRequire = function (obj) {
     return obj && (obj["default"] || obj);
   };
 
   var foo = _interopRequire(_foo);
 
-  var foo = _foo;
+  var foo2 = _foo;
   var bar = _foo.bar;
-  var bar = _foo.foo;
+  var bar2 = _foo.foo;
   exports.test = test;
-  var test = exports.test = 5;
+  var test2 = exports.test2 = 5;
 
   exports["default"] = test;
-});
+  module.exports = _extends(exports["default"], exports);
+});

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-2/actual.js

@@ -0,0 +1,2 @@
+import { foo } from "foo";
+var foo;

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-2/options.json

@@ -0,0 +1,3 @@
+{
+  "throws": "Illegal assignment of module import"
+}

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-3/actual.js

@@ -0,0 +1,2 @@
+import { foo } from "foo";
+foo.bar = 1;

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-3/options.json

@@ -0,0 +1,3 @@
+{
+  "throws": "Illegal assignment of module import"
+}

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-4/actual.js

@@ -0,0 +1,2 @@
+import * as foo from "foo";
+foo = 1;

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-4/options.json

@@ -0,0 +1,3 @@
+{
+  "throws": "Illegal assignment of module import"
+}

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-5/actual.js

@@ -0,0 +1,2 @@
+import * as foo from "foo";
+var foo;

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-5/options.json

@@ -0,0 +1,3 @@
+{
+  "throws": "Illegal assignment of module import"
+}

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-6/actual.js

@@ -0,0 +1,2 @@
+import { foo as bar } from "foo";
+var bar;

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-6/options.json

@@ -0,0 +1,3 @@
+{
+  "throws": "Illegal assignment of module import"
+}

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-7/actual.js

@@ -0,0 +1,2 @@
+import { foo as bar } from "foo";
+bar = 1;

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-7/options.json

@@ -0,0 +1,3 @@
+{
+  "throws": "Illegal assignment of module import"
+}

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-8/actual.js

@@ -0,0 +1,2 @@
+import { foo } from "foo";
+import { foo } from "bar";

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-8/options.json

@@ -0,0 +1,3 @@
+{
+  "throws": "Illegal assignment of module import"
+}

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-9/actual.js

@@ -0,0 +1,2 @@
+import { foo as bar } from "foo";
+import { foo as bar } from "bar";

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping-9/options.json

@@ -0,0 +1,3 @@
+{
+  "throws": "Illegal assignment of module import"
+}

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping/actual.js

@@ -0,0 +1,2 @@
+import { foo } from "foo";
+foo = 1;

test/fixtures/transformation/es6-modules-common-strict/.disallow-import-remapping/options.json

@@ -0,0 +1,3 @@
+{
+  "throws": "Illegal assignment of module import"
+}