v1.11.12

.gitignore

@@ -6,7 +6,7 @@ test/tmp
 /templates.json
 /tests.json
 /browser.js
-/polyfill.js
+/browser-polyfill.js
 /runtime.js
 coverage
 dist

Makefile

@@ -6,7 +6,7 @@ MOCHA_CMD = node_modules/mocha/bin/_mocha
 
 export NODE_ENV = test
 
-.PHONY: clean test test-cov test-travis test-browser publish bench build
+.PHONY: clean test test-cov tlint est-travis test-appveyor test-browser publish bench build
 
 clean:
 	rm -rf coverage templates.json test/tmp dist
@@ -15,16 +15,22 @@ bench:
 	npm install es6-transpiler traceur esnext es6now jstransform
 	node node_modules/matcha/bin/_matcha
 
-test:
+lint:
 	$(JSHINT_CMD) lib bin benchmark/index.js
+
+test:
+	make lint
 	$(MOCHA_CMD)
 
 test-cov:
 	rm -rf coverage
 	node $(ISTANBUL_CMD) $(MOCHA_CMD) --
 
-test-travis:
+test-appveyor:
 	node $(ISTANBUL_CMD) $(MOCHA_CMD) -- --reporter spec
+
+test-travis:
+	make test-appveyor
 	if test -n "$$CODECLIMATE_REPO_TOKEN"; then codeclimate < coverage/lcov.info; fi
 
 test-browser:
@@ -60,7 +66,7 @@ publish:
 
 	make build
 	cp dist/6to5.min.js browser.js
-	cp dist/polyfill.min.js polyfill.js
+	cp dist/polyfill.min.js browser-polyfill.js
 	cp dist/runtime.min.js runtime.js
 
 	node bin/cache-templates

README.md

@@ -7,6 +7,10 @@
     <img alt="Travis Status" src="http://img.shields.io/travis/6to5/6to5.svg?branch=master&amp;style=flat&amp;label=travis">
   </a>
 
+  <a href="https://ci.appveyor.com/project/sebmck/6to5">
+    <img alt="Appveyor Status" src="http://img.shields.io/appveyor/ci/sebmck/6to5.svg?style=flat&amp;label=appveyor">
+  </a>
+
   <a href="https://codeclimate.com/github/6to5/6to5">
     <img alt="Code Climate Score" src="http://img.shields.io/codeclimate/github/6to5/6to5.svg?style=flat">
   </a>
@@ -342,8 +346,8 @@ require("6to5/polyfill");
 
 ### Browser
 
-Available from the `polyfill.js` file within the 6to5 directory of an npm
-release.
+Available from the `browser-polyfill.js` file within the 6to5 directory of an
+npm release.
 
 ## Optional runtime
 

appveyor.yml

@@ -0,0 +1,17 @@
+environment:
+  matrix:
+    - nodejs_version: "0.10"
+    - nodejs_version: "0.11"
+
+install:
+ - "npm install"
+ - "cinst make"
+
+test_script:
+ - "node --version"
+ - "npm --version"
+ - "make test-appveyor"
+
+build: "off"
+
+version: "{build}"

bin/6to5/util.js

