[pull] master from handlebars-lang:master

.github/workflows/ci.yml

@@ -85,4 +85,6 @@ jobs:
         run: npx grunt prepare
 
       - name: Test
-        run: npm run test:browser
+        run: |
+          npm run test:browser-smoke
+          npm run test:browser

Gruntfile.js

@@ -151,17 +151,15 @@ module.exports = function (grunt) {
   grunt.registerTask('globals', ['webpack']);
   grunt.registerTask('release', 'Build final packages', [
     'uglify',
-    'test:min',
     'copy:dist',
     'copy:components',
   ]);
 
-  grunt.registerTask('on-file-change', ['build', 'concat:tests', 'test']);
+  grunt.registerTask('on-file-change', ['build', 'concat:tests']);
 
   // === Primary tasks ===
   grunt.registerTask('dev', ['clean', 'connect', 'watch']);
-  grunt.registerTask('default', ['clean', 'build', 'test', 'release']);
-  grunt.registerTask('test', ['test:bin', 'test:cov']);
+  grunt.registerTask('default', ['clean', 'build', 'release']);
   grunt.registerTask('bench', ['metrics']);
   grunt.registerTask('prepare', ['build', 'concat:tests']);
   grunt.registerTask(

lib/handlebars/compiler/code-gen.js

@@ -4,7 +4,7 @@ import { isArray } from '../utils';
 let SourceNode;
 
 try {
-  /* istanbul ignore next */
+  /* v8 ignore next */
   if (typeof define !== 'function' || !define.amd) {
     // We don't support this in AMD environments. For these environments, we assume that
     // they are running on the browser and thus have no need for the source-map library.
@@ -15,15 +15,15 @@ try {
   /* NOP */
 }
 
-/* istanbul ignore if: tested but not covered in istanbul due to dist build  */
+/* v8 ignore next -- tested but not covered due to dist build */
 if (!SourceNode) {
   SourceNode = function (line, column, srcFile, chunks) {
     this.src = '';
     if (chunks) {
       this.add(chunks);
     }
   };
-  /* istanbul ignore next */
+  /* v8 ignore next */
   SourceNode.prototype = {
     add: function (chunks) {
       if (isArray(chunks)) {

lib/handlebars/compiler/compiler.js

@@ -87,7 +87,7 @@ Compiler.prototype = {
   },
 
   accept: function (node) {
-    /* istanbul ignore next: Sanity code */
+    /* v8 ignore next -- Sanity code */
     if (!this[node.type]) {
       throw new Exception('Unknown type: ' + node.type, node);
     }

lib/handlebars/compiler/javascript-compiler.js

@@ -112,7 +112,7 @@ JavaScriptCompiler.prototype = {
     this.source.currentLocation = firstLoc;
     this.pushSource('');
 
-    /* istanbul ignore next */
+    /* v8 ignore next */
     if (this.stackSlot || this.inlineStack.length || this.compileStack.length) {
       throw new Exception('Compile completed with content left on stack');
     }
@@ -924,7 +924,7 @@ JavaScriptCompiler.prototype = {
       createdStack,
       usedLiteral;
 
-    /* istanbul ignore next */
+    /* v8 ignore next */
     if (!this.isInline()) {
       throw new Exception('replaceStack on non-inline');
     }
@@ -972,7 +972,7 @@ JavaScriptCompiler.prototype = {
     this.inlineStack = [];
     for (let i = 0, len = inlineStack.length; i < len; i++) {
       let entry = inlineStack[i];
-      /* istanbul ignore if */
+      /* v8 ignore next */
       if (entry instanceof Literal) {
         this.compileStack.push(entry);
       } else {
@@ -994,7 +994,7 @@ JavaScriptCompiler.prototype = {
       return item.value;
     } else {
       if (!inline) {
-        /* istanbul ignore next */
+        /* v8 ignore next */
         if (!this.stackSlot) {
           throw new Exception('Invalid stack pop');
         }
@@ -1008,7 +1008,7 @@ JavaScriptCompiler.prototype = {
     let stack = this.isInline() ? this.inlineStack : this.compileStack,
       item = stack[stack.length - 1];
 
-    /* istanbul ignore if */
+    /* v8 ignore next */
     if (item instanceof Literal) {
       return item.value;
     } else {

lib/handlebars/no-conflict.js

@@ -1,7 +1,7 @@
 export default function (Handlebars) {
   let $Handlebars = globalThis.Handlebars;
 
-  /* istanbul ignore next */
+  /* v8 ignore next */
   Handlebars.noConflict = function () {
     if (globalThis.Handlebars === Handlebars) {
       globalThis.Handlebars = $Handlebars;

lib/handlebars/runtime.js

@@ -47,7 +47,7 @@ export function checkRevision(compilerInfo) {
 }
 
 export function template(templateSpec, env) {
-  /* istanbul ignore next */
+  /* v8 ignore next */
   if (!env) {
     throw new Exception('No environment passed to template');
   }

lib/index.js

@@ -19,7 +19,7 @@ function extension(module, filename) {
   var templateString = fs.readFileSync(filename, 'utf8');
   module.exports = handlebars.compile(templateString);
 }
-/* istanbul ignore else */
+/* v8 ignore next 4 */
 if (typeof require !== 'undefined' && require.extensions) {
   require.extensions['.handlebars'] = extension;
   require.extensions['.hbs'] = extension;

lib/precompiler.js

@@ -95,7 +95,7 @@ function loadFiles(opts, callback) {
           opts.hasDirectory = true;
 
           fs.readdir(path, function (err, children) {
-            /* istanbul ignore next : Race condition that being too lazy to test */
+            /* v8 ignore next -- Race condition that being too lazy to test */
             if (err) {
               return callback(err);
             }
@@ -114,7 +114,7 @@ function loadFiles(opts, callback) {
           });
         } else {
           fs.readFile(path, 'utf8', function (err, data) {
-            /* istanbul ignore next : Race condition that being too lazy to test */
+            /* v8 ignore next -- Race condition that being too lazy to test */
             if (err) {
               return callback(err);
             }