v3.0.8

- hopefully fixing hanging saucelabs build

.eslintignore

@@ -1,2 +0,0 @@
-dist
-node_modules

.eslintrc

@@ -0,0 +1,199 @@
+{
+  "globals": {
+    "self": false
+  },
+  "env": {
+    "node": true
+  },
+  "ecmaFeatures": {
+    // Enabling features that can be implemented without polyfills. Want to avoid polyfills at this time.
+    "arrowFunctions": true,
+    "blockBindings": true,
+    "defaultParams": true,
+    "destructuring": true,
+    "modules": true,
+    "objectLiteralComputedProperties": true,
+    "objectLiteralDuplicateProperties": true,
+    "objectLiteralShorthandMethods": true,
+    "objectLiteralShorthandProperties": true,
+    "spread": true,
+    "templateStrings": true
+  },
+  "rules": {
+    // Possible Errors //
+    //-----------------//
+
+    "comma-dangle": [2, "never"],
+    "no-cond-assign": [2, "except-parens"],
+
+    // Allow for debugging
+    "no-console": 1,
+
+    "no-constant-condition": 2,
+    "no-control-regex": 2,
+
+    // Allow for debugging
+    "no-debugger": 1,
+
+    "no-dupe-args": 2,
+    "no-dupe-keys": 2,
+    "no-duplicate-case": 2,
+    "no-empty": 2,
+    "no-empty-class": 2,
+    "no-ex-assign": 2,
+    "no-extra-boolean-cast": 2,
+    "no-extra-parens": 0,
+    "no-extra-semi": 2,
+    "no-func-assign": 2,
+
+    // Stylistic... might consider disallowing in the future
+    "no-inner-declarations": 0,
+
+    "no-invalid-regexp": 2,
+    "no-irregular-whitespace": 2,
+    "no-negated-in-lhs": 2,
+    "no-obj-calls": 2,
+    "no-regex-spaces": 2,
+    "no-reserved-keys": 2,    // Important for IE
+    "no-sparse-arrays": 0,
+
+    // Optimizer and coverage will handle/highlight this and can be useful for debugging
+    "no-unreachable": 1,
+
+    "use-isnan": 2,
+    "valid-jsdoc": 0,
+    "valid-typeof": 2,
+
+
+    // Best Practices //
+    //----------------//
+    "block-scoped-var": 0,
+    "complexity": 0,
+    "consistent-return": 0,
+    "curly": 2,
+    "default-case": 1,
+    "dot-notation": [2, {"allowKeywords": false}],
+    "eqeqeq": 0,
+    "guard-for-in": 1,
+    "no-alert": 2,
+    "no-caller": 2,
+    "no-div-regex": 1,
+    "no-else-return": 0,
+    "no-empty-label": 2,
+    "no-eq-null": 0,
+    "no-eval": 2,
+    "no-extend-native": 2,
+    "no-extra-bind": 2,
+    "no-fallthrough": 2,
+    "no-floating-decimal": 2,
+    "no-implied-eval": 2,
+    "no-iterator": 2,
+    "no-labels": 2,
+    "no-lone-blocks": 2,
+    "no-loop-func": 2,
+    "no-multi-spaces": 2,
+    "no-multi-str": 1,
+    "no-native-reassign": 2,
+    "no-new": 2,
+    "no-new-func": 2,
+    "no-new-wrappers": 2,
+    "no-octal": 2,
+    "no-octal-escape": 2,
+    "no-param-reassign": 0,
+    "no-process-env": 2,
+    "no-proto": 2,
+    "no-redeclare": 2,
+    "no-return-assign": 2,
+    "no-script-url": 2,
+    "no-self-compare": 2,
+    "no-sequences": 2,
+    "no-throw-literal": 2,
+    "no-unused-expressions": 2,
+    "no-void": 0,
+    "no-warning-comments": 1,
+    "no-with": 2,
+    "radix": 2,
+    "vars-on-top": 0,
+    "wrap-iife": 2,
+    "yoda": 0,
+
+
+    // Strict //
+    //--------//
+    "strict": 0,
+
+
+    // Variables //
+    //-----------//
+    "no-catch-shadow": 2,
+    "no-delete-var": 2,
+    "no-label-var": 2,
+    "no-shadow": 2,
+    "no-shadow-restricted-names": 2,
+    "no-undef": 2,
+    "no-undef-init": 2,
+    "no-undefined": 0,
+    "no-unused-vars": [2, {"vars": "all", "args": "after-used"}],    
+    "no-use-before-define": [2, "nofunc"],
+
+
+    // Node.js //
+    //---------//
+    // Others left to environment defaults
+    "no-mixed-requires": 0,
+
+
+    // Stylistic //
+    //-----------//
+    "indent": 0,
+    "brace-style": [2, "1tbs", {"allowSingleLine": true}],
+    "camelcase": 2,
+    "comma-spacing": [2, {"before": false, "after": true}],
+    "comma-style": [2, "last"],
+    "consistent-this": [1, "self"],
+    "eol-last": 2,
+    "func-names": 0,
+    "func-style": [2, "declaration"],
+    "key-spacing": [2, {
+        "beforeColon": false,
+        "afterColon": true
+    }],
+    "max-nested-callbacks": 0,
+    "new-cap": 2,
+    "new-parens": 2,
+    "newline-after-var": 0,
+    "no-array-constructor": 2,
+    "no-continue": 0,
+    "no-inline-comments": 0,
+    "no-lonely-if": 2,
+    "no-mixed-spaces-and-tabs": 2,
+    "no-multiple-empty-lines": 0,
+    "no-nested-ternary": 1,
+    "no-new-object": 2,
+    "no-spaced-func": 2,
+    "no-ternary": 0,
+    "no-trailing-spaces": 2,
+    "no-underscore-dangle": 0,
+    "no-wrap-func": 2,
+    "one-var": 0,
+    "operator-assignment": 0,
+    "padded-blocks": 0,
+    "quote-props": 0,
+    "quotes": [2, "single", "avoid-escape"],
+    "semi": 2,
+    "semi-spacing": [2, {"before": false, "after": true}],
+    "sort-vars": 0,
+    "space-after-keywords": [2, "always"],
+    "space-before-blocks": [2, "always"],
+    "space-before-function-paren": [2, {"anonymous": "never", "named": "never"}],
+    "space-in-brackets": 0,
+    "space-in-parens": [2, "never"],
+    "space-infix-ops": 2,
+    "space-return-throw-case": 2,
+    "space-unary-ops": 2,
+    "spaced-line-comment": 2,
+    "wrap-regex": 1,
+
+    "no-var": 1
+  }
+}

.eslintrc.js

@@ -1,119 +0,0 @@
-module.exports = {
-  "extends": ["eslint:recommended","plugin:compat/recommended"],
-  "globals": {
-    "self": false,
-    "SOURCE_MAPS": true
-  },
-  "env": {
-    "node": true,
-    "es6": true
-  },
-  "rules": {
-    // overrides eslint:recommended defaults
-    "no-sparse-arrays": "off",
-    "no-func-assign": "off",
-    "no-console": "warn",
-    "no-debugger": "warn",
-    "no-unreachable": "warn",
-
-    // Possible Errors //
-    //-----------------//
-    "no-unsafe-negation": "error",
-
-
-    // Best Practices //
-    //----------------//
-    "curly": "error",
-    "default-case": "warn",
-    "dot-notation": ["error", { "allowKeywords": false }],
-    "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-spaces": "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",
-    "wrap-iife": "error",
-    "no-prototype-builtins": "error",
-
-
-    // Variables //
-    //-----------//
-    "no-catch-shadow": "error",
-    "no-label-var": "error",
-    "no-shadow-restricted-names": "error",
-    "no-undef-init": "error",
-    "no-use-before-define": ["error", "nofunc"],
-
-
-    // Stylistic Issues //
-    //------------------//
-    "comma-dangle": ["error", "never"],
-    "quote-props": ["error", "as-needed", { "keywords": true, "unnecessary": false }],
-    "brace-style": ["error", "1tbs", { "allowSingleLine": true }],
-    "camelcase": "error",
-    "comma-spacing": ["error", { "before": false, "after": true }],
-    "comma-style": ["error", "last"],
-    "consistent-this": ["warn", "self"],
-    "eol-last": "error",
-    "func-style": ["error", "declaration"],
-    "key-spacing": ["error", {
-      "beforeColon": false,
-      "afterColon": true
-    }],
-    "new-cap": "error",
-    "new-parens": "error",
-    "no-array-constructor": "error",
-    "no-lonely-if": "error",
-    "no-mixed-spaces-and-tabs": "error",
-    "no-nested-ternary": "warn",
-    "no-new-object": "error",
-    "no-spaced-func": "error",
-    "no-trailing-spaces": "error",
-    "no-extra-parens": ["error", "functions"],
-    "quotes": ["error", "single", "avoid-escape"],
-    "semi": "error",
-    "semi-spacing": ["error", { "before": false, "after": true }],
-    "keyword-spacing": "error",
-    "space-before-blocks": ["error", "always"],
-    "space-before-function-paren": ["error", { "anonymous": "never", "named": "never" }],
-    "space-in-parens": ["error", "never"],
-    "space-infix-ops": "error",
-    "space-unary-ops": "error",
-    "spaced-comment": ["error", "always", { "markers": [","] }],
-    "wrap-regex": "warn",
-
-    // ECMAScript 6 //
-    //--------------//
-    "no-var": "warn"
-  },
-  "parserOptions": {
-    "sourceType": "module",
-    "ecmaVersion": 6,
-    "ecmaFeatures": {}
-  }
-};

.gitattributes

@@ -1,6 +0,0 @@
-# Handlebars-template fixtures in test cases need deterministic eol
-*.handlebars text eol=lf
-*.hbs text eol=lf
-
-# Lexer files as well
-*.l text eol=lf

.gitignore

@@ -10,6 +10,4 @@ node_modules
 *.sublime-workspace
 npm-debug.log
 sauce_connect.log*
-.idea
-yarn-error.log
-/handlebars-release.tgz
+/.idea/

.istanbul.yml

@@ -1,2 +1,2 @@
 instrumentation:
-    excludes: ['**/spec/**', '**/handlebars/compiler/parser.js']
+    excludes: ['**/spec/**']

.npmignore