@@ -6,7 +6,9 @@ var fs      = require("fs");
 var _       = require("lodash");
 
 exports.readdirFilter = function (filename) {
-  return readdir(filename).filter(util.canCompile);
+  return readdir(filename).filter(function (filename) {
+    return util.canCompile(filename);
+  });
 };
 
 exports.transform = function (filename, code, opts) {

lib/6to5/file.js

@@ -11,7 +11,7 @@ var _         = require("lodash");
 
 function File(opts) {
   this.opts            = File.normaliseOptions(opts);
-  this.moduleFormatter = this.getModuleFormatter(opts.modules);
+  this.moduleFormatter = this.getModuleFormatter(this.opts.modules);
 
   this.declarations = {};
   this.uids         = {};
@@ -21,7 +21,7 @@ function File(opts) {
 File.declarations = ["extends", "class-props", "slice"];
 
 File.normaliseOptions = function (opts) {
-  opts = opts || {};
+  opts = _.cloneDeep(opts || {});
 
   _.defaults(opts, {
     whitespace: true,
@@ -110,6 +110,8 @@ File.prototype.errorWithNode = function (node, msg, Error) {
 };
 
 File.prototype.parse = function (code) {
+  code = (code || "") + "";
+
   var self = this;
 
   this.code = code;

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

@@ -64,15 +64,20 @@ exports.CallExpression = function (node, print) {
   this.push(")");
 };
 
-exports.YieldExpression = function (node, print) {
-  this.push("yield");
-  if (node.delegate) this.push("*");
-  if (node.argument) {
-    this.space();
-    print(node.argument);
-  }
+var buildYieldAwait = function (keyword) {
+  return function (node, print) {
+    this.push(keyword);
+    if (node.delegate) this.push("*");
+    if (node.argument) {
+      this.space();
+      print(node.argument);
+    }
+  };
 };
 
+exports.YieldExpression = buildYieldAwait("yield");
+exports.AwaitExpression = buildYieldAwait("await");
+
 exports.EmptyStatement = function () {
   this.semicolon();
 };

lib/6to5/transformation/transform.js

@@ -5,9 +5,6 @@ var File        = require("../file");
 var _           = require("lodash");
 
 function transform(code, opts) {
-  opts = opts || {};
-  code = (code || "") + "";
-
   var file = new File(opts);
   return file.parse(code);
 }
@@ -49,7 +46,6 @@ _.each({
   letScoping:               require("./transformers/let-scoping"),
   forOf:                    require("./transformers/for-of"),
   unicodeRegex:             require("./transformers/unicode-regex"),
-  generators:               require("./transformers/generators"),
   numericLiterals:          require("./transformers/numeric-literals"),
 
   react:                    require("./transformers/react"),
@@ -59,6 +55,7 @@ _.each({
   _blockHoist:              require("./transformers/_block-hoist"),
   _declarations:            require("./transformers/_declarations"),
 
+  generators:               require("./transformers/generators"),
   useStrict:                require("./transformers/use-strict"),
 
   _moduleFormatter:         require("./transformers/_module-formatter")

lib/6to5/transformation/transformers/_property-literals.js

@@ -1,10 +1,11 @@
 var esutils = require("esutils");
 var t       = require("../../types");
+var _       = require("lodash");
 
 exports.Property = function (node) {
   // ignore key literals that are valid identifiers
   var key = node.key;
-  if (t.isLiteral(key) && esutils.keyword.isIdentifierName(key.value)) {
+  if (t.isLiteral(key) && _.isString(key.value) && esutils.keyword.isIdentifierName(key.value)) {
     key.type = "Identifier";
     key.name = key.value;
     delete key.value;

lib/6to5/types/visitor-keys.json

@@ -3,6 +3,7 @@
   "ArrayPattern":             ["elements"],
   "ArrowFunctionExpression":  ["params", "defaults", "rest", "body"],
   "AssignmentExpression":     ["left", "right"],
+  "AwaitExpression":          ["argument"],
   "BinaryExpression":         ["left", "right"],
   "BlockStatement":           ["body"],
   "BreakStatement":           ["label"],

lib/6to5/util.js

@@ -52,11 +52,6 @@ exports.isAbsolute = function (loc) {
   return false;
 };
 
-exports.canCompile = function (filename) {
-  var ext = path.extname(filename);
-  return _.contains([".js", ".es6"], ext);
-};
-
 exports.sourceMapToComment = function (map) {
   var json = JSON.stringify(map);
   var base64 = new Buffer(json).toString("base64");

package.json

@@ -1,7 +1,7 @@
 {
   "name": "6to5",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "1.11.5",
+  "version": "1.11.12",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://github.com/6to5/6to5",
   "repository": {
@@ -44,11 +44,11 @@
     "es6-symbol": "0.1.1",
     "regexpu": "0.3.0",
     "source-map": "0.1.40",
-    "regenerator-6to5": "https://github.com/6to5/regenerator-6to5/archive/b7bc53e1a655879974aad53a8ceb93a70efaa08d.tar.gz",
+    "regenerator-6to5": "https://github.com/6to5/regenerator-6to5/archive/37798b2311c46975bc199ff595fe1b1f28bee94c.tar.gz",
     "chokidar": "0.10.5",
     "source-map-support": "0.2.8",
     "esutils": "1.1.4",
-    "acorn-6to5": "https://github.com/6to5/acorn-6to5/archive/49e421660af161af0e75c2fa066ea356d6650e69.tar.gz",
+    "acorn-6to5": "https://github.com/6to5/acorn-6to5/archive/0384a0d51f630f66ed591769c1765581a17d2124.tar.gz",
     "estraverse": "^1.7.0"
   },
   "devDependencies": {

polyfill.js

@@ -0,0 +1 @@
+module.exports = require("./lib/6to5/polyfill");