rollup 0.43.0 → 0.43.1

package/dist/rollup.es.js

@@ -1,6 +1,6 @@
 /*
-	Rollup.js v0.43.0
-	Mon Jun 12 2017 22:58:47 GMT-0400 (EDT) - commit edff27a27d6a99705830004d947214fd52e2b0c4
+	Rollup.js v0.43.1
+	Sun Jul 09 2017 19:16:27 GMT-0400 (EDT) - commit 6f3f349afff179d3ea85764390fe74d38544a88b
 
 
 	https://github.com/rollup/rollup
@@ -164,7 +164,14 @@ function validateKeys ( actualKeys, allowedKeys ) {
 }
 
 function error ( props ) {
-	var err = new Error( props.message );
+	// use the same constructor as props (if it's an error object)
+	// so that err.name is preserved etc
+	// (Object.keys below does not update these values because they
+	// are properties on the prototype chain)
+	// basically if props is a SyntaxError it will not be overriden as a generic Error
+	var constructor = Error;
+	if (props instanceof Error) { constructor = props.constructor; }
+	var err = new constructor( props.message );
 
 	Object.keys( props ).forEach( function (key) {
 		err[ key ] = props[ key ];
@@ -1852,7 +1859,7 @@ function isIdentifierChar(code, astral) {
 // continue jumps to that label.
 
 var TokenType = function TokenType(label, conf) {
-  if ( conf === void 0 ) conf = {};
+  if ( conf === void 0 ) { conf = {}; }
 
   this.label = label;
   this.keyword = conf.keyword;
@@ -1878,7 +1885,7 @@ var keywords$1 = {};
 
 // Succinct definitions of keyword token types
 function kw(name, options) {
-  if ( options === void 0 ) options = {};
+  if ( options === void 0 ) { options = {}; }
 
   options.keyword = name;
   return keywords$1[name] = new TokenType(name, options)
@@ -1905,6 +1912,7 @@ var types = {
   question: new TokenType("?", beforeExpr),
   arrow: new TokenType("=>", beforeExpr),
   template: new TokenType("template"),
+  invalidTemplate: new TokenType("invalidTemplate"),
   ellipsis: new TokenType("...", beforeExpr),
   backQuote: new TokenType("`", startsExpr),
   dollarBraceL: new TokenType("${", {beforeExpr: true, startsExpr: true}),
@@ -1965,7 +1973,7 @@ var types = {
   _new: kw("new", {beforeExpr: true, startsExpr: true}),
   _this: kw("this", startsExpr),
   _super: kw("super", startsExpr),
-  _class: kw("class"),
+  _class: kw("class", startsExpr),
   _extends: kw("extends", beforeExpr),
   _export: kw("export"),
   _import: kw("import"),
@@ -2173,7 +2181,7 @@ function pushComment(options, array) {
 var plugins = {};
 
 function keywordRegexp(words) {
-  return new RegExp("^(" + words.replace(/ /g, "|") + ")$")
+  return new RegExp("^(?:" + words.replace(/ /g, "|") + ")$")
 }
 
 var Parser = function Parser(options, input, startPos) {
@@ -2374,9 +2382,13 @@ pp.unexpected = function(pos) {
   this.raise(pos != null ? pos : this.start, "Unexpected token");
 };
 
-var DestructuringErrors = function DestructuringErrors() {
-  this.shorthandAssign = this.trailingComma = this.parenthesizedAssign = this.parenthesizedBind = -1;
-};
+function DestructuringErrors() {
+  this.shorthandAssign =
+  this.trailingComma =
+  this.parenthesizedAssign =
+  this.parenthesizedBind =
+    -1;
+}
 
 pp.checkPatternErrors = function(refDestructuringErrors, isAssign) {
   if (!refDestructuringErrors) { return }
@@ -2759,14 +2771,19 @@ pp$1.parseEmptyStatement = function(node) {
 pp$1.parseLabeledStatement = function(node, maybeName, expr) {
   var this$1 = this;
 
-  for (var i = 0; i < this.labels.length; ++i)
-    { if (this$1.labels[i].name === maybeName) { this$1.raise(expr.start, "Label '" + maybeName + "' is already declared"); } }
+  for (var i$1 = 0, list = this$1.labels; i$1 < list.length; i$1 += 1)
+    {
+    var label = list[i$1];
+
+    if (label.name === maybeName)
+      { this$1.raise(expr.start, "Label '" + maybeName + "' is already declared");
+  } }
   var kind = this.type.isLoop ? "loop" : this.type === types._switch ? "switch" : null;
-  for (var i$1 = this.labels.length - 1; i$1 >= 0; i$1--) {
-    var label = this$1.labels[i$1];
-    if (label.statementStart == node.start) {
-      label.statementStart = this$1.start;
-      label.kind = kind;
+  for (var i = this.labels.length - 1; i >= 0; i--) {
+    var label$1 = this$1.labels[i];
+    if (label$1.statementStart == node.start) {
+      label$1.statementStart = this$1.start;
+      label$1.kind = kind;
     } else { break }
   }
   this.labels.push({name: maybeName, kind: kind, statementStart: this.start});
@@ -2792,7 +2809,7 @@ pp$1.parseExpressionStatement = function(node, expr) {
 
 pp$1.parseBlock = function(createNewLexicalScope) {
   var this$1 = this;
-  if ( createNewLexicalScope === void 0 ) createNewLexicalScope = true;
+  if ( createNewLexicalScope === void 0 ) { createNewLexicalScope = true; }
 
   var node = this.startNode();
   node.body = [];
@@ -2914,7 +2931,7 @@ pp$1.parseFunction = function(node, isStatement, allowExpressionBody, isAsync) {
 
 pp$1.parseFunctionParams = function(node) {
   this.expect(types.parenL);
-  node.params = this.parseBindingList(types.parenR, false, this.options.ecmaVersion >= 8, true);
+  node.params = this.parseBindingList(types.parenR, false, this.options.ecmaVersion >= 8);
   this.checkYieldAwaitInDefaultParams();
 };
 
@@ -3048,10 +3065,10 @@ pp$1.parseExport = function(node, exports) {
       node.source = this.type === types.string ? this.parseExprAtom() : this.unexpected();
     } else {
       // check for keywords used as local names
-      for (var i = 0; i < node.specifiers.length; i++) {
-        if (this$1.keywords.test(node.specifiers[i].local.name) || this$1.reservedWords.test(node.specifiers[i].local.name)) {
-          this$1.unexpected(node.specifiers[i].local.start);
-        }
+      for (var i = 0, list = node.specifiers; i < list.length; i += 1) {
+        var spec = list[i];
+
+        this$1.checkUnreserved(spec.local);
       }
 
       node.source = null;
@@ -3075,12 +3092,17 @@ pp$1.checkPatternExport = function(exports, pat) {
   if (type == "Identifier")
     { this.checkExport(exports, pat.name, pat.start); }
   else if (type == "ObjectPattern")
-    { for (var i = 0; i < pat.properties.length; ++i)
-      { this$1.checkPatternExport(exports, pat.properties[i].value); } }
+    { for (var i = 0, list = pat.properties; i < list.length; i += 1)
+      {
+        var prop = list[i];
+
+        this$1.checkPatternExport(exports, prop.value);
+      } }
   else if (type == "ArrayPattern")
-    { for (var i$1 = 0; i$1 < pat.elements.length; ++i$1) {
-      var elt = pat.elements[i$1];
-      if (elt) { this$1.checkPatternExport(exports, elt); }
+    { for (var i$1 = 0, list$1 = pat.elements; i$1 < list$1.length; i$1 += 1) {
+      var elt = list$1[i$1];
+
+        if (elt) { this$1.checkPatternExport(exports, elt); }
     } }
   else if (type == "AssignmentPattern")
     { this.checkPatternExport(exports, pat.left); }
@@ -3092,8 +3114,12 @@ pp$1.checkVariableExport = function(exports, decls) {
   var this$1 = this;
 
   if (!exports) { return }
-  for (var i = 0; i < decls.length; i++)
-    { this$1.checkPatternExport(exports, decls[i].id); }
+  for (var i = 0, list = decls; i < list.length; i += 1)
+    {
+    var decl = list[i];
+
+    this$1.checkPatternExport(exports, decl.id);
+  }
 };
 
 pp$1.shouldParseExportStatement = function() {
@@ -3180,9 +3206,8 @@ pp$1.parseImportSpecifiers = function() {
     if (this$1.eatContextual("as")) {
       node$2.local = this$1.parseIdent();
     } else {
+      this$1.checkUnreserved(node$2.imported);
       node$2.local = node$2.imported;
-      if (this$1.isKeyword(node$2.local.name)) { this$1.unexpected(node$2.local.start); }
-      if (this$1.reservedWordsStrict.test(node$2.local.name)) { this$1.raiseRecoverable(node$2.local.start, "The keyword '" + node$2.local.name + "' is reserved"); }
     }
     this$1.checkLVal(node$2.local, "let");
     nodes.push(this$1.finishNode(node$2, "ImportSpecifier"));
@@ -3211,9 +3236,10 @@ pp$2.toAssignable = function(node, isBinding) {
 
     case "ObjectExpression":
       node.type = "ObjectPattern";
-      for (var i = 0; i < node.properties.length; i++) {
-        var prop = node.properties[i];
-        if (prop.kind !== "init") { this$1.raise(prop.key.start, "Object pattern can't contain getter or setter"); }
+      for (var i = 0, list = node.properties; i < list.length; i += 1) {
+        var prop = list[i];
+
+      if (prop.kind !== "init") { this$1.raise(prop.key.start, "Object pattern can't contain getter or setter"); }
         this$1.toAssignable(prop.value, isBinding);
       }
       break
@@ -3238,7 +3264,7 @@ pp$2.toAssignable = function(node, isBinding) {
       break
 
     case "ParenthesizedExpression":
-      node.expression = this.toAssignable(node.expression, isBinding);
+      this.toAssignable(node.expression, isBinding);
       break
 
     case "MemberExpression":
@@ -3265,12 +3291,10 @@ pp$2.toAssignableList = function(exprList, isBinding) {
       last.type = "RestElement";
       var arg = last.argument;
       this.toAssignable(arg, isBinding);
-      if (arg.type !== "Identifier" && arg.type !== "MemberExpression" && arg.type !== "ArrayPattern")
-        { this.unexpected(arg.start); }
       --end;
     }
 
-    if (isBinding && last && last.type === "RestElement" && last.argument.type !== "Identifier")
+    if (this.options.ecmaVersion === 6 && isBinding && last && last.type === "RestElement" && last.argument.type !== "Identifier")
       { this.unexpected(last.argument.start); }
   }
   for (var i = 0; i < end; i++) {
@@ -3289,13 +3313,15 @@ pp$2.parseSpread = function(refDestructuringErrors) {
   return this.finishNode(node, "SpreadElement")
 };
 
-pp$2.parseRest = function(allowNonIdent) {
+pp$2.parseRestBinding = function() {
   var node = this.startNode();
   this.next();
 
   // RestElement inside of a function parameter must be an identifier
-  if (allowNonIdent) { node.argument = this.type === types.name ? this.parseIdent() : this.unexpected(); }
-  else { node.argument = this.type === types.name || this.type === types.bracketL ? this.parseBindingAtom() : this.unexpected(); }
+  if (this.options.ecmaVersion === 6 && this.type !== types.name)
+    { this.unexpected(); }
+
+  node.argument = this.parseBindingAtom();
 
   return this.finishNode(node, "RestElement")
 };
@@ -3322,7 +3348,7 @@ pp$2.parseBindingAtom = function() {
   }
 };
 
-pp$2.parseBindingList = function(close, allowEmpty, allowTrailingComma, allowNonIdent) {
+pp$2.parseBindingList = function(close, allowEmpty, allowTrailingComma) {
   var this$1 = this;
 
   var elts = [], first = true;
@@ -3334,7 +3360,7 @@ pp$2.parseBindingList = function(close, allowEmpty, allowTrailingComma, allowNon
     } else if (allowTrailingComma && this$1.afterTrailingComma(close)) {
       break
     } else if (this$1.type === types.ellipsis) {
-      var rest = this$1.parseRest(allowNonIdent);
+      var rest = this$1.parseRestBinding();
       this$1.parseBindingListItem(rest);
       elts.push(rest);
       if (this$1.type === types.comma) { this$1.raise(this$1.start, "Comma is not permitted after the rest element"); }
@@ -3403,14 +3429,19 @@ pp$2.checkLVal = function(expr, bindingType, checkClashes) {
     break
 
   case "ObjectPattern":
-    for (var i = 0; i < expr.properties.length; i++)
-      { this$1.checkLVal(expr.properties[i].value, bindingType, checkClashes); }
+    for (var i = 0, list = expr.properties; i < list.length; i += 1)
+      {
+    var prop = list[i];
+
+    this$1.checkLVal(prop.value, bindingType, checkClashes);
+  }
     break
 
   case "ArrayPattern":
-    for (var i$1 = 0; i$1 < expr.elements.length; i$1++) {
-      var elem = expr.elements[i$1];
-      if (elem) { this$1.checkLVal(elem, bindingType, checkClashes); }
+    for (var i$1 = 0, list$1 = expr.elements; i$1 < list$1.length; i$1 += 1) {
+      var elem = list$1[i$1];
+
+    if (elem) { this$1.checkLVal(elem, bindingType, checkClashes); }
     }
     break
 
@@ -3712,7 +3743,7 @@ pp$3.parseSubscripts = function(base, startPos, startLoc, noCalls) {
     } else if (this$1.type === types.backQuote) {
       var node$2 = this$1.startNodeAt(startPos, startLoc);
       node$2.tag = base;
-      node$2.quasi = this$1.parseTemplate();
+      node$2.quasi = this$1.parseTemplate({isTagged: true});
       base = this$1.finishNode(node$2, "TaggedTemplateExpression");
     } else {
       return base
@@ -3843,7 +3874,7 @@ pp$3.parseParenAndDistinguishExpression = function(canBeArrow) {
         break
       } else if (this$1.type === types.ellipsis) {
         spreadStart = this$1.start;
-        exprList.push(this$1.parseParenItem(this$1.parseRest()));
+        exprList.push(this$1.parseParenItem(this$1.parseRestBinding()));
         if (this$1.type === types.comma) { this$1.raise(this$1.start, "Comma is not permitted after the rest element"); }
         break
       } else {
@@ -3928,30 +3959,44 @@ pp$3.parseNew = function() {
 
 // Parse template expression.
 
-pp$3.parseTemplateElement = function() {
+pp$3.parseTemplateElement = function(ref) {
+  var isTagged = ref.isTagged;
+
   var elem = this.startNode();
-  elem.value = {
-    raw: this.input.slice(this.start, this.end).replace(/\r\n?/g, "\n"),
-    cooked: this.value
-  };
+  if (this.type === types.invalidTemplate) {
+    if (!isTagged) {
+      this.raiseRecoverable(this.start, "Bad escape sequence in untagged template literal");
+    }
+    elem.value = {
+      raw: this.value,
+      cooked: null
+    };
+  } else {
+    elem.value = {
+      raw: this.input.slice(this.start, this.end).replace(/\r\n?/g, "\n"),
+      cooked: this.value
+    };
+  }
   this.next();
   elem.tail = this.type === types.backQuote;
   return this.finishNode(elem, "TemplateElement")
 };
 
-pp$3.parseTemplate = function() {
+pp$3.parseTemplate = function(ref) {
   var this$1 = this;
+  if ( ref === void 0 ) { ref = {}; }
+  var isTagged = ref.isTagged; if ( isTagged === void 0 ) { isTagged = false; }
 
   var node = this.startNode();
   this.next();
   node.expressions = [];
-  var curElt = this.parseTemplateElement();
+  var curElt = this.parseTemplateElement({isTagged: isTagged});
   node.quasis = [curElt];
   while (!curElt.tail) {
     this$1.expect(types.dollarBraceL);
     node.expressions.push(this$1.parseExpression());
     this$1.expect(types.braceR);
-    node.quasis.push(curElt = this$1.parseTemplateElement());
+    node.quasis.push(curElt = this$1.parseTemplateElement({isTagged: isTagged}));
   }
   this.next();
   return this.finishNode(node, "TemplateLiteral")
@@ -3959,6 +4004,12 @@ pp$3.parseTemplate = function() {
 
 // Parse an object literal or binding pattern.
 
+pp$3.isAsyncProp = function(prop) {
+  return !prop.computed && prop.key.type === "Identifier" && prop.key.name === "async" &&
+    (this.type === types.name || this.type === types.num || this.type === types.string || this.type === types.bracketL) &&
+    !lineBreak.test(this.input.slice(this.lastTokEnd, this.start))
+};
+
 pp$3.parseObj = function(isPattern, refDestructuringErrors) {
   var this$1 = this;
 
@@ -3983,9 +4034,7 @@ pp$3.parseObj = function(isPattern, refDestructuringErrors) {
         { isGenerator = this$1.eat(types.star); }
     }
     this$1.parsePropertyName(prop);
-    if (!isPattern && this$1.options.ecmaVersion >= 8 && !isGenerator && !prop.computed &&
-        prop.key.type === "Identifier" && prop.key.name === "async" && this$1.type !== types.parenL &&
-        this$1.type !== types.colon && !this$1.canInsertSemicolon()) {
+    if (!isPattern && this$1.options.ecmaVersion >= 8 && !isGenerator && this$1.isAsyncProp(prop)) {
       isAsync = true;
       this$1.parsePropertyName(prop, refDestructuringErrors);
     } else {
@@ -4029,11 +4078,7 @@ pp$3.parsePropertyValue = function(prop, isPattern, isGenerator, isAsync, startP
         { this.raiseRecoverable(prop.value.params[0].start, "Setter cannot use rest params"); }
     }
   } else if (this.options.ecmaVersion >= 6 && !prop.computed && prop.key.type === "Identifier") {
-    if (this.keywords.test(prop.key.name) ||
-        (this.strict ? this.reservedWordsStrict : this.reservedWords).test(prop.key.name) ||
-        (this.inGenerator && prop.key.name == "yield") ||
-        (this.inAsync && prop.key.name == "await"))
-      { this.raiseRecoverable(prop.key.start, "'" + prop.key.name + "' can not be used as shorthand property"); }
+    this.checkUnreserved(prop.key);
     prop.kind = "init";
     if (isPattern) {
       prop.value = this.parseMaybeDefault(startPos, startLoc, prop.key);
@@ -4177,8 +4222,12 @@ pp$3.parseFunctionBody = function(node, isArrowFunction) {
 };
 
 pp$3.isSimpleParamList = function(params) {
-  for (var i = 0; i < params.length; i++)
-    { if (params[i].type !== "Identifier") { return false } }
+  for (var i = 0, list = params; i < list.length; i += 1)
+    {
+    var param = list[i];
+
+    if (param.type !== "Identifier") { return false
+  } }
   return true
 };
 
@@ -4189,7 +4238,12 @@ pp$3.checkParams = function(node, allowDuplicates) {
   var this$1 = this;
 
   var nameHash = {};
-  for (var i = 0; i < node.params.length; i++) { this$1.checkLVal(node.params[i], "var", allowDuplicates ? null : nameHash); }
+  for (var i = 0, list = node.params; i < list.length; i += 1)
+    {
+    var param = list[i];
+
+    this$1.checkLVal(param, "var", allowDuplicates ? null : nameHash);
+  }
 };
 
 // Parses a comma-separated list of expressions, and returns them as
@@ -4227,26 +4281,38 @@ pp$3.parseExprList = function(close, allowTrailingComma, allowEmpty, refDestruct
 // when parsing properties), it will also convert keywords into
 // identifiers.
 
-pp$3.parseIdent = function(liberal) {
+pp$3.checkUnreserved = function(ref) {
+  var start = ref.start;
+  var end = ref.end;
+  var name = ref.name;
+
+  if (this.inGenerator && name === "yield")
+    { this.raiseRecoverable(start, "Can not use 'yield' as identifier inside a generator"); }
+  if (this.inAsync && name === "await")
+    { this.raiseRecoverable(start, "Can not use 'await' as identifier inside an async function"); }
+  if (this.isKeyword(name))
+    { this.raise(start, ("Unexpected keyword '" + name + "'")); }
+  if (this.options.ecmaVersion < 6 &&
+    this.input.slice(start, end).indexOf("\\") != -1) { return }
+  var re = this.strict ? this.reservedWordsStrict : this.reservedWords;
+  if (re.test(name))
+    { this.raiseRecoverable(start, ("The keyword '" + name + "' is reserved")); }
+};
+
+pp$3.parseIdent = function(liberal, isBinding) {
   var node = this.startNode();
   if (liberal && this.options.allowReserved == "never") { liberal = false; }
   if (this.type === types.name) {
-    if (!liberal && (this.strict ? this.reservedWordsStrict : this.reservedWords).test(this.value) &&
-        (this.options.ecmaVersion >= 6 ||
-         this.input.slice(this.start, this.end).indexOf("\\") == -1))
-      { this.raiseRecoverable(this.start, "The keyword '" + this.value + "' is reserved"); }
-    if (this.inGenerator && this.value === "yield")
-      { this.raiseRecoverable(this.start, "Can not use 'yield' as identifier inside a generator"); }
-    if (this.inAsync && this.value === "await")
-      { this.raiseRecoverable(this.start, "Can not use 'await' as identifier inside an async function"); }
     node.name = this.value;
-  } else if (liberal && this.type.keyword) {
+  } else if (this.type.keyword) {
     node.name = this.type.keyword;
   } else {
     this.unexpected();
   }
   this.next();
-  return this.finishNode(node, "Identifier")
+  this.finishNode(node, "Identifier");
+  if (!liberal) { this.checkUnreserved(node); }
+  return node
 };
 
 // Parses yield expression inside generator.
@@ -4303,11 +4369,14 @@ var pp$5 = Parser.prototype;
 
 // Object.assign polyfill
 var assign$1 = Object.assign || function(target) {
+  var arguments$1 = arguments;
+
   var sources = [], len = arguments.length - 1;
-  while ( len-- > 0 ) sources[ len ] = arguments[ len + 1 ];
+  while ( len-- > 0 ) { sources[ len ] = arguments$1[ len + 1 ]; }
+
+  for (var i = 0, list = sources; i < list.length; i += 1) {
+    var source = list[i];
 
-  for (var i = 0; i < sources.length; i++) {
-    var source = sources[i];
     for (var key in source) {
       if (has(source, key)) {
         target[key] = source[key];
@@ -4436,10 +4505,11 @@ var TokContext = function TokContext(token, isExpr, preserveSpace, override, gen
 var types$1 = {
   b_stat: new TokContext("{", false),
   b_expr: new TokContext("{", true),
-  b_tmpl: new TokContext("${", true),
+  b_tmpl: new TokContext("${", false),
   p_stat: new TokContext("(", false),
   p_expr: new TokContext("(", true),
-  q_tmpl: new TokContext("`", true, true, function (p) { return p.readTmplToken(); }),
+  q_tmpl: new TokContext("`", true, true, function (p) { return p.tryReadTemplateToken(); }),
+  f_stat: new TokContext("function", false),
   f_expr: new TokContext("function", true),
   f_expr_gen: new TokContext("function", true, false, null, true),
   f_gen: new TokContext("function", false, false, null, true)
@@ -4452,25 +4522,34 @@ pp$7.initialContext = function() {
 };
 
 pp$7.braceIsBlock = function(prevType) {
-  if (prevType === types.colon) {
-    var parent = this.curContext();
-    if (parent === types$1.b_stat || parent === types$1.b_expr)
-      { return !parent.isExpr }
-  }
-  if (prevType === types._return)
+  var parent = this.curContext();
+  if (parent === types$1.f_expr || parent === types$1.f_stat)
+    { return true }
+  if (prevType === types.colon && (parent === types$1.b_stat || parent === types$1.b_expr))
+    { return !parent.isExpr }
+
+  // The check for `tt.name && exprAllowed` detects whether we are
+  // after a `yield` or `of` construct. See the `updateContext` for
+  // `tt.name`.
+  if (prevType === types._return || prevType == types.name && this.exprAllowed)
     { return lineBreak.test(this.input.slice(this.lastTokEnd, this.start)) }
   if (prevType === types._else || prevType === types.semi || prevType === types.eof || prevType === types.parenR || prevType == types.arrow)
     { return true }
   if (prevType == types.braceL)
-    { return this.curContext() === types$1.b_stat }
+    { return parent === types$1.b_stat }
+  if (prevType == types._var || prevType == types.name)
+    { return false }
   return !this.exprAllowed
 };
 
 pp$7.inGeneratorContext = function() {
   var this$1 = this;
 
-  for (var i = this.context.length - 1; i >= 0; i--)
-    { if (this$1.context[i].generator) { return true } }
+  for (var i = this.context.length - 1; i >= 1; i--) {
+    var context = this$1.context[i];
+    if (context.token === "function")
+      { return context.generator }
+  }
   return false
 };
 
@@ -4491,15 +4570,11 @@ types.parenR.updateContext = types.braceR.updateContext = function() {
     this.exprAllowed = true;
     return
   }
-  var out = this.context.pop(), cur;
-  if (out === types$1.b_stat && (cur = this.curContext()) && cur.token === "function") {
-    this.context.pop();
-    this.exprAllowed = false;
-  } else if (out === types$1.b_tmpl) {
-    this.exprAllowed = true;
-  } else {
-    this.exprAllowed = !out.isExpr;
+  var out = this.context.pop();
+  if (out === types$1.b_stat && this.curContext().token === "function") {
+    out = this.context.pop();
   }
+  this.exprAllowed = !out.isExpr;
 };
 
 types.braceL.updateContext = function(prevType) {
@@ -4522,10 +4597,12 @@ types.incDec.updateContext = function() {
   // tokExprAllowed stays unchanged
 };
 
-types._function.updateContext = function(prevType) {
+types._function.updateContext = types._class.updateContext = function(prevType) {
   if (prevType.beforeExpr && prevType !== types.semi && prevType !== types._else &&
       !((prevType === types.colon || prevType === types.braceL) && this.curContext() === types$1.b_stat))
     { this.context.push(types$1.f_expr); }
+  else
+    { this.context.push(types$1.f_stat); }
   this.exprAllowed = false;
 };
 
@@ -4539,10 +4616,11 @@ types.backQuote.updateContext = function() {
 
 types.star.updateContext = function(prevType) {
   if (prevType == types._function) {
-    if (this.curContext() === types$1.f_expr)
-      { this.context[this.context.length - 1] = types$1.f_expr_gen; }
+    var index = this.context.length - 1;
+    if (this.context[index] === types$1.f_expr)
+      { this.context[index] = types$1.f_expr_gen; }
     else
-      { this.context.push(types$1.f_gen); }
+      { this.context[index] = types$1.f_gen; }
   }
   this.exprAllowed = true;
 };
@@ -4677,9 +4755,8 @@ pp$8.skipLineComment = function(startSkip) {
   var start = this.pos;
   var startLoc = this.options.onComment && this.curPosition();
   var ch = this.input.charCodeAt(this.pos += startSkip);
-  while (this.pos < this.input.length && ch !== 10 && ch !== 13 && ch !== 8232 && ch !== 8233) {
-    ++this$1.pos;
-    ch = this$1.input.charCodeAt(this$1.pos);
+  while (this.pos < this.input.length && !isNewLine(ch)) {
+    ch = this$1.input.charCodeAt(++this$1.pos);
   }
   if (this.options.onComment)
     { this.options.onComment(false, this.input.slice(start + startSkip, this.pos), start, this.pos,
@@ -4808,7 +4885,7 @@ pp$8.readToken_plus_min = function(code) { // '+-'
   var next = this.input.charCodeAt(this.pos + 1);
   if (next === code) {
     if (next == 45 && this.input.charCodeAt(this.pos + 2) == 62 &&
-        lineBreak.test(this.input.slice(this.lastTokEnd, this.pos))) {
+        (this.lastTokEnd === 0 || lineBreak.test(this.input.slice(this.lastTokEnd, this.pos)))) {
       // A `-->` line comment
       this.skipLineComment(3);
       this.skipSpace();
@@ -5061,7 +5138,8 @@ pp$8.readNumber = function(startsWithDot) {
   var str = this.input.slice(start, this.pos), val;
   if (isFloat) { val = parseFloat(str); }
   else if (!octal || str.length === 1) { val = parseInt(str, 10); }
-  else if (/[89]/.test(str) || this.strict) { this.raise(start, "Invalid number"); }
+  else if (this.strict) { this.raise(start, "Invalid number"); }
+  else if (/[89]/.test(str)) { val = parseInt(str, 10); }
   else { val = parseInt(str, 8); }
   return this.finishToken(types.num, val)
 };
@@ -5071,12 +5149,12 @@ pp$8.readNumber = function(startsWithDot) {
 pp$8.readCodePoint = function() {
   var ch = this.input.charCodeAt(this.pos), code;
 
-  if (ch === 123) {
+  if (ch === 123) { // '{'
     if (this.options.ecmaVersion < 6) { this.unexpected(); }
     var codePos = ++this.pos;
     code = this.readHexChar(this.input.indexOf("}", this.pos) - this.pos);
     ++this.pos;
-    if (code > 0x10FFFF) { this.raise(codePos, "Code point out of bounds"); }
+    if (code > 0x10FFFF) { this.invalidStringToken(codePos, "Code point out of bounds"); }
   } else {
     code = this.readHexChar(4);
   }
@@ -5113,6 +5191,31 @@ pp$8.readString = function(quote) {
 
 // Reads template string tokens.
 
+var INVALID_TEMPLATE_ESCAPE_ERROR = {};
+
+pp$8.tryReadTemplateToken = function() {
+  this.inTemplateElement = true;
+  try {
+    this.readTmplToken();
+  } catch (err) {
+    if (err === INVALID_TEMPLATE_ESCAPE_ERROR) {
+      this.readInvalidTemplateToken();
+    } else {
+      throw err
+    }
+  }
+
+  this.inTemplateElement = false;
+};
+
+pp$8.invalidStringToken = function(position, message) {
+  if (this.inTemplateElement && this.options.ecmaVersion >= 9) {
+    throw INVALID_TEMPLATE_ESCAPE_ERROR
+  } else {
+    this.raise(position, message);
+  }
+};
+
 pp$8.readTmplToken = function() {
   var this$1 = this;
 
@@ -5121,7 +5224,7 @@ pp$8.readTmplToken = function() {
     if (this$1.pos >= this$1.input.length) { this$1.raise(this$1.start, "Unterminated template"); }
     var ch = this$1.input.charCodeAt(this$1.pos);
     if (ch === 96 || ch === 36 && this$1.input.charCodeAt(this$1.pos + 1) === 123) { // '`', '${'
-      if (this$1.pos === this$1.start && this$1.type === types.template) {
+      if (this$1.pos === this$1.start && (this$1.type === types.template || this$1.type === types.invalidTemplate)) {
         if (ch === 36) {
           this$1.pos += 2;
           return this$1.finishToken(types.dollarBraceL)
@@ -5161,6 +5264,31 @@ pp$8.readTmplToken = function() {
   }
 };
 
+// Reads a template token to search for the end, without validating any escape sequences
+pp$8.readInvalidTemplateToken = function() {
+  var this$1 = this;
+
+  for (; this.pos < this.input.length; this.pos++) {
+    switch (this$1.input[this$1.pos]) {
+    case "\\":
+      ++this$1.pos;
+      break
+
+    case "$":
+      if (this$1.input[this$1.pos + 1] !== "{") {
+        break
+      }
+    // falls through
+
+    case "`":
+      return this$1.finishToken(types.invalidTemplate, this$1.input.slice(this$1.start, this$1.pos))
+
+    // no default
+    }
+  }
+  this.raise(this.start, "Unterminated template");
+};
+
 // Used to read escaped characters
 
 pp$8.readEscapedChar = function(inTemplate) {
@@ -5188,7 +5316,7 @@ pp$8.readEscapedChar = function(inTemplate) {
         octal = parseInt(octalStr, 8);
       }
       if (octalStr !== "0" && (this.strict || inTemplate)) {
-        this.raise(this.pos - 2, "Octal literal in strict mode");
+        this.invalidStringToken(this.pos - 2, "Octal literal in strict mode");
       }
       this.pos += octalStr.length - 1;
       return String.fromCharCode(octal)
@@ -5202,7 +5330,7 @@ pp$8.readEscapedChar = function(inTemplate) {
 pp$8.readHexChar = function(len) {
   var codePos = this.pos;
   var n = this.readInt(16, len);
-  if (n === null) { this.raise(codePos, "Bad character escape sequence"); }
+  if (n === null) { this.invalidStringToken(codePos, "Bad character escape sequence"); }
   return n
 };
 
@@ -5227,11 +5355,11 @@ pp$8.readWord1 = function() {
       word += this$1.input.slice(chunkStart, this$1.pos);
       var escStart = this$1.pos;
       if (this$1.input.charCodeAt(++this$1.pos) != 117) // "u"
-        { this$1.raise(this$1.pos, "Expecting Unicode escape sequence \\uXXXX"); }
+        { this$1.invalidStringToken(this$1.pos, "Expecting Unicode escape sequence \\uXXXX"); }
       ++this$1.pos;
       var esc = this$1.readCodePoint();
       if (!(first ? isIdentifierStart : isIdentifierChar)(esc, astral))
-        { this$1.raise(escStart, "Invalid Unicode escape"); }
+        { this$1.invalidStringToken(escStart, "Invalid Unicode escape"); }
       word += codePointToString(esc);
       chunkStart = this$1.pos;
     } else {
@@ -5255,29 +5383,6 @@ pp$8.readWord = function() {
   return this.finishToken(type, word)
 };
 
-// Acorn is a tiny, fast JavaScript parser written in JavaScript.
-//
-// Acorn was written by Marijn Haverbeke, Ingvar Stepanyan, and
-// various contributors and released under an MIT license.
-//
-// Git repositories for Acorn are available at
-//
-//     http://marijnhaverbeke.nl/git/acorn
-//     https://github.com/ternjs/acorn.git
-//
-// Please use the [github bug tracker][ghbt] to report issues.
-//
-// [ghbt]: https://github.com/ternjs/acorn/issues
-//
-// This file defines the main parser interface. The library also comes
-// with a [error-tolerant parser][dammit] and an
-// [abstract syntax tree walker][walk], defined in other files.
-//
-// [dammit]: acorn_loose.js
-// [walk]: util/walk.js
-
-
-
 // The main exported interface (under `self.acorn` when in the
 // browser) is a `parse` function that takes a code string and
 // returns an abstract syntax tree as specified by [Mozilla parser
@@ -5289,22 +5394,6 @@ function parse(input, options) {
   return new Parser(options, input).parse()
 }
 
-// This function tries to parse a single expression at a given
-// offset in a string. Useful for parsing mixed-language formats
-// that embed JavaScript expressions.
-
-
-
-// Acorn is organized as a tokenizer and a recursive-descent parser.
-// The `tokenizer` export provides an interface to the tokenizer.
-
-
-
-// This is a terrible kludge to support the existing, pre-ES6
-// interface where the loose parser module retroactively adds exports
-// to this module.
- // eslint-disable-line camelcase
-
 function getLocator$1(source, options) {
     if (options === void 0) { options = {}; }
     var offsetLine = options.offsetLine || 0;
@@ -6126,33 +6215,35 @@ var BlockStatement = (function (Statement$$1) {
 	return BlockStatement;
 }(Statement));
 
-function isReference ( node, parent ) {
-	if ( node.type === 'MemberExpression' ) {
-		return !node.computed && isReference( node.object, node );
+function isReference (node, parent) {
+	if (node.type === 'MemberExpression') {
+		return !node.computed && isReference(node.object, node);
 	}
 
-	if ( node.type === 'Identifier' ) {
+	if (node.type === 'Identifier') {
 		// the only time we could have an identifier node without a parent is
 		// if it's the entire body of a function without a block statement –
 		// i.e. an arrow function expression like `a => a`
-		if ( !parent ) return true;
+		if (!parent) return true;
 
 		// TODO is this right?
-		if ( parent.type === 'MemberExpression' || parent.type === 'MethodDefinition' ) {
+		if (parent.type === 'MemberExpression' || parent.type === 'MethodDefinition') {
 			return parent.computed || node === parent.object;
 		}
 
 		// disregard the `bar` in `{ bar: foo }`, but keep it in `{ [bar]: foo }`
-		if ( parent.type === 'Property' ) return parent.computed || node === parent.value;
+		if (parent.type === 'Property') return parent.computed || node === parent.value;
 
 		// disregard the `bar` in `class Foo { bar () {...} }`
-		if ( parent.type === 'MethodDefinition' ) return false;
+		if (parent.type === 'MethodDefinition') return false;
 
 		// disregard the `bar` in `export { foo as bar }`
-		if ( parent.type === 'ExportSpecifier' && node !== parent.local ) return;
+		if (parent.type === 'ExportSpecifier' && node !== parent.local) return false;
 
 		return true;
 	}
+
+	return false;
 }
 
 function flatten ( node ) {
@@ -7183,7 +7274,7 @@ var IfStatement = (function (Statement$$1) {
 					}
 
 					else if ( statementsWithIfStatements.has( this.parent.type ) ) {
-						code.insertRight( this.start, '{}' );
+						code.prependRight( this.start, '{}' );
 					}
 				}
 			}
@@ -9175,12 +9266,20 @@ function transform ( bundle, source, id, plugins ) {
 				if ( !object.code ) { object.code = code; }
 
 				if ( pos !== undefined ) {
-					object.pos = pos;
-					var ref = locate( previous, pos, { offsetLine: 1 });
-					var line = ref.line;
-					var column = ref.column;
-					object.loc = { file: id, line: line, column: column };
-					object.frame = getCodeFrame( previous, line, column );
+					if ( pos.line !== undefined && pos.column !== undefined ) {
+						var line = pos.line;
+						var column = pos.column;
+						object.loc = { file: id, line: line, column: column };
+						object.frame = getCodeFrame( previous, line, column );
+					}
+					else {
+						object.pos = pos;
+						var ref = locate( previous, pos, { offsetLine: 1 });
+						var line$1 = ref.line;
+						var column$1 = ref.column;
+						object.loc = { file: id, line: line$1, column: column$1 };
+						object.frame = getCodeFrame( previous, line$1, column$1 );
+					}
 				}
 
 				return object;
@@ -9511,7 +9610,7 @@ var BundleScope = (function (Scope$$1) {
 	return BundleScope;
 }(Scope));
 
-var Bundle$$1 = function Bundle$$1 ( options ) {
+var Bundle = function Bundle ( options ) {
 	var this$1 = this;
 
 	this.cachedModules = new Map();
@@ -9561,10 +9660,11 @@ var Bundle$$1 = function Bundle$$1 ( options ) {
 	this.hasLoaders = loaders.length !== 0;
 	this.load = first( loaders.concat( load ) );
 
-	this.getPath = typeof options.paths === 'function' ?
-		( function (id) { return options.paths( id ) || this$1.getPathRelativeToEntryDirname( id ); } ) :
-		options.paths ?
-			( function (id) { return options.paths.hasOwnProperty( id ) ? options.paths[ id ] : this$1.getPathRelativeToEntryDirname( id ); } ) :
+	var optionsPaths = options.paths;
+	this.getPath = typeof optionsPaths === 'function' ?
+		( function (id) { return optionsPaths( id ) || this$1.getPathRelativeToEntryDirname( id ); } ) :
+		optionsPaths ?
+			( function (id) { return optionsPaths.hasOwnProperty( id ) ? optionsPaths[ id ] : this$1.getPathRelativeToEntryDirname( id ); } ) :
 			function (id) { return this$1.getPathRelativeToEntryDirname( id ); };
 
 	this.scope = new BundleScope();
@@ -9579,12 +9679,13 @@ var Bundle$$1 = function Bundle$$1 ( options ) {
 
 	this.context = String( options.context );
 
-	if ( typeof options.moduleContext === 'function' ) {
-		this.getModuleContext = function (id) { return options.moduleContext( id ) || this$1.context; };
-	} else if ( typeof options.moduleContext === 'object' ) {
+	var optionsModuleContext = options.moduleContext;
+	if ( typeof optionsModuleContext === 'function' ) {
+		this.getModuleContext = function (id) { return optionsModuleContext( id ) || this$1.context; };
+	} else if ( typeof optionsModuleContext === 'object' ) {
 		var moduleContext = new Map();
-		Object.keys( options.moduleContext ).forEach( function (key) {
-			moduleContext.set( resolve( key ), options.moduleContext[ key ] );
+		Object.keys( optionsModuleContext ).forEach( function (key) {
+			moduleContext.set( resolve( key ), optionsModuleContext[ key ] );
 		});
 		this.getModuleContext = function (id) { return moduleContext.get( id ) || this$1.context; };
 	} else {
@@ -9607,7 +9708,7 @@ var Bundle$$1 = function Bundle$$1 ( options ) {
 	this.dependentExpressions = [];
 };
 
-Bundle$$1.prototype.build = function build () {
+Bundle.prototype.build = function build () {
 		var this$1 = this;
 
 	// Phase 1 – discovery. We load the entry module and find which
@@ -9615,6 +9716,13 @@ Bundle$$1.prototype.build = function build () {
 	// of the entry module's dependencies
 	return this.resolveId( this.entry, undefined )
 		.then( function (id) {
+			if ( id === false ) {
+				error({
+					code: 'UNRESOLVED_ENTRY',
+					message: "Entry module cannot be external"
+				});
+			}
+
 			if ( id == null ) {
 				error({
 					code: 'UNRESOLVED_ENTRY',
@@ -9721,7 +9829,7 @@ Bundle$$1.prototype.build = function build () {
 		});
 };
 
-Bundle$$1.prototype.deconflict = function deconflict () {
+Bundle.prototype.deconflict = function deconflict () {
 	var used = blank();
 
 	// ensure no conflicts with globals
@@ -9771,7 +9879,7 @@ Bundle$$1.prototype.deconflict = function deconflict () {
 	this.scope.deshadow( toDeshadow );
 };
 
-Bundle$$1.prototype.fetchModule = function fetchModule ( id, importer ) {
+Bundle.prototype.fetchModule = function fetchModule ( id, importer ) {
 		var this$1 = this;
 
 	// short-circuit cycles
@@ -9859,7 +9967,7 @@ Bundle$$1.prototype.fetchModule = function fetchModule ( id, importer ) {
 		});
 };
 
-Bundle$$1.prototype.fetchAllDependencies = function fetchAllDependencies ( module ) {
+Bundle.prototype.fetchAllDependencies = function fetchAllDependencies ( module ) {
 		var this$1 = this;
 
 	return mapSequence( module.sources, function (source) {
@@ -9927,7 +10035,7 @@ Bundle$$1.prototype.fetchAllDependencies = function fetchAllDependencies ( modul
 	});
 };
 
-Bundle$$1.prototype.getPathRelativeToEntryDirname = function getPathRelativeToEntryDirname ( resolvedId ) {
+Bundle.prototype.getPathRelativeToEntryDirname = function getPathRelativeToEntryDirname ( resolvedId ) {
 	if ( isRelative( resolvedId ) || isAbsolute( resolvedId ) ) {
 		var entryDirname = dirname( this.entryId );
 		var relativeToEntry = normalize( relative( entryDirname, resolvedId ) );
@@ -9938,7 +10046,7 @@ Bundle$$1.prototype.getPathRelativeToEntryDirname = function getPathRelativeToEn
 	return resolvedId;
 };
 
-Bundle$$1.prototype.render = function render ( options ) {
+Bundle.prototype.render = function render ( options ) {
 		var this$1 = this;
 		if ( options === void 0 ) options = {};
 
@@ -10057,7 +10165,7 @@ Bundle$$1.prototype.render = function render ( options ) {
 	return { code: code, map: map };
 };
 
-Bundle$$1.prototype.sort = function sort () {
+Bundle.prototype.sort = function sort () {
 		var this$1 = this;
 
 	var hasCycles;
@@ -10145,7 +10253,7 @@ Bundle$$1.prototype.sort = function sort () {
 	return ordered;
 };
 
-Bundle$$1.prototype.warn = function warn ( warning ) {
+Bundle.prototype.warn = function warn ( warning ) {
 	warning.toString = function () {
 		var str = '';
 
@@ -10159,7 +10267,7 @@ Bundle$$1.prototype.warn = function warn ( warning ) {
 	this.onwarn( warning );
 };
 
-var VERSION = '0.43.0';
+var VERSION = '0.43.1';
 
 var ALLOWED_KEYS = [
 	'acorn',
@@ -10195,15 +10303,7 @@ var ALLOWED_KEYS = [
 	'watch'
 ];
 
-function checkOptions ( options ) {
-	if ( !options ) {
-		throw new Error( 'You must supply an options object to rollup' );
-	}
-
-	if ( options.transform || options.load || options.resolveId || options.resolveExternal ) {
-		throw new Error( 'The `transform`, `load`, `resolveId` and `resolveExternal` options are deprecated in favour of a unified plugin API. See https://github.com/rollup/rollup/wiki/Plugins for details' );
-	}
-
+function checkAmd ( options ) {
 	if ( options.moduleId ) {
 		if ( options.amd ) { throw new Error( 'Cannot have both options.amd and options.moduleId' ); }
 
@@ -10217,6 +10317,18 @@ function checkOptions ( options ) {
 			console.warn( msg ); // eslint-disable-line no-console
 		}
 	}
+}
+
+function checkOptions ( options ) {
+	if ( !options ) {
+		throw new Error( 'You must supply an options object to rollup' );
+	}
+
+	if ( options.transform || options.load || options.resolveId || options.resolveExternal ) {
+		throw new Error( 'The `transform`, `load`, `resolveId` and `resolveExternal` options are deprecated in favour of a unified plugin API. See https://github.com/rollup/rollup/wiki/Plugins for details' );
+	}
+
+	checkAmd (options);
 
 	var err = validateKeys( keys(options), ALLOWED_KEYS );
 	if ( err ) { throw err; }
@@ -10225,7 +10337,7 @@ function checkOptions ( options ) {
 function rollup ( options ) {
 	try {
 		checkOptions( options );
-		var bundle = new Bundle$$1( options );
+		var bundle = new Bundle( options );
 
 		timeStart( '--BUILD--' );
 
@@ -10245,6 +10357,8 @@ function rollup ( options ) {
 					options.format = 'es';
 				}
 
+				checkAmd( options );
+
 				timeStart( '--GENERATE--' );
 
 				var rendered = bundle.render( options );