@@ -0,0 +1,25 @@
+.DS_Store
+.gitignore
+.rvmrc
+.eslintrc
+.travis.yml
+.rspec
+Gemfile
+Gemfile.lock
+Rakefile
+Gruntfile.js
+*.gemspec
+*.nuspec
+*.log
+bench/*
+configurations/*
+components/*
+coverage/*
+dist/cdnjs/*
+dist/components/*
+spec/*
+src/*
+tasks/*
+tmp/*
+publish/*
+vendor/*

.travis.yml

@@ -18,9 +18,8 @@ matrix:
     - PUBLISH=true
     - secure: pLTzghtVll9yGKJI0AaB0uI8GypfWxLTaIB0ZL8//yN3nAEIKMhf/RRilYTsn/rKj2NUa7vt2edYILi3lttOUlCBOwTc9amiRms1W8Lwr/3IdWPeBLvLuH1zNJRm2lBAwU4LBSqaOwhGaxOQr6KHTnWudhNhgOucxpZfvfI/dFw=
     - secure: yERYCf7AwL11D9uMtacly/THGV8BlzsMmrt+iQVvGA3GaY6QMmfYqf6P6cCH98sH5etd1Y+1e6YrPeMjqI6lyRllT7FptoyOdHulazQe86VQN4sc0EpqMlH088kB7gGjTut9Z+X9ViooT5XEh9WA5jXEI9pXhQJNoIHkWPuwGuY=
+  - node_js: '8'
+  - node_js: '6'
 cache:
   directories:
   - node_modules
-
-git:
-  depth: 100

CONTRIBUTING.md

@@ -15,6 +15,8 @@ Documentation issues on the handlebarsjs.com site should be reported on [handleb
 * 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 previous release. Relevant bugfixes may be cherry-picked into this
+  branch from the `4.x` branch. There should be no merges anymore between this branch and `4.x` or `master`.
 
 ## Pull Requests
 
@@ -48,7 +50,7 @@ The `grunt dev` implements watching for tests and allows for in browser testing
 If you notice any problems, please report them to the GitHub issue tracker at
 [http://github.com/wycats/handlebars.js/issues](http://github.com/wycats/handlebars.js/issues).
 
-##Running Tests
+## Running Tests
 
 To run tests locally, first install all dependencies.
 ```sh
@@ -81,16 +83,21 @@ npm link handlebars
 npm test
 ```
 
-## Releasing the latest version
-
-*When releasing a previous version of Handlebars, please look into the CONTRIBUNG.md in the corresponding branch.*
+## Releasing
 
 Handlebars utilizes the [release yeoman generator][generator-release] to perform most release tasks.
 
+Before starting the release, make sure that the `yo`, `generator-release` and `grunt` are installed globally.
+The last release was successfully performed with `yo@2.0.5`, `generator-release@2.6.1` and `grunt@1.0.3` and `node@10.11.0`.
+If the latest versions of the tools don't work you may want to revert to those versions.
+
+```bash
+npm install -g yo generator-release grunt
+```
+
 A full release may be completed with the following:
 
 ```
-npm ci
 yo release
 npm publish
 yo release:publish components handlebars.js dist/components/
@@ -100,17 +107,9 @@ 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
-in those places still point to the latest version
-
-* [The npm-package](https://www.npmjs.com/package/handlebars) (check latest-tag)
-* [The bower package](https://github.com/components/handlebars.js) (check the package.json)
-* [The AWS S3 Bucket](https://s3.amazonaws.com/builds.handlebarsjs.com) (check latest-tag)
-* [RubyGems](https://rubygems.org/gems/handlebars-source)
-
-When everything is OK, the handlebars site needs to be updated to point to the new version numbers. The jsfiddle link should be updated to point to the most recent distribution for all instances in our documentation.
+After this point the handlebars site needs to be updated to point to the new version numbers. The jsfiddle link should be updated to point to the most recent distribution for all instances in our documentation.
 
 [generator-release]: https://github.com/walmartlabs/generator-release
 [pull-request]: https://github.com/wycats/handlebars.js/pull/new/master
 [issue]: https://github.com/wycats/handlebars.js/issues/new
-[jsfiddle]: https://jsfiddle.net/9D88g/180/
+[jsfiddle]: http://jsfiddle.net/9D88g/26/

Gruntfile.js

@@ -1,29 +1,26 @@
-/* eslint-disable no-process-env */
+/*eslint-disable no-process-env */
 module.exports = function(grunt) {
 
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
 
     eslint: {
+      options: {
+      },
       files: [
         '*.js',
-        'bench/**/*.js',
-        'tasks/**/*.js',
         'lib/**/!(*.min|parser).js',
-        'spec/**/!(*.amd|json2|require).js',
-        'integration-testing/multi-nodejs-test/*.js',
-        'integration-testing/webpack-test/*.js',
-        'integration-testing/webpack-test/src/*.js'
+        'spec/**/!(*.amd|json2|require).js'
       ]
     },
 
-    clean: ['tmp', 'dist', 'lib/handlebars/compiler/parser.js', 'integration-testing/**/node_modules'],
+    clean: ['tmp', 'dist', 'lib/handlebars/compiler/parser.js'],
 
     copy: {
       dist: {
         options: {
           processContent: function(content) {
-            return grunt.template.process('/**!\n\n @license\n <%= pkg.name %> v<%= pkg.version %>\n\n<%= grunt.file.read("LICENSE") %>\n*/\n')
+            return grunt.template.process('/*!\n\n <%= pkg.name %> v<%= pkg.version %>\n\n<%= grunt.file.read("LICENSE") %>\n@license\n*/\n')
                 + content;
           }
         },
@@ -43,17 +40,14 @@ module.exports = function(grunt) {
         ]
       }
     },
-    webpack: {
-      build: require('./webpack.config')
-    },
+
     babel: {
       options: {
-        sourceMaps: 'inline',
-        auxiliaryCommentBefore: 'istanbul ignore next'
+        loose: ['es6.modules']
       },
       amd: {
         options: {
-          plugins: ['@babel/plugin-transform-modules-amd']
+          modules: 'amd'
         },
         files: [{
           expand: true,
@@ -65,11 +59,7 @@ module.exports = function(grunt) {
 
       cjs: {
         options: {
-          plugins: [
-            '@babel/plugin-transform-modules-commonjs',
-            // support "import * as Handlebars" for backward-compatibility
-            'babel-plugin-add-module-exports'
-          ]
+          modules: 'common'
         },
         files: [{
           cwd: 'lib/',
@@ -79,6 +69,72 @@ module.exports = function(grunt) {
         }]
       }
     },
+    webpack: {
+      options: {
+        context: __dirname,
+        module: {
+          loaders: [
+            // the optional 'runtime' transformer tells babel to require the runtime instead of inlining it.
+            { test: /\.jsx?$/, exclude: /node_modules/, loader: 'babel-loader?optional=runtime&loose=es6.modules' }
+          ]
+        },
+        output: {
+          path: 'dist/',
+          library: 'Handlebars',
+          libraryTarget: 'umd'
+        }
+      },
+      handlebars: {
+        entry: './lib/handlebars.js',
+        output: {
+          filename: 'handlebars.js'
+        }
+      },
+      runtime: {
+        entry: './lib/handlebars.runtime.js',
+        output: {
+          filename: 'handlebars.runtime.js'
+        }
+      }
+    },
+
+    requirejs: {
+      options: {
+        optimize: 'none',
+        baseUrl: 'dist/amd/'
+      },
+      dist: {
+        options: {
+          name: 'handlebars',
+          out: 'dist/handlebars.amd.js'
+        }
+      },
+      runtime: {
+        options: {
+          name: 'handlebars.runtime',
+          out: 'dist/handlebars.runtime.amd.js'
+        }
+      }
+    },
+
+    uglify: {
+      options: {
+        mangle: true,
+        compress: true,
+        preserveComments: 'some'
+      },
+      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: {
@@ -102,14 +158,15 @@ module.exports = function(grunt) {
           build: process.env.TRAVIS_JOB_ID,
           urls: ['http://localhost:9999/spec/?headless=true', 'http://localhost:9999/spec/amd.html?headless=true'],
           detailedError: true,
-          concurrency: 4,
+          concurrency: 2,
           browsers: [
             {browserName: 'chrome'},
             {browserName: 'firefox', platform: 'Linux'},
-            // {browserName: 'safari', version: 9, platform: 'OS X 10.11'},
-            // {browserName: 'safari', version: 8, platform: 'OS X 10.10'},
+            {browserName: 'safari', version: 9, platform: 'OS X 10.11'},
+            {browserName: 'safari', version: 8, platform: 'OS X 10.10'},
             {browserName: 'internet explorer', version: 11, platform: 'Windows 8.1'},
-            {browserName: 'internet explorer', version: 10, platform: 'Windows 8'}
+            {browserName: 'internet explorer', version: 10, platform: 'Windows 8'},
+            {browserName: 'internet explorer', version: 9, platform: 'Windows 7'}
           ]
         }
       },
@@ -126,20 +183,6 @@ module.exports = function(grunt) {
       }
     },
 
-    bgShell: {
-      checkTypes: {
-        cmd: 'npm run checkTypes',
-        bg: false,
-        fail: true
-      },
-      integrationTests: {
-        cmd: './integration-testing/run-integration-tests.sh',
-        bg: false,
-        fail: true
-      }
-
-    },
-
     watch: {
       scripts: {
         options: {
@@ -155,38 +198,39 @@ module.exports = function(grunt) {
   // Build a new version of the library
   this.registerTask('build', 'Builds a distributable version of the current project', [
                     'eslint',
-                    'bgShell:checkTypes',
                     'parser',
                     'node',
                     'globals']);
 
-  this.registerTask('amd', ['babel:amd']);
+  this.registerTask('amd', ['babel:amd', 'requirejs']);
   this.registerTask('node', ['babel:cjs']);
   this.registerTask('globals', ['webpack']);
   this.registerTask('tests', ['concat:tests']);
 
-  this.registerTask('release', 'Build final packages', ['eslint', 'amd', 'test:min', 'copy:dist', 'copy:components', 'copy:cdnjs']);
+  this.registerTask('release', 'Build final packages', ['eslint', 'amd', 'uglify', 'copy:dist', 'copy:components', 'copy:cdnjs']);
 
   // 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-requirejs');
+  grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-babel');
-  grunt.loadNpmTasks('grunt-bg-shell');
   grunt.loadNpmTasks('grunt-eslint');
-  grunt.loadNpmTasks('@knappi/grunt-saucelabs');
+  grunt.loadNpmTasks('grunt-saucelabs');
   grunt.loadNpmTasks('grunt-webpack');
 
   grunt.task.loadTasks('tasks');
 
   grunt.registerTask('bench', ['metrics']);
-  grunt.registerTask('sauce', process.env.SAUCE_USERNAME ? ['tests', 'connect', 'saucelabs-mocha'] : []);
+  // remove this comment when saucelabs is working again
+  grunt.registerTask('sauce', process.env.SAUCE_USERNAME ? ['tests' /*, 'connect' , 'saucelabs-mocha' */ ] : []);
 
-  grunt.registerTask('travis', process.env.PUBLISH ? ['default', 'bgShell:integrationTests', 'sauce', 'metrics', 'publish:latest'] : ['default']);
+
+  grunt.registerTask('travis', process.env.PUBLISH ? ['default', 'sauce', 'metrics', 'publish:latest'] : ['default']);
 
   grunt.registerTask('dev', ['clean', 'connect', 'watch']);
   grunt.registerTask('default', ['clean', 'build', 'test', 'release']);
-  grunt.registerTask('integration-tests', ['default', 'bgShell:integrationTests']);
 };

LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2011-2017 by Yehuda Katz
+Copyright (C) 2011-2014 by Yehuda Katz
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.markdown

@@ -11,12 +11,24 @@ Handlebars.js and Mustache are both logicless templating languages that
 keep the view and the code separated like we all know they should be.
 
 Checkout the official Handlebars docs site at
-[http://www.handlebarsjs.com](http://www.handlebarsjs.com) and the live demo at [http://tryhandlebarsjs.com/](http://tryhandlebarsjs.com/).
+[http://www.handlebarsjs.com](http://www.handlebarsjs.com).
 
 Installing
 ----------
+Installing Handlebars is easy. Simply download the package [from the official site](http://handlebarsjs.com/) or the [bower repository][bower-repo] and add it to your web pages (you should usually use the most recent version).
 
-See our [installation documentation](http://handlebarsjs.com/installation.html).
+For web browsers, a free CDN is available at [jsDelivr](http://www.jsdelivr.com/#!handlebarsjs).  Advanced usage, such as [version aliasing & concocting](https://github.com/jsdelivr/jsdelivr#usage), is available. 
+
+Alternatively, if you prefer having the latest version of handlebars from
+the 'master' branch, passing builds of the 'master' branch are automatically
+published to S3. You may download the latest passing master build by grabbing
+a `handlebars-latest.js` file from the [builds page][builds-page]. When the
+build is published, it is also available as a `handlebars-gitSHA.js` file on
+the builds page if you need a version to refer to others.
+`handlebars-runtime.js` builds are also available.
+
+**Note**: The S3 builds page is provided as a convenience for the community,
+but you should not use it for hosting Handlebars in production.
 
 Usage
 -----
@@ -46,34 +58,295 @@ var result = template(data);
 // </ul>
 ```
 
-Full documentation and more examples are at [handlebarsjs.com](http://handlebarsjs.com/).
 
-Precompiling Templates
-----------------------
+Registering Helpers
+-------------------
+
+You can register helpers that Handlebars will use when evaluating your
+template. Here's an example, which assumes that your objects have a URL
+embedded in them, as well as the text for a link:
+
+```js
+Handlebars.registerHelper('link_to', function() {
+  return new Handlebars.SafeString("<a href='" + Handlebars.Utils.escapeExpression(this.url) + "'>" + Handlebars.Utils.escapeExpression(this.body) + "</a>");
+});
+
+var context = { posts: [{url: "/hello-world", body: "Hello World!"}] };
+var source = "<ul>{{#posts}}<li>{{link_to}}</li>{{/posts}}</ul>"
+
+var template = Handlebars.compile(source);
+template(context);
+
+// Would render:
+//
+// <ul>
+//   <li><a href='/hello-world'>Hello World!</a></li>
+// </ul>
+```
+
+Helpers take precedence over fields defined on the context. To access a field
+that is masked by a helper, a path reference may be used. In the example above
+a field named `link_to` on the `context` object would be referenced using:
+
+```
+{{./link_to}}
+```
+
+Escaping
+--------
+
+By default, the `{{expression}}` syntax will escape its contents. This
+helps to protect you against accidental XSS problems caused by malicious
+data passed from the server as JSON.
+
+To explicitly *not* escape the contents, use the triple-mustache
+(`{{{}}}`). You have seen this used in the above example.
 
-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](http://handlebarsjs.com/precompilation.html).
 
 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.
 
-- [Nested Paths](http://handlebarsjs.com/#paths)
-- [Helpers](http://handlebarsjs.com/#helpers)
-- [Block Expressions](http://handlebarsjs.com/#block-expressions)
-- [Literal Values](http://handlebarsjs.com/#literals)
-- [Delimited Comments](http://handlebarsjs.com/#comments)
+### Paths
+
+Handlebars.js supports an extended expression syntax that we call paths.
+Paths are made up of typical expressions and `.` characters. Expressions
+allow you to not only display data from the current context, but to
+display data from contexts that are descendants and ancestors of the
+current context.
+
+To display data from descendant contexts, use the `.` character. So, for
+example, if your data were structured like:
+
+```js
+var data = {"person": { "name": "Alan" }, "company": {"name": "Rad, Inc." } };
+```
+
+You could display the person's name from the top-level context with the
+following expression:
+
+```
+{{person.name}}
+```
+
+You can backtrack using `../`. For example, if you've already traversed
+into the person object you could still display the company's name with
+an expression like `{{../company.name}}`, so:
+
+```
+{{#with person}}{{name}} - {{../company.name}}{{/with}}
+```
+
+would render:
+
+```
+Alan - Rad, Inc.
+```
+
+### Strings
+
+When calling a helper, you can pass paths or Strings as parameters. For
+instance:
+
+```js
+Handlebars.registerHelper('link_to', function(title, options) {
+  return "<a href='/posts" + this.url + "'>" + title + "!</a>"
+});
+
+var context = { posts: [{url: "/hello-world", body: "Hello World!"}] };
+var source = '<ul>{{#posts}}<li>{{{link_to "Post"}}}</li>{{/posts}}</ul>'
+
+var template = Handlebars.compile(source);
+template(context);
+
+// Would render:
+//
+// <ul>
+//   <li><a href='/posts/hello-world'>Post!</a></li>
+// </ul>
+```
+
+When you pass a String as a parameter to a helper, the literal String
+gets passed to the helper function.
+
+
+### Block Helpers
+
+Handlebars.js also adds the ability to define block helpers. Block
+helpers are functions that can be called from anywhere in the template.
+Here's an example:
+
+```js
+var source = "<ul>{{#people}}<li>{{#link}}{{name}}{{/link}}</li>{{/people}}</ul>";
+Handlebars.registerHelper('link', function(options) {
+  return '<a href="/people/' + this.id + '">' + options.fn(this) + '</a>';
+});
+var template = Handlebars.compile(source);
+
+var data = { "people": [
+    { "name": "Alan", "id": 1 },
+    { "name": "Yehuda", "id": 2 }
+  ]};
+template(data);
+
+// Should render:
+// <ul>
+//   <li><a href="/people/1">Alan</a></li>
+//   <li><a href="/people/2">Yehuda</a></li>
+// </ul>
+```
+
+Whenever the block helper is called it is given one or more parameters,
+any arguments that are passed into the helper in the call, and an `options`
+object containing the `fn` function which executes the block's child.
+The block's current context may be accessed through `this`.
+
+Block helpers have the same syntax as mustache sections but should not be
+confused with one another. Sections are akin to an implicit `each` or
+`with` statement depending on the input data and helpers are explicit
+pieces of code that are free to implement whatever behavior they like.
+The [mustache spec](http://mustache.github.io/mustache.5.html)
+defines the exact behavior of sections. In the case of name conflicts,
+helpers are given priority.
+
+### Partials
+
+You can register additional templates as partials, which will be used by
+Handlebars when it encounters a partial (`{{> partialName}}`). Partials
+can either be String templates or compiled template functions. Here's an
+example:
+
+```js
+var source = "<ul>{{#people}}<li>{{> link}}</li>{{/people}}</ul>";
+
+Handlebars.registerPartial('link', '<a href="/people/{{id}}">{{name}}</a>')
+var template = Handlebars.compile(source);
+
+var data = { "people": [
+    { "name": "Alan", "id": 1 },
+    { "name": "Yehuda", "id": 2 }
+  ]};
+
+template(data);
+
+// Should render:
+// <ul>
+//   <li><a href="/people/1">Alan</a></li>
+//   <li><a href="/people/2">Yehuda</a></li>
+// </ul>
+```
+
+Partials can also accept parameters
+
+```js
+var source = "<div>{{> roster rosterProperties people=listOfPeople}}</div>";
+
+Handlebars.registerPartial('roster', '<h2>{{rosterName}}</h2>{{#people}}<span>{{id}}: {{name}}</span>{{/people}}')
+var template = Handlebars.compile(source);
+
+var data = {
+	"listOfPeople": [
+		{ "name": "Alan", "id": 1 },
+		{ "name": "Yehuda", "id": 2 }
+	], 
+	"rosterProperties": {
+		"rosterName": "Cool People"
+	}
+};
+
+template(data);
+
+// Should render:
+// <div>
+//  <h2>Cool People</h2>
+//   <span>1: Alan</span>
+//   <span>2: Yehuda</span>
+// </div>
+
+```
+
+### Comments
+
+You can add comments to your templates with the following syntax:
+
+```js
+{{! This is a comment }}
+```
+
+You can also use real html comments if you want them to end up in the output.
+
+```html
+<div>
+    {{! This comment will not end up in the output }}
+    <!-- This comment will show up in the output -->
+</div>
+```
 
-Block expressions have the same syntax as mustache sections but should not be confused with one another. Sections are akin to an implicit `each` or `with` statement depending on the input data and helpers are explicit pieces of code that are free to implement whatever behavior they like. The [mustache spec](http://mustache.github.io/mustache.5.html) defines the exact behavior of sections. In the case of name conflicts, helpers are given priority.
 
 ### 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.
-- Alternative delimiters are not supported.
+- The optional Mustache-style lambdas are not supported. Instead Handlebars provides it's own lambda resolution that follows the behaviors of helpers.
+- Alternative delimeters are not supported.
 
 
+Precompiling Templates
+----------------------
+
+Handlebars allows templates to be precompiled and included as javascript
+code rather than the handlebars template allowing for faster startup time.
+
+### Installation
+The precompiler script may be installed via npm using the `npm install -g handlebars`
+command.
+
+### Usage
+
+<pre>
+Precompile handlebar templates.
+Usage: handlebars template...
+
+Options:
+  -a, --amd            Create an AMD format function (allows loading with RequireJS)          [boolean]
+  -f, --output         Output File                                                            [string]
+  -k, --known          Known helpers                                                          [string]
+  -o, --knownOnly      Known helpers only                                                     [boolean]
+  -m, --min            Minimize output                                                        [boolean]
+  -s, --simple         Output template function only.                                         [boolean]
+  -r, --root           Template root. Base value that will be stripped from template names.   [string]
+  -c, --commonjs       Exports CommonJS style, path to Handlebars module                      [string]
+  -h, --handlebarPath  Path to handlebar.js (only valid for amd-style)                        [string]
+  -n, --namespace      Template namespace                                                     [string]
+  -p, --partial        Compiling a partial template                                           [boolean]
+  -d, --data           Include data when compiling                                            [boolean]
+  -e, --extension      Template extension.                                                    [string]
+  -b, --bom            Removes the BOM (Byte Order Mark) from the beginning of the templates. [boolean]
+</pre>
+
+If using the precompiler's normal mode, the resulting templates will be
+stored to the `Handlebars.templates` object using the relative template
+name sans the extension. These templates may be executed in the same
+manner as templates.
+
+If using the simple mode the precompiler will generate a single
+javascript method. To execute this method it must be passed to
+the `Handlebars.template` method and the resulting object may be used as normal.
+
+### Optimizations
+
+- Rather than using the full _handlebars.js_ library, implementations that
+  do not need to compile templates at runtime may include _handlebars.runtime.js_
+  whose min+gzip size is approximately 1k.
+- If a helper is known to exist in the target environment they may be defined
+  using the `--known name` argument may be used to optimize accesses to these
+  helpers for size and speed.
+- When all helpers are known in advance the `--knownOnly` argument may be used
+  to optimize all block helper references.
+- Implementations that do not use `@data` variables can improve performance of
+  iteration centric templates by specifying `{data: false}` in the compiler options.
+
 Supported Environments
 ----------------------
 
@@ -122,7 +395,6 @@ Handlebars in the Wild
 * [Assemble](http://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.
-* [Cory](https://github.com/leo/cory), by [@leo](https://github.com/leo), is another tiny static site generator
 * [CoSchedule](http://coschedule.com) An editorial calendar for WordPress that uses Handlebars.js
 * [dashbars](https://github.com/pismute/dashbars) A modern helper library for Handlebars.js.
 * [Ember.js](http://www.emberjs.com) makes Handlebars.js the primary way to
@@ -143,16 +415,13 @@ Handlebars in the Wild
   Handlebars.js with [jQuery](http://jquery.com/).
 * [Lumbar](http://walmartlabs.github.io/lumbar) provides easy module-based template management for
   handlebars projects.
-* [Marionette.Handlebars](https://github.com/hashchange/marionette.handlebars) adds support for Handlebars and Mustache templates to Marionette.
 * [sammy.js](http://github.com/quirkey/sammy) by Aaron Quint, a.k.a. quirkey,
   supports Handlebars.js as one of its template plugins.
 * [SproutCore](http://www.sproutcore.com) uses Handlebars.js as its main
   templating engine, extending it with automatic data binding support.
 * [YUI](http://yuilibrary.com/yui/docs/handlebars/) implements a port of handlebars
 * [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!
-* [DOMBars](https://github.com/blakeembrey/dombars) is a DOM-based templating engine built on the Handlebars parser and runtime **DEPRECATED**
-* [promised-handlebars](https://github.com/nknapp/promised-handlebars) is a wrapper for Handlebars that allows helpers to return Promises.
-* [just-handlebars-helpers](https://github.com/leapfrogtechnology/just-handlebars-helpers) A fully tested lightweight package with common Handlebars helpers.
+* [DOMBars](https://github.com/blakeembrey/dombars) is a DOM-based templating engine built on the Handlebars parser and runtime
 
 External Resources
 ------------------
@@ -165,4 +434,6 @@ License
 -------
 Handlebars.js is released under the MIT license.
 
+[bower-repo]: https://github.com/components/handlebars.js
+[builds-page]: http://builds.handlebarsjs.com.s3.amazonaws.com/bucket-listing.html?sort=lastmod&sortdir=desc
 [pull-request]: https://github.com/wycats/handlebars.js/pull/new/master

babel.config.js

@@ -1,7 +0,0 @@
-module.exports = function(api) {
-  api.cache(false);
-  return {
-    presets: ['@babel/preset-env'],
-    plugins: ['@babel/plugin-transform-runtime']
-  };
-};

bench/.eslintrc

@@ -1,14 +0,0 @@
-{
-  "globals": {
-    "require": true
-  },
-  "rules": {
-    // Disabling for tests, for now.
-    "no-path-concat": 0,
-
-    "no-var": 0,
-    "no-shadow": 0,
-    "handle-callback-err": 0,
-    "no-console": 0
-  }
-}

bench/dist-size.js

@@ -1,4 +1,5 @@
-var async = require('neo-async'),
+var _ = require('underscore'),
+    async = require('async'),
     fs = require('fs'),
     zlib = require('zlib');
 

bench/index.js

@@ -2,7 +2,7 @@ var fs = require('fs');
 
 var metrics = fs.readdirSync(__dirname);
 metrics.forEach(function(metric) {
-  if (metric === 'index.js' || !(/(.*)\.js$/.test(metric))) {
+  if (metric === 'index.js' || !/(.*)\.js$/.test(metric)) {
     return;
   }
 

bench/templates/arguments.js

@@ -1,6 +1,6 @@
 module.exports = {
   helpers: {
-    foo: function() {
+    foo: function(options) {
       return '';
     }
   },

bench/templates/array-each.js

@@ -1,7 +1,7 @@
 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}}',
-  eco: '<% for item in @names: %><%= item.name %><% end %>'
+  context: { names: [{name: "Moe"}, {name: "Larry"}, {name: "Curly"}, {name: "Shemp"}] },
+  handlebars: "{{#each names}}{{name}}{{/each}}",
+  dust: "{#names}{name}{/names}",
+  mustache: "{{#names}}{{name}}{{/names}}",
+  eco: "<% for item in @names: %><%= item.name %><% end %>"
 };

bench/templates/array-mustache.js

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

bench/templates/complex.js

@@ -3,13 +3,13 @@ var fs = require('fs');
 module.exports = {
   context: {
     header: function() {
-      return 'Colors';
+      return "Colors";
     },
-    hasItems: true, // To make things fairer in mustache land due to no `{{if}}` construct on arrays
+    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'}
+      {name: "red", current: true, url: "#Red"},
+      {name: "green", current: false, url: "#Green"},
+      {name: "blue", current: false, url: "#Blue"}
     ]
   },
 

bench/templates/data.js

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

bench/templates/depth-1.js

@@ -1,6 +1,6 @@
 module.exports = {
-  context: { names: [{name: 'Moe'}, {name: 'Larry'}, {name: 'Curly'}, {name: 'Shemp'}], foo: 'bar' },
-  handlebars: '{{#each names}}{{../foo}}{{/each}}',
-  mustache: '{{#names}}{{foo}}{{/names}}',
-  eco: '<% for item in @names: %><%= @foo %><% end %>'
+  context: { names: [{name: "Moe"}, {name: "Larry"}, {name: "Curly"}, {name: "Shemp"}], foo: 'bar' },
+  handlebars: "{{#each names}}{{../foo}}{{/each}}",
+  mustache: "{{#names}}{{foo}}{{/names}}",
+  eco: "<% for item in @names: %><%= @foo %><% end %>"
 };

bench/templates/depth-2.js

@@ -1,6 +1,6 @@
 module.exports = {
-  context: { names: [{bat: 'foo', name: ['Moe']}, {bat: 'foo', name: ['Larry']}, {bat: 'foo', name: ['Curly']}, {bat: 'foo', name: ['Shemp']}], foo: 'bar' },
-  handlebars: '{{#each names}}{{#each name}}{{../bat}}{{../../foo}}{{/each}}{{/each}}',
-  mustache: '{{#names}}{{#name}}{{bat}}{{foo}}{{/name}}{{/names}}',
-  eco: '<% for item in @names: %><% for child in item.name: %><%= item.bat %><%= @foo %><% end %><% end %>'
+  context: { names: [{bat: 'foo', name: ["Moe"]}, {bat: 'foo', name: ["Larry"]}, {bat: 'foo', name: ["Curly"]}, {bat: 'foo', name: ["Shemp"]}], foo: 'bar' },
+  handlebars: "{{#each names}}{{#each name}}{{../bat}}{{../../foo}}{{/each}}{{/each}}",
+  mustache: "{{#names}}{{#name}}{{bat}}{{foo}}{{/name}}{{/names}}",
+  eco: "<% for item in @names: %><% for child in item.name: %><%= item.bat %><%= @foo %><% end %><% end %>"
 };

bench/templates/index.js

@@ -2,7 +2,7 @@ var fs = require('fs');
 
 var templates = fs.readdirSync(__dirname);
 templates.forEach(function(template) {
-  if (template === 'index.js' || !(/(.*)\.js$/.test(template))) {
+  if (template === 'index.js' || !/(.*)\.js$/.test(template)) {
     return;
   }
   module.exports[RegExp.$1] = require('./' + RegExp.$1);

bench/templates/object-mustache.js

@@ -1,4 +1,4 @@
 module.exports = {
-  context: { person: { name: 'Larry', age: 45 } },
-  handlebars: '{{#person}}{{name}}{{age}}{{/person}}'
+  context: { person: { name: "Larry", age: 45 } },
+  handlebars: "{{#person}}{{name}}{{age}}{{/person}}"
 };

bench/templates/object.js

@@ -1,7 +1,7 @@
 module.exports = {
-  context: { person: { name: 'Larry', age: 45 } },
-  handlebars: '{{#with person}}{{name}}{{age}}{{/with}}',
-  dust: '{#person}{name}{age}{/person}',
-  eco: '<%= @person.name %><%= @person.age %>',
-  mustache: '{{#person}}{{name}}{{age}}{{/person}}'
+  context: { person: { name: "Larry", age: 45 } },
+  handlebars: "{{#with person}}{{name}}{{age}}{{/with}}",
+  dust: "{#person}{name}{age}{/person}",
+  eco: "<%= @person.name %><%= @person.age %>",
+  mustache: "{{#person}}{{name}}{{age}}{{/person}}"
 };

bench/templates/partial-recursion.js

@@ -1,10 +1,10 @@
 module.exports = {
   context: { name: '1', kids: [{ name: '1.1', kids: [{name: '1.1.1', kids: []}] }] },
   partials: {
-    mustache: { recursion: '{{name}}{{#kids}}{{>recursion}}{{/kids}}' },
-    handlebars: { recursion: '{{name}}{{#each kids}}{{>recursion}}{{/each}}' }
+    mustache: { recursion: "{{name}}{{#kids}}{{>recursion}}{{/kids}}" },
+    handlebars: { recursion: "{{name}}{{#each kids}}{{>recursion}}{{/each}}" }
   },
-  handlebars: '{{name}}{{#each kids}}{{>recursion}}{{/each}}',
-  dust: '{name}{#kids}{>recursion:./}{/kids}',
-  mustache: '{{name}}{{#kids}}{{>recursion}}{{/kids}}'
+  handlebars: "{{name}}{{#each kids}}{{>recursion}}{{/each}}",
+  dust: "{name}{#kids}{>recursion:./}{/kids}",
+  mustache: "{{name}}{{#kids}}{{>recursion}}{{/kids}}"
 };

bench/templates/partial.js

@@ -1,11 +1,11 @@
 module.exports = {
-  context: { peeps: [{name: 'Moe', count: 15}, {name: 'Larry', count: 5}, {name: 'Curly', count: 1}] },
+  context: { peeps: [{name: "Moe", count: 15}, {name: "Larry", count: 5}, {name: "Curly", count: 1}] },
   partials: {
-    mustache: { variables: 'Hello {{name}}! You have {{count}} new messages.' },
-    handlebars: { variables: 'Hello {{name}}! You have {{count}} new messages.' }
+    mustache: { variables: "Hello {{name}}! You have {{count}} new messages." },
+    handlebars: { variables: "Hello {{name}}! You have {{count}} new messages." }
   },
 
-  handlebars: '{{#each peeps}}{{>variables}}{{/each}}',
-  dust: '{#peeps}{>variables/}{/peeps}',
-  mustache: '{{#peeps}}{{>variables}}{{/peeps}}'
+  handlebars: "{{#each peeps}}{{>variables}}{{/each}}",
+  dust: "{#peeps}{>variables/}{/peeps}",
+  mustache: "{{#peeps}}{{>variables}}{{/peeps}}"
 };

bench/templates/paths.js

@@ -1,7 +1,7 @@
 module.exports = {
-  context: { person: { name: {bar: {baz: 'Larry'}}, age: 45 } },
-  handlebars: '{{person.name.bar.baz}}{{person.age}}{{person.foo}}{{animal.age}}',
-  dust: '{person.name.bar.baz}{person.age}{person.foo}{animal.age}',
-  eco: '<%= @person.name.bar.baz %><%= @person.age %><%= @person.foo %><% if @animal: %><%= @animal.age %><% end %>',
-  mustache: '{{person.name.bar.baz}}{{person.age}}{{person.foo}}{{animal.age}}'
+  context: { person: { name: {bar: {baz: "Larry"}}, age: 45 } },
+  handlebars: "{{person.name.bar.baz}}{{person.age}}{{person.foo}}{{animal.age}}",
+  dust: "{person.name.bar.baz}{person.age}{person.foo}{animal.age}",
+  eco: "<%= @person.name.bar.baz %><%= @person.age %><%= @person.foo %><% if @animal: %><%= @animal.age %><% end %>",
+  mustache: "{{person.name.bar.baz}}{{person.age}}{{person.foo}}{{animal.age}}"
 };

bench/templates/string.js

@@ -1,7 +1,7 @@
 module.exports = {
   context: {},
-  handlebars: 'Hello world',
-  dust: 'Hello world',
-  mustache: 'Hello world',
-  eco: 'Hello world'
+  handlebars: "Hello world",
+  dust: "Hello world",
+  mustache: "Hello world",
+  eco: "Hello world"
 };

bench/templates/subexpression.js

@@ -4,11 +4,11 @@ module.exports = {
       return 'foo ' + value;
     },
     header: function() {
-      return 'Colors';
+      return "Colors";
     }
   },
-  handlebars: '{{echo (header)}}',
-  eco: '<%= @echo(@header()) %>'
+  handlebars: "{{echo (header)}}",
+  eco: "<%= @echo(@header()) %>"
 };
 
 module.exports.context = module.exports.helpers;

bench/templates/variables.js

@@ -1,8 +1,8 @@
 module.exports = {
-  context: {name: 'Mick', count: 30},
-  handlebars: 'Hello {{name}}! You have {{count}} new messages.',
-  dust: 'Hello {name}! You have {count} new messages.',
-  mustache: 'Hello {{name}}! You have {{count}} new messages.',
-  eco: 'Hello <%= @name %>! You have <%= @count %> new messages.'
+  context: {name: "Mick", count: 30},
+  handlebars:  "Hello {{name}}! You have {{count}} new messages.",
+  dust: "Hello {name}! You have {count} new messages.",
+  mustache: "Hello {{name}}! You have {{count}} new messages.",
+  eco: "Hello <%= @name %>! You have <%= @count %> new messages."
 };
 

bench/throughput.js

@@ -1,22 +1,23 @@
 var _ = require('underscore'),
     runner = require('./util/template-runner'),
+    templates = require('./templates'),
 
-    eco, dust, Handlebars, Mustache;
+    eco, dust, Handlebars, Mustache, eco;
 
 try {
-  dust = require('dustjs-linkedin');
+  dust = require("dustjs-linkedin");
 } catch (err) { /* NOP */ }
 
 try {
-  Mustache = require('mustache');
+  Mustache = require("mustache");
 } catch (err) { /* NOP */ }
 
 try {
-  eco = require('eco');
+  eco = require("eco");
 } catch (err) { /* NOP */ }
 
 function error() {
-  throw new Error('EWOT');
+  throw new Error("EWOT");
 }
 
 function makeSuite(bench, name, template, handlebarsOnly) {
@@ -33,19 +34,19 @@ function makeSuite(bench, name, template, handlebarsOnly) {
       mustacheOut;
 
   var handlebar = Handlebars.compile(template.handlebars, {data: false}),
-      compat = Handlebars.compile(template.handlebars, {data: false, compat: true}),
+      compat =  Handlebars.compile(template.handlebars, {data: false, compat: true}),
       options = {helpers: template.helpers};
-  _.each(template.partials && template.partials.handlebars, function(partial, partialName) {
-    Handlebars.registerPartial(partialName, Handlebars.compile(partial, {data: false}));
+  _.each(template.partials && template.partials.handlebars, function(partial, name) {
+    Handlebars.registerPartial(name, Handlebars.compile(partial, {data: false}));
   });
 
   handlebarsOut = handlebar(context, options);
-  bench('handlebars', function() {
+  bench("handlebars", function() {
     handlebar(context, options);
   });
 
   compatOut = compat(context, options);
-  bench('compat', function() {
+  bench("compat", function() {
     compat(context, options);
   });
 
@@ -60,8 +61,8 @@ function makeSuite(bench, name, template, handlebarsOnly) {
 
       dust.render(templateName, context, function(err, out) { dustOut = out; });
 
-      bench('dust', function() {
-        dust.render(templateName, context, function() {});
+      bench("dust", function() {
+        dust.render(templateName, context, function(err, out) { });
       });
     } else {
       bench('dust', error);
@@ -74,11 +75,11 @@ function makeSuite(bench, name, template, handlebarsOnly) {
 
       ecoOut = ecoTemplate(context);
 
-      bench('eco', function() {
+      bench("eco", function() {
         ecoTemplate(context);
       });
     } else {
-      bench('eco', error);
+      bench("eco", error);
     }
   }
 
@@ -89,11 +90,11 @@ function makeSuite(bench, name, template, handlebarsOnly) {
     if (mustacheSource) {
       mustacheOut = Mustache.to_html(mustacheSource, context, mustachePartials);
 
-      bench('mustache', function() {
+      bench("mustache", function() {
         Mustache.to_html(mustacheSource, context, mustachePartials);
       });
     } else {
-      bench('mustache', error);
+      bench("mustache", error);
     }
   }
 

bench/util/benchwarmer.js

@@ -1,7 +1,7 @@
 var _ = require('underscore'),
-    Benchmark = require('benchmark');
+    Benchmark = require("benchmark");
 
-function BenchWarmer() {
+var BenchWarmer = function(names) {
   this.benchmarks = [];
   this.currentBenches = [];
   this.names = [];
@@ -9,9 +9,9 @@ function BenchWarmer() {
   this.minimum = Infinity;
   this.maximum = -Infinity;
   this.errors = {};
-}
+};
 
-var print = require('util').print;
+var print = require("sys").print;
 
 BenchWarmer.prototype = {
   winners: function(benches) {
@@ -29,7 +29,7 @@ BenchWarmer.prototype = {
     });
   },
   push: function(name, fn) {
-    if (this.names.indexOf(name) === -1) {
+    if(this.names.indexOf(name) == -1) {
       this.names.push(name);
     }
 
@@ -37,9 +37,9 @@ BenchWarmer.prototype = {
     this.first = false;
 
     var bench = new Benchmark(fn, {
-      name: this.suiteName + ': ' + name,
+      name: this.suiteName + ": " + name,
       onComplete: function() {
-        if (first) { self.startLine(suiteName); }
+        if(first) { self.startLine(suiteName); }
         self.writeBench(bench);
         self.currentBenches.push(bench);
       }, onError: function() {
@@ -58,7 +58,7 @@ BenchWarmer.prototype = {
     this.printHeader('ops/msec', true);
 
     Benchmark.invoke(this.benchmarks, {
-      name: 'run',
+      name: "run",
       onComplete: function() {
         self.scaleTimes();
 
@@ -76,34 +76,35 @@ BenchWarmer.prototype = {
         print('\n');
 
         var errors = false, prop, bench;
-        for (prop in self.errors) {
-          if (Object.prototype.hasOwnProperty.call(self, prop)
+        for(prop in self.errors) {
+          if (self.errors.hasOwnProperty(prop)
               && self.errors[prop].error.message !== 'EWOT') {
             errors = true;
             break;
           }
         }
 
-        if (errors) {
-          print('\n\nErrors:\n');
-          Object.keys(self.errors).forEach(function(prop) {
-            if (self.errors[prop].error.message !== 'EWOT') {
+        if(errors) {
+          print("\n\nErrors:\n");
+          for(prop in self.errors) {
+            if (self.errors.hasOwnProperty(prop)
+                && self.errors[prop].error.message !== 'EWOT') {
               bench = self.errors[prop];
-              print('\n' + bench.name + ':\n');
+              print("\n" + bench.name + ":\n");
               print(bench.error.message);
-              if (bench.error.stack) {
-                print(bench.error.stack.join('\n'));
+              if(bench.error.stack) {
+                print(bench.error.stack.join("\n"));
               }
-              print('\n');
+              print("\n");
             }
-          });
+          }
         }
 
         callback();
       }
     });
 
-    print('\n');
+    print("\n");
   },
 
   scaleTimes: function() {
@@ -120,10 +121,10 @@ BenchWarmer.prototype = {
   printHeader: function(title, winners) {
     var benchSize = 0, names = this.names, i, l;
 
-    for (i = 0, l = names.length; i < l; i++) {
+    for(i=0, l=names.length; i<l; i++) {
       var name = names[i];
 
-      if (benchSize < name.length) { benchSize = name.length; }
+      if(benchSize < name.length) { benchSize = name.length; }
     }
 
     this.nameSize = benchSize + 2;
@@ -132,28 +133,28 @@ BenchWarmer.prototype = {
 
     this.startLine(title);
     horSize = horSize + this.benchSize;
-    for (i = 0, l = names.length; i < l; i++) {
+    for(i=0, l=names.length; i<l; i++) {
       this.writeValue(names[i]);
       horSize = horSize + this.benchSize;
     }
 
     if (winners) {
-      print('WINNER(S)');
-      horSize = horSize + 'WINNER(S)'.length;
+      print("WINNER(S)");
+      horSize = horSize + "WINNER(S)".length;
     }
 
-    print('\n' + new Array(horSize + 1).join('-'));
+    print("\n" + new Array(horSize + 1).join("-"));
   },
 
   startLine: function(name) {
     var winners = Benchmark.map(this.winners(this.currentBenches), function(bench) {
-      return bench.name.split(': ')[1];
+      return bench.name.split(": ")[1];
     });
 
     this.currentBenches = [];
 
-    print(winners.join(', '));
-    print('\n');
+    print(winners.join(", "));
+    print("\n");
 
     if (name) {
       this.writeValue(name);
@@ -162,9 +163,9 @@ BenchWarmer.prototype = {
   writeBench: function(bench) {
     var out;
 
-    if (!bench.error) {
+    if(!bench.error) {
       var count = bench.hz,
-          moe = count * bench.stats.rme / 100,
+          moe   = count * bench.stats.rme / 100,
           minimum,
           maximum;
 
@@ -173,22 +174,24 @@ BenchWarmer.prototype = {
       minimum = count - moe;
       maximum = count + moe;
 
-      out = count + ' ±' + moe + ' (' + bench.cycles + ')';
+      out = count + " ±" + moe + " (" + bench.cycles + ")";
 
       this.times[bench.suiteName][bench.benchName] = count;
       this.minimum = Math.min(this.minimum, minimum);
       this.maximum = Math.max(this.maximum, maximum);
-    } else if (bench.error.message === 'EWOT') {
-      out = 'NA';
     } else {
-      out = 'E';
+      if (bench.error.message === 'EWOT') {
+        out = 'NA';
+      } else {
+        out = 'E';
+      }
     }
     this.writeValue(out);
   },
 
   writeValue: function(out) {
     var padding = this.benchSize - out.length + 1;
-    out = out + new Array(padding).join(' ');
+    out = out + new Array(padding).join(" ");
     print(out);
   }
 };

bench/util/template-runner.js

@@ -22,8 +22,6 @@ module.exports = function(grunt, makeSuite, callback) {
   });
 
   warmer.bench(function() {
-    if (callback) {
-      callback(warmer.times, warmer.scaled);
-    }
+    callback && callback(warmer.times, warmer.scaled);
   });
 };

bin/handlebars

@@ -26,7 +26,7 @@ var optimist = require('optimist')
         'type': 'string',
         'description': 'Path to handlebar.js (only valid for amd-style)',
         'alias': 'handlebarPath',
-        'default': ''
+  	    'default': ''
       },
       'k': {
         'type': 'string',
@@ -54,27 +54,17 @@ var optimist = require('optimist')
         'description': 'Output template function only.',
         'alias': 'simple'
       },
-      'N': {
-        'type': 'string',
-        'description': 'Name of passed string templates. Optional if running in a simple mode. Required when operating on multiple templates.',
-        'alias': 'name'
-      },
-      'i': {
-        'type': 'string',
-        'description': 'Generates a template from the passed CLI argument.\n"-" is treated as a special value and causes stdin to be read for the template value.',
-        'alias': 'string'
-      },
       'r': {
         'type': 'string',
         'description': 'Template root. Base value that will be stripped from template names.',
         'alias': 'root'
       },
-      'p': {
+      'p' : {
         'type': 'boolean',
         'description': 'Compiling a partial template',
         'alias': 'partial'
       },
-      'd': {
+      'd' : {
         'type': 'boolean',
         'description': 'Include data when compiling',
         'alias': 'data'
@@ -102,7 +92,6 @@ var optimist = require('optimist')
       }
     })
 
-    .wrap(120)
     .check(function(argv) {
       if (argv.version) {
         return;
@@ -111,18 +100,12 @@ var optimist = require('optimist')
 
 
 var argv = optimist.argv;
-argv.files = argv._;
+argv.templates = argv._;
 delete argv._;
 
-var Precompiler = require('../dist/cjs/precompiler');
-Precompiler.loadTemplates(argv, function(err, opts) {
-  if (err) {
-    throw err;
-  }
+if (argv.help || (!argv.templates.length && !argv.version)) {
+  optimist.showHelp();
+  return;
+}
 
-  if (opts.help || (!opts.templates.length && !opts.version)) {
-    optimist.showHelp();
-  } else {
-    Precompiler.cli(opts);
-  }
-});
+return require('../dist/cjs/precompiler').cli(argv);

components/bower.json

@@ -1,7 +1,6 @@
 {
   "name": "handlebars",
-  "version": "4.5.3",
+  "version": "3.0.8",
   "main": "handlebars.js",
-  "license": "MIT",
   "dependencies": {}
 }

components/handlebars.js.nuspec

@@ -2,7 +2,7 @@
 <package>
 	<metadata>
 		<id>handlebars.js</id>
-		<version>4.5.3</version>
+		<version>3.0.8</version>
 		<authors>handlebars.js Authors</authors>
 		<licenseUrl>https://github.com/wycats/handlebars.js/blob/master/LICENSE</licenseUrl>
 		<projectUrl>https://github.com/wycats/handlebars.js/</projectUrl>

components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "handlebars",
-  "version": "4.5.3",
+  "version": "3.0.8",
   "license": "MIT",
   "jspm": {
     "main": "handlebars",

docs/compiler-api.md

@@ -16,34 +16,6 @@ var ast = Handlebars.parse(myTemplate);
 Handlebars.precompile(ast);
 ```
 
-### Parsing
-
-There are two primary APIs that are used to parse an existing template into the AST:
-
-#### parseWithoutProcessing
-
-`Handlebars.parseWithoutProcessing` is the primary mechanism to turn a raw template string into the Handlebars AST described in this document. No processing is done on the resulting AST which makes this ideal for codemod (for source to source transformation) tooling.
-
-Example:
-
-```js
-let ast = Handlebars.parseWithoutProcessing(myTemplate);
-```
-
-#### parse
-
-`Handlebars.parse` will parse the template with `parseWithoutProcessing` (see above) then it will update the AST to strip extraneous whitespace. The whitespace stripping functionality handles two distinct situations:
-
-* Removes whitespace around dynamic statements that are on a line by themselves (aka "stand alone")
-* Applies "whitespace control" characters (i.e. `~`) by truncating the `ContentStatement` `value` property appropriately (e.g. `\n\n{{~foo}}` would have a `ContentStatement` with a `value` of `''`)
-
-`Handlebars.parse` is used internally by `Handlebars.precompile` and `Handlebars.compile`.
-
-Example:
-
-```js
-let ast = Handlebars.parse(myTemplate);
-```
 
 ### Basic
 
@@ -94,7 +66,7 @@ interface MustacheStatement <: Statement {
 
 interface BlockStatement <: Statement {
     type: "BlockStatement";
-    path: PathExpression | Literal;
+    path: PathExpression;
     params: [ Expression ];
     hash: Hash;
 
@@ -111,23 +83,10 @@ interface PartialStatement <: Statement {
     name: PathExpression | SubExpression;
     params: [ Expression ];
     hash: Hash;
-
+    
     indent: string;
     strip: StripFlags | null;
 }
-
-interface PartialBlockStatement <: Statement {
-    type: "PartialBlockStatement";
-    name: PathExpression | SubExpression;
-    params: [ Expression ];
-    hash: Hash;
-
-    program: Program | null;
-
-    indent: string;
-    openStrip: StripFlags | null;
-    closeStrip: StripFlags | null;
-}
 ```
 
 `name` will be a `SubExpression` when tied to a dynamic partial, i.e. `{{> (foo) }}`, otherwise this is a path or literal whose `original` value is used to lookup the desired partial.
@@ -148,33 +107,6 @@ interface CommentStatement <: Statement {
 }
 ```
 
-
-```java
-interface Decorator <: Statement {
-    type: "Decorator";
-
-    path: PathExpression | Literal;
-    params: [ Expression ];
-    hash: Hash;
-
-    strip: StripFlags | null;
-}
-
-interface DecoratorBlock <: Statement {
-    type: "DecoratorBlock";
-    path: PathExpression | Literal;
-    params: [ Expression ];
-    hash: Hash;
-
-    program: Program | null;
-
-    openStrip: StripFlags | null;
-    closeStrip: StripFlags | null;
-}
-```
-
-Decorator paths only utilize the `path.original` value and as a consequence do not support depthed evaluation.
-
 ### Expressions
 
 ```java
@@ -304,7 +236,7 @@ The `Handlebars.JavaScriptCompiler` object has a number of methods that may be c
 
   - `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`.
+  - `type` is the type of name being evaluated. May be one of `context`, `data`, `helper`, or `partial`.
 
   Note that this does not impact dynamic partials, which implementors need to be aware of. Overriding `VM.resolvePartial` may be required to support dynamic cases.
 
@@ -324,43 +256,21 @@ The `Handlebars.JavaScriptCompiler` object has a number of methods that may be c
 - `initializeBuffer()`
     Allows for buffers other than the default string buffer to be used. Generally needs to be paired with a custom `appendToBuffer` implementation.
 
-### Example for the compiler api.
-
-This example changes all lookups of properties are performed by a helper (`lookupLowerCase`) which looks for `test` if `{{Test}}` occurs in the template. This is just to illustrate how compiler behavior can be change.
-
-There is also [a jsfiddle with this code](https://jsfiddle.net/9D88g/162/) if you want to play around with it.
-
-
 ```javascript
 function MyCompiler() {
   Handlebars.JavaScriptCompiler.apply(this, arguments);
 }
-MyCompiler.prototype = new Handlebars.JavaScriptCompiler();
+MyCompiler.prototype = Object.create(Handlebars.JavaScriptCompiler);
 
-// Use this compile to compile BlockStatment-Blocks
-MyCompiler.prototype.compiler = MyCompiler
-
-MyCompiler.prototype.nameLookup = function(parent, name, type) {
-  if (type === 'context') {
-    return this.source.functionCall('helpers.lookupLowerCase', '', [parent, JSON.stringify(name)])
+MyCompiler.nameLookup = function(parent, name, type) {
+  if (type === 'partial') {
+    return 'MyPartialList[' + JSON.stringify(name) ']';
   } else {
     return Handlebars.JavaScriptCompiler.prototype.nameLookup.call(this, parent, name, type);
   }
-}
+};
 
 var env = Handlebars.create();
-env.registerHelper('lookupLowerCase', function(parent, name) {
-  return parent[name.toLowerCase()]
-})
-
 env.JavaScriptCompiler = MyCompiler;
-
-var template = env.compile('{{#each Test}} ({{Value}}) {{/each}}');
-console.log(template({
-  test: [ 
-    {value: 'a'},
-    {value: 'b'},
-    {value: 'c'}
-    ]
-}));
+env.compile('my template');
 ```

docs/decorators-api.md

@@ -1,19 +0,0 @@
-# Decorators
-
-Decorators allow for blocks to be annotated with metadata or wrapped in functionality prior to execution of the block. This may be used to communicate with the containing helper or to setup a particular state in the system prior to running the block.
-
-Decorators are registered through similar methods as helpers, `registerDecorators` and `unregisterDecorators`. These can then be referenced via the friendly name in the template using the `{{* decorator}}` and `{{#* decorator}}{/decorator}}` syntaxes. These syntaxes are derivatives of the normal mustache syntax and as such have all of the same argument and whitespace behaviors.
-
-Decorators are executed when the block program is instantiated and are passed `(program, props, container, context, data, blockParams, depths)`.
-
-- `program`: The block to wrap
-- `props`: Object used to set metadata on the final function. Any values set on this object will be set on the function, regardless of if the original function is replaced or not. Metadata should be applied using this object as values applied to `program` may be masked by subsequent decorators that may wrap `program`.
-- `container`: The current runtime container
-- `context`: The current context. Since the decorator is run before the block that contains it, this is the parent context.
-- `data`: The current `@data` values
-- `blockParams`: The current block parameters stack
-- `depths`: The current context stack
-
-Decorators may set values on `props` or return a modified function that wraps `program` in particular behaviors. If the decorator returns nothing, then `program` is left unaltered.
-
-The [inline partial](https://github.com/wycats/handlebars.js/blob/master/lib/handlebars/decorators/inline.js) implementation provides an example of decorators being used for both metadata and wrapping behaviors.

integration-testing/README.md

@@ -1,12 +0,0 @@
-Add a new integration test by creating a new subfolder
-
-Add a file "test.sh" to that runs the test. "test.sh" should exit with a non-zero exit code 
-and display an error message, if something goes wrong.
-
-* An integration test should reflect real-world setups that use handlebars.
-* It should compile a minimal template and compare the output to an expected output.
-* It should use "../.." as dependency for Handlebars so that the currently built library is used.
-
-Currently, integration tests are only running on Linux, especially in travis-ci.
-
-  

integration-testing/multi-nodejs-test/.eslintrc.js

@@ -1,12 +0,0 @@
-module.exports = {
-  "extends": "eslint:recommended",
-  "globals": {
-    "self": false
-  },
-  "env": {
-    "node": true
-  },
-  "rules": {
-    'no-console': 'off'
-  }
-}

integration-testing/multi-nodejs-test/.gitignore

@@ -1,2 +0,0 @@
-target
-package-lock.json

integration-testing/multi-nodejs-test/package.json

@@ -1,16 +0,0 @@
-{
-  "name": "multi-nodejs-test",
-  "version": "1.0.0",
-  "description": "Simple integration test with all relevant NodeJS-versions.",
-  "keywords": [],
-  "author": "Nils Knappmeier",
-  "private": true,
-  "license": "MIT",
-  "dependencies": {
-    "handlebars": "file:../.."
-  },
-  "scripts": {
-    "test": "node run-handlebars.js",
-    "test-precompile": "handlebars precompile-test-template.txt.hbs"
-  }
-}

integration-testing/multi-nodejs-test/precompile-test-template.txt.hbs

@@ -1 +0,0 @@
-Author: {{author}}

integration-testing/multi-nodejs-test/run-handlebars.js

@@ -1,11 +0,0 @@
-// This test should run successfully with node 0.10++ as long as Handlebars has been compiled before
-var assert = require('assert');
-var Handlebars = require('handlebars');
-
-console.log('Testing built Handlebars with Node version ' + process.version);
-
-var template = Handlebars.compile('Author: {{author}}');
-var output = template({author: 'Yehuda'});
-assert.strictEqual(output, 'Author: Yehuda');
-
-console.log('Success');

integration-testing/multi-nodejs-test/test.sh

@@ -1,26 +0,0 @@
-#!/bin/bash
-
-cd "$( dirname "$( readlink -f "$0" )" )" || exit 1
-# shellcheck disable=SC1090
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-
-# This script tests with precompiler and the built distribution with multiple NodeJS version.
-# The rest of the travis-build will only work with newer NodeJS versions, because the build
-# tools don't support older versions.
-# However, the built distribution should work with older NodeJS versions as well.
-# This test is simple by design. It merely ensures, that calling Handlebars does not fail with old versions.
-# It does (almost) not test for correctness, because that is already done in the mocha-tests.
-# And it does not use any NodeJS based testing framwork to make this part independent of the Node version.
-
-# A list of NodeJS versions is expected as cli-args
-echo "Handlebars should be able to run in various versions of NodeJS"
-for i in  0.10 0.12 4 5 6 7 8 9 10 11 ; do
-    rm target node_modules package-lock.json -rf
-    mkdir target
-    nvm install "$i"
-    nvm exec "$i" npm install
-    nvm exec "$i" npm run test || exit 1
-    nvm exec "$i" npm run test-precompile || exit 1
-
-    echo Success
-done

integration-testing/run-integration-tests.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-
-cd "$( dirname "$( readlink -f "$0" )" )" || exit 1
-
-for i in */test.sh ; do
-  (
-    echo "----------------------------------------"
-    echo "-- Running integration test: $i"
-    echo "----------------------------------------"
-    cd "$( dirname "$i" )" || exit 1
-    ./test.sh || exit 1
-  )
-done

integration-testing/webpack-babel-test/.babelrc

@@ -1,11 +0,0 @@
-{
-  "plugins": [
-    "@roundingwellos/babel-plugin-handlebars-inline-precompile"
-   // "istanbul"
-  ],
-  "presets": [
-    [
-      "@babel/preset-env"
-    ]
-  ]
-}

integration-testing/webpack-babel-test/.gitignore

@@ -1,3 +0,0 @@
-node_modules
-dist
-package-lock.json

integration-testing/webpack-babel-test/package.json

@@ -1,24 +0,0 @@
-{
-  "name": "webpack-babel-test",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@babel/core": "^7.5.5",
-    "@babel/preset-env": "^7.5.5",
-    "@roundingwellos/babel-plugin-handlebars-inline-precompile": "^3.0.1",
-    "babel-loader": "^8.0.6",
-    "babel-plugin-istanbul": "^5.2.0",
-    "handlebars": "file:../..",
-    "handlebars-loader": "^1.7.1",
-    "nyc": "^14.1.1",
-    "webpack": "^4.39.3",
-    "webpack-cli": "^3.3.7"
-  },
-  "scripts": {
-    "build": "webpack --config webpack.config.js"
-  }
-}

integration-testing/webpack-babel-test/src/handlebars-inline-precompile-test.js

@@ -1,12 +0,0 @@
-import * as Handlebars from 'handlebars/runtime';
-import hbs from 'handlebars-inline-precompile';
-import {assertEquals} from '../../webpack-test/src/lib/assert';
-
-Handlebars.registerHelper('loud', function(text) {
-    return text.toUpperCase();
-});
-
-const template = hbs`{{loud name}}`;
-const output = template({name: 'yehuda'});
-
-assertEquals(output, 'YEHUDA');

integration-testing/webpack-babel-test/src/lib/assert.js

@@ -1,5 +0,0 @@
-export function assertEquals(actual, expected) {
-    if (actual !== expected) {
-        throw new Error(`Expected "${actual}" to equal "${expected}"`);
-    }
-}

integration-testing/webpack-babel-test/test.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Cleanup: package-lock and "npm ci" is not working with local dependencies
-rm dist package-lock.json -rf
-npm install
-npm run build
-
-for i in dist/*-test.js ; do
-  echo "----------------------"
-  echo "-- Running $i"
-  echo "----------------------"
-  node "$i"
-  echo "Success"
-done

integration-testing/webpack-babel-test/webpack.config.js

@@ -1,33 +0,0 @@
-const fs = require('fs');
-
-const testFiles = fs.readdirSync('src');
-const entryPoints = {};
-testFiles
-    .filter(file => file.match(/-test.js$/))
-    .forEach(file => {
-        entryPoints[file] = `./src/${file}`;
-    });
-
-module.exports = {
-    entry: entryPoints,
-    mode: 'production',
-    output: {
-        filename: '[name]',
-        path: __dirname + '/dist'
-    },
-    module: {
-        rules: [
-            {
-                test: /\.js?$/,
-                exclude: /node_modules/,
-                use: {
-                    loader: 'babel-loader',
-                    options: { cacheDirectory: false },
-                }
-            }
-        ]
-    },
-    optimization: {
-        minimize: false
-    }
-};

integration-testing/webpack-test/.gitignore

@@ -1,3 +0,0 @@
-node_modules
-dist
-package-lock.json

integration-testing/webpack-test/package.json

@@ -1,21 +0,0 @@
-{
-  "name": "webpack-test",
-  "description": "Various tests with Handlebars and Webpack",
-  "version": "1.0.0",
-  "main": "index.js",
-  "scripts": {
-    "build": "webpack --config webpack.config.js",
-    "test": "node dist/main.js"
-  },
-  "private": true,
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {},
-  "devDependencies": {
-    "handlebars": "file:../..",
-    "handlebars-loader": "^1.7.1",
-    "webpack": "^4.39.3",
-    "webpack-cli": "^3.3.7"
-  }
-}

integration-testing/webpack-test/src/handlebars-default-import-pre-4.2-test.js

@@ -1,6 +0,0 @@
-import Handlebars from 'handlebars/dist/handlebars';
-
-import {assertEquals} from './lib/assert';
-
-const template = Handlebars.compile('Author: {{author}}');
-assertEquals(template({author: 'Yehuda'}), 'Author: Yehuda');

integration-testing/webpack-test/src/handlebars-default-import-test.js

@@ -1,6 +0,0 @@
-import Handlebars from 'handlebars';
-import {assertEquals} from './lib/assert';
-
-
-const template = Handlebars.compile('Author: {{author}}');
-assertEquals(template({author: 'Yehuda'}), 'Author: Yehuda');

integration-testing/webpack-test/src/handlebars-loader-test.js

@@ -1,8 +0,0 @@
-import {assertEquals} from './lib/assert';
-
-import testTemplate from './test-template.handlebars';
-assertEquals(testTemplate({author: 'Yehuda'}).trim(), 'Author: Yehuda');
-
-
-const testTemplateRequire = require('./test-template.handlebars');
-assertEquals(testTemplateRequire({author: 'Yehuda'}).trim(), 'Author: Yehuda');

integration-testing/webpack-test/src/handlebars-require-vs-import-test.js

@@ -1,10 +0,0 @@
-import * as HandlebarsViaImport from 'handlebars';
-const HandlebarsViaRequire = require('handlebars');
-import {assertEquals} from './lib/assert';
-
-HandlebarsViaImport.registerHelper('loud', function(text) {
-    return text.toUpperCase();
-});
-
-const template = HandlebarsViaRequire.compile('Author: {{loud author}}');
-assertEquals(template({author: 'Yehuda'}), 'Author: YEHUDA');

integration-testing/webpack-test/src/handlebars-wildcard-import-pre-4.2-test.js

@@ -1,6 +0,0 @@
-import * as Handlebars from 'handlebars/dist/handlebars';
-
-import {assertEquals} from './lib/assert';
-
-const template = Handlebars.compile('Author: {{author}}');
-assertEquals(template({author: 'Yehuda'}), 'Author: Yehuda');

integration-testing/webpack-test/src/handlebars-wildcard-import-test.js

@@ -1,5 +0,0 @@
-import * as Handlebars from 'handlebars';
-import {assertEquals} from './lib/assert';
-
-const template = Handlebars.compile('Author: {{author}}');
-assertEquals(template({author: 'Yehuda'}), 'Author: Yehuda');

integration-testing/webpack-test/src/lib/assert.js

@@ -1,5 +0,0 @@
-export function assertEquals(actual, expected) {
-    if (actual !== expected) {
-        throw new Error(`Expected "${actual}" to equal "${expected}"`);
-    }
-}

integration-testing/webpack-test/src/test-template.handlebars

@@ -1,2 +0,0 @@
-Author: {{author}}
-

integration-testing/webpack-test/test.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Cleanup: package-lock and "npm ci" is not working with local dependencies
-rm dist package-lock.json -rf
-npm install
-npm run build
-
-for i in dist/*-test.js ; do
-  echo "----------------------"
-  echo "-- Running $i"
-  echo "----------------------"
-  node "$i"
-  echo "Success"
-done

integration-testing/webpack-test/webpack.config.js

@@ -1,22 +0,0 @@
-const fs = require('fs');
-
-const testFiles = fs.readdirSync('src');
-const entryPoints = {};
-testFiles
-    .filter(file => file.match(/-test.js$/))
-    .forEach(file => {
-        entryPoints[file] = `./src/${file}`;
-    });
-
-module.exports = {
-    entry: entryPoints,
-    output: {
-        filename: '[name]',
-        path: __dirname + '/dist'
-    },
-    module: {
-        rules: [
-            {test: /\.handlebars$/, loader: 'handlebars-loader'}
-        ]
-    }
-};

lib/handlebars.js

@@ -2,16 +2,17 @@ import runtime from './handlebars.runtime';
 
 // Compiler imports
 import AST from './handlebars/compiler/ast';
-import { parser as Parser, parse, parseWithoutProcessing } from './handlebars/compiler/base';
+import { parser as Parser, parse } from './handlebars/compiler/base';
 import { Compiler, compile, precompile } from './handlebars/compiler/compiler';
 import JavaScriptCompiler from './handlebars/compiler/javascript-compiler';
 import Visitor from './handlebars/compiler/visitor';
 
 import noConflict from './handlebars/no-conflict';
 
+let _create = runtime.create;
 function create() {
-  let hb = runtime.create();
-  hb.create = create;
+  let hb = _create();
+
   hb.compile = function(input, options) {
     return compile(input, options, hb);
   };
@@ -24,12 +25,13 @@ function create() {
   hb.JavaScriptCompiler = JavaScriptCompiler;
   hb.Parser = Parser;
   hb.parse = parse;
-  hb.parseWithoutProcessing = parseWithoutProcessing;
 
   return hb;
 }
 
 let inst = create();
+inst.create = create;
+
 noConflict(inst);
 
 inst.Visitor = Visitor;

lib/handlebars.runtime.js

@@ -4,52 +4,31 @@ import * as base from './handlebars/base';
 // (This is done to easily share code between commonjs and browse envs)
 import SafeString from './handlebars/safe-string';
 import Exception from './handlebars/exception';
-import {
-  extend,
-  toString,
-  isFunction,
-  isArray,
-  indexOf,
-  escapeExpression,
-  isEmpty,
-  createFrame,
-  blockParams,
-  appendContextPath
-} from './handlebars/utils';
-import {checkRevision, template, wrapProgram, resolvePartial, invokePartial, noop} from './handlebars/runtime';
+import * as Utils from './handlebars/utils';
+import * as runtime from './handlebars/runtime';
 
 import noConflict from './handlebars/no-conflict';
 
 // For compatibility and usage outside of module systems, make the Handlebars object a namespace
-export function create() {
+function create() {
   let hb = new base.HandlebarsEnvironment();
 
-  extend(hb, base);
+  Utils.extend(hb, base);
   hb.SafeString = SafeString;
   hb.Exception = Exception;
-  hb.Utils = {
-    extend,
-    toString,
-    isFunction,
-    isArray,
-    indexOf,
-    escapeExpression,
-    isEmpty,
-    createFrame,
-    blockParams,
-    appendContextPath
-  };
-  hb.escapeExpression = escapeExpression;
-  hb.create = create;
-  hb.VM = {checkRevision, template, wrapProgram, resolvePartial, invokePartial, noop};
+  hb.Utils = Utils;
+  hb.escapeExpression = Utils.escapeExpression;
+
+  hb.VM = runtime;
   hb.template = function(spec) {
-    return template(spec, hb);
+    return runtime.template(spec, hb);
   };
 
   return hb;
 }
 
 let inst = create();
+inst.create = create;
 
 noConflict(inst);
 

lib/handlebars/base.js

@@ -1,12 +1,8 @@
-import {createFrame, extend, toString} from './utils';
+import * as Utils from './utils';
 import Exception from './exception';
-import {registerDefaultHelpers} from './helpers';
-import {registerDefaultDecorators} from './decorators';
-import logger from './logger';
 
-export const VERSION = '4.5.3';
-export const COMPILER_REVISION = 8;
-export const LAST_COMPATIBLE_COMPILER_REVISION = 7;
+export const VERSION = '3.0.1';
+export const COMPILER_REVISION = 6;
 
 export const REVISION_CHANGES = {
   1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it
@@ -14,32 +10,31 @@ export const REVISION_CHANGES = {
   3: '== 1.0.0-rc.4',
   4: '== 1.x.x',
   5: '== 2.0.0-alpha.x',
-  6: '>= 2.0.0-beta.1',
-  7: '>= 4.0.0 <4.3.0',
-  8: '>= 4.3.0'
+  6: '>= 2.0.0-beta.1'
 };
 
-const objectType = '[object Object]';
+const isArray = Utils.isArray,
+      isFunction = Utils.isFunction,
+      toString = Utils.toString,
+      objectType = '[object Object]';
 
-export function HandlebarsEnvironment(helpers, partials, decorators) {
+export function HandlebarsEnvironment(helpers, partials) {
   this.helpers = helpers || {};
   this.partials = partials || {};
-  this.decorators = decorators || {};
 
   registerDefaultHelpers(this);
-  registerDefaultDecorators(this);
 }
 
 HandlebarsEnvironment.prototype = {
   constructor: HandlebarsEnvironment,
 
   logger: logger,
-  log: logger.log,
+  log: log,
 
   registerHelper: function(name, fn) {
     if (toString.call(name) === objectType) {
       if (fn) { throw new Exception('Arg not supported with multiple helpers'); }
-      extend(this.helpers, name);
+      Utils.extend(this.helpers, name);
     } else {
       this.helpers[name] = fn;
     }
@@ -50,31 +45,206 @@ HandlebarsEnvironment.prototype = {
 
   registerPartial: function(name, partial) {
     if (toString.call(name) === objectType) {
-      extend(this.partials, name);
+      Utils.extend(this.partials, name);
     } else {
       if (typeof partial === 'undefined') {
-        throw new Exception(`Attempting to register a partial called "${name}" as undefined`);
+        throw new Exception('Attempting to register a partial as undefined');
       }
       this.partials[name] = partial;
     }
   },
   unregisterPartial: function(name) {
     delete this.partials[name];
-  },
+  }
+};
 
-  registerDecorator: function(name, fn) {
-    if (toString.call(name) === objectType) {
-      if (fn) { throw new Exception('Arg not supported with multiple decorators'); }
-      extend(this.decorators, name);
+function registerDefaultHelpers(instance) {
+  instance.registerHelper('helperMissing', function(/* [args, ]options */) {
+    if (arguments.length === 1) {
+      // A missing field in a {{foo}} constuct.
+      return undefined;
     } else {
-      this.decorators[name] = fn;
+      // Someone is actually trying to call something, blow up.
+      throw new Exception('Missing helper: "' + arguments[arguments.length - 1].name + '"');
+    }
+  });
+
+  instance.registerHelper('blockHelperMissing', function(context, options) {
+    let inverse = options.inverse,
+        fn = options.fn;
+
+    if (context === true) {
+      return fn(this);
+    } else if (context === false || context == null) {
+      return inverse(this);
+    } else if (isArray(context)) {
+      if (context.length > 0) {
+        if (options.ids) {
+          options.ids = [options.name];
+        }
+
+        return instance.helpers.each(context, options);
+      } else {
+        return inverse(this);
+      }
+    } else {
+      if (options.data && options.ids) {
+        let data = createFrame(options.data);
+        data.contextPath = Utils.appendContextPath(options.data.contextPath, options.name);
+        options = {data: data};
+      }
+
+      return fn(context, options);
+    }
+  });
+
+  instance.registerHelper('each', function(context, options) {
+    if (!options) {
+      throw new Exception('Must pass iterator to #each');
+    }
+
+    let fn = options.fn,
+        inverse = options.inverse,
+        i = 0,
+        ret = '',
+        data,
+        contextPath;
+
+    if (options.data && options.ids) {
+      contextPath = Utils.appendContextPath(options.data.contextPath, options.ids[0]) + '.';
+    }
+
+    if (isFunction(context)) { context = context.call(this); }
+
+    if (options.data) {
+      data = createFrame(options.data);
+    }
+
+    function execIteration(field, index, last) {
+      if (data) {
+        data.key = field;
+        data.index = index;
+        data.first = index === 0;
+        data.last = !!last;
+
+        if (contextPath) {
+          data.contextPath = contextPath + field;
+        }
+      }
+
+      ret = ret + fn(context[field], {
+        data: data,
+        blockParams: Utils.blockParams([context[field], field], [contextPath + field, null])
+      });
+    }
+
+    if (context && typeof context === 'object') {
+      if (isArray(context)) {
+        for (let j = context.length; i < j; i++) {
+          execIteration(i, i, i === context.length - 1);
+        }
+      } else {
+        let priorKey;
+
+        for (let key in context) {
+          if (context.hasOwnProperty(key)) {
+            // We're running the iterations one step out of sync so we can detect
+            // the last iteration without have to scan the object twice and create
+            // an itermediate keys array.
+            if (priorKey) {
+              execIteration(priorKey, i - 1);
+            }
+            priorKey = key;
+            i++;
+          }
+        }
+        if (priorKey) {
+          execIteration(priorKey, i - 1, true);
+        }
+      }
+    }
+
+    if (i === 0) {
+      ret = inverse(this);
+    }
+
+    return ret;
+  });
+
+  instance.registerHelper('if', function(conditional, options) {
+    if (isFunction(conditional)) { conditional = conditional.call(this); }
+
+    // Default behavior is to render the positive path if the value is truthy and not empty.
+    // The `includeZero` option may be set to treat the condtional as purely not empty based on the
+    // behavior of isEmpty. Effectively this determines if 0 is handled by the positive path or negative.
+    if ((!options.hash.includeZero && !conditional) || Utils.isEmpty(conditional)) {
+      return options.inverse(this);
+    } else {
+      return options.fn(this);
+    }
+  });
+
+  instance.registerHelper('unless', function(conditional, options) {
+    return instance.helpers['if'].call(this, conditional, {fn: options.inverse, inverse: options.fn, hash: options.hash});
+  });
+
+  instance.registerHelper('with', function(context, options) {
+    if (isFunction(context)) { context = context.call(this); }
+
+    let fn = options.fn;
+
+    if (!Utils.isEmpty(context)) {
+      if (options.data && options.ids) {
+        let data = createFrame(options.data);
+        data.contextPath = Utils.appendContextPath(options.data.contextPath, options.ids[0]);
+        options = {data: data};
+      }
+
+      return fn(context, options);
+    } else {
+      return options.inverse(this);
+    }
+  });
+
+  instance.registerHelper('log', function(message, options) {
+    let level = options.data && options.data.level != null ? parseInt(options.data.level, 10) : 1;
+    instance.log(level, message);
+  });
+
+  instance.registerHelper('lookup', function(obj, field) {
+    if (!obj) {
+      return obj;
+    }
+    if (Utils.dangerousPropertyRegex.test(String(field)) && !Object.prototype.hasOwnProperty.call(obj, field)) {
+      return undefined;
+    }
+    return obj[field];
+  });
+}
+
+export let logger = {
+  methodMap: { 0: 'debug', 1: 'info', 2: 'warn', 3: 'error' },
+
+  // State enum
+  DEBUG: 0,
+  INFO: 1,
+  WARN: 2,
+  ERROR: 3,
+  level: 1,
+
+  // Can be overridden in the host environment
+  log: function(level, message) {
+    if (typeof console !== 'undefined' && logger.level <= level) {
+      let method = logger.methodMap[level];
+      (console[method] || console.log).call(console, message);    // eslint-disable-line no-console
     }
-  },
-  unregisterDecorator: function(name) {
-    delete this.decorators[name];
   }
 };
 
 export let log = logger.log;
 
-export {createFrame, logger};
+export function createFrame(object) {
+  let frame = Utils.extend({}, object);
+  frame._parent = object;
+  return frame;
+}

lib/handlebars/compiler/ast.js

@@ -1,13 +1,137 @@
 let AST = {
+  Program: function(statements, blockParams, strip, locInfo) {
+    this.loc = locInfo;
+    this.type = 'Program';
+    this.body = statements;
+
+    this.blockParams = blockParams;
+    this.strip = strip;
+  },
+
+  MustacheStatement: function(path, params, hash, escaped, strip, locInfo) {
+    this.loc = locInfo;
+    this.type = 'MustacheStatement';
+
+    this.path = path;
+    this.params = params || [];
+    this.hash = hash;
+    this.escaped = escaped;
+
+    this.strip = strip;
+  },
+
+  BlockStatement: function(path, params, hash, program, inverse, openStrip, inverseStrip, closeStrip, locInfo) {
+    this.loc = locInfo;
+    this.type = 'BlockStatement';
+
+    this.path = path;
+    this.params = params || [];
+    this.hash = hash;
+    this.program = program;
+    this.inverse = inverse;
+
+    this.openStrip = openStrip;
+    this.inverseStrip = inverseStrip;
+    this.closeStrip = closeStrip;
+  },
+
+  PartialStatement: function(name, params, hash, strip, locInfo) {
+    this.loc = locInfo;
+    this.type = 'PartialStatement';
+
+    this.name = name;
+    this.params = params || [];
+    this.hash = hash;
+
+    this.indent = '';
+    this.strip = strip;
+  },
+
+  ContentStatement: function(string, locInfo) {
+    this.loc = locInfo;
+    this.type = 'ContentStatement';
+    this.original = this.value = string;
+  },
+
+  CommentStatement: function(comment, strip, locInfo) {
+    this.loc = locInfo;
+    this.type = 'CommentStatement';
+    this.value = comment;
+
+    this.strip = strip;
+  },
+
+  SubExpression: function(path, params, hash, locInfo) {
+    this.loc = locInfo;
+
+    this.type = 'SubExpression';
+    this.path = path;
+    this.params = params || [];
+    this.hash = hash;
+  },
+
+  PathExpression: function(data, depth, parts, original, locInfo) {
+    this.loc = locInfo;
+    this.type = 'PathExpression';
+
+    this.data = data;
+    this.original = original;
+    this.parts = parts;
+    this.depth = depth;
+  },
+
+  StringLiteral: function(string, locInfo) {
+    this.loc = locInfo;
+    this.type = 'StringLiteral';
+    this.original =
+      this.value = string;
+  },
+
+  NumberLiteral: function(number, locInfo) {
+    this.loc = locInfo;
+    this.type = 'NumberLiteral';
+    this.original =
+      this.value = Number(number);
+  },
+
+  BooleanLiteral: function(bool, locInfo) {
+    this.loc = locInfo;
+    this.type = 'BooleanLiteral';
+    this.original =
+      this.value = bool === 'true';
+  },
+
+  UndefinedLiteral: function(locInfo) {
+    this.loc = locInfo;
+    this.type = 'UndefinedLiteral';
+    this.original = this.value = undefined;
+  },
+
+  NullLiteral: function(locInfo) {
+    this.loc = locInfo;
+    this.type = 'NullLiteral';
+    this.original = this.value = null;
+  },
+
+  Hash: function(pairs, locInfo) {
+    this.loc = locInfo;
+    this.type = 'Hash';
+    this.pairs = pairs;
+  },
+  HashPair: function(key, value, locInfo) {
+    this.loc = locInfo;
+    this.type = 'HashPair';
+    this.key = key;
+    this.value = value;
+  },
+
   // Public API used to evaluate derived attributes regarding AST nodes
   helpers: {
     // a mustache is definitely a helper if:
     // * it is an eligible helper, and
     // * it has at least one parameter or hash segment
     helperExpression: function(node) {
-      return (node.type === 'SubExpression')
-          || ((node.type === 'MustacheStatement' || node.type === 'BlockStatement')
-            && !!((node.params && node.params.length) || node.hash));
+      return !!(node.type === 'SubExpression' || node.params.length || node.hash);
     },
 
     scopedId: function(path) {

lib/handlebars/compiler/base.js

@@ -1,4 +1,5 @@
 import parser from './parser';
+import AST from './ast';
 import WhitespaceControl from './whitespace-control';
 import * as Helpers from './helpers';
 import { extend } from '../utils';
@@ -6,9 +7,9 @@ import { extend } from '../utils';
 export { parser };
 
 let yy = {};
-extend(yy, Helpers);
+extend(yy, Helpers, AST);
 
-export function parseWithoutProcessing(input, options) {
+export function parse(input, options) {
   // Just return if an already-compiled AST was passed in.
   if (input.type === 'Program') { return input; }
 
@@ -19,14 +20,6 @@ export function parseWithoutProcessing(input, options) {
     return new yy.SourceLocation(options && options.srcName, locInfo);
   };
 
-  let ast = parser.parse(input);
-
-  return ast;
-}
-
-export function parse(input, options) {
-  let ast = parseWithoutProcessing(input, options);
-  let strip = new WhitespaceControl(options);
-
-  return strip.accept(ast);
+  let strip = new WhitespaceControl();
+  return strip.accept(parser.parse(input));
 }

lib/handlebars/compiler/code-gen.js

@@ -1,11 +1,16 @@
+/*global define */
 import {isArray} from '../utils';
 
 let SourceNode;
 
 try {
-  // the 'source-map' map package is ignored in 'umd' and 'amd' builds (via webpack-config)
-  let SourceMap = require('source-map');
-  SourceNode = SourceMap.SourceNode;
+  /* istanbul ignore next */
+  if (typeof define !== 'function' || !define.amd) {
+    // We don't support this in AMD environments. For these environments, we asusme that
+    // they are running on the browser and thus have no need for the source-map library.
+    let SourceMap = require('source-map');
+    SourceNode = SourceMap.SourceNode;
+  }
 } catch (err) {
   /* NOP */
 }
@@ -64,9 +69,6 @@ function CodeGen(srcFile) {
 }
 
 CodeGen.prototype = {
-  isEmpty() {
-    return !this.source.length;
-  },
   prepend: function(source, loc) {
     this.source.unshift(this.wrap(source, loc));
   },
@@ -88,8 +90,7 @@ CodeGen.prototype = {
     }
   },
 
-  empty: function() {
-    let loc = this.currentLocation || {start: {}};
+  empty: function(loc = this.currentLocation || {start: {}}) {
     return new SourceNode(loc.start.line, loc.start.column, this.srcFile);
   },
   wrap: function(chunk, loc = this.currentLocation || {start: {}}) {
@@ -113,19 +114,21 @@ CodeGen.prototype = {
       .replace(/"/g, '\\"')
       .replace(/\n/g, '\\n')
       .replace(/\r/g, '\\r')
-      .replace(/\u2028/g, '\\u2028') // Per Ecma-262 7.3 + 7.8.4
+      .replace(/\u2028/g, '\\u2028')   // Per Ecma-262 7.3 + 7.8.4
       .replace(/\u2029/g, '\\u2029') + '"';
   },
 
   objectLiteral: function(obj) {
     let pairs = [];
 
-    Object.keys(obj).forEach(key => {
-      let value = castChunk(obj[key], this);
-      if (value !== 'undefined') {
-        pairs.push([this.quotedString(key), ':', value]);
+    for (let key in obj) {
+      if (obj.hasOwnProperty(key)) {
+        let value = castChunk(obj[key], this);
+        if (value !== 'undefined') {
+          pairs.push([this.quotedString(key), ':', value]);
+        }
       }
-    });
+    }
 
     let ret = this.generateList(pairs);
     ret.prepend('{');
@@ -134,22 +137,22 @@ CodeGen.prototype = {
   },
 
 
-  generateList: function(entries) {
-    let ret = this.empty();
+  generateList: function(entries, loc) {
+    let ret = this.empty(loc);
 
     for (let i = 0, len = entries.length; i < len; i++) {
       if (i) {
         ret.add(',');
       }
 
-      ret.add(castChunk(entries[i], this));
+      ret.add(castChunk(entries[i], this, loc));
     }
 
     return ret;
   },
 
-  generateArray: function(entries) {
-    let ret = this.generateList(entries);
+  generateArray: function(entries, loc) {
+    let ret = this.generateList(entries, loc);
     ret.prepend('[');
     ret.add(']');
 

lib/handlebars/compiler/compiler.js

@@ -1,7 +1,5 @@
-/* eslint-disable new-cap */
-
 import Exception from '../exception';
-import {isArray, indexOf, extend} from '../utils';
+import {isArray, indexOf} from '../utils';
 import AST from './ast';
 
 const slice = [].slice;
@@ -54,7 +52,9 @@ Compiler.prototype = {
 
     options.blockParams = options.blockParams || [];
 
-    options.knownHelpers = extend(Object.create(null), {
+    // These changes will propagate to the other compiler components
+    let knownHelpers = options.knownHelpers;
+    options.knownHelpers = {
       'helperMissing': true,
       'blockHelperMissing': true,
       'each': true,
@@ -63,7 +63,14 @@ Compiler.prototype = {
       'with': true,
       'log': true,
       'lookup': true
-    }, options.knownHelpers);
+    };
+    if (knownHelpers) {
+      for (let name in knownHelpers) {
+        if (name in knownHelpers) {
+          options.knownHelpers[name] = knownHelpers[name];
+        }
+      }
+    }
 
     return this.accept(program);
   },
@@ -82,11 +89,6 @@ Compiler.prototype = {
   },
 
   accept: function(node) {
-    /* istanbul ignore next: Sanity code */
-    if (!this[node.type]) {
-      throw new Exception('Unknown type: ' + node.type, node);
-    }
-
     this.sourceNode.unshift(node);
     let ret = this[node.type](node);
     this.sourceNode.shift();
@@ -146,32 +148,14 @@ Compiler.prototype = {
     this.opcode('append');
   },
 
-  DecoratorBlock(decorator) {
-    let program = decorator.program && this.compileProgram(decorator.program);
-    let params = this.setupFullMustacheParams(decorator, program, undefined),
-        path = decorator.path;
-
-    this.useDecorators = true;
-    this.opcode('registerDecorator', params.length, path.original);
-  },
-
   PartialStatement: function(partial) {
     this.usePartial = true;
 
-    let program = partial.program;
-    if (program) {
-      program = this.compileProgram(partial.program);
-    }
-
     let params = partial.params;
     if (params.length > 1) {
       throw new Exception('Unsupported number of partial arguments: ' + params.length, partial);
     } else if (!params.length) {
-      if (this.options.explicitPartialContext) {
-        this.opcode('pushLiteral', 'undefined');
-      } else {
-        params.push({type: 'PathExpression', parts: [], depth: 0});
-      }
+      params.push({type: 'PathExpression', parts: [], depth: 0});
     }
 
     let partialName = partial.name.original,
@@ -180,7 +164,7 @@ Compiler.prototype = {
       this.accept(partial.name);
     }
 
-    this.setupFullMustacheParams(partial, program, undefined, true);
+    this.setupFullMustacheParams(partial, undefined, undefined, true);
 
     let indent = partial.indent || '';
     if (this.options.preventIndent && indent) {
@@ -191,12 +175,9 @@ Compiler.prototype = {
     this.opcode('invokePartial', isDynamic, partialName, indent);
     this.opcode('append');
   },
-  PartialBlockStatement: function(partialBlock) {
-    this.PartialStatement(partialBlock);
-  },
 
   MustacheStatement: function(mustache) {
-    this.SubExpression(mustache);
+    this.SubExpression(mustache);   // eslint-disable-line new-cap
 
     if (mustache.escaped && !this.options.noEscape) {
       this.opcode('appendEscaped');
@@ -204,10 +185,6 @@ Compiler.prototype = {
       this.opcode('append');
     }
   },
-  Decorator(decorator) {
-    this.DecoratorBlock(decorator);
-  },
-
 
   ContentStatement: function(content) {
     if (content.value) {
@@ -239,16 +216,13 @@ Compiler.prototype = {
     this.opcode('pushProgram', program);
     this.opcode('pushProgram', inverse);
 
-    path.strict = true;
     this.accept(path);
 
     this.opcode('invokeAmbiguous', name, isBlock);
   },
 
   simpleSexpr: function(sexpr) {
-    let path = sexpr.path;
-    path.strict = true;
-    this.accept(path);
+    this.accept(sexpr.path);
     this.opcode('resolvePossibleLambda');
   },
 
@@ -262,7 +236,6 @@ Compiler.prototype = {
     } else if (this.options.knownHelpersOnly) {
       throw new Exception('You specified knownHelpersOnly, but used the unknown helper ' + name, sexpr);
     } else {
-      path.strict = true;
       path.falsy = true;
 
       this.accept(path);
@@ -285,9 +258,9 @@ Compiler.prototype = {
       this.opcode('pushContext');
     } else if (path.data) {
       this.options.data = true;
-      this.opcode('lookupData', path.depth, path.parts, path.strict);
+      this.opcode('lookupData', path.depth, path.parts);
     } else {
-      this.opcode('lookupOnContext', path.parts, path.falsy, path.strict, scoped);
+      this.opcode('lookupOnContext', path.parts, path.falsy, scoped);
     }
   },
 
@@ -359,6 +332,7 @@ Compiler.prototype = {
     if (isEligible && !isHelper) {
       let name = sexpr.path.parts[0],
           options = this.options;
+
       if (options.knownHelpers[name]) {
         isHelper = true;
       } else if (options.knownHelpersOnly) {
@@ -415,9 +389,8 @@ Compiler.prototype = {
           value = val.original || value;
           if (value.replace) {
             value = value
-                .replace(/^this(?:\.|$)/, '')
-                .replace(/^\.\//, '')
-                .replace(/^\.$/, '');
+                .replace(/^\.\//g, '')
+                .replace(/^\.$/g, '');
           }
 
           this.opcode('pushId', val.type, value);
@@ -477,7 +450,6 @@ export function compile(input, options = {}, env) {
     throw new Exception('You must pass a string or Handlebars AST to Handlebars.compile. You passed ' + input);
   }
 
-  options = extend({}, options);
   if (!('data' in options)) {
     options.data = true;
   }
@@ -536,13 +508,6 @@ function transformLiteralToPath(sexpr) {
     let literal = sexpr.path;
     // Casting to string here to make false and 0 literal values play nicely with the rest
     // of the system.
-    sexpr.path = {
-      type: 'PathExpression',
-      data: false,
-      depth: 0,
-      parts: [literal.original + ''],
-      original: literal.original + '',
-      loc: literal.loc
-    };
+    sexpr.path = new AST.PathExpression(false, 0, [literal.original + ''], literal.original + '', literal.loc);
   }
 }

lib/handlebars/compiler/helpers.js

@@ -1,15 +1,5 @@
 import Exception from '../exception';
 
-function validateClose(open, close) {
-  close = close.path ? close.path.original : close;
-
-  if (open.path.original !== close) {
-    let errorNode = {loc: open.path.loc};
-
-    throw new Exception(open.path.original + " doesn't match " + close, errorNode);
-  }
-}
-
 export function SourceLocation(source, locInfo) {
   this.source = source;
   this.start = {
@@ -24,7 +14,7 @@ export function SourceLocation(source, locInfo) {
 
 export function id(token) {
   if (/^\[.*\]$/.test(token)) {
-    return token.substring(1, token.length - 1);
+    return token.substr(1, token.length - 2);
   } else {
     return token;
   }
@@ -38,16 +28,17 @@ export function stripFlags(open, close) {
 }
 
 export function stripComment(comment) {
-  return comment.replace(/^\{\{~?!-?-?/, '')
+  return comment.replace(/^\{\{~?\!-?-?/, '')
                 .replace(/-?-?~?\}\}$/, '');
 }
 
-export function preparePath(data, parts, loc) {
-  loc = this.locInfo(loc);
+export function preparePath(data, parts, locInfo) {
+  locInfo = this.locInfo(locInfo);
 
   let original = data ? '@' : '',
       dig = [],
-      depth = 0;
+      depth = 0,
+      depthString = '';
 
   for (let i = 0, l = parts.length; i < l; i++) {
     let part = parts[i].part,
@@ -58,23 +49,17 @@ export function preparePath(data, parts, loc) {
 
     if (!isLiteral && (part === '..' || part === '.' || part === 'this')) {
       if (dig.length > 0) {
-        throw new Exception('Invalid path: ' + original, {loc});
+        throw new Exception('Invalid path: ' + original, {loc: locInfo});
       } else if (part === '..') {
         depth++;
+        depthString += '../';
       }
     } else {
       dig.push(part);
     }
   }
 
-  return {
-    type: 'PathExpression',
-    data,
-    depth,
-    parts: dig,
-    original,
-    loc
-  };
+  return new this.PathExpression(data, depth, dig, original, locInfo);
 }
 
 export function prepareMustache(path, params, hash, open, strip, locInfo) {
@@ -82,48 +67,33 @@ export function prepareMustache(path, params, hash, open, strip, locInfo) {
   let escapeFlag = open.charAt(3) || open.charAt(2),
       escaped = escapeFlag !== '{' && escapeFlag !== '&';
 
-  let decorator = (/\*/.test(open));
-  return {
-    type: decorator ? 'Decorator' : 'MustacheStatement',
-    path,
-    params,
-    hash,
-    escaped,
-    strip,
-    loc: this.locInfo(locInfo)
-  };
+  return new this.MustacheStatement(path, params, hash, escaped, strip, this.locInfo(locInfo));
 }
 
-export function prepareRawBlock(openRawBlock, contents, close, locInfo) {
-  validateClose(openRawBlock, close);
+export function prepareRawBlock(openRawBlock, content, close, locInfo) {
+  if (openRawBlock.path.original !== close) {
+    let errorNode = {loc: openRawBlock.path.loc};
+
+    throw new Exception(openRawBlock.path.original + " doesn't match " + close, errorNode);
+  }
 
   locInfo = this.locInfo(locInfo);
-  let program = {
-    type: 'Program',
-    body: contents,
-    strip: {},
-    loc: locInfo
-  };
+  let program = new this.Program([content], null, {}, locInfo);
 
-  return {
-    type: 'BlockStatement',
-    path: openRawBlock.path,
-    params: openRawBlock.params,
-    hash: openRawBlock.hash,
-    program,
-    openStrip: {},
-    inverseStrip: {},
-    closeStrip: {},
-    loc: locInfo
-  };
+  return new this.BlockStatement(
+      openRawBlock.path, openRawBlock.params, openRawBlock.hash,
+      program, undefined,
+      {}, {}, {},
+      locInfo);
 }
 
 export function prepareBlock(openBlock, program, inverseAndProgram, close, inverted, locInfo) {
-  if (close && close.path) {
-    validateClose(openBlock, close);
-  }
+  // When we are chaining inverse calls, we will not have a close path
+  if (close && close.path && openBlock.path.original !== close.path.original) {
+    let errorNode = {loc: openBlock.path.loc};
 
-  let decorator = (/\*/.test(openBlock.open));
+    throw new Exception(openBlock.path.original + ' doesn\'t match ' + close.path.original, errorNode);
+  }
 
   program.blockParams = openBlock.blockParams;
 
@@ -131,10 +101,6 @@ export function prepareBlock(openBlock, program, inverseAndProgram, close, inver
       inverseStrip;
 
   if (inverseAndProgram) {
-    if (decorator) {
-      throw new Exception('Unexpected inverse block on decorator', inverseAndProgram);
-    }
-
     if (inverseAndProgram.chain) {
       inverseAndProgram.program.body[0].closeStrip = close.strip;
     }
@@ -149,62 +115,9 @@ export function prepareBlock(openBlock, program, inverseAndProgram, close, inver
     program = inverted;
   }
 
-  return {
-    type: decorator ? 'DecoratorBlock' : 'BlockStatement',
-    path: openBlock.path,
-    params: openBlock.params,
-    hash: openBlock.hash,
-    program,
-    inverse,
-    openStrip: openBlock.strip,
-    inverseStrip,
-    closeStrip: close && close.strip,
-    loc: this.locInfo(locInfo)
-  };
+  return new this.BlockStatement(
+      openBlock.path, openBlock.params, openBlock.hash,
+      program, inverse,
+      openBlock.strip, inverseStrip, close && close.strip,
+      this.locInfo(locInfo));
 }
-
-export function prepareProgram(statements, loc) {
-  if (!loc && statements.length) {
-    const firstLoc = statements[0].loc,
-          lastLoc = statements[statements.length - 1].loc;
-
-    /* istanbul ignore else */
-    if (firstLoc && lastLoc) {
-      loc = {
-        source: firstLoc.source,
-        start: {
-          line: firstLoc.start.line,
-          column: firstLoc.start.column
-        },
-        end: {
-          line: lastLoc.end.line,
-          column: lastLoc.end.column
-        }
-      };
-    }
-  }
-
-  return {
-    type: 'Program',
-    body: statements,
-    strip: {},
-    loc: loc
-  };
-}
-
-
-export function preparePartialBlock(open, program, close, locInfo) {
-  validateClose(open, close);
-
-  return {
-    type: 'PartialBlockStatement',
-    name: open.path,
-    params: open.params,
-    hash: open.hash,
-    program,
-    openStrip: open.strip,
-    closeStrip: close && close.strip,
-    loc: this.locInfo(locInfo)
-  };
-}
-

lib/handlebars/compiler/javascript-compiler.js

@@ -1,8 +1,7 @@
 import { COMPILER_REVISION, REVISION_CHANGES } from '../base';
 import Exception from '../exception';
-import {isArray} from '../utils';
+import {isArray, dangerousPropertyRegex} from '../utils';
 import CodeGen from './code-gen';
-import {dangerousPropertyRegex} from '../helpers/lookup';
 
 function Literal(value) {
   this.value = value;
@@ -13,10 +12,10 @@ function JavaScriptCompiler() {}
 JavaScriptCompiler.prototype = {
   // PUBLIC API: You can override these methods in a subclass to provide
   // alternative compiled forms for name lookup and buffering semantics
-  nameLookup: function(parent, name/* , type*/) {
+  nameLookup: function(parent, name /* , type*/) {
     if (dangerousPropertyRegex.test(name)) {
-      const isEnumerable = [ this.aliasable('container.propertyIsEnumerable'), '.call(', parent, ',', JSON.stringify(name), ')'];
-      return ['(', isEnumerable, '?', _actualLookup(), ' : undefined)'];
+      const isOwnProperty = [ this.aliasable('Object.prototype.hasOwnProperty'), '.call(', parent, ',', JSON.stringify(name), ')'];
+      return ['(', isOwnProperty, '?', _actualLookup(), ' : undefined)'];
     }
     return _actualLookup();
 
@@ -29,7 +28,7 @@ JavaScriptCompiler.prototype = {
     }
   },
   depthedLookup: function(name) {
-    return [this.aliasable('container.lookup'), '(depths, "', name, '")'];
+    return [this.aliasable('this.lookup'), '(depths, "', name, '")'];
   },
 
   compilerInfo: function() {
@@ -73,7 +72,6 @@ JavaScriptCompiler.prototype = {
     this.name = this.environment.name;
     this.isChild = !!context;
     this.context = context || {
-      decorators: [],
       programs: [],
       environments: []
     };
@@ -91,7 +89,7 @@ JavaScriptCompiler.prototype = {
 
     this.compileChildren(environment, options);
 
-    this.useDepths = this.useDepths || environment.useDepths || environment.useDecorators || this.options.compat;
+    this.useDepths = this.useDepths || environment.useDepths || this.options.compat;
     this.useBlockParams = this.useBlockParams || environment.useBlockParams;
 
     let opcodes = environment.opcodes,
@@ -117,43 +115,16 @@ JavaScriptCompiler.prototype = {
       throw new Exception('Compile completed with content left on stack');
     }
 
-    if (!this.decorators.isEmpty()) {
-      this.useDecorators = true;
-
-      this.decorators.prepend('var decorators = container.decorators;\n');
-      this.decorators.push('return fn;');
-
-      if (asObject) {
-        this.decorators = Function.apply(this, ['fn', 'props', 'container', 'depth0', 'data', 'blockParams', 'depths', this.decorators.merge()]);
-      } else {
-        this.decorators.prepend('function(fn, props, container, depth0, data, blockParams, depths) {\n');
-        this.decorators.push('}\n');
-        this.decorators = this.decorators.merge();
-      }
-    } else {
-      this.decorators = undefined;
-    }
-
     let fn = this.createFunctionContext(asObject);
     if (!this.isChild) {
       let ret = {
         compiler: this.compilerInfo(),
         main: fn
       };
-
-      if (this.decorators) {
-        ret.main_d = this.decorators; // eslint-disable-line camelcase
-        ret.useDecorators = true;
-      }
-
-      let {programs, decorators} = this.context;
+      let programs = this.context.programs;
       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;
-          }
         }
       }
 
@@ -200,7 +171,6 @@ JavaScriptCompiler.prototype = {
     // getContext opcode when it would be a noop
     this.lastContext = 0;
     this.source = new CodeGen(this.options.srcName);
-    this.decorators = new CodeGen(this.options.srcName);
   },
 
   createFunctionContext: function(asObject) {
@@ -218,15 +188,16 @@ JavaScriptCompiler.prototype = {
     // aliases will not be used, but this case is already being run on the client and
     // we aren't concern about minimizing the template size.
     let aliasCount = 0;
-    Object.keys(this.aliases).forEach(alias => {
+    for (let alias in this.aliases) {    // eslint-disable-line guard-for-in
       let node = this.aliases[alias];
-      if (node.children && node.referenceCount > 1) {
+
+      if (this.aliases.hasOwnProperty(alias) && node.children && node.referenceCount > 1) {
         varDeclarations += ', alias' + (++aliasCount) + '=' + alias;
         node.children[0] = 'alias' + aliasCount;
       }
-    });
+    }
 
-    let params = ['container', 'depth0', 'helpers', 'partials', 'data'];
+    let params = ['depth0', 'helpers', 'partials', 'data'];
 
     if (this.useBlockParams || this.useDepths) {
       params.push('blockParams');
@@ -316,7 +287,7 @@ JavaScriptCompiler.prototype = {
   // replace it on the stack with the result of properly
   // invoking blockHelperMissing.
   blockValue: function(name) {
-    let blockHelperMissing = this.aliasable('container.hooks.blockHelperMissing'),
+    let blockHelperMissing = this.aliasable('helpers.blockHelperMissing'),
         params = [this.contextName(0)];
     this.setupHelperArgs(name, 0, params);
 
@@ -334,7 +305,7 @@ JavaScriptCompiler.prototype = {
   // On stack, after, if lastHelper: value
   ambiguousBlockValue: function() {
     // We're being a bit cheeky and reusing the options value from the prior exec
-    let blockHelperMissing = this.aliasable('container.hooks.blockHelperMissing'),
+    let blockHelperMissing = this.aliasable('helpers.blockHelperMissing'),
         params = [this.contextName(0)];
     this.setupHelperArgs('', 0, params, true);
 
@@ -344,9 +315,9 @@ JavaScriptCompiler.prototype = {
     params.splice(1, 0, current);
 
     this.pushSource([
-      'if (!', this.lastHelper, ') { ',
-      current, ' = ', this.source.functionCall(blockHelperMissing, 'call', params),
-      '}']);
+        'if (!', this.lastHelper, ') { ',
+          current, ' = ', this.source.functionCall(blockHelperMissing, 'call', params),
+        '}']);
   },
 
   // [appendContent]
@@ -396,7 +367,7 @@ JavaScriptCompiler.prototype = {
   // Escape `value` and append it to the buffer
   appendEscaped: function() {
     this.pushSource(this.appendToBuffer(
-        [this.aliasable('container.escapeExpression'), '(', this.popStack(), ')']));
+        [this.aliasable('this.escapeExpression'), '(', this.popStack(), ')']));
   },
 
   // [getContext]
@@ -427,7 +398,7 @@ JavaScriptCompiler.prototype = {
   //
   // Looks up the value of `name` on the current context and pushes
   // it onto the stack.
-  lookupOnContext: function(parts, falsy, strict, scoped) {
+  lookupOnContext: function(parts, falsy, scoped) {
     let i = 0;
 
     if (!scoped && this.options.compat && !this.lastContext) {
@@ -438,7 +409,7 @@ JavaScriptCompiler.prototype = {
       this.pushContext();
     }
 
-    this.resolvePath('context', parts, i, falsy, strict);
+    this.resolvePath('context', parts, i, falsy);
   },
 
   // [lookupBlockParam]
@@ -461,25 +432,25 @@ JavaScriptCompiler.prototype = {
   // On stack, after: data, ...
   //
   // Push the data lookup operator
-  lookupData: function(depth, parts, strict) {
+  lookupData: function(depth, parts) {
     if (!depth) {
       this.pushStackLiteral('data');
     } else {
-      this.pushStackLiteral('container.data(data, ' + depth + ')');
+      this.pushStackLiteral('this.data(data, ' + depth + ')');
     }
 
-    this.resolvePath('data', parts, 0, true, strict);
+    this.resolvePath('data', parts, 0, true);
   },
 
-  resolvePath: function(type, parts, i, falsy, strict) {
+  resolvePath: function(type, parts, i, falsy) {
     if (this.options.strict || this.options.assumeObjects) {
-      this.push(strictLookup(this.options.strict && strict, this, parts, type));
+      this.push(strictLookup(this.options.strict, this, parts, type));
       return;
     }
 
     let len = parts.length;
     for (; i < len; i++) {
-      /* eslint-disable no-loop-func */
+      /*eslint-disable no-loop-func */
       this.replaceStack((current) => {
         let lookup = this.nameLookup(current, parts[i], type);
         // We want to ensure that zero and false are handled properly if the context (falsy flag)
@@ -491,7 +462,7 @@ JavaScriptCompiler.prototype = {
           return [' && ', lookup];
         }
       });
-      /* eslint-enable no-loop-func */
+      /*eslint-enable no-loop-func */
     }
   },
 
@@ -503,7 +474,7 @@ JavaScriptCompiler.prototype = {
   // If the `value` is a lambda, replace it on the stack by
   // the return value of the lambda
   resolvePossibleLambda: function() {
-    this.push([this.aliasable('container.lambda'), '(', this.popStack(), ', ', this.contextName(0), ')']);
+    this.push([this.aliasable('this.lambda'), '(', this.popStack(), ', ', this.contextName(0), ')']);
   },
 
   // [pushStringParam]
@@ -543,7 +514,7 @@ JavaScriptCompiler.prototype = {
     if (this.hash) {
       this.hashes.push(this.hash);
     }
-    this.hash = {values: {}, types: [], contexts: [], ids: []};
+    this.hash = {values: [], types: [], contexts: [], ids: []};
   },
   popHash: function() {
     let hash = this.hash;
@@ -598,24 +569,6 @@ JavaScriptCompiler.prototype = {
     }
   },
 
-  // [registerDecorator]
-  //
-  // On stack, before: hash, program, params..., ...
-  // On stack, after: ...
-  //
-  // Pops off the decorator's parameters, invokes the decorator,
-  // and inserts the decorator into the decorators list.
-  registerDecorator(paramSize, name) {
-    let foundDecorator = this.nameLookup('decorators', name, 'decorator'),
-        options = this.setupHelperArgs(name, paramSize);
-
-    this.decorators.push([
-      'fn = ',
-      this.decorators.functionCall(foundDecorator, '', ['fn', 'props', 'container', options]),
-      ' || fn;'
-    ]);
-  },
-
   // [invokeHelper]
   //
   // On stack, before: hash, inverse, program, params..., ...
@@ -627,32 +580,18 @@ JavaScriptCompiler.prototype = {
   // If the helper is not found, `helperMissing` is called.
   invokeHelper: function(paramSize, name, isSimple) {
     let nonHelper = this.popStack(),
-        helper = this.setupHelper(paramSize, name);
+        helper = this.setupHelper(paramSize, name),
+        simple = isSimple ? [helper.name, ' || '] : '';
 
-    let possibleFunctionCalls = [];
-
-    if (isSimple) { // direct call to helper
-      possibleFunctionCalls.push(helper.name);
-    }
-    // call a function from the input object
-    possibleFunctionCalls.push(nonHelper);
+    let lookup = ['('].concat(simple, nonHelper);
     if (!this.options.strict) {
-      possibleFunctionCalls.push(this.aliasable('container.hooks.helperMissing'));
+      lookup.push(' || ', this.aliasable('helpers.helperMissing'));
     }
+    lookup.push(')');
 
-    let functionLookupCode = ['(', this.itemsSeparatedBy(possibleFunctionCalls, '||'), ')'];
-    let functionCall = this.source.functionCall(functionLookupCode, 'call', helper.callParams);
-    this.push(functionCall);
+    this.push(this.source.functionCall(lookup, 'call', helper.callParams));
   },
 
-  itemsSeparatedBy: function(items, separator) {
-    let result = [];
-    result.push(items[0]);
-    for (let i = 1; i < items.length; i++) {
-      result.push(separator, items[i]);
-    }
-    return result;
-  },
   // [invokeKnownHelper]
   //
   // On stack, before: hash, inverse, program, params..., ...
@@ -691,16 +630,16 @@ JavaScriptCompiler.prototype = {
     if (!this.options.strict) {
       lookup[0] = '(helper = ';
       lookup.push(
-          ' != null ? helper : ',
-          this.aliasable('container.hooks.helperMissing')
+        ' != null ? helper : ',
+        this.aliasable('helpers.helperMissing')
       );
     }
 
     this.push([
-      '(', lookup,
-      (helper.paramsInit ? ['),(', helper.paramsInit] : []), '),',
-      '(typeof helper === ', this.aliasable('"function"'), ' ? ',
-      this.source.functionCall('helper', 'call', helper.callParams), ' : helper))'
+        '(', lookup,
+        (helper.paramsInit ? ['),(', helper.paramsInit] : []), '),',
+        '(typeof helper === ', this.aliasable('"function"'), ' ? ',
+        this.source.functionCall('helper', 'call', helper.callParams), ' : helper))'
     ]);
   },
 
@@ -713,7 +652,7 @@ JavaScriptCompiler.prototype = {
   // and pushes the result of the invocation back.
   invokePartial: function(isDynamic, name, indent) {
     let params = [],
-        options = this.setupParams(name, 1, params);
+        options = this.setupParams(name, 1, params, false);
 
     if (isDynamic) {
       name = this.popStack();
@@ -725,7 +664,6 @@ JavaScriptCompiler.prototype = {
     }
     options.helpers = 'helpers';
     options.partials = 'partials';
-    options.decorators = 'container.decorators';
 
     if (!isDynamic) {
       params.unshift(this.nameLookup('partials', name, 'partial'));
@@ -739,7 +677,7 @@ JavaScriptCompiler.prototype = {
     options = this.objectLiteral(options);
     params.push(options);
 
-    this.push(this.source.functionCall('container.invokePartial', '', params));
+    this.push(this.source.functionCall('this.invokePartial', '', params));
   },
 
   // [assignToHash]
@@ -798,29 +736,26 @@ 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();    // eslint-disable-line new-cap
 
-      let existing = this.matchExistingProgram(child);
+      let index = this.matchExistingProgram(child);
 
-      if (existing == null) {
-        this.context.programs.push(''); // Placeholder to prevent name conflicts for nested children
-        let index = this.context.programs.length;
+      if (index == null) {
+        this.context.programs.push('');     // Placeholder to prevent name conflicts for nested children
+        index = this.context.programs.length;
         child.index = index;
         child.name = 'program' + index;
         this.context.programs[index] = compiler.compile(child, options, this.context, !this.precompile);
-        this.context.decorators[index] = compiler.decorators;
         this.context.environments[index] = child;
 
         this.useDepths = this.useDepths || compiler.useDepths;
         this.useBlockParams = this.useBlockParams || compiler.useBlockParams;
-        child.useDepths = this.useDepths;
-        child.useBlockParams = this.useBlockParams;
       } else {
-        child.index = existing.index;
-        child.name = 'program' + existing.index;
+        child.index = index;
+        child.name = 'program' + index;
 
-        this.useDepths = this.useDepths || existing.useDepths;
-        this.useBlockParams = this.useBlockParams || existing.useBlockParams;
+        this.useDepths = this.useDepths || child.useDepths;
+        this.useBlockParams = this.useBlockParams || child.useBlockParams;
       }
     }
   },
@@ -828,7 +763,7 @@ JavaScriptCompiler.prototype = {
     for (let i = 0, len = this.context.environments.length; i < len; i++) {
       let environment = this.context.environments[i];
       if (environment && environment.equals(child)) {
-        return environment;
+        return i;
       }
     }
   },
@@ -844,7 +779,7 @@ JavaScriptCompiler.prototype = {
       programParams.push('depths');
     }
 
-    return 'container.program(' + programParams.join(', ') + ')';
+    return 'this.program(' + programParams.join(', ') + ')';
   },
 
   useRegister: function(name) {
@@ -1008,28 +943,18 @@ JavaScriptCompiler.prototype = {
   setupHelper: function(paramSize, name, blockHelper) {
     let params = [],
         paramsInit = this.setupHelperArgs(name, paramSize, params, blockHelper);
-    let foundHelper = this.nameLookup('helpers', name, 'helper'),
-        callContext = this.aliasable(`${this.contextName(0)} != null ? ${this.contextName(0)} : (container.nullContext || {})`);
+    let foundHelper = this.nameLookup('helpers', name, 'helper');
 
     return {
       params: params,
       paramsInit: paramsInit,
       name: foundHelper,
-      callParams: [callContext].concat(params)
+      callParams: [this.contextName(0)].concat(params)
     };
   },
 
   setupParams: function(helper, paramSize, params) {
-    let options = {},
-        contexts = [],
-        types = [],
-        ids = [],
-        objectArgs = !params,
-        param;
-
-    if (objectArgs) {
-      params = [];
-    }
+    let options = {}, contexts = [], types = [], ids = [], param;
 
     options.name = this.quotedString(helper);
     options.hash = this.popStack();
@@ -1048,8 +973,8 @@ JavaScriptCompiler.prototype = {
     // Avoid setting fn and inverse if neither are set. This allows
     // helpers to do a check for `if (options.fn)`
     if (program || inverse) {
-      options.fn = program || 'container.noop';
-      options.inverse = inverse || 'container.noop';
+      options.fn = program || 'this.noop';
+      options.inverse = inverse || 'this.noop';
     }
 
     // The parameters go on to the stack in order (making sure that they are evaluated in order)
@@ -1068,10 +993,6 @@ JavaScriptCompiler.prototype = {
       }
     }
 
-    if (objectArgs) {
-      options.args = this.source.generateArray(params);
-    }
-
     if (this.trackIds) {
       options.ids = this.source.generateArray(ids);
     }
@@ -1090,18 +1011,15 @@ JavaScriptCompiler.prototype = {
   },
 
   setupHelperArgs: function(helper, paramSize, params, useRegister) {
-    let options = this.setupParams(helper, paramSize, params);
-    options.loc = JSON.stringify(this.source.currentLocation);
+    let options = this.setupParams(helper, paramSize, params, true);
     options = this.objectLiteral(options);
     if (useRegister) {
       this.useRegister('options');
       params.push('options');
       return ['options=', options];
-    } else if (params) {
+    } else {
       params.push(options);
       return '';
-    } else {
-      return options;
     }
   }
 };
@@ -1151,7 +1069,7 @@ function strictLookup(requireTerminal, compiler, parts, type) {
   }
 
   if (requireTerminal) {
-    return [compiler.aliasable('container.strict'), '(', stack, ', ', compiler.quotedString(parts[i]), ', ', JSON.stringify(compiler.source.currentLocation), ' )'];
+    return [compiler.aliasable('this.strict'), '(', stack, ', ', compiler.quotedString(parts[i]), ')'];
   } else {
     return stack;
   }

lib/handlebars/compiler/printer.js

@@ -1,4 +1,4 @@
-/* eslint-disable new-cap */
+/*eslint-disable new-cap */
 import Visitor from './visitor';
 
 export function print(ast) {
@@ -15,10 +15,10 @@ PrintVisitor.prototype.pad = function(string) {
   let out = '';
 
   for (let i = 0, l = this.padding; i < l; i++) {
-    out += '  ';
+    out = out + '  ';
   }
 
-  out += string + '\n';
+  out = out + string + '\n';
   return out;
 };
 
@@ -37,7 +37,7 @@ PrintVisitor.prototype.Program = function(program) {
   }
 
   for (i = 0, l = body.length; i < l; i++) {
-    out += this.accept(body[i]);
+    out = out + this.accept(body[i]);
   }
 
   this.padding--;
@@ -48,28 +48,24 @@ PrintVisitor.prototype.Program = function(program) {
 PrintVisitor.prototype.MustacheStatement = function(mustache) {
   return this.pad('{{ ' + this.SubExpression(mustache) + ' }}');
 };
-PrintVisitor.prototype.Decorator = function(mustache) {
-  return this.pad('{{ DIRECTIVE ' + this.SubExpression(mustache) + ' }}');
-};
 
-PrintVisitor.prototype.BlockStatement =
-PrintVisitor.prototype.DecoratorBlock = function(block) {
+PrintVisitor.prototype.BlockStatement = function(block) {
   let out = '';
 
-  out += this.pad((block.type === 'DecoratorBlock' ? 'DIRECTIVE ' : '') + 'BLOCK:');
+  out = out + this.pad('BLOCK:');
   this.padding++;
-  out += this.pad(this.SubExpression(block));
+  out = out + this.pad(this.SubExpression(block));
   if (block.program) {
-    out += this.pad('PROGRAM:');
+    out = out + this.pad('PROGRAM:');
     this.padding++;
-    out += this.accept(block.program);
+    out = out + this.accept(block.program);
     this.padding--;
   }
   if (block.inverse) {
     if (block.program) { this.padding++; }
-    out += this.pad('{{^}}');
+    out = out + this.pad('{{^}}');
     this.padding++;
-    out += this.accept(block.inverse);
+    out = out + this.accept(block.inverse);
     this.padding--;
     if (block.program) { this.padding--; }
   }
@@ -88,22 +84,6 @@ PrintVisitor.prototype.PartialStatement = function(partial) {
   }
   return this.pad('{{> ' + content + ' }}');
 };
-PrintVisitor.prototype.PartialBlockStatement = function(partial) {
-  let content = 'PARTIAL BLOCK:' + partial.name.original;
-  if (partial.params[0]) {
-    content += ' ' + this.accept(partial.params[0]);
-  }
-  if (partial.hash) {
-    content += ' ' + this.accept(partial.hash);
-  }
-
-  content += ' ' + this.pad('PROGRAM:');
-  this.padding++;
-  content += this.accept(partial.program);
-  this.padding--;
-
-  return this.pad('{{> ' + content + ' }}');
-};
 
 PrintVisitor.prototype.ContentStatement = function(content) {
   return this.pad("CONTENT[ '" + content.value + "' ]");
@@ -168,4 +148,4 @@ PrintVisitor.prototype.Hash = function(hash) {
 PrintVisitor.prototype.HashPair = function(pair) {
   return pair.key + '=' + this.accept(pair.value);
 };
-/* eslint-enable new-cap */
+/*eslint-enable new-cap */

lib/handlebars/compiler/visitor.js

@@ -1,4 +1,5 @@
 import Exception from '../exception';
+import AST from './ast';
 
 function Visitor() {
   this.parents = [];
@@ -12,9 +13,8 @@ Visitor.prototype = {
   acceptKey: function(node, name) {
     let value = this.accept(node[name]);
     if (this.mutating) {
-      // Hacky sanity check: This may have a few false positives for type for the helper
-      // methods but will generally do the right thing without a lot of overhead.
-      if (value && !Visitor.prototype[value.type]) {
+      // Hacky sanity check:
+      if (value && (!value.type || !AST[value.type])) {
         throw new Exception('Unexpected node type "' + value.type + '" found when accepting ' + name + ' on ' + node.type);
       }
       node[name] = value;
@@ -50,11 +50,6 @@ Visitor.prototype = {
       return;
     }
 
-    /* istanbul ignore next: Sanity code */
-    if (!this[object.type]) {
-      throw new Exception('Unknown type: ' + object.type, object);
-    }
-
     if (this.current) {
       this.parents.unshift(this.current);
     }
@@ -75,23 +70,35 @@ Visitor.prototype = {
     this.acceptArray(program.body);
   },
 
-  MustacheStatement: visitSubExpression,
-  Decorator: visitSubExpression,
+  MustacheStatement: function(mustache) {
+    this.acceptRequired(mustache, 'path');
+    this.acceptArray(mustache.params);
+    this.acceptKey(mustache, 'hash');
+  },
 
-  BlockStatement: visitBlock,
-  DecoratorBlock: visitBlock,
+  BlockStatement: function(block) {
+    this.acceptRequired(block, 'path');
+    this.acceptArray(block.params);
+    this.acceptKey(block, 'hash');
 
-  PartialStatement: visitPartial,
-  PartialBlockStatement: function(partial) {
-    visitPartial.call(this, partial);
+    this.acceptKey(block, 'program');
+    this.acceptKey(block, 'inverse');
+  },
 
-    this.acceptKey(partial, 'program');
+  PartialStatement: function(partial) {
+    this.acceptRequired(partial, 'name');
+    this.acceptArray(partial.params);
+    this.acceptKey(partial, 'hash');
   },
 
   ContentStatement: function(/* content */) {},
   CommentStatement: function(/* comment */) {},
 
-  SubExpression: visitSubExpression,
+  SubExpression: function(sexpr) {
+    this.acceptRequired(sexpr, 'path');
+    this.acceptArray(sexpr.params);
+    this.acceptKey(sexpr, 'hash');
+  },
 
   PathExpression: function(/* path */) {},
 
@@ -109,21 +116,4 @@ Visitor.prototype = {
   }
 };
 
-function visitSubExpression(mustache) {
-  this.acceptRequired(mustache, 'path');
-  this.acceptArray(mustache.params);
-  this.acceptKey(mustache, 'hash');
-}
-function visitBlock(block) {
-  visitSubExpression.call(this, block);
-
-  this.acceptKey(block, 'program');
-  this.acceptKey(block, 'inverse');
-}
-function visitPartial(partial) {
-  this.acceptRequired(partial, 'name');
-  this.acceptArray(partial.params);
-  this.acceptKey(partial, 'hash');
-}
-
 export default Visitor;

lib/handlebars/compiler/whitespace-control.js

@@ -1,13 +1,10 @@
 import Visitor from './visitor';
 
-function WhitespaceControl(options = {}) {
-  this.options = options;
+function WhitespaceControl() {
 }
 WhitespaceControl.prototype = new Visitor();
 
 WhitespaceControl.prototype.Program = function(program) {
-  const doStandalone = !this.options.ignoreStandalone;
-
   let isRoot = !this.isRootSeen;
   this.isRootSeen = true;
 
@@ -34,7 +31,7 @@ WhitespaceControl.prototype.Program = function(program) {
       omitLeft(body, i, true);
     }
 
-    if (doStandalone && inlineStandalone) {
+    if (inlineStandalone) {
       omitRight(body, i);
 
       if (omitLeft(body, i)) {
@@ -45,13 +42,13 @@ WhitespaceControl.prototype.Program = function(program) {
         }
       }
     }
-    if (doStandalone && openStandalone) {
+    if (openStandalone) {
       omitRight((current.program || current.inverse).body);
 
       // Strip out the previous content node if it's whitespace only
       omitLeft(body, i);
     }
-    if (doStandalone && closeStandalone) {
+    if (closeStandalone) {
       // Always strip the next node
       omitRight(body, i);
 
@@ -61,10 +58,7 @@ WhitespaceControl.prototype.Program = function(program) {
 
   return program;
 };
-
-WhitespaceControl.prototype.BlockStatement =
-WhitespaceControl.prototype.DecoratorBlock =
-WhitespaceControl.prototype.PartialBlockStatement = function(block) {
+WhitespaceControl.prototype.BlockStatement = function(block) {
   this.accept(block.program);
   this.accept(block.inverse);
 
@@ -112,8 +106,7 @@ WhitespaceControl.prototype.PartialBlockStatement = function(block) {
     }
 
     // Find standalone else statments
-    if (!this.options.ignoreStandalone
-        && isPrevWhitespace(program.body)
+    if (isPrevWhitespace(program.body)
         && isNextWhitespace(firstInverse.body)) {
       omitLeft(program.body);
       omitRight(firstInverse.body);
@@ -125,7 +118,6 @@ WhitespaceControl.prototype.PartialBlockStatement = function(block) {
   return strip;
 };
 
-WhitespaceControl.prototype.Decorator =
 WhitespaceControl.prototype.MustacheStatement = function(mustache) {
   return mustache.strip;
 };
@@ -206,7 +198,7 @@ function omitLeft(body, i, multiple) {
     return;
   }
 
-  // We omit the last node if it's whitespace only and not preceded by a non-content node.
+  // We omit the last node if it's whitespace only and not preceeded by a non-content node.
   let original = current.value;
   current.value = current.value.replace(multiple ? (/\s+$/) : (/[ \t]+$/), '');
   current.leftStripped = current.value !== original;

lib/handlebars/decorators.js

@@ -1,6 +0,0 @@
-import registerInline from './decorators/inline';
-
-export function registerDefaultDecorators(instance) {
-  registerInline(instance);
-}
-

lib/handlebars/decorators/inline.js

@@ -1,22 +0,0 @@
-import {extend} from '../utils';
-
-export default function(instance) {
-  instance.registerDecorator('inline', function(fn, props, container, options) {
-    let ret = fn;
-    if (!props.partials) {
-      props.partials = {};
-      ret = function(context, options) {
-        // Create a new partials stack frame prior to exec.
-        let original = container.partials;
-        container.partials = extend({}, original, props.partials);
-        let ret = fn(context, options);
-        container.partials = original;
-        return ret;
-      };
-    }
-
-    props.partials[options.args[0]] = options.fn;
-
-    return ret;
-  });
-}

lib/handlebars/exception.js

@@ -1,18 +1,13 @@
 
-const errorProps = ['description', 'fileName', 'lineNumber', 'endLineNumber', 'message', 'name', 'number', 'stack'];
+const errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack'];
 
 function Exception(message, node) {
   let loc = node && node.loc,
       line,
-      endLineNumber,
-      column,
-      endColumn;
-
+      column;
   if (loc) {
     line = loc.start.line;
-    endLineNumber = loc.end.line;
     column = loc.start.column;
-    endColumn = loc.end.column;
 
     message += ' - ' + line + ':' + column;
   }
@@ -32,7 +27,6 @@ function Exception(message, node) {
   try {
     if (loc) {
       this.lineNumber = line;
-      this.endLineNumber = endLineNumber;
 
       // Work around issue under safari where we can't directly set the column value
       /* istanbul ignore next */
@@ -41,13 +35,8 @@ function Exception(message, node) {
           value: column,
           enumerable: true
         });
-        Object.defineProperty(this, 'endColumn', {
-          value: endColumn,
-          enumerable: true
-        });
       } else {
         this.column = column;
-        this.endColumn = endColumn;
       }
     }
   } catch (nop) {

lib/handlebars/helpers.js

@@ -1,26 +0,0 @@
-import registerBlockHelperMissing from './helpers/block-helper-missing';
-import registerEach from './helpers/each';
-import registerHelperMissing from './helpers/helper-missing';
-import registerIf from './helpers/if';
-import registerLog from './helpers/log';
-import registerLookup from './helpers/lookup';
-import registerWith from './helpers/with';
-
-export function registerDefaultHelpers(instance) {
-  registerBlockHelperMissing(instance);
-  registerEach(instance);
-  registerHelperMissing(instance);
-  registerIf(instance);
-  registerLog(instance);
-  registerLookup(instance);
-  registerWith(instance);
-}
-
-export function moveHelperToHooks(instance, helperName, keepHelper) {
-  if (instance.helpers[helperName]) {
-    instance.hooks[helperName] = instance.helpers[helperName];
-    if (!keepHelper) {
-      delete instance.helpers[helperName];
-    }
-  }
-}

lib/handlebars/helpers/block-helper-missing.js

@@ -1,32 +0,0 @@
-import {appendContextPath, createFrame, isArray} from '../utils';
-
-export default function(instance) {
-  instance.registerHelper('blockHelperMissing', function(context, options) {
-    let inverse = options.inverse,
-        fn = options.fn;
-
-    if (context === true) {
-      return fn(this);
-    } else if (context === false || context == null) {
-      return inverse(this);
-    } else if (isArray(context)) {
-      if (context.length > 0) {
-        if (options.ids) {
-          options.ids = [options.name];
-        }
-
-        return instance.helpers.each(context, options);
-      } else {
-        return inverse(this);
-      }
-    } else {
-      if (options.data && options.ids) {
-        let data = createFrame(options.data);
-        data.contextPath = appendContextPath(options.data.contextPath, options.name);
-        options = {data: data};
-      }
-
-      return fn(context, options);
-    }
-  });
-}

lib/handlebars/helpers/each.js

@@ -1,87 +0,0 @@
-import {appendContextPath, blockParams, createFrame, isArray, isFunction} from '../utils';
-import Exception from '../exception';
-
-export default function(instance) {
-  instance.registerHelper('each', function(context, options) {
-    if (!options) {
-      throw new Exception('Must pass iterator to #each');
-    }
-
-    let fn = options.fn,
-        inverse = options.inverse,
-        i = 0,
-        ret = '',
-        data,
-        contextPath;
-
-    if (options.data && options.ids) {
-      contextPath = appendContextPath(options.data.contextPath, options.ids[0]) + '.';
-    }
-
-    if (isFunction(context)) { context = context.call(this); }
-
-    if (options.data) {
-      data = createFrame(options.data);
-    }
-
-    function execIteration(field, index, last) {
-      if (data) {
-        data.key = field;
-        data.index = index;
-        data.first = index === 0;
-        data.last = !!last;
-
-        if (contextPath) {
-          data.contextPath = contextPath + field;
-        }
-      }
-
-      ret = ret + fn(context[field], {
-        data: data,
-        blockParams: blockParams([context[field], field], [contextPath + field, null])
-      });
-    }
-
-    if (context && typeof context === 'object') {
-      if (isArray(context)) {
-        for (let j = context.length; i < j; i++) {
-          if (i in context) {
-            execIteration(i, i, i === context.length - 1);
-          }
-        }
-      } else if (global.Symbol && context[global.Symbol.iterator]) {
-        const newContext = [];
-        const iterator = context[global.Symbol.iterator]();
-        for (let it = iterator.next(); !it.done; it = iterator.next()) {
-          newContext.push(it.value);
-        }
-        context = newContext;
-        for (let j = context.length; i < j; i++) {
-          execIteration(i, i, i === context.length - 1);
-        }
-      } else {
-        let priorKey;
-
-        Object.keys(context).forEach(key => {
-          // We're running the iterations one step out of sync so we can detect
-          // the last iteration without have to scan the object twice and create
-          // an itermediate keys array.
-          if (priorKey !== undefined) {
-            execIteration(priorKey, i - 1);
-          }
-          priorKey = key;
-          i++;
-        });
-        if (priorKey !== undefined) {
-          execIteration(priorKey, i - 1, true);
-        }
-      }
-    }
-
-    if (i === 0) {
-      ret = inverse(this);
-    }
-
-    return ret;
-  });
-}

lib/handlebars/helpers/helper-missing.js

@@ -1,13 +0,0 @@
-import Exception from '../exception';
-
-export default function(instance) {
-  instance.registerHelper('helperMissing', function(/* [args, ]options */) {
-    if (arguments.length === 1) {
-      // A missing field in a {{foo}} construct.
-      return undefined;
-    } else {
-      // Someone is actually trying to call something, blow up.
-      throw new Exception('Missing helper: "' + arguments[arguments.length - 1].name + '"');
-    }
-  });
-}

lib/handlebars/helpers/if.js

@@ -1,23 +0,0 @@
-import { isEmpty, isFunction } from '../utils';
-import Exception from '../exception';
-
-export default function(instance) {
-  instance.registerHelper('if', function(conditional, options) {
-    if (arguments.length != 2) { throw new Exception('#if requires exactly one argument');}
-    if (isFunction(conditional)) { conditional = conditional.call(this); }
-
-    // Default behavior is to render the positive path if the value is truthy and not empty.
-    // The `includeZero` option may be set to treat the condtional as purely not empty based on the
-    // behavior of isEmpty. Effectively this determines if 0 is handled by the positive path or negative.
-    if ((!options.hash.includeZero && !conditional) || isEmpty(conditional)) {
-      return options.inverse(this);
-    } else {
-      return options.fn(this);
-    }
-  });
-
-  instance.registerHelper('unless', function(conditional, options) {
-    if (arguments.length != 2) { throw new Exception('#unless requires exactly one argument');}
-    return instance.helpers['if'].call(this, conditional, {fn: options.inverse, inverse: options.fn, hash: options.hash});
-  });
-}

lib/handlebars/helpers/log.js

@@ -1,19 +0,0 @@
-export default function(instance) {
-  instance.registerHelper('log', function(/* message, options */) {
-    let args = [undefined],
-        options = arguments[arguments.length - 1];
-    for (let i = 0; i < arguments.length - 1; i++) {
-      args.push(arguments[i]);
-    }
-
-    let level = 1;
-    if (options.hash.level != null) {
-      level = options.hash.level;
-    } else if (options.data && options.data.level != null) {
-      level = options.data.level;
-    }
-    args[0] = level;
-
-    instance.log(... args);
-  });
-}

lib/handlebars/helpers/lookup.js

@@ -1,13 +0,0 @@
-export const dangerousPropertyRegex = /^(constructor|__defineGetter__|__defineSetter__|__lookupGetter__|__proto__)$/;
-
-export default function(instance) {
-  instance.registerHelper('lookup', function(obj, field) {
-    if (!obj) {
-      return obj;
-    }
-    if (dangerousPropertyRegex.test(String(field)) && !Object.prototype.propertyIsEnumerable.call(obj, field)) {
-      return undefined;
-    }
-    return obj[field];
-  });
-}

lib/handlebars/helpers/with.js

@@ -1,26 +0,0 @@
-import { appendContextPath, blockParams, createFrame, isEmpty, isFunction } from '../utils';
-import Exception from '../exception';
-
-export default function(instance) {
-  instance.registerHelper('with', function(context, options) {
-    if (arguments.length != 2) { throw new Exception('#with requires exactly one argument');}
-    if (isFunction(context)) { context = context.call(this); }
-
-    let fn = options.fn;
-
-    if (!isEmpty(context)) {
-      let data = options.data;
-      if (options.data && options.ids) {
-        data = createFrame(options.data);
-        data.contextPath = appendContextPath(options.data.contextPath, options.ids[0]);
-      }
-
-      return fn(context, {
-        data: data,
-        blockParams: blockParams([context], [data && data.contextPath])
-      });
-    } else {
-      return options.inverse(this);
-    }
-  });
-}

lib/handlebars/logger.js

@@ -1,35 +0,0 @@
-import {indexOf} from './utils';
-
-let logger = {
-  methodMap: ['debug', 'info', 'warn', 'error'],
-  level: 'info',
-
-  // Maps a given level value to the `methodMap` indexes above.
-  lookupLevel: function(level) {
-    if (typeof level === 'string') {
-      let levelMap = indexOf(logger.methodMap, level.toLowerCase());
-      if (levelMap >= 0) {
-        level = levelMap;
-      } else {
-        level = parseInt(level, 10);
-      }
-    }
-
-    return level;
-  },
-
-  // Can be overridden in the host environment
-  log: function(level, ...message) {
-    level = logger.lookupLevel(level);
-
-    if (typeof console !== 'undefined' && logger.lookupLevel(logger.level) <= level) {
-      let method = logger.methodMap[level];
-      if (!console[method]) { // eslint-disable-line no-console
-        method = 'log';
-      }
-      console[method](...message); // eslint-disable-line no-console
-    }
-  }
-};
-
-export default logger;

lib/handlebars/no-conflict.js

@@ -1,4 +1,4 @@
-/* global window */
+/*global window */
 export default function(Handlebars) {
   /* istanbul ignore next */
   let root = typeof global !== 'undefined' ? global : window,
@@ -8,6 +8,5 @@ export default function(Handlebars) {
     if (root.Handlebars === Handlebars) {
       root.Handlebars = $Handlebars;
     }
-    return Handlebars;
   };
 }

lib/handlebars/runtime.js

@@ -1,30 +1,26 @@
-import {extend, escapeExpression} from './utils';
+import * as Utils from './utils';
 import Exception from './exception';
-import {COMPILER_REVISION, createFrame, LAST_COMPATIBLE_COMPILER_REVISION, REVISION_CHANGES} from './base';
-import {moveHelperToHooks} from './helpers';
+import { COMPILER_REVISION, REVISION_CHANGES, createFrame } from './base';
 
 export function checkRevision(compilerInfo) {
   const compilerRevision = compilerInfo && compilerInfo[0] || 1,
         currentRevision = COMPILER_REVISION;
 
-  if (compilerRevision >= LAST_COMPATIBLE_COMPILER_REVISION && compilerRevision <= COMPILER_REVISION) {
-    return;
-  }
-
-  if (compilerRevision < LAST_COMPATIBLE_COMPILER_REVISION) {
-    const runtimeVersions = REVISION_CHANGES[currentRevision],
-          compilerVersions = REVISION_CHANGES[compilerRevision];
-    throw new Exception('Template was precompiled with an older version of Handlebars than the current runtime. ' +
-          'Please update your precompiler to a newer version (' + runtimeVersions + ') or downgrade your runtime to an older version (' + compilerVersions + ').');
-  } else {
-    // Use the embedded version info since the runtime doesn't know about this revision yet
-    throw new Exception('Template was precompiled with a newer version of Handlebars than the current runtime. ' +
-          'Please update your runtime to a newer version (' + compilerInfo[1] + ').');
+  if (compilerRevision !== currentRevision) {
+    if (compilerRevision < currentRevision) {
+      const runtimeVersions = REVISION_CHANGES[currentRevision],
+            compilerVersions = REVISION_CHANGES[compilerRevision];
+      throw new Exception('Template was precompiled with an older version of Handlebars than the current runtime. ' +
+            'Please update your precompiler to a newer version (' + runtimeVersions + ') or downgrade your runtime to an older version (' + compilerVersions + ').');
+    } else {
+      // Use the embedded version info since the runtime doesn't know about this revision yet
+      throw new Exception('Template was precompiled with a newer version of Handlebars than the current runtime. ' +
+            'Please update your runtime to a newer version (' + compilerInfo[1] + ').');
+    }
   }
 }
 
 export function template(templateSpec, env) {
-
   /* istanbul ignore next */
   if (!env) {
     throw new Exception('No environment passed to template');
@@ -33,31 +29,21 @@ export function template(templateSpec, env) {
     throw new Exception('Unknown template object: ' + typeof templateSpec);
   }
 
-  templateSpec.main.decorator = templateSpec.main_d;
-
   // Note: Using env.VM references rather than local var references throughout this section to allow
-  // for external users to override these as pseudo-supported APIs.
+  // for external users to override these as psuedo-supported APIs.
   env.VM.checkRevision(templateSpec.compiler);
 
-  // backwards compatibility for precompiled templates with compiler-version 7 (<4.3.0)
-  const templateWasPrecompiledWithCompilerV7 = templateSpec.compiler && templateSpec.compiler[0] === 7;
-
   function invokePartialWrapper(partial, context, options) {
     if (options.hash) {
-      context = extend({}, context, options.hash);
-      if (options.ids) {
-        options.ids[0] = true;
-      }
+      context = Utils.extend({}, context, options.hash);
     }
+
     partial = env.VM.resolvePartial.call(this, partial, context, options);
-
-    let optionsWithHooks = extend({}, options, {hooks: this.hooks});
-
-    let result = env.VM.invokePartial.call(this, partial, context, optionsWithHooks);
+    let result = env.VM.invokePartial.call(this, partial, context, options);
 
     if (result == null && env.compile) {
       options.partials[options.name] = env.compile(partial, templateSpec.compilerOptions, env);
-      result = options.partials[options.name](context, optionsWithHooks);
+      result = options.partials[options.name](context, options);
     }
     if (result != null) {
       if (options.indent) {
@@ -79,9 +65,9 @@ export function template(templateSpec, env) {
 
   // Just add water
   let container = {
-    strict: function(obj, name, loc) {
-      if (!obj || !(name in obj)) {
-        throw new Exception('"' + name + '" not defined in ' + obj, { loc: loc });
+    strict: function(obj, name) {
+      if (!(name in obj)) {
+        throw new Exception('"' + name + '" not defined in ' + obj);
       }
       return obj[name];
     },
@@ -97,13 +83,11 @@ export function template(templateSpec, env) {
       return typeof current === 'function' ? current.call(context) : current;
     },
 
-    escapeExpression: escapeExpression,
+    escapeExpression: Utils.escapeExpression,
     invokePartial: invokePartialWrapper,
 
     fn: function(i) {
-      let ret = templateSpec[i];
-      ret.decorator = templateSpec[i + '_d'];
-      return ret;
+      return templateSpec[i];
     },
 
     programs: [],
@@ -124,8 +108,15 @@ export function template(templateSpec, env) {
       }
       return value;
     },
-    // An empty object to use as replacement for null-contexts
-    nullContext: Object.seal({}),
+    merge: function(param, common) {
+      let obj = param || common;
+
+      if (param && common && (param !== common)) {
+        obj = Utils.extend({}, common, param);
+      }
+
+      return obj;
+    },
 
     noop: env.VM.noop,
     compilerInfo: templateSpec.compiler
@@ -141,45 +132,24 @@ export function template(templateSpec, env) {
     let depths,
         blockParams = templateSpec.useBlockParams ? [] : undefined;
     if (templateSpec.useDepths) {
-      if (options.depths) {
-        depths = context != options.depths[0] ? [context].concat(options.depths) : options.depths;
-      } else {
-        depths = [context];
-      }
+      depths = options.depths ? [context].concat(options.depths) : [context];
     }
 
-    function main(context/*, options*/) {
-      return '' + templateSpec.main(container, context, container.helpers, container.partials, data, blockParams, depths);
-    }
-    main = executeDecorators(templateSpec.main, main, container, options.depths || [], data, blockParams);
-    return main(context, options);
+    return templateSpec.main.call(container, context, container.helpers, container.partials, data, blockParams, depths);
   }
   ret.isTop = true;
 
   ret._setup = function(options) {
     if (!options.partial) {
-      container.helpers = extend({}, env.helpers, options.helpers);
+      container.helpers = container.merge(options.helpers, env.helpers);
 
       if (templateSpec.usePartial) {
-        container.partials = extend({}, env.partials, options.partials);
+        container.partials = container.merge(options.partials, env.partials);
       }
-      if (templateSpec.usePartial || templateSpec.useDecorators) {
-        container.decorators = extend({}, env.decorators, options.decorators);
-      }
-
-      container.hooks = {};
-
-      let keepHelperInHelpers = options.allowCallsToHelperMissing || templateWasPrecompiledWithCompilerV7;
-      moveHelperToHooks(container, 'helperMissing', keepHelperInHelpers);
-      moveHelperToHooks(container, 'blockHelperMissing', keepHelperInHelpers);
-
     } else {
       container.helpers = options.helpers;
       container.partials = options.partials;
-      container.decorators = options.decorators;
-      container.hooks = options.hooks;
     }
-
   };
 
   ret._child = function(i, data, blockParams, depths) {
@@ -197,37 +167,22 @@ export function template(templateSpec, env) {
 
 export function wrapProgram(container, i, fn, data, declaredBlockParams, blockParams, depths) {
   function prog(context, options = {}) {
-    let currentDepths = depths;
-    if (depths && context != depths[0] && !(context === container.nullContext && depths[0] === null)) {
-      currentDepths = [context].concat(depths);
-    }
-
-    return fn(container,
+    return fn.call(container,
         context,
         container.helpers, container.partials,
         options.data || data,
         blockParams && [options.blockParams].concat(blockParams),
-        currentDepths);
+        depths && [context].concat(depths));
   }
-
-  prog = executeDecorators(fn, prog, container, depths, data, blockParams);
-
   prog.program = i;
   prog.depth = depths ? depths.length : 0;
   prog.blockParams = declaredBlockParams || 0;
   return prog;
 }
 
-/**
- * This is currently part of the official API, therefore implementation details should not be changed.
- */
 export function resolvePartial(partial, context, options) {
   if (!partial) {
-    if (options.name === '@partial-block') {
-      partial = options.data['partial-block'];
-    } else {
-      partial = options.partials[options.name];
-    }
+    partial = options.partials[options.name];
   } else if (!partial.call && !options.name) {
     // This is a dynamic partial that returned a string
     options.name = partial;
@@ -237,34 +192,7 @@ export function resolvePartial(partial, context, options) {
 }
 
 export function invokePartial(partial, context, options) {
-  // Use the current closure context to save the partial-block if this partial
-  const currentPartialBlock = options.data && options.data['partial-block'];
   options.partial = true;
-  if (options.ids) {
-    options.data.contextPath = options.ids[0] || options.data.contextPath;
-  }
-
-  let partialBlock;
-  if (options.fn && options.fn !== noop) {
-    options.data = createFrame(options.data);
-    // Wrapper function to get access to currentPartialBlock from the closure
-    let fn = options.fn;
-    partialBlock = options.data['partial-block'] = function partialBlockWrapper(context, options = {}) {
-
-      // Restore the partial-block from the closure for the execution of the block
-      // i.e. the part inside the block of the partial call.
-      options.data = createFrame(options.data);
-      options.data['partial-block'] = currentPartialBlock;
-      return fn(context, options);
-    };
-    if (fn.partials) {
-      options.partials = extend({}, options.partials, fn.partials);
-    }
-  }
-
-  if (partial === undefined && partialBlock) {
-    partial = partialBlock;
-  }
 
   if (partial === undefined) {
     throw new Exception('The partial ' + options.name + ' could not be found');
@@ -282,12 +210,3 @@ function initData(context, data) {
   }
   return data;
 }
-
-function executeDecorators(fn, prog, container, depths, data, blockParams) {
-  if (fn.decorator) {
-    let props = {};
-    prog = fn.decorator(prog, props, container, depths && depths[0], data, blockParams, depths);
-    extend(prog, props);
-  }
-  return prog;
-}

lib/handlebars/utils.js

@@ -1,22 +1,22 @@
-
 const escape = {
   '&': '&',
   '<': '&lt;',
   '>': '&gt;',
   '"': '&quot;',
   "'": '&#x27;',
-  '`': '&#x60;',
-  '=': '&#x3D;'
+  '`': '&#x60;'
+  // The "equals-sign" is intentionally excluded from this list
+  // due to semantic-versioning issues (see #1489)
 };
 
-const badChars = /[&<>"'`=]/g,
-      possible = /[&<>"'`=]/;
+const badChars = /[&<>"'`]/g,
+      possible = /[&<>"'`]/;
 
 function escapeChar(chr) {
   return escape[chr];
 }
 
-export function extend(obj/* , ...source */) {
+export function extend(obj /* , ...source */) {
   for (let i = 1; i < arguments.length; i++) {
     for (let key in arguments[i]) {
       if (Object.prototype.hasOwnProperty.call(arguments[i], key)) {
@@ -32,24 +32,19 @@ export let toString = Object.prototype.toString;
 
 // Sourced from lodash
 // https://github.com/bestiejs/lodash/blob/master/LICENSE.txt
-/* eslint-disable func-style */
-export const isFunction = createIsFunction();
-
-
-function createIsFunction() {
-  // istanbul ignore next
-  // eslint-disable-next-line no-constant-condition
-  if (typeof /x/ === 'function') {
-    // fallback for older chrome/firefox versions
-    return function isFunction(value) {
-      return typeof value === 'function' && toString.call(value) === '[object Function]';
-    };
-  }
-  return function isFunction(value) {
-    return typeof value === 'function';
+/*eslint-disable func-style, no-var */
+var isFunction = function(value) {
+  return typeof value === 'function';
+};
+// fallback for older versions of Chrome and Safari
+/* istanbul ignore next */
+if (isFunction(/x/)) {
+  isFunction = function(value) {
+    return typeof value === 'function' && toString.call(value) === '[object Function]';
   };
 }
-
+export var isFunction;
+/*eslint-enable func-style, no-var */
 
 /* istanbul ignore next */
 export const isArray = Array.isArray || function(value) {
@@ -67,7 +62,6 @@ export function indexOf(array, value) {
 }
 
 
-
 export function escapeExpression(string) {
   if (typeof string !== 'string') {
     // don't escape SafeStrings, since they're already safe
@@ -89,7 +83,6 @@ export function escapeExpression(string) {
   return string.replace(badChars, escapeChar);
 }
 
-
 export function isEmpty(value) {
   if (!value && value !== 0) {
     return true;
@@ -100,12 +93,6 @@ export function isEmpty(value) {
   }
 }
 
-export function createFrame(object) {
-  let frame = extend({}, object);
-  frame._parent = object;
-  return frame;
-}
-
 export function blockParams(params, ids) {
   params.path = ids;
   return params;
@@ -114,3 +101,5 @@ export function blockParams(params, ids) {
 export function appendContextPath(contextPath, id) {
   return (contextPath ? contextPath + '.' : '') + id;
 }
+
+export const dangerousPropertyRegex = /^(constructor|__defineGetter__|__defineSetter__|__lookupGetter__|__proto__)$/;

lib/precompiler.js

@@ -1,135 +1,9 @@
-/* eslint-disable no-console */
-import Async from 'neo-async';
+/*eslint-disable no-console */
 import fs from 'fs';
-import Handlebars from './handlebars';
+import * as Handlebars from './handlebars';
 import {basename} from 'path';
 import {SourceMapConsumer, SourceNode} from 'source-map';
-
-
-module.exports.loadTemplates = function(opts, callback) {
-  loadStrings(opts, function(err, strings) {
-    if (err) {
-      callback(err);
-    } else {
-      loadFiles(opts, function(err, files) {
-        if (err) {
-          callback(err);
-        } else {
-          opts.templates = strings.concat(files);
-          callback(undefined, opts);
-        }
-      });
-    }
-  });
-};
-
-function loadStrings(opts, callback) {
-  let strings = arrayCast(opts.string),
-      names = arrayCast(opts.name);
-
-  if (names.length !== strings.length
-      && strings.length > 1) {
-    return callback(new Handlebars.Exception('Number of names did not match the number of string inputs'));
-  }
-
-  Async.map(strings, function(string, callback) {
-      if (string !== '-') {
-        callback(undefined, string);
-      } else {
-        // Load from stdin
-        let buffer = '';
-        process.stdin.setEncoding('utf8');
-
-        process.stdin.on('data', function(chunk) {
-          buffer += chunk;
-        });
-        process.stdin.on('end', function() {
-          callback(undefined, buffer);
-        });
-      }
-    },
-    function(err, strings) {
-      strings = strings.map((string, index) => ({
-        name: names[index],
-        path: names[index],
-        source: string
-      }));
-      callback(err, strings);
-    });
-}
-
-function loadFiles(opts, callback) {
-  // Build file extension pattern
-  let extension = (opts.extension || 'handlebars').replace(/[\\^$*+?.():=!|{}\-[\]]/g, function(arg) { return '\\' + arg; });
-  extension = new RegExp('\\.' + extension + '$');
-
-  let ret = [],
-      queue = (opts.files || []).map((template) => ({template, root: opts.root}));
-  Async.whilst(() => queue.length, function(callback) {
-    let {template: path, root} = queue.shift();
-
-    fs.stat(path, function(err, stat) {
-      if (err) {
-        return callback(new Handlebars.Exception(`Unable to open template file "${path}"`));
-      }
-
-      if (stat.isDirectory()) {
-        opts.hasDirectory = true;
-
-        fs.readdir(path, function(err, children) {
-          /* istanbul ignore next : Race condition that being too lazy to test */
-          if (err) {
-            return callback(err);
-          }
-          children.forEach(function(file) {
-            let childPath = path + '/' + file;
-
-            if (extension.test(childPath) || fs.statSync(childPath).isDirectory()) {
-              queue.push({template: childPath, root: root || path});
-            }
-          });
-
-          callback();
-        });
-      } else {
-        fs.readFile(path, 'utf8', function(err, data) {
-          /* istanbul ignore next : Race condition that being too lazy to test */
-          if (err) {
-            return callback(err);
-          }
-
-          if (opts.bom && data.indexOf('\uFEFF') === 0) {
-            data = data.substring(1);
-          }
-
-          // Clean the template name
-          let name = path;
-          if (!root) {
-            name = basename(name);
-          } else if (name.indexOf(root) === 0) {
-            name = name.substring(root.length + 1);
-          }
-          name = name.replace(extension, '');
-
-          ret.push({
-            path: path,
-            name: name,
-            source: data
-          });
-
-          callback();
-        });
-      }
-    });
-  },
-  function(err) {
-    if (err) {
-      callback(err);
-    } else {
-      callback(undefined, ret);
-    }
-  });
-}
+import uglify from 'uglify-js';
 
 module.exports.cli = function(opts) {
   if (opts.version) {
@@ -137,25 +11,25 @@ module.exports.cli = function(opts) {
     return;
   }
 
-  if (!opts.templates.length && !opts.hasDirectory) {
+  if (!opts.templates.length) {
     throw new Handlebars.Exception('Must define at least one template or directory.');
   }
 
+  opts.templates.forEach(function(template) {
+    try {
+      fs.statSync(template);
+    } catch (err) {
+      throw new Handlebars.Exception(`Unable to open template file "${template}"`);
+    }
+  });
+
   if (opts.simple && opts.min) {
     throw new Handlebars.Exception('Unable to minimize simple output');
   }
-
-  const multiple = opts.templates.length !== 1 || opts.hasDirectory;
-  if (opts.simple && multiple) {
+  if (opts.simple && (opts.templates.length !== 1 || fs.statSync(opts.templates[0]).isDirectory())) {
     throw new Handlebars.Exception('Unable to output multiple templates in simple mode');
   }
 
-  // Force simple mode if we have only one template and it's unnamed.
-  if (!opts.amd && !opts.commonjs && opts.templates.length === 1
-      && !opts.templates[0].name) {
-    opts.simple = true;
-  }
-
   // Convert the known list into a hash
   let known = {};
   if (opts.known && !Array.isArray(opts.known)) {
@@ -167,7 +41,9 @@ module.exports.cli = function(opts) {
     }
   }
 
-  const objectName = opts.partial ? 'Handlebars.partials' : 'templates';
+  // Build file extension pattern
+  let extension = opts.extension.replace(/[\\^$*+?.():=!|{}\-\[\]]/g, function(arg) { return '\\' + arg; });
+  extension = new RegExp('\\.' + extension + '$');
 
   let output = new SourceNode();
   if (!opts.simple) {
@@ -187,47 +63,81 @@ module.exports.cli = function(opts) {
     }
     output.add('{};\n');
   }
+  function processTemplate(template, root) {
+    let path = template,
+        stat = fs.statSync(path);
+    if (stat.isDirectory()) {
+      fs.readdirSync(template).map(function(file) {
+        let childPath = template + '/' + file;
+
+        if (extension.test(childPath) || fs.statSync(childPath).isDirectory()) {
+          processTemplate(childPath, root || template);
+        }
+      });
+    } else {
+      let data = fs.readFileSync(path, 'utf8');
+
+      if (opts.bom && data.indexOf('\uFEFF') === 0) {
+        data = data.substring(1);
+      }
+
+      let options = {
+        knownHelpers: known,
+        knownHelpersOnly: opts.o
+      };
+
+      if (opts.map) {
+        options.srcName = path;
+      }
+      if (opts.data) {
+        options.data = true;
+      }
+
+      // Clean the template name
+      if (!root) {
+        template = basename(template);
+      } else if (template.indexOf(root) === 0) {
+        template = template.substring(root.length + 1);
+      }
+      template = template.replace(extension, '');
+
+      let precompiled = Handlebars.precompile(data, options);
+
+      // If we are generating a source map, we have to reconstruct the SourceNode object
+      if (opts.map) {
+        let consumer = new SourceMapConsumer(precompiled.map);
+        precompiled = SourceNode.fromStringWithSourceMap(precompiled.code, consumer);
+      }
+
+      if (opts.simple) {
+        output.add([precompiled, '\n']);
+      } else if (opts.partial) {
+        if (opts.amd && (opts.templates.length == 1 && !fs.statSync(opts.templates[0]).isDirectory())) {
+          output.add('return ');
+        }
+        output.add(['Handlebars.partials[\'', template, '\'] = template(', precompiled, ');\n']);
+      } else {
+        if (opts.amd && (opts.templates.length == 1 && !fs.statSync(opts.templates[0]).isDirectory())) {
+          output.add('return ');
+        }
+        output.add(['templates[\'', template, '\'] = template(', precompiled, ');\n']);
+      }
+    }
+  }
 
   opts.templates.forEach(function(template) {
-    let options = {
-      knownHelpers: known,
-      knownHelpersOnly: opts.o
-    };
-
-    if (opts.map) {
-      options.srcName = template.path;
-    }
-    if (opts.data) {
-      options.data = true;
-    }
-
-    let precompiled = Handlebars.precompile(template.source, options);
-
-    // If we are generating a source map, we have to reconstruct the SourceNode object
-    if (opts.map) {
-      let consumer = new SourceMapConsumer(precompiled.map);
-      precompiled = SourceNode.fromStringWithSourceMap(precompiled.code, consumer);
-    }
-
-    if (opts.simple) {
-      output.add([precompiled, '\n']);
-    } else {
-      if (!template.name) {
-        throw new Handlebars.Exception('Name missing for template');
-      }
-
-      if (opts.amd && !multiple) {
-        output.add('return ');
-      }
-      output.add([objectName, '[\'', template.name, '\'] = template(', precompiled, ');\n']);
-    }
+    processTemplate(template, opts.root);
   });
 
   // Output the content
   if (!opts.simple) {
     if (opts.amd) {
-      if (multiple) {
-        output.add(['return ', objectName, ';\n']);
+      if (opts.templates.length > 1 || (opts.templates.length == 1 && fs.statSync(opts.templates[0]).isDirectory())) {
+        if (opts.partial) {
+          output.add('return Handlebars.partials;\n');
+        } else {
+          output.add('return templates;\n');
+        }
       }
       output.add('});');
     } else if (!opts.commonjs) {
@@ -235,6 +145,7 @@ module.exports.cli = function(opts) {
     }
   }
 
+
   if (opts.map) {
     output.add('\n//# sourceMappingURL=' + opts.map + '\n');
   }
@@ -243,7 +154,15 @@ module.exports.cli = function(opts) {
   output.map = output.map + '';
 
   if (opts.min) {
-    output = minify(output, opts.map);
+    output = uglify.minify(output.code, {
+      fromString: true,
+
+      outSourceMap: opts.map,
+      inSourceMap: JSON.parse(output.map)
+    });
+    if (opts.map) {
+      output.code += '\n//# sourceMappingURL=' + opts.map + '\n';
+    }
   }
 
   if (opts.map) {
@@ -257,42 +176,3 @@ module.exports.cli = function(opts) {
     console.log(output);
   }
 };
-
-function arrayCast(value) {
-  value = value != null ? value : [];
-  if (!Array.isArray(value)) {
-    value = [value];
-  }
-  return value;
-}
-
-/**
- * Run uglify to minify the compiled template, if uglify exists in the dependencies.
- *
- * We are using `require` instead of `import` here, because es6-modules do not allow
- * dynamic imports and uglify-js is an optional dependency. Since we are inside NodeJS here, this
- * should not be a problem.
- *
- * @param {string} output the compiled template
- * @param {string} sourceMapFile the file to write the source map to.
- */
-function minify(output, sourceMapFile) {
-  try {
-    // Try to resolve uglify-js in order to see if it does exist
-    require.resolve('uglify-js');
-  } catch (e) {
-    if (e.code !== 'MODULE_NOT_FOUND') {
-      // Something else seems to be wrong
-      throw e;
-    }
-    // it does not exist!
-    console.error('Code minimization is disabled due to missing uglify-js dependency');
-    return output;
-  }
-  return require('uglify-js').minify(output.code, {
-    sourceMap: {
-      content: output.map,
-      url: sourceMapFile
-    }
-  });
-}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "handlebars",
   "barename": "handlebars",
-  "version": "4.5.3",
+  "version": "3.0.8",
   "description": "Handlebars provides the power necessary to let you build semantic templates effectively with no frustration",
   "homepage": "http://www.handlebarsjs.com/",
   "keywords": [
@@ -10,6 +10,9 @@
     "template",
     "html"
   ],
+  "publishConfig": {
+    "tag": "legacy"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/wycats/handlebars.js.git"
@@ -21,66 +24,48 @@
     "node": ">=0.4.7"
   },
   "dependencies": {
-    "neo-async": "^2.6.0",
     "optimist": "^0.6.1",
-    "source-map": "^0.6.1"
+    "source-map": "^0.1.40"
   },
   "optionalDependencies": {
-    "uglify-js": "^3.1.4"
+    "uglify-js": "^2.6"
   },
   "devDependencies": {
-    "@babel/core": "^7.7.4",
-    "@babel/plugin-transform-modules-amd": "^7.7.4",
-    "@babel/plugin-transform-modules-commonjs": "^7.7.4",
-    "@babel/plugin-transform-runtime": "^7.7.4",
-    "@babel/preset-env": "^7.7.4",
-    "@babel/runtime": "^7.7.4",
-    "@knappi/grunt-saucelabs": "^9.0.2",
+    "async": "^0.9.0",
     "aws-sdk": "^2.1.49",
-    "babel-loader": "^8.0.6",
-    "babel-plugin-add-module-exports": "^1.0.2",
+    "babel-loader": "^5.0.0",
+    "babel-runtime": "^5.1.10",
     "benchmark": "~1.0",
-    "chai": "^4.2.0",
-    "dirty-chai": "^2.0.1",
-    "dtslint": "^0.5.5",
     "dustjs-linkedin": "^2.0.2",
     "eco": "~1.1.0-rc-3",
-    "eslint-plugin-compat": "^3.3.0",
-    "eslint-plugin-es5": "^1.4.1",
-    "grunt": "^1.0.4",
-    "grunt-babel": "^8.0.0",
-    "grunt-bg-shell": "^2.3.3",
-    "grunt-cli": "^1",
-    "grunt-contrib-clean": "^1",
-    "grunt-contrib-concat": "^1",
-    "grunt-contrib-connect": "^1",
-    "grunt-contrib-copy": "^1",
-    "grunt-contrib-watch": "^1.1.0",
-    "grunt-eslint": "^20.1.0",
-    "grunt-webpack": "^3.1.3",
+    "grunt": "~0.4.1",
+    "grunt-babel": "^5.0.0",
+    "grunt-cli": "~0.1.10",
+    "grunt-contrib-clean": "0.x",
+    "grunt-contrib-concat": "0.x",
+    "grunt-contrib-connect": "0.x",
+    "grunt-contrib-copy": "0.x",
+    "grunt-contrib-requirejs": "0.x",
+    "grunt-contrib-uglify": "0.x",
+    "grunt-contrib-watch": "0.x",
+    "grunt-eslint": "^11.0.0",
+    "grunt-saucelabs": "9.x",
+    "grunt-webpack": "^1.0.8",
     "istanbul": "^0.3.0",
     "jison": "~0.3.0",
-    "mocha": "^5",
-    "mock-stdin": "^0.3.0",
-    "mustache": "^2.1.3",
-    "semver": "^5.0.1",
-    "sinon": "^7.5.0",
-    "typescript": "^3.4.3",
+    "keen.io": "0.0.3",
+    "mocha": "~1.21.5",
+    "mustache": "0.x",
+    "semver": "^4.0.0",
     "underscore": "^1.5.1",
-    "webpack": "^4.41.2",
-    "webpack-dev-server": "^3.9.0"
+    "webpack": "^1.15.0",
+    "webpack-dev-server": "^1.16.5"
   },
   "main": "lib/index.js",
-  "types": "types/index.d.ts",
-  "browser": {
-    ".": "./dist/cjs/handlebars.js",
-    "./runtime": "./dist/cjs/handlebars.runtime.js"
-  },
   "bin": {
     "handlebars": "bin/handlebars"
   },
   "scripts": {
-    "checkTypes": "dtslint types",
     "test": "grunt"
   },
   "jspm": {
@@ -91,16 +76,5 @@
     "buildConfig": {
       "minify": true
     }
-  },
-  "files": [
-    "bin",
-    "dist/*.js",
-    "dist/amd/**/*.js",
-    "dist/cjs/**/*.js",
-    "lib",
-    "print-script",
-    "release-notes.md",
-    "runtime.js",
-    "types/*.d.ts"
-  ]
+  }
 }

print-script

@@ -1,95 +0,0 @@
-#! /usr/bin/env node
-/* eslint-disable no-console, no-var */
-// Util script for debugging source code generation issues
-
-var script = process.argv[2].replace(/\\n/g, '\n'),
-    verbose = process.argv[3] === '-v';
-
-var Handlebars = require('./lib'),
-    SourceMap = require('source-map'),
-      SourceMapConsumer = SourceMap.SourceMapConsumer;
-
-var template = Handlebars.precompile(script, {
-      srcName: 'input.hbs',
-      destName: 'output.js',
-
-      assumeObjects: true,
-      compat: false,
-      strict: true,
-      trackIds: true,
-      knownHelpersOnly: false
-    });
-
-if (!verbose) {
-  console.log(template);
-} else {
-  var consumer = new SourceMapConsumer(template.map),
-      lines = template.code.split('\n'),
-      srcLines = script.split('\n');
-
-  console.log();
-  console.log('Source:');
-  srcLines.forEach(function(source, index) {
-    console.log(index + 1, source);
-  });
-  console.log();
-  console.log('Generated:');
-  console.log(template.code);
-  lines.forEach(function(source, index) {
-    console.log(index + 1, source);
-  });
-  console.log();
-  console.log('Map:');
-  console.log(template.map);
-  console.log();
-
-  function collectSource(lines, lineName, colName, order) {
-    var ret = {},
-        ordered = [],
-        last;
-
-    function collect(current) {
-      if (last) {
-        var mapLines = lines.slice(last[lineName] - 1, current && current[lineName]);
-        if (mapLines.length) {
-          if (current) {
-            mapLines[mapLines.length - 1] = mapLines[mapLines.length - 1].slice(0, current[colName]);
-          }
-          mapLines[0] = mapLines[0].slice(last[colName]);
-        }
-        ret[last[lineName] + ':' + last[colName]] = mapLines.join('\n');
-        ordered.push({
-          startLine: last[lineName],
-          startCol: last[colName],
-          endLine: current && current[lineName]
-        });
-      }
-      last = current;
-    }
-
-    consumer.eachMapping(collect, undefined, order);
-    collect();
-
-    return ret;
-  }
-
-  srcLines = collectSource(srcLines, 'originalLine', 'originalColumn', SourceMapConsumer.ORIGINAL_ORDER);
-  lines = collectSource(lines, 'generatedLine', 'generatedColumn');
-
-  consumer.eachMapping(function(mapping) {
-    var originalSrc = srcLines[mapping.originalLine + ':' + mapping.originalColumn],
-        generatedSrc = lines[mapping.generatedLine + ':' + mapping.generatedColumn];
-
-    if (!mapping.originalLine) {
-      console.log('generated', mapping.generatedLine + ':' + mapping.generatedColumn, generatedSrc);
-    } else {
-      console.log('map',
-          mapping.source,
-          mapping.originalLine + ':' + mapping.originalColumn,
-          originalSrc,
-          '->',
-          mapping.generatedLine + ':' + mapping.generatedColumn,
-          generatedSrc);
-    }
-  });
-}

release-notes.md

@@ -2,297 +2,49 @@
 
 ## Development
 
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.5.3...master)
+[Commits](https://github.com/wycats/handlebars.js/compare/v3.0.8...master)
 
-## v4.5.3 - November 18th, 2019
+## v3.0.8 - February 23rd, 2020
 Bugfixes:
+- backport some (but not all) of the security fixes from 4.x - 156061e
 
-- fix: add "no-prototype-builtins" eslint-rule and fix all occurences - f7f05d7
-- fix: add more properties required to be enumerable - 1988878
-
-Chores / Build:
-- fix: use !== 0 instead of != 0 - c02b05f
-- add chai and dirty-chai and sinon, for cleaner test-assertions and spies, 
-  deprecate old assertion-methods  - 93e284e, 886ba86, 0817dad, 93516a0
-
-Security:
-
+Compatibility notes:
 - The properties `__proto__`, `__defineGetter__`, `__defineSetter__` and `__lookupGetter__` 
-  have been added to the list of "properties that must be enumerable".
-  If a property by that name is found and not enumerable on its parent, 
-  it will silently evaluate to `undefined`. This is done in both the compiled template and the "lookup"-helper. 
-  This will prevent new Remote-Code-Execution exploits that have been
-  published recently.
+  have been added to the list of "dangerous properties". If a property
+  by that name is found and not an own-property of its parent, it will silently evaluate to undefined.
+  This is done in both the compiled template and the "lookup"-helper. This will prevent
+  Remote-Code-Execution exploits that have been published in npm advisories [1324](https://www.npmjs.com/advisories/1324)
+  and [1316](https://www.npmjs.com/advisories/1316).
+- The check for dangerous properties has been changed from "propertyIsEnumerable" to "hasOwnProperty", as it is now done 
+  in Handlebars 4.6.0 and later.
 
-Compatibility notes: 
+Security issues resolved:
+- [npm advisory 1324](https://www.npmjs.com/advisories/1324)
+- [npm advisory 1316](https://www.npmjs.com/advisories/1316)
+- [npm advisory 1325](https://www.npmjs.com/advisories/1325)
+- [npm advisory 1164](https://www.npmjs.com/advisories/1164)
 
-- Due to the security-fixes. The semantics of the templates using
-  `__proto__`, `__defineGetter__`, `__defineSetter__` and `__lookupGetter__` in the respect that those expression now return 
-  `undefined` rather than their actual value from the proto.
-- The semantics have not changed in cases where the properties are  enumerable, as in:
 
-```js
-{
-  __proto__: 'some string'
-}
-```
-
-- The change may be breaking in that respect, but we still only 
-  increase the patch-version, because the incompatible use-cases
-  are not intended, undocumented and far less important than fixing
-  Remote-Code-Execution exploits on existing systems.
-
-
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.5.2...v4.5.3)
-
-## v4.5.2 - November 13th, 2019
-# Bugfixes
-
-- fix: use String(field) in lookup when checking for "constructor" - d541378
-- test: add fluent API for testing Handlebars - c2ac79c
-
-Compatibility notes:
-- no incompatibility are to be expected
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.5.1...v4.5.2)
-
-## v4.5.1 - October 29th, 2019
-Bugfixs
-
-- fix: move "eslint-plugin-compat" to devDependencies - 5e9d17f (#1589)
-
-Compatibility notes:
-- No compatibility issues are to be expected
-
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.5.0...v4.5.1)
-
-## v4.5.0 - October 28th, 2019
-Features / Improvements
-- Add method Handlebars.parseWithoutProcessing (#1584) - 62ed3c2
-- add guard to if & unless helpers (#1549)
-- show source location for the strict lookup exceptions - feb60f8
-
-Bugfixes:
-- Use objects for hash value tracking - 7fcf9d2
-
-Chore:
-- Resolve deprecation warning message from eslint while running eslint (#1586) - 7052e88
-- chore: add eslint-plugin-compat and eslint-plugin-es5 - 088e618
-
-Compatibility notes:
-- No compatibility issues are to be expected
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.4.5...v4.5.0)
-
-## v4.4.5 - October 20th, 2019
-Bugfixes: 
-
-- Contents of raw-blocks must be matched with non-eager regex-matching - 8d5530e, #1579
-
-
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.4.4...v4.4.5)
-
-## v4.4.4 - October 20th, 2019
-Bugfixes:
-- fix: prevent zero length tokens in raw-blocks (#1577, #1578) - f1752fe
-
-Chore: 
-- chore: link to s3 bucket with https, add "npm ci" to build instructions - 0b593bf
-
-Compatibility notes:
-- no compatibility issues are expected
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.4.3...v4.4.4)
-
-## v4.4.3 - October 8th, 2019
-Bugfixes
-
-Typings:
-- add missing type fields to AST typings and add tests for them - 0440af2
-
-
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.4.2...v4.4.3)
-
-## v4.4.2 - October 2nd, 2019
-- chore: fix grunt-saucelabs dependency - b7eada0
-
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.4.1...v4.4.2)
-
-## v4.4.1 - October 2nd, 2019
-- [#1562](https://github.com/wycats/handlebars.js/issues/1562) - Error message for syntax error missing location in 4.2.1+
-
-
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.4.0...v4.4.1)
-
-## v4.4.0 - September 29th, 2019
-- Added support for iterable objects in {{#each}} helper (#1557) - cf7545e
-
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.3.4...v4.4.0)
-
-## v4.3.4 - September 28th, 2019
-- fix: harden "propertyIsEnumerable"-check - ff4d827
-
-Compatibility notes:
-- No incompatibilities are known.
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.3.3...v4.3.4)
-
-## v4.3.3 - September 27th, 2019
- - fix test case for browsers that do not support __defineGetter__ - 8742bde
-
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.3.2...v4.3.3)
-
-## v4.3.2 - September 26th, 2019
-- Use Object.prototype.propertyIsEnumerable to check for constructors - 213c0bb, #1563
-
-Compatibility notes:
-- There are no breaking changes
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.3.1...v4.3.2)
-
-## v4.3.1 - September 25th, 2019
-Fixes:
-
-- do not break on precompiled templates from Handlebars >=4.0.0 <4.3.0 - 1266838, #1561
-- Ensure allowCallsToHelperMissing runtime option is optional in typings - 93444c5, 64ecb9e, #1560
-
-
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.3.0...v4.3.1)
-
-## v4.3.0 - September 24th, 2019
-Fixes:
-
-- Security: Disallow calling "helperMissing" and "blockHelperMissing" directly - 2078c72
-- Disallow calling "helperMissing" and "blockHelperMissing" directly - 2078c72
-
-Features:
-
-- Add new runtime option `allowCallsToHelperMissing` to allow calling `blockHelperMissing` and `helperMissing`.
-
-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
-    that you always recompile your templates with the latest compiler in your build pipelines.
-
-- Disallow calling "helperMissing" and "blockHelperMissing" directly - 2078c72
-  - Calling "helperMissing" and "blockHelperMissing" directly from a template (like in `{{blockHelperMissing}}` was 
-    never intended and was part of the exploits that have been revealed early in 2019 
-    (see https://github.com/wycats/handlebars.js/issues/1495). *It is also part of a new exploit that 
-    is not captured by the earlier fix.* In order to harden Handlebars against such exploits, calling thos helpers 
-    is now not possible anymore. *Overriding* those helpers is still possible.
-  - If you really need this behavior, you can set the runtime option `allowCallsToHelperMissing` to `true` and the
-    calls will again be possible
-
-Both bullet points imly that Handlebars is not 100% percent compatible to 4.2.0, despite the minor version bump.
-
-We consider it more important to resolve a major security issue than to maintain 100% compatibility.
-
-    
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.2.1...v4.3.0)
-
-## v4.2.1 - September 20th, 2019
-Bugfixes: 
-
-- The "browser" property in the package.json has been updated to use the common-js builds instead of the minified UMD - c55a7be, #1553
-
-Compatibility notes:
-- No compatibility issues should arise
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.2.0...v4.2.1)
-
-## v4.2.0 - September 3rd, 2019
-Chore/Test:
-- Use custom `grunt-saucelab` with current sauce-connect proxy - f119497
-- Add framework for various integration tests - f9cce4d
-- Add integration test for webpack - a57b682
-
-
-Bugfixes:
-- [#1544](https://github.com/wycats/handlebars.js/issues/1544) - Typescript types: `knownHelpers` doesnt allow for custom helpers ([@NickCis](https://api.github.com/users/NickCis))
-- [#1534](https://github.com/wycats/handlebars.js/pull/1534) - Add typings for "Handlebars.VM.resolvePartial ([@AndrewLeedham](https://api.github.com/users/AndrewLeedham))
-
-Features:
-- [#1540](https://github.com/wycats/handlebars.js/pull/1540) - added "browser"-property to package.json, resolves #1102 ([@ouijan](https://api.github.com/users/ouijan))
-
-Compatibility notes:
-- The new "browser"-property should not break anything, but you can never be sure. The integration test for webpack 
-  shows that it works, but if it doesn't please open an issue.
-
-
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.1.2-0...v4.2.0)
-
-## v4.1.2-0 - August 25th, 2019
-[#1540](https://github.com/wycats/handlebars.js/pull/1540) - added browser to package.json, resolves #1102 ([@ouijan](https://api.github.com/users/ouijan))
-
-Compatibility notes:
-- We are not sure if imports via webpack are still working, which is why this release is a pre-release
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.1.2...v4.1.2-0)
-
-## v4.1.2 - April 13th, 2019
-Chore/Test:
-- [#1515](https://github.com/wycats/handlebars.js/pull/1515) - Port over linting and test for typings ([@zimmi88](https://api.github.com/users/zimmi88))
-- chore: add missing typescript dependency, add package-lock.json - 594f1e3
-- test: remove safari from saucelabs - 871accc
-
-Bugfixes: 
-- fix: prevent RCE through the "lookup"-helper - cd38583
-
-Compatibility notes:
-
-Access to the constructor of a class thought `{{lookup obj "constructor" }}` is now prohibited. This closes 
-a leak that only half closed in versions 4.0.13 and 4.1.0, but it is a slight incompatibility.
-
-This kind of access is not the intended use of Handlebars and leads to the vulnerability described
-in #1495. We will **not** increase the major version, because such use is not intended or documented, 
-and because of the potential impact of the issue (we fear that most people won't use a new major version
-and the issue may not be resolved on many systems). 
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.1.1...v4.1.2)
-
-## v4.1.1 - March 16th, 2019
-Bugfixes:
-- fix: add "runtime.d.ts" to allow "require('handlebars/runtime')" in TypeScript - 5cedd62
-
-Refactorings:
-- replace "async" with "neo-async" - 048f2ce
-- use "substring"-function instead of "substr" - 445ae12
-
-Compatibility notes:
-- This is a bugfix release. There are no breaking change and no new features.
-
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.1.0...v4.1.1)
-
-## v4.1.0 - February 7th, 2019
-New Features
-
-- import TypeScript typings - 27ac1ee
+[Commits](https://github.com/wycats/handlebars.js/compare/v3.0.7...v3.0.8)
 
+## v3.0.7 - June 30th, 2019
 Security fixes:
 
-- disallow access to the constructor in templates to prevent RCE - 42841c4, #1495
+- [#1532](https://github.com/wycats/handlebars.js/pull/1532) - Backport security fixes to 3.x branch ([@mattolson](https://api.github.com/users/mattolson))
 
 Housekeeping
 
-- chore: fix components/handlebars package.json and auto-update on release - bacd473
-- chore: Use node 10 to build handlebars - 78dd89c
-- chore/doc: Add more release docs - 6b87c21
+- disable saucelabs-tests since the tunnel is not working - 95f33b1
+- update grunt-saucelabs and aws dependency - 09aaa56
+- fix package.json of components/handlebars.js repo - 7cf753b
+- Fix Travis by updating git tag retrieval - 7c3944015d30a4348ae66ec1736b752cd864d5c1
+- Use istanbul/lib/cli.js instead of node_modules/.bin/istanbul - 7820b207e123babd0bda0b4871790f2ea6b36b01
+
+Tests:
+
+- test: run appveyor tests in Node 10 - 420ac171a01b8777ebce0a777221754fcc72a5a8
+- Fix build on Windows - 47adcda48530ab1504b8019fe17eaedd4f4c943f
+
 
 Compatibility notes:
 
@@ -314,246 +66,98 @@ This kind of access is not the intended use of Handlebars and leads to the vulne
 
 
 
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.0.12...v4.1.0)
 
-## v4.0.12 - September 4th, 2018
-New features:
 
-- none
+[Commits](https://github.com/wycats/handlebars.js/compare/v3.0.6...v3.0.7)
 
-Various dependency updates
+## v3.0.6 - January 2nd, 2019
+Chore:
+- prevent tagging 3.x versions as "latest" in npm - df403ed, [#1486](https://github.com/wycats/handlebars.js/issues/1486)
+- ignore idea config - af919d2
+- fix travis build - 9283205
+- update components/handlebars package.json on release - 9679fe6
+- add active NodeJS versions to travis - d207ad0
 
-- [#1464](https://github.com/wycats/handlebars.js/pull/1464) - Bump versions of grunt-plugins to 1.x
-- [#1398](https://github.com/wycats/handlebars.js/pull/1398) - Chore: updated various dev dependencies
-- upgrade uglify-js - d3d3942
-- Update grunt-eslint to 20.1.0 - 7729aa9
-- Update dependencies "async" to 2.5.0 and "source-map" to 0.6.1 (73d5637)
+Fix: 
+- No longer escape "=" in HTML content - 6e9dbac, [#1489](https://github.com/wycats/handlebars.js/issues/1489)
+- gracefully handle read-only "column"-property of the Error class (required in Safari 9+) - 725986d
 
-Bugfixes:
-
-- [components/handlebars.js#24](https://github.com/components/handlebars.js#24) Add package.json to components shim
-- Updated `source-map`-package should work better with `rollup`[#1463](https://github.com/wycats/handlebars.js/issues/1463)
-
-Removed obsolete code:
-
-- unnecessary check - 0ddff8b
-- Use `files` field - 69c6ca5
-- Update jsfiddle to 4.0.11 - 8947dd0
 
 Compatibility notes:
-- No compatibility issues are to be expected
+- Compatibility to 3.0.5 is broken due to reverting to *not* escaping "=" in HTML,
+  but compatibility to 3.0.3 is restored.
 
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.0.11...v4.0.12)
 
-## v4.0.11 - October 17th, 2017
-- [#1391](https://github.com/wycats/handlebars.js/issues/1391) - `uglify-js` is unconditionally imported, but only listed as optional dependency ([@Turbo87](https://github.com/Turbo87))
-- [#1233](https://github.com/wycats/handlebars.js/issues/1233) - Unable to build under windows - error at test:bin task ([@blikblum](https://github.com/blikblum))
-- Update (C) year in the LICENSE file - 21386b6
+[Commits](https://github.com/wycats/handlebars.js/compare/v3.0.5...v3.0.6)
+
+## v3.0.5 - December 15th, 2018
+- chore: use node 10.x in travis-build - 4ed0a62
 
 Compatibility notes:
-- This is a bugfix release. There are no breaking change and no new features.
+- no breaking changes
 
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.0.10...v4.0.11)
+[Commits](https://github.com/wycats/handlebars.js/compare/v3.0.4...v3.0.5)
 
-## v4.0.10 - May 21st, 2017
-- Fix regression in 4.0.9: Replace "Object.assign" (not support in IE) by "util/extend" - 0e953d1
-
-
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.0.9...v4.0.10)
-
-## v4.0.9 - May 21st, 2017
-
-- [#1327](https://github.com/wycats/handlebars.js/issues/1327) Handlebars.compile() does not modify "options" anymore
-- pending [#1331](https://github.com/wycats/handlebars.js/issues/1331) Attempts to build Handlebars in a Windows environment
-  - Fix build in windows - cc554a5
-  - Ensure LF line-edings in handlebars-template fixtures (*.hbs) - ed879a6
-  - Run integration test with `node handlebars -a ...` on Windows - 2e21e2b
-  - Ensure LF line-edings in lexer-files (*.l) - bdfdbea
-  - Force LF line-endings for spec/artifacts - b50ef03
-  - Use istanbul/lib/cli.js instead of node_modules/.bin/istanbul - 6e6269f
-- TravisCI: Publish valid semver tags independently of the branch - 7378f85
-
-Compatibility notes:
-- No compatibility issues are expected.
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.0.8...v4.0.9)
-
-## v4.0.8 - May 2nd, 2017
-- [#1341](https://github.com/wycats/handlebars.js/issues/1341) [#1342](https://github.com/wycats/handlebars.js/issues/1342) Allow partial-blocks to be executed without "options" ([@nknapp](https://github.com/nknapp)) - a00c598
+## v3.0.4 - December 15th, 2018
+- Further relax uglify dependency - 4cd5305
+- Update uglify-js to avoid vulnerability - d97c2e6
+- Escape = in HTML content - 1c863e3
 
 Compatibility notes:
 - No breaking changes
 
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.0.7...v4.0.8)
-
-## v4.0.7 - April 29th, 2017
-- [#1319](https://github.com/wycats/handlebars.js/issues/1319): Fix context-stack when calling block-helpers on null values ([@nknapp](https://github.com/nknapp)) - c8f4b57
-- [#1315](https://github.com/wycats/handlebars.js/pull/1315) Parser: Change suffix to use ES6 default module export ([@Turbo87](https://github.com/Turbo87))- b617375
-- [#1290](https://github.com/wycats/handlebars.js/pull/1290) [#1252](https://github.com/wycats/handlebars.js/issue/1290) Add more tests for partial-blocks and inline partials ([@nknapp](https://github.com/nknapp)) -  63a8e0c
-- [#1252](https://github.com/wycats/handlebars.js/issue/1290) Using @partial-block twice in a template not possible ([@nknapp](https://github.com/nknapp)) - 5a164d0
-- [#1310](https://github.com/wycats/handlebars.js/pull/1310) Avoid duplicate "sourceMappingURL=" lines. ([@joonas-lahtinen](https://github.com/joonas-lahtinen)) - 01b0f65
-- [#1275](https://github.com/wycats/handlebars.js/pull/1275) require('sys') is deprecated, using 'util' instead ([@travnels](https://github.com/travnels)) - 406f2ee
-- [#1285](https://github.com/wycats/handlebars.js/pull/1285) [#1284](https://github.com/wycats/handlebars.js/issues/1284) Make "column"-property of Errors enumerable ([@nknapp](https://github.com/nknapp)) - a023cb4
-- [#1285](https://github.com/wycats/handlebars.js/pull/1285) Testcase to verify that compile-errors have a column-property ([@nknapp](https://github.com/nknapp)) - c7dc353
-
-[Commits](https://github.com/lawnsea/handlebars.js/compare/v4.0.6...v4.0.7)
-
-## v4.0.6 - November 12th, 2016
-- [#1243](https://github.com/wycats/handlebars.js/pull/1243) - Walk up data frames for nested @partial-block ([@lawnsea](https://github.com/lawnsea))
-- [#1210](https://github.com/wycats/handlebars.js/pull/1210) - Add a new lightweight package based on handlebars in the README ([@kabirbaidhya](https://github.com/kabirbaidhya))
-- [#1187](https://github.com/wycats/handlebars.js/pull/1187) - Ensure that existing blockParams and depths are respected on dupe programs ([@charleso](https://github.com/charleso))
-- [#1191](https://github.com/wycats/handlebars.js/pull/1191) - Added cory ([@leo](https://github.com/leo))
-- [#1177](https://github.com/wycats/handlebars.js/pull/1177) - Preserve License info in Closure Compiler ([@gennadiylitvinyuk](https://github.com/gennadiylitvinyuk))
-- [#1171](https://github.com/wycats/handlebars.js/pull/1171) - Contributing doc fix: failing thats -> failing tests ([@paulfalgout](https://github.com/paulfalgout))
-- [#1166](https://github.com/wycats/handlebars.js/pull/1166) - Update license date ([@timwangdev](https://github.com/timwangdev))
--  Update jsfiddle to point to latest - 959ee55 (originally dfc7554 by [@kpdecker](https://github.com/kpdecker))
-- [#1163](https://github.com/wycats/handlebars.js/pull/1163) - Fix typos on decorators-api.md. ([@adjohnson916](https://github.com/adjohnson916))
-- Drop extra Error params - 8c19874 (originally 63fdb92 by [@kpdecker](https://github.com/kpdecker))
-- [#1153](https://github.com/wycats/handlebars.js/pull/1153) - Add documentation for running tests to contributing.md ([@ryanmurakami](https://github.com/ryanmurakami))
-- Avoid error in older browsers in test - 400916c (originally a6121ca by [@kpdecker](https://github.com/kpdecker))
-- Update target browser test versions - fee2334 (originally 871c32a by [@kpdecker](https://github.com/kpdecker))
-- Exclude coverage check in exception conditional - 32d6363 (originally 326734b by [@kpdecker](https://github.com/kpdecker))
-- Fix throw when creating exception object in Safari - 20c965c (originally 2ea6119 by [@kpdecker](https://github.com/kpdecker))
-- Update build for modern node versions - 6c9f98c (originally 8289c0b by [@kpdecker](https://github.com/kpdecker))
-- [#1135](https://github.com/wycats/handlebars.js/issues/1135) - Relax depth check for context push - c393c81 (originally 25458fd by [@kpdecker](https://github.com/kpdecker))
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.0.5...v4.0.6)
-
-## v4.0.5 - November 19th, 2015
-- [#1132](https://github.com/wycats/handlebars.js/pull/1132) - Update uglify-js to avoid vulnerability ([@plynchnlm](https://github.com/plynchnlm))
-- [#1129](https://github.com/wycats/handlebars.js/issues/1129) - Minified lib returns an empty string ([@bricss](https://github.com/bricss))
-- Return current handlebars instance from noConflict - 685cf92
-- Add webpack to dev dependency to support npm 3 - 7a6c228
-- Further relax uglify dependency - 0a3b3c2
-- Include tests for minimized artifacts - c21118d
-- Fix lint errors under latest eslint - 9f59de9
-- Add print-script helper script - 98a6717
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.0.4...v4.0.5)
-
-## v4.0.4 - October 29th, 2015
-- [#1121](https://github.com/wycats/handlebars.js/pull/1121) - Include partial name in 'undefined partial' exception message ([@shinypb](https://github.com/shinypb))
-- [#1125](https://github.com/wycats/handlebars.js/pull/1125) - Add promised-handlebars to "in-the-wild"-list ([@nknapp](https://github.com/nknapp))
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.0.3...v4.0.4)
-
-## v4.0.3 - September 23rd, 2015
-- [#1099](https://github.com/wycats/handlebars.js/issues/1099) - @partial-block is overridden ([@btmorex](https://github.com/btmorex))
-- [#1093](https://github.com/wycats/handlebars.js/issues/1093) - #each skips iteration on undefined values ([@florianpilz](https://github.com/florianpilz))
-- [#1092](https://github.com/wycats/handlebars.js/issues/1092) - Square braces in key name ([@distantnative](https://github.com/distantnative))
-- [#1091](https://github.com/wycats/handlebars.js/pull/1091) - fix typo in release notes ([@nikolas](https://github.com/nikolas))
-- [#1090](https://github.com/wycats/handlebars.js/pull/1090) - grammar fixes in 4.0.0 release notes ([@nikolas](https://github.com/nikolas))
-
-Compatibility notes:
-- `each` iteration with `undefined` values has been restored to the 3.0 behaviors. Helper calls with undefined context values will now execute against an arbitrary empty object to avoid executing against global object in non-strict mode.
-- `]` can now be included in `[]` wrapped identifiers by escaping with `\`. Any `[]` identifiers that include `\` will now have to properly escape these values.
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.0.2...v4.0.3)
-
-## v4.0.2 - September 4th, 2015
-- [#1089](https://github.com/wycats/handlebars.js/issues/1089) - "Failover content" not working in multiple levels of inline partials ([@michaellopez](https://github.com/michaellopez))
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.0.1...v4.0.2)
-
-## v4.0.1 - September 2nd, 2015
-- Fix failure when using decorators in partials - 05b82a2
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.0.0...v4.0.1)
-
-## v4.0.0 - September 1st, 2015
-- [#1082](https://github.com/wycats/handlebars.js/pull/1082) - Decorators and Inline Partials ([@kpdecker](https://github.com/kpdecker))
-- [#1076](https://github.com/wycats/handlebars.js/pull/1076) - Implement partial blocks ([@kpdecker](https://github.com/kpdecker))
-- [#1087](https://github.com/wycats/handlebars.js/pull/1087) - Fix #each when last object entry has empty key ([@denniskuczynski](https://github.com/denniskuczynski))
-- [#1084](https://github.com/wycats/handlebars.js/pull/1084) - Bump uglify version to fix vulnerability ([@John-Steidley](https://github.com/John-Steidley))
-- [#1068](https://github.com/wycats/handlebars.js/pull/1068) - Fix typo ([@0xack13](https://github.com/0xack13))
-- [#1060](https://github.com/wycats/handlebars.js/pull/1060) - #1056 Fixed grammar for nested raw blocks ([@ericbn](https://github.com/ericbn))
-- [#1052](https://github.com/wycats/handlebars.js/pull/1052) - Updated year in License ([@maqnouch](https://github.com/maqnouch))
-- [#1037](https://github.com/wycats/handlebars.js/pull/1037) - Fix minor typos in README ([@tomxtobin](https://github.com/tomxtobin))
-- [#1032](https://github.com/wycats/handlebars.js/issues/1032) - Is it possible to render a partial without the parent scope? ([@aputinski](https://github.com/aputinski))
-- [#1019](https://github.com/wycats/handlebars.js/pull/1019) - Fixes typo in tests ([@aymerick](https://github.com/aymerick))
-- [#1016](https://github.com/wycats/handlebars.js/issues/1016) - Version mis-match ([@mayankdedhia](https://github.com/mayankdedhia))
-- [#1023](https://github.com/wycats/handlebars.js/issues/1023) - is it possible for nested custom helpers to communicate between each other?
-- [#893](https://github.com/wycats/handlebars.js/issues/893) - [Proposal] Section blocks.
-- [#792](https://github.com/wycats/handlebars.js/issues/792) - feature request: inline partial definitions
-- [#583](https://github.com/wycats/handlebars.js/issues/583) - Parent path continues to drill down depth with multiple conditionals
-- [#404](https://github.com/wycats/handlebars.js/issues/404) - Add named child helpers that can be referenced by block helpers
-- Escape = in HTML content - [83b8e84](https://github.com/wycats/handlebars.js/commit/83b8e84)
-- Drop AST constructors in favor of JSON - [95d84ba](https://github.com/wycats/handlebars.js/commit/95d84ba)
-- Pass container rather than exec as context - [9a2d1d6](https://github.com/wycats/handlebars.js/commit/9a2d1d6)
-- Add ignoreStandalone compiler option - [ea3a5a1](https://github.com/wycats/handlebars.js/commit/ea3a5a1)
-- Ignore empty when iterating on sparse arrays - [06d515a](https://github.com/wycats/handlebars.js/commit/06d515a)
-- Add support for string and stdin precompilation - [0de8dac](https://github.com/wycats/handlebars.js/commit/0de8dac)
-- Simplify object assignment generation logic - [77e6bfc](https://github.com/wycats/handlebars.js/commit/77e6bfc)
-- Bulletproof AST.helpers.helperExpression - [93b0760](https://github.com/wycats/handlebars.js/commit/93b0760)
-- Always return string responses - [8e868ab](https://github.com/wycats/handlebars.js/commit/8e868ab)
-- Pass undefined fields to helpers in strict mode - [5d4b8da](https://github.com/wycats/handlebars.js/commit/5d4b8da)
-- Avoid depth creation when context remains the same - [279e038](https://github.com/wycats/handlebars.js/commit/279e038)
-- Improve logging API - [9a49d35](https://github.com/wycats/handlebars.js/commit/9a49d35)
-- Fix with operator in no @data mode - [231a8d7](https://github.com/wycats/handlebars.js/commit/231a8d7)
-- Allow empty key name in each iteration - [1bb640b](https://github.com/wycats/handlebars.js/commit/1bb640b)
-- Add with block parameter support - [2a85106](https://github.com/wycats/handlebars.js/commit/2a85106)
-- Fix escaping of non-javascript identifiers - [410141c](https://github.com/wycats/handlebars.js/commit/410141c)
-- Fix location information for programs - [93faffa](https://github.com/wycats/handlebars.js/commit/93faffa)
-
-Compatibility notes:
-- Depthed paths are now conditionally pushed on to the stack. If the helper uses the same context, then a new stack is not created. This leads to behavior that better matches expectations for helpers like `if` that do not seem to alter the context. Any instances of `../` in templates will need to be checked for the correct behavior under 4.0.0. In general templates will either reduce the number of `../` instances or leave them as is. See [#1028](https://github.com/wycats/handlebars.js/issues/1028).
-- The `=` character is now HTML escaped. This closes a potential exploit case when using unquoted attributes, i.e. `<div foo={{bar}}>`. In general it's recommended that attributes always be quoted when their values are generated from a mustache to avoid any potential exploit surfaces.
-- AST constructors have been dropped in favor of plain old javascript objects
-- The runtime version has been increased. Precompiled templates will need to use runtime of at least 4.0.0.
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v3.0.3...v4.0.0)
+[Commits](https://github.com/wycats/handlebars.js/compare/v3.0.3...v3.0.4)
 
 ## v3.0.3 - April 28th, 2015
-- [#1004](https://github.com/wycats/handlebars.js/issues/1004) - Latest version breaks with RequireJS (global is undefined) ([@boskee](https://github.com/boskee))
+- [#1004](https://github.com/wycats/handlebars.js/issues/1004) - Latest version breaks with RequireJS (global is undefined) ([@boskee](https://api.github.com/users/boskee))
 
 [Commits](https://github.com/wycats/handlebars.js/compare/v3.0.2...v3.0.3)
 
 ## v3.0.2 - April 20th, 2015
-- [#998](https://github.com/wycats/handlebars.js/pull/998) - Add full support for es6 ([@kpdecker](https://github.com/kpdecker))
-- [#994](https://github.com/wycats/handlebars.js/issues/994) - Access Handlebars.Visitor in browser ([@tamlyn](https://github.com/tamlyn))
-- [#990](https://github.com/wycats/handlebars.js/issues/990) - Allow passing null/undefined literals subexpressions ([@blimmer](https://github.com/blimmer))
-- [#989](https://github.com/wycats/handlebars.js/issues/989) - Source-map error with requirejs ([@SteppeEagle](https://github.com/SteppeEagle))
-- [#967](https://github.com/wycats/handlebars.js/issues/967) - can't access "this" property  ([@75lb](https://github.com/75lb))
+- [#998](https://github.com/wycats/handlebars.js/pull/998) - Add full support for es6 ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#994](https://github.com/wycats/handlebars.js/issues/994) - Access Handlebars.Visitor in browser ([@tamlyn](https://api.github.com/users/tamlyn))
+- [#990](https://github.com/wycats/handlebars.js/issues/990) - Allow passing null/undefined literals subexpressions ([@blimmer](https://api.github.com/users/blimmer))
+- [#989](https://github.com/wycats/handlebars.js/issues/989) - Source-map error with requirejs ([@SteppeEagle](https://api.github.com/users/SteppeEagle))
+- [#967](https://github.com/wycats/handlebars.js/issues/967) - can't access "this" property  ([@75lb](https://api.github.com/users/75lb))
 - Use captureStackTrace for error handler - a009a97
 - Ignore branches tested without coverage monitoring - 37a664b
 
 [Commits](https://github.com/wycats/handlebars.js/compare/v3.0.1...v3.0.2)
 
 ## v3.0.1 - March 24th, 2015
-- [#984](https://github.com/wycats/handlebars.js/pull/984) - Adding documentation for passing arguments into partials ([@johneke](https://github.com/johneke))
-- [#973](https://github.com/wycats/handlebars.js/issues/973) - version 3 is slower than version 2 ([@elover](https://github.com/elover))
-- [#966](https://github.com/wycats/handlebars.js/issues/966) - "handlebars --version" does not work with v3.0.0 ([@abloomston](https://github.com/abloomston))
-- [#964](https://github.com/wycats/handlebars.js/pull/964) - default is a reserved word ([@grassick](https://github.com/grassick))
-- [#962](https://github.com/wycats/handlebars.js/pull/962) - Add dashbars' link on README. ([@pismute](https://github.com/pismute))
+- [#984](https://github.com/wycats/handlebars.js/pull/984) - Adding documentation for passing arguments into partials ([@johneke](https://api.github.com/users/johneke))
+- [#973](https://github.com/wycats/handlebars.js/issues/973) - version 3 is slower than version 2 ([@elover](https://api.github.com/users/elover))
+- [#966](https://github.com/wycats/handlebars.js/issues/966) - "handlebars --version" does not work with v3.0.0 ([@abloomston](https://api.github.com/users/abloomston))
+- [#964](https://github.com/wycats/handlebars.js/pull/964) - default is a reserved word ([@grassick](https://api.github.com/users/grassick))
+- [#962](https://github.com/wycats/handlebars.js/pull/962) - Add dashbars' link on README. ([@pismute](https://api.github.com/users/pismute))
 
 [Commits](https://github.com/wycats/handlebars.js/compare/v3.0.0...v3.0.1)
 
 ## v3.0.0 - February 10th, 2015
-- [#941](https://github.com/wycats/handlebars.js/pull/941) - Add support for dynamic partial names ([@kpdecker](https://github.com/kpdecker))
-- [#940](https://github.com/wycats/handlebars.js/pull/940) - Add missing reserved words so compiler knows to use array syntax: ([@mattflaschen](https://github.com/mattflaschen))
-- [#938](https://github.com/wycats/handlebars.js/pull/938) - Fix example using #with helper ([@diwo](https://github.com/diwo))
-- [#930](https://github.com/wycats/handlebars.js/pull/930) - Add parent tracking and mutation to AST visitors ([@kpdecker](https://github.com/kpdecker))
-- [#926](https://github.com/wycats/handlebars.js/issues/926) - Depthed lookups fail when program duplicator runs ([@kpdecker](https://github.com/kpdecker))
-- [#918](https://github.com/wycats/handlebars.js/pull/918) - Add instructions for 'spec/mustache' to CONTRIBUTING.md, fix a few typos ([@oneeman](https://github.com/oneeman))
-- [#915](https://github.com/wycats/handlebars.js/pull/915) - Ast update ([@kpdecker](https://github.com/kpdecker))
-- [#910](https://github.com/wycats/handlebars.js/issues/910) - Different behavior of {{@last}} when {{#each}} in {{#each}} ([@zordius](https://github.com/zordius))
-- [#907](https://github.com/wycats/handlebars.js/issues/907) - Implement named helper variable references ([@kpdecker](https://github.com/kpdecker))
-- [#906](https://github.com/wycats/handlebars.js/pull/906) - Add parser support for block params ([@mmun](https://github.com/mmun))
-- [#903](https://github.com/wycats/handlebars.js/issues/903) - Only provide aliases for multiple use calls ([@kpdecker](https://github.com/kpdecker))
-- [#902](https://github.com/wycats/handlebars.js/pull/902) - Generate Source Maps ([@kpdecker](https://github.com/kpdecker))
-- [#901](https://github.com/wycats/handlebars.js/issues/901) - Still escapes with noEscape enabled on isolated Handlebars environment ([@zedknight](https://github.com/zedknight))
-- [#896](https://github.com/wycats/handlebars.js/pull/896) - Simplify BlockNode by removing intermediate MustacheNode ([@mmun](https://github.com/mmun))
-- [#892](https://github.com/wycats/handlebars.js/pull/892) - Implement parser for else chaining of helpers ([@kpdecker](https://github.com/kpdecker))
-- [#889](https://github.com/wycats/handlebars.js/issues/889) - Consider extensible parser API ([@kpdecker](https://github.com/kpdecker))
-- [#887](https://github.com/wycats/handlebars.js/issues/887) - Handlebars.noConflict() option? ([@bradvogel](https://github.com/bradvogel))
-- [#886](https://github.com/wycats/handlebars.js/issues/886) - Add SafeString to context (or use duck-typing) ([@dominicbarnes](https://github.com/dominicbarnes))
-- [#870](https://github.com/wycats/handlebars.js/pull/870) - Registering undefined partial throws exception. ([@max-b](https://github.com/max-b))
-- [#866](https://github.com/wycats/handlebars.js/issues/866) - comments don't respect whitespace control ([@75lb](https://github.com/75lb))
-- [#863](https://github.com/wycats/handlebars.js/pull/863) - + jsDelivr CDN info ([@tomByrer](https://github.com/tomByrer))
-- [#858](https://github.com/wycats/handlebars.js/issues/858) - Disable new default auto-indent at included partials ([@majodev](https://github.com/majodev))
-- [#856](https://github.com/wycats/handlebars.js/pull/856) - jspm compatibility ([@MajorBreakfast](https://github.com/MajorBreakfast))
-- [#805](https://github.com/wycats/handlebars.js/issues/805) - Request: "strict" lookups ([@nzakas](https://github.com/nzakas))
+- [#941](https://github.com/wycats/handlebars.js/pull/941) - Add support for dynamic partial names ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#940](https://github.com/wycats/handlebars.js/pull/940) - Add missing reserved words so compiler knows to use array syntax: ([@mattflaschen](https://api.github.com/users/mattflaschen))
+- [#938](https://github.com/wycats/handlebars.js/pull/938) - Fix example using #with helper ([@diwo](https://api.github.com/users/diwo))
+- [#930](https://github.com/wycats/handlebars.js/pull/930) - Add parent tracking and mutation to AST visitors ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#926](https://github.com/wycats/handlebars.js/issues/926) - Depthed lookups fail when program duplicator runs ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#918](https://github.com/wycats/handlebars.js/pull/918) - Add instructions for 'spec/mustache' to CONTRIBUTING.md, fix a few typos ([@oneeman](https://api.github.com/users/oneeman))
+- [#915](https://github.com/wycats/handlebars.js/pull/915) - Ast update ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#910](https://github.com/wycats/handlebars.js/issues/910) - Different behavior of {{@last}} when {{#each}} in {{#each}} ([@zordius](https://api.github.com/users/zordius))
+- [#907](https://github.com/wycats/handlebars.js/issues/907) - Implement named helper variable references ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#906](https://github.com/wycats/handlebars.js/pull/906) - Add parser support for block params ([@mmun](https://api.github.com/users/mmun))
+- [#903](https://github.com/wycats/handlebars.js/issues/903) - Only provide aliases for multiple use calls ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#902](https://github.com/wycats/handlebars.js/pull/902) - Generate Source Maps ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#901](https://github.com/wycats/handlebars.js/issues/901) - Still escapes with noEscape enabled on isolated Handlebars environment ([@zedknight](https://api.github.com/users/zedknight))
+- [#896](https://github.com/wycats/handlebars.js/pull/896) - Simplify BlockNode by removing intermediate MustacheNode ([@mmun](https://api.github.com/users/mmun))
+- [#892](https://github.com/wycats/handlebars.js/pull/892) - Implement parser for else chaining of helpers ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#889](https://github.com/wycats/handlebars.js/issues/889) - Consider extensible parser API ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#887](https://github.com/wycats/handlebars.js/issues/887) - Handlebars.noConflict() option? ([@bradvogel](https://api.github.com/users/bradvogel))
+- [#886](https://github.com/wycats/handlebars.js/issues/886) - Add SafeString to context (or use duck-typing) ([@dominicbarnes](https://api.github.com/users/dominicbarnes))
+- [#870](https://github.com/wycats/handlebars.js/pull/870) - Registering undefined partial throws exception. ([@max-b](https://api.github.com/users/max-b))
+- [#866](https://github.com/wycats/handlebars.js/issues/866) - comments don't respect whitespace control ([@75lb](https://api.github.com/users/75lb))
+- [#863](https://github.com/wycats/handlebars.js/pull/863) - + jsDelivr CDN info ([@tomByrer](https://api.github.com/users/tomByrer))
+- [#858](https://github.com/wycats/handlebars.js/issues/858) - Disable new default auto-indent at included partials ([@majodev](https://api.github.com/users/majodev))
+- [#856](https://github.com/wycats/handlebars.js/pull/856) - jspm compatibility ([@MajorBreakfast](https://api.github.com/users/MajorBreakfast))
+- [#805](https://github.com/wycats/handlebars.js/issues/805) - Request: "strict" lookups ([@nzakas](https://api.github.com/users/nzakas))
 
 - Export the default object for handlebars/runtime - 5594416
 - Lookup partials when undefined - 617dd57
@@ -587,21 +191,21 @@ New Features:
 [Commits](https://github.com/wycats/handlebars.js/compare/v2.0.0-beta.1...v2.0.0)
 
 ## v2.0.0-beta.1 - August 26th, 2014
-- [#787](https://github.com/wycats/handlebars.js/pull/787) - Remove whitespace surrounding standalone statements ([@kpdecker](https://github.com/kpdecker))
-- [#827](https://github.com/wycats/handlebars.js/issues/827) - Render false literal as “false” ([@scoot557](https://github.com/scoot557))
-- [#767](https://github.com/wycats/handlebars.js/issues/767) - Subexpressions bug with hash and context ([@evensoul](https://github.com/evensoul))
+- [#787](https://github.com/wycats/handlebars.js/pull/787) - Remove whitespace surrounding standalone statements ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#827](https://github.com/wycats/handlebars.js/issues/827) - Render false literal as “false” ([@scoot557](https://api.github.com/users/scoot557))
+- [#767](https://github.com/wycats/handlebars.js/issues/767) - Subexpressions bug with hash and context ([@evensoul](https://api.github.com/users/evensoul))
 - Changes to 0/undefined handling
-  - [#731](https://github.com/wycats/handlebars.js/pull/731) - Strange behavior for {{#foo}} {{bar}} {{/foo}} when foo is 0 ([@kpdecker](https://github.com/kpdecker))
-  - [#820](https://github.com/wycats/handlebars.js/issues/820) - strange behavior for {{foo.bar}} when foo is 0 or null or false ([@zordius](https://github.com/zordius))
-  - [#837](https://github.com/wycats/handlebars.js/issues/837) - Strange input for custom helper ( foo.bar == false when foo is undefined ) ([@zordius](https://github.com/zordius))
-- [#819](https://github.com/wycats/handlebars.js/pull/819) - Implement recursive field lookup ([@kpdecker](https://github.com/kpdecker))
-- [#764](https://github.com/wycats/handlebars.js/issues/764) - This reference not working for helpers ([@kpdecker](https://github.com/kpdecker))
-- [#773](https://github.com/wycats/handlebars.js/issues/773) - Implicit parameters in {{#each}} introduces a peculiarity in helpers calling convention  ([@Bertrand](https://github.com/Bertrand))
-- [#783](https://github.com/wycats/handlebars.js/issues/783) - helperMissing and consistency for different expression types ([@ErisDS](https://github.com/ErisDS))
-- [#795](https://github.com/wycats/handlebars.js/pull/795) - Turn the precompile script into a wrapper around a module. ([@jwietelmann](https://github.com/jwietelmann))
-- [#823](https://github.com/wycats/handlebars.js/pull/823) - Support inverse sections on the with helper ([@dan-manges](https://github.com/dan-manges))
-- [#834](https://github.com/wycats/handlebars.js/pull/834) - Refactor blocks, programs and inverses ([@mmun](https://github.com/mmun))
-- [#852](https://github.com/wycats/handlebars.js/issues/852) - {{foo~}} space control behavior is different from older version ([@zordius](https://github.com/zordius))
+  - [#731](https://github.com/wycats/handlebars.js/pull/731) - Strange behavior for {{#foo}} {{bar}} {{/foo}} when foo is 0 ([@kpdecker](https://api.github.com/users/kpdecker))
+  - [#820](https://github.com/wycats/handlebars.js/issues/820) - strange behavior for {{foo.bar}} when foo is 0 or null or false ([@zordius](https://api.github.com/users/zordius))
+  - [#837](https://github.com/wycats/handlebars.js/issues/837) - Strange input for custom helper ( foo.bar == false when foo is undefined ) ([@zordius](https://api.github.com/users/zordius))
+- [#819](https://github.com/wycats/handlebars.js/pull/819) - Implement recursive field lookup ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#764](https://github.com/wycats/handlebars.js/issues/764) - This reference not working for helpers ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#773](https://github.com/wycats/handlebars.js/issues/773) - Implicit parameters in {{#each}} introduces a peculiarity in helpers calling convention  ([@Bertrand](https://api.github.com/users/Bertrand))
+- [#783](https://github.com/wycats/handlebars.js/issues/783) - helperMissing and consistency for different expression types ([@ErisDS](https://api.github.com/users/ErisDS))
+- [#795](https://github.com/wycats/handlebars.js/pull/795) - Turn the precompile script into a wrapper around a module. ([@jwietelmann](https://api.github.com/users/jwietelmann))
+- [#823](https://github.com/wycats/handlebars.js/pull/823) - Support inverse sections on the with helper ([@dan-manges](https://api.github.com/users/dan-manges))
+- [#834](https://github.com/wycats/handlebars.js/pull/834) - Refactor blocks, programs and inverses ([@mmun](https://api.github.com/users/mmun))
+- [#852](https://github.com/wycats/handlebars.js/issues/852) - {{foo~}} space control behavior is different from older version ([@zordius](https://api.github.com/users/zordius))
 - [#835](https://github.com/wycats/handlebars.js/issues/835) - Templates overwritten if file is loaded twice
 
 - Expose escapeExpression on the root object - 980c38c
@@ -616,7 +220,7 @@ Compatibility notes:
 - Lines containing only block statements and whitespace are now removed. This matches the Mustache spec but may cause issues with code that expects whitespace to exist but would not otherwise.
 - Partials that are standalone will now indent their rendered content
 - `AST.ProgramNode`'s signature has changed. 
-- Numerious methods/features removed from pseudo-API classes
+- Numerious methods/features removed from psuedo-API classes
   - `JavaScriptCompiler.register`
   - `JavaScriptCompiler.replaceStack` no longer supports non-inline replace
   - `Compiler.disassemble`
@@ -635,18 +239,18 @@ Compatibility notes:
 [Commits](https://github.com/wycats/handlebars.js/compare/v2.0.0-alpha.3...v2.0.0-alpha.4)
 
 ## v2.0.0-alpha.3 - May 19th, 2014
-- [#797](https://github.com/wycats/handlebars.js/pull/797) - Pass full helper ID to helperMissing when options are provided ([@tomdale](https://github.com/tomdale))
-- [#793](https://github.com/wycats/handlebars.js/pull/793) - Ensure isHelper is coerced to a boolean ([@mmun](https://github.com/mmun))
+- [#797](https://github.com/wycats/handlebars.js/pull/797) - Pass full helper ID to helperMissing when options are provided ([@tomdale](https://api.github.com/users/tomdale))
+- [#793](https://github.com/wycats/handlebars.js/pull/793) - Ensure isHelper is coerced to a boolean ([@mmun](https://api.github.com/users/mmun))
 - Refactor template init logic - 085e5e1
 
 [Commits](https://github.com/wycats/handlebars.js/compare/v2.0.0-alpha.2...v2.0.0-alpha.3)
 
 ## v2.0.0-alpha.2 - March 6th, 2014
-- [#756](https://github.com/wycats/handlebars.js/pull/756) - fix bug in IE<=8 (no Array::map), closes #751 ([@jenseng](https://github.com/jenseng))
-- [#749](https://github.com/wycats/handlebars.js/pull/749) - properly handle multiple subexpressions in the same hash, fixes #748 ([@jenseng](https://github.com/jenseng))
-- [#743](https://github.com/wycats/handlebars.js/issues/743) - subexpression confusion/problem? ([@waynedpj](https://github.com/waynedpj))
-- [#746](https://github.com/wycats/handlebars.js/issues/746) - [CLI] support `handlebars --version` ([@apfelbox](https://github.com/apfelbox))
-- [#747](https://github.com/wycats/handlebars.js/pull/747) - updated grunt-saucelabs, failing tests revealed ([@Jonahss](https://github.com/Jonahss))
+- [#756](https://github.com/wycats/handlebars.js/pull/756) - fix bug in IE<=8 (no Array::map), closes #751 ([@jenseng](https://api.github.com/users/jenseng))
+- [#749](https://github.com/wycats/handlebars.js/pull/749) - properly handle multiple subexpressions in the same hash, fixes #748 ([@jenseng](https://api.github.com/users/jenseng))
+- [#743](https://github.com/wycats/handlebars.js/issues/743) - subexpression confusion/problem? ([@waynedpj](https://api.github.com/users/waynedpj))
+- [#746](https://github.com/wycats/handlebars.js/issues/746) - [CLI] support `handlebars --version` ([@apfelbox](https://api.github.com/users/apfelbox))
+- [#747](https://github.com/wycats/handlebars.js/pull/747) - updated grunt-saucelabs, failing tests revealed ([@Jonahss](https://api.github.com/users/Jonahss))
 - Make JSON a requirement for the compiler. - 058c0fb
 - Temporarily kill the AWS publish CI step - 8347ee2
 
@@ -656,26 +260,26 @@ Compatibility notes:
 [Commits](https://github.com/wycats/handlebars.js/compare/v2.0.0-alpha.1...v2.0.0-alpha.2)
 
 ## v2.0.0-alpha.1 - February 10th, 2014
-- [#182](https://github.com/wycats/handlebars.js/pull/182) - Allow passing hash parameters to partials ([@kpdecker](https://github.com/kpdecker))
-- [#392](https://github.com/wycats/handlebars.js/pull/392) - Access to root context in partials and helpers ([@kpdecker](https://github.com/kpdecker))
-- [#472](https://github.com/wycats/handlebars.js/issues/472) - Helpers cannot have decimal parameters ([@kayleg](https://github.com/kayleg))
-- [#569](https://github.com/wycats/handlebars.js/pull/569) - Unable to lookup array values using @index ([@kpdecker](https://github.com/kpdecker))
-- [#491](https://github.com/wycats/handlebars.js/pull/491) - For nested helpers: get the @ variables of the outer helper from the inner one ([@kpdecker](https://github.com/kpdecker))
-- [#669](https://github.com/wycats/handlebars.js/issues/669) - Ability to unregister a helper ([@dbachrach](https://github.com/dbachrach))
-- [#730](https://github.com/wycats/handlebars.js/pull/730) - Raw block helpers ([@kpdecker](https://github.com/kpdecker))
-- [#634](https://github.com/wycats/handlebars.js/pull/634) - It would be great to have the helper name passed to `blockHelperMissing` ([@kpdecker](https://github.com/kpdecker))
-- [#729](https://github.com/wycats/handlebars.js/pull/729) - Convert template spec to object literal ([@kpdecker](https://github.com/kpdecker))
+- [#182](https://github.com/wycats/handlebars.js/pull/182) - Allow passing hash parameters to partials ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#392](https://github.com/wycats/handlebars.js/pull/392) - Access to root context in partials and helpers ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#472](https://github.com/wycats/handlebars.js/issues/472) - Helpers cannot have decimal parameters ([@kayleg](https://api.github.com/users/kayleg))
+- [#569](https://github.com/wycats/handlebars.js/pull/569) - Unable to lookup array values using @index ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#491](https://github.com/wycats/handlebars.js/pull/491) - For nested helpers: get the @ variables of the outer helper from the inner one ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#669](https://github.com/wycats/handlebars.js/issues/669) - Ability to unregister a helper ([@dbachrach](https://api.github.com/users/dbachrach))
+- [#730](https://github.com/wycats/handlebars.js/pull/730) - Raw block helpers ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#634](https://github.com/wycats/handlebars.js/pull/634) - It would be great to have the helper name passed to `blockHelperMissing` ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#729](https://github.com/wycats/handlebars.js/pull/729) - Convert template spec to object literal ([@kpdecker](https://api.github.com/users/kpdecker))
 
-- [#658](https://github.com/wycats/handlebars.js/issues/658) - Depthed helpers do not work after an upgrade from 1.0.0 ([@xibxor](https://github.com/xibxor))
-- [#671](https://github.com/wycats/handlebars.js/issues/671) - Crashes on no-parameter {{#each}} ([@stepancheg](https://github.com/stepancheg))
-- [#689](https://github.com/wycats/handlebars.js/issues/689) - broken template precompilation ([@AAS](https://github.com/AAS))
-- [#698](https://github.com/wycats/handlebars.js/pull/698) - Fix parser generation under windows ([@osiris43](https://github.com/osiris43))
-- [#699](https://github.com/wycats/handlebars.js/issues/699) - @DATA not compiles to invalid JS in stringParams mode ([@kpdecker](https://github.com/kpdecker))
-- [#705](https://github.com/wycats/handlebars.js/issues/705) - 1.3.0 can not be wrapped in an IIFE ([@craigteegarden](https://github.com/craigteegarden))
-- [#706](https://github.com/wycats/handlebars.js/pull/706) - README: Use with helper instead of relying on blockHelperMissing ([@scottgonzalez](https://github.com/scottgonzalez))
+- [#658](https://github.com/wycats/handlebars.js/issues/658) - Depthed helpers do not work after an upgrade from 1.0.0 ([@xibxor](https://api.github.com/users/xibxor))
+- [#671](https://github.com/wycats/handlebars.js/issues/671) - Crashes on no-parameter {{#each}} ([@stepancheg](https://api.github.com/users/stepancheg))
+- [#689](https://github.com/wycats/handlebars.js/issues/689) - broken template precompilation ([@AAS](https://api.github.com/users/AAS))
+- [#698](https://github.com/wycats/handlebars.js/pull/698) - Fix parser generation under windows ([@osiris43](https://api.github.com/users/osiris43))
+- [#699](https://github.com/wycats/handlebars.js/issues/699) - @DATA not compiles to invalid JS in stringParams mode ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#705](https://github.com/wycats/handlebars.js/issues/705) - 1.3.0 can not be wrapped in an IIFE ([@craigteegarden](https://api.github.com/users/craigteegarden))
+- [#706](https://github.com/wycats/handlebars.js/pull/706) - README: Use with helper instead of relying on blockHelperMissing ([@scottgonzalez](https://api.github.com/users/scottgonzalez))
 
-- [#700](https://github.com/wycats/handlebars.js/pull/700) - Remove redundant conditions ([@blakeembrey](https://github.com/blakeembrey))
-- [#704](https://github.com/wycats/handlebars.js/pull/704) - JavaScript Compiler Cleanup ([@blakeembrey](https://github.com/blakeembrey))
+- [#700](https://github.com/wycats/handlebars.js/pull/700) - Remove redundant conditions ([@blakeembrey](https://api.github.com/users/blakeembrey))
+- [#704](https://github.com/wycats/handlebars.js/pull/704) - JavaScript Compiler Cleanup ([@blakeembrey](https://api.github.com/users/blakeembrey))
 
 Compatibility notes:
 - `helperMissing` helper no longer has the indexed name argument. Helper name is now available via `options.name`.
@@ -685,17 +289,17 @@ Compatibility notes:
   - INTEGER -> NUMBER
   - Additional PartialNode hash parameter
   - New RawBlockNode type
-- Data frames now have a `_parent` field. This is internal but is enumerable for performance/compatibility reasons.
+- Data frames now have a `_parent` field. This is internal but is enumerable for performance/compatability reasons.
 
 [Commits](https://github.com/wycats/handlebars.js/compare/v1.3.0...v2.0.0-alpha.1)
 
 ## v1.3.0 - January 1st, 2014
-- [#690](https://github.com/wycats/handlebars.js/pull/690) - Added support for subexpressions ([@machty](https://github.com/machty))
-- [#696](https://github.com/wycats/handlebars.js/pull/696) - Fix for reserved keyword "default" ([@nateirwin](https://github.com/nateirwin))
-- [#692](https://github.com/wycats/handlebars.js/pull/692) - add line numbers to nodes when parsing ([@fivetanley](https://github.com/fivetanley))
-- [#695](https://github.com/wycats/handlebars.js/pull/695) - Pull options out from param setup to allow easier extension ([@blakeembrey](https://github.com/blakeembrey))
-- [#694](https://github.com/wycats/handlebars.js/pull/694) - Make the environment reusable ([@blakeembrey](https://github.com/blakeembrey))
-- [#636](https://github.com/wycats/handlebars.js/issues/636) - Print line and column of errors ([@sgronblo](https://github.com/sgronblo))
+- [#690](https://github.com/wycats/handlebars.js/pull/690) - Added support for subexpressions ([@machty](https://api.github.com/users/machty))
+- [#696](https://github.com/wycats/handlebars.js/pull/696) - Fix for reserved keyword "default" ([@nateirwin](https://api.github.com/users/nateirwin))
+- [#692](https://github.com/wycats/handlebars.js/pull/692) - add line numbers to nodes when parsing ([@fivetanley](https://api.github.com/users/fivetanley))
+- [#695](https://github.com/wycats/handlebars.js/pull/695) - Pull options out from param setup to allow easier extension ([@blakeembrey](https://api.github.com/users/blakeembrey))
+- [#694](https://github.com/wycats/handlebars.js/pull/694) - Make the environment reusable ([@blakeembrey](https://api.github.com/users/blakeembrey))
+- [#636](https://github.com/wycats/handlebars.js/issues/636) - Print line and column of errors ([@sgronblo](https://api.github.com/users/sgronblo))
 - Use literal for data lookup - c1a93d3
 - Add stack handling sanity checks - cd885bf
 - Fix stack id "leak" on replaceStack - ddfe457
@@ -704,25 +308,25 @@ Compatibility notes:
 [Commits](https://github.com/wycats/handlebars.js/compare/v1.2.1...v1.3.0)
 
 ## v1.2.1 - December 26th, 2013
-- [#684](https://github.com/wycats/handlebars.js/pull/684) - Allow any number of trailing characters for valid JavaScript variable ([@blakeembrey](https://github.com/blakeembrey))
-- [#686](https://github.com/wycats/handlebars.js/pull/686) - Falsy AMD module names in version 1.2.0 ([@kpdecker](https://github.com/kpdecker))
+- [#684](https://github.com/wycats/handlebars.js/pull/684) - Allow any number of trailing characters for valid JavaScript variable ([@blakeembrey](https://api.github.com/users/blakeembrey))
+- [#686](https://github.com/wycats/handlebars.js/pull/686) - Falsy AMD module names in version 1.2.0 ([@kpdecker](https://api.github.com/users/kpdecker))
 
 [Commits](https://github.com/wycats/handlebars.js/compare/v1.2.0...v1.2.1)
 
 ## v1.2.0 - December 23rd, 2013
-- [#675](https://github.com/wycats/handlebars.js/issues/675) - Cannot compile empty template for partial ([@erwinw](https://github.com/erwinw))
-- [#677](https://github.com/wycats/handlebars.js/issues/677) - Triple brace statements fail under IE ([@hamzaCM](https://github.com/hamzaCM))
-- [#655](https://github.com/wycats/handlebars.js/issues/655) - Loading Handlebars using bower ([@niki4810](https://github.com/niki4810))
-- [#657](https://github.com/wycats/handlebars.js/pull/657) - Fixes issue where cli compiles non handlebars templates ([@chrishoage](https://github.com/chrishoage))
-- [#681](https://github.com/wycats/handlebars.js/pull/681) - Adds in-browser testing and Saucelabs CI ([@kpdecker](https://github.com/kpdecker))
-- [#661](https://github.com/wycats/handlebars.js/pull/661) - Add @first and @index to #each object iteration ([@cgp](https://github.com/cgp))
-- [#650](https://github.com/wycats/handlebars.js/pull/650) - Handlebars is MIT-licensed ([@thomasboyt](https://github.com/thomasboyt))
-- [#641](https://github.com/wycats/handlebars.js/pull/641) - Document ember testing process ([@kpdecker](https://github.com/kpdecker))
+- [#675](https://github.com/wycats/handlebars.js/issues/675) - Cannot compile empty template for partial ([@erwinw](https://api.github.com/users/erwinw))
+- [#677](https://github.com/wycats/handlebars.js/issues/677) - Triple brace statements fail under IE ([@hamzaCM](https://api.github.com/users/hamzaCM))
+- [#655](https://github.com/wycats/handlebars.js/issues/655) - Loading Handlebars using bower ([@niki4810](https://api.github.com/users/niki4810))
+- [#657](https://github.com/wycats/handlebars.js/pull/657) - Fixes issue where cli compiles non handlebars templates ([@chrishoage](https://api.github.com/users/chrishoage))
+- [#681](https://github.com/wycats/handlebars.js/pull/681) - Adds in-browser testing and Saucelabs CI ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#661](https://github.com/wycats/handlebars.js/pull/661) - Add @first and @index to #each object iteration ([@cgp](https://api.github.com/users/cgp))
+- [#650](https://github.com/wycats/handlebars.js/pull/650) - Handlebars is MIT-licensed ([@thomasboyt](https://api.github.com/users/thomasboyt))
+- [#641](https://github.com/wycats/handlebars.js/pull/641) - Document ember testing process ([@kpdecker](https://api.github.com/users/kpdecker))
 - [#662](https://github.com/wycats/handlebars.js/issues/662) - handlebars-source 1.1.2 is missing from RubyGems.
-- [#656](https://github.com/wycats/handlebars.js/issues/656) - Expose COMPILER_REVISION checks as a hook ([@machty](https://github.com/machty))
-- [#668](https://github.com/wycats/handlebars.js/issues/668) - Consider publishing handlebars-runtime as a separate module on npm ([@dlmanning](https://github.com/dlmanning))
-- [#679](https://github.com/wycats/handlebars.js/issues/679) - Unable to override invokePartial ([@mattbrailsford](https://github.com/mattbrailsford))
-- [#646](https://github.com/wycats/handlebars.js/pull/646) - Fix "\\{{" immediately following "\{{" ([@dmarcotte](https://github.com/dmarcotte))
+- [#656](https://github.com/wycats/handlebars.js/issues/656) - Expose COMPILER_REVISION checks as a hook ([@machty](https://api.github.com/users/machty))
+- [#668](https://github.com/wycats/handlebars.js/issues/668) - Consider publishing handlebars-runtime as a separate module on npm ([@dlmanning](https://api.github.com/users/dlmanning))
+- [#679](https://github.com/wycats/handlebars.js/issues/679) - Unable to override invokePartial ([@mattbrailsford](https://api.github.com/users/mattbrailsford))
+- [#646](https://github.com/wycats/handlebars.js/pull/646) - Fix "\\{{" immediately following "\{{" ([@dmarcotte](https://api.github.com/users/dmarcotte))
 - Allow extend to work with non-prototyped objects - eb53f2e
 - Add JavascriptCompiler public API tests - 1a751b2
 - Add AST test coverage for more complex paths - ddea5be
@@ -737,8 +341,8 @@ Compatibility notes:
 
 ## v1.1.2 - November 5th, 2013
 
-- [#645](https://github.com/wycats/handlebars.js/issues/645) - 1.1.1 fails under IE8 ([@kpdecker](https://github.com/kpdecker))
-- [#644](https://github.com/wycats/handlebars.js/issues/644) - Using precompiled templates (AMD mode) with handlebars.runtime 1.1.1 ([@fddima](https://github.com/fddima))
+- [#645](https://github.com/wycats/handlebars.js/issues/645) - 1.1.1 fails under IE8 ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#644](https://github.com/wycats/handlebars.js/issues/644) - Using precompiled templates (AMD mode) with handlebars.runtime 1.1.1 ([@fddima](https://api.github.com/users/fddima))
 
 - Add simple binary utility tests - 96a45a4
 - Fix empty string compilation - eea708a
@@ -755,13 +359,13 @@ Compatibility notes:
 
 ## v1.1.0 - November 3rd, 2013
 
-- [#628](https://github.com/wycats/handlebars.js/pull/628) - Convert code to ES6 modules ([@kpdecker](https://github.com/kpdecker))
-- [#336](https://github.com/wycats/handlebars.js/pull/336) - Add whitespace control syntax ([@kpdecker](https://github.com/kpdecker))
-- [#535](https://github.com/wycats/handlebars.js/pull/535) - Fix for probable JIT error under Safari ([@sorentwo](https://github.com/sorentwo))
-- [#483](https://github.com/wycats/handlebars.js/issues/483) - Add first and last @ vars to each helper ([@denniskuczynski](https://github.com/denniskuczynski))
-- [#557](https://github.com/wycats/handlebars.js/pull/557) - `\\{{foo}}` escaping only works in some situations ([@dmarcotte](https://github.com/dmarcotte))
-- [#552](https://github.com/wycats/handlebars.js/pull/552) - Added BOM removal flag. ([@blessenm](https://github.com/blessenm))
-- [#543](https://github.com/wycats/handlebars.js/pull/543) - publish passing master builds to s3 ([@fivetanley](https://github.com/fivetanley))
+- [#628](https://github.com/wycats/handlebars.js/pull/628) - Convert code to ES6 modules ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#336](https://github.com/wycats/handlebars.js/pull/336) - Add whitespace control syntax ([@kpdecker](https://api.github.com/users/kpdecker))
+- [#535](https://github.com/wycats/handlebars.js/pull/535) - Fix for probable JIT error under Safari ([@sorentwo](https://api.github.com/users/sorentwo))
+- [#483](https://github.com/wycats/handlebars.js/issues/483) - Add first and last @ vars to each helper ([@denniskuczynski](https://api.github.com/users/denniskuczynski))
+- [#557](https://github.com/wycats/handlebars.js/pull/557) - `\\{{foo}}` escaping only works in some situations ([@dmarcotte](https://api.github.com/users/dmarcotte))
+- [#552](https://github.com/wycats/handlebars.js/pull/552) - Added BOM removal flag. ([@blessenm](https://api.github.com/users/blessenm))
+- [#543](https://github.com/wycats/handlebars.js/pull/543) - publish passing master builds to s3 ([@fivetanley](https://api.github.com/users/fivetanley))
 
 - [#608](https://github.com/wycats/handlebars.js/issues/608) - Add `includeZero` flag to `if` conditional
 - [#498](https://github.com/wycats/handlebars.js/issues/498) - `Handlebars.compile` fails on empty string although a single blank works fine
@@ -807,7 +411,7 @@ Compatibility notes:
 ## v1.0.11 / 1.0.0-rc4 - May 13 2013
 
 - [#458](https://github.com/wycats/handlebars.js/issues/458) - Fix `./foo` syntax ([@jpfiset](https://github.com/jpfiset))
-- [#460](https://github.com/wycats/handlebars.js/issues/460) - Allow `:` in unescaped identifiers ([@jpfiset](https://github.com/jpfiset))
+- [#460](https://github.com/wycats/handlebars.js/issues/460) - Allow `:` in unescaped identifers ([@jpfiset](https://github.com/jpfiset))
 - [#471](https://github.com/wycats/handlebars.js/issues/471) - Create release notes (These!)
 - [#456](https://github.com/wycats/handlebars.js/issues/456) - Allow escaping of `\\`
 - [#211](https://github.com/wycats/handlebars.js/issues/211) - Fix exception in `escapeExpression`