Fix non-contiguous program indices

* chore: update type testing setup
* stricter TSConfig
* deduplicate type checking

.eslintignore

@@ -1,23 +0,0 @@
-.rvmrc
-.DS_Store
-/tmp/
-*.sublime-project
-*.sublime-workspace
-npm-debug.log
-.idea
-yarn-error.log
-node_modules
-/handlebars-release.tgz
-.nyc_output
-
-# Generated files
-/coverage/
-/dist/
-/tests/integration/*/dist/
-
-# Third-party or files that must remain unchanged
-/spec/expected/
-/spec/vendor
-
-# JS-Snippets
-src/*.js

.eslintrc.js

@@ -1,64 +0,0 @@
-module.exports = {
-  extends: ['eslint:recommended', 'plugin:compat/recommended', 'prettier'],
-  globals: {
-    self: false,
-  },
-  env: {
-    node: true,
-    es2020: true,
-  },
-  parserOptions: {
-    sourceType: 'module',
-  },
-  rules: {
-    'no-console': 'warn',
-
-    // temporarily disabled until the violating places are fixed.
-    'no-func-assign': 'off',
-    'no-sparse-arrays': 'off',
-
-    // Best Practices //
-    //----------------//
-    'default-case': 'warn',
-    'guard-for-in': 'warn',
-    'no-alert': 'error',
-    'no-caller': 'error',
-    'no-div-regex': 'warn',
-    'no-eval': 'error',
-    'no-extend-native': 'error',
-    'no-extra-bind': 'error',
-    'no-floating-decimal': 'error',
-    'no-implied-eval': 'error',
-    'no-iterator': 'error',
-    'no-labels': 'error',
-    'no-lone-blocks': 'error',
-    'no-loop-func': 'error',
-    'no-multi-str': 'warn',
-    'no-global-assign': 'error',
-    'no-new': 'error',
-    'no-new-func': 'error',
-    'no-new-wrappers': 'error',
-    'no-octal-escape': 'error',
-    'no-process-env': 'error',
-    'no-proto': 'error',
-    'no-return-assign': 'error',
-    'no-script-url': 'error',
-    'no-self-compare': 'error',
-    'no-sequences': 'error',
-    'no-throw-literal': 'error',
-    'no-unused-expressions': 'error',
-    'no-warning-comments': 'warn',
-    'no-with': 'error',
-    radix: 'error',
-
-    // Variables //
-    //-----------//
-    'no-label-var': 'error',
-    'no-undef-init': 'error',
-    'no-use-before-define': ['error', 'nofunc'],
-
-    // ECMAScript 6 //
-    //--------------//
-    'no-var': 'error',
-  },
-};

.git-blame-ignore-revs

@@ -1,4 +1,6 @@
 # Upgrade to Prettier 2.7
 3d228334530860a6e3f99dc10777c84bf22292c1
 # Format markdown files with Prettier
-dfe2eaaf20f0b679d94e5a799757c4394d80f1cc
+dfe2eaaf20f0b679d94e5a799757c4394d80f1cc
+# migrate to oxlint and oxfmt
+0c1d00282ca619c3416ad819bdf53c0852b32415

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,6 +7,6 @@ Generally we like to see pull requests that
 - [ ] Are focused on a single change (i.e. avoid large refactoring or style adjustments in untouched code if not the primary goal of the pull request)
 - [ ] Have good commit messages
 - [ ] Have tests
-- [ ] Have the [typings](https://www.typescriptlang.org/docs/handbook/declaration-files/introduction.html) (lib/handlebars.d.ts) updated on every API change. If you need help, updating those, please mention that in the PR description.
+- [ ] Have the [typings](https://www.typescriptlang.org/docs/handbook/declaration-files/introduction.html) (types/index.d.ts) updated on every API change. If you need help, updating those, please mention that in the PR description.
 - [ ] Don't significantly decrease the current code coverage (see coverage/lcov-report/index.html)
-- [ ] Currently, the `4.x`-branch contains the latest version. Please target that branch in the PR.
+- [ ] Please target the `master` branch in the PR.

.github/dependabot.yml

@@ -1,7 +1,7 @@
 version: 2
 updates:
   - package-ecosystem: npm
-    directory: "/"
+    directory: '/'
     open-pull-requests-limit: 0
     schedule:
       interval: weekly

.github/workflows/ci.yml

@@ -12,12 +12,12 @@ jobs:
     runs-on: 'ubuntu-latest'
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v6
 
       - name: Setup Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v6
         with:
-          node-version: '18'
+          node-version: '24'
 
       - name: Install dependencies
         run: npm ci
@@ -25,31 +25,6 @@ jobs:
       - name: Lint
         run: npm run lint
 
-  dependencies:
-    name: Test (dependencies)
-    runs-on: 'ubuntu-latest'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v2
-        with:
-          # Node 14 ships with npm v6, which doesn't install peer-dependencies by default.
-          # Starting with npm v7 (which is shipped with Node >= 16), peer-dependencies are
-          # automatically installed. So this test (check for unmet peer-dependencies) only
-          # works with Node <= 14.
-          node-version: '14'
-
-      # Simulate an installation by a dependent package
-      - name: Install dependencies
-        run: |
-          rm package-lock.json
-          npm install --production
-
-      - name: Check dependency tree
-        run: npm ls
-
   test:
     name: Test (Node)
     runs-on: ${{ matrix.operating-system }}
@@ -58,16 +33,16 @@ jobs:
       matrix:
         operating-system: ['ubuntu-latest', 'windows-latest']
         # https://nodejs.org/en/about/releases/
-        node-version: ['12', '14', '16', '18', '20']
+        node-version: ['20', '22', '24']
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v6
         with:
           submodules: true
 
       - name: Setup Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v6
         with:
           node-version: ${{ matrix.node-version }}
 
@@ -77,25 +52,27 @@ jobs:
       - name: Test
         run: npm run test
 
+      - name: Test (Publish)
+        if: matrix.node-version != '20'
+        run: npx vitest run --project publish
+
       - name: Test (Integration)
-        run: |
-          cd ./tests/integration/rollup-test && ./test.sh && cd -
-          cd ./tests/integration/webpack-babel-test && ./test.sh && cd -
-          cd ./tests/integration/webpack-test && ./test.sh && cd -
+        if: matrix.operating-system == 'ubuntu-latest'
+        run: npm run test:integration
 
   browser:
     name: Test (Browser)
-    runs-on: 'ubuntu-22.04'
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v6
         with:
           submodules: true
 
       - name: Setup Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v6
         with:
-          node-version: '18'
+          node-version: '24'
 
       - name: Install dependencies
         run: npm ci
@@ -106,7 +83,9 @@ jobs:
           npx playwright install
 
       - name: Build
-        run: npx grunt prepare
+        run: npm run build
 
       - name: Test
-        run: npm run test:browser
+        run: |
+          npm run test:browser-smoke
+          npm run test:browser

.github/workflows/release.yml

@@ -15,14 +15,14 @@ jobs:
     environment: 'builds.handlebarsjs.com.s3.amazonaws.com'
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v6
         with:
           submodules: true
 
       - name: Setup Node.js
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v6
         with:
-          node-version: '18'
+          node-version: '24'
 
       - name: Install dependencies
         run: npm ci
@@ -33,6 +33,7 @@ jobs:
           git config --global user.name "handlebars-lang"
           npm run publish:aws
         env:
-          S3_BUCKET_NAME: "builds.handlebarsjs.com"
+          S3_BUCKET_NAME: 'builds.handlebarsjs.com'
+          S3_REGION: 'us-east-1'
           S3_ACCESS_KEY_ID: ${{ secrets.S3_ACCESS_KEY_ID }}
           S3_SECRET_ACCESS_KEY: ${{ secrets.S3_SECRET_ACCESS_KEY }}

.gitignore

@@ -14,5 +14,6 @@ node_modules
 # Generated files
 /coverage/
 /dist/
+/tests/bench/results/
 /tests/integration/*/dist/
 /spec/tmp/*

.oxfmtrc.json

@@ -0,0 +1,28 @@
+{
+  "$schema": "https://raw.githubusercontent.com/nicolo-ribaudo/oxfmt-config-schema/refs/heads/main/schema.json",
+  "singleQuote": true,
+  "tabWidth": 2,
+  "semi": true,
+  "trailingComma": "es5",
+  "printWidth": 80,
+  "ignorePatterns": [
+    ".rvmrc",
+    ".DS_Store",
+    "/tmp/",
+    "*.sublime-project",
+    "*.sublime-workspace",
+    "npm-debug.log",
+    "sauce_connect.log*",
+    ".idea",
+    "yarn-error.log",
+    "/coverage/",
+    ".nyc_output/",
+    "/dist/",
+    "/tests/integration/*/dist/",
+    "/spec/expected/",
+    "/spec/mustache",
+    "/spec/vendor",
+    "*.handlebars",
+    "*.hbs"
+  ]
+}

.oxlintrc.json

@@ -0,0 +1,150 @@
+{
+  "$schema": "https://raw.githubusercontent.com/oxc-project/oxc/main/npm/oxlint/configuration_schema.json",
+  "plugins": ["eslint", "typescript", "unicorn", "oxc", "node", "vitest"],
+  "categories": {
+    "correctness": "error"
+  },
+  "rules": {
+    "no-console": "warn",
+    "no-func-assign": "off",
+    "no-sparse-arrays": "off",
+
+    "default-case": "warn",
+    "guard-for-in": "warn",
+    "no-alert": "error",
+    "no-caller": "error",
+    "no-div-regex": "warn",
+    "no-eval": "error",
+    "no-extend-native": "error",
+    "no-extra-bind": "error",
+    "no-implied-eval": "error",
+    "no-iterator": "error",
+    "no-labels": "error",
+    "no-lone-blocks": "error",
+    "no-loop-func": "error",
+    "no-multi-str": "warn",
+    "no-global-assign": "error",
+    "no-new": "error",
+    "no-new-func": "error",
+    "no-new-wrappers": "error",
+    "no-proto": "error",
+    "no-return-assign": "error",
+    "no-script-url": "error",
+    "no-self-compare": "error",
+    "no-sequences": "error",
+    "no-throw-literal": "error",
+    "no-unused-expressions": "error",
+    "no-warning-comments": "warn",
+    "no-with": "error",
+    "radix": "error",
+
+    "no-label-var": "error",
+    "no-use-before-define": ["error", { "functions": false }],
+
+    "no-var": "error",
+
+    "node/no-process-env": "error"
+  },
+  "ignorePatterns": [
+    "tmp/",
+    "dist/",
+    "coverage/",
+    ".nyc_output/",
+    "handlebars-release.tgz",
+    "tests/integration/*/dist/",
+    "spec/expected/",
+    "spec/mustache",
+    "spec/vendor",
+    "node_modules",
+    "types/"
+  ],
+  "overrides": [
+    {
+      "files": ["lib/**/*.js"],
+      "env": {
+        "node": false,
+        "browser": true
+      }
+    },
+    {
+      "files": ["spec/**/*.js"],
+      "globals": {
+        "CompilerContext": "readonly",
+        "Handlebars": "writable",
+        "handlebarsEnv": "readonly",
+        "expectTemplate": "readonly",
+        "suite": "readonly",
+        "test": "readonly",
+        "testBoth": "readonly",
+        "raises": "readonly",
+        "deepEqual": "readonly",
+        "start": "readonly",
+        "stop": "readonly",
+        "ok": "readonly",
+        "vi": "readonly",
+        "strictEqual": "readonly",
+        "define": "readonly",
+        "expect": "readonly",
+        "beforeEach": "readonly",
+        "afterEach": "readonly",
+        "describe": "readonly",
+        "it": "readonly"
+      },
+      "rules": {
+        "no-var": "off",
+        "dot-notation": "off",
+        "vitest/no-conditional-tests": "off"
+      }
+    },
+    {
+      "files": ["tasks/**/*.js"],
+      "rules": {
+        "node/no-process-env": "off",
+        "prefer-const": "warn",
+        "dot-notation": "error"
+      }
+    },
+    {
+      "files": ["tasks/tests/**/*.js"],
+      "globals": {
+        "describe": "readonly",
+        "it": "readonly",
+        "expect": "readonly",
+        "beforeEach": "readonly",
+        "afterEach": "readonly",
+        "vi": "readonly"
+      }
+    },
+    {
+      "files": ["tests/bench/**/*.mjs"],
+      "rules": {
+        "no-console": "off"
+      }
+    },
+    {
+      "files": ["tests/integration/multi-nodejs-test/**/*.js"],
+      "rules": {
+        "no-console": "off",
+        "no-var": "off"
+      }
+    },
+    {
+      "files": ["tests/browser/**/*.js"],
+      "env": {
+        "browser": true
+      }
+    },
+    {
+      "files": [
+        "tests/integration/webpack-babel-test/src/**/*.js",
+        "tests/integration/webpack-test/src/**/*.js"
+      ],
+      "env": {
+        "browser": true
+      },
+      "rules": {
+        "no-var": "off"
+      }
+    }
+  ]
+}

.prettierignore

@@ -1,21 +0,0 @@
-.rvmrc
-.DS_Store
-/tmp/
-*.sublime-project
-*.sublime-workspace
-npm-debug.log
-sauce_connect.log*
-.idea
-yarn-error.log
-node_modules
-/handlebars-release.tgz
-.nyc_output
-
-# Generated files
-/coverage/
-/dist/
-/tests/integration/*/dist/
-
-# Third-party or files that must remain unchanged
-/spec/expected/
-/spec/vendor

.swcrc

@@ -0,0 +1,8 @@
+{
+  "$schema": "https://swc.rs/schema.json",
+  "module": {
+    "type": "commonjs",
+    "importInterop": "swc"
+  },
+  "sourceMaps": "inline"
+}

CONTRIBUTING.md

@@ -18,11 +18,8 @@ Documentation issues on the [handlebarsjs.com](https://handlebarsjs.com) site sh
 
 ## Branches
 
-- The branch `4.x` contains the currently released version. Bugfixes should be made in this branch.
-- The branch `master` contains the next version. A release date is not yet specified. Maintainers
-  should merge the branch `4.x` into the master branch regularly.
-- The branch `3.x` contains the legacy version `3.x`. Bugfixes are applied separately (if needed). The branch will not
-  be merged with any of the other branches.
+- The branch `master` contains the current development version (v5).
+- The branch `4.x` contains the previous stable version. Only critical bugfixes are backported there.
 
 ## Pull Requests
 
@@ -38,21 +35,13 @@ Generally we like to see pull requests that
 
 ## Building
 
-To build Handlebars.js you'll need a few things installed.
-
-- Node.js
-- [Grunt](http://gruntjs.com/getting-started)
+To build Handlebars.js you'll need Node.js installed.
 
 Before building, you need to make sure that the Git submodule `spec/mustache` is included (i.e. the directory `spec/mustache` should not be empty). To include it, if using Git version 1.6.5 or newer, use `git clone --recursive` rather than `git clone`. Or, if you already cloned without `--recursive`, use `git submodule update --init`.
 
 Project dependencies may be installed via `npm install`.
 
-To build Handlebars.js from scratch, you'll want to run `grunt`
-in the root of the project. That will build Handlebars and output the
-results to the dist/ folder. To re-run tests, run `grunt test` or `npm test`.
-You can also run our set of benchmarks with `grunt bench`.
-
-The `grunt dev` implements watching for tests and allows for in browser testing at `http://localhost:9999/spec/`.
+To build Handlebars.js from scratch, run `npm run build` in the root of the project. That will compile CJS modules via SWC and bundle UMD distributions via rspack, outputting results to the dist/ folder. To run tests, use `npm test`.
 
 If you notice any problems, please report them to the GitHub issue tracker at
 [http://github.com/handlebars-lang/handlebars.js/issues](http://github.com/handlebars-lang/handlebars.js/issues).
@@ -81,21 +70,16 @@ npm test
 
 ## Linting and Formatting
 
-Handlebars uses `eslint` to enforce best-practices and `prettier` to auto-format files.
-We do linting and formatting in two phases:
-
-- Committed files are linted and formatted in a pre-commit hook. In this stage eslint-errors are forbidden,
-  while warnings are allowed.
-- The GitHub CI job also lints all files and checks if they are formatted correctly. In this stage, warnings
-  are forbidden.
+Handlebars uses `oxlint` for linting, `oxfmt` for formatting, and `eslint` (with `eslint-plugin-compat`) for browser API compatibility checks.
+Committed files are linted and formatted in a pre-commit hook.
 
 You can use the following scripts to make sure that the CI job does not fail:
 
-- **npm run lint** will run `eslint` and fail on warnings
-- **npm run format** will run `prettier` on all files
-- **npm run check-before-pull-request** will perform all most checks that our CI job does in its build-job, excluding the "integration-test".
-- **npm run test:integration** will run integration tests (using old NodeJS versions and integrations with webpack, babel and so on)
-  These tests only work on a Linux-machine with `nvm` installed (for running tests in multiple versions of NodeJS).
+- **npm run lint** will run all linters and fail on warnings
+- **npm run format** will format all files
+- **npm run check-before-pull-request** will perform all checks that our CI job does, excluding integration tests.
+- **npm run test:integration** will run integration tests (bundler compatibility with webpack, rollup, etc.)
+  These tests only work on Linux.
 
 ## Releasing the latest version
 
@@ -113,12 +97,8 @@ A full release may be completed with the following:
 
 ```
 npm ci
-npx grunt
+npm run build
 npm publish
-
-cd dist/components/
-gem build handlebars-source.gemspec
-gem push handlebars-source-*.gem
 ```
 
 After the release, you should check that all places have really been updated. Especially verify that the `latest`-tags

Gruntfile.js

@@ -1,176 +0,0 @@
-/* eslint-disable no-process-env */
-module.exports = function (grunt) {
-  grunt.initConfig({
-    pkg: grunt.file.readJSON('package.json'),
-
-    clean: ['tmp', 'dist', 'tests/integration/**/node_modules'],
-
-    copy: {
-      dist: {
-        options: {
-          processContent: function (content) {
-            return (
-              grunt.template.process(
-                '/**!\n\n @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat\n <%= pkg.name %> v<%= pkg.version %>\n\n<%= grunt.file.read("LICENSE") %>\n*/\n'
-              ) +
-              content +
-              '\n// @license-end\n'
-            );
-          },
-        },
-        files: [{ expand: true, cwd: 'dist/', src: ['*.js'], dest: 'dist/' }],
-      },
-      components: {
-        files: [
-          {
-            expand: true,
-            cwd: 'components/',
-            src: ['**'],
-            dest: 'dist/components',
-          },
-          {
-            expand: true,
-            cwd: 'dist/',
-            src: ['*.js'],
-            dest: 'dist/components',
-          },
-        ],
-      },
-    },
-
-    babel: {
-      options: {
-        sourceMaps: 'inline',
-        loose: ['es6.modules'],
-        auxiliaryCommentBefore: 'istanbul ignore next',
-      },
-      cjs: {
-        files: [
-          {
-            cwd: 'lib/',
-            expand: true,
-            src: '**/!(index).js',
-            dest: 'dist/cjs/',
-          },
-        ],
-      },
-    },
-    webpack: {
-      options: {
-        context: __dirname,
-        output: {
-          path: 'dist/',
-          library: 'Handlebars',
-          libraryTarget: 'umd',
-        },
-      },
-      handlebars: {
-        entry: './dist/cjs/handlebars.js',
-        output: {
-          filename: 'handlebars.js',
-        },
-      },
-      runtime: {
-        entry: './dist/cjs/handlebars.runtime.js',
-        output: {
-          filename: 'handlebars.runtime.js',
-        },
-      },
-    },
-
-    uglify: {
-      options: {
-        mangle: true,
-        compress: true,
-        preserveComments: /(?:^!|@(?:license|preserve|cc_on))/,
-      },
-      dist: {
-        files: [
-          {
-            cwd: 'dist/',
-            expand: true,
-            src: ['handlebars*.js', '!*.min.js'],
-            dest: 'dist/',
-            rename: function (dest, src) {
-              return dest + src.replace(/\.js$/, '.min.js');
-            },
-          },
-        ],
-      },
-    },
-
-    concat: {
-      tests: {
-        src: ['spec/!(require).js'],
-        dest: 'tmp/tests.js',
-      },
-    },
-
-    connect: {
-      server: {
-        options: {
-          base: '.',
-          hostname: '*',
-          port: 9999,
-        },
-      },
-    },
-
-    shell: {
-      integrationTests: {
-        command: './tests/integration/run-integration-tests.sh',
-      },
-    },
-
-    watch: {
-      scripts: {
-        options: {
-          atBegin: true,
-        },
-
-        files: ['src/*', 'lib/**/*.js', 'spec/**/*.js'],
-        tasks: ['on-file-change'],
-      },
-    },
-  });
-
-  // Load tasks from npm
-  grunt.loadNpmTasks('grunt-contrib-clean');
-  grunt.loadNpmTasks('grunt-contrib-concat');
-  grunt.loadNpmTasks('grunt-contrib-connect');
-  grunt.loadNpmTasks('grunt-contrib-copy');
-  grunt.loadNpmTasks('grunt-contrib-uglify');
-  grunt.loadNpmTasks('grunt-contrib-watch');
-  grunt.loadNpmTasks('grunt-babel');
-  grunt.loadNpmTasks('grunt-shell');
-  grunt.loadNpmTasks('grunt-webpack');
-
-  grunt.task.loadTasks('tasks');
-
-  grunt.registerTask('node', ['babel:cjs']);
-  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']);
-
-  // === Primary tasks ===
-  grunt.registerTask('dev', ['clean', 'connect', 'watch']);
-  grunt.registerTask('default', ['clean', 'build', 'test', 'release']);
-  grunt.registerTask('test', ['test:bin', 'test:cov']);
-  grunt.registerTask('bench', ['metrics']);
-  grunt.registerTask('prepare', ['build', 'concat:tests']);
-  grunt.registerTask(
-    'build',
-    'Builds a distributable version of the current project',
-    ['node', 'globals']
-  );
-  grunt.registerTask('integration-tests', [
-    'default',
-    'shell:integrationTests',
-  ]);
-};

README.md

