terser 5.39.1 → 5.39.2

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v5.39.2
+
+ - Fix crash when parsing bare `yield` inside a template string.
+ - Update internally used acorn version requirement
+
 ## v5.39.1
 
  - Fix bitwise operations that could mix `BigInt` and `number`

package/dist/bundle.min.js

@@ -843,7 +843,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
             } else if (ch == "$" && peek() == "{") {
                 next(true, true);
                 S.brace_counter++;
-                tok = token(begin ? "template_head" : "template_substitution", content);
+                tok = token(begin ? "template_head" : "template_cont", content);
                 TEMPLATE_RAWS.set(tok, raw);
                 tok.template_end = false;
                 return tok;
@@ -860,7 +860,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
             content += ch;
         }
         S.template_braces.pop();
-        tok = token(begin ? "template_head" : "template_substitution", content);
+        tok = token(begin ? "template_head" : "template_cont", content);
         TEMPLATE_RAWS.set(tok, raw);
         tok.template_end = true;
         return tok;
@@ -2111,11 +2111,6 @@ function parse($TEXT, options) {
     }
 
     function _yield_expression() {
-        // Previous token must be keyword yield and not be interpret as an identifier
-        if (!is_in_generator()) {
-            croak("Unexpected yield expression outside generator function",
-                S.prev.line, S.prev.col, S.prev.pos);
-        }
         var start = S.token;
         var star = false;
         var has_expression = true;
@@ -2130,10 +2125,12 @@ function parse($TEXT, options) {
         // Note 1: It isn't allowed for yield* to close without an expression
         // Note 2: If there is a nlb between yield and star, it is interpret as
         //         yield <explicit undefined> <inserted automatic semicolon> *
-        if (can_insert_semicolon() ||
-            (is("punc") && PUNC_AFTER_EXPRESSION.has(S.token.value))) {
+        if (
+            can_insert_semicolon()
+            || is("punc") && PUNC_AFTER_EXPRESSION.has(S.token.value)
+            || is("template_cont")
+        ) {
             has_expression = false;
-
         } else if (is("operator", "*")) {
             star = true;
             next();
@@ -32837,7 +32834,7 @@ async function run_cli({ program, packageJson, fs, path }) {
                 if (program.parse.acorn) {
                     files = convert_ast(function(toplevel, name) {
                         return require("acorn").parse(files[name], {
-                            ecmaVersion: 2018,
+                            ecmaVersion: 2024,
                             locations: true,
                             program: toplevel,
                             sourceFile: name,

package/lib/cli.js

@@ -202,7 +202,7 @@ export async function run_cli({ program, packageJson, fs, path }) {
                 if (program.parse.acorn) {
                     files = convert_ast(function(toplevel, name) {
                         return require("acorn").parse(files[name], {
-                            ecmaVersion: 2018,
+                            ecmaVersion: 2024,
                             locations: true,
                             program: toplevel,
                             sourceFile: name,

package/lib/parse.js

@@ -698,7 +698,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
             } else if (ch == "$" && peek() == "{") {
                 next(true, true);
                 S.brace_counter++;
-                tok = token(begin ? "template_head" : "template_substitution", content);
+                tok = token(begin ? "template_head" : "template_cont", content);
                 TEMPLATE_RAWS.set(tok, raw);
                 tok.template_end = false;
                 return tok;
@@ -715,7 +715,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
             content += ch;
         }
         S.template_braces.pop();
-        tok = token(begin ? "template_head" : "template_substitution", content);
+        tok = token(begin ? "template_head" : "template_cont", content);
         TEMPLATE_RAWS.set(tok, raw);
         tok.template_end = true;
         return tok;
@@ -1966,11 +1966,6 @@ function parse($TEXT, options) {
     }
 
     function _yield_expression() {
-        // Previous token must be keyword yield and not be interpret as an identifier
-        if (!is_in_generator()) {
-            croak("Unexpected yield expression outside generator function",
-                S.prev.line, S.prev.col, S.prev.pos);
-        }
         var start = S.token;
         var star = false;
         var has_expression = true;
@@ -1985,10 +1980,12 @@ function parse($TEXT, options) {
         // Note 1: It isn't allowed for yield* to close without an expression
         // Note 2: If there is a nlb between yield and star, it is interpret as
         //         yield <explicit undefined> <inserted automatic semicolon> *
-        if (can_insert_semicolon() ||
-            (is("punc") && PUNC_AFTER_EXPRESSION.has(S.token.value))) {
+        if (
+            can_insert_semicolon()
+            || is("punc") && PUNC_AFTER_EXPRESSION.has(S.token.value)
+            || is("template_cont")
+        ) {
             has_expression = false;
-
         } else if (is("operator", "*")) {
             star = true;
             next();

package/package.json

@@ -4,7 +4,7 @@
   "homepage": "https://terser.org",
   "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
   "license": "BSD-2-Clause",
-  "version": "5.39.1",
+  "version": "5.39.2",
   "engines": {
     "node": ">=10"
   },
@@ -45,7 +45,7 @@
   ],
   "dependencies": {
     "@jridgewell/source-map": "^0.3.3",
-    "acorn": "^8.8.2",
+    "acorn": "^8.14.0",
     "commander": "^2.20.0",
     "source-map-support": "~0.5.20"
   },