@@ -5,8 +5,7 @@
 [![Bundle size](https://badgen.net/bundlephobia/minzip/handlebars?label=minified%20%2B%20gzipped)](https://bundlephobia.com/package/handlebars)
 [![Install size](https://packagephobia.com/badge?p=handlebars)](https://packagephobia.com/result?p=handlebars)
 
-Handlebars.js
-=============
+# Handlebars.js
 
 Handlebars provides the power necessary to let you build **semantic templates** effectively with no frustration.
 Handlebars is largely compatible with Mustache templates. In most cases it is possible to swap out Mustache with Handlebars and continue using your current templates.
@@ -14,13 +13,12 @@ Handlebars is largely compatible with Mustache templates. In most cases it is po
 Checkout the official Handlebars docs site at
 [handlebarsjs.com](https://handlebarsjs.com) and try our [live demo](https://handlebarsjs.com/playground.html).
 
-Installing
-----------
+## Installing
 
-See our [installation documentation](https://handlebarsjs.com/installation/).
+See our [installation documentation](https://handlebarsjs.com/guide/installation/).
+
+## Usage
 
-Usage
------
 In general, the syntax of Handlebars.js templates is a superset
 of Mustache templates. For basic syntax, check out the [Mustache
 manpage](https://mustache.github.io/mustache.5.html).
@@ -30,13 +28,20 @@ the template into a function. The generated function takes a context
 argument, which will be used to render the template.
 
 ```js
-var source = "<p>Hello, my name is {{name}}. I am from {{hometown}}. I have " +
-             "{{kids.length}} kids:</p>" +
-             "<ul>{{#kids}}<li>{{name}} is {{age}}</li>{{/kids}}</ul>";
+var source =
+  '<p>Hello, my name is {{name}}. I am from {{hometown}}. I have ' +
+  '{{kids.length}} kids:</p>' +
+  '<ul>{{#kids}}<li>{{name}} is {{age}}</li>{{/kids}}</ul>';
 var template = Handlebars.compile(source);
 
-var data = { "name": "Alan", "hometown": "Somewhere, TX",
-             "kids": [{"name": "Jimmy", "age": "12"}, {"name": "Sally", "age": "4"}]};
+var data = {
+  name: 'Alan',
+  hometown: 'Somewhere, TX',
+  kids: [
+    { name: 'Jimmy', age: '12' },
+    { name: 'Sally', age: '4' },
+  ],
+};
 var result = template(data);
 
 // Would render:
@@ -49,13 +54,12 @@ var result = template(data);
 
 Full documentation and more examples are at [handlebarsjs.com](https://handlebarsjs.com/).
 
-Precompiling Templates
-----------------------
+## Precompiling Templates
 
-Handlebars allows templates to be precompiled and included as javascript code rather than the handlebars template allowing for faster startup time. Full details are located [here](https://handlebarsjs.com/installation/precompilation.html).
+Handlebars allows templates to be precompiled and included as javascript code rather than the handlebars template allowing for faster startup time. Full details are located [here](https://handlebarsjs.com/guide/installation/precompilation.html).
+
+## Differences Between Handlebars.js and Mustache
 
-Differences Between Handlebars.js and Mustache
-----------------------------------------------
 Handlebars.js adds a couple of additional features to make writing
 templates easier and also changes a tiny detail of how partials work.
 
@@ -70,14 +74,13 @@ Block expressions have the same syntax as mustache sections but should not be co
 ### Compatibility
 
 There are a few Mustache behaviors that Handlebars does not implement.
+
 - Handlebars deviates from Mustache slightly in that it does not perform recursive lookup by default. The compile time `compat` flag must be set to enable this functionality. Users should note that there is a performance cost for enabling this flag. The exact cost varies by template, but it's recommended that performance sensitive operations should avoid this mode and instead opt for explicit path references.
 - The optional Mustache-style lambdas are not supported. Instead Handlebars provides its own lambda resolution that follows the behaviors of helpers.
 - Handlebars does not allow space between the opening `{{` and a command character such as `#`, `/` or `>`. The command character must immediately follow the braces, so for example `{{> partial }}` is allowed but `{{ > partial }}` is not.
 - Alternative delimiters are not supported.
 
-
-Supported Environments
-----------------------
+## Supported Environments
 
 Handlebars has been designed to work in any ECMAScript 2020 environment. This includes
 
@@ -89,9 +92,7 @@ Handlebars has been designed to work in any ECMAScript 2020 environment. This in
 
 If you need to support older environments, use Handlebars version 4.
 
-
-Performance
------------
+## Performance
 
 In a rough performance test, precompiled Handlebars.js templates (in
 the original version of Handlebars.js) rendered in about half the
@@ -103,9 +104,44 @@ does have some big performance advantages. Justin Marney, a.k.a.
 rewritten Handlebars (current version) is faster than the old version,
 with many performance tests being 5 to 7 times faster than the Mustache equivalent.
 
+### Benchmarks
 
-Upgrading
----------
+The project includes a comprehensive benchmark suite (powered by [tinybench](https://github.com/tinylibs/tinybench)) that measures compilation, execution, precompilation, and end-to-end performance across templates of varying size and complexity.
+
+```bash
+# Run benchmarks (auto-labels with current git branch)
+npm run bench
+
+# Run with a custom label
+npm run bench -- --label my-optimization
+
+# Filter templates by name (regex, case-insensitive)
+npm run bench -- --grep "complex|recursive"
+
+# Run only specific sections (regex, case-insensitive)
+npm run bench -- --section precompil
+npm run bench -- --section "compilation|precompil"
+
+# Compare results
+npm run bench:compare
+
+# Or specify files explicitly
+npm run bench:compare -- bench/results/bench-*-main.md bench/results/bench-*-feat.md
+```
+
+Results are saved as timestamped Markdown files in `bench/results/`. Each report includes ops/sec, avg latency, p50/p75/p99 percentiles, and sample counts.
+
+Typical workflow for comparing branches:
+
+```bash
+git checkout main && npm run bench
+git checkout my-feature && npm run bench
+npm run bench:compare
+```
+
+When run without arguments, `bench:compare` auto-selects two result files: if a file labelled "main" exists it is always used as the baseline, otherwise the older file is the baseline. The comparison uses p75 latency for the diff to filter outliers, and marks changes with `!` (>2%) and `!!` (>5%).
+
+## Upgrading
 
 See [release-notes.md](https://github.com/handlebars-lang/handlebars.js/blob/master/release-notes.md) for upgrade notes.
 
@@ -114,55 +150,49 @@ If you are using Handlebars in production, please regularly look for issues labe
 If this label is applied to an issue, it means that the requested change is probably not a breaking change,
 but since Handlebars is widely in use by a lot of people, there's always a chance that it breaks somebody's build.
 
-
-Known Issues
-------------
+## Known Issues
 
 See [FAQ.md](https://github.com/handlebars-lang/handlebars.js/blob/master/FAQ.md) for known issues and common pitfalls.
 
+## Handlebars in the Wild
 
-Handlebars in the Wild
-----------------------
+- [apiDoc](https://github.com/apidoc/apidoc) apiDoc uses handlebars as parsing engine for api documentation view generation.
+- [Assemble](https://assemble.io), by [@jonschlinkert](https://github.com/jonschlinkert) and [@doowb](https://github.com/doowb), is a static site generator that uses Handlebars.js as its template engine.
+- [CoSchedule](https://coschedule.com) An editorial calendar for WordPress that uses Handlebars.js.
+- [Ember.js](https://www.emberjs.com) makes Handlebars.js the primary way to structure your views, also with automatic data binding support.
+- [express-handlebars](https://github.com/express-handlebars/express-handlebars) A Handlebars view engine for Express which doesn't suck.
+- [express-hbs](https://github.com/TryGhost/express-hbs) Express Handlebars template engine with inheritance, partials, i18n and async helpers.
+- [Ghost](https://ghost.org/) Just a blogging platform.
+- [handlebars-action](https://github.com/marketplace/actions/handlebars-action) A GitHub action to transform files in your repository with Handlebars templating.
+- [handlebars_assets](https://github.com/leshill/handlebars_assets) A Rails Asset Pipeline gem from Les Hill (@leshill).
+- [handlebars-helpers](https://github.com/assemble/handlebars-helpers) is an extensive library with 100+ handlebars helpers.
+- [handlebars-layouts](https://github.com/shannonmoeller/handlebars-layouts) is a set of helpers which implement extensible and embeddable layout blocks as seen in other popular templating languages.
+- [handlebars-loader](https://github.com/pcardune/handlebars-loader) A handlebars template loader for webpack.
+- [handlebars-wax](https://github.com/shannonmoeller/handlebars-wax) The missing Handlebars API. Effortless registration of data, partials, helpers, and decorators using file-system globs, modules, and plain-old JavaScript objects.
+- [hbs](https://github.com/pillarjs/hbs) An Express.js view engine adapter for Handlebars.js, from Don Park.
+- [html-bundler-webpack-plugin](https://github.com/webdiscus/html-bundler-webpack-plugin) The webpack plugin to compile templates, [supports Handlebars](https://github.com/webdiscus/html-bundler-webpack-plugin#using-template-handlebars).
+- [incremental-bars](https://github.com/atomictag/incremental-bars) adds support for [incremental-dom](https://github.com/google/incremental-dom) as template target to Handlebars.
+- [jQuery plugin](https://71104.github.io/jquery-handlebars/) allows you to use Handlebars.js with [jQuery](http://jquery.com/).
+- [just-handlebars-helpers](https://github.com/leapfrogtechnology/just-handlebars-helpers) A fully tested lightweight package with common Handlebars helpers.
+- [koa-hbs](https://github.com/jwilm/koa-hbs) [koa](https://github.com/koajs/koa) generator based renderer for Handlebars.js.
+- [Marionette.Handlebars](https://github.com/hashchange/marionette.handlebars) adds support for Handlebars and Mustache templates to Marionette.
+- [openVALIDATION](https://github.com/openvalidation/openvalidation) a natural language compiler for validation rules. Generates program code in Java, JavaScript, C#, Python and Rust with handlebars.
+- [Plop](https://plopjs.com/) is a micro-generator framework that makes it easy to create files with a level of uniformity.
+- [promised-handlebars](https://github.com/nknapp/promised-handlebars) is a wrapper for Handlebars that allows helpers to return Promises.
+- [sammy.js](https://github.com/quirkey/sammy) by Aaron Quint, a.k.a. quirkey, supports Handlebars.js as one of its template plugins.
+- [Swag](https://github.com/elving/swag) by [@elving](https://github.com/elving) is a growing collection of helpers for handlebars.js. Give your handlebars.js templates some swag son!
+- [SproutCore](https://www.sproutcore.com) uses Handlebars.js as its main templating engine, extending it with automatic data binding support.
+- [vite-plugin-handlebars](https://github.com/alexlafroscia/vite-plugin-handlebars) A package for Vite 2. Allows for running your HTML files through the Handlebars compiler.
+- [YUI](https://yuilibrary.com/yui/docs/handlebars/) implements a port of handlebars.
 
-* [apiDoc](https://github.com/apidoc/apidoc) apiDoc uses handlebars as parsing engine for api documentation view generation.
-* [Assemble](https://assemble.io), by [@jonschlinkert](https://github.com/jonschlinkert) and [@doowb](https://github.com/doowb), is a static site generator that uses Handlebars.js as its template engine.
-* [CoSchedule](https://coschedule.com) An editorial calendar for WordPress that uses Handlebars.js.
-* [Ember.js](https://www.emberjs.com) makes Handlebars.js the primary way to structure your views, also with automatic data binding support.
-* [express-handlebars](https://github.com/express-handlebars/express-handlebars) A Handlebars view engine for Express which doesn't suck.
-* [express-hbs](https://github.com/TryGhost/express-hbs) Express Handlebars template engine with inheritance, partials, i18n and async helpers.
-* [Ghost](https://ghost.org/) Just a blogging platform.
-* [handlebars-action](https://github.com/marketplace/actions/handlebars-action) A GitHub action to transform files in your repository with Handlebars templating.
-* [handlebars_assets](https://github.com/leshill/handlebars_assets) A Rails Asset Pipeline gem from Les Hill (@leshill).
-* [handlebars-helpers](https://github.com/assemble/handlebars-helpers) is an extensive library with 100+ handlebars helpers.
-* [handlebars-layouts](https://github.com/shannonmoeller/handlebars-layouts) is a set of helpers which implement extensible and embeddable layout blocks as seen in other popular templating languages.
-* [handlebars-loader](https://github.com/pcardune/handlebars-loader) A handlebars template loader for webpack.
-* [handlebars-wax](https://github.com/shannonmoeller/handlebars-wax) The missing Handlebars API. Effortless registration of data, partials, helpers, and decorators using file-system globs, modules, and plain-old JavaScript objects.
-* [hbs](https://github.com/pillarjs/hbs) An Express.js view engine adapter for Handlebars.js, from Don Park.
-* [html-bundler-webpack-plugin](https://github.com/webdiscus/html-bundler-webpack-plugin) The webpack plugin to compile templates, [supports Handlebars](https://github.com/webdiscus/html-bundler-webpack-plugin#using-template-handlebars).
-* [incremental-bars](https://github.com/atomictag/incremental-bars) adds support for [incremental-dom](https://github.com/google/incremental-dom) as template target to Handlebars.
-* [jblotus](https://github.com/jblotus) created [http://tryhandlebarsjs.com](http://tryhandlebarsjs.com) for anyone who would like to try out Handlebars.js in their browser.
-* [jQuery plugin](https://71104.github.io/jquery-handlebars/) allows you to use Handlebars.js with [jQuery](http://jquery.com/).
-* [just-handlebars-helpers](https://github.com/leapfrogtechnology/just-handlebars-helpers) A fully tested lightweight package with common Handlebars helpers.
-* [koa-hbs](https://github.com/jwilm/koa-hbs) [koa](https://github.com/koajs/koa) generator based renderer for Handlebars.js.
-* [Marionette.Handlebars](https://github.com/hashchange/marionette.handlebars) adds support for Handlebars and Mustache templates to Marionette.
-* [openVALIDATION](https://github.com/openvalidation/openvalidation) a natural language compiler for validation rules. Generates program code in Java, JavaScript, C#, Python and Rust with handlebars.
-* [Plop](https://plopjs.com/) is a micro-generator framework that makes it easy to create files with a level of uniformity.
-* [promised-handlebars](https://github.com/nknapp/promised-handlebars) is a wrapper for Handlebars that allows helpers to return Promises.
-* [sammy.js](https://github.com/quirkey/sammy) by Aaron Quint, a.k.a. quirkey, supports Handlebars.js as one of its template plugins.
-* [Swag](https://github.com/elving/swag) by [@elving](https://github.com/elving) is a growing collection of helpers for handlebars.js. Give your handlebars.js templates some swag son!
-* [SproutCore](https://www.sproutcore.com) uses Handlebars.js as its main templating engine, extending it with automatic data binding support.
-* [vite-plugin-handlebars](https://github.com/alexlafroscia/vite-plugin-handlebars) A package for Vite 2. Allows for running your HTML files through the Handlebars compiler.
-* [YUI](https://yuilibrary.com/yui/docs/handlebars/) implements a port of handlebars.
+## External Resources
 
-External Resources
-------------------
-
-* [Gist about Synchronous and asynchronous loading of external handlebars templates](https://gist.github.com/2287070)
+- [Gist about Synchronous and asynchronous loading of external handlebars templates](https://gist.github.com/2287070)
 
 Have a project using Handlebars? Send us a [pull request][pull-request]!
 
-License
--------
+## License
+
 Handlebars.js is released under the MIT license.
 
 [pull-request]: https://github.com/handlebars-lang/handlebars.js/pull/new/master

bin/handlebars.mjs

@@ -1,7 +1,15 @@
 #!/usr/bin/env node
 
-const yargs = require('yargs')
+import { createRequire } from 'node:module';
+import yargs from 'yargs';
+
+const require = createRequire(import.meta.url);
+const Precompiler = require('../dist/cjs/precompiler');
+
+const parser = yargs(process.argv.slice(2))
   .usage('Precompile handlebar templates.\nUsage: $0 [template|directory]...')
+  .help(false)
+  .version(false)
   .option('f', {
     type: 'string',
     description: 'Output File',
@@ -105,19 +113,24 @@ const yargs = require('yargs')
   })
   .wrap(120);
 
-const argv = yargs.argv;
+const argv = parser.parseSync();
 argv.files = argv._;
 delete argv._;
 
-const Precompiler = require('../dist/cjs/precompiler');
 Precompiler.loadTemplates(argv, function (err, opts) {
   if (err) {
     throw err;
   }
 
   if (opts.help || (!opts.templates.length && !opts.version)) {
-    yargs.showHelp();
+    parser.showHelp('log');
   } else {
-    Precompiler.cli(opts);
+    // cli() is async (returns a Promise), so errors would become unhandled
+    // rejections. Re-throw via nextTick to surface them as uncaught exceptions.
+    Promise.resolve(Precompiler.cli(opts)).catch((error) => {
+      process.nextTick(() => {
+        throw error;
+      });
+    });
   }
 });

docs/compiler-api.md

@@ -297,7 +297,6 @@ The `Handlebars.JavaScriptCompiler` object has a number of methods that may be c
 
 - `nameLookup(parent, name, type)`
   Used to generate the code to resolve a given path component.
-
   - `parent` is the existing code in the path resolution
   - `name` is the current path component
   - `type` is the type of name being evaluated. May be one of `context`, `data`, `helper`, `decorator`, or `partial`.
@@ -312,7 +311,6 @@ The `Handlebars.JavaScriptCompiler` object has a number of methods that may be c
 
 - `appendToBuffer(source, location, explicit)`
   Allows for code buffer emitting code. Defaults behavior is string concatenation.
-
   - `source` is the source code whose result is to be appending
   - `location` is the location of the source in the source map.
   - `explicit` is a flag signaling that the emit operation must occur, vs. the lazy evaled options otherwise.

eslint.config.mjs

@@ -0,0 +1,17 @@
+import compat from 'eslint-plugin-compat';
+
+export default [
+  {
+    // Ignore everything except lib/
+    ignores: ['**', '!lib/**'],
+  },
+  {
+    // Only check browser API compat in the runtime library code.
+    // All other linting is handled by oxlint.
+    ...compat.configs['flat/recommended'],
+    files: ['lib/**/*.js'],
+    linterOptions: {
+      reportUnusedDisableDirectives: 'off',
+    },
+  },
+];

lib/.eslintrc.js

@@ -1,7 +0,0 @@
-/* eslint-env node */
-module.exports = {
-  env: {
-    // Handlebars should run natively in the browser
-    node: false,
-  },
-};

lib/handlebars.runtime.js

@@ -19,7 +19,10 @@ function create() {
   hb.Utils = Utils;
   hb.escapeExpression = Utils.escapeExpression;
 
-  hb.VM = runtime;
+  // Spread into a plain object so that runtime functions (e.g. checkRevision)
+  // can be overridden by consumers. ES module namespace objects are sealed with
+  // getter-only properties per spec, which would prevent monkey-patching.
+  hb.VM = { ...runtime };
   hb.template = function (spec) {
     return runtime.template(spec, hb);
   };

lib/handlebars/compiler/code-gen.js

@@ -4,18 +4,24 @@ 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.
-    let SourceMap = require('source-map'); // eslint-disable-line no-undef
+    // The variable indirection prevents bundlers from statically resolving and bundling
+    // source-map (which requires Node-built-ins). The stub SourceNode below handles
+    // browser/bundled usage. Bundlers may emit a "Critical dependency" warning — this
+    // is expected and harmless.
+    let mod = 'source-map';
+    let SourceMap = require(mod);
     SourceNode = SourceMap.SourceNode;
   }
+  // oxlint-disable-next-line no-unused-vars -- Babel 5 requires named catch param
 } catch (err) {
   /* 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 = '';
@@ -23,7 +29,7 @@ if (!SourceNode) {
       this.add(chunks);
     }
   };
-  /* istanbul ignore next */
+  /* v8 ignore next */
   SourceNode.prototype = {
     add: function (chunks) {
       if (isArray(chunks)) {

lib/handlebars/compiler/compiler.js

@@ -1,5 +1,3 @@
-/* eslint-disable new-cap */
-
 import { Exception } from '@handlebars/parser';
 import { isArray, indexOf, extend } from '../utils';
 import AST from './ast';
@@ -74,7 +72,7 @@ Compiler.prototype = {
   },
 
   compileProgram: function (program) {
-    let childCompiler = new this.compiler(), // eslint-disable-line new-cap
+    let childCompiler = new this.compiler(),
       result = childCompiler.compile(program, this.options),
       guid = this.guid++;
 
@@ -87,7 +85,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');
     }
@@ -158,21 +158,22 @@ JavaScriptCompiler.prototype = {
       };
 
       if (this.decorators) {
-        ret.main_d = this.decorators; // eslint-disable-line camelcase
+        ret.main_d = this.decorators;
         ret.useDecorators = true;
       }
 
       let { programs, decorators } = this.context;
       for (i = 0, l = programs.length; i < l; i++) {
-        if (programs[i]) {
-          ret[i] = programs[i];
-          if (decorators[i]) {
-            ret[i + '_d'] = decorators[i];
-            ret.useDecorators = true;
-          }
+        ret[i] = programs[i];
+        if (decorators[i]) {
+          ret[i + '_d'] = decorators[i];
+          ret.useDecorators = true;
         }
       }
 
+      // Release AST/compiler references only needed during compilation for dedup
+      this.context.environments.length = 0;
+
       if (this.environment.usePartial) {
         ret.usePartial = true;
       }
@@ -828,13 +829,13 @@ JavaScriptCompiler.prototype = {
 
     for (let i = 0, l = children.length; i < l; i++) {
       child = children[i];
-      compiler = new this.compiler(); // eslint-disable-line new-cap
+      compiler = new this.compiler();
 
       let existing = this.matchExistingProgram(child);
 
       if (existing == null) {
-        this.context.programs.push(''); // Placeholder to prevent name conflicts for nested children
-        let index = this.context.programs.length;
+        // Placeholder to prevent name conflicts for nested children
+        let index = this.context.programs.push('') - 1;
         child.index = index;
         child.name = 'program' + index;
         this.context.programs[index] = compiler.compile(
@@ -924,7 +925,7 @@ JavaScriptCompiler.prototype = {
       createdStack,
       usedLiteral;
 
-    /* istanbul ignore next */
+    /* v8 ignore next */
     if (!this.isInline()) {
       throw new Exception('replaceStack on non-inline');
     }
@@ -972,7 +973,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 +995,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 +1009,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/helpers.js

@@ -20,7 +20,8 @@ export function moveHelperToHooks(instance, helperName, keepHelper) {
   if (instance.helpers[helperName]) {
     instance.hooks[helperName] = instance.helpers[helperName];
     if (!keepHelper) {
-      delete instance.helpers[helperName];
+      // Using delete is slow
+      instance.helpers[helperName] = undefined;
     }
   }
 }

lib/handlebars/helpers/each.js

@@ -1,5 +1,5 @@
 import { Exception } from '@handlebars/parser';
-import { createFrame, isArray, isFunction } from '../utils';
+import { createFrame, isArray, isFunction, isMap, isSet } from '../utils';
 
 export default function (instance) {
   instance.registerHelper('each', function (context, options) {
@@ -21,7 +21,7 @@ export default function (instance) {
       data = createFrame(options.data);
     }
 
-    function execIteration(field, index, last) {
+    function execIteration(field, value, index, last) {
       if (data) {
         data.key = field;
         data.index = index;
@@ -31,7 +31,7 @@ export default function (instance) {
 
       ret =
         ret +
-        fn(context[field], {
+        fn(value, {
           data: data,
           blockParams: [context[field], field],
         });
@@ -41,9 +41,19 @@ export default function (instance) {
       if (isArray(context)) {
         for (let j = context.length; i < j; i++) {
           if (i in context) {
-            execIteration(i, i, i === context.length - 1);
+            execIteration(i, context[i], i, i === context.length - 1);
           }
         }
+      } else if (isMap(context)) {
+        const j = context.size;
+        for (const [key, value] of context) {
+          execIteration(key, value, i++, i === j);
+        }
+      } else if (isSet(context)) {
+        const j = context.size;
+        for (const value of context) {
+          execIteration(i, value, i++, i === j);
+        }
       } else if (typeof Symbol === 'function' && context[Symbol.iterator]) {
         const newContext = [];
         const iterator = context[Symbol.iterator]();
@@ -52,7 +62,7 @@ export default function (instance) {
         }
         context = newContext;
         for (let j = context.length; i < j; i++) {
-          execIteration(i, i, i === context.length - 1);
+          execIteration(i, context[i], i, i === context.length - 1);
         }
       } else {
         let priorKey;
@@ -62,13 +72,13 @@ export default function (instance) {
           // the last iteration without have to scan the object twice and create
           // an intermediate keys array.
           if (priorKey !== undefined) {
-            execIteration(priorKey, i - 1);
+            execIteration(priorKey, context[priorKey], i - 1);
           }
           priorKey = key;
           i++;
         });
         if (priorKey !== undefined) {
-          execIteration(priorKey, i - 1, true);
+          execIteration(priorKey, context[priorKey], i - 1, true);
         }
       }
     }

lib/handlebars/internal/create-new-lookup-object.js

@@ -1,11 +0,0 @@
-import { extend } from '../utils';
-
-/**
- * Create a new object with "null"-prototype to avoid truthy results on prototype properties.
- * The resulting object can be used with "object[property]" to check if a property exists
- * @param {...object} sources a varargs parameter of source objects that will be merged
- * @returns {object}
- */
-export function createNewLookupObject(...sources) {
-  return extend(Object.create(null), ...sources);
-}

lib/handlebars/internal/proto-access.js

@@ -1,32 +1,30 @@
-import { createNewLookupObject } from './create-new-lookup-object';
+import { extend } from '../utils';
 import logger from '../logger';
 
 const loggedProperties = Object.create(null);
 
 export function createProtoAccessControl(runtimeOptions) {
-  let defaultMethodWhiteList = Object.create(null);
-  defaultMethodWhiteList['constructor'] = false;
-  defaultMethodWhiteList['__defineGetter__'] = false;
-  defaultMethodWhiteList['__defineSetter__'] = false;
-  defaultMethodWhiteList['__lookupGetter__'] = false;
-
-  let defaultPropertyWhiteList = Object.create(null);
+  // Create an object with "null"-prototype to avoid truthy results on
+  // prototype properties.
+  const propertyWhiteList = Object.create(null);
   // eslint-disable-next-line no-proto
-  defaultPropertyWhiteList['__proto__'] = false;
+  propertyWhiteList['__proto__'] = false;
+  extend(propertyWhiteList, runtimeOptions.allowedProtoProperties);
+
+  const methodWhiteList = Object.create(null);
+  methodWhiteList['constructor'] = false;
+  methodWhiteList['__defineGetter__'] = false;
+  methodWhiteList['__defineSetter__'] = false;
+  methodWhiteList['__lookupGetter__'] = false;
+  extend(methodWhiteList, runtimeOptions.allowedProtoMethods);
 
   return {
     properties: {
-      whitelist: createNewLookupObject(
-        defaultPropertyWhiteList,
-        runtimeOptions.allowedProtoProperties
-      ),
+      whitelist: propertyWhiteList,
       defaultValue: runtimeOptions.allowProtoPropertiesByDefault,
     },
     methods: {
-      whitelist: createNewLookupObject(
-        defaultMethodWhiteList,
-        runtimeOptions.allowedProtoMethods
-      ),
+      whitelist: methodWhiteList,
       defaultValue: runtimeOptions.allowProtoMethodsByDefault,
     },
   };

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');
   }
@@ -71,17 +71,10 @@ export function template(templateSpec, env) {
     }
     partial = env.VM.resolvePartial.call(this, partial, context, options);
 
-    let extendedOptions = Utils.extend({}, options, {
-      hooks: this.hooks,
-      protoAccessControl: this.protoAccessControl,
-    });
+    options.hooks = this.hooks;
+    options.protoAccessControl = this.protoAccessControl;
 
-    let result = env.VM.invokePartial.call(
-      this,
-      partial,
-      context,
-      extendedOptions
-    );
+    let result = env.VM.invokePartial.call(this, partial, context, options);
 
     if (result == null && env.compile) {
       options.partials[options.name] = env.compile(
@@ -89,7 +82,7 @@ export function template(templateSpec, env) {
         templateSpec.compilerOptions,
         env
       );
-      result = options.partials[options.name](context, extendedOptions);
+      result = options.partials[options.name](context, options);
     }
     if (result != null) {
       if (options.indent) {
@@ -124,6 +117,10 @@ export function template(templateSpec, env) {
       return container.lookupProperty(obj, name);
     },
     lookupProperty: function (parent, propertyName) {
+      if (Utils.isMap(parent)) {
+        return parent.get(propertyName);
+      }
+
       let result = parent[propertyName];
       if (result == null) {
         return result;
@@ -251,8 +248,9 @@ export function template(templateSpec, env) {
 
   function _setup(options) {
     if (!options.partial) {
-      let mergedHelpers = Utils.extend({}, env.helpers, options.helpers);
-      wrapHelpersToPassLookupProperty(mergedHelpers, container);
+      let mergedHelpers = {};
+      addHelpers(mergedHelpers, env.helpers, container);
+      addHelpers(mergedHelpers, options.helpers, container);
       container.helpers = mergedHelpers;
 
       if (templateSpec.usePartial) {
@@ -413,9 +411,10 @@ function executeDecorators(fn, prog, container, depths, data, blockParams) {
   return prog;
 }
 
-function wrapHelpersToPassLookupProperty(mergedHelpers, container) {
-  Object.keys(mergedHelpers).forEach((helperName) => {
-    let helper = mergedHelpers[helperName];
+function addHelpers(mergedHelpers, helpers, container) {
+  if (!helpers) return;
+  Object.keys(helpers).forEach((helperName) => {
+    let helper = helpers[helperName];
     mergedHelpers[helperName] = passLookupPropertyOption(helper, container);
   });
 }
@@ -423,6 +422,7 @@ function wrapHelpersToPassLookupProperty(mergedHelpers, container) {
 function passLookupPropertyOption(helper, container) {
   const lookupProperty = container.lookupProperty;
   return wrapHelper(helper, (options) => {
-    return Utils.extend({ lookupProperty }, options);
+    options.lookupProperty = lookupProperty;
+    return options;
   });
 }

lib/handlebars/utils.js

@@ -35,14 +35,18 @@ export function isFunction(value) {
   return typeof value === 'function';
 }
 
-/* istanbul ignore next */
-export const isArray =
-  Array.isArray ||
-  function (value) {
+function testTag(name) {
+  const tag = '[object ' + name + ']';
+  return function (value) {
     return value && typeof value === 'object'
-      ? toString.call(value) === '[object Array]'
+      ? toString.call(value) === tag
       : false;
   };
+}
+
+export const isArray = Array.isArray;
+export const isMap = testTag('Map');
+export const isSet = testTag('Set');
 
 // Older IE versions do not directly support indexOf so we must implement our own, sadly.
 export function indexOf(array, value) {

lib/index.js

@@ -1,6 +1,5 @@
 // USAGE:
 // var handlebars = require('handlebars');
-/* eslint-env node */
 /* eslint-disable no-var */
 
 // var local = handlebars.create();
@@ -19,7 +18,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

@@ -1,8 +1,7 @@
-/* eslint-env node */
 /* eslint-disable no-console */
 import Async from 'neo-async';
 import fs from 'fs';
-import * as Handlebars from './handlebars';
+import Handlebars from './handlebars';
 import { basename } from 'path';
 import { SourceMapConsumer, SourceNode } from 'source-map';
 
@@ -95,7 +94,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 +113,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);
             }
@@ -153,7 +152,7 @@ function loadFiles(opts, callback) {
   );
 }
 
-module.exports.cli = function (opts) {
+module.exports.cli = async function (opts) {
   if (opts.version) {
     console.log(Handlebars.VERSION);
     return;
@@ -222,7 +221,7 @@ module.exports.cli = function (opts) {
     output.add('{};\n');
   }
 
-  opts.templates.forEach(function (template) {
+  for (const template of opts.templates) {
     let options = {
       knownHelpers: known,
       knownHelpersOnly: opts.o,
@@ -239,11 +238,12 @@ module.exports.cli = function (opts) {
 
     // If we are generating a source map, we have to reconstruct the SourceNode object
     if (opts.map) {
-      let consumer = new SourceMapConsumer(precompiled.map);
+      let consumer = await new SourceMapConsumer(precompiled.map);
       precompiled = SourceNode.fromStringWithSourceMap(
         precompiled.code,
         consumer
       );
+      consumer.destroy();
     }
 
     if (opts.simple) {
@@ -265,7 +265,7 @@ module.exports.cli = function (opts) {
         ');\n',
       ]);
     }
-  });
+  }
 
   // Output the content
   if (!opts.simple) {

nyc.config.js

@@ -1,9 +0,0 @@
-module.exports = {
-  'check-coverage': true,
-  branches: 100,
-  lines: 100,
-  functions: 100,
-  statements: 100,
-  exclude: ['**/spec/**'],
-  reporter: 'html',
-};

package.json

@@ -2,107 +2,21 @@
   "name": "handlebars",
   "version": "5.0.0-alpha.1",
   "description": "Handlebars provides the power necessary to let you build semantic templates effectively with no frustration",
-  "homepage": "https://handlebarsjs.com/",
   "keywords": [
     "handlebars",
+    "html",
     "mustache",
-    "template",
-    "html"
+    "template"
   ],
+  "homepage": "https://handlebarsjs.com/",
+  "license": "MIT",
+  "author": "Yehuda Katz",
   "repository": {
     "type": "git",
     "url": "https://github.com/handlebars-lang/handlebars.js.git"
   },
-  "author": "Yehuda Katz",
-  "license": "MIT",
-  "readmeFilename": "README.markdown",
-  "engines": {
-    "node": ">=12"
-  },
-  "dependencies": {
-    "@handlebars/parser": "^2.1.0",
-    "neo-async": "^2.6.2",
-    "source-map": "^0.6.1",
-    "yargs": "^16.2.0"
-  },
-  "peerDependencies": {
-    "uglify-js": "^3.1.4"
-  },
-  "devDependencies": {
-    "@definitelytyped/dtslint": "^0.0.100",
-    "@playwright/test": "^1.36.1",
-    "aws-sdk": "^2.1.49",
-    "babel-loader": "^5.0.0",
-    "babel-runtime": "^5.1.10",
-    "benchmark": "~1.0",
-    "chai": "^4.2.0",
-    "chai-diff": "^1.0.1",
-    "concurrently": "^5.0.0",
-    "dirty-chai": "^2.0.1",
-    "dustjs-linkedin": "^2.0.2",
-    "eslint": "^8.25.0",
-    "eslint-config-prettier": "^8.9.0",
-    "eslint-plugin-compat": "4.0",
-    "fs-extra": "^8.1.0",
-    "grunt": "^1.0.4",
-    "grunt-babel": "^5.0.0",
-    "grunt-cli": "^1",
-    "grunt-contrib-clean": "^1",
-    "grunt-contrib-concat": "^1",
-    "grunt-contrib-connect": "^3.0.0",
-    "grunt-contrib-copy": "^1",
-    "grunt-contrib-requirejs": "^1",
-    "grunt-contrib-uglify": "^1",
-    "grunt-contrib-watch": "^1.1.0",
-    "grunt-shell": "^4.0.0",
-    "grunt-webpack": "^1.0.8",
-    "husky": "^3.1.0",
-    "lint-staged": "^9.5.0",
-    "mocha": "^5",
-    "mock-stdin": "^0.3.0",
-    "mustache": "^2.1.3",
-    "nyc": "^14.1.1",
-    "prettier": "^3.0.0",
-    "semver": "^5.0.1",
-    "sinon": "^7.5.0",
-    "typescript": "^3.4.3",
-    "uglify-js": "^3.1.4",
-    "underscore": "^1.5.1",
-    "webpack": "^1.12.6",
-    "webpack-dev-server": "^1.12.1"
-  },
-  "main": "lib/index.js",
-  "types": "types/index.d.ts",
-  "browser": "./dist/cjs/handlebars.js",
   "bin": {
-    "handlebars": "bin/handlebars.js"
-  },
-  "scripts": {
-    "build": "grunt build",
-    "release": "grunt release",
-    "publish:aws": "npm run test:tasks && grunt && grunt publish-to-aws",
-    "format": "prettier --write '**/*.{js,css,json,md}' && eslint --fix .",
-    "lint": "npm run lint:eslint && npm run lint:prettier && npm run lint:types",
-    "lint:eslint": "eslint --max-warnings 0 .",
-    "lint:prettier": "prettier --check '**/*.js'",
-    "lint:types": "dtslint types",
-    "test": "npm run test:mocha",
-    "test:mocha": "grunt build && grunt test",
-    "test:tasks": "mocha tasks/tests/",
-    "test:browser": "playwright test --config tests/browser/playwright.config.js",
-    "test:integration": "grunt integration-tests",
-    "test:serve": "grunt connect:server:keepalive",
-    "--- combined tasks ---": "",
-    "check-before-pull-request": "concurrently --kill-others-on-fail npm:lint npm:test"
-  },
-  "jspm": {
-    "main": "handlebars",
-    "directories": {
-      "lib": "dist/cjs"
-    },
-    "buildConfig": {
-      "minify": true
-    }
+    "handlebars": "bin/handlebars.mjs"
   },
   "files": [
     "bin",
@@ -114,13 +28,72 @@
     "types/*.d.ts",
     "runtime.d.ts"
   ],
-  "browserslist": [
-    "last 2 versions",
-    "Firefox ESR",
-    "not dead",
-    "not IE 11",
-    "maintained node versions"
-  ],
+  "main": "lib/index.js",
+  "browser": "./dist/cjs/handlebars.js",
+  "types": "types/index.d.ts",
+  "scripts": {
+    "clean": "node -e \"require('fs').rmSync('dist',{recursive:true,force:true});require('fs').rmSync('tmp',{recursive:true,force:true})\"",
+    "build:cjs": "swc lib --out-dir dist/cjs --strip-leading-paths --ignore \"**/index.js\"",
+    "build:bundles": "rspack build",
+    "build": "npm run clean && npm run build:cjs && npm run build:bundles",
+    "release": "npm run build",
+    "publish:aws": "npm run build && npm run test:tasks && node tasks/publish-to-aws.js",
+    "format": "oxfmt --write . && oxlint --fix .",
+    "lint": "npm run lint:oxlint && npm run lint:format && npm run lint:types && npm run lint:compat",
+    "lint:oxlint": "oxlint --max-warnings 0 .",
+    "lint:format": "oxfmt --check .",
+    "lint:types": "tstyche",
+    "lint:compat": "eslint",
+    "test": "npm run build && vitest run --project node --project tasks --project rspack --coverage",
+    "test:browser": "vitest run --project browser",
+    "test:unit": "vitest run --project node",
+    "test:tasks": "vitest run --project tasks",
+    "test:publish": "npm run build && vitest run --project publish",
+    "test:browser-smoke": "playwright test --config tests/browser/playwright.config.js",
+    "test:serve": "npx serve -l 9999 .",
+    "test:integration": "npm run build && ./tests/integration/run-integration-tests.sh",
+    "bench": "node tests/bench/perf.mjs",
+    "bench:compare": "node tests/bench/compare.mjs",
+    "bench:size": "node tests/bench/size.mjs",
+    "--- combined tasks ---": "",
+    "check-before-pull-request": "concurrently --kill-others-on-fail npm:lint npm:test"
+  },
+  "dependencies": {
+    "@handlebars/parser": "^2.1.0",
+    "neo-async": "^2.6.2",
+    "source-map": "^0.7.6",
+    "yargs": "^18.0.0"
+  },
+  "devDependencies": {
+    "@aws-sdk/client-s3": "^3.1011.0",
+    "@playwright/test": "^1.58.2",
+    "@rspack/cli": "^1.7.8",
+    "@rspack/core": "^1.7.8",
+    "@swc/cli": "^0.8.0",
+    "@swc/core": "^1.15.18",
+    "@vitest/browser": "^4.0.18",
+    "@vitest/browser-playwright": "^4.0.18",
+    "@vitest/coverage-v8": "^4.0.18",
+    "cli-testlab": "^6.0.0",
+    "concurrently": "^5.0.0",
+    "eslint": "^10.0.3",
+    "eslint-plugin-compat": "^7.0.1",
+    "fs-extra": "^8.1.0",
+    "husky": "^3.1.0",
+    "lint-staged": "^16.3.2",
+    "mock-stdin": "^0.3.0",
+    "oxfmt": "^0.36.0",
+    "oxlint": "^1.51.0",
+    "semver": "^5.0.1",
+    "tinybench": "^6.0.0",
+    "tstyche": "^6.2.0",
+    "typescript": "^5.9.3",
+    "uglify-js": "^3.19.3",
+    "vitest": "^4.0.18"
+  },
+  "peerDependencies": {
+    "uglify-js": "^3.19.3"
+  },
   "husky": {
     "hooks": {
       "pre-commit": "lint-staged"
@@ -128,12 +101,29 @@
   },
   "lint-staged": {
     "*.{js,css,json,md}": [
-      "prettier --write",
-      "git add"
+      "oxfmt --write"
     ],
     "*.js": [
-      "eslint --fix",
-      "git add"
+      "oxlint --fix"
     ]
+  },
+  "browserslist": [
+    "last 2 versions",
+    "Firefox ESR",
+    "not dead",
+    "not IE 11",
+    "maintained node versions"
+  ],
+  "engines": {
+    "node": ">=20"
+  },
+  "jspm": {
+    "main": "handlebars",
+    "directories": {
+      "lib": "dist/cjs"
+    },
+    "buildConfig": {
+      "minify": true
+    }
   }
 }

prettier.config.js

@@ -1,6 +0,0 @@
-module.exports = {
-  tabWidth: 2,
-  semi: true,
-  singleQuote: true,
-  trailingComma: 'es5',
-};

release-notes.md

@@ -356,7 +356,6 @@ Breaking changes:
 Compatibility notes:
 
 - Compiler revision increased - 06b7224
-
   - This means that template compiled with versions prior to 4.3.0 will not work with runtimes >= 4.3.0
     The increase was done because the "helperMissing" and "blockHelperMissing" are now moved from the helpers
     to the internal "container.hooks" object, so old templates will not be able to call them anymore. We suggest

rspack.config.js

@@ -0,0 +1,88 @@
+const { rspack } = require('@rspack/core');
+const path = require('path');
+const fs = require('fs');
+
+const pkg = require('./package.json');
+const license = fs.readFileSync(path.resolve(__dirname, 'LICENSE'), 'utf8');
+const banner = `/*!
+
+ @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat
+ ${pkg.name} v${pkg.version}
+
+${license}
+*/`;
+
+function createConfig(entry, filename, minimize) {
+  const plugins = [];
+
+  if (!minimize) {
+    // For non-minified builds, use BannerPlugin to add the license header
+    plugins.push(new rspack.BannerPlugin({ banner, raw: true }));
+  }
+
+  return {
+    mode: minimize ? 'production' : 'none',
+    context: __dirname,
+    entry,
+    output: {
+      path: path.resolve(__dirname, 'dist'),
+      filename,
+      library: {
+        name: 'Handlebars',
+        type: 'umd',
+        export: 'default',
+      },
+      globalObject: 'this',
+      clean: false,
+    },
+    module: {
+      rules: [
+        {
+          test: /\.js$/,
+          exclude: /node_modules/,
+          use: {
+            loader: 'builtin:swc-loader',
+            options: {
+              jsc: {
+                parser: { syntax: 'ecmascript' },
+              },
+            },
+          },
+        },
+      ],
+    },
+    optimization: {
+      minimize,
+      minimizer: minimize
+        ? [
+            new rspack.SwcJsMinimizerRspackPlugin({
+              extractComments: false,
+              minimizerOptions: {
+                compress: { passes: 2 },
+                mangle: true,
+                format: {
+                  comments: false,
+                  // Prepend the license banner in the minified output
+                  preamble: banner,
+                },
+              },
+            }),
+          ]
+        : [],
+    },
+    plugins,
+    target: ['web', 'browserslist'],
+    devtool: false,
+  };
+}
+
+module.exports = [
+  createConfig('./lib/handlebars.js', 'handlebars.js', false),
+  createConfig('./lib/handlebars.runtime.js', 'handlebars.runtime.js', false),
+  createConfig('./lib/handlebars.js', 'handlebars.min.js', true),
+  createConfig(
+    './lib/handlebars.runtime.js',
+    'handlebars.runtime.min.js',
+    true
+  ),
+];

runtime.d.ts

@@ -1,5 +1,3 @@
-import Handlebars = require('handlebars')
+import Handlebars = require('handlebars');
 
-declare module "handlebars/runtime" {
-   
-}
+declare module 'handlebars/runtime' {}

spec/.eslintrc.js

@@ -1,37 +0,0 @@
-module.exports = {
-  globals: {
-    CompilerContext: true,
-    Handlebars: true,
-    handlebarsEnv: true,
-    shouldCompileTo: true,
-    shouldCompileToWithPartials: true,
-    shouldThrow: true,
-    expectTemplate: true,
-    compileWithPartials: true,
-    suite: true,
-    equal: true,
-    equals: true,
-    test: true,
-    testBoth: true,
-    raises: true,
-    deepEqual: true,
-    start: true,
-    stop: true,
-    ok: true,
-    sinon: true,
-    strictEqual: true,
-    define: true,
-    expect: true,
-    chai: true,
-  },
-  env: {
-    mocha: true,
-  },
-  rules: {
-    // Disabling for tests, for now.
-    'no-path-concat': 'off',
-
-    'no-var': 'off',
-    'dot-notation': 'off',
-  },
-};

spec/ast.js

@@ -7,102 +7,100 @@ describe('ast', function () {
 
   describe('BlockStatement', function () {
     it('should throw on mustache mismatch', function () {
-      shouldThrow(
-        function () {
-          handlebarsEnv.parse('\n  {{#foo}}{{/bar}}');
-        },
-        Handlebars.Exception,
-        "foo doesn't match bar - 2:5"
-      );
+      expect(function () {
+        handlebarsEnv.parse('\n  {{#foo}}{{/bar}}');
+      }).toThrow("foo doesn't match bar - 2:5");
     });
   });
 
   describe('helpers', function () {
     describe('#helperExpression', function () {
       it('should handle mustache statements', function () {
-        equals(
+        expect(
           AST.helpers.helperExpression({
             type: 'MustacheStatement',
             params: [],
             hash: undefined,
-          }),
-          false
-        );
-        equals(
+          })
+        ).toBe(false);
+        expect(
           AST.helpers.helperExpression({
             type: 'MustacheStatement',
             params: [1],
             hash: undefined,
-          }),
-          true
-        );
-        equals(
+          })
+        ).toBe(true);
+        expect(
           AST.helpers.helperExpression({
             type: 'MustacheStatement',
             params: [],
             hash: {},
-          }),
-          true
-        );
+          })
+        ).toBe(true);
       });
       it('should handle block statements', function () {
-        equals(
+        expect(
           AST.helpers.helperExpression({
             type: 'BlockStatement',
             params: [],
             hash: undefined,
-          }),
-          false
-        );
-        equals(
+          })
+        ).toBe(false);
+        expect(
           AST.helpers.helperExpression({
             type: 'BlockStatement',
             params: [1],
             hash: undefined,
-          }),
-          true
-        );
-        equals(
+          })
+        ).toBe(true);
+        expect(
           AST.helpers.helperExpression({
             type: 'BlockStatement',
             params: [],
             hash: {},
-          }),
+          })
+        ).toBe(true);
+      });
+      it('should handle subexpressions', function () {
+        expect(AST.helpers.helperExpression({ type: 'SubExpression' })).toBe(
           true
         );
       });
-      it('should handle subexpressions', function () {
-        equals(AST.helpers.helperExpression({ type: 'SubExpression' }), true);
-      });
       it('should work with non-helper nodes', function () {
-        equals(AST.helpers.helperExpression({ type: 'Program' }), false);
+        expect(AST.helpers.helperExpression({ type: 'Program' })).toBe(false);
 
-        equals(
-          AST.helpers.helperExpression({ type: 'PartialStatement' }),
+        expect(AST.helpers.helperExpression({ type: 'PartialStatement' })).toBe(
           false
         );
-        equals(
-          AST.helpers.helperExpression({ type: 'ContentStatement' }),
+        expect(AST.helpers.helperExpression({ type: 'ContentStatement' })).toBe(
           false
         );
-        equals(
-          AST.helpers.helperExpression({ type: 'CommentStatement' }),
+        expect(AST.helpers.helperExpression({ type: 'CommentStatement' })).toBe(
           false
         );
 
-        equals(AST.helpers.helperExpression({ type: 'PathExpression' }), false);
-
-        equals(AST.helpers.helperExpression({ type: 'StringLiteral' }), false);
-        equals(AST.helpers.helperExpression({ type: 'NumberLiteral' }), false);
-        equals(AST.helpers.helperExpression({ type: 'BooleanLiteral' }), false);
-        equals(
-          AST.helpers.helperExpression({ type: 'UndefinedLiteral' }),
+        expect(AST.helpers.helperExpression({ type: 'PathExpression' })).toBe(
           false
         );
-        equals(AST.helpers.helperExpression({ type: 'NullLiteral' }), false);
 
-        equals(AST.helpers.helperExpression({ type: 'Hash' }), false);
-        equals(AST.helpers.helperExpression({ type: 'HashPair' }), false);
+        expect(AST.helpers.helperExpression({ type: 'StringLiteral' })).toBe(
+          false
+        );
+        expect(AST.helpers.helperExpression({ type: 'NumberLiteral' })).toBe(
+          false
+        );
+        expect(AST.helpers.helperExpression({ type: 'BooleanLiteral' })).toBe(
+          false
+        );
+        expect(AST.helpers.helperExpression({ type: 'UndefinedLiteral' })).toBe(
+          false
+        );
+        expect(AST.helpers.helperExpression({ type: 'NullLiteral' })).toBe(
+          false
+        );
+
+        expect(AST.helpers.helperExpression({ type: 'Hash' })).toBe(false);
+        expect(AST.helpers.helperExpression({ type: 'HashPair' })).toBe(false);
       });
     });
   });
@@ -111,13 +109,12 @@ describe('ast', function () {
     var ast, body;
 
     function testColumns(node, firstLine, lastLine, firstColumn, lastColumn) {
-      equals(node.loc.start.line, firstLine);
-      equals(node.loc.start.column, firstColumn);
-      equals(node.loc.end.line, lastLine);
-      equals(node.loc.end.column, lastColumn);
+      expect(node.loc.start.line).toBe(firstLine);
+      expect(node.loc.start.column).toBe(firstColumn);
+      expect(node.loc.end.line).toBe(lastLine);
+      expect(node.loc.end.column).toBe(lastColumn);
     }
 
-    /* eslint-disable no-multi-spaces */
     ast = Handlebars.parse(
       'line 1 {{line1Token}}\n' + // 1
         ' line 2 {{line2token}}\n' + // 2
@@ -131,7 +128,6 @@ describe('ast', function () {
         '{{else}}\n' + // 10
         '{{/open}}'
     ); // 11
-    /* eslint-enable no-multi-spaces */
     body = ast.body;
 
     it('gets ContentNode line numbers', function () {

spec/basic.js

@@ -1,9 +1,3 @@
-global.handlebarsEnv = null;
-
-beforeEach(function () {
-  global.handlebarsEnv = Handlebars.create();
-});
-
 describe('basic context', function () {
   it('most basic', function () {
     expectTemplate('{{foo}}').withInput({ foo: 'foo' }).toCompileTo('foo');
@@ -387,6 +381,13 @@ describe('basic context', function () {
       .toCompileTo('Goodbye beautiful world!');
   });
 
+  it('nested paths with Map', function () {
+    expectTemplate('Goodbye {{alan/expression}} world!')
+      .withInput({ alan: new Map([['expression', 'beautiful']]) })
+      .withMessage('Nested paths access nested objects')
+      .toCompileTo('Goodbye beautiful world!');
+  });
+
   it('nested paths with empty string value', function () {
     expectTemplate('Goodbye {{alan/expression}} world!')
       .withInput({ alan: { expression: '' } })

spec/blocks.js

@@ -381,26 +381,26 @@ describe('blocks', function () {
       var run;
       expectTemplate('{{*decorator "success"}}')
         .withDecorator('decorator', function (fn, props, container, options) {
-          equals(options.args[0], 'success');
+          expect(options.args[0]).toBe('success');
           run = true;
           return fn;
         })
         .withInput({ foo: 'success' })
         .toCompileTo('');
-      equals(run, true);
+      expect(run).toBe(true);
     });
 
     it('should fail when accessing variables from root', function () {
       var run;
       expectTemplate('{{*decorator foo}}')
         .withDecorator('decorator', function (fn, props, container, options) {
-          equals(options.args[0], undefined);
+          expect(options.args[0]).toBeUndefined();
           run = true;
           return fn;
         })
         .withInput({ foo: 'fail' })
         .toCompileTo('');
-      equals(run, true);
+      expect(run).toBe(true);
     });
 
     describe('registration', function () {
@@ -411,9 +411,9 @@ describe('blocks', function () {
           return 'fail';
         });
 
-        equals(!!handlebarsEnv.decorators.foo, true);
+        expect(handlebarsEnv.decorators.foo).toBeTruthy();
         handlebarsEnv.unregisterDecorator('foo');
-        equals(handlebarsEnv.decorators.foo, undefined);
+        expect(handlebarsEnv.decorators.foo).toBeUndefined();
       });
 
       it('allows multiple globals', function () {
@@ -424,32 +424,28 @@ describe('blocks', function () {
           bar: function () {},
         });
 
-        equals(!!handlebarsEnv.decorators.foo, true);
-        equals(!!handlebarsEnv.decorators.bar, true);
+        expect(handlebarsEnv.decorators.foo).toBeTruthy();
+        expect(handlebarsEnv.decorators.bar).toBeTruthy();
         handlebarsEnv.unregisterDecorator('foo');
         handlebarsEnv.unregisterDecorator('bar');
-        equals(handlebarsEnv.decorators.foo, undefined);
-        equals(handlebarsEnv.decorators.bar, undefined);
+        expect(handlebarsEnv.decorators.foo).toBeUndefined();
+        expect(handlebarsEnv.decorators.bar).toBeUndefined();
       });
 
       it('fails with multiple and args', function () {
-        shouldThrow(
-          function () {
-            handlebarsEnv.registerDecorator(
-              {
-                world: function () {
-                  return 'world!';
-                },
-                testHelper: function () {
-                  return 'found it!';
-                },
+        expect(function () {
+          handlebarsEnv.registerDecorator(
+            {
+              world: function () {
+                return 'world!';
               },
-              {}
-            );
-          },
-          Error,
-          'Arg not supported with multiple decorators'
-        );
+              testHelper: function () {
+                return 'found it!';
+              },
+            },
+            {}
+          );
+        }).toThrow('Arg not supported with multiple decorators');
       });
     });
   });

spec/builtins.js

@@ -257,17 +257,13 @@ describe('builtin helpers', function () {
       // Object property iteration order is undefined according to ECMA spec,
       // so we need to check both possible orders
       // @see http://stackoverflow.com/questions/280713/elements-order-in-a-for-in-loop
-      var actual = compileWithPartials(string, hash);
+      var actual = CompilerContext.compile(string)(hash);
       var expected1 =
         '<b>#1</b>. goodbye! 2. GOODBYE! cruel world!';
       var expected2 =
         '2. GOODBYE! <b>#1</b>. goodbye! cruel world!';
 
-      equals(
-        actual === expected1 || actual === expected2,
-        true,
-        'each with object argument iterates over the contents when not empty'
-      );
+      expect([expected1, expected2]).toContain(actual);
 
       expectTemplate(string)
         .withInput({
@@ -508,6 +504,50 @@ describe('builtin helpers', function () {
       );
     });
 
+    it('each on Map', function () {
+      var map = new Map([
+        [1, 'one'],
+        [2, 'two'],
+        [3, 'three'],
+      ]);
+
+      expectTemplate('{{#each map}}{{@key}}(i{{@index}}) {{.}} {{/each}}')
+        .withInput({ map: map })
+        .toCompileTo('1(i0) one 2(i1) two 3(i2) three ');
+
+      expectTemplate('{{#each map}}{{#if @first}}{{.}}{{/if}}{{/each}}')
+        .withInput({ map: map })
+        .toCompileTo('one');
+
+      expectTemplate('{{#each map}}{{#if @last}}{{.}}{{/if}}{{/each}}')
+        .withInput({ map: map })
+        .toCompileTo('three');
+
+      expectTemplate('{{#each map}}{{.}}{{/each}}not-in-each')
+        .withInput({ map: new Map() })
+        .toCompileTo('not-in-each');
+    });
+
+    it('each on Set', function () {
+      var set = new Set([1, 2, 3]);
+
+      expectTemplate('{{#each set}}{{@key}}(i{{@index}}) {{.}} {{/each}}')
+        .withInput({ set: set })
+        .toCompileTo('0(i0) 1 1(i1) 2 2(i2) 3 ');
+
+      expectTemplate('{{#each set}}{{#if @first}}{{.}}{{/if}}{{/each}}')
+        .withInput({ set: set })
+        .toCompileTo('1');
+
+      expectTemplate('{{#each set}}{{#if @last}}{{.}}{{/if}}{{/each}}')
+        .withInput({ set: set })
+        .toCompileTo('3');
+
+      expectTemplate('{{#each set}}{{.}}{{/each}}not-in-each')
+        .withInput({ set: new Set() })
+        .toCompileTo('not-in-each');
+    });
+
     if (global.Symbol && global.Symbol.iterator) {
       it('each on iterable', function () {
         function Iterator(arr) {
@@ -586,8 +626,8 @@ describe('builtin helpers', function () {
         .withInput({ blah: 'whee' })
         .withMessage('log should not display')
         .toCompileTo('');
-      equals(1, levelArg, 'should call log with 1');
-      equals('whee', logArg, "should call log with 'whee'");
+      expect(levelArg).toBe(1);
+      expect(logArg).toBe('whee');
     });
 
     it('should call logger at data level', function () {
@@ -602,21 +642,21 @@ describe('builtin helpers', function () {
         .withRuntimeOptions({ data: { level: '03' } })
         .withCompileOptions({ data: true })
         .toCompileTo('');
-      equals('03', levelArg);
-      equals('whee', logArg);
+      expect(levelArg).toBe('03');
+      expect(logArg).toBe('whee');
     });
 
     it('should output to info', function () {
       var called;
 
       console.info = function (info) {
-        equals('whee', info);
+        expect(info).toBe('whee');
         called = true;
         console.info = $info;
         console.log = $log;
       };
       console.log = function (log) {
-        equals('whee', log);
+        expect(log).toBe('whee');
         called = true;
         console.info = $info;
         console.log = $log;
@@ -625,14 +665,14 @@ describe('builtin helpers', function () {
       expectTemplate('{{log blah}}')
         .withInput({ blah: 'whee' })
         .toCompileTo('');
-      equals(true, called);
+      expect(called).toBe(true);
     });
 
     it('should log at data level', function () {
       var called;
 
       console.error = function (log) {
-        equals('whee', log);
+        expect(log).toBe('whee');
         called = true;
         console.error = $error;
       };
@@ -642,7 +682,7 @@ describe('builtin helpers', function () {
         .withRuntimeOptions({ data: { level: '03' } })
         .withCompileOptions({ data: true })
         .toCompileTo('');
-      equals(true, called);
+      expect(called).toBe(true);
     });
 
     it('should handle missing logger', function () {
@@ -650,7 +690,7 @@ describe('builtin helpers', function () {
 
       console.error = undefined;
       console.log = function (log) {
-        equals('whee', log);
+        expect(log).toBe('whee');
         called = true;
         console.log = $log;
       };
@@ -660,14 +700,14 @@ describe('builtin helpers', function () {
         .withRuntimeOptions({ data: { level: '03' } })
         .withCompileOptions({ data: true })
         .toCompileTo('');
-      equals(true, called);
+      expect(called).toBe(true);
     });
 
     it('should handle string log levels', function () {
       var called;
 
       console.error = function (log) {
-        equals('whee', log);
+        expect(log).toBe('whee');
         called = true;
       };
 
@@ -676,7 +716,7 @@ describe('builtin helpers', function () {
         .withRuntimeOptions({ data: { level: 'error' } })
         .withCompileOptions({ data: true })
         .toCompileTo('');
-      equals(true, called);
+      expect(called).toBe(true);
 
       called = false;
 
@@ -685,21 +725,21 @@ describe('builtin helpers', function () {
         .withRuntimeOptions({ data: { level: 'ERROR' } })
         .withCompileOptions({ data: true })
         .toCompileTo('');
-      equals(true, called);
+      expect(called).toBe(true);
     });
 
     it('should handle hash log levels', function () {
       var called;
 
       console.error = function (log) {
-        equals('whee', log);
+        expect(log).toBe('whee');
         called = true;
       };
 
       expectTemplate('{{log blah level="error"}}')
         .withInput({ blah: 'whee' })
         .toCompileTo('');
-      equals(true, called);
+      expect(called).toBe(true);
     });
 
     it('should handle hash log levels', function () {
@@ -717,16 +757,16 @@ describe('builtin helpers', function () {
       expectTemplate('{{log blah level="debug"}}')
         .withInput({ blah: 'whee' })
         .toCompileTo('');
-      equals(false, called);
+      expect(called).toBe(false);
     });
 
     it('should pass multiple log arguments', function () {
       var called;
 
       console.info = console.log = function (log1, log2, log3) {
-        equals('whee', log1);
-        equals('foo', log2);
-        equals(1, log3);
+        expect(log1).toBe('whee');
+        expect(log2).toBe('foo');
+        expect(log3).toBe(1);
         called = true;
         console.log = $log;
       };
@@ -734,20 +774,20 @@ describe('builtin helpers', function () {
       expectTemplate('{{log blah "foo" 1}}')
         .withInput({ blah: 'whee' })
         .toCompileTo('');
-      equals(true, called);
+      expect(called).toBe(true);
     });
 
     it('should pass zero log arguments', function () {
       var called;
 
       console.info = console.log = function () {
-        expect(arguments.length).to.equal(0);
+        expect(arguments.length).toBe(0);
         called = true;
         console.log = $log;
       };
 
       expectTemplate('{{log}}').withInput({ blah: 'whee' }).toCompileTo('');
-      expect(called).to.be.true();
+      expect(called).toBe(true);
     });
     /* eslint-enable no-console */
   });

spec/compiler.js

@@ -10,69 +10,56 @@ describe('compiler', function () {
     }
 
     it('should treat as equal', function () {
-      equal(compile('foo').equals(compile('foo')), true);
-      equal(compile('{{foo}}').equals(compile('{{foo}}')), true);
-      equal(compile('{{foo.bar}}').equals(compile('{{foo.bar}}')), true);
-      equal(
+      expect(compile('foo').equals(compile('foo'))).toBe(true);
+      expect(compile('{{foo}}').equals(compile('{{foo}}'))).toBe(true);
+      expect(compile('{{foo.bar}}').equals(compile('{{foo.bar}}'))).toBe(true);
+      expect(
         compile('{{foo.bar baz "foo" true false bat=1}}').equals(
           compile('{{foo.bar baz "foo" true false bat=1}}')
-        ),
-        true
-      );
-      equal(
+        )
+      ).toBe(true);
+      expect(
         compile('{{foo.bar (baz bat=1)}}').equals(
           compile('{{foo.bar (baz bat=1)}}')
-        ),
-        true
-      );
-      equal(
-        compile('{{#foo}} {{/foo}}').equals(compile('{{#foo}} {{/foo}}')),
-        true
-      );
+        )
+      ).toBe(true);
+      expect(
+        compile('{{#foo}} {{/foo}}').equals(compile('{{#foo}} {{/foo}}'))
+      ).toBe(true);
     });
     it('should treat as not equal', function () {
-      equal(compile('foo').equals(compile('bar')), false);
-      equal(compile('{{foo}}').equals(compile('{{bar}}')), false);
-      equal(compile('{{foo.bar}}').equals(compile('{{bar.bar}}')), false);
-      equal(
+      expect(compile('foo').equals(compile('bar'))).toBe(false);
+      expect(compile('{{foo}}').equals(compile('{{bar}}'))).toBe(false);
+      expect(compile('{{foo.bar}}').equals(compile('{{bar.bar}}'))).toBe(false);
+      expect(
         compile('{{foo.bar baz bat=1}}').equals(
           compile('{{foo.bar bar bat=1}}')
-        ),
-        false
-      );
-      equal(
+        )
+      ).toBe(false);
+      expect(
         compile('{{foo.bar (baz bat=1)}}').equals(
           compile('{{foo.bar (bar bat=1)}}')
-        ),
-        false
-      );
-      equal(
-        compile('{{#foo}} {{/foo}}').equals(compile('{{#bar}} {{/bar}}')),
-        false
-      );
-      equal(
-        compile('{{#foo}} {{/foo}}').equals(
-          compile('{{#foo}} {{foo}}{{/foo}}')
-        ),
-        false
-      );
+        )
+      ).toBe(false);
+      expect(
+        compile('{{#foo}} {{/foo}}').equals(compile('{{#bar}} {{/bar}}'))
+      ).toBe(false);
+      expect(
+        compile('{{#foo}} {{/foo}}').equals(compile('{{#foo}} {{foo}}{{/foo}}'))
+      ).toBe(false);
     });
   });
 
   describe('#compile', function () {
     it('should fail with invalid input', function () {
-      shouldThrow(
-        function () {
-          Handlebars.compile(null);
-        },
-        Error,
+      expect(function () {
+        Handlebars.compile(null);
+      }).toThrow(
         'You must pass a string or Handlebars AST to Handlebars.compile. You passed null'
       );
-      shouldThrow(
-        function () {
-          Handlebars.compile({});
-        },
-        Error,
+      expect(function () {
+        Handlebars.compile({});
+      }).toThrow(
         'You must pass a string or Handlebars AST to Handlebars.compile. You passed [object Object]'
       );
     });
@@ -80,71 +67,52 @@ describe('compiler', function () {
     it('should include the location in the error (row and column)', function () {
       try {
         Handlebars.compile(' \n  {{#if}}\n{{/def}}')();
-        equal(
-          true,
-          false,
-          'Statement must throw exception. This line should not be executed.'
-        );
+        expect.unreachable('Statement must throw exception');
       } catch (err) {
-        equal(
-          err.message,
-          "if doesn't match def - 2:5",
-          'Checking error message'
-        );
+        expect(err.message).toBe("if doesn't match def - 2:5");
         if (Object.getOwnPropertyDescriptor(err, 'column').writable) {
           // In Safari 8, the column-property is read-only. This means that even if it is set with defineProperty,
           // its value won't change (https://github.com/jquery/esprima/issues/1290#issuecomment-132455482)
           // Since this was neither working in Handlebars 3 nor in 4.0.5, we only check the column for other browsers.
-          equal(err.column, 5, 'Checking error column');
+          expect(err.column).toBe(5);
         }
-        equal(err.lineNumber, 2, 'Checking error row');
+        expect(err.lineNumber).toBe(2);
       }
     });
 
     it('should include the location as enumerable property', function () {
       try {
         Handlebars.compile(' \n  {{#if}}\n{{/def}}')();
-        equal(
-          true,
-          false,
-          'Statement must throw exception. This line should not be executed.'
-        );
+        expect.unreachable('Statement must throw exception');
       } catch (err) {
-        equal(
-          Object.prototype.propertyIsEnumerable.call(err, 'column'),
-          true,
-          'Checking error column'
+        expect(Object.prototype.propertyIsEnumerable.call(err, 'column')).toBe(
+          true
         );
       }
     });
 
     it('can utilize AST instance', function () {
-      equal(
+      expect(
         Handlebars.compile({
           type: 'Program',
           body: [{ type: 'ContentStatement', value: 'Hello' }],
-        })(),
-        'Hello'
-      );
+        })()
+      ).toBe('Hello');
     });
 
     it('can pass through an empty string', function () {
-      equal(Handlebars.compile('')(), '');
+      expect(Handlebars.compile('')()).toBe('');
     });
 
     it('throws on desupported options', function () {
-      shouldThrow(
-        function () {
-          Handlebars.compile('Dudes', { trackIds: true });
-        },
-        Error,
+      expect(function () {
+        Handlebars.compile('Dudes', { trackIds: true });
+      }).toThrow(
         'TrackIds and stringParams are no longer supported. See Github #1145'
       );
-      shouldThrow(
-        function () {
-          Handlebars.compile('Dudes', { stringParams: true });
-        },
-        Error,
+      expect(function () {
+        Handlebars.compile('Dudes', { stringParams: true });
+      }).toThrow(
         'TrackIds and stringParams are no longer supported. See Github #1145'
       );
     });
@@ -152,54 +120,41 @@ describe('compiler', function () {
     it('should not modify the options.data property(GH-1327)', function () {
       var options = { data: [{ a: 'foo' }, { a: 'bar' }] };
       Handlebars.compile('{{#each data}}{{@index}}:{{a}} {{/each}}', options)();
-      equal(
-        JSON.stringify(options, 0, 2),
-        JSON.stringify({ data: [{ a: 'foo' }, { a: 'bar' }] }, 0, 2)
-      );
+      expect(options).toStrictEqual({ data: [{ a: 'foo' }, { a: 'bar' }] });
     });
 
     it('should not modify the options.knownHelpers property(GH-1327)', function () {
       var options = { knownHelpers: {} };
       Handlebars.compile('{{#each data}}{{@index}}:{{a}} {{/each}}', options)();
-      equal(
-        JSON.stringify(options, 0, 2),
-        JSON.stringify({ knownHelpers: {} }, 0, 2)
-      );
+      expect(options).toStrictEqual({ knownHelpers: {} });
     });
   });
 
   describe('#precompile', function () {
     it('should fail with invalid input', function () {
-      shouldThrow(
-        function () {
-          Handlebars.precompile(null);
-        },
-        Error,
+      expect(function () {
+        Handlebars.precompile(null);
+      }).toThrow(
         'You must pass a string or Handlebars AST to Handlebars.compile. You passed null'
       );
-      shouldThrow(
-        function () {
-          Handlebars.precompile({});
-        },
-        Error,
+      expect(function () {
+        Handlebars.precompile({});
+      }).toThrow(
         'You must pass a string or Handlebars AST to Handlebars.compile. You passed [object Object]'
       );
     });
 
     it('can utilize AST instance', function () {
-      equal(
-        /return "Hello"/.test(
-          Handlebars.precompile({
-            type: 'Program',
-            body: [{ type: 'ContentStatement', value: 'Hello' }],
-          })
-        ),
-        true
-      );
+      expect(
+        Handlebars.precompile({
+          type: 'Program',
+          body: [{ type: 'ContentStatement', value: 'Hello' }],
+        })
+      ).toMatch(/return "Hello"/);
     });
 
     it('can pass through an empty string', function () {
-      equal(/return ""/.test(Handlebars.precompile('')), true);
+      expect(Handlebars.precompile('')).toMatch(/return ""/);
     });
   });
 });

spec/env/browser-vitest-pre.js

@@ -0,0 +1,6 @@
+// Pre-setup for browser tests. Must run before the main setup file
+// imports the Handlebars library, so that noConflict() captures this value.
+globalThis.Handlebars = 'no-conflict';
+
+// Polyfill Node.js 'global' for specs that reference it at module level
+globalThis.global = globalThis;

spec/env/browser-vitest.js

@@ -0,0 +1,27 @@
+import './common.js';
+import Handlebars from '../../lib/handlebars.js';
+
+globalThis.Handlebars = Handlebars;
+
+globalThis.CompilerContext = {
+  browser: true,
+
+  compile: function (template, options) {
+    var templateSpec = handlebarsEnv.precompile(template, options);
+    return handlebarsEnv.template(safeEval(templateSpec));
+  },
+  compileWithPartial: function (template, options) {
+    return handlebarsEnv.compile(template, options);
+  },
+};
+
+function safeEval(templateSpec) {
+  /* eslint-disable no-eval, no-console */
+  try {
+    return eval('(' + templateSpec + ')');
+  } catch (err) {
+    console.error(templateSpec);
+    throw err;
+  }
+  /* eslint-enable no-eval, no-console */
+}

spec/env/browser.js

@@ -3,20 +3,9 @@ require('./common');
 var fs = require('fs'),
   vm = require('vm');
 
-var chai = require('chai');
-var dirtyChai = require('dirty-chai');
-
-chai.use(dirtyChai);
-global.expect = chai.expect;
-
-global.sinon = require('sinon');
-
 global.Handlebars = 'no-conflict';
 
 var filename = 'dist/handlebars.js';
-if (global.minimizedTest) {
-  filename = 'dist/handlebars.min.js';
-}
 var distHandlebars = fs.readFileSync(
   require.resolve('../../' + filename),
   'utf-8'

spec/env/common.js

@@ -1,125 +1,4 @@
-var global = (function () {
-  return this;
-})();
-
-var AssertError;
-if (Error.captureStackTrace) {
-  AssertError = function AssertError(message, caller) {
-    Error.prototype.constructor.call(this, message);
-    this.message = message;
-
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, caller || AssertError);
-    }
-  };
-
-  AssertError.prototype = new Error();
-} else {
-  AssertError = Error;
-}
-
-/**
- * @deprecated Use "expectTemplate(template)...toCompileTo(output)" instead
- */
-global.shouldCompileTo = function (string, hashOrArray, expected, message) {
-  shouldCompileToWithPartials(string, hashOrArray, false, expected, message);
-};
-
-/**
- * @deprecated Use "expectTemplate(template)...toCompileTo(output)" instead
- */
-global.shouldCompileToWithPartials = function shouldCompileToWithPartials(
-  string,
-  hashOrArray,
-  partials,
-  expected,
-  message
-) {
-  var result = compileWithPartials(string, hashOrArray, partials);
-  if (result !== expected) {
-    throw new AssertError(
-      "'" + result + "' should === '" + expected + "': " + message,
-      shouldCompileToWithPartials
-    );
-  }
-};
-
-/**
- * @deprecated Use "expectTemplate(template)...toCompileTo(output)" instead
- */
-global.compileWithPartials = function (string, hashOrArray, partials) {
-  var template, ary, options;
-  if (hashOrArray && hashOrArray.hash) {
-    ary = [hashOrArray.hash, hashOrArray];
-    delete hashOrArray.hash;
-  } else if (Object.prototype.toString.call(hashOrArray) === '[object Array]') {
-    ary = [];
-    ary.push(hashOrArray[0]); // input
-    ary.push({ helpers: hashOrArray[1], partials: hashOrArray[2] });
-    options =
-      typeof hashOrArray[3] === 'object'
-        ? hashOrArray[3]
-        : { compat: hashOrArray[3] };
-    if (hashOrArray[4] != null) {
-      options.data = !!hashOrArray[4];
-      ary[1].data = hashOrArray[4];
-    }
-  } else {
-    ary = [hashOrArray];
-  }
-
-  template = CompilerContext[partials ? 'compileWithPartial' : 'compile'](
-    string,
-    options
-  );
-  return template.apply(this, ary);
-};
-
-/**
- * @deprecated Use chai's expect-style API instead (`expect(actualValue).to.equal(expectedValue)`)
- * @see https://www.chaijs.com/api/bdd/
- */
-global.equals = global.equal = function equals(a, b, msg) {
-  if (a !== b) {
-    throw new AssertError(
-      "'" + a + "' should === '" + b + "'" + (msg ? ': ' + msg : ''),
-      equals
-    );
-  }
-};
-
-/**
- * @deprecated Use chai's expect-style API instead (`expect(actualValue).to.equal(expectedValue)`)
- * @see https://www.chaijs.com/api/bdd/#method_throw
- */
-global.shouldThrow = function (callback, type, msg) {
-  var failed;
-  try {
-    callback();
-    failed = true;
-  } catch (caught) {
-    if (type && !(caught instanceof type)) {
-      throw new AssertError('Type failure: ' + caught);
-    }
-    if (
-      msg &&
-      !(msg.test ? msg.test(caught.message) : msg === caught.message)
-    ) {
-      throw new AssertError(
-        'Throw mismatch: Expected ' +
-          caught.message +
-          ' to match ' +
-          msg +
-          '\n\n' +
-          caught.stack,
-        shouldThrow
-      );
-    }
-  }
-  if (failed) {
-    throw new AssertError('It failed to throw', shouldThrow);
-  }
-};
+var global = globalThis;
 
 global.expectTemplate = function (templateAsString) {
   return new HandlebarsTestBench(templateAsString);
@@ -200,18 +79,29 @@ HandlebarsTestBench.prototype.withMessage = function (message) {
 };
 
 HandlebarsTestBench.prototype.toCompileTo = function (expectedOutputAsString) {
-  expect(this._compileAndExecute()).to.equal(
-    expectedOutputAsString,
-    this.message
-  );
+  expect(this._compileAndExecute()).toBe(expectedOutputAsString);
 };
 
-// see chai "to.throw" (https://www.chaijs.com/api/bdd/#method_throw)
 HandlebarsTestBench.prototype.toThrow = function (errorLike, errMsgMatcher) {
   var self = this;
-  expect(function () {
+  var caught;
+  try {
     self._compileAndExecute();
-  }).to.throw(errorLike, errMsgMatcher, this.message);
+  } catch (e) {
+    caught = e;
+  }
+
+  expect(caught).toBeDefined();
+
+  if (typeof errorLike === 'function') {
+    expect(caught).toBeInstanceOf(errorLike);
+    if (errMsgMatcher) {
+      expect(caught.message).toMatch(errMsgMatcher);
+    }
+  } else if (errorLike) {
+    // errorLike is a string or regex message matcher (single-argument form)
+    expect(caught.message).toMatch(errorLike);
+  }
 };
 
 HandlebarsTestBench.prototype._compileAndExecute = function () {
@@ -237,3 +127,7 @@ HandlebarsTestBench.prototype._combineRuntimeOptions = function () {
   combinedRuntimeOptions.decorators = this.decorators;
   return combinedRuntimeOptions;
 };
+
+beforeEach(function () {
+  global.handlebarsEnv = Handlebars.create();
+});

spec/env/node.js

@@ -1,13 +1,5 @@
 require('./common');
 
-var chai = require('chai');
-var dirtyChai = require('dirty-chai');
-
-chai.use(dirtyChai);
-global.expect = chai.expect;
-
-global.sinon = require('sinon');
-
 global.Handlebars = require('../../lib');
 
 global.CompilerContext = {

spec/env/runner.js

@@ -1,63 +0,0 @@
-/* eslint-disable no-console */
-var fs = require('fs'),
-  Mocha = require('mocha'),
-  path = require('path');
-
-var errors = 0,
-  testDir = path.dirname(__dirname),
-  grep = process.argv[2];
-
-// Lazy hack, but whatever
-if (grep === '--min') {
-  global.minimizedTest = true;
-  grep = undefined;
-}
-
-var files = fs
-  .readdirSync(testDir)
-  .filter(function (name) {
-    return /.*\.js$/.test(name);
-  })
-  .map(function (name) {
-    return testDir + path.sep + name;
-  });
-
-if (global.minimizedTest) {
-  run('./runtime', function () {
-    run('./browser', function () {
-      /* eslint-disable no-process-exit */
-      process.exit(errors);
-      /* eslint-enable no-process-exit */
-    });
-  });
-} else {
-  run('./runtime', function () {
-    run('./browser', function () {
-      run('./node', function () {
-        /* eslint-disable no-process-exit */
-        process.exit(errors);
-        /* eslint-enable no-process-exit */
-      });
-    });
-  });
-}
-
-function run(env, callback) {
-  var mocha = new Mocha();
-  mocha.ui('bdd');
-  mocha.files = files.slice();
-  if (grep) {
-    mocha.grep(grep);
-  }
-
-  files.forEach(function (name) {
-    delete require.cache[name];
-  });
-
-  console.log('Running env: ' + env);
-  require(env);
-  mocha.run(function (errorCount) {
-    errors += errorCount;
-    callback();
-  });
-}

spec/env/runtime.js

@@ -1,73 +0,0 @@
-require('./common');
-
-var fs = require('fs'),
-  vm = require('vm');
-
-var chai = require('chai');
-var dirtyChai = require('dirty-chai');
-
-chai.use(dirtyChai);
-global.expect = chai.expect;
-
-global.sinon = require('sinon');
-
-global.Handlebars = 'no-conflict';
-
-var filename = 'dist/handlebars.runtime.js';
-if (global.minimizedTest) {
-  filename = 'dist/handlebars.runtime.min.js';
-}
-vm.runInThisContext(
-  fs.readFileSync(__dirname + '/../../' + filename),
-  filename
-);
-
-var parse = require('@handlebars/parser').parse;
-var compiler = require('../../dist/cjs/handlebars/compiler/compiler');
-var JavaScriptCompiler = require('../../dist/cjs/handlebars/compiler/javascript-compiler');
-
-global.CompilerContext = {
-  browser: true,
-
-  compile: function (template, options) {
-    // Hack the compiler on to the environment for these specific tests
-    handlebarsEnv.precompile = function (
-      precompileTemplate,
-      precompileOptions
-    ) {
-      return compiler.precompile(
-        precompileTemplate,
-        precompileOptions,
-        handlebarsEnv
-      );
-    };
-    handlebarsEnv.parse = parse;
-    handlebarsEnv.Compiler = compiler.Compiler;
-    handlebarsEnv.JavaScriptCompiler = JavaScriptCompiler;
-
-    var templateSpec = handlebarsEnv.precompile(template, options);
-    return handlebarsEnv.template(safeEval(templateSpec));
-  },
-  compileWithPartial: function (template, options) {
-    // Hack the compiler on to the environment for these specific tests
-    handlebarsEnv.compile = function (compileTemplate, compileOptions) {
-      return compiler.compile(compileTemplate, compileOptions, handlebarsEnv);
-    };
-    handlebarsEnv.parse = parse;
-    handlebarsEnv.Compiler = compiler.Compiler;
-    handlebarsEnv.JavaScriptCompiler = JavaScriptCompiler;
-
-    return handlebarsEnv.compile(template, options);
-  },
-};
-
-function safeEval(templateSpec) {
-  /* eslint-disable no-eval, no-console */
-  try {
-    return eval('(' + templateSpec + ')');
-  } catch (err) {
-    console.error(templateSpec);
-    throw err;
-  }
-  /* eslint-enable no-eval, no-console */
-}

spec/expected/help.menu.txt

@@ -1,10 +1,9 @@
 Precompile handlebar templates.
-Usage: handlebars.js [template|directory]...
+Usage: handlebars.mjs [template|directory]...
 
 Options:
-  --help               Outputs this message                                                                    [boolean]
   -f, --output         Output File                                                                              [string]
-  --map                Source Map File                                                                          [string]
+      --map            Source Map File                                                                          [string]
   -a, --amd            Exports amd style (require.js)                                                          [boolean]
   -c, --commonjs       Exports CommonJS style, path to Handlebars module                        [string] [default: null]
   -h, --handlebarPath  Path to handlebar.js (only valid for amd-style)                            [string] [default: ""]
@@ -22,4 +21,5 @@ Options:
   -d, --data           Include data when compiling                                                             [boolean]
   -e, --extension      Template extension.                                              [string] [default: "handlebars"]
   -b, --bom            Removes the BOM (Byte Order Mark) from the beginning of the templates.                  [boolean]
-  -v, --version        Show version number                                                                     [boolean]
+  -v, --version        Prints the current compiler version                                                     [boolean]
+      --help           Outputs this message                                                                    [boolean]

spec/expected/non.empty.amd.known.helper.js

@@ -1,6 +1,6 @@
 define(['handlebars.runtime'], function(Handlebars) {
 Handlebars = Handlebars["default"]; var template = Handlebars.template, templates = Handlebars.templates = Handlebars.templates || {};
-return templates['known.helpers'] = template({"1":function(container,depth0,helpers,partials,data) {
+return templates['known.helpers'] = template({"0":function(container,depth0,helpers,partials,data) {
 var stack1, lookupProperty = container.lookupProperty || function(parent, propertyName) {
 if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
 return parent[propertyName];
@@ -8,8 +8,8 @@ return parent[propertyName];
 return undefined
 };
 return " <div>Some known helper</div>\n" 
-+ ((stack1 = lookupProperty(helpers,"anotherHelper").call(depth0 != null ? depth0 : (container.nullContext || {}),true,{"name":"anotherHelper","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":3,"column":4},"end":{"line":5,"column":22}}})) != null ? stack1 : "");
-},"2":function(container,depth0,helpers,partials,data) {
++ ((stack1 = lookupProperty(helpers,"anotherHelper").call(depth0 != null ? depth0 : (container.nullContext || {}),true,{"name":"anotherHelper","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":3,"column":4},"end":{"line":5,"column":22}}})) != null ? stack1 : "");
+},"1":function(container,depth0,helpers,partials,data) {
 return " <div>Another known helper</div>\n";
 },"compiler":[8,">= 4.3.0"],"main":function(container,depth0,helpers,partials,data) {
 var stack1, lookupProperty = container.lookupProperty || function(parent, propertyName) {
@@ -18,7 +18,7 @@ return parent[propertyName];
 }
 return undefined
 };
-return ((stack1 = lookupProperty(helpers,"someHelper").call(depth0 != null ? depth0 : (container.nullContext || {}),true,{"name":"someHelper","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":1,"column":0},"end":{"line":6,"column":15}}})) != null ? stack1 : "");
+return ((stack1 = lookupProperty(helpers,"someHelper").call(depth0 != null ? depth0 : (container.nullContext || {}),true,{"name":"someHelper","hash":{},"fn":container.program(0, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":1,"column":0},"end":{"line":6,"column":15}}})) != null ? stack1 : "");
 },"useData":true});
 });
     

spec/helpers.js

@@ -53,7 +53,7 @@ describe('helpers', function () {
       runWithIdentityHelper('{{{{identity}}}}{{{{/identity}}}}', '');
     });
 
-    xit('helper for nested raw block works if nested raw blocks are broken', function () {
+    it.skip('helper for nested raw block works if nested raw blocks are broken', function () {
       // This test was introduced in 4.4.4, but it was not the actual problem that lead to the patch release
       // The test is deactivated, because in 3.x this template cases an exception and it also does not work in 4.4.3
       // If anyone can make this template work without breaking everything else, then go for it,
@@ -392,7 +392,7 @@ describe('helpers', function () {
         return 'fail';
       });
       handlebarsEnv.unregisterHelper('foo');
-      equals(handlebarsEnv.helpers.foo, undefined);
+      expect(handlebarsEnv.helpers.foo).toBeUndefined();
     });
 
     it('allows multiple globals', function () {
@@ -417,23 +417,19 @@ describe('helpers', function () {
     });
 
     it('fails with multiple and args', function () {
-      shouldThrow(
-        function () {
-          handlebarsEnv.registerHelper(
-            {
-              world: function () {
-                return 'world!';
-              },
-              testHelper: function () {
-                return 'found it!';
-              },
+      expect(function () {
+        handlebarsEnv.registerHelper(
+          {
+            world: function () {
+              return 'world!';
             },
-            {}
-          );
-        },
-        Error,
-        'Arg not supported with multiple helpers'
-      );
+            testHelper: function () {
+              return 'found it!';
+            },
+          },
+          {}
+        );
+      }).toThrow('Arg not supported with multiple helpers');
     });
   });
 
@@ -920,7 +916,7 @@ describe('helpers', function () {
       expectTemplate('{{#goodbyes as |value|}}{{value}}{{/goodbyes}}{{value}}')
         .withInput({ value: 'foo' })
         .withHelper('goodbyes', function (options) {
-          equals(options.fn.blockParams, 1);
+          expect(options.fn.blockParams).toBe(1);
           return options.fn({ value: 'bar' }, { blockParams: [1, 2] });
         })
         .toCompileTo('1foo');
@@ -932,7 +928,7 @@ describe('helpers', function () {
           return 'foo';
         })
         .withHelper('goodbyes', function (options) {
-          equals(options.fn.blockParams, 1);
+          expect(options.fn.blockParams).toBe(1);
           return options.fn({}, { blockParams: [1, 2] });
         })
         .toCompileTo('1foo');
@@ -947,7 +943,7 @@ describe('helpers', function () {
           return 'foo';
         })
         .withHelper('goodbyes', function (options) {
-          equals(options.fn.blockParams, 1);
+          expect(options.fn.blockParams).toBe(1);
           return options.fn(this, { blockParams: [1, 2] });
         })
         .toCompileTo('barfoo');
@@ -977,7 +973,7 @@ describe('helpers', function () {
       )
         .withInput({ value: 'foo' })
         .withHelper('goodbyes', function (options) {
-          equals(options.fn.blockParams, 1);
+          expect(options.fn.blockParams).toBe(1);
           return options.fn({ value: 'bar' }, { blockParams: [1, 2] });
         })
         .toCompileTo('1foo');

spec/index.html

@@ -1,98 +1,55 @@
 <!doctype html>
 <html>
   <head>
-    <title>Mocha</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <link rel="stylesheet" href="/node_modules/mocha/mocha.css" />
-    <style>
-      .headless .suite > h1,
-      .headless .test.pass {
-        display: none;
-      }
-    </style>
-
-    <script>
-      // Show only errors in "headless", non-interactive mode.
-      if (/headless=true/.test(location.href)) {
-        document.documentElement.className = 'headless';
-      }
-    </script>
-    <script src="/node_modules/sinon/pkg/sinon.js"></script>
-    <script src="/node_modules/chai/chai.js"></script>
-    <script src="/node_modules/dirty-chai/lib/dirty-chai.js"></script>
-    <script src="/node_modules/mocha/mocha.js"></script>
-    <script>
-      window.expect = chai.expect;
-      mocha.setup('bdd');
-    </script>
-    <script src="/dist/handlebars.js"></script>
-    <script src="/spec/env/common.js"></script>
-    <script>
-      var CompilerContext = {
-        compile: function(template, options) {
-          var templateSpec = handlebarsEnv.precompile(template, options);
-          return handlebarsEnv.template(safeEval(templateSpec));
-        },
-        compileWithPartial: function(template, options) {
-          return handlebarsEnv.compile(template, options);
-        }
-      };
-
-      function safeEval(templateSpec) {
-        try {
-          var ret;
-          eval('ret = ' + templateSpec);
-          return ret;
-        } catch (err) {
-          console.error(templateSpec);
-          throw err;
-        }
-      }
-    </script>
-    <script src="/tmp/tests.js"></script>
-    <script>
-      onload = function(){
-        mocha.globals(['mochaResults'])
-        // The test harness leaks under FF. We should have decent global leak coverage from other tests
-        if (!navigator.userAgent.match(/Firefox\/([\d.]+)/)) {
-          mocha.checkLeaks();
-        }
-        var runner = mocha.run();
-
-        // Reporting to test-runner
-        var failedTests = [];
-        runner.on('end', function(){
-          window.mochaResults = runner.stats;
-          window.mochaResults.reports = failedTests;
-        });
-
-        runner.on('fail', logFailure);
-
-        function logFailure(test, err){
-
-          var flattenTitles = function(test){
-            var titles = [];
-            while (test.parent.title){
-              titles.push(test.parent.title);
-              test = test.parent;
-            }
-            return titles.reverse();
-          };
-
-          failedTests.push({
-            name: test.title,
-            result: false,
-            message: err.message,
-            stack: err.stack,
-            titles: flattenTitles(test)
-          });
-        };
-      };
-    </script>
+    <title>Handlebars UMD Smoke Test</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   </head>
   <body>
-    <div id="mocha"></div>
+    <h1>Handlebars UMD Smoke Test</h1>
+    <pre id="results"></pre>
+    <script src="/dist/handlebars.js"></script>
+    <script>
+      var results = document.getElementById('results');
+      var failures = 0;
+      var tests = 0;
+
+      function assert(condition, message) {
+        tests++;
+        if (!condition) {
+          failures++;
+          results.textContent += 'FAIL: ' + message + '\n';
+        } else {
+          results.textContent += 'PASS: ' + message + '\n';
+        }
+      }
+
+      try {
+        assert(typeof Handlebars !== 'undefined', 'Handlebars is defined');
+        assert(
+          typeof Handlebars.compile === 'function',
+          'Handlebars.compile exists'
+        );
+        assert(
+          typeof Handlebars.template === 'function',
+          'Handlebars.template exists'
+        );
+        assert(
+          typeof Handlebars.VERSION === 'string',
+          'Handlebars.VERSION exists'
+        );
+
+        var template = Handlebars.compile('Hello {{name}}!');
+        var output = template({ name: 'World' });
+        assert(output === 'Hello World!', 'Basic compilation works: ' + output);
+      } catch (e) {
+        failures++;
+        results.textContent += 'ERROR: ' + e.message + '\n';
+      }
+
+      results.textContent +=
+        '\n' + tests + ' tests, ' + failures + ' failures\n';
+      window.mochaResults = { passes: tests - failures, failures: failures };
+    </script>
   </body>
 </html>

spec/javascript-compiler.js

@@ -19,11 +19,9 @@ describe('javascript-compiler api', function () {
       ) {
         return parent + '.bar_' + name;
       };
-      /* eslint-disable camelcase */
       expectTemplate('{{foo}}')
         .withInput({ bar_foo: 'food' })
         .toCompileTo('food');
-      /* eslint-enable camelcase */
     });
 
     // Tests nameLookup dot vs. bracket behavior.  Bracket is required in certain cases
@@ -34,30 +32,35 @@ describe('javascript-compiler api', function () {
         .toCompileTo('food');
     });
   });
-  describe('#compilerInfo', function () {
-    var $superCheck, $superInfo;
-    beforeEach(function () {
-      $superCheck = handlebarsEnv.VM.checkRevision;
-      $superInfo = handlebarsEnv.JavaScriptCompiler.prototype.compilerInfo;
-    });
-    afterEach(function () {
-      handlebarsEnv.VM.checkRevision = $superCheck;
-      handlebarsEnv.JavaScriptCompiler.prototype.compilerInfo = $superInfo;
-    });
-    it('should allow compilerInfo override', function () {
-      handlebarsEnv.JavaScriptCompiler.prototype.compilerInfo = function () {
-        return 'crazy';
-      };
-      handlebarsEnv.VM.checkRevision = function (compilerInfo) {
-        if (compilerInfo !== 'crazy') {
-          throw new Error("It didn't work");
-        }
-      };
-      expectTemplate('{{foo}} ')
-        .withInput({ foo: 'food' })
-        .toCompileTo('food ');
-    });
-  });
+  // Monkey-patching VM.checkRevision is not possible when VM is an ESM
+  // namespace object (browser mode), so skip these tests in that context.
+  (CompilerContext.browser ? describe.skip : describe)(
+    '#compilerInfo',
+    function () {
+      var $superCheck, $superInfo;
+      beforeEach(function () {
+        $superCheck = handlebarsEnv.VM.checkRevision;
+        $superInfo = handlebarsEnv.JavaScriptCompiler.prototype.compilerInfo;
+      });
+      afterEach(function () {
+        handlebarsEnv.VM.checkRevision = $superCheck;
+        handlebarsEnv.JavaScriptCompiler.prototype.compilerInfo = $superInfo;
+      });
+      it('should allow compilerInfo override', function () {
+        handlebarsEnv.JavaScriptCompiler.prototype.compilerInfo = function () {
+          return 'crazy';
+        };
+        handlebarsEnv.VM.checkRevision = function (compilerInfo) {
+          if (compilerInfo !== 'crazy') {
+            throw new Error("It didn't work");
+          }
+        };
+        expectTemplate('{{foo}} ')
+          .withInput({ foo: 'food' })
+          .toCompileTo('food ');
+      });
+    }
+  );
   describe('buffer', function () {
     var $superAppend, $superCreate;
     beforeEach(function () {
@@ -105,7 +108,7 @@ describe('javascript-compiler api', function () {
           handlebarsEnv.JavaScriptCompiler.isValidJavaScriptVariableName(
             validVariableName
           )
-        ).to.be.true();
+        ).toBe(true);
       });
     });
     [('123test', 'abc()', 'abc.cde')].forEach(function (invalidVariableName) {
@@ -114,7 +117,7 @@ describe('javascript-compiler api', function () {
           handlebarsEnv.JavaScriptCompiler.isValidJavaScriptVariableName(
             invalidVariableName
           )
-        ).to.be.false();
+        ).toBe(false);
       });
     });
   });

spec/partials.js

@@ -164,12 +164,9 @@ describe('partials', function () {
   });
 
   it('registering undefined partial throws an exception', function () {
-    shouldThrow(
-      function () {
-        var undef;
-        handlebarsEnv.registerPartial('undefined_test', undef);
-      },
-      Handlebars.Exception,
+    expect(function () {
+      handlebarsEnv.registerPartial('undefined_test', undefined);
+    }).toThrow(
       'Attempting to register a partial called "undefined_test" as undefined'
     );
   });
@@ -231,7 +228,7 @@ describe('partials', function () {
       .toCompileTo('Dudes: Jeepers Creepers');
 
     handlebarsEnv.unregisterPartial('globalTest');
-    equals(handlebarsEnv.partials.globalTest, undefined);
+    expect(handlebarsEnv.partials.globalTest).toBeUndefined();
   });
 
   it('Multiple partial registration', function () {
@@ -556,7 +553,7 @@ describe('partials', function () {
       var env = Handlebars.create();
       env.registerPartial('partial', '{{foo}}');
       var template = env.compile('{{foo}} {{> partial}}', { noEscape: true });
-      equal(template({ foo: '<' }), '< <');
+      expect(template({ foo: '<' })).toBe('< <');
     }
   });
 

spec/precompiler.js

@@ -33,7 +33,7 @@ describe('precompiler', function () {
    * @param {Error} loadError the error that should be thrown if uglify is loaded
    * @param {function} callback a callback-function to run when the mock is active.
    */
-  function mockRequireUglify(loadError, callback) {
+  async function mockRequireUglify(loadError, callback) {
     var Module = require('module');
     var _resolveFilename = Module._resolveFilename;
     delete require.cache[require.resolve('uglify-js')];
@@ -45,7 +45,7 @@ describe('precompiler', function () {
       return _resolveFilename.call(this, request, mod);
     };
     try {
-      callback();
+      await callback();
     } finally {
       Module._resolveFilename = _resolveFilename;
       delete require.cache[require.resolve('uglify-js')];
@@ -83,326 +83,312 @@ describe('precompiler', function () {
     console.error = errorLogFunction;
   });
 
-  it('should output version', function () {
-    Precompiler.cli({ templates: [], version: true });
-    equals(log, Handlebars.VERSION);
+  it('should output version', async function () {
+    await Precompiler.cli({ templates: [], version: true });
+    expect(log).toBe(Handlebars.VERSION);
   });
-  it('should throw if lacking templates', function () {
-    shouldThrow(
-      function () {
-        Precompiler.cli({ templates: [] });
-      },
-      Handlebars.Exception,
+  it('should throw if lacking templates', async function () {
+    await expect(Precompiler.cli({ templates: [] })).rejects.toThrow(
       'Must define at least one template or directory.'
     );
   });
-  it('should handle empty/filtered directories', function () {
-    Precompiler.cli({ hasDirectory: true, templates: [] });
+  it('should handle empty/filtered directories', async function () {
+    Handlebars.precompile = function () {
+      return 'simple';
+    };
+    await Precompiler.cli({ hasDirectory: true, templates: [] });
     // Success is not throwing
   });
-  it('should throw when combining simple and minimized', function () {
-    shouldThrow(
-      function () {
-        Precompiler.cli({ templates: [__dirname], simple: true, min: true });
-      },
-      Handlebars.Exception,
-      'Unable to minimize simple output'
-    );
+  it('should throw when combining simple and minimized', async function () {
+    await expect(
+      Precompiler.cli({ templates: [__dirname], simple: true, min: true })
+    ).rejects.toThrow('Unable to minimize simple output');
   });
-  it('should throw when combining simple and multiple templates', function () {
-    shouldThrow(
-      function () {
-        Precompiler.cli({
-          templates: [
-            __dirname + '/artifacts/empty.handlebars',
-            __dirname + '/artifacts/empty.handlebars',
-          ],
-          simple: true,
-        });
-      },
-      Handlebars.Exception,
-      'Unable to output multiple templates in simple mode'
-    );
+  it('should throw when combining simple and multiple templates', async function () {
+    await expect(
+      Precompiler.cli({
+        templates: [
+          __dirname + '/artifacts/empty.handlebars',
+          __dirname + '/artifacts/empty.handlebars',
+        ],
+        simple: true,
+      })
+    ).rejects.toThrow('Unable to output multiple templates in simple mode');
   });
-  it('should throw when missing name', function () {
-    shouldThrow(
-      function () {
-        Precompiler.cli({ templates: [{ source: '' }], amd: true });
-      },
-      Handlebars.Exception,
-      'Name missing for template'
-    );
+  it('should throw when missing name', async function () {
+    await expect(
+      Precompiler.cli({ templates: [{ source: '' }], amd: true })
+    ).rejects.toThrow('Name missing for template');
   });
-  it('should throw when combining simple and directories', function () {
-    shouldThrow(
-      function () {
-        Precompiler.cli({ hasDirectory: true, templates: [1], simple: true });
-      },
-      Handlebars.Exception,
-      'Unable to output multiple templates in simple mode'
-    );
+  it('should throw when combining simple and directories', async function () {
+    await expect(
+      Precompiler.cli({ hasDirectory: true, templates: [1], simple: true })
+    ).rejects.toThrow('Unable to output multiple templates in simple mode');
   });
 
-  it('should output simple templates', function () {
+  it('should output simple templates', async function () {
     Handlebars.precompile = function () {
       return 'simple';
     };
-    Precompiler.cli({ templates: [emptyTemplate], simple: true });
-    equal(log, 'simple\n');
+    await Precompiler.cli({ templates: [emptyTemplate], simple: true });
+    expect(log).toBe('simple\n');
   });
-  it('should default to simple templates', function () {
+  it('should default to simple templates', async function () {
     Handlebars.precompile = function () {
       return 'simple';
     };
-    Precompiler.cli({ templates: [{ source: '' }] });
-    equal(log, 'simple\n');
+    await Precompiler.cli({ templates: [{ source: '' }] });
+    expect(log).toBe('simple\n');
   });
-  it('should output amd templates', function () {
+  it('should output amd templates', async function () {
     Handlebars.precompile = function () {
       return 'amd';
     };
-    Precompiler.cli({ templates: [emptyTemplate], amd: true });
-    equal(/template\(amd\)/.test(log), true);
+    await Precompiler.cli({ templates: [emptyTemplate], amd: true });
+    expect(log).toMatch(/template\(amd\)/);
   });
-  it('should output multiple amd', function () {
+  it('should output multiple amd', async function () {
     Handlebars.precompile = function () {
       return 'amd';
     };
-    Precompiler.cli({
+    await Precompiler.cli({
       templates: [emptyTemplate, emptyTemplate],
       amd: true,
       namespace: 'foo',
     });
-    equal(/templates = foo = foo \|\|/.test(log), true);
-    equal(/return templates/.test(log), true);
-    equal(/template\(amd\)/.test(log), true);
+    expect(log).toMatch(/templates = foo = foo \|\|/);
+    expect(log).toMatch(/return templates/);
+    expect(log).toMatch(/template\(amd\)/);
   });
-  it('should output amd partials', function () {
+  it('should output amd partials', async function () {
     Handlebars.precompile = function () {
       return 'amd';
     };
-    Precompiler.cli({ templates: [emptyTemplate], amd: true, partial: true });
-    equal(/return Handlebars\.partials\['empty'\]/.test(log), true);
-    equal(/template\(amd\)/.test(log), true);
+    await Precompiler.cli({
+      templates: [emptyTemplate],
+      amd: true,
+      partial: true,
+    });
+    expect(log).toMatch(/return Handlebars\.partials\['empty'\]/);
+    expect(log).toMatch(/template\(amd\)/);
   });
-  it('should output multiple amd partials', function () {
+  it('should output multiple amd partials', async function () {
     Handlebars.precompile = function () {
       return 'amd';
     };
-    Precompiler.cli({
+    await Precompiler.cli({
       templates: [emptyTemplate, emptyTemplate],
       amd: true,
       partial: true,
     });
-    equal(/return Handlebars\.partials\[/.test(log), false);
-    equal(/template\(amd\)/.test(log), true);
+    expect(log).not.toMatch(/return Handlebars\.partials\[/);
+    expect(log).toMatch(/template\(amd\)/);
   });
-  it('should output commonjs templates', function () {
+  it('should output commonjs templates', async function () {
     Handlebars.precompile = function () {
       return 'commonjs';
     };
-    Precompiler.cli({ templates: [emptyTemplate], commonjs: true });
-    equal(/template\(commonjs\)/.test(log), true);
+    await Precompiler.cli({ templates: [emptyTemplate], commonjs: true });
+    expect(log).toMatch(/template\(commonjs\)/);
   });
 
-  it('should set data flag', function () {
+  it('should set data flag', async function () {
     Handlebars.precompile = function (data, options) {
-      equal(options.data, true);
+      expect(options.data).toBe(true);
       return 'simple';
     };
-    Precompiler.cli({ templates: [emptyTemplate], simple: true, data: true });
-    equal(log, 'simple\n');
+    await Precompiler.cli({
+      templates: [emptyTemplate],
+      simple: true,
+      data: true,
+    });
+    expect(log).toBe('simple\n');
   });
 
-  it('should set known helpers', function () {
+  it('should set known helpers', async function () {
     Handlebars.precompile = function (data, options) {
-      equal(options.knownHelpers.foo, true);
+      expect(options.knownHelpers.foo).toBe(true);
       return 'simple';
     };
-    Precompiler.cli({ templates: [emptyTemplate], simple: true, known: 'foo' });
-    equal(log, 'simple\n');
+    await Precompiler.cli({
+      templates: [emptyTemplate],
+      simple: true,
+      known: 'foo',
+    });
+    expect(log).toBe('simple\n');
   });
-  it('should output to file system', function () {
+  it('should output to file system', async function () {
     Handlebars.precompile = function () {
       return 'simple';
     };
-    Precompiler.cli({
+    await Precompiler.cli({
       templates: [emptyTemplate],
       simple: true,
       output: 'file!',
     });
-    equal(file, 'file!');
-    equal(content, 'simple\n');
-    equal(log, '');
+    expect(file).toBe('file!');
+    expect(content).toBe('simple\n');
+    expect(log).toBe('');
   });
 
-  it('should output minimized templates', function () {
+  it('should output minimized templates', async function () {
     Handlebars.precompile = function () {
       return 'amd';
     };
     uglify.minify = function () {
       return { code: 'min' };
     };
-    Precompiler.cli({ templates: [emptyTemplate], min: true });
-    equal(log, 'min');
+    await Precompiler.cli({ templates: [emptyTemplate], min: true });
+    expect(log).toBe('min');
   });
 
-  it('should omit minimization gracefully, if uglify-js is missing', function () {
+  it('should omit minimization gracefully, if uglify-js is missing', async function () {
     var error = new Error("Cannot find module 'uglify-js'");
     error.code = 'MODULE_NOT_FOUND';
-    mockRequireUglify(error, function () {
+    await mockRequireUglify(error, async function () {
       var Precompiler = require('../dist/cjs/precompiler');
       Handlebars.precompile = function () {
         return 'amd';
       };
-      Precompiler.cli({ templates: [emptyTemplate], min: true });
-      equal(/template\(amd\)/.test(log), true);
-      equal(/\n/.test(log), true);
-      equal(/Code minimization is disabled/.test(errorLog), true);
+      await Precompiler.cli({ templates: [emptyTemplate], min: true });
+      expect(log).toMatch(/template\(amd\)/);
+      expect(log).toMatch(/\n/);
+      expect(errorLog).toMatch(/Code minimization is disabled/);
     });
   });
 
-  it('should fail on errors (other than missing module) while loading uglify-js', function () {
-    mockRequireUglify(new Error('Mock Error'), function () {
-      shouldThrow(
-        function () {
-          var Precompiler = require('../dist/cjs/precompiler');
-          Handlebars.precompile = function () {
-            return 'amd';
-          };
-          Precompiler.cli({ templates: [emptyTemplate], min: true });
-        },
-        Error,
-        'Mock Error'
-      );
+  it('should fail on errors (other than missing module) while loading uglify-js', async function () {
+    await mockRequireUglify(new Error('Mock Error'), async function () {
+      var Precompiler = require('../dist/cjs/precompiler');
+      Handlebars.precompile = function () {
+        return 'amd';
+      };
+      await expect(
+        Precompiler.cli({ templates: [emptyTemplate], min: true })
+      ).rejects.toThrow('Mock Error');
     });
   });
 
-  it('should output map', function () {
-    Precompiler.cli({ templates: [emptyTemplate], map: 'foo.js.map' });
+  it('should output map', async function () {
+    await Precompiler.cli({ templates: [emptyTemplate], map: 'foo.js.map' });
 
-    equal(file, 'foo.js.map');
-    equal(log.match(/sourceMappingURL=/g).length, 1);
+    expect(file).toBe('foo.js.map');
+    expect(log.match(/sourceMappingURL=/g).length).toBe(1);
   });
 
-  it('should output map', function () {
-    Precompiler.cli({
+  it('should output map with minification', async function () {
+    await Precompiler.cli({
       templates: [emptyTemplate],
       min: true,
       map: 'foo.js.map',
     });
 
-    equal(file, 'foo.js.map');
-    equal(log.match(/sourceMappingURL=/g).length, 1);
+    expect(file).toBe('foo.js.map');
+    expect(log.match(/sourceMappingURL=/g).length).toBe(1);
   });
 
   describe('#loadTemplates', function () {
-    it('should throw on missing template', function (done) {
-      Precompiler.loadTemplates({ files: ['foo'] }, function (err) {
-        equal(err.message, 'Unable to open template file "foo"');
-        done();
+    function loadTemplatesAsync(inputOpts) {
+      return new Promise(function (resolve, reject) {
+        Precompiler.loadTemplates(inputOpts, function (err, opts) {
+          if (err) {
+            reject(err);
+          } else {
+            resolve(opts);
+          }
+        });
       });
-    });
-    it('should enumerate directories by extension', function (done) {
-      Precompiler.loadTemplates(
-        { files: [__dirname + '/artifacts'], extension: 'hbs' },
-        function (err, opts) {
-          equal(opts.templates.length, 2);
-          equal(opts.templates[0].name, 'example_2');
+    }
 
-          done(err);
-        }
-      );
+    it('should throw on missing template', async function () {
+      try {
+        await loadTemplatesAsync({ files: ['foo'] });
+        throw new Error('should have thrown');
+      } catch (err) {
+        expect(err.message).toBe('Unable to open template file "foo"');
+      }
     });
-    it('should enumerate all templates by extension', function (done) {
-      Precompiler.loadTemplates(
-        { files: [__dirname + '/artifacts'], extension: 'handlebars' },
-        function (err, opts) {
-          equal(opts.templates.length, 5);
-          equal(opts.templates[0].name, 'bom');
-          equal(opts.templates[1].name, 'empty');
-          equal(opts.templates[2].name, 'example_1');
-          done(err);
-        }
-      );
+    it('should enumerate directories by extension', async function () {
+      var opts = await loadTemplatesAsync({
+        files: [__dirname + '/artifacts'],
+        extension: 'hbs',
+      });
+      expect(opts.templates.length).toBe(2);
+      expect(opts.templates[0].name).toBe('example_2');
     });
-    it('should handle regular expression characters in extensions', function (done) {
-      Precompiler.loadTemplates(
-        { files: [__dirname + '/artifacts'], extension: 'hb(s' },
-        function (err) {
-          // Success is not throwing
-          done(err);
-        }
-      );
+    it('should enumerate all templates by extension', async function () {
+      var opts = await loadTemplatesAsync({
+        files: [__dirname + '/artifacts'],
+        extension: 'handlebars',
+      });
+      expect(opts.templates.length).toBe(5);
+      expect(opts.templates[0].name).toBe('bom');
+      expect(opts.templates[1].name).toBe('empty');
+      expect(opts.templates[2].name).toBe('example_1');
     });
-    it('should handle BOM', function (done) {
-      var opts = {
+    it('should handle regular expression characters in extensions', async function () {
+      await loadTemplatesAsync({
+        files: [__dirname + '/artifacts'],
+        extension: 'hb(s',
+      });
+      // Success is not throwing
+    });
+    it('should handle BOM', async function () {
+      var opts = await loadTemplatesAsync({
         files: [__dirname + '/artifacts/bom.handlebars'],
         extension: 'handlebars',
         bom: true,
-      };
-      Precompiler.loadTemplates(opts, function (err, opts) {
-        equal(opts.templates[0].source, 'a');
-        done(err);
       });
+      expect(opts.templates[0].source).toBe('a');
     });
 
-    it('should handle different root', function (done) {
-      var opts = {
+    it('should handle different root', async function () {
+      var opts = await loadTemplatesAsync({
         files: [__dirname + '/artifacts/empty.handlebars'],
         simple: true,
         root: 'foo/',
-      };
-      Precompiler.loadTemplates(opts, function (err, opts) {
-        equal(opts.templates[0].name, __dirname + '/artifacts/empty');
-        done(err);
       });
+      expect(opts.templates[0].name).toBe(__dirname + '/artifacts/empty');
     });
 
-    it('should accept string inputs', function (done) {
-      var opts = { string: '' };
-      Precompiler.loadTemplates(opts, function (err, opts) {
-        equal(opts.templates[0].name, undefined);
-        equal(opts.templates[0].source, '');
-        done(err);
-      });
+    it('should accept string inputs', async function () {
+      var opts = await loadTemplatesAsync({ string: '' });
+      expect(opts.templates[0].name).toBeUndefined();
+      expect(opts.templates[0].source).toBe('');
     });
-    it('should accept string array inputs', function (done) {
-      var opts = { string: ['', 'bar'], name: ['beep', 'boop'] };
-      Precompiler.loadTemplates(opts, function (err, opts) {
-        equal(opts.templates[0].name, 'beep');
-        equal(opts.templates[0].source, '');
-        equal(opts.templates[1].name, 'boop');
-        equal(opts.templates[1].source, 'bar');
-        done(err);
+    it('should accept string array inputs', async function () {
+      var opts = await loadTemplatesAsync({
+        string: ['', 'bar'],
+        name: ['beep', 'boop'],
       });
+      expect(opts.templates[0].name).toBe('beep');
+      expect(opts.templates[0].source).toBe('');
+      expect(opts.templates[1].name).toBe('boop');
+      expect(opts.templates[1].source).toBe('bar');
     });
-    it('should accept stdin input', function (done) {
+    it('should accept stdin input', async function () {
       var stdin = require('mock-stdin').stdin();
-      Precompiler.loadTemplates({ string: '-' }, function (err, opts) {
-        equal(opts.templates[0].source, 'foo');
-        done(err);
-      });
+      var promise = loadTemplatesAsync({ string: '-' });
       stdin.send('fo');
       stdin.send('o');
       stdin.end();
+      var opts = await promise;
+      expect(opts.templates[0].source).toBe('foo');
     });
-    it('error on name missing', function (done) {
-      var opts = { string: ['', 'bar'] };
-      Precompiler.loadTemplates(opts, function (err) {
-        equal(
-          err.message,
+    it('error on name missing', async function () {
+      try {
+        await loadTemplatesAsync({ string: ['', 'bar'] });
+        throw new Error('should have thrown');
+      } catch (err) {
+        expect(err.message).toBe(
           'Number of names did not match the number of string inputs'
         );
-        done();
-      });
+      }
     });
 
-    it('should complete when no args are passed', function (done) {
-      Precompiler.loadTemplates({}, function (err, opts) {
-        equal(opts.templates.length, 0);
-        done(err);
-      });
+    it('should complete when no args are passed', async function () {
+      var opts = await loadTemplatesAsync({});
+      expect(opts.templates.length).toBe(0);
     });
   });
 });

spec/regressions.js

@@ -337,7 +337,10 @@ describe('Regressions', function () {
       },
     };
 
-    shouldCompileTo('{{helpa length="foo"}}', [obj, helpers], 'foo');
+    expectTemplate('{{helpa length="foo"}}')
+      .withInput(obj)
+      .withHelpers(helpers)
+      .toCompileTo('foo');
   });
 
   it('GH-1319: "unless" breaks when "each" value equals "null"', function () {
@@ -373,20 +376,16 @@ describe('Regressions', function () {
       var result = newHandlebarsInstance.templates['test.hbs']({
         name: 'yehuda',
       });
-      equals(result.trim(), 'YEHUDA');
+      expect(result.trim()).toBe('YEHUDA');
     });
 
     it('should call "helperMissing" if a helper is missing', function () {
       var newHandlebarsInstance = Handlebars.create();
 
-      shouldThrow(
-        function () {
-          registerTemplate(newHandlebarsInstance, compiledTemplateVersion7());
-          newHandlebarsInstance.templates['test.hbs']({});
-        },
-        Handlebars.Exception,
-        'Missing helper: "loud"'
-      );
+      expect(function () {
+        registerTemplate(newHandlebarsInstance, compiledTemplateVersion7());
+        newHandlebarsInstance.templates['test.hbs']({});
+      }).toThrow('Missing helper: "loud"');
     });
 
     it('should pass "options.lookupProperty" to "lookup"-helper, even with old templates', function () {
@@ -403,7 +402,7 @@ describe('Regressions', function () {
           property: 'a',
           test: { a: 'b' },
         })
-      ).to.equal('b');
+      ).toBe('b');
     });
 
     function registerTemplate(Handlebars, compileTemplate) {
@@ -479,19 +478,19 @@ describe('Regressions', function () {
       newHandlebarsInstance = Handlebars.create();
     });
     afterEach(function () {
-      sinon.restore();
+      vi.restoreAllMocks();
     });
 
     it('should only compile global partials once', function () {
-      var templateSpy = sinon.spy(newHandlebarsInstance, 'template');
+      var templateSpy = vi.spyOn(newHandlebarsInstance, 'template');
       newHandlebarsInstance.registerPartial({
         dude: 'I am a partial',
       });
       var string = 'Dudes: {{> dude}} {{> dude}}';
       newHandlebarsInstance.compile(string)(); // This should compile template + partial once
       newHandlebarsInstance.compile(string)(); // This should only compile template
-      equal(templateSpy.callCount, 3);
-      sinon.restore();
+      expect(templateSpy).toHaveBeenCalledTimes(3);
+      vi.restoreAllMocks();
     });
   });
 

spec/require.js

@@ -2,22 +2,22 @@ if (typeof require !== 'undefined' && require.extensions['.handlebars']) {
   describe('Require', function () {
     it('Load .handlebars files with require()', function () {
       var template = require('./artifacts/example_1');
-      equal(template, require('./artifacts/example_1.handlebars'));
+      expect(template).toBe(require('./artifacts/example_1.handlebars'));
 
       var expected = 'foo\n';
       var result = template({ foo: 'foo' });
 
-      equal(result, expected);
+      expect(result).toBe(expected);
     });
 
     it('Load .hbs files with require()', function () {
       var template = require('./artifacts/example_2');
-      equal(template, require('./artifacts/example_2.hbs'));
+      expect(template).toBe(require('./artifacts/example_2.hbs'));
 
       var expected = 'Hello, World!\n';
       var result = template({ name: 'World' });
 
-      equal(result, expected);
+      expect(result).toBe(expected);
     });
   });
 }

spec/runtime.js

@@ -1,74 +1,55 @@
 describe('runtime', function () {
   describe('#template', function () {
     it('should throw on invalid templates', function () {
-      shouldThrow(
-        function () {
-          Handlebars.template({});
-        },
-        Error,
-        'Unknown template object: object'
-      );
-      shouldThrow(
-        function () {
-          Handlebars.template();
-        },
-        Error,
-        'Unknown template object: undefined'
-      );
-      shouldThrow(
-        function () {
-          Handlebars.template('');
-        },
-        Error,
-        'Unknown template object: string'
-      );
+      expect(function () {
+        Handlebars.template({});
+      }).toThrow('Unknown template object: object');
+      expect(function () {
+        Handlebars.template();
+      }).toThrow('Unknown template object: undefined');
+      expect(function () {
+        Handlebars.template('');
+      }).toThrow('Unknown template object: string');
     });
     it('should throw on version mismatch', function () {
-      shouldThrow(
-        function () {
-          Handlebars.template({
-            main: {},
-            compiler: [Handlebars.COMPILER_REVISION + 1],
-          });
-        },
-        Error,
+      expect(function () {
+        Handlebars.template({
+          main: {},
+          compiler: [Handlebars.COMPILER_REVISION + 1],
+        });
+      }).toThrow(
         /Template was precompiled with a newer version of Handlebars than the current runtime/
       );
-      shouldThrow(
-        function () {
-          Handlebars.template({
-            main: {},
-            compiler: [Handlebars.LAST_COMPATIBLE_COMPILER_REVISION - 1],
-          });
-        },
-        Error,
+      expect(function () {
+        Handlebars.template({
+          main: {},
+          compiler: [Handlebars.LAST_COMPATIBLE_COMPILER_REVISION - 1],
+        });
+      }).toThrow(
         /Template was precompiled with an older version of Handlebars than the current runtime/
       );
-      shouldThrow(
-        function () {
-          Handlebars.template({
-            main: {},
-          });
-        },
-        Error,
+      expect(function () {
+        Handlebars.template({
+          main: {},
+        });
+      }).toThrow(
         /Template was precompiled with an older version of Handlebars than the current runtime/
       );
     });
   });
 
   describe('#noConflict', function () {
-    if (!CompilerContext.browser) {
-      return;
-    }
-
     it('should reset on no conflict', function () {
+      if (!CompilerContext.browser) {
+        return;
+      }
       var reset = Handlebars;
       Handlebars.noConflict();
-      equal(Handlebars, 'no-conflict');
+      expect(Handlebars).toBe('no-conflict');
 
       Handlebars = 'really, none';
       reset.noConflict();
-      equal(Handlebars, 'really, none');
+      expect(Handlebars).toBe('really, none');
 
       Handlebars = reset;
     });

spec/security.js

@@ -57,8 +57,8 @@ describe('security issues', function () {
               functionCalls.push('called');
             },
           });
-        }).to.throw(Error);
-        expect(functionCalls.length).to.equal(0);
+        }).toThrow();
+        expect(functionCalls.length).toBe(0);
       });
 
       it('should throw an exception when calling  "{{#blockHelperMissing .}}{{/blockHelperMissing}}"', function () {
@@ -96,7 +96,7 @@ describe('security issues', function () {
           },
           { allowCallsToHelperMissing: true }
         );
-        equals(functionCalls.length, 1);
+        expect(functionCalls.length).toBe(1);
       });
 
       it('should not throw an exception when calling  "{{#blockHelperMissing .}}{{/blockHelperMissing}}"', function () {
@@ -109,20 +109,23 @@ describe('security issues', function () {
   });
 
   describe('GH-1563', function () {
-    it('should not allow to access constructor after overriding via __defineGetter__', function () {
-      if ({}.__defineGetter__ == null || {}.__lookupGetter__ == null) {
-        return this.skip(); // Browser does not support this exploit anyway
+    var browserSupportsExploit =
+      {}.__defineGetter__ != null && {}.__lookupGetter__ != null;
+
+    it.skipIf(!browserSupportsExploit)(
+      'should not allow to access constructor after overriding via __defineGetter__',
+      function () {
+        expectTemplate(
+          '{{__defineGetter__ "undefined" valueOf }}' +
+            '{{#with __lookupGetter__ }}' +
+            '{{__defineGetter__ "propertyIsEnumerable" (this.bind (this.bind 1)) }}' +
+            '{{constructor.name}}' +
+            '{{/with}}'
+        )
+          .withInput({})
+          .toThrow(/Missing helper: "__defineGetter__"/);
       }
-      expectTemplate(
-        '{{__defineGetter__ "undefined" valueOf }}' +
-          '{{#with __lookupGetter__ }}' +
-          '{{__defineGetter__ "propertyIsEnumerable" (this.bind (this.bind 1)) }}' +
-          '{{constructor.name}}' +
-          '{{/with}}'
-      )
-        .withInput({})
-        .toThrow(/Missing helper: "__defineGetter__"/);
-    });
+    );
   });
 
   describe('GH-1595: dangerous properties', function () {
@@ -169,7 +172,7 @@ describe('security issues', function () {
     });
 
     afterEach(function () {
-      sinon.restore();
+      vi.restoreAllMocks();
     });
 
     describe('control access to prototype methods via "allowedProtoMethods"', function () {
@@ -181,19 +184,25 @@ describe('security issues', function () {
 
       function checkProtoMethodAccess(compileOptions) {
         it('should be prohibited by default and log a warning', function () {
-          var spy = sinon.spy(console, 'error');
+          var spy = vi
+            .spyOn(console, 'error')
+            .mockImplementation(function () {});
 
           expectTemplate('{{aMethod}}')
             .withInput(new TestClass())
             .withCompileOptions(compileOptions)
             .toCompileTo('');
 
-          expect(spy.calledOnce).to.be.true();
-          expect(spy.args[0][0]).to.match(/Handlebars: Access has been denied/);
+          expect(spy).toHaveBeenCalledTimes(1);
+          expect(spy.mock.calls[0][0]).toMatch(
+            /Handlebars: Access has been denied/
+          );
         });
 
         it('should only log the warning once', function () {
-          var spy = sinon.spy(console, 'error');
+          var spy = vi
+            .spyOn(console, 'error')
+            .mockImplementation(function () {});
 
           expectTemplate('{{aMethod}}')
             .withInput(new TestClass())
@@ -205,12 +214,16 @@ describe('security issues', function () {
             .withCompileOptions(compileOptions)
             .toCompileTo('');
 
-          expect(spy.calledOnce).to.be.true();
-          expect(spy.args[0][0]).to.match(/Handlebars: Access has been denied/);
+          expect(spy).toHaveBeenCalledTimes(1);
+          expect(spy.mock.calls[0][0]).toMatch(
+            /Handlebars: Access has been denied/
+          );
         });
 
         it('can be allowed, which disables the warning', function () {
-          var spy = sinon.spy(console, 'error');
+          var spy = vi
+            .spyOn(console, 'error')
+            .mockImplementation(function () {});
 
           expectTemplate('{{aMethod}}')
             .withInput(new TestClass())
@@ -222,11 +235,13 @@ describe('security issues', function () {
             })
             .toCompileTo('returnValue');
 
-          expect(spy.callCount).to.equal(0);
+          expect(spy).not.toHaveBeenCalled();
         });
 
         it('can be turned on by default, which disables the warning', function () {
-          var spy = sinon.spy(console, 'error');
+          var spy = vi
+            .spyOn(console, 'error')
+            .mockImplementation(function () {});
 
           expectTemplate('{{aMethod}}')
             .withInput(new TestClass())
@@ -236,11 +251,13 @@ describe('security issues', function () {
             })
             .toCompileTo('returnValue');
 
-          expect(spy.callCount).to.equal(0);
+          expect(spy).not.toHaveBeenCalled();
         });
 
         it('can be turned off by default, which disables the warning', function () {
-          var spy = sinon.spy(console, 'error');
+          var spy = vi
+            .spyOn(console, 'error')
+            .mockImplementation(function () {});
 
           expectTemplate('{{aMethod}}')
             .withInput(new TestClass())
@@ -250,7 +267,7 @@ describe('security issues', function () {
             })
             .toCompileTo('');
 
-          expect(spy.callCount).to.equal(0);
+          expect(spy).not.toHaveBeenCalled();
         });
 
         it('can be turned off, if turned on by default', function () {
@@ -300,19 +317,25 @@ describe('security issues', function () {
 
       function checkProtoPropertyAccess(compileOptions) {
         it('should be prohibited by default and log a warning', function () {
-          var spy = sinon.spy(console, 'error');
+          var spy = vi
+            .spyOn(console, 'error')
+            .mockImplementation(function () {});
 
           expectTemplate('{{aProperty}}')
             .withInput(new TestClass())
             .withCompileOptions(compileOptions)
             .toCompileTo('');
 
-          expect(spy.calledOnce).to.be.true();
-          expect(spy.args[0][0]).to.match(/Handlebars: Access has been denied/);
+          expect(spy).toHaveBeenCalledTimes(1);
+          expect(spy.mock.calls[0][0]).toMatch(
+            /Handlebars: Access has been denied/
+          );
         });
 
         it('can be explicitly prohibited by default, which disables the warning', function () {
-          var spy = sinon.spy(console, 'error');
+          var spy = vi
+            .spyOn(console, 'error')
+            .mockImplementation(function () {});
 
           expectTemplate('{{aProperty}}')
             .withInput(new TestClass())
@@ -322,11 +345,13 @@ describe('security issues', function () {
             })
             .toCompileTo('');
 
-          expect(spy.callCount).to.equal(0);
+          expect(spy).not.toHaveBeenCalled();
         });
 
         it('can be turned on, which disables the warning', function () {
-          var spy = sinon.spy(console, 'error');
+          var spy = vi
+            .spyOn(console, 'error')
+            .mockImplementation(function () {});
 
           expectTemplate('{{aProperty}}')
             .withInput(new TestClass())
@@ -338,11 +363,13 @@ describe('security issues', function () {
             })
             .toCompileTo('propertyValue');
 
-          expect(spy.callCount).to.equal(0);
+          expect(spy).not.toHaveBeenCalled();
         });
 
         it('can be turned on by default, which disables the warning', function () {
-          var spy = sinon.spy(console, 'error');
+          var spy = vi
+            .spyOn(console, 'error')
+            .mockImplementation(function () {});
 
           expectTemplate('{{aProperty}}')
             .withInput(new TestClass())
@@ -352,7 +379,7 @@ describe('security issues', function () {
             })
             .toCompileTo('propertyValue');
 
-          expect(spy.callCount).to.equal(0);
+          expect(spy).not.toHaveBeenCalled();
         });
 
         it('can be turned off, if turned on by default', function () {
@@ -373,14 +400,16 @@ describe('security issues', function () {
     describe('compatibility with old runtimes, that do not provide the function "container.lookupProperty"', function () {
       beforeEach(function simulateRuntimeWithoutLookupProperty() {
         var oldTemplateMethod = handlebarsEnv.template;
-        sinon.replace(handlebarsEnv, 'template', function (templateSpec) {
-          templateSpec.main = wrapToAdjustContainer(templateSpec.main);
-          return oldTemplateMethod.call(this, templateSpec);
-        });
+        vi.spyOn(handlebarsEnv, 'template').mockImplementation(
+          function (templateSpec) {
+            templateSpec.main = wrapToAdjustContainer(templateSpec.main);
+            return oldTemplateMethod.call(this, templateSpec);
+          }
+        );
       });
 
       afterEach(function () {
-        sinon.restore();
+        vi.restoreAllMocks();
       });
 
       it('should work with simple properties', function () {

spec/source-map.js

@@ -3,7 +3,7 @@ try {
     var SourceMap = require('source-map'),
       SourceMapConsumer = SourceMap.SourceMapConsumer;
   }
-} catch (err) {
+} catch {
   /* NOP for in browser */
 }
 
@@ -18,10 +18,14 @@ describe('source-map', function () {
       srcName: 'src.hbs',
     });
 
-    equal(!!template.code, true);
-    equal(!!template.map, !CompilerContext.browser);
+    expect(template.code).toBeTruthy();
+    if (CompilerContext.browser) {
+      expect(template.map).toBeFalsy();
+    } else {
+      expect(template.map).toBeTruthy();
+    }
   });
-  it('should map source properly', function () {
+  it('should map source properly', async function () {
     var templateSource =
         '  b{{hello}}  \n  {{bar}}a {{#block arg hash=(subex 1 subval)}}{{/block}}',
       template = Handlebars.precompile(templateSource, {
@@ -30,15 +34,16 @@ describe('source-map', function () {
       });
 
     if (template.map) {
-      var consumer = new SourceMapConsumer(template.map),
+      var consumer = await new SourceMapConsumer(template.map),
         lines = template.code.split('\n'),
         srcLines = templateSource.split('\n'),
         generated = grepLine('"  b"', lines),
         source = grepLine('  b', srcLines);
 
       var mapped = consumer.originalPositionFor(generated);
-      equal(mapped.line, source.line);
-      equal(mapped.column, source.column);
+      expect(mapped.line).toBe(source.line);
+      expect(mapped.column).toBe(source.column);
+      consumer.destroy();
     }
   });
 });

spec/strict.js

@@ -92,8 +92,8 @@ describe('strict', function () {
         })
         .withHelpers({
           helper: function (options) {
-            equals('value' in options.hash, true);
-            equals(options.hash.value, undefined);
+            expect(options.hash).toHaveProperty('value');
+            expect(options.hash.value).toBeUndefined();
             return 'success';
           },
         })
@@ -113,10 +113,10 @@ describe('strict', function () {
         });
         template({});
       } catch (error) {
-        equals(error.lineNumber, 4);
-        equals(error.endLineNumber, 4);
-        equals(error.column, 5);
-        equals(error.endColumn, 10);
+        expect(error.lineNumber).toBe(4);
+        expect(error.endLineNumber).toBe(4);
+        expect(error.column).toBe(5);
+        expect(error.endColumn).toBe(10);
       }
     });
   });

spec/tokenizer.js

@@ -1,11 +1,11 @@
 function shouldMatchTokens(result, tokens) {
   for (var index = 0; index < result.length; index++) {
-    equals(result[index].name, tokens[index]);
+    expect(result[index].name).toBe(tokens[index]);
   }
 }
 function shouldBeToken(result, name, text) {
-  equals(result.name, name);
-  equals(result.text, text);
+  expect(result.name).toBe(name);
+  expect(result.text).toBe(text);
 }
 
 describe('Tokenizer', function () {

spec/umd-runtime.html

@@ -1,91 +1,58 @@
+<!doctype html>
 <html>
   <head>
-    <title>Mocha</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <link rel="stylesheet" href="/node_modules/mocha/mocha.css" />
-    <style>
-      .headless .suite > h1,
-      .headless .test.pass {
-        display: none;
-      }
-    </style>
-
-    <script>
-      // Show only errors in "headless", non-interactive mode.
-      if (/headless=true/.test(location.href)) {
-        document.documentElement.className = 'headless';
-      }
-    </script>
-    <script src="/node_modules/sinon/pkg/sinon.js"></script>
-    <script src="/node_modules/chai/chai.js"></script>
-    <script src="/node_modules/dirty-chai/lib/dirty-chai.js"></script>
-    <script src="/node_modules/mocha/mocha.js"></script>
-    <script>
-      window.expect = chai.expect;
-      mocha.setup('bdd');
-    </script>
-    <script src="/spec/vendor/require.js"></script>
-
-    <script src="/spec/env/common.js"></script>
-    <script>
-      requirejs.config({
-        paths: {
-          'handlebars.runtime': '/dist/handlebars.runtime'
-        }
-      });
-    </script>
-    <script>
-      onload = function(){
-        require(['handlebars.runtime'], function(Handlebars) {
-          describe('runtime', function() {
-            it('should load', function() {
-              equal(!!Handlebars.template, true);
-              equal(!!Handlebars.VERSION, true);
-            });
-          });
-
-          mocha.globals(['mochaResults'])
-          // The test harness leaks under FF. We should have decent global leak coverage from other tests
-          if (!navigator.userAgent.match(/Firefox\/([\d.]+)/)) {
-            mocha.checkLeaks();
-          }
-          var runner = mocha.run();
-
-          // Reporting to test-runner
-          var failedTests = [];
-          runner.on('end', function(){
-            window.mochaResults = runner.stats;
-            window.mochaResults.reports = failedTests;
-          });
-
-          runner.on('fail', logFailure);
-
-          function logFailure(test, err){
-
-            var flattenTitles = function(test){
-              var titles = [];
-              while (test.parent.title){
-                titles.push(test.parent.title);
-                test = test.parent;
-              }
-              return titles.reverse();
-            };
-
-            failedTests.push({
-              name: test.title,
-              result: false,
-              message: err.message,
-              stack: err.stack,
-              titles: flattenTitles(test)
-            });
-          }
-        });
-      };
-    </script>
+    <title>Handlebars Runtime UMD Smoke Test</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   </head>
   <body>
-    <div id="mocha"></div>
+    <h1>Handlebars Runtime UMD Smoke Test</h1>
+    <pre id="results"></pre>
+    <script src="/spec/vendor/require.js"></script>
+    <script>
+      var results = document.getElementById('results');
+      var failures = 0;
+      var tests = 0;
+
+      function assert(condition, message) {
+        tests++;
+        if (!condition) {
+          failures++;
+          results.textContent += 'FAIL: ' + message + '\n';
+        } else {
+          results.textContent += 'PASS: ' + message + '\n';
+        }
+      }
+
+      requirejs.config({
+        paths: {
+          'handlebars.runtime': '/dist/handlebars.runtime',
+        },
+      });
+
+      require(['handlebars.runtime'], function (Handlebars) {
+        try {
+          assert(
+            typeof Handlebars !== 'undefined',
+            'Handlebars runtime loaded via RequireJS'
+          );
+          assert(
+            typeof Handlebars.template === 'function',
+            'Handlebars.template exists'
+          );
+          assert(
+            typeof Handlebars.VERSION === 'string',
+            'Handlebars.VERSION exists'
+          );
+        } catch (e) {
+          failures++;
+          results.textContent += 'ERROR: ' + e.message + '\n';
+        }
+
+        results.textContent +=
+          '\n' + tests + ' tests, ' + failures + ' failures\n';
+        window.mochaResults = { passes: tests - failures, failures: failures };
+      });
+    </script>
   </body>
 </html>

spec/umd.html

@@ -1,112 +1,66 @@
+<!doctype html>
 <html>
   <head>
-    <title>Mocha</title>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <link rel="stylesheet" href="/node_modules/mocha/mocha.css" />
-    <style>
-      .headless .suite > h1,
-      .headless .test.pass {
-        display: none;
-      }
-    </style>
-
-    <script>
-      // Show only errors in "headless", non-interactive mode.
-      if (/headless=true/.test(location.href)) {
-        document.documentElement.className = 'headless';
-      }
-    </script>
-
-    <script src="/node_modules/sinon/pkg/sinon.js"></script>
-    <script src="/node_modules/chai/chai.js"></script>
-    <script src="/node_modules/dirty-chai/lib/dirty-chai.js"></script>
-    <script src="/node_modules/mocha/mocha.js"></script>
-    <script>
-      window.expect = chai.expect;
-      mocha.setup('bdd');
-    </script>
+    <title>Handlebars UMD Module Smoke Test</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  </head>
+  <body>
+    <h1>Handlebars UMD Module Smoke Test</h1>
+    <pre id="results"></pre>
     <script src="/spec/vendor/require.js"></script>
-
-    <script src="/spec/env/common.js"></script>
     <script>
+      var results = document.getElementById('results');
+      var failures = 0;
+      var tests = 0;
+
+      function assert(condition, message) {
+        tests++;
+        if (!condition) {
+          failures++;
+          results.textContent += 'FAIL: ' + message + '\n';
+        } else {
+          results.textContent += 'PASS: ' + message + '\n';
+        }
+      }
+
       requirejs.config({
         paths: {
           handlebars: '/dist/handlebars',
-          tests: '/tmp/tests'
-        }
+        },
       });
 
-      var CompilerContext = {
-        compile: function(template, options) {
-          var templateSpec = handlebarsEnv.precompile(template, options);
-          return handlebarsEnv.template(safeEval(templateSpec));
-        },
-        compileWithPartial: function(template, options) {
-          return handlebarsEnv.compile(template, options);
-        }
-      };
-
-      function safeEval(templateSpec) {
+      require(['handlebars'], function (Handlebars) {
         try {
-          var ret;
-          eval('ret = ' + templateSpec);
-          return ret;
-        } catch (err) {
-          console.error(templateSpec);
-          throw err;
+          assert(
+            typeof Handlebars !== 'undefined',
+            'Handlebars loaded via RequireJS'
+          );
+          assert(
+            typeof Handlebars.compile === 'function',
+            'Handlebars.compile exists'
+          );
+          assert(
+            typeof Handlebars.template === 'function',
+            'Handlebars.template exists'
+          );
+          assert(
+            typeof Handlebars.VERSION === 'string',
+            'Handlebars.VERSION exists'
+          );
+
+          var template = Handlebars.compile('Hello {{name}}!');
+          var output = template({ name: 'UMD' });
+          assert(output === 'Hello UMD!', 'Basic compilation works: ' + output);
+        } catch (e) {
+          failures++;
+          results.textContent += 'ERROR: ' + e.message + '\n';
         }
-      }
+
+        results.textContent +=
+          '\n' + tests + ' tests, ' + failures + ' failures\n';
+        window.mochaResults = { passes: tests - failures, failures: failures };
+      });
     </script>
-    <script>
-      onload = function(){
-
-        require(['handlebars'], function(Handlebars) {
-          window.Handlebars = Handlebars;
-
-          require(['tests'], function() {
-            mocha.globals(['mochaResults'])
-            // The test harness leaks under FF. We should have decent global leak coverage from other tests
-            if (!navigator.userAgent.match(/Firefox\/([\d.]+)/)) {
-              mocha.checkLeaks();
-            }
-            var runner = mocha.run();
-
-            // Reporting to test-runner
-            var failedTests = [];
-            runner.on('end', function(){
-              window.mochaResults = runner.stats;
-              window.mochaResults.reports = failedTests;
-            });
-
-            runner.on('fail', logFailure);
-
-            function logFailure(test, err){
-
-              var flattenTitles = function(test){
-                var titles = [];
-                while (test.parent.title){
-                  titles.push(test.parent.title);
-                  test = test.parent;
-                }
-                return titles.reverse();
-              };
-
-              failedTests.push({
-                name: test.title,
-                result: false,
-                message: err.message,
-                stack: err.stack,
-                titles: flattenTitles(test)
-              });
-            };
-          });
-        });
-      };
-    </script>
-  </head>
-  <body>
-    <div id="mocha"></div>
   </body>
 </html>

spec/utils.js

@@ -5,11 +5,7 @@ describe('utils', function () {
       if (!(safe instanceof Handlebars.SafeString)) {
         throw new Error('Must be instance of SafeString');
       }
-      equals(
-        safe.toString(),
-        'testing 1, 2, 3',
-        'SafeString is equivalent to its underlying string'
-      );
+      expect(safe.toString()).toBe('testing 1, 2, 3');
     });
 
     it('it should not escape SafeString properties', function () {
@@ -23,51 +19,50 @@ describe('utils', function () {
 
   describe('#escapeExpression', function () {
     it('should escape html', function () {
-      equals(
-        Handlebars.Utils.escapeExpression('foo<&"\'>'),
+      expect(Handlebars.Utils.escapeExpression('foo<&"\'>')).toBe(
         'foo&lt;&amp;&quot;&#x27;&gt;'
       );
-      equals(Handlebars.Utils.escapeExpression('foo='), 'foo&#x3D;');
+      expect(Handlebars.Utils.escapeExpression('foo=')).toBe('foo&#x3D;');
     });
     it('should not escape SafeString', function () {
       var string = new Handlebars.SafeString('foo<&"\'>');
-      equals(Handlebars.Utils.escapeExpression(string), 'foo<&"\'>');
+      expect(Handlebars.Utils.escapeExpression(string)).toBe('foo<&"\'>');
 
       var obj = {
         toHTML: function () {
           return 'foo<&"\'>';
         },
       };
-      equals(Handlebars.Utils.escapeExpression(obj), 'foo<&"\'>');
+      expect(Handlebars.Utils.escapeExpression(obj)).toBe('foo<&"\'>');
     });
     it('should handle falsy', function () {
-      equals(Handlebars.Utils.escapeExpression(''), '');
-      equals(Handlebars.Utils.escapeExpression(undefined), '');
-      equals(Handlebars.Utils.escapeExpression(null), '');
+      expect(Handlebars.Utils.escapeExpression('')).toBe('');
+      expect(Handlebars.Utils.escapeExpression(undefined)).toBe('');
+      expect(Handlebars.Utils.escapeExpression(null)).toBe('');
 
-      equals(Handlebars.Utils.escapeExpression(false), 'false');
-      equals(Handlebars.Utils.escapeExpression(0), '0');
+      expect(Handlebars.Utils.escapeExpression(false)).toBe('false');
+      expect(Handlebars.Utils.escapeExpression(0)).toBe('0');
     });
     it('should handle empty objects', function () {
-      equals(Handlebars.Utils.escapeExpression({}), {}.toString());
-      equals(Handlebars.Utils.escapeExpression([]), [].toString());
+      expect(Handlebars.Utils.escapeExpression({})).toBe({}.toString());
+      expect(Handlebars.Utils.escapeExpression([])).toBe([].toString());
     });
   });
 
   describe('#isEmpty', function () {
     it('should not be empty', function () {
-      equals(Handlebars.Utils.isEmpty(undefined), true);
-      equals(Handlebars.Utils.isEmpty(null), true);
-      equals(Handlebars.Utils.isEmpty(false), true);
-      equals(Handlebars.Utils.isEmpty(''), true);
-      equals(Handlebars.Utils.isEmpty([]), true);
+      expect(Handlebars.Utils.isEmpty(undefined)).toBe(true);
+      expect(Handlebars.Utils.isEmpty(null)).toBe(true);
+      expect(Handlebars.Utils.isEmpty(false)).toBe(true);
+      expect(Handlebars.Utils.isEmpty('')).toBe(true);
+      expect(Handlebars.Utils.isEmpty([])).toBe(true);
     });
 
     it('should be empty', function () {
-      equals(Handlebars.Utils.isEmpty(0), false);
-      equals(Handlebars.Utils.isEmpty([1]), false);
-      equals(Handlebars.Utils.isEmpty('foo'), false);
-      equals(Handlebars.Utils.isEmpty({ bar: 1 }), false);
+      expect(Handlebars.Utils.isEmpty(0)).toBe(false);
+      expect(Handlebars.Utils.isEmpty([1])).toBe(false);
+      expect(Handlebars.Utils.isEmpty('foo')).toBe(false);
+      expect(Handlebars.Utils.isEmpty({ bar: 1 })).toBe(false);
     });
   });
 
@@ -82,8 +77,25 @@ describe('utils', function () {
 
       Handlebars.Utils.extend(b, new A());
 
-      equals(b.a, 1);
-      equals(b.b, 2);
+      expect(b.a).toBe(1);
+      expect(b.b).toBe(2);
+    });
+  });
+
+  describe('#isType', function () {
+    it('should check if variable is type Array', function () {
+      expect(Handlebars.Utils.isArray('string')).toBe(false);
+      expect(Handlebars.Utils.isArray([])).toBe(true);
+    });
+
+    it('should check if variable is type Map', function () {
+      expect(Handlebars.Utils.isMap('string')).toBe(false);
+      expect(Handlebars.Utils.isMap(new Map())).toBe(true);
+    });
+
+    it('should check if variable is type Set', function () {
+      expect(Handlebars.Utils.isSet('string')).toBe(false);
+      expect(Handlebars.Utils.isSet(new Set())).toBe(true);
     });
   });
 });

tasks/.eslintrc.js

@@ -1,8 +0,0 @@
-module.exports = {
-  rules: {
-    'no-process-env': 'off',
-    'prefer-const': 'warn',
-    'compat/compat': 'off',
-    'dot-notation': ['error', { allowKeywords: true }],
-  },
-};

tasks/metrics.js

@@ -1,29 +0,0 @@
-const metrics = require('../tests/bench');
-const { createRegisterAsyncTaskFn } = require('./util/async-grunt-task');
-
-module.exports = function (grunt) {
-  const registerAsyncTask = createRegisterAsyncTaskFn(grunt);
-
-  registerAsyncTask('metrics', function () {
-    const onlyExecuteName = grunt.option('name');
-    const events = {};
-
-    const promises = Object.keys(metrics).map(async (name) => {
-      if (/^_/.test(name)) {
-        return;
-      }
-      if (onlyExecuteName != null && name !== onlyExecuteName) {
-        return;
-      }
-
-      return new Promise((resolve) => {
-        metrics[name](grunt, function (data) {
-          events[name] = data;
-          resolve();
-        });
-      });
-    });
-
-    return Promise.all(promises);
-  });
-};

tasks/publish-to-aws.js

@@ -1,96 +1,101 @@
-const AWS = require('aws-sdk');
+/* eslint-disable no-console */
+const fs = require('fs');
+const { S3, PutObjectCommand } = require('@aws-sdk/client-s3');
 const git = require('./util/git');
-const { createRegisterAsyncTaskFn } = require('./util/async-grunt-task');
 const semver = require('semver');
 
-module.exports = function (grunt) {
-  const registerAsyncTask = createRegisterAsyncTaskFn(grunt);
+const PUBLISHED_FILES = [
+  'handlebars.js',
+  'handlebars.min.js',
+  'handlebars.runtime.js',
+  'handlebars.runtime.min.js',
+];
 
-  registerAsyncTask('publish-to-aws', async () => {
-    grunt.log.writeln('remotes: ' + (await git.remotes()));
-    grunt.log.writeln('branches: ' + (await git.branches()));
+let s3Client;
 
-    const commitInfo = await git.commitInfo();
-    grunt.log.writeln('tag: ', commitInfo.tagName);
+async function main() {
+  console.log('remotes: ' + (await git.remotes()));
+  console.log('branches: ' + (await git.branches()));
 
-    const suffixes = [];
+  const commitInfo = await git.commitInfo();
+  console.log('tag: ', commitInfo.tagName);
 
-    // Publish the master as "latest" and with the commit-id
-    if (commitInfo.isMaster) {
-      suffixes.push('-latest');
-      suffixes.push('-' + commitInfo.headSha);
-    }
+  const suffixes = buildSuffixes(commitInfo);
 
-    // Publish tags by their tag-name
-    if (commitInfo.tagName != null && semver.valid(commitInfo.tagName)) {
-      suffixes.push('-' + commitInfo.tagName);
-    }
+  if (suffixes.length > 0) {
+    validateS3Env();
+    console.log('publishing file-suffixes: ' + JSON.stringify(suffixes));
+    await publish(suffixes);
+  }
+}
 
-    if (suffixes.length > 0) {
-      initSDK();
-      grunt.log.writeln(
-        'publishing file-suffixes: ' + JSON.stringify(suffixes)
-      );
-      await publish(suffixes);
-    }
+function buildSuffixes(commitInfo) {
+  const suffixes = [];
+
+  if (commitInfo.isMaster) {
+    suffixes.push('-latest');
+    suffixes.push('-' + commitInfo.headSha);
+  }
+
+  if (commitInfo.tagName != null && semver.valid(commitInfo.tagName)) {
+    suffixes.push('-' + commitInfo.tagName);
+  }
+
+  return suffixes;
+}
+
+function validateS3Env() {
+  const bucket = process.env.S3_BUCKET_NAME,
+    region = process.env.S3_REGION,
+    key = process.env.S3_ACCESS_KEY_ID,
+    secret = process.env.S3_SECRET_ACCESS_KEY;
+
+  if (!bucket || !region || !key || !secret) {
+    throw new Error('Missing S3 config values');
+  }
+}
+
+async function publish(suffixes, overrides) {
+  const publishPromises = suffixes.map((suffix) =>
+    publishSuffix(suffix, overrides)
+  );
+  return Promise.all(publishPromises);
+}
+
+async function publishSuffix(suffix, overrides) {
+  const publishPromises = PUBLISHED_FILES.map(async (filename) => {
+    const nameInBucket = getNameInBucket(filename, suffix);
+    const localFile = getLocalFile(filename);
+    await uploadToBucket(localFile, nameInBucket, overrides);
+    console.log(`Published ${localFile} to build server (${nameInBucket})`);
   });
+  return Promise.all(publishPromises);
+}
 
-  function initSDK() {
-    const bucket = process.env.S3_BUCKET_NAME,
-      key = process.env.S3_ACCESS_KEY_ID,
-      secret = process.env.S3_SECRET_ACCESS_KEY;
+async function uploadToBucket(localFile, nameInBucket, overrides) {
+  const s3 = overrides?.s3Client ?? getS3Client();
+  const bucket = overrides?.bucket ?? process.env.S3_BUCKET_NAME;
 
-    if (!bucket || !key || !secret) {
-      throw new Error('Missing S3 config values');
-    }
-
-    AWS.config.update({ accessKeyId: key, secretAccessKey: secret });
-  }
-
-  async function publish(suffixes) {
-    const publishPromises = suffixes.map((suffix) => publishSuffix(suffix));
-    return Promise.all(publishPromises);
-  }
-
-  async function publishSuffix(suffix) {
-    const filenames = [
-      'handlebars.js',
-      'handlebars.min.js',
-      'handlebars.runtime.js',
-      'handlebars.runtime.min.js',
-    ];
-    const publishPromises = filenames.map(async (filename) => {
-      const nameInBucket = getNameInBucket(filename, suffix);
-      const localFile = getLocalFile(filename);
-      await uploadToBucket(localFile, nameInBucket);
-      grunt.log.writeln(
-        `Published ${localFile} to build server (${nameInBucket})`
-      );
-    });
-    return Promise.all(publishPromises);
-  }
-
-  async function uploadToBucket(localFile, nameInBucket) {
-    const bucket = process.env.S3_BUCKET_NAME;
-    const uploadParams = {
+  return s3.send(
+    new PutObjectCommand({
       Bucket: bucket,
       Key: nameInBucket,
-      Body: grunt.file.read(localFile),
-    };
-    return s3PutObject(uploadParams);
-  }
-};
+      Body: fs.readFileSync(localFile, 'utf8'),
+    })
+  );
+}
 
-function s3PutObject(uploadParams) {
-  const s3 = new AWS.S3();
-  return new Promise((resolve, reject) => {
-    s3.putObject(uploadParams, (err) => {
-      if (err != null) {
-        return reject(err);
-      }
-      resolve();
+function getS3Client() {
+  if (!s3Client) {
+    s3Client = new S3({
+      region: process.env.S3_REGION,
+      credentials: {
+        accessKeyId: process.env.S3_ACCESS_KEY_ID,
+        secretAccessKey: process.env.S3_SECRET_ACCESS_KEY,
+      },
     });
-  });
+  }
+  return s3Client;
 }
 
 function getNameInBucket(filename, suffix) {
@@ -100,3 +105,19 @@ function getNameInBucket(filename, suffix) {
 function getLocalFile(filename) {
   return 'dist/' + filename;
 }
+
+module.exports = {
+  PUBLISHED_FILES,
+  buildSuffixes,
+  validateS3Env,
+  publish,
+  getNameInBucket,
+  getLocalFile,
+};
+
+if (require.main === module) {
+  main().catch((err) => {
+    console.error(err);
+    process.exit(1);
+  });
+}

tasks/test-bin.js

@@ -1,242 +0,0 @@
-const childProcess = require('child_process');
-const fs = require('fs');
-const os = require('os');
-const path = require('path');
-
-const chai = require('chai');
-chai.use(require('chai-diff'));
-const expect = chai.expect;
-
-const testCases = [
-  {
-    binInputParameters: ['-a', 'spec/artifacts/empty.handlebars'],
-    outputLocation: 'stdout',
-    expectedOutputSpec: './spec/expected/empty.amd.js',
-  },
-  {
-    binInputParameters: [
-      '-a',
-      '-f',
-      'TEST_OUTPUT',
-      'spec/artifacts/empty.handlebars',
-    ],
-    outputLocation: 'TEST_OUTPUT',
-    expectedOutputSpec: './spec/expected/empty.amd.js',
-  },
-  {
-    binInputParameters: [
-      '-a',
-      '-n',
-      'CustomNamespace.templates',
-      'spec/artifacts/empty.handlebars',
-    ],
-    outputLocation: 'stdout',
-    expectedOutputSpec: './spec/expected/empty.amd.namespace.js',
-  },
-  {
-    binInputParameters: [
-      '-a',
-      '--namespace',
-      'CustomNamespace.templates',
-      'spec/artifacts/empty.handlebars',
-    ],
-    outputLocation: 'stdout',
-    expectedOutputSpec: './spec/expected/empty.amd.namespace.js',
-  },
-  {
-    binInputParameters: ['-a', '-s', 'spec/artifacts/empty.handlebars'],
-    outputLocation: 'stdout',
-    expectedOutputSpec: './spec/expected/empty.amd.simple.js',
-  },
-  {
-    binInputParameters: ['-a', '-m', 'spec/artifacts/empty.handlebars'],
-    outputLocation: 'stdout',
-    expectedOutputSpec: './spec/expected/empty.amd.min.js',
-  },
-  {
-    binInputParameters: [
-      'spec/artifacts/known.helpers.handlebars',
-      '-a',
-      '-k',
-      'someHelper',
-      '-k',
-      'anotherHelper',
-      '-o',
-    ],
-    outputLocation: 'stdout',
-    expectedOutputSpec: './spec/expected/non.empty.amd.known.helper.js',
-  },
-  {
-    binInputParameters: ['--help'],
-    outputLocation: 'stdout',
-    expectedOutputSpec: './spec/expected/help.menu.txt',
-  },
-  {
-    binInputParameters: ['-v'],
-    outputLocation: 'stdout',
-    expectedOutput: require('../package.json').version,
-  },
-  {
-    binInputParameters: [
-      '-a',
-      '-e',
-      'hbs',
-      './spec/artifacts/non.default.extension.hbs',
-    ],
-    outputLocation: 'stdout',
-    expectedOutputSpec: './spec/expected/non.default.extension.amd.js',
-  },
-  {
-    binInputParameters: [
-      '-a',
-      '-p',
-      './spec/artifacts/partial.template.handlebars',
-    ],
-    outputLocation: 'stdout',
-    expectedOutputSpec: './spec/expected/partial.template.js',
-  },
-  {
-    binInputParameters: ['spec/artifacts/empty.handlebars', '-c'],
-    outputLocation: 'stdout',
-    expectedOutputSpec: './spec/expected/empty.common.js',
-  },
-  {
-    binInputParameters: [
-      'spec/artifacts/empty.handlebars',
-      'spec/artifacts/empty.handlebars',
-      '-a',
-      '-n',
-      'someNameSpace',
-    ],
-    outputLocation: 'stdout',
-    expectedOutputSpec: './spec/expected/namespace.amd.js',
-  },
-  {
-    binInputParameters: [
-      'spec/artifacts/empty.handlebars',
-      '-h',
-      'some-path/',
-      '-a',
-    ],
-    outputLocation: 'stdout',
-    expectedOutputSpec: './spec/expected/handlebar.path.amd.js',
-  },
-  {
-    binInputParameters: [
-      'spec/artifacts/partial.template.handlebars',
-      '-r',
-      'spec',
-      '-a',
-    ],
-    outputLocation: 'stdout',
-    expectedOutputSpec: './spec/expected/empty.root.amd.js',
-  },
-  {
-    binInputParameters: [
-      '-i',
-      '<div>1</div>',
-      '-i',
-      '<div>2</div>',
-      '-N',
-      'firstTemplate',
-      '-N',
-      'secondTemplate',
-      '-a',
-    ],
-    outputLocation: 'stdout',
-    expectedOutputSpec: './spec/expected/empty.name.amd.js',
-  },
-  {
-    binInputParameters: [
-      '-i',
-      '<div>1</div>',
-      '-a',
-      '-m',
-      '-N',
-      'test',
-      '--map',
-      './spec/tmp/source.map.amd.txt',
-    ],
-    outputLocation: 'stdout',
-    expectedOutputSpec: './spec/expected/source.map.amd.js',
-  },
-  {
-    binInputParameters: ['./spec/artifacts/bom.handlebars', '-b', '-a'],
-    outputLocation: 'stdout',
-    expectedOutputSpec: './spec/expected/bom.amd.js',
-  },
-  // Issue #1673
-  {
-    binInputParameters: [
-      '--amd',
-      '--no-amd',
-      'spec/artifacts/empty.handlebars',
-    ],
-    outputLocation: 'stdout',
-    expectedOutputSpec: './spec/expected/empty.common.js',
-  },
-];
-
-module.exports = function (grunt) {
-  grunt.registerTask('test:bin', function () {
-    testCases.forEach(
-      ({
-        binInputParameters,
-        outputLocation,
-        expectedOutputSpec,
-        expectedOutput,
-      }) => {
-        const stdout = executeBinHandlebars(...binInputParameters);
-
-        if (!expectedOutput && expectedOutputSpec) {
-          expectedOutput = fs.readFileSync(expectedOutputSpec, 'utf-8');
-        }
-
-        const useStdout = outputLocation === 'stdout';
-        const normalizedOutput = normalizeCrlf(
-          useStdout ? stdout : fs.readFileSync(outputLocation, 'utf-8')
-        );
-        const normalizedExpectedOutput = normalizeCrlf(expectedOutput);
-
-        if (!useStdout) {
-          fs.unlinkSync(outputLocation);
-        }
-
-        expect(normalizedOutput).not.to.be.differentFrom(
-          normalizedExpectedOutput,
-          {
-            relaxedSpace: true,
-          }
-        );
-      }
-    );
-  });
-};
-
-// helper functions
-
-function executeBinHandlebars(...args) {
-  if (os.platform() === 'win32') {
-    // On Windows, the executable handlebars.js file cannot be run directly
-    const nodeJs = process.argv[0];
-    return execFilesSyncUtf8(nodeJs, ['./bin/handlebars.js'].concat(args));
-  }
-  return execFilesSyncUtf8('./bin/handlebars.js', args);
-}
-
-function execFilesSyncUtf8(command, args) {
-  const env = process.env;
-  env.PATH = addPathToNodeJs(env.PATH);
-  return childProcess.execFileSync(command, args, { encoding: 'utf-8', env });
-}
-
-function addPathToNodeJs(pathEnvironment) {
-  return path.dirname(process.argv0) + path.delimiter + pathEnvironment;
-}
-
-function normalizeCrlf(string) {
-  if (typeof string === 'string') {
-    return string.replace(/\r\n/g, '\n');
-  }
-  return string;
-}

tasks/test-mocha.js

@@ -1,22 +0,0 @@
-const { execNodeJsScriptWithInheritedOutput } = require('./util/exec-file');
-const { createRegisterAsyncTaskFn } = require('./util/async-grunt-task');
-const nodeJs = process.argv0;
-
-module.exports = function (grunt) {
-  const registerAsyncTask = createRegisterAsyncTaskFn(grunt);
-
-  registerAsyncTask('test:mocha', async () =>
-    execNodeJsScriptWithInheritedOutput('./spec/env/runner')
-  );
-
-  registerAsyncTask('test:cov', async () =>
-    execNodeJsScriptWithInheritedOutput('node_modules/nyc/bin/nyc', [
-      nodeJs,
-      './spec/env/runner.js',
-    ])
-  );
-
-  registerAsyncTask('test:min', async () =>
-    execNodeJsScriptWithInheritedOutput('./spec/env/runner', ['--min'])
-  );
-};

tasks/tests/.eslintrc.js

@@ -1,5 +0,0 @@
-module.exports = {
-  env: {
-    mocha: true,
-  },
-};

tasks/tests/cli.test.js

@@ -0,0 +1,274 @@
+const fs = require('fs');
+const { exec } = require('child_process');
+const { execCommand, FileTestHelper } = require('cli-testlab');
+const Handlebars = require('../../lib');
+
+const cli = 'node ./bin/handlebars.mjs';
+
+expect.extend({
+  toEqualWithRelaxedSpace(received, expected) {
+    const normalize = (str) =>
+      typeof str === 'string'
+        ? str
+            .replace(/\r\n/g, '\n')
+            .split('\n')
+            .map((line) => line.replace(/\s+/g, ' ').trim())
+            .filter((line) => line.length > 0)
+            .join('\n')
+            .trim()
+        : str;
+
+    const normalizedReceived = normalize(received);
+    const normalizedExpected = normalize(expected);
+    const pass = normalizedReceived === normalizedExpected;
+
+    return {
+      pass,
+      message: () =>
+        `Expected output to match with relaxed whitespace.\n\n` +
+        `Expected:\n${normalizedExpected}\n\nReceived:\n${normalizedReceived}`,
+    };
+  },
+});
+
+function expectedFile(specPath) {
+  return fs.readFileSync(specPath, 'utf-8');
+}
+
+describe('bin/handlebars', function () {
+  describe('help and version', function () {
+    it('--help displays help menu', async function () {
+      const result = await execCommand(`${cli} --help`);
+      expect(result.stdout).toEqualWithRelaxedSpace(
+        expectedFile('./spec/expected/help.menu.txt')
+      );
+    });
+
+    it('no arguments displays help menu', async function () {
+      const result = await execCommand(`${cli}`);
+      expect(result.stdout).toEqualWithRelaxedSpace(
+        expectedFile('./spec/expected/help.menu.txt')
+      );
+    });
+
+    it('-v prints the compiler version', async function () {
+      await execCommand(`${cli} -v`, {
+        expectedOutput: Handlebars.VERSION,
+      });
+    });
+  });
+
+  describe('AMD output', function () {
+    it('-a produces AMD output', async function () {
+      const result = await execCommand(
+        `${cli} -a spec/artifacts/empty.handlebars`
+      );
+      expect(result.stdout).toEqualWithRelaxedSpace(
+        expectedFile('./spec/expected/empty.amd.js')
+      );
+    });
+
+    it('-a -s produces simple AMD output', async function () {
+      const result = await execCommand(
+        `${cli} -a -s spec/artifacts/empty.handlebars`
+      );
+      expect(result.stdout).toEqualWithRelaxedSpace(
+        expectedFile('./spec/expected/empty.amd.simple.js')
+      );
+    });
+
+    it('-a -m produces minified AMD output', async function () {
+      const result = await execCommand(
+        `${cli} -a -m spec/artifacts/empty.handlebars`
+      );
+      expect(result.stdout).toEqualWithRelaxedSpace(
+        expectedFile('./spec/expected/empty.amd.min.js')
+      );
+    });
+  });
+
+  describe('CommonJS output', function () {
+    it('-c produces CommonJS output', async function () {
+      const result = await execCommand(
+        `${cli} spec/artifacts/empty.handlebars -c`
+      );
+      expect(result.stdout).toEqualWithRelaxedSpace(
+        expectedFile('./spec/expected/empty.common.js')
+      );
+    });
+  });
+
+  describe('namespace', function () {
+    it('-n sets custom namespace', async function () {
+      const result = await execCommand(
+        `${cli} -a -n CustomNamespace.templates spec/artifacts/empty.handlebars`
+      );
+      expect(result.stdout).toEqualWithRelaxedSpace(
+        expectedFile('./spec/expected/empty.amd.namespace.js')
+      );
+    });
+
+    it('--namespace sets custom namespace', async function () {
+      const result = await execCommand(
+        `${cli} -a --namespace CustomNamespace.templates spec/artifacts/empty.handlebars`
+      );
+      expect(result.stdout).toEqualWithRelaxedSpace(
+        expectedFile('./spec/expected/empty.amd.namespace.js')
+      );
+    });
+
+    it('multiple files share a namespace', async function () {
+      const result = await execCommand(
+        `${cli} spec/artifacts/empty.handlebars spec/artifacts/empty.handlebars -a -n someNameSpace`
+      );
+      expect(result.stdout).toEqualWithRelaxedSpace(
+        expectedFile('./spec/expected/namespace.amd.js')
+      );
+    });
+  });
+
+  describe('file output', function () {
+    let files;
+
+    beforeEach(function () {
+      files = new FileTestHelper({ basePath: '.' });
+      files.createDir('tmp');
+    });
+
+    afterEach(function () {
+      files.cleanup();
+    });
+
+    it('-f writes output to a file', async function () {
+      const outputFile = 'tmp/cli-test-output.js';
+      files.registerForCleanup(outputFile);
+
+      await execCommand(
+        `${cli} -a -f ${outputFile} spec/artifacts/empty.handlebars`
+      );
+
+      expect(files.fileExists(outputFile)).toBe(true);
+      const content = files.getFileTextContent(outputFile);
+      expect(content).toEqualWithRelaxedSpace(
+        expectedFile('./spec/expected/empty.amd.js')
+      );
+    });
+
+    it('--map writes source map and appends sourceMappingURL', async function () {
+      const mapFile = 'tmp/cli-test-source.map';
+      files.registerForCleanup(mapFile);
+
+      const result = await execCommand(
+        `${cli} -i "<div>1</div>" -a -m -N test --map ${mapFile}`
+      );
+
+      expect(result.stdout).toContain('sourceMappingURL=');
+      expect(files.fileExists(mapFile)).toBe(true);
+      const parsed = JSON.parse(files.getFileTextContent(mapFile));
+      expect(parsed).toHaveProperty('version', 3);
+      expect(parsed).toHaveProperty('sources');
+      expect(parsed).toHaveProperty('mappings');
+    });
+  });
+
+  describe('template options', function () {
+    it('-e sets custom extension', async function () {
+      const result = await execCommand(
+        `${cli} -a -e hbs ./spec/artifacts/non.default.extension.hbs`
+      );
+      expect(result.stdout).toEqualWithRelaxedSpace(
+        expectedFile('./spec/expected/non.default.extension.amd.js')
+      );
+    });
+
+    it('-p compiles as partial', async function () {
+      const result = await execCommand(
+        `${cli} -a -p ./spec/artifacts/partial.template.handlebars`
+      );
+      expect(result.stdout).toEqualWithRelaxedSpace(
+        expectedFile('./spec/expected/partial.template.js')
+      );
+    });
+
+    it('-r strips root from template names', async function () {
+      const result = await execCommand(
+        `${cli} spec/artifacts/partial.template.handlebars -r spec -a`
+      );
+      expect(result.stdout).toEqualWithRelaxedSpace(
+        expectedFile('./spec/expected/empty.root.amd.js')
+      );
+    });
+
+    it('-b strips BOM', async function () {
+      const result = await execCommand(
+        `${cli} ./spec/artifacts/bom.handlebars -b -a`
+      );
+      expect(result.stdout).toEqualWithRelaxedSpace(
+        expectedFile('./spec/expected/bom.amd.js')
+      );
+    });
+
+    it('-h sets custom handlebar path', async function () {
+      const result = await execCommand(
+        `${cli} spec/artifacts/empty.handlebars -h some-path/ -a`
+      );
+      expect(result.stdout).toEqualWithRelaxedSpace(
+        expectedFile('./spec/expected/handlebar.path.amd.js')
+      );
+    });
+
+    it('-k -o sets known helpers only', async function () {
+      const result = await execCommand(
+        `${cli} spec/artifacts/known.helpers.handlebars -a -k someHelper -k anotherHelper -o`
+      );
+      expect(result.stdout).toEqualWithRelaxedSpace(
+        expectedFile('./spec/expected/non.empty.amd.known.helper.js')
+      );
+    });
+  });
+
+  describe('inline templates', function () {
+    it('-i compiles inline template', async function () {
+      const result = await execCommand(
+        `${cli} -i "<div>hello</div>" -a -N myTemplate`
+      );
+      expect(result.stdout).toContain("define(['handlebars.runtime']");
+      expect(result.stdout).toContain("templates['myTemplate']");
+    });
+
+    it('-i compiles multiple inline templates with -N', async function () {
+      const result = await execCommand(
+        `${cli} -i "<div>1</div>" -i "<div>2</div>" -N firstTemplate -N secondTemplate -a`
+      );
+      expect(result.stdout).toEqualWithRelaxedSpace(
+        expectedFile('./spec/expected/empty.name.amd.js')
+      );
+    });
+  });
+
+  describe('error handling', function () {
+    it('should not produce unhandled promise rejections on async errors', async function () {
+      const { stderr } = await new Promise((resolve) => {
+        exec(
+          `node --unhandled-rejections=warn ./bin/handlebars.mjs -i "<div>test</div>" -N test --map /nonexistent/dir/test.map`,
+          (error, stdout, stderr) => {
+            resolve({ exitCode: error ? error.code : 0, stderr });
+          }
+        );
+      });
+
+      expect(stderr).not.toMatch(/unhandled/i);
+    });
+  });
+
+  describe('negated boolean flags', function () {
+    it('--no-amd negates --amd (issue #1673)', async function () {
+      const result = await execCommand(
+        `${cli} --amd --no-amd spec/artifacts/empty.handlebars`
+      );
+      expect(result.stdout).toEqualWithRelaxedSpace(
+        expectedFile('./spec/expected/empty.common.js')
+      );
+    });
+  });
+});

tasks/tests/fake-s3.js

@@ -0,0 +1,81 @@
+const http = require('http');
+
+/**
+ * Minimal in-memory S3-compatible server for testing.
+ * Supports PutObject and GetObject via path-style requests.
+ */
+function createFakeS3() {
+  const buckets = new Map();
+
+  const server = http.createServer((req, res) => {
+    const { bucket, key } = parsePath(req.url);
+
+    if (!bucket || !buckets.has(bucket)) {
+      res.writeHead(404, { 'Content-Type': 'application/xml' });
+      res.end('<Error><Code>NoSuchBucket</Code></Error>');
+      return;
+    }
+
+    const store = buckets.get(bucket);
+
+    if (req.method === 'PUT' && key) {
+      const chunks = [];
+      req.on('data', (chunk) => chunks.push(chunk));
+      req.on('end', () => {
+        store.set(key, Buffer.concat(chunks));
+        res.writeHead(200);
+        res.end();
+      });
+    } else if ((req.method === 'GET' || req.method === 'HEAD') && key) {
+      if (!store.has(key)) {
+        res.writeHead(404, { 'Content-Type': 'application/xml' });
+        res.end('<Error><Code>NoSuchKey</Code></Error>');
+        return;
+      }
+      const body = store.get(key);
+      res.writeHead(200, {
+        'Content-Length': body.length,
+        'Content-Type': 'application/octet-stream',
+      });
+      res.end(req.method === 'HEAD' ? undefined : body);
+    } else {
+      res.writeHead(405);
+      res.end();
+    }
+  });
+
+  return {
+    start() {
+      return new Promise((resolve) => {
+        server.listen(0, '127.0.0.1', () => {
+          const { port } = server.address();
+          resolve({
+            address: `http://127.0.0.1:${port}`,
+            createBucket(name) {
+              if (!buckets.has(name)) buckets.set(name, new Map());
+            },
+            reset() {
+              for (const store of buckets.values()) store.clear();
+            },
+            stop() {
+              return new Promise((r) => server.close(r));
+            },
+          });
+        });
+      });
+    },
+  };
+}
+
+function parsePath(url) {
+  // Path-style: /<bucket>/<key>
+  const parts = new URL(url, 'http://localhost').pathname
+    .replace(/^\//, '')
+    .split('/');
+  return {
+    bucket: parts[0] || null,
+    key: parts.slice(1).join('/') || null,
+  };
+}
+
+module.exports = { createFakeS3 };

tasks/tests/git.test.js

@@ -1,26 +1,26 @@
 const os = require('os');
 const path = require('path');
 const fs = require('fs-extra');
-const chai = require('chai');
-chai.use(require('dirty-chai'));
+const { spawnSync } = require('child_process');
 
 const git = require('../util/git');
 
-const expect = chai.expect;
-
 const tmpBaseDir = path.join(os.tmpdir(), 'handlebars-task-tests');
 const tmpDir = path.join(tmpBaseDir, Date.now().toString(36));
 const remoteDir = path.join(tmpDir, 'remote-repo');
 const cloneDir = path.join(tmpDir, 'clone-repo');
 const oldCwd = process.cwd();
+const gitInstalled = spawnSync('git', ['-v'], { stdio: 'ignore' }).status === 0;
 
-describe('utils/git', function () {
+describe.runIf(gitInstalled)('utils/git', function () {
   beforeEach(async function () {
     await fs.remove(tmpDir);
     await createRepositoryThatActsAsRemote();
     process.chdir(tmpDir);
     await git.git('clone', 'remote-repo', 'clone-repo');
     process.chdir(cloneDir);
+    await git.git('config', 'user.email', 'test@test.com');
+    await git.git('config', 'user.name', 'Test');
   });
 
   async function createRepositoryThatActsAsRemote() {
@@ -28,6 +28,8 @@ describe('utils/git', function () {
     process.chdir(remoteDir);
 
     await git.git('init');
+    await git.git('config', 'user.email', 'test@test.com');
+    await git.git('config', 'user.name', 'Test');
     await fs.writeFile('testfile.txt', 'Testfile');
     await git.add('testfile.txt');
     await git.commit('commit message');
@@ -44,7 +46,7 @@ describe('utils/git', function () {
 
       const result = await git.remotes();
 
-      expect(result.trim().split('\n')).to.deep.equal([
+      expect(result.trim().split('\n')).toEqual([
         'origin\thttps://test.org/test (fetch)',
         'origin\thttps://test.org/test (push)',
         'second-remote\thttps://test.org/test2 (fetch)',
@@ -59,7 +61,7 @@ describe('utils/git', function () {
       await git.git('branch', 'test2');
 
       const result = await git.branches();
-      expect(result.trim().split('\n')).to.deep.equal([
+      expect(result.trim().split('\n')).toEqual([
         '* master',
         '  test',
         '  test2',
@@ -72,21 +74,21 @@ describe('utils/git', function () {
   describe('the "commitInfo"-function', function () {
     it('should list head and master sha', async function () {
       const result = await git.commitInfo();
-      expect(result.masterSha).to.equal(result.headSha);
-      expect(result.masterSha).to.match(/^[0-9a-f]+$/);
-      expect(result.headSha).to.match(/^[0-9a-f]+$/);
+      expect(result.masterSha).toBe(result.headSha);
+      expect(result.masterSha).toMatch(/^[0-9a-f]+$/);
+      expect(result.headSha).toMatch(/^[0-9a-f]+$/);
     });
 
     it('should have "isMaster=true" if the master branch is checked out', async function () {
       const result = await git.commitInfo();
-      expect(result.isMaster).to.be.true();
+      expect(result.isMaster).toBe(true);
     });
 
     it('should have "isMaster=true" if the current commit is the last commit of the master branch', async function () {
       await git.git('checkout', '-b', 'new-branch');
 
       const result = await git.commitInfo();
-      expect(result.isMaster).to.be.true();
+      expect(result.isMaster).toBe(true);
     });
 
     it('should have "isMaster=false" if the current commit is NOT the last commit of the master branch', async function () {
@@ -96,13 +98,13 @@ describe('utils/git', function () {
       await git.commit('added new file');
 
       const result = await git.commitInfo();
-      expect(result.isMaster).to.be.false();
+      expect(result.isMaster).toBe(false);
     });
 
     it('should show the current tag', async function () {
       await git.git('tag', 'test-tag');
       const result = await git.commitInfo();
-      expect(result.tagName).to.be.equal('test-tag');
+      expect(result.tagName).toBe('test-tag');
     });
 
     it('should show a version tag rather than standard tags', async function () {
@@ -110,12 +112,12 @@ describe('utils/git', function () {
       await git.git('tag', 'v1.2');
       await git.git('tag', 'test-tag2');
       const result = await git.commitInfo();
-      expect(result.tagName).to.be.equal('v1.2');
+      expect(result.tagName).toBe('v1.2');
     });
 
     it('should show no tag if there is no tag', async function () {
       const result = await git.commitInfo();
-      expect(result.tagName).to.be.null();
+      expect(result.tagName).toBeNull();
     });
   });
 });

tasks/tests/publish-to-aws.test.js

@@ -0,0 +1,221 @@
+const fs = require('fs');
+const { S3, GetObjectCommand } = require('@aws-sdk/client-s3');
+const { createFakeS3 } = require('./fake-s3');
+
+const BUCKET = 'test-bucket';
+
+const {
+  PUBLISHED_FILES,
+  buildSuffixes,
+  validateS3Env,
+  publish,
+  getNameInBucket,
+  getLocalFile,
+} = require('../publish-to-aws');
+
+let server;
+let s3Client;
+
+beforeAll(async () => {
+  server = await createFakeS3().start();
+  server.createBucket(BUCKET);
+
+  s3Client = new S3({
+    endpoint: server.address,
+    region: 'us-east-1',
+    credentials: { accessKeyId: 'test', secretAccessKey: 'test' },
+    forcePathStyle: true,
+  });
+});
+
+afterAll(async () => {
+  await server?.stop();
+});
+
+beforeEach(() => {
+  server.reset();
+});
+
+async function getObjectBody(key) {
+  const response = await s3Client.send(
+    new GetObjectCommand({ Bucket: BUCKET, Key: key })
+  );
+  return response.Body.transformToString();
+}
+
+describe('buildSuffixes', () => {
+  it('should add -latest and commit sha for master', () => {
+    const result = buildSuffixes({
+      isMaster: true,
+      headSha: 'abc123',
+      tagName: null,
+    });
+    expect(result).toEqual(['-latest', '-abc123']);
+  });
+
+  it('should add tag suffix for valid semver tag', () => {
+    const result = buildSuffixes({
+      isMaster: false,
+      headSha: 'abc123',
+      tagName: '4.7.0',
+    });
+    expect(result).toEqual(['-4.7.0']);
+  });
+
+  it('should add both master and tag suffixes when on master with a tag', () => {
+    const result = buildSuffixes({
+      isMaster: true,
+      headSha: 'abc123',
+      tagName: '4.7.0',
+    });
+    expect(result).toEqual(['-latest', '-abc123', '-4.7.0']);
+  });
+
+  it('should return empty array for non-master with no valid tag', () => {
+    const result = buildSuffixes({
+      isMaster: false,
+      headSha: 'abc123',
+      tagName: null,
+    });
+    expect(result).toEqual([]);
+  });
+
+  it('should ignore invalid semver tags', () => {
+    const result = buildSuffixes({
+      isMaster: false,
+      headSha: 'abc123',
+      tagName: 'not-semver',
+    });
+    expect(result).toEqual([]);
+  });
+});
+
+describe('getNameInBucket', () => {
+  it('should insert suffix before .js extension', () => {
+    expect(getNameInBucket('handlebars.js', '-latest')).toBe(
+      'handlebars-latest.js'
+    );
+  });
+
+  it('should handle .min.js files', () => {
+    expect(getNameInBucket('handlebars.min.js', '-4.7.0')).toBe(
+      'handlebars.min-4.7.0.js'
+    );
+  });
+
+  it('should handle runtime files', () => {
+    expect(getNameInBucket('handlebars.runtime.js', '-abc123')).toBe(
+      'handlebars.runtime-abc123.js'
+    );
+  });
+});
+
+describe('getLocalFile', () => {
+  it('should prefix with dist/', () => {
+    expect(getLocalFile('handlebars.js')).toBe('dist/handlebars.js');
+  });
+});
+
+describe('validateS3Env', () => {
+  const S3_KEYS = [
+    'S3_BUCKET_NAME',
+    'S3_REGION',
+    'S3_ACCESS_KEY_ID',
+    'S3_SECRET_ACCESS_KEY',
+  ];
+  const saved = {};
+
+  beforeEach(() => {
+    for (const key of S3_KEYS) {
+      saved[key] = process.env[key];
+    }
+  });
+
+  afterEach(() => {
+    for (const key of S3_KEYS) {
+      if (saved[key] === undefined) {
+        delete process.env[key];
+      } else {
+        process.env[key] = saved[key];
+      }
+    }
+  });
+
+  it('should throw when S3 env vars are missing', () => {
+    for (const key of S3_KEYS) {
+      delete process.env[key];
+    }
+
+    expect(() => validateS3Env()).toThrow('Missing S3 config values');
+  });
+
+  it('should not throw when all S3 env vars are set', () => {
+    process.env.S3_BUCKET_NAME = 'test-bucket';
+    process.env.S3_REGION = 'us-east-1';
+    process.env.S3_ACCESS_KEY_ID = 'key';
+    process.env.S3_SECRET_ACCESS_KEY = 'secret';
+
+    expect(() => validateS3Env()).not.toThrow();
+  });
+});
+
+describe('publish to S3', () => {
+  const overrides = {};
+
+  beforeAll(() => {
+    overrides.s3Client = s3Client;
+    overrides.bucket = BUCKET;
+  });
+
+  it('should upload all 4 files for a single suffix', async () => {
+    await publish(['-latest'], overrides);
+
+    for (const filename of PUBLISHED_FILES) {
+      const key = getNameInBucket(filename, '-latest');
+      const body = await getObjectBody(key);
+      const localContent = fs.readFileSync(getLocalFile(filename), 'utf8');
+      expect(body).toBe(localContent);
+    }
+  });
+
+  it('should upload files for multiple suffixes', async () => {
+    await publish(['-latest', '-abc123'], overrides);
+
+    for (const suffix of ['-latest', '-abc123']) {
+      for (const filename of PUBLISHED_FILES) {
+        const key = getNameInBucket(filename, suffix);
+        const body = await getObjectBody(key);
+        expect(body).toBeTruthy();
+      }
+    }
+  });
+
+  it('should upload correct content from dist/', async () => {
+    await publish(['-v1.0.0'], overrides);
+
+    const key = getNameInBucket('handlebars.js', '-v1.0.0');
+    const uploaded = await getObjectBody(key);
+    const local = fs.readFileSync('dist/handlebars.js', 'utf8');
+    expect(uploaded).toBe(local);
+  });
+
+  it('should produce correct keys for a version tag', async () => {
+    await publish(['-4.7.0'], overrides);
+
+    const expectedKeys = PUBLISHED_FILES.map((f) =>
+      getNameInBucket(f, '-4.7.0')
+    );
+
+    for (const key of expectedKeys) {
+      const body = await getObjectBody(key);
+      expect(body).toBeTruthy();
+    }
+
+    expect(expectedKeys).toEqual([
+      'handlebars-4.7.0.js',
+      'handlebars.min-4.7.0.js',
+      'handlebars.runtime-4.7.0.js',
+      'handlebars.runtime.min-4.7.0.js',
+    ]);
+  });
+});

tasks/util/async-grunt-task.js

@@ -1,13 +0,0 @@
-module.exports = { createRegisterAsyncTaskFn };
-
-function createRegisterAsyncTaskFn(grunt) {
-  return function registerAsyncTask(name, asyncFunction) {
-    grunt.registerTask(name, function () {
-      asyncFunction()
-        .catch((error) => {
-          grunt.fatal(error);
-        })
-        .finally(this.async());
-    });
-  };
-}

tasks/util/git.js

@@ -52,7 +52,7 @@ async function getTagName() {
   }
 
   const tags = trimmedStdout.split(/\n|\r\n/);
-  const versionTags = tags.filter((tag) => /^v/.test(tag));
+  const versionTags = tags.filter((tag) => tag.startsWith('v'));
   if (versionTags[0] != null) {
     return versionTags[0];
   }

tasks/version.js

@@ -1,62 +1,68 @@
+const fs = require('fs');
+const { execSync } = require('child_process');
 const git = require('./util/git');
 const semver = require('semver');
-const { createRegisterAsyncTaskFn } = require('./util/async-grunt-task');
 
-module.exports = function (grunt) {
-  const registerAsyncTask = createRegisterAsyncTaskFn(grunt);
-
-  registerAsyncTask('version', async () => {
-    const pkg = grunt.config('pkg');
-    const version = grunt.option('ver');
-    if (!semver.valid(version)) {
-      throw new Error(
-        'Must provide a version number (Ex: --ver=1.0.0):\n\t' +
-          version +
-          '\n\n'
-      );
-    }
-    pkg.version = version;
-    grunt.config('pkg', pkg);
-
-    const replaceSpec = [
-      {
-        path: 'lib/handlebars/base.js',
-        regex: /const VERSION = ['"](.*)['"];/,
-        replacement: `const VERSION = '${version}';`,
-      },
-      {
-        path: 'components/bower.json',
-        regex: /"version":.*/,
-        replacement: `"version": "${version}",`,
-      },
-      {
-        path: 'components/package.json',
-        regex: /"version":.*/,
-        replacement: `"version": "${version}",`,
-      },
-      {
-        path: 'components/handlebars.js.nuspec',
-        regex: /<version>.*<\/version>/,
-        replacement: `<version>${version}</version>`,
-      },
-    ];
-
-    await Promise.all(
-      replaceSpec.map((replaceSpec) =>
-        replaceAndAdd(
-          replaceSpec.path,
-          replaceSpec.regex,
-          replaceSpec.replacement
-        )
-      )
+async function main() {
+  const version = process.argv[2];
+  if (!semver.valid(version)) {
+    throw new Error(
+      'Must provide a valid semver version as first argument (e.g.: node tasks/version.js 1.0.0):\n\t' +
+        version +
+        '\n\n'
     );
-    grunt.task.run(['default']);
-  });
-
-  async function replaceAndAdd(path, regex, value) {
-    let content = grunt.file.read(path);
-    content = content.replace(regex, value);
-    grunt.file.write(path, content);
-    await git.add(path);
   }
-};
+
+  const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8'));
+  pkg.version = version;
+  fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2) + '\n');
+  await git.add('package.json');
+
+  const replaceSpec = [
+    {
+      path: 'lib/handlebars/base.js',
+      regex: /const VERSION = ['"](.*)['"];/,
+      replacement: `const VERSION = '${version}';`,
+    },
+    {
+      path: 'components/bower.json',
+      regex: /"version":.*/,
+      replacement: `"version": "${version}",`,
+    },
+    {
+      path: 'components/package.json',
+      regex: /"version":.*/,
+      replacement: `"version": "${version}",`,
+    },
+    {
+      path: 'components/handlebars.js.nuspec',
+      regex: /<version>.*<\/version>/,
+      replacement: `<version>${version}</version>`,
+    },
+  ];
+
+  await Promise.all(
+    replaceSpec.map((spec) =>
+      replaceAndAdd(spec.path, spec.regex, spec.replacement)
+    )
+  );
+
+  execSync('npm run build', { stdio: 'inherit' });
+}
+
+async function replaceAndAdd(filePath, regex, value) {
+  let content = fs.readFileSync(filePath, 'utf8');
+  content = content.replace(regex, value);
+  fs.writeFileSync(filePath, content);
+  await git.add(filePath);
+}
+
+module.exports = { replaceAndAdd };
+
+if (require.main === module) {
+  main().catch((err) => {
+    // eslint-disable-next-line no-console
+    console.error(err);
+    process.exit(1);
+  });
+}

tests/bench/.eslintrc.js

@@ -1,6 +0,0 @@
-module.exports = {
-  rules: {
-    'no-console': 'off',
-    'no-var': 'off',
-  },
-};

tests/bench/compare.mjs

@@ -0,0 +1,250 @@
+import {
+  mkdirSync,
+  readFileSync,
+  readdirSync,
+  writeFileSync,
+  statSync,
+} from 'node:fs';
+import { basename, dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+import { formatOps } from './report.mjs';
+
+// ─── Resolve files ───────────────────────────────────────────────────────────
+
+const args = process.argv.slice(2);
+let baselinePath, currentPath;
+
+if (args.length >= 2) {
+  [baselinePath, currentPath] = args;
+} else {
+  const resultsDir = join(__dirname, 'results');
+  let files;
+  try {
+    files = readdirSync(resultsDir)
+      .filter((f) => f.endsWith('.md') && f.startsWith('bench-'))
+      .map((f) => join(resultsDir, f));
+  } catch {
+    files = [];
+  }
+
+  if (files.length < 2) {
+    console.error(
+      files.length === 0
+        ? 'No benchmark results found in bench/results/.'
+        : 'Only one benchmark result found. Run benchmarks on another branch first.'
+    );
+    console.error('');
+    console.error('Usage: node bench/compare.mjs [<baseline.md> <current.md>]');
+    console.error('');
+    console.error(
+      'With no arguments, auto-selects the two most recent results.'
+    );
+    console.error('A result labelled "main" is always used as the baseline.');
+    process.exit(1);
+  }
+
+  // Find the "main" labelled file if any
+  const mainFile = files.find((f) => {
+    const content = readFileSync(f, 'utf8');
+    const match = content.match(/^- \*\*Label:\*\* (.+)$/m);
+    return match && match[1] === 'main';
+  });
+
+  if (mainFile) {
+    // Baseline is main, current is the most recent non-main file
+    baselinePath = mainFile;
+    const others = files
+      .filter((f) => f !== mainFile)
+      .sort((a, b) => statSync(b).mtimeMs - statSync(a).mtimeMs);
+    currentPath = others[0];
+  } else {
+    // Sort by mtime, older = baseline, newer = current
+    files.sort((a, b) => statSync(a).mtimeMs - statSync(b).mtimeMs);
+    baselinePath = files[files.length - 2];
+    currentPath = files[files.length - 1];
+  }
+
+  console.log(`Auto-selected files:`);
+  console.log(`  baseline: ${basename(baselinePath)}`);
+  console.log(`  current:  ${basename(currentPath)}`);
+  console.log();
+}
+
+// ─── Parse ───────────────────────────────────────────────────────────────────
+
+function parseOps(str) {
+  str = str.trim();
+  if (str.endsWith('M')) return parseFloat(str) * 1_000_000;
+  if (str.endsWith('K')) return parseFloat(str) * 1_000;
+  return parseFloat(str);
+}
+
+function parseNs(str) {
+  str = str.trim();
+  if (str.endsWith('ms')) return parseFloat(str) * 1_000_000;
+  if (str.endsWith('µs')) return parseFloat(str) * 1_000;
+  if (str.endsWith('ns')) return parseFloat(str);
+  return parseFloat(str);
+}
+
+function parseReport(filepath) {
+  const content = readFileSync(filepath, 'utf8');
+  const lines = content.split('\n');
+
+  let label = null;
+  const labelMatch = content.match(/^- \*\*Label:\*\* (.+)$/m);
+  if (labelMatch) label = labelMatch[1];
+
+  const sections = {};
+  let currentSection = null;
+
+  for (const line of lines) {
+    if (line.startsWith('## ')) {
+      currentSection = line.slice(3).trim();
+      sections[currentSection] = {};
+      continue;
+    }
+
+    if (
+      !currentSection ||
+      !line.startsWith('|') ||
+      line.startsWith('|---') ||
+      line.startsWith('| Benchmark')
+    ) {
+      continue;
+    }
+
+    const cells = line
+      .split('|')
+      .map((c) => c.trim())
+      .filter(Boolean);
+    if (cells.length < 8) continue;
+
+    const [name, opsSec, avg, p50, p75, p99, rme, samples] = cells;
+    sections[currentSection][name] = {
+      opsSec: parseOps(opsSec),
+      avg: parseNs(avg),
+      p50: parseNs(p50),
+      p75: parseNs(p75),
+      p99: parseNs(p99),
+      rme: parseFloat(rme),
+      samples: parseInt(samples, 10),
+    };
+  }
+
+  return { label, sections };
+}
+
+// ─── Compare ─────────────────────────────────────────────────────────────────
+
+function pctChange(baseline, current) {
+  if (baseline === 0) return 0;
+  return ((current - baseline) / baseline) * 100;
+}
+
+function formatPct(pct) {
+  const sign = pct > 0 ? '+' : '';
+  return `${sign}${pct.toFixed(1)}%`;
+}
+
+function indicator(pct, higherIsBetter) {
+  const effective = higherIsBetter ? pct : -pct;
+  if (effective > 5) return ' !!';
+  if (effective > 2) return ' !';
+  if (effective < -5) return ' !!';
+  if (effective < -2) return ' !';
+  return '';
+}
+
+// ─── Output ──────────────────────────────────────────────────────────────────
+
+const baseline = parseReport(baselinePath);
+const current = parseReport(currentPath);
+
+const baseLabel = baseline.label || 'baseline';
+const curLabel = current.label || 'current';
+
+console.log(`Benchmark Comparison: ${baseLabel} vs ${curLabel}`);
+console.log('='.repeat(50));
+console.log(`Baseline: ${baselinePath}`);
+console.log(`Current:  ${currentPath}`);
+console.log();
+console.log('Legend: ! = >2% change, !! = >5% change');
+console.log();
+
+const mdLines = [];
+mdLines.push(`# Benchmark Comparison: ${baseLabel} vs ${curLabel}`);
+mdLines.push('');
+mdLines.push(`- **Baseline:** ${baseLabel} (${baselinePath})`);
+mdLines.push(`- **Current:** ${curLabel} (${currentPath})`);
+mdLines.push(`- **Legend:** ! = >2% change, !! = >5% change`);
+mdLines.push('');
+
+const allSections = [
+  ...new Set([
+    ...Object.keys(baseline.sections),
+    ...Object.keys(current.sections),
+  ]),
+].sort();
+
+for (const section of allSections) {
+  const baseBenches = baseline.sections[section] || {};
+  const curBenches = current.sections[section] || {};
+  const allNames = [
+    ...new Set([...Object.keys(baseBenches), ...Object.keys(curBenches)]),
+  ].sort();
+
+  if (allNames.size === 0) continue;
+
+  console.log(`## ${section}`);
+  console.log();
+
+  const header = `| Benchmark | ${baseLabel} ops/sec | ${curLabel} ops/sec | ops/sec | p75 latency |`;
+  const sep = '|---|---|---|---|---|';
+
+  console.log(header);
+  console.log(sep);
+
+  mdLines.push(`## ${section}`);
+  mdLines.push('');
+  mdLines.push(header);
+  mdLines.push(sep);
+
+  for (const name of allNames) {
+    const b = baseBenches[name];
+    const c = curBenches[name];
+
+    if (!b || !c) {
+      const row = `| ${name} | ${b ? formatOps(b.opsSec) : 'n/a'} | ${c ? formatOps(c.opsSec) : 'n/a'} | - | - |`;
+      console.log(row);
+      mdLines.push(row);
+      continue;
+    }
+
+    const opsPct = pctChange(b.opsSec, c.opsSec);
+    const p75Pct = pctChange(b.p75, c.p75);
+
+    const opsStr = `${formatPct(opsPct)}${indicator(opsPct, true)}`;
+    const p75Str = `${formatPct(p75Pct)}${indicator(p75Pct, false)}`;
+
+    const row = `| ${name} | ${formatOps(b.opsSec)} | ${formatOps(c.opsSec)} | ${opsStr} | ${p75Str} |`;
+    console.log(row);
+    mdLines.push(row);
+  }
+
+  console.log();
+  mdLines.push('');
+}
+
+const resultsDir = join(__dirname, 'results');
+mkdirSync(resultsDir, { recursive: true });
+const curLabelSlug = curLabel.replace(/[^a-zA-Z0-9-_]/g, '_');
+const baseLabelSlug = baseLabel.replace(/[^a-zA-Z0-9-_]/g, '_');
+const outPath = join(
+  resultsDir,
+  `compare-${baseLabelSlug}-vs-${curLabelSlug}.md`
+);
+writeFileSync(outPath, mdLines.join('\n'));
+console.log(`Comparison saved to: ${outPath}`);

tests/bench/dist-size.js

@@ -1,43 +0,0 @@
-var async = require('neo-async'),
-  fs = require('fs'),
-  zlib = require('zlib');
-
-module.exports = function (grunt, callback) {
-  var distFiles = fs.readdirSync('dist'),
-    distSizes = {};
-
-  async.each(
-    distFiles,
-    function (file, callback) {
-      var content;
-      try {
-        content = fs.readFileSync('dist/' + file);
-      } catch (err) {
-        if (err.code === 'EISDIR') {
-          callback();
-          return;
-        } else {
-          throw err;
-        }
-      }
-
-      file = file.replace(/\.js/, '').replace(/\./g, '_');
-      distSizes[file] = content.length;
-
-      zlib.gzip(content, function (err, data) {
-        if (err) {
-          throw err;
-        }
-
-        distSizes[file + '_gz'] = data.length;
-        callback();
-      });
-    },
-    function () {
-      grunt.log.writeln(
-        'Distribution sizes: ' + JSON.stringify(distSizes, undefined, 2)
-      );
-      callback([distSizes]);
-    }
-  );
-};

tests/bench/index.js

@@ -1,14 +0,0 @@
-var fs = require('fs');
-
-var metrics = fs.readdirSync(__dirname);
-metrics.forEach(function (metric) {
-  if (metric === 'index.js' || !/(.*)\.js$/.test(metric)) {
-    return;
-  }
-
-  var name = RegExp.$1;
-  metric = require('./' + name);
-  if (metric instanceof Function) {
-    module.exports[name] = metric;
-  }
-});

tests/bench/perf.mjs

@@ -0,0 +1,288 @@
+import { execSync } from 'node:child_process';
+import { Bench } from 'tinybench';
+import Handlebars from '../../lib/index.js';
+import { templates as allTemplates } from './templates.mjs';
+import {
+  printResults,
+  printSectionHeader,
+  saveMarkdownReport,
+} from './report.mjs';
+
+// ─── Configuration ───────────────────────────────────────────────────────────
+// Compilation happens once at app startup — low warmup reflects real-world conditions.
+// Execution happens thousands of times — higher warmup lets V8 optimize hot paths.
+
+const COMPILE_BENCH_CONFIG = {
+  warmupIterations: 10,
+  iterations: 1000,
+  time: 3000,
+};
+
+const EXEC_BENCH_CONFIG = {
+  warmupIterations: 500,
+  iterations: 5000,
+  time: 3000,
+};
+
+// ─── CLI Args ────────────────────────────────────────────────────────────────
+
+function getGitBranch() {
+  try {
+    return execSync('git rev-parse --abbrev-ref HEAD', {
+      encoding: 'utf8',
+    }).trim();
+  } catch {
+    return null;
+  }
+}
+
+const args = process.argv.slice(2);
+const labelIdx = args.indexOf('--label');
+const label = labelIdx !== -1 ? args[labelIdx + 1] : getGitBranch();
+
+const grepIdx = args.indexOf('--grep');
+let grepPattern = null;
+if (grepIdx !== -1 && args[grepIdx + 1]) {
+  try {
+    grepPattern = new RegExp(args[grepIdx + 1], 'i');
+  } catch (e) {
+    console.error(`Invalid --grep pattern: ${e.message}`);
+    process.exit(1);
+  }
+}
+
+const sectionIdx = args.indexOf('--section');
+let sectionPattern = null;
+if (sectionIdx !== -1 && args[sectionIdx + 1]) {
+  try {
+    sectionPattern = new RegExp(args[sectionIdx + 1], 'i');
+  } catch (e) {
+    console.error(`Invalid --section pattern: ${e.message}`);
+    process.exit(1);
+  }
+}
+
+// ─── Filter templates ───────────────────────────────────────────────────────
+
+const templates = Object.fromEntries(
+  Object.entries(allTemplates).filter(
+    ([name]) => !grepPattern || grepPattern.test(name)
+  )
+);
+
+if (Object.keys(templates).length === 0) {
+  console.error(
+    `No templates match --grep ${grepPattern}. Available: ${Object.keys(allTemplates).join(', ')}`
+  );
+  process.exit(1);
+}
+
+if (grepPattern) {
+  console.log(
+    `Filtering templates: ${Object.keys(templates).length}/${Object.keys(allTemplates).length} match /${grepPattern.source}/i`
+  );
+  console.log();
+}
+
+// ─── Bench helpers ───────────────────────────────────────────────────────────
+
+function newBench(config) {
+  return new Bench(config);
+}
+
+function createEnv(def) {
+  const hb = Handlebars.create();
+  if (def.helpers) {
+    hb.registerHelper(def.helpers);
+  }
+  if (def.partials) {
+    for (const [name, tpl] of Object.entries(def.partials)) {
+      hb.registerPartial(name, tpl);
+    }
+  }
+  return hb;
+}
+
+function shouldRunSection(title) {
+  if (!sectionPattern) return true;
+  return sectionPattern.test(title);
+}
+
+async function runSection(title, config, setup) {
+  if (!shouldRunSection(title)) return null;
+
+  printSectionHeader(title);
+
+  const bench = newBench(config);
+  setup(bench);
+  await bench.run();
+  printResults(bench);
+  console.log();
+
+  return { title, bench };
+}
+
+// ─── Main ────────────────────────────────────────────────────────────────────
+
+async function run() {
+  const now = new Date();
+  const headerLabel = label ? ` [${label}]` : '';
+
+  console.log(`Handlebars Performance Benchmark${headerLabel}`);
+  console.log('================================');
+  console.log(
+    `tinybench | compile: warmup ${COMPILE_BENCH_CONFIG.warmupIterations}, min ${COMPILE_BENCH_CONFIG.iterations} | exec: warmup ${EXEC_BENCH_CONFIG.warmupIterations}, min ${EXEC_BENCH_CONFIG.iterations} | time: ${EXEC_BENCH_CONFIG.time}ms per bench`
+  );
+  console.log(`Node ${process.version} | ${process.platform} ${process.arch}`);
+  console.log();
+
+  const allSections = [];
+
+  if (sectionPattern) {
+    console.log(`Filtering sections: /${sectionPattern.source}/i`);
+    console.log();
+  }
+
+  // ─── COMPILATION ────────────────────────────────────────────────────────────
+
+  allSections.push(
+    await runSection(
+      'COMPILATION (Handlebars.compile + first render)',
+      COMPILE_BENCH_CONFIG,
+      (bench) => {
+        for (const [name, def] of Object.entries(templates)) {
+          const hb = createEnv(def);
+          // Handlebars.compile() uses lazy evaluation — actual compilation
+          // (parsing, codegen, new Function()) only happens on first invocation.
+          bench.add(`compile: ${name}`, () => {
+            hb.compile(def.template)({});
+          });
+        }
+      }
+    )
+  );
+
+  // ─── EXECUTION + output verification ────────────────────────────────────────
+
+  const expectedOutputs = {};
+
+  const execResult = await runSection(
+    'EXECUTION (template rendering)',
+    EXEC_BENCH_CONFIG,
+    (bench) => {
+      for (const [name, def] of Object.entries(templates)) {
+        const compiled = createEnv(def).compile(def.template);
+        expectedOutputs[name] = compiled(def.context);
+        bench.add(`exec: ${name}`, () => {
+          compiled(def.context);
+        });
+      }
+    }
+  );
+  allSections.push(execResult);
+
+  // Verify outputs haven't changed during benchmarking
+  if (execResult) {
+    let verifyFails = 0;
+    for (const [name, def] of Object.entries(templates)) {
+      const compiled = createEnv(def).compile(def.template);
+      const actual = compiled(def.context);
+      if (actual !== expectedOutputs[name]) {
+        console.warn(
+          `  WARNING: output mismatch for "${name}"\n    expected: ${JSON.stringify(expectedOutputs[name])}\n    actual:   ${JSON.stringify(actual)}`
+        );
+        verifyFails++;
+      }
+    }
+    if (verifyFails === 0) {
+      console.log('Output verification: all templates OK');
+    } else {
+      console.warn(`Output verification: ${verifyFails} mismatch(es)`);
+    }
+    console.log();
+  }
+
+  // ─── PRECOMPILATION ─────────────────────────────────────────────────────────
+
+  allSections.push(
+    await runSection(
+      'PRECOMPILATION (Handlebars.precompile)',
+      COMPILE_BENCH_CONFIG,
+      (bench) => {
+        for (const [name, def] of Object.entries(templates)) {
+          bench.add(`precompile: ${name}`, () => {
+            Handlebars.precompile(def.template);
+          });
+        }
+      }
+    )
+  );
+
+  // ─── END-TO-END ─────────────────────────────────────────────────────────────
+
+  allSections.push(
+    await runSection(
+      'END-TO-END (compile + render)',
+      COMPILE_BENCH_CONFIG,
+      (bench) => {
+        for (const [name, def] of Object.entries(templates)) {
+          const hb = createEnv(def);
+          bench.add(`e2e: ${name}`, () => {
+            const fn = hb.compile(def.template);
+            fn(def.context);
+          });
+        }
+      }
+    )
+  );
+
+  // ─── COMPILE OPTIONS ───────────────────────────────────────────────────────
+
+  allSections.push(
+    await runSection(
+      'COMPILE OPTIONS COMPARISON',
+      EXEC_BENCH_CONFIG,
+      (bench) => {
+        const src = allTemplates['complex (if/each/helpers)'].template;
+        const ctx = allTemplates['complex (if/each/helpers)'].context;
+
+        const defaultFn = Handlebars.compile(src);
+        bench.add('exec: default options', () => defaultFn(ctx));
+
+        const noEscapeFn = Handlebars.compile(src, { noEscape: true });
+        bench.add('exec: noEscape=true', () => noEscapeFn(ctx));
+
+        const strictFn = Handlebars.compile(src, {
+          strict: true,
+          assumeObjects: true,
+        });
+        bench.add('exec: strict + assumeObjects', () => strictFn(ctx));
+
+        const knownFn = Handlebars.compile(src, {
+          knownHelpers: { if: true, each: true },
+          knownHelpersOnly: false,
+        });
+        bench.add('exec: knownHelpers', () => knownFn(ctx));
+
+        const compatFn = Handlebars.compile(src, { compat: true });
+        bench.add('exec: compat=true', () => compatFn(ctx));
+
+        const noDataFn = Handlebars.compile(src, { data: false });
+        bench.add('exec: data=false', () => noDataFn(ctx));
+      }
+    )
+  );
+
+  const filepath = saveMarkdownReport(allSections.filter(Boolean), {
+    label,
+    compileConfig: COMPILE_BENCH_CONFIG,
+    execConfig: EXEC_BENCH_CONFIG,
+    date: now,
+  });
+  console.log(`Results saved to: ${filepath}`);
+}
+
+run().catch((err) => {
+  console.error(err);
+  process.exit(1);
+});

tests/bench/precompile-size.js

@@ -1,24 +0,0 @@
-var _ = require('underscore'),
-  templates = require('./templates');
-
-module.exports = function (grunt, callback) {
-  // Deferring to here in case we have a build for parser, etc as part of this grunt exec
-  var Handlebars = require('../../lib');
-
-  var templateSizes = {};
-  _.each(templates, function (info, template) {
-    var src = info.handlebars,
-      compiled = Handlebars.precompile(src, {}),
-      knownHelpers = Handlebars.precompile(src, {
-        knownHelpersOnly: true,
-        knownHelpers: info.helpers,
-      });
-
-    templateSizes[template] = compiled.length;
-    templateSizes['knownOnly_' + template] = knownHelpers.length;
-  });
-  grunt.log.writeln(
-    'Precompiled sizes: ' + JSON.stringify(templateSizes, undefined, 2)
-  );
-  callback([templateSizes]);
-};

tests/bench/report.mjs

@@ -0,0 +1,126 @@
+import { writeFileSync, mkdirSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+// ─── Formatting ──────────────────────────────────────────────────────────────
+
+export function formatNs(ns) {
+  if (ns < 1000) return `${ns.toFixed(0)}ns`;
+  if (ns < 1_000_000) return `${(ns / 1000).toFixed(2)}µs`;
+  return `${(ns / 1_000_000).toFixed(2)}ms`;
+}
+
+export function formatOps(ops) {
+  if (ops >= 1_000_000) return `${(ops / 1_000_000).toFixed(2)}M`;
+  if (ops >= 1000) return `${(ops / 1000).toFixed(2)}K`;
+  return ops.toFixed(0);
+}
+
+function taskToRow(task) {
+  const { latency, throughput } = task.result;
+  const toNs = (ms) => ms * 1_000_000;
+  return {
+    name: task.name,
+    opsSec: formatOps(throughput.mean),
+    avg: formatNs(toNs(latency.mean)),
+    p50: formatNs(toNs(latency.p50)),
+    p75: formatNs(toNs(latency.p75)),
+    p99: formatNs(toNs(latency.p99)),
+    rme: latency.rme.toFixed(2),
+    samples: latency.samplesCount,
+  };
+}
+
+function completedTasks(bench) {
+  return bench.tasks.filter((t) => t.result?.state === 'completed');
+}
+
+// ─── Console output ──────────────────────────────────────────────────────────
+
+export function printResults(bench) {
+  for (const task of bench.tasks) {
+    if (!task.result || task.result.state !== 'completed') {
+      console.error(
+        `  FAILED: ${task.name}`,
+        task.result?.error || 'no result'
+      );
+    }
+  }
+
+  const results = completedTasks(bench).map((task) => {
+    const row = taskToRow(task);
+    return {
+      Name: row.name,
+      'ops/sec': row.opsSec,
+      avg: row.avg,
+      p50: row.p50,
+      p75: row.p75,
+      p99: row.p99,
+      '±%': row.rme,
+      samples: row.samples,
+    };
+  });
+
+  console.table(results);
+}
+
+export function printSectionHeader(title) {
+  const padded = `  ${title}  `;
+  const width = Math.max(padded.length + 4, 59);
+  const inner = padded.padEnd(width - 2);
+  console.log(`┌${'─'.repeat(width - 2)}┐`);
+  console.log(`│${inner}│`);
+  console.log(`└${'─'.repeat(width - 2)}┘`);
+  console.log();
+}
+
+// ─── Markdown report ─────────────────────────────────────────────────────────
+
+export function saveMarkdownReport(
+  sections,
+  { label, compileConfig, execConfig, date }
+) {
+  const resultsDir = join(__dirname, 'results');
+  mkdirSync(resultsDir, { recursive: true });
+
+  const timestamp = date.toISOString().replace(/[:.]/g, '-').slice(0, 19);
+  const labelSlug = label ? `-${label.replace(/[^a-zA-Z0-9-_]/g, '_')}` : '';
+  const filename = `bench-${timestamp}${labelSlug}.md`;
+  const filepath = join(resultsDir, filename);
+
+  const lines = [];
+  const labelStr = label ? ` [${label}]` : '';
+  lines.push(`# Handlebars Benchmark Results${labelStr}`);
+  lines.push('');
+  lines.push(`- **Date:** ${date.toISOString()}`);
+  if (label) lines.push(`- **Label:** ${label}`);
+  lines.push(`- **Node:** ${process.version}`);
+  lines.push(`- **Platform:** ${process.platform} ${process.arch}`);
+  lines.push(
+    `- **Compile config:** warmup=${compileConfig.warmupIterations}, minIterations=${compileConfig.iterations}, time=${compileConfig.time}ms`
+  );
+  lines.push(
+    `- **Exec config:** warmup=${execConfig.warmupIterations}, minIterations=${execConfig.iterations}, time=${execConfig.time}ms`
+  );
+  lines.push('');
+
+  for (const { title, bench } of sections) {
+    lines.push(`## ${title}`);
+    lines.push('');
+    lines.push(
+      '| Benchmark | ops/sec | avg | p50 | p75 | p99 | ±% | samples |'
+    );
+    lines.push('|---|---|---|---|---|---|---|---|');
+    for (const row of completedTasks(bench).map(taskToRow)) {
+      lines.push(
+        `| ${row.name} | ${row.opsSec} | ${row.avg} | ${row.p50} | ${row.p75} | ${row.p99} | ${row.rme} | ${row.samples} |`
+      );
+    }
+    lines.push('');
+  }
+
+  writeFileSync(filepath, lines.join('\n'));
+  return filepath;
+}

tests/bench/size.mjs

@@ -0,0 +1,94 @@
+import { readFileSync, readdirSync, statSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+import { gzip } from 'node:zlib';
+import { promisify } from 'node:util';
+import Handlebars from '../../lib/index.js';
+import { templates } from './templates.mjs';
+
+const gzipAsync = promisify(gzip);
+
+// ─── Dist sizes ──────────────────────────────────────────────────────────────
+
+async function measureDistSizes() {
+  const distDir = join(__dirname, '..', 'dist');
+  let files;
+  try {
+    files = readdirSync(distDir).filter((f) => {
+      try {
+        return statSync(join(distDir, f)).isFile();
+      } catch {
+        return false;
+      }
+    });
+  } catch {
+    console.warn('dist/ directory not found — run `npm run build` first.');
+    return [];
+  }
+
+  const results = [];
+  for (const file of files) {
+    const content = readFileSync(join(distDir, file));
+    const gzipped = await gzipAsync(content);
+    results.push({
+      File: file,
+      'Raw (bytes)': content.length,
+      'Gzip (bytes)': gzipped.length,
+    });
+  }
+  return results;
+}
+
+// ─── Precompile sizes ────────────────────────────────────────────────────────
+
+function measurePrecompileSizes() {
+  const results = [];
+  for (const [name, def] of Object.entries(templates)) {
+    const compiled = Handlebars.precompile(def.template, {});
+
+    const helpers = {};
+    if (def.helpers) {
+      for (const k of Object.keys(def.helpers)) {
+        helpers[k] = true;
+      }
+    }
+    const knownOnly = Handlebars.precompile(def.template, {
+      knownHelpersOnly: true,
+      knownHelpers: helpers,
+    });
+
+    results.push({
+      Template: name,
+      'Default (chars)': compiled.length,
+      'knownHelpersOnly (chars)': knownOnly.length,
+      'Saved (chars)': compiled.length - knownOnly.length,
+    });
+  }
+  return results;
+}
+
+// ─── Main ────────────────────────────────────────────────────────────────────
+
+async function run() {
+  console.log('Handlebars Size Report');
+  console.log('=====================');
+  console.log();
+
+  const distSizes = await measureDistSizes();
+  if (distSizes.length > 0) {
+    console.log('## Distribution files');
+    console.table(distSizes);
+    console.log();
+  }
+
+  console.log('## Precompiled template sizes');
+  const precompileSizes = measurePrecompileSizes();
+  console.table(precompileSizes);
+}
+
+run().catch((err) => {
+  console.error(err);
+  process.exit(1);
+});

tests/bench/templates.mjs

@@ -0,0 +1,265 @@
+export const templates = {
+  // --- Small templates ---
+  'static string (no expressions)': {
+    template: 'Hello world',
+    context: {},
+  },
+  'simple variables': {
+    template: 'Hello {{name}}! You have {{count}} new messages.',
+    context: { name: 'Mick', count: 30 },
+  },
+  'dot paths': {
+    template:
+      '{{person.name.bar.baz}}{{person.age}}{{person.foo}}{{animal.age}}',
+    context: { person: { name: { bar: { baz: 'Larry' } }, age: 45 } },
+  },
+  'with helper': {
+    template: '{{#with person}}{{name}}{{age}}{{/with}}',
+    context: { person: { name: 'Larry', age: 45 } },
+  },
+
+  // --- Arguments & mustache-style ---
+  'arguments (positional + hash)': {
+    template:
+      '{{foo person "person" 1 true foo=bar foo="person" foo=1 foo=true}}',
+    context: { bar: true },
+    helpers: { foo: () => '' },
+  },
+  'depth-1 (../)': {
+    template: '{{#each names}}{{../foo}}{{/each}}',
+    context: {
+      names: [
+        { name: 'Moe' },
+        { name: 'Larry' },
+        { name: 'Curly' },
+        { name: 'Shemp' },
+      ],
+      foo: 'bar',
+    },
+  },
+  'mustache-style section (array)': {
+    template: '{{#names}}{{name}}{{/names}}',
+    context: {
+      names: [
+        { name: 'Moe' },
+        { name: 'Larry' },
+        { name: 'Curly' },
+        { name: 'Shemp' },
+      ],
+    },
+  },
+  'mustache-style section (object)': {
+    template: '{{#person}}{{name}}{{age}}{{/person}}',
+    context: { person: { name: 'Larry', age: 45 } },
+  },
+
+  // --- Medium templates ---
+  'each (small array, 4 items)': {
+    template: '{{#each names}}{{name}}{{/each}}',
+    context: {
+      names: [
+        { name: 'Moe' },
+        { name: 'Larry' },
+        { name: 'Curly' },
+        { name: 'Shemp' },
+      ],
+    },
+  },
+  'each with @index/@key': {
+    template: '{{#each names}}{{@index}}:{{name}} {{/each}}',
+    context: {
+      names: [
+        { name: 'Moe' },
+        { name: 'Larry' },
+        { name: 'Curly' },
+        { name: 'Shemp' },
+      ],
+    },
+  },
+  'if/else conditional': {
+    template:
+      '{{#if active}}<span class="active">{{name}}</span>{{else}}<span>{{name}}</span>{{/if}}',
+    context: { active: true, name: 'Widget' },
+  },
+  'partial (each + partial)': {
+    template: '{{#each peeps}}{{>variables}}{{/each}}',
+    context: {
+      peeps: [
+        { name: 'Moe', count: 15 },
+        { name: 'Larry', count: 5 },
+        { name: 'Curly', count: 1 },
+      ],
+    },
+    partials: {
+      variables: 'Hello {{name}}! You have {{count}} new messages.',
+    },
+  },
+  'nested depth (../../)': {
+    template:
+      '{{#each names}}{{#each name}}{{../bat}}{{../../foo}}{{/each}}{{/each}}',
+    context: {
+      names: [
+        { bat: 'foo', name: ['Moe'] },
+        { bat: 'foo', name: ['Larry'] },
+        { bat: 'foo', name: ['Curly'] },
+        { bat: 'foo', name: ['Shemp'] },
+      ],
+      foo: 'bar',
+    },
+  },
+  subexpressions: {
+    template: '{{echo (header)}}',
+    context: { echo: () => {}, header: () => {} },
+    helpers: {
+      echo: (value) => 'foo ' + value,
+      header: () => 'Colors',
+    },
+  },
+
+  // --- Complex template ---
+  'complex (if/each/helpers)': {
+    template: `<h1>{{header}}</h1>
+{{#if items}}
+  <ul>
+    {{#each items}}
+      {{#if current}}
+        <li><strong>{{name}}</strong></li>
+      {{^}}
+        <li><a href="{{url}}">{{name}}</a></li>
+      {{/if}}
+    {{/each}}
+  </ul>
+{{^}}
+  <p>The list is empty.</p>
+{{/if}}`,
+    context: {
+      header() {
+        return 'Colors';
+      },
+      hasItems: true,
+      items: [
+        { name: 'red', current: true, url: '#Red' },
+        { name: 'green', current: false, url: '#Green' },
+        { name: 'blue', current: false, url: '#Blue' },
+      ],
+    },
+  },
+  'recursive partials': {
+    template: '{{name}}{{#each kids}}{{>recursion}}{{/each}}',
+    context: {
+      name: '1',
+      kids: [{ name: '1.1', kids: [{ name: '1.1.1', kids: [] }] }],
+    },
+    partials: {
+      recursion: '{{name}}{{#each kids}}{{>recursion}}{{/each}}',
+    },
+  },
+
+  // --- Large/stress templates ---
+  'each (large array, 100 items)': {
+    template:
+      '{{#each items}}<div class="item"><h3>{{title}}</h3><p>{{description}}</p><span>{{price}}</span></div>{{/each}}',
+    context: {
+      items: Array.from({ length: 100 }, (_, i) => ({
+        title: `Item ${i}`,
+        description: `Description for item ${i} with some longer text to simulate real content`,
+        price: `$${(i * 9.99).toFixed(2)}`,
+      })),
+    },
+  },
+  'each (large array, 1000 items)': {
+    template: '{{#each items}}{{name}} {{/each}}',
+    context: {
+      items: Array.from({ length: 1000 }, (_, i) => ({ name: `item-${i}` })),
+    },
+  },
+  'deeply nested context (4 levels)': {
+    template: `{{#with level1}}
+  {{#with level2}}
+    {{#each items}}
+      {{#if active}}
+        {{../../title}}: {{name}} ({{../label}})
+      {{/if}}
+    {{/each}}
+  {{/with}}
+{{/with}}`,
+    context: {
+      level1: {
+        title: 'Root',
+        level2: {
+          label: 'Section',
+          items: Array.from({ length: 20 }, (_, i) => ({
+            name: `item-${i}`,
+            active: i % 2 === 0,
+          })),
+        },
+      },
+    },
+  },
+  'many partials (10 partials)': {
+    template: Array.from({ length: 10 }, (_, i) => `{{>partial${i}}}`).join(
+      '\n'
+    ),
+    context: { name: 'World', count: 42 },
+    partials: Object.fromEntries(
+      Array.from({ length: 10 }, (_, i) => [
+        `partial${i}`,
+        `<section><h2>Section {{name}} #${i}</h2><p>Count: {{count}}</p></section>`,
+      ])
+    ),
+  },
+  'page template (mixed features)': {
+    template: `<!DOCTYPE html>
+<html>
+<head><title>{{title}}</title></head>
+<body>
+  <header>{{>header}}</header>
+  <nav>
+    <ul>
+      {{#each nav}}
+        <li{{#if active}} class="active"{{/if}}><a href="{{url}}">{{label}}</a></li>
+      {{/each}}
+    </ul>
+  </nav>
+  <main>
+    {{#if showBanner}}<div class="banner">{{bannerText}}</div>{{/if}}
+    {{#each sections}}
+      <section>
+        <h2>{{title}}</h2>
+        {{#each items}}
+          <div class="card">
+            <h3>{{name}}</h3>
+            <p>{{description}}</p>
+            {{#if featured}}<span class="badge">Featured</span>{{/if}}
+          </div>
+        {{/each}}
+      </section>
+    {{/each}}
+  </main>
+  <footer>{{>footer}}</footer>
+</body>
+</html>`,
+    context: {
+      title: 'My Page',
+      showBanner: true,
+      bannerText: 'Welcome!',
+      nav: [
+        { label: 'Home', url: '/', active: true },
+        { label: 'About', url: '/about', active: false },
+        { label: 'Contact', url: '/contact', active: false },
+      ],
+      sections: Array.from({ length: 5 }, (_, si) => ({
+        title: `Section ${si + 1}`,
+        items: Array.from({ length: 8 }, (_, ii) => ({
+          name: `Card ${si * 8 + ii + 1}`,
+          description: `Description for card ${si * 8 + ii + 1}`,
+          featured: ii === 0,
+        })),
+      })),
+    },
+    partials: {
+      header: '<h1>{{title}}</h1>',
+      footer: '<p>&copy; 2026 {{title}}</p>',
+    },
+  },
+};

tests/bench/templates/arguments.js

@@ -1,13 +0,0 @@
-module.exports = {
-  helpers: {
-    foo: function () {
-      return '';
-    },
-  },
-  context: {
-    bar: true,
-  },
-
-  handlebars:
-    '{{foo person "person" 1 true foo=bar foo="person" foo=1 foo=true}}',
-};

tests/bench/templates/array-each.js

@@ -1,13 +0,0 @@
-module.exports = {
-  context: {
-    names: [
-      { name: 'Moe' },
-      { name: 'Larry' },
-      { name: 'Curly' },
-      { name: 'Shemp' },
-    ],
-  },
-  handlebars: '{{#each names}}{{name}}{{/each}}',
-  dust: '{#names}{name}{/names}',
-  mustache: '{{#names}}{{name}}{{/names}}',
-};

tests/bench/templates/array-mustache.js

@@ -1,11 +0,0 @@
-module.exports = {
-  context: {
-    names: [
-      { name: 'Moe' },
-      { name: 'Larry' },
-      { name: 'Curly' },
-      { name: 'Shemp' },
-    ],
-  },
-  handlebars: '{{#names}}{{name}}{{/names}}',
-};

tests/bench/templates/complex.dust

@@ -1,14 +0,0 @@
-<h1>{header}</h1>
-{?items}
-  <ul>
-    {#items}
-      {#current}
-        <li><strong>{name}</strong></li>
-      {:else}
-        <li><a href="{url}">{name}</a></li>
-      {/current}
-    {/items}
-  </ul>
-{:else}
-  <p>The list is empty.</p>
-{/items}

tests/bench/templates/complex.handlebars

@@ -1,14 +0,0 @@
-<h1>{{header}}</h1>
-{{#if items}}
-  <ul>
-    {{#each items}}
-      {{#if current}}
-        <li><strong>{{name}}</strong></li>
-      {{^}}
-        <li><a href="{{url}}">{{name}}</a></li>
-      {{/if}}
-    {{/each}}
-  </ul>
-{{^}}
-  <p>The list is empty.</p>
-{{/if}}

tests/bench/templates/complex.js

@@ -1,19 +0,0 @@
-var fs = require('fs');
-
-module.exports = {
-  context: {
-    header: function () {
-      return 'Colors';
-    },
-    hasItems: true, // To make things fairer in mustache land due to no `{{if}}` construct on arrays
-    items: [
-      { name: 'red', current: true, url: '#Red' },
-      { name: 'green', current: false, url: '#Green' },
-      { name: 'blue', current: false, url: '#Blue' },
-    ],
-  },
-
-  handlebars: fs.readFileSync(__dirname + '/complex.handlebars').toString(),
-  dust: fs.readFileSync(__dirname + '/complex.dust').toString(),
-  mustache: fs.readFileSync(__dirname + '/complex.mustache').toString(),
-};

tests/bench/templates/complex.mustache

@@ -1,13 +0,0 @@
-<h1>{{header}}</h1>
-{{#hasItems}}
-  <ul>
-    {{#items}}
-      {{#current}}
-        <li><strong>{{name}}</strong></li>
-      {{/current}}
-      {{^current}}
-        <li><a href="{{url}}">{{name}}</a></li>
-      {{/current}}
-    {{/items}}
-  </ul>
-{{/hasItems}}

tests/bench/templates/data.js

@@ -1,11 +0,0 @@
-module.exports = {
-  context: {
-    names: [
-      { name: 'Moe' },
-      { name: 'Larry' },
-      { name: 'Curly' },
-      { name: 'Shemp' },
-    ],
-  },
-  handlebars: '{{#each names}}{{@index}}{{name}}{{/each}}',
-};