v4.3.5

.eslintignore

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

.eslintrc.js

@@ -1,12 +1,25 @@
 module.exports = {
-  "extends": ["eslint:recommended","plugin:compat/recommended"],
+  "extends": "eslint:recommended",
   "globals": {
-    "self": false,
-    "SOURCE_MAPS": true
+    "self": false
   },
   "env": {
-    "node": true,
-    "es6": true
+    "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,
+    "restParams": true,
+    "spread": true,
+    "templateStrings": true
   },
   "rules": {
     // overrides eslint:recommended defaults
@@ -58,7 +71,6 @@ module.exports = {
     "no-with": "error",
     "radix": "error",
     "wrap-iife": "error",
-    "no-prototype-builtins": "error",
 
 
     // Variables //
@@ -112,8 +124,6 @@ module.exports = {
     "no-var": "warn"
   },
   "parserOptions": {
-    "sourceType": "module",
-    "ecmaVersion": 6,
-    "ecmaFeatures": {}
+    "sourceType": "module"
   }
-};
+}

CONTRIBUTING.md

@@ -90,7 +90,6 @@ Handlebars utilizes the [release yeoman generator][generator-release] to perform
 A full release may be completed with the following:
 
 ```
-npm ci
 yo release
 npm publish
 yo release:publish components handlebars.js dist/components/
@@ -105,7 +104,7 @@ 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)
+* [The AWS S3 Bucket](http://builds.handlebarsjs.com.s3.amazonaws.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.

Gruntfile.js

@@ -43,17 +43,16 @@ module.exports = function(grunt) {
         ]
       }
     },
-    webpack: {
-      build: require('./webpack.config')
-    },
+
     babel: {
       options: {
         sourceMaps: 'inline',
+        loose: ['es6.modules'],
         auxiliaryCommentBefore: 'istanbul ignore next'
       },
       amd: {
         options: {
-          plugins: ['@babel/plugin-transform-modules-amd']
+          modules: 'amd'
         },
         files: [{
           expand: true,
@@ -65,11 +64,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 +74,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&auxiliaryCommentBefore=istanbul%20ignore%20next' }
+          ]
+        },
+        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: /(?:^!|@(?:license|preserve|cc_on))/
+      },
+      dist: {
+        files: [{
+          cwd: 'dist/',
+          expand: true,
+          src: ['handlebars*.js', '!*.min.js'],
+          dest: 'dist/',
+          rename: function(dest, src) {
+            return dest + src.replace(/\.js$/, '.min.js');
+          }
+        }]
+      }
+    },
 
     concat: {
       tests: {
@@ -160,23 +221,25 @@ module.exports = function(grunt) {
                     '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', 'test:min', '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');

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/util/benchwarmer.js

@@ -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);
     }
 
@@ -77,7 +77,7 @@ BenchWarmer.prototype = {
 
         var errors = false, prop, bench;
         for (prop in self.errors) {
-          if (Object.prototype.hasOwnProperty.call(self, prop)
+          if (self.errors.hasOwnProperty(prop)
               && self.errors[prop].error.message !== 'EWOT') {
             errors = true;
             break;
@@ -86,8 +86,9 @@ BenchWarmer.prototype = {
 
         if (errors) {
           print('\n\nErrors:\n');
-          Object.keys(self.errors).forEach(function(prop) {
-            if (self.errors[prop].error.message !== 'EWOT') {
+          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(bench.error.message);
@@ -96,7 +97,7 @@ BenchWarmer.prototype = {
               }
               print('\n');
             }
-          });
+          }
         }
 
         callback();

components/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "handlebars",
-  "version": "4.5.3",
+  "version": "4.3.5",
   "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>4.3.5</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": "4.3.5",
   "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
 

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

@@ -1,12 +1,12 @@
-import * as Handlebars from 'handlebars/runtime';
+import * as Handlebars from 'handlebars/runtime'
 import hbs from 'handlebars-inline-precompile';
-import {assertEquals} from '../../webpack-test/src/lib/assert';
+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'});
+const output = template({name: 'yehuda'})
 
-assertEquals(output, 'YEHUDA');
+assertEquals(output, 'YEHUDA')

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

@@ -13,4 +13,4 @@ for i in dist/*-test.js ; do
   echo "----------------------"
   node "$i"
   echo "Success"
-done
+done

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

@@ -10,7 +10,6 @@ testFiles
 
 module.exports = {
     entry: entryPoints,
-    mode: 'production',
     output: {
         filename: '[name]',
         path: __dirname + '/dist'

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

@@ -4,7 +4,7 @@ import {registerDefaultHelpers} from './helpers';
 import {registerDefaultDecorators} from './decorators';
 import logger from './logger';
 
-export const VERSION = '4.5.3';
+export const VERSION = '4.3.5';
 export const COMPILER_REVISION = 8;
 export const LAST_COMPATIBLE_COMPILER_REVISION = 7;
 

lib/handlebars/compiler/base.js

@@ -8,7 +8,7 @@ export { parser };
 let yy = {};
 extend(yy, Helpers);
 
-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 +19,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);
+  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 */
 }
@@ -120,12 +125,14 @@ CodeGen.prototype = {
   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('{');

lib/handlebars/compiler/compiler.js

@@ -54,7 +54,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 +65,15 @@ Compiler.prototype = {
       'with': true,
       'log': true,
       'lookup': true
-    }, options.knownHelpers);
+    };
+    if (knownHelpers) {
+      // the next line should use "Object.keys", but the code has been like this a long time and changing it, might
+      // cause backwards-compatibility issues... It's an old library...
+      // eslint-disable-next-line guard-for-in
+      for (let name in knownHelpers) {
+          this.options.knownHelpers[name] = knownHelpers[name];
+      }
+    }
 
     return this.accept(program);
   },
@@ -359,6 +369,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) {

lib/handlebars/compiler/javascript-compiler.js

@@ -2,7 +2,6 @@ import { COMPILER_REVISION, REVISION_CHANGES } from '../base';
 import Exception from '../exception';
 import {isArray} from '../utils';
 import CodeGen from './code-gen';
-import {dangerousPropertyRegex} from '../helpers/lookup';
 
 function Literal(value) {
   this.value = value;
@@ -14,8 +13,9 @@ 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*/) {
-    if (dangerousPropertyRegex.test(name)) {
-      const isEnumerable = [ this.aliasable('container.propertyIsEnumerable'), '.call(', parent, ',', JSON.stringify(name), ')'];
+    const isEnumerable = [ this.aliasable('container.propertyIsEnumerable'), '.call(', parent, ',"constructor")'];
+
+    if (name === 'constructor') {
       return ['(', isEnumerable, '?', _actualLookup(), ' : undefined)'];
     }
     return _actualLookup();
@@ -218,13 +218,13 @@ 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'];
 
@@ -543,7 +543,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;
@@ -1091,7 +1091,6 @@ JavaScriptCompiler.prototype = {
 
   setupHelperArgs: function(helper, paramSize, params, useRegister) {
     let options = this.setupParams(helper, paramSize, params);
-    options.loc = JSON.stringify(this.source.currentLocation);
     options = this.objectLiteral(options);
     if (useRegister) {
       this.useRegister('options');
@@ -1151,7 +1150,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('container.strict'), '(', stack, ', ', compiler.quotedString(parts[i]), ')'];
   } else {
     return stack;
   }

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/each.js

@@ -49,29 +49,21 @@ export default function(instance) {
             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);
+        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 !== undefined) {
+              execIteration(priorKey, i - 1);
+            }
+            priorKey = key;
+            i++;
           }
-          priorKey = key;
-          i++;
-        });
+        }
         if (priorKey !== undefined) {
           execIteration(priorKey, i - 1, true);
         }

lib/handlebars/helpers/if.js

@@ -1,9 +1,7 @@
-import { isEmpty, isFunction } from '../utils';
-import Exception from '../exception';
+import {isEmpty, isFunction} from '../utils';
 
 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.
@@ -17,7 +15,6 @@ export default function(instance) {
   });
 
   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/lookup.js

@@ -1,11 +1,9 @@
-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)) {
+    if (field === 'constructor' && !obj.propertyIsEnumerable(field)) {
       return undefined;
     }
     return obj[field];

lib/handlebars/helpers/with.js

@@ -1,9 +1,7 @@
-import { appendContextPath, blockParams, createFrame, isEmpty, isFunction } from '../utils';
-import Exception from '../exception';
+import {appendContextPath, blockParams, createFrame, isEmpty, isFunction} from '../utils';
 
 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;

lib/handlebars/runtime.js

@@ -1,4 +1,4 @@
-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';
@@ -44,14 +44,14 @@ export function template(templateSpec, env) {
 
   function invokePartialWrapper(partial, context, options) {
     if (options.hash) {
-      context = extend({}, context, options.hash);
+      context = Utils.extend({}, context, options.hash);
       if (options.ids) {
         options.ids[0] = true;
       }
     }
     partial = env.VM.resolvePartial.call(this, partial, context, options);
 
-    let optionsWithHooks = extend({}, options, {hooks: this.hooks});
+    let optionsWithHooks = Utils.extend({}, options, {hooks: this.hooks});
 
     let result = env.VM.invokePartial.call(this, partial, context, optionsWithHooks);
 
@@ -79,9 +79,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,7 +97,7 @@ export function template(templateSpec, env) {
       return typeof current === 'function' ? current.call(context) : current;
     },
 
-    escapeExpression: escapeExpression,
+    escapeExpression: Utils.escapeExpression,
     invokePartial: invokePartialWrapper,
 
     fn: function(i) {
@@ -158,13 +158,13 @@ export function template(templateSpec, env) {
 
   ret._setup = function(options) {
     if (!options.partial) {
-      container.helpers = extend({}, env.helpers, options.helpers);
+      container.helpers = Utils.extend({}, env.helpers, options.helpers);
 
       if (templateSpec.usePartial) {
-        container.partials = extend({}, env.partials, options.partials);
+        container.partials = Utils.extend({}, env.partials, options.partials);
       }
       if (templateSpec.usePartial || templateSpec.useDecorators) {
-        container.decorators = extend({}, env.decorators, options.decorators);
+        container.decorators = Utils.extend({}, env.decorators, options.decorators);
       }
 
       container.hooks = {};
@@ -258,7 +258,7 @@ export function invokePartial(partial, context, options) {
       return fn(context, options);
     };
     if (fn.partials) {
-      options.partials = extend({}, options.partials, fn.partials);
+      options.partials = Utils.extend({}, options.partials, fn.partials);
     }
   }
 
@@ -287,7 +287,7 @@ 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);
+    Utils.extend(prog, props);
   }
   return prog;
 }

lib/handlebars/utils.js

@@ -33,23 +33,18 @@ 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';
+let 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 {isFunction};
+/* eslint-enable func-style */
 
 /* 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;

lib/precompiler.js

@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 import Async from 'neo-async';
 import fs from 'fs';
-import Handlebars from './handlebars';
+import * as Handlebars from './handlebars';
 import {basename} from 'path';
 import {SourceMapConsumer, SourceNode} from 'source-map';
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "handlebars",
   "barename": "handlebars",
-  "version": "4.5.3",
+  "version": "4.3.5",
   "description": "Handlebars provides the power necessary to let you build semantic templates effectively with no frustration",
   "homepage": "http://www.handlebarsjs.com/",
   "keywords": [
@@ -29,46 +29,37 @@
     "uglify-js": "^3.1.4"
   },
   "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",
     "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": "^1.0.3",
+    "grunt-babel": "^5.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-requirejs": "^1",
+    "grunt-contrib-uglify": "^1",
     "grunt-contrib-watch": "^1.1.0",
     "grunt-eslint": "^20.1.0",
-    "grunt-webpack": "^3.1.3",
+    "grunt-saucelabs": "github:nknapp/grunt-saucelabs",
+    "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",
     "underscore": "^1.5.1",
-    "webpack": "^4.41.2",
-    "webpack-dev-server": "^3.9.0"
+    "webpack": "^1.12.6",
+    "webpack-dev-server": "^1.12.1"
   },
   "main": "lib/index.js",
   "types": "types/index.d.ts",

release-notes.md

@@ -2,139 +2,13 @@
 
 ## Development
 
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.5.3...master)
+[Commits](https://github.com/wycats/handlebars.js/compare/v4.3.5...master)
 
-## v4.5.3 - November 18th, 2019
-Bugfixes:
-
-- 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:
-
-- 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.
-
-Compatibility notes: 
-
-- 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
+## v4.3.5 - 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)
+[Commits](https://github.com/wycats/handlebars.js/compare/v4.3.4...v4.3.5)
 
 ## v4.3.4 - September 28th, 2019
 - fix: harden "propertyIsEnumerable"-check - ff4d827

spec/.eslintrc

@@ -1,20 +1,14 @@
 {
-  "extends": [
-    "../.eslintrc.js",
-    "plugin:es5/no-es2015"
-  ],
-  "plugins": [
-    "es5"
-  ],
   "globals": {
     "CompilerContext": true,
     "Handlebars": true,
     "handlebarsEnv": true,
+
     "shouldCompileTo": true,
     "shouldCompileToWithPartials": true,
     "shouldThrow": true,
-    "expectTemplate": true,
     "compileWithPartials": true,
+
     "console": true,
     "require": true,
     "suite": true,
@@ -27,20 +21,16 @@
     "start": true,
     "stop": true,
     "ok": true,
-    "sinon": true,
     "strictEqual": true,
-    "define": true,
-    "expect": true,
-    "chai": true
+    "define": true
   },
   "env": {
     "mocha": true
   },
   "rules": {
     // Disabling for tests, for now.
-    "no-path-concat": "off",
+    "no-path-concat": 0,
 
-    "no-var": "off",
-    "dot-notation": "off"
+    "no-var": 0
   }
 }

spec/amd-runtime.html

@@ -18,14 +18,12 @@
         document.documentElement.className = 'headless';
       }
     </script>
-    <script src="/node_modules/sinon/pkg/sinon.js"></script>
-    <script src="/node_modules/chai/chai.js"></script>
-    <script src="/node_modules/dirty-chai/lib/dirty-chai.js"></script>
     <script src="/node_modules/mocha/mocha.js"></script>
     <script>
-      window.expect = chai.expect;
       mocha.setup('bdd');
     </script>
+
+    <script src="/spec/env/json2.js"></script>
     <script src="/spec/env/require.js"></script>
 
     <script src="/spec/env/common.js"></script>

spec/amd.html

@@ -19,15 +19,14 @@
         document.documentElement.className = 'headless';
       }
     </script>
-    <script src="/node_modules/sinon/pkg/sinon.js"></script>
-    <script src="/node_modules/chai/chai.js"></script>
-    <script src="/node_modules/dirty-chai/lib/dirty-chai.js"></script>
     <script src="/node_modules/mocha/mocha.js"></script>
     <script>
-      window.expect = chai.expect;
       mocha.setup('bdd');
     </script>
+
+    <script src="/spec/env/json2.js"></script>
     <script src="/spec/env/require.js"></script>
+
     <script src="/spec/env/common.js"></script>
     <script>
       var requireFailure;

spec/ast.js

@@ -123,40 +123,6 @@ describe('ast', function() {
      });
   });
 
-  describe('whitespace control', function() {
-    describe('parse', function() {
-      it('mustache', function() {
-        var ast = Handlebars.parse('  {{~comment~}} ');
-
-        equals(ast.body[0].value, '');
-        equals(ast.body[2].value, '');
-      });
-
-      it('block statements', function() {
-        var ast = Handlebars.parse(' {{# comment~}} \nfoo\n {{~/comment}}');
-
-        equals(ast.body[0].value, '');
-        equals(ast.body[1].program.body[0].value, 'foo');
-      });
-    });
-
-    describe('parseWithoutProcessing', function() {
-      it('mustache', function() {
-        var ast = Handlebars.parseWithoutProcessing('  {{~comment~}} ');
-
-        equals(ast.body[0].value, '  ');
-        equals(ast.body[2].value, ' ');
-      });
-
-      it('block statements', function() {
-        var ast = Handlebars.parseWithoutProcessing(' {{# comment~}} \nfoo\n {{~/comment}}');
-
-        equals(ast.body[0].value, ' ');
-        equals(ast.body[1].program.body[0].value, ' \nfoo\n ');
-      });
-    });
-  });
-
   describe('standalone flags', function() {
     describe('mustache', function() {
       it('does not mark mustaches as standalone', function() {
@@ -165,54 +131,6 @@ describe('ast', function() {
         equals(!!ast.body[2].value, true);
       });
     });
-    describe('blocks - parseWithoutProcessing', function() {
-      it('block mustaches', function() {
-        var ast = Handlebars.parseWithoutProcessing(' {{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} '),
-          block = ast.body[1];
-
-        equals(ast.body[0].value, ' ');
-
-        equals(block.program.body[0].value, ' \nfoo\n ');
-        equals(block.inverse.body[0].value, ' \n  bar \n  ');
-
-        equals(ast.body[2].value, ' ');
-      });
-      it('initial block mustaches', function() {
-        var ast = Handlebars.parseWithoutProcessing('{{# comment}} \nfoo\n {{/comment}}'),
-          block = ast.body[0];
-
-        equals(block.program.body[0].value, ' \nfoo\n ');
-      });
-      it('mustaches with children', function() {
-        var ast = Handlebars.parseWithoutProcessing('{{# comment}} \n{{foo}}\n {{/comment}}'),
-          block = ast.body[0];
-
-        equals(block.program.body[0].value, ' \n');
-        equals(block.program.body[1].path.original, 'foo');
-        equals(block.program.body[2].value, '\n ');
-      });
-      it('nested block mustaches', function() {
-        var ast = Handlebars.parseWithoutProcessing('{{#foo}} \n{{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} \n{{/foo}}'),
-          body = ast.body[0].program.body,
-          block = body[1];
-
-        equals(body[0].value, ' \n');
-
-        equals(block.program.body[0].value, ' \nfoo\n ');
-        equals(block.inverse.body[0].value, ' \n  bar \n  ');
-      });
-      it('column 0 block mustaches', function() {
-        var ast = Handlebars.parseWithoutProcessing('test\n{{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} '),
-            block = ast.body[1];
-
-        equals(ast.body[0].omit, undefined);
-
-        equals(block.program.body[0].value, ' \nfoo\n ');
-        equals(block.inverse.body[0].value, ' \n  bar \n  ');
-
-        equals(ast.body[2].value, ' ');
-      });
-    });
     describe('blocks', function() {
       it('marks block mustaches as standalone', function() {
         var ast = Handlebars.parse(' {{# comment}} \nfoo\n {{else}} \n  bar \n  {{/comment}} '),
@@ -286,18 +204,6 @@ describe('ast', function() {
         equals(ast.body[2].value, '');
       });
     });
-    describe('partials - parseWithoutProcessing', function() {
-      it('simple partial', function() {
-        var ast = Handlebars.parseWithoutProcessing('{{> partial }} ');
-        equals(ast.body[1].value, ' ');
-      });
-      it('indented partial', function() {
-        var ast = Handlebars.parseWithoutProcessing('  {{> partial }} ');
-        equals(ast.body[0].value, '  ');
-        equals(ast.body[1].indent, '');
-        equals(ast.body[2].value, ' ');
-      });
-    });
     describe('partials', function() {
       it('marks partial as standalone', function() {
         var ast = Handlebars.parse('{{> partial }} ');
@@ -317,17 +223,6 @@ describe('ast', function() {
         equals(ast.body[1].omit, undefined);
       });
     });
-    describe('comments - parseWithoutProcessing', function() {
-      it('simple comment', function() {
-        var ast = Handlebars.parseWithoutProcessing('{{! comment }} ');
-        equals(ast.body[1].value, ' ');
-      });
-      it('indented comment', function() {
-        var ast = Handlebars.parseWithoutProcessing('  {{! comment }} ');
-        equals(ast.body[0].value, '  ');
-        equals(ast.body[2].value, ' ');
-      });
-    });
     describe('comments', function() {
       it('marks comment as standalone', function() {
         var ast = Handlebars.parse('{{! comment }} ');

spec/builtins.js

@@ -254,37 +254,6 @@ describe('builtin helpers', function() {
         template({});
       }, handlebarsEnv.Exception, 'Must pass iterator to #each');
     });
-
-    if (global.Symbol && global.Symbol.iterator) {
-      it('each on iterable', function() {
-        function Iterator(arr) {
-          this.arr = arr;
-          this.index = 0;
-        }
-        Iterator.prototype.next = function() {
-          var value = this.arr[this.index];
-          var done = this.index === this.arr.length;
-          if (!done) {
-            this.index++;
-          }
-          return { value: value, done: done };
-        };
-        function Iterable(arr) {
-          this.arr = arr;
-        }
-        Iterable.prototype[global.Symbol.iterator] = function() {
-          return new Iterator(this.arr);
-        };
-        var string = '{{#each goodbyes}}{{text}}! {{/each}}cruel {{world}}!';
-        var goodbyes = new Iterable([{text: 'goodbye'}, {text: 'Goodbye'}, {text: 'GOODBYE'}]);
-        var goodbyesEmpty = new Iterable([]);
-        var hash = {goodbyes: goodbyes, world: 'world'};
-        shouldCompileTo(string, hash, 'goodbye! Goodbye! GOODBYE! cruel world!',
-          'each with array argument iterates over the contents when not empty');
-        shouldCompileTo(string, {goodbyes: goodbyesEmpty, world: 'world'}, 'cruel world!',
-          'each with array argument ignores the contents when empty');
-      });
-    }
   });
 
   describe('#log', function() {

spec/compiler.js

@@ -59,7 +59,7 @@ describe('compiler', function() {
         Handlebars.compile(' \n  {{#if}}\n{{/def}}')();
         equal(true, false, 'Statement must throw exception. This line should not be executed.');
       } catch (err) {
-        equal(Object.prototype.propertyIsEnumerable.call(err, 'column'), true, 'Checking error column');
+        equal(err.propertyIsEnumerable('column'), true, 'Checking error column');
       }
     });
 

spec/env/browser.js

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

spec/env/common.js

@@ -1,6 +1,4 @@
-var global = (function() {
-  return this;
-}());
+var global = (function() { return this; }());
 
 var AssertError;
 if (Error.captureStackTrace) {
@@ -18,16 +16,10 @@ if (Error.captureStackTrace) {
   AssertError = Error;
 }
 
-/**
- * @deprecated Use "expectTemplate(template)...toCompileTo(output)" instead
- */
 global.shouldCompileTo = function(string, hashOrArray, expected, message) {
   shouldCompileToWithPartials(string, hashOrArray, false, expected, message);
 };
 
-/**
- * @deprecated Use "expectTemplate(template)...toCompileTo(output)" instead
- */
 global.shouldCompileToWithPartials = function shouldCompileToWithPartials(string, hashOrArray, partials, expected, message) {
   var result = compileWithPartials(string, hashOrArray, partials);
   if (result !== expected) {
@@ -35,9 +27,6 @@ global.shouldCompileToWithPartials = function shouldCompileToWithPartials(string
   }
 };
 
-/**
- * @deprecated Use "expectTemplate(template)...toCompileTo(output)" instead
- */
 global.compileWithPartials = function(string, hashOrArray, partials) {
   var template,
       ary,
@@ -47,8 +36,8 @@ global.compileWithPartials = function(string, hashOrArray, partials) {
     delete hashOrArray.hash;
   } else if (Object.prototype.toString.call(hashOrArray) === '[object Array]') {
     ary = [];
-    ary.push(hashOrArray[0]); // input
-    ary.push({helpers: hashOrArray[1], partials: hashOrArray[2]});
+    ary.push(hashOrArray[0]);
+    ary.push({ helpers: hashOrArray[1], partials: hashOrArray[2] });
     options = typeof hashOrArray[3] === 'object' ? hashOrArray[3] : {compat: hashOrArray[3]};
     if (hashOrArray[4] != null) {
       options.data = !!hashOrArray[4];
@@ -63,20 +52,12 @@ global.compileWithPartials = function(string, hashOrArray, partials) {
 };
 
 
-/**
- * @deprecated Use chai's expect-style API instead (`expect(actualValue).to.equal(expectedValue)`)
- * @see https://www.chaijs.com/api/bdd/
- */
 global.equals = global.equal = function equals(a, b, msg) {
   if (a !== b) {
     throw new AssertError("'" + a + "' should === '" + b + "'" + (msg ? ': ' + msg : ''), equals);
   }
 };
 
-/**
- * @deprecated Use chai's expect-style API instead (`expect(actualValue).to.equal(expectedValue)`)
- * @see https://www.chaijs.com/api/bdd/#method_throw
- */
 global.shouldThrow = function(callback, type, msg) {
   var failed;
   try {
@@ -94,83 +75,3 @@ global.shouldThrow = function(callback, type, msg) {
     throw new AssertError('It failed to throw', shouldThrow);
   }
 };
-
-
-global.expectTemplate = function(templateAsString) {
-  return new HandlebarsTestBench(templateAsString);
-};
-
-
-function HandlebarsTestBench(templateAsString) {
-  this.templateAsString = templateAsString;
-  this.helpers = {};
-  this.partials = {};
-  this.input = {};
-  this.message = 'Template' + templateAsString + ' does not evaluate to expected output';
-  this.compileOptions = {};
-  this.runtimeOptions = {};
-}
-
-HandlebarsTestBench.prototype.withInput = function(input) {
-  this.input = input;
-  return this;
-};
-
-HandlebarsTestBench.prototype.withHelper = function(name, helperFunction) {
-  this.helpers[name] = helperFunction;
-  return this;
-};
-
-HandlebarsTestBench.prototype.withPartial = function(name, partialAsString) {
-  this.partials[name] = partialAsString;
-  return this;
-};
-
-HandlebarsTestBench.prototype.withCompileOptions = function(compileOptions) {
-  this.compileOptions = compileOptions;
-  return this;
-};
-
-HandlebarsTestBench.prototype.withRuntimeOptions = function(runtimeOptions) {
-  this.runtimeOptions = runtimeOptions;
-  return this;
-};
-
-HandlebarsTestBench.prototype.withMessage = function(message) {
-  this.message = message;
-  return this;
-};
-
-HandlebarsTestBench.prototype.toCompileTo = function(expectedOutputAsString) {
-  expect(this._compileAndExeute()).to.equal(expectedOutputAsString);
-};
-
-// see chai "to.throw" (https://www.chaijs.com/api/bdd/#method_throw)
-HandlebarsTestBench.prototype.toThrow = function(errorLike, errMsgMatcher, msg) {
-  var self = this;
-  expect(function() {
-    self._compileAndExeute();
-  }).to.throw(errorLike, errMsgMatcher, msg);
-};
-
-HandlebarsTestBench.prototype._compileAndExeute = function() {
-  var compile = Object.keys(this.partials).length > 0
-      ? CompilerContext.compileWithPartial
-      : CompilerContext.compile;
-
-  var combinedRuntimeOptions = this._combineRuntimeOptions();
-
-  var template = compile(this.templateAsString, this.compileOptions);
-  return template(this.input, combinedRuntimeOptions);
-};
-
-HandlebarsTestBench.prototype._combineRuntimeOptions = function() {
-  var self = this;
-  var combinedRuntimeOptions = {};
-  Object.keys(this.runtimeOptions).forEach(function(key) {
-    combinedRuntimeOptions[key] = self.runtimeOptions[key];
-  });
-  combinedRuntimeOptions.helpers = this.helpers;
-  combinedRuntimeOptions.partials = this.partials;
-  return combinedRuntimeOptions;
-};

spec/env/json2.js

@@ -0,0 +1,489 @@
+/*
+    json2.js
+    2014-02-04
+
+    Public Domain.
+
+    NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
+
+    See http://www.JSON.org/js.html
+
+
+    This code should be minified before deployment.
+    See http://javascript.crockford.com/jsmin.html
+
+    USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
+    NOT CONTROL.
+
+
+    This file creates a global JSON object containing two methods: stringify
+    and parse.
+
+        JSON.stringify(value, replacer, space)
+            value       any JavaScript value, usually an object or array.
+
+            replacer    an optional parameter that determines how object
+                        values are stringified for objects. It can be a
+                        function or an array of strings.
+
+            space       an optional parameter that specifies the indentation
+                        of nested structures. If it is omitted, the text will
+                        be packed without extra whitespace. If it is a number,
+                        it will specify the number of spaces to indent at each
+                        level. If it is a string (such as '\t' or ' '),
+                        it contains the characters used to indent at each level.
+
+            This method produces a JSON text from a JavaScript value.
+
+            When an object value is found, if the object contains a toJSON
+            method, its toJSON method will be called and the result will be
+            stringified. A toJSON method does not serialize: it returns the
+            value represented by the name/value pair that should be serialized,
+            or undefined if nothing should be serialized. The toJSON method
+            will be passed the key associated with the value, and this will be
+            bound to the value
+
+            For example, this would serialize Dates as ISO strings.
+
+                Date.prototype.toJSON = function (key) {
+                    function f(n) {
+                        // Format integers to have at least two digits.
+                        return n < 10 ? '0' + n : n;
+                    }
+
+                    return this.getUTCFullYear()   + '-' +
+                         f(this.getUTCMonth() + 1) + '-' +
+                         f(this.getUTCDate())      + 'T' +
+                         f(this.getUTCHours())     + ':' +
+                         f(this.getUTCMinutes())   + ':' +
+                         f(this.getUTCSeconds())   + 'Z';
+                };
+
+            You can provide an optional replacer method. It will be passed the
+            key and value of each member, with this bound to the containing
+            object. The value that is returned from your method will be
+            serialized. If your method returns undefined, then the member will
+            be excluded from the serialization.
+
+            If the replacer parameter is an array of strings, then it will be
+            used to select the members to be serialized. It filters the results
+            such that only members with keys listed in the replacer array are
+            stringified.
+
+            Values that do not have JSON representations, such as undefined or
+            functions, will not be serialized. Such values in objects will be
+            dropped; in arrays they will be replaced with null. You can use
+            a replacer function to replace those with JSON values.
+            JSON.stringify(undefined) returns undefined.
+
+            The optional space parameter produces a stringification of the
+            value that is filled with line breaks and indentation to make it
+            easier to read.
+
+            If the space parameter is a non-empty string, then that string will
+            be used for indentation. If the space parameter is a number, then
+            the indentation will be that many spaces.
+
+            Example:
+
+            text = JSON.stringify(['e', {pluribus: 'unum'}]);
+            // text is '["e",{"pluribus":"unum"}]'
+
+
+            text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
+            // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
+
+            text = JSON.stringify([new Date()], function (key, value) {
+                return this[key] instanceof Date ?
+                    'Date(' + this[key] + ')' : value;
+            });
+            // text is '["Date(---current time---)"]'
+
+
+        JSON.parse(text, reviver)
+            This method parses a JSON text to produce an object or array.
+            It can throw a SyntaxError exception.
+
+            The optional reviver parameter is a function that can filter and
+            transform the results. It receives each of the keys and values,
+            and its return value is used instead of the original value.
+            If it returns what it received, then the structure is not modified.
+            If it returns undefined then the member is deleted.
+
+            Example:
+
+            // Parse the text. Values that look like ISO date strings will
+            // be converted to Date objects.
+
+            myData = JSON.parse(text, function (key, value) {
+                var a;
+                if (typeof value === 'string') {
+                    a =
+/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
+                    if (a) {
+                        return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
+                            +a[5], +a[6]));
+                    }
+                }
+                return value;
+            });
+
+            myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
+                var d;
+                if (typeof value === 'string' &&
+                        value.slice(0, 5) === 'Date(' &&
+                        value.slice(-1) === ')') {
+                    d = new Date(value.slice(5, -1));
+                    if (d) {
+                        return d;
+                    }
+                }
+                return value;
+            });
+
+
+    This is a reference implementation. You are free to copy, modify, or
+    redistribute.
+*/
+
+/*jslint evil: true, regexp: true */
+
+/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
+    call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
+    getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join,
+    lastIndex, length, parse, prototype, push, replace, slice, stringify,
+    test, toJSON, toString, valueOf
+*/
+
+
+// Create a JSON object only if one does not already exist. We create the
+// methods in a closure to avoid creating global variables.
+
+if (typeof JSON !== 'object') {
+    JSON = {};
+}
+
+(function () {
+    'use strict';
+
+    function f(n) {
+        // Format integers to have at least two digits.
+        return n < 10 ? '0' + n : n;
+    }
+
+    if (typeof Date.prototype.toJSON !== 'function') {
+
+        Date.prototype.toJSON = function () {
+
+            return isFinite(this.valueOf())
+                ? this.getUTCFullYear()     + '-' +
+                    f(this.getUTCMonth() + 1) + '-' +
+                    f(this.getUTCDate())      + 'T' +
+                    f(this.getUTCHours())     + ':' +
+                    f(this.getUTCMinutes())   + ':' +
+                    f(this.getUTCSeconds())   + 'Z'
+                : null;
+        };
+
+        String.prototype.toJSON      =
+            Number.prototype.toJSON  =
+            Boolean.prototype.toJSON = function () {
+                return this.valueOf();
+            };
+    }
+
+    var cx,
+        escapable,
+        gap,
+        indent,
+        meta,
+        rep;
+
+
+    function quote(string) {
+
+// If the string contains no control characters, no quote characters, and no
+// backslash characters, then we can safely slap some quotes around it.
+// Otherwise we must also replace the offending characters with safe escape
+// sequences.
+
+        escapable.lastIndex = 0;
+        return escapable.test(string) ? '"' + string.replace(escapable, function (a) {
+            var c = meta[a];
+            return typeof c === 'string'
+                ? c
+                : '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+        }) + '"' : '"' + string + '"';
+    }
+
+
+    function str(key, holder) {
+
+// Produce a string from holder[key].
+
+        var i,          // The loop counter.
+            k,          // The member key.
+            v,          // The member value.
+            length,
+            mind = gap,
+            partial,
+            value = holder[key];
+
+// If the value has a toJSON method, call it to obtain a replacement value.
+
+        if (value && typeof value === 'object' &&
+                typeof value.toJSON === 'function') {
+            value = value.toJSON(key);
+        }
+
+// If we were called with a replacer function, then call the replacer to
+// obtain a replacement value.
+
+        if (typeof rep === 'function') {
+            value = rep.call(holder, key, value);
+        }
+
+// What happens next depends on the value's type.
+
+        switch (typeof value) {
+        case 'string':
+            return quote(value);
+
+        case 'number':
+
+// JSON numbers must be finite. Encode non-finite numbers as null.
+
+            return isFinite(value) ? String(value) : 'null';
+
+        case 'boolean':
+        case 'null':
+
+// If the value is a boolean or null, convert it to a string. Note:
+// typeof null does not produce 'null'. The case is included here in
+// the remote chance that this gets fixed someday.
+
+            return String(value);
+
+// If the type is 'object', we might be dealing with an object or an array or
+// null.
+
+        case 'object':
+
+// Due to a specification blunder in ECMAScript, typeof null is 'object',
+// so watch out for that case.
+
+            if (!value) {
+                return 'null';
+            }
+
+// Make an array to hold the partial results of stringifying this object value.
+
+            gap += indent;
+            partial = [];
+
+// Is the value an array?
+
+            if (Object.prototype.toString.apply(value) === '[object Array]') {
+
+// The value is an array. Stringify every element. Use null as a placeholder
+// for non-JSON values.
+
+                length = value.length;
+                for (i = 0; i < length; i += 1) {
+                    partial[i] = str(i, value) || 'null';
+                }
+
+// Join all of the elements together, separated with commas, and wrap them in
+// brackets.
+
+                v = partial.length === 0
+                    ? '[]'
+                    : gap
+                    ? '[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']'
+                    : '[' + partial.join(',') + ']';
+                gap = mind;
+                return v;
+            }
+
+// If the replacer is an array, use it to select the members to be stringified.
+
+            if (rep && typeof rep === 'object') {
+                length = rep.length;
+                for (i = 0; i < length; i += 1) {
+                    if (typeof rep[i] === 'string') {
+                        k = rep[i];
+                        v = str(k, value);
+                        if (v) {
+                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
+                        }
+                    }
+                }
+            } else {
+
+// Otherwise, iterate through all of the keys in the object.
+
+                for (k in value) {
+                    if (Object.prototype.hasOwnProperty.call(value, k)) {
+                        v = str(k, value);
+                        if (v) {
+                            partial.push(quote(k) + (gap ? ': ' : ':') + v);
+                        }
+                    }
+                }
+            }
+
+// Join all of the member texts together, separated with commas,
+// and wrap them in braces.
+
+            v = partial.length === 0
+                ? '{}'
+                : gap
+                ? '{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}'
+                : '{' + partial.join(',') + '}';
+            gap = mind;
+            return v;
+        }
+    }
+
+// If the JSON object does not yet have a stringify method, give it one.
+
+    if (typeof JSON.stringify !== 'function') {
+        escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
+        meta = {    // table of character substitutions
+            '\b': '\\b',
+            '\t': '\\t',
+            '\n': '\\n',
+            '\f': '\\f',
+            '\r': '\\r',
+            '"' : '\\"',
+            '\\': '\\\\'
+        };
+        JSON.stringify = function (value, replacer, space) {
+
+// The stringify method takes a value and an optional replacer, and an optional
+// space parameter, and returns a JSON text. The replacer can be a function
+// that can replace values, or an array of strings that will select the keys.
+// A default replacer method can be provided. Use of the space parameter can
+// produce text that is more easily readable.
+
+            var i;
+            gap = '';
+            indent = '';
+
+// If the space parameter is a number, make an indent string containing that
+// many spaces.
+
+            if (typeof space === 'number') {
+                for (i = 0; i < space; i += 1) {
+                    indent += ' ';
+                }
+
+// If the space parameter is a string, it will be used as the indent string.
+
+            } else if (typeof space === 'string') {
+                indent = space;
+            }
+
+// If there is a replacer, it must be a function or an array.
+// Otherwise, throw an error.
+
+            rep = replacer;
+            if (replacer && typeof replacer !== 'function' &&
+                    (typeof replacer !== 'object' ||
+                    typeof replacer.length !== 'number')) {
+                throw new Error('JSON.stringify');
+            }
+
+// Make a fake root object containing our value under the key of ''.
+// Return the result of stringifying the value.
+
+            return str('', {'': value});
+        };
+    }
+
+
+// If the JSON object does not yet have a parse method, give it one.
+
+    if (typeof JSON.parse !== 'function') {
+        cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
+        JSON.parse = function (text, reviver) {
+
+// The parse method takes a text and an optional reviver function, and returns
+// a JavaScript value if the text is a valid JSON text.
+
+            var j;
+
+            function walk(holder, key) {
+
+// The walk method is used to recursively walk the resulting structure so
+// that modifications can be made.
+
+                var k, v, value = holder[key];
+                if (value && typeof value === 'object') {
+                    for (k in value) {
+                        if (Object.prototype.hasOwnProperty.call(value, k)) {
+                            v = walk(value, k);
+                            if (v !== undefined) {
+                                value[k] = v;
+                            } else {
+                                delete value[k];
+                            }
+                        }
+                    }
+                }
+                return reviver.call(holder, key, value);
+            }
+
+
+// Parsing happens in four stages. In the first stage, we replace certain
+// Unicode characters with escape sequences. JavaScript handles many characters
+// incorrectly, either silently deleting them, or treating them as line endings.
+
+            text = String(text);
+            cx.lastIndex = 0;
+            if (cx.test(text)) {
+                text = text.replace(cx, function (a) {
+                    return '\\u' +
+                        ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+                });
+            }
+
+// In the second stage, we run the text against regular expressions that look
+// for non-JSON patterns. We are especially concerned with '()' and 'new'
+// because they can cause invocation, and '=' because it can cause mutation.
+// But just to be safe, we want to reject all unexpected forms.
+
+// We split the second stage into 4 regexp operations in order to work around
+// crippling inefficiencies in IE's and Safari's regexp engines. First we
+// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we
+// replace all simple value tokens with ']' characters. Third, we delete all
+// open brackets that follow a colon or comma or that begin the text. Finally,
+// we look to see that the remaining characters are only whitespace or ']' or
+// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
+
+            if (/^[\],:{}\s]*$/
+                    .test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
+                        .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
+                        .replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+
+// In the third stage we use the eval function to compile the text into a
+// JavaScript structure. The '{' operator is subject to a syntactic ambiguity
+// in JavaScript: it can begin a block or an object literal. We wrap the text
+// in parens to eliminate the ambiguity.
+
+                j = eval('(' + text + ')');
+
+// In the optional fourth stage, we recursively walk the new structure, passing
+// each name/value pair to a reviver function for possible transformation.
+
+                return typeof reviver === 'function'
+                    ? walk({'': j}, '')
+                    : j;
+            }
+
+// If the text is not JSON parseable, then a SyntaxError is thrown.
+
+            throw new SyntaxError('JSON.parse');
+        };
+    }
+}());

spec/env/node.js

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

spec/env/runner.js

@@ -39,11 +39,7 @@ if (global.minimizedTest) {
 
 
 function run(env, callback) {
-  if (errors > 0) {
-    throw new Error('Errors have been detected before');
-  }
   var mocha = new Mocha();
-  mocha.bail();
   mocha.ui('bdd');
   mocha.files = files.slice();
   if (grep) {
@@ -58,6 +54,6 @@ function run(env, callback) {
   require(env);
   mocha.run(function(errorCount) {
     errors += errorCount;
-      callback();
+    callback();
   });
 }

spec/env/runtime.js

@@ -3,15 +3,6 @@ require('./common');
 var fs = require('fs'),
     vm = require('vm');
 
-var chai = require('chai');
-var dirtyChai = require('dirty-chai');
-
-
-chai.use(dirtyChai);
-global.expect = chai.expect;
-
-global.sinon = require('sinon');
-
 global.Handlebars = 'no-conflict';
 
 var filename = 'dist/handlebars.runtime.js';

spec/helpers.js

@@ -28,43 +28,14 @@ describe('helpers', function() {
                     'raw block helper gets raw content');
   });
 
-  describe('raw block parsing (with identity helper-function)', function() {
-
-    function runWithIdentityHelper(template, expected) {
-      var helpers = {
-        identity: function(options) {
+  it('helper for nested raw block gets raw content', function() {
+    var string = '{{{{a}}}} {{{{b}}}} {{{{/b}}}} {{{{/a}}}}';
+    var helpers = {
+        a: function(options) {
           return options.fn();
-        }
-      };
-      shouldCompileTo(template, [{}, helpers], expected);
-    }
-
-    it('helper for nested raw block gets raw content', function() {
-      runWithIdentityHelper('{{{{identity}}}} {{{{b}}}} {{{{/b}}}} {{{{/identity}}}}', ' {{{{b}}}} {{{{/b}}}} ');
-    });
-
-    it('helper for nested raw block works with empty content', function() {
-      runWithIdentityHelper('{{{{identity}}}}{{{{/identity}}}}', '');
-    });
-
-    xit('helper for nested raw block works if nested raw blocks are broken', function() {
-      // This test was introduced in 4.4.4, but it was not the actual problem that lead to the patch release
-      // The test is deactivated, because in 3.x this template cases an exception and it also does not work in 4.4.3
-      // If anyone can make this template work without breaking everything else, then go for it,
-      // but for now, this is just a known bug, that will be documented.
-      runWithIdentityHelper('{{{{identity}}}} {{{{a}}}} {{{{ {{{{/ }}}} }}}} {{{{/identity}}}}', ' {{{{a}}}} {{{{ {{{{/ }}}} }}}} ');
-    });
-
-    it('helper for nested raw block closes after first matching close', function() {
-      runWithIdentityHelper('{{{{identity}}}}abc{{{{/identity}}}} {{{{identity}}}}abc{{{{/identity}}}}', 'abc abc');
-    });
-
-    it('helper for nested raw block throw exception when with missing closing braces', function() {
-      var string = '{{{{a}}}} {{{{/a';
-      shouldThrow(function() {
-        Handlebars.compile(string)();
-      });
-    });
+      }
+    };
+    shouldCompileTo(string, [{}, helpers], ' {{{{b}}}} {{{{/b}}}} ', 'raw block helper should get nested raw block as raw content');
   });
 
   it('helper block with identical context', function() {
@@ -766,70 +737,4 @@ describe('helpers', function() {
       shouldCompileTo('{{#if bar}}{{else goodbyes as |value|}}{{value}}{{/if}}{{value}}', [hash, helpers], '1foo');
     });
   });
-
-  describe('built-in helpers malformed arguments ', function() {
-    it('if helper - too few arguments', function() {
-      var template = CompilerContext.compile('{{#if}}{{/if}}');
-        shouldThrow(function() {
-
-            template({});
-        }, undefined, /#if requires exactly one argument/);
-    });
-
-    it('if helper - too many arguments, string', function() {
-      var template = CompilerContext.compile('{{#if test "string"}}{{/if}}');
-        shouldThrow(function() {
-
-            template({});
-        }, undefined, /#if requires exactly one argument/);
-    });
-
-    it('if helper - too many arguments, undefined', function() {
-      var template = CompilerContext.compile('{{#if test undefined}}{{/if}}');
-        shouldThrow(function() {
-
-            template({});
-        }, undefined, /#if requires exactly one argument/);
-    });
-
-    it('if helper - too many arguments, null', function() {
-      var template = CompilerContext.compile('{{#if test null}}{{/if}}');
-        shouldThrow(function() {
-
-            template({});
-        }, undefined, /#if requires exactly one argument/);
-    });
-
-    it('unless helper - too few arguments', function() {
-      var template = CompilerContext.compile('{{#unless}}{{/unless}}');
-        shouldThrow(function() {
-
-            template({});
-        }, undefined, /#unless requires exactly one argument/);
-    });
-
-    it('unless helper - too many arguments', function() {
-      var template = CompilerContext.compile('{{#unless test null}}{{/unless}}');
-        shouldThrow(function() {
-
-            template({});
-        }, undefined, /#unless requires exactly one argument/);
-    });
-
-    it('with helper - too few arguments', function() {
-      var template = CompilerContext.compile('{{#with}}{{/with}}');
-        shouldThrow(function() {
-
-            template({});
-        }, undefined, /#with requires exactly one argument/);
-    });
-
-    it('with helper - too many arguments', function() {
-      var template = CompilerContext.compile('{{#with test "string"}}{{/with}}');
-        shouldThrow(function() {
-
-            template({});
-        }, undefined, /#with requires exactly one argument/);
-    });
-  });
 });

spec/index.html

@@ -19,15 +19,13 @@
         document.documentElement.className = 'headless';
       }
     </script>
-    <script src="/node_modules/sinon/pkg/sinon.js"></script>
-    <script src="/node_modules/chai/chai.js"></script>
-    <script src="/node_modules/dirty-chai/lib/dirty-chai.js"></script>
     <script src="/node_modules/mocha/mocha.js"></script>
     <script>
-      window.expect = chai.expect;
       mocha.setup('bdd');
     </script>
     <script src="/dist/handlebars.js"></script>
+
+    <script src="/spec/env/json2.js"></script>
     <script src="/spec/env/common.js"></script>
     <script>
       var CompilerContext = {

spec/regressions.js

@@ -211,12 +211,12 @@ describe('Regressions', function() {
         // It's valid to execute a block against an undefined context, but
         // helpers can not do so, so we expect to have an empty object here;
         for (var name in this) {
-          if (Object.prototype.hasOwnProperty.call(this, name)) {
+          if (this.hasOwnProperty(name)) {
             return 'found';
           }
         }
         // And to make IE happy, check for the known string as length is not enumerated.
-        return (this === 'bat' ? 'found' : 'not');
+        return (this == 'bat' ? 'found' : 'not');
       }
     };
 
@@ -323,15 +323,4 @@ describe('Regressions', function() {
         }, 'useData': true});
     }
   });
-
-  it('should allow hash with protected array names', function() {
-    var obj = {array: [1], name: 'John'};
-    var helpers = {
-      helpa: function(options) {
-        return options.hash.length;
-      }
-    };
-
-    shouldCompileTo('{{helpa length="foo"}}', [obj, helpers], 'foo');
-  });
 });

spec/security.js

@@ -1,26 +1,11 @@
 describe('security issues', function() {
     describe('GH-1495: Prevent Remote Code Execution via constructor', function() {
         it('should not allow constructors to be accessed', function() {
-            expectTemplate('{{lookup (lookup this "constructor") "name"}}')
-                .withInput({})
-                .toCompileTo('');
-
-            expectTemplate('{{constructor.name}}')
-                .withInput({})
-                .toCompileTo('');
+            shouldCompileTo('{{constructor.name}}', {}, '');
+            shouldCompileTo('{{lookup (lookup this "constructor") "name"}}', {}, '');
         });
 
-        it('GH-1603: should not allow constructors to be accessed (lookup via toString)', function() {
-          expectTemplate('{{lookup (lookup this (list "constructor")) "name"}}')
-              .withInput({})
-              .withHelper('list', function(element) {
-                return [element];
-              })
-              .toCompileTo('');
-        });
-
-
-      it('should allow the "constructor" property to be accessed if it is enumerable', function() {
+        it('should allow the "constructor" property to be accessed if it is enumerable', function() {
             shouldCompileTo('{{constructor.name}}', {'constructor': {
                 'name': 'here we go'
             }}, 'here we go');
@@ -29,13 +14,6 @@ describe('security issues', function() {
             }}, 'here we go');
         });
 
-        it('should allow the "constructor" property to be accessed if it is enumerable', function() {
-            shouldCompileTo('{{lookup (lookup this "constructor") "name"}}', {'constructor': {
-                    'name': 'here we go'
-                }}, 'here we go');
-        });
-
-
         it('should allow prototype properties that are not constructors', function() {
             function TestClass() {
             }
@@ -75,11 +53,11 @@ describe('security issues', function() {
             });
             it('should throw an exception when calling  "{{blockHelperMissing "abc" .}}" ', function() {
                 var functionCalls = [];
-                expect(function() {
+                shouldThrow(function() {
                     var template = Handlebars.compile('{{blockHelperMissing "abc" .}}');
                     template({ fn: function() { functionCalls.push('called'); }});
-                }).to.throw(Error);
-                expect(functionCalls.length).to.equal(0);
+                }, Error);
+                equals(functionCalls.length, 0);
             });
             it('should throw an exception when calling  "{{#blockHelperMissing .}}{{/blockHelperMissing}}"', function() {
                 shouldThrow(function() {
@@ -114,31 +92,13 @@ describe('security issues', function() {
     describe('GH-1563', function() {
         it('should not allow to access constructor after overriding via __defineGetter__', function() {
             if (({}).__defineGetter__ == null || ({}).__lookupGetter__ == null) {
-                return this.skip(); // Browser does not support this exploit anyway
+                return; // Browser does not support this exploit anyway
             }
-            expectTemplate('{{__defineGetter__ "undefined" valueOf }}' +
+            shouldCompileTo('{{__defineGetter__ "undefined" valueOf }}' +
                 '{{#with __lookupGetter__ }}' +
                 '{{__defineGetter__ "propertyIsEnumerable" (this.bind (this.bind 1)) }}' +
                 '{{constructor.name}}' +
-                '{{/with}}')
-                .withInput({})
-                .toThrow(/Missing helper: "__defineGetter__"/);
+                '{{/with}}', {}, '');
         });
     });
-
-    describe('GH-1595', function() {
-      it('properties, that are required to be enumerable', function() {
-        expectTemplate('{{constructor}}').withInput({}).toCompileTo('');
-        expectTemplate('{{__defineGetter__}}').withInput({}).toCompileTo('');
-        expectTemplate('{{__defineSetter__}}').withInput({}).toCompileTo('');
-        expectTemplate('{{__lookupGetter__}}').withInput({}).toCompileTo('');
-        expectTemplate('{{__proto__}}').withInput({}).toCompileTo('');
-
-        expectTemplate('{{lookup "constructor"}}').withInput({}).toCompileTo('');
-        expectTemplate('{{lookup "__defineGetter__"}}').withInput({}).toCompileTo('');
-        expectTemplate('{{lookup "__defineSetter__"}}').withInput({}).toCompileTo('');
-        expectTemplate('{{lookup "__lookupGetter__"}}').withInput({}).toCompileTo('');
-        expectTemplate('{{lookup "__proto__"}}').withInput({}).toCompileTo('');
-      });
-    });
 });

spec/strict.js

@@ -95,25 +95,6 @@ describe('strict', function() {
       };
       equals(template({}, {helpers: helpers}), 'success');
     });
-
-    it('should show error location on missing property lookup', function() {
-      shouldThrow(function() {
-        var template = CompilerContext.compile('\n\n\n   {{hello}}', {strict: true});
-        template({});
-      }, Exception, '"hello" not defined in [object Object] - 4:5');
-    });
-
-    it('should error contains correct location properties on missing property lookup', function() {
-      try {
-        var template = CompilerContext.compile('\n\n\n   {{hello}}', {strict: true});
-        template({});
-      } catch (error) {
-        equals(error.lineNumber, 4);
-        equals(error.endLineNumber, 4);
-        equals(error.column, 5);
-        equals(error.endColumn, 10);
-      }
-    });
   });
 
   describe('assume objects', function() {

spec/tokenizer.js

@@ -441,9 +441,4 @@ describe('Tokenizer', function() {
     result = tokenize('{{else foo as |bar baz|}}');
     shouldMatchTokens(result, ['OPEN_INVERSE_CHAIN', 'ID', 'OPEN_BLOCK_PARAMS', 'ID', 'ID', 'CLOSE_BLOCK_PARAMS', 'CLOSE']);
   });
-
-  it('tokenizes raw blocks', function() {
-    var result = tokenize('{{{{a}}}} abc {{{{/a}}}} aaa {{{{a}}}} abc {{{{/a}}}}');
-    shouldMatchTokens(result, ['OPEN_RAW_BLOCK', 'ID', 'CLOSE_RAW_BLOCK', 'CONTENT', 'END_RAW_BLOCK', 'CONTENT', 'OPEN_RAW_BLOCK', 'ID', 'CLOSE_RAW_BLOCK', 'CONTENT', 'END_RAW_BLOCK']);
-  });
 });

spec/umd-runtime.html

@@ -18,15 +18,14 @@
         document.documentElement.className = 'headless';
       }
     </script>
-    <script src="/node_modules/sinon/pkg/sinon.js"></script>
-    <script src="/node_modules/chai/chai.js"></script>
-    <script src="/node_modules/dirty-chai/lib/dirty-chai.js"></script>
     <script src="/node_modules/mocha/mocha.js"></script>
     <script>
-      window.expect = chai.expect;
       mocha.setup('bdd');
     </script>
+
+    <script src="/spec/env/json2.js"></script>
     <script src="/spec/env/require.js"></script>
+
     <script src="/spec/env/common.js"></script>
     <script>
       requirejs.config({

spec/umd.html

@@ -18,16 +18,14 @@
         document.documentElement.className = 'headless';
       }
     </script>
-
-    <script src="/node_modules/sinon/pkg/sinon.js"></script>
-    <script src="/node_modules/chai/chai.js"></script>
-    <script src="/node_modules/dirty-chai/lib/dirty-chai.js"></script>
     <script src="/node_modules/mocha/mocha.js"></script>
     <script>
-      window.expect = chai.expect;
       mocha.setup('bdd');
     </script>
+
+    <script src="/spec/env/json2.js"></script>
     <script src="/spec/env/require.js"></script>
+
     <script src="/spec/env/common.js"></script>
     <script>
       requirejs.config({

src/handlebars.l

@@ -63,7 +63,7 @@ ID    [^\s!"#%-,\.\/;->@\[-\^`\{-~]+/{LOOKAHEAD}
                                     return 'END_RAW_BLOCK';
                                   }
                                  }
-<raw>[^\x00]+?/("{{{{")          { return 'CONTENT'; }
+<raw>[^\x00]*?/("{{{{")          { return 'CONTENT'; }
 
 <com>[\s\S]*?"--"{RIGHT_STRIP}?"}}" {
   this.popState();

src/handlebars.yy

@@ -39,7 +39,7 @@ content
   };
 
 rawBlock
-  : openRawBlock content* END_RAW_BLOCK -> yy.prepareRawBlock($1, $2, $3, @$)
+  : openRawBlock content+ END_RAW_BLOCK -> yy.prepareRawBlock($1, $2, $3, @$)
   ;
 
 openRawBlock

tasks/test.js

@@ -33,7 +33,7 @@ module.exports = function(grunt) {
 
     var runner = childProcess.fork('./spec/env/runner', [], {stdio: 'inherit'});
     runner.on('close', function(code) {
-      if (code !== 0) {
+      if (code != 0) {
         grunt.fatal(code + ' tests failed');
       }
       done();
@@ -55,7 +55,7 @@ module.exports = function(grunt) {
 
     var runner = childProcess.fork('./spec/env/runner', ['--min'], {stdio: 'inherit'});
     runner.on('close', function(code) {
-      if (code !== 0) {
+      if (code != 0) {
         grunt.fatal(code + ' tests failed');
       }
       done();

types/index.d.ts

@@ -47,8 +47,8 @@ declare namespace Handlebars {
   }
 
   export interface ParseOptions {
-      srcName?: string;
-      ignoreStandalone?: boolean;
+      srcName?: string,
+      ignoreStandalone?: boolean
   }
 
   export function registerHelper(name: string, fn: HelperDelegate): void;
@@ -66,9 +66,9 @@ declare namespace Handlebars {
   export function K(): void;
   export function createFrame(object: any): any;
   export function blockParams(obj: any[], ids: any[]): any[];
+  export function Exception(message: string): void;
   export function log(level: number, obj: any): void;
   export function parse(input: string, options?: ParseOptions): hbs.AST.Program;
-  export function parseWithoutProcessing(input: string, options?: ParseOptions): hbs.AST.Program;
   export function compile<T = any>(input: any, options?: CompileOptions): HandlebarsTemplateDelegate<T>;
   export function precompile(input: any, options?: PrecompileOptions): TemplateSpecification;
   export function template<T = any>(precompilation: TemplateSpecification): HandlebarsTemplateDelegate<T>;
@@ -86,20 +86,6 @@ declare namespace Handlebars {
 
   export function noConflict(): typeof Handlebars;
 
-  export class Exception {
-      constructor(message: string, node?: hbs.AST.Node);
-      description: string;
-      fileName: string;
-      lineNumber?: any;
-      endLineNumber?: any;
-      message: string;
-      name: string;
-      number: number;
-      stack?: string;
-      column?: any;
-      endColumn?: any;
-  }
-
   export class SafeString {
       constructor(str: string);
       toString(): string;
@@ -284,7 +270,6 @@ declare namespace hbs {
       interface Statement extends Node {}
 
       interface MustacheStatement extends Statement {
-          type: 'MustacheStatement';
           path: PathExpression | Literal;
           params: Expression[];
           hash: Hash;
@@ -295,7 +280,6 @@ declare namespace hbs {
       interface Decorator extends MustacheStatement { }
 
       interface BlockStatement extends Statement {
-          type: 'BlockStatement';
           path: PathExpression;
           params: Expression[];
           hash: Hash;
@@ -309,7 +293,6 @@ declare namespace hbs {
       interface DecoratorBlock extends BlockStatement { }
 
       interface PartialStatement extends Statement {
-          type: 'PartialStatement';
           name: PathExpression | SubExpression;
           params: Expression[];
           hash: Hash;
@@ -318,7 +301,6 @@ declare namespace hbs {
       }
 
       interface PartialBlockStatement extends Statement {
-          type: 'PartialBlockStatement';
           name: PathExpression | SubExpression;
           params: Expression[];
           hash: Hash;
@@ -328,13 +310,11 @@ declare namespace hbs {
       }
 
       interface ContentStatement extends Statement {
-          type: 'ContentStatement';
           value: string;
           original: StripFlags;
       }
 
       interface CommentStatement extends Statement {
-          type: 'CommentStatement';
           value: string;
           strip: StripFlags;
       }
@@ -342,14 +322,12 @@ declare namespace hbs {
       interface Expression extends Node {}
 
       interface SubExpression extends Expression {
-          type: 'SubExpression';
           path: PathExpression;
           params: Expression[];
           hash: Hash;
       }
 
       interface PathExpression extends Expression {
-          type: 'PathExpression';
           data: boolean;
           depth: number;
           parts: string[];
@@ -358,38 +336,29 @@ declare namespace hbs {
 
       interface Literal extends Expression {}
       interface StringLiteral extends Literal {
-          type: 'StringLiteral';
           value: string;
           original: string;
       }
 
       interface BooleanLiteral extends Literal {
-          type: 'BooleanLiteral';
           value: boolean;
           original: boolean;
       }
 
       interface NumberLiteral extends Literal {
-          type: 'NumberLiteral';
           value: number;
           original: number;
       }
 
-      interface UndefinedLiteral extends Literal {
-          type: 'UndefinedLiteral';
-	  }
+      interface UndefinedLiteral extends Literal {}
 
-      interface NullLiteral extends Literal {
-          type: 'NullLiteral';
-	  }
+      interface NullLiteral extends Literal {}
 
       interface Hash extends Node {
-          type: 'Hash';
           pairs: HashPair[];
       }
 
       interface HashPair extends Node {
-          type: 'HashPair';
           key: string;
           value: Expression;
       }

types/test.ts

@@ -110,133 +110,4 @@ Handlebars.compile('test', {
 
 Handlebars.compile('test')({},{allowCallsToHelperMissing: true});
 
-Handlebars.compile('test')({},{});
-
-
-const allthings = {} as hbs.AST.MustacheStatement |
-  hbs.AST.BlockStatement |
-  hbs.AST.PartialStatement |
-  hbs.AST.PartialBlockStatement |
-  hbs.AST.ContentStatement |
-  hbs.AST.CommentStatement |
-  hbs.AST.SubExpression |
-  hbs.AST.PathExpression |
-  hbs.AST.StringLiteral |
-  hbs.AST.BooleanLiteral |
-  hbs.AST.NumberLiteral |
-  hbs.AST.UndefinedLiteral |
-  hbs.AST.NullLiteral |
-  hbs.AST.Hash |
-  hbs.AST.HashPair;
-
-switch(allthings.type) {
-  case "MustacheStatement":
-    let mustacheStatement: hbs.AST.MustacheStatement;
-    mustacheStatement = allthings;
-    break;
-  case "BlockStatement":
-    let blockStatement: hbs.AST.BlockStatement;
-    blockStatement = allthings;
-    break;
-  case "PartialStatement":
-    let partialStatement: hbs.AST.PartialStatement;
-    partialStatement = allthings;
-    break;
-  case "PartialBlockStatement":
-    let partialBlockStatement: hbs.AST.PartialBlockStatement;
-    partialBlockStatement = allthings;
-    break;
-  case "ContentStatement":
-    let ContentStatement: hbs.AST.ContentStatement;
-    ContentStatement = allthings;
-    break;
-  case "CommentStatement":
-    let CommentStatement: hbs.AST.CommentStatement;
-    CommentStatement = allthings;
-    break;
-  case "SubExpression":
-    let SubExpression: hbs.AST.SubExpression;
-    SubExpression = allthings;
-    break;
-  case "PathExpression":
-    let PathExpression: hbs.AST.PathExpression;
-    PathExpression = allthings;
-    break;
-  case "StringLiteral":
-    let StringLiteral: hbs.AST.StringLiteral;
-    StringLiteral = allthings;
-    break;
-  case "BooleanLiteral":
-    let BooleanLiteral: hbs.AST.BooleanLiteral;
-    BooleanLiteral = allthings;
-    break;
-  case "NumberLiteral":
-    let NumberLiteral: hbs.AST.NumberLiteral;
-    NumberLiteral = allthings;
-    break;
-  case "UndefinedLiteral":
-    let UndefinedLiteral: hbs.AST.UndefinedLiteral;
-    UndefinedLiteral = allthings;
-    break;
-  case "NullLiteral":
-    let NullLiteral: hbs.AST.NullLiteral;
-    NullLiteral = allthings;
-    break;
-  case "Hash":
-    let Hash: hbs.AST.Hash;
-    Hash = allthings;
-    break;
-  case "HashPair":
-    let HashPair: hbs.AST.HashPair;
-    HashPair = allthings;
-    break;
-  default:
-    break;
-}
-
-function testParseWithoutProcessing() {
-  const parsedTemplate: hbs.AST.Program = Handlebars.parseWithoutProcessing('<p>Hello, my name is {{name}}.</p>', {
-    srcName: "/foo/bar/baz.hbs",
-  });
-
-  const parsedTemplateWithoutOptions: hbs.AST.Program = Handlebars.parseWithoutProcessing('<p>Hello, my name is {{name}}.</p>');
-}
-
-function testExceptionTypings() {
-  // Test exception constructor with a single argument - message.
-  let exception: Handlebars.Exception = new Handlebars.Exception('message');
-
-  // Fields
-  let message: string = exception.message;
-  let lineNumber: number = exception.lineNumber;
-  let column: number = exception.column;
-  let endLineNumber: number = exception.endLineNumber;
-  let endColumn: number = exception.endColumn;
-  let description = exception.description;
-  let name: string = exception.name;
-  let fileName: string = exception.fileName;
-  let stack: string | undefined = exception.stack;
-}
-
-function testExceptionWithNodeTypings() {
-  // Test exception constructor with both arguments.
-  const exception: Handlebars.Exception = new Handlebars.Exception('message', {
-    type: 'MustacheStatement',
-    loc: {
-      source: 'source',
-      start: { line: 1, column: 5 },
-      end: { line: 10, column: 2 }
-    }
-  });
-
-  // Fields
-  let message: string = exception.message;
-  let lineNumber: number = exception.lineNumber;
-  let column: number = exception.column;
-  let endLineNumber: number = exception.endLineNumber;
-  let endColumn: number = exception.endColumn;
-  let description = exception.description;
-  let name: string = exception.name;
-  let fileName: string = exception.fileName;
-  let stack: string | undefined = exception.stack;
-}
+Handlebars.compile('test')({},{});

webpack.config.js

@@ -1,134 +0,0 @@
-const path = require('path');
-const webpack = require('webpack');
-const assert = require('assert');
-
-module.exports = [
-    createBuild({
-        name: 'umd-compiler-runtime',
-        entry: './lib/handlebars.js',
-        output: buildUmdOutput('handlebars.js'),
-        shouldHandlebarsSupportSourceMaps: false,
-        minimize: false
-    }),
-    createBuild({
-        name: 'umd-compiler-runtime-min',
-        entry: './lib/handlebars.js',
-        output: buildUmdOutput('handlebars.min.js'),
-        shouldHandlebarsSupportSourceMaps: false,
-        minimize: true
-    }),
-    createBuild({
-        name: 'umd-runtime',
-        entry: './lib/handlebars.runtime.js',
-        output: buildUmdOutput('handlebars.runtime.js'),
-        shouldHandlebarsSupportSourceMaps: false,
-        minimize: false
-    }),
-    createBuild({
-        name: 'umd-runtime',
-        entry: './lib/handlebars.runtime.js',
-        output: buildUmdOutput('handlebars.runtime.min.js'),
-        shouldHandlebarsSupportSourceMaps: false,
-        minimize: true
-    }),
-
-    createBuild({
-        name: 'amd-compiler-runtime',
-        entry: './lib/handlebars.js',
-        output: buildAmdOutput('handlebars.amd.js', 'handlebars'),
-        shouldHandlebarsSupportSourceMaps: false,
-        minimize: false
-    }),
-    createBuild({
-        name: 'amd-compiler-runtime-min',
-        entry: './lib/handlebars.js',
-        output: buildAmdOutput('handlebars.amd.min.js', 'handlebars'),
-        shouldHandlebarsSupportSourceMaps: false,
-        minimize: true
-    }),
-    createBuild({
-        name: 'amd-runtime',
-        entry: './lib/handlebars.runtime.js',
-        output: buildAmdOutput('handlebars.runtime.amd.js', 'handlebars.runtime'),
-        shouldHandlebarsSupportSourceMaps: false,
-        minimize: false
-    }),
-    createBuild({
-        name: 'amd-runtime-min',
-        entry: './lib/handlebars.runtime.js',
-        output: buildAmdOutput('handlebars.runtime.amd.min.js', 'handlebars.runtime'),
-        shouldHandlebarsSupportSourceMaps: false,
-        minimize: true
-    })
-];
-
-function createBuild({name, entry, shouldHandlebarsSupportSourceMaps, output, minimize}) {
-    assert(output != null);
-    assert(name != null);
-    assert(entry != null);
-    assert(shouldHandlebarsSupportSourceMaps != null);
-    assert(minimize != null);
-    return {
-        name,
-        module: {
-            rules: [
-                {
-                    test: /\.m?js$/,
-                    exclude: /node_modules/,
-                    use: {
-                        loader: 'babel-loader'
-                    }
-                }
-            ]
-        },
-        plugins: buildPluginConfig(shouldHandlebarsSupportSourceMaps),
-        mode: 'production',
-        devtool: false,
-        optimization: {
-            minimize
-        },
-        entry,
-        output
-    };
-}
-
-function buildPluginConfig(shouldHandlebarsSupportSourceMaps) {
-    const plugins = [];
-    if (!shouldHandlebarsSupportSourceMaps) {
-        plugins.push(
-            new webpack.IgnorePlugin({
-                resourceRegExp: /source-map/
-            })
-        );
-    }
-    return plugins;
-}
-
-function buildAmdOutput(outputFile, targetModuleName) {
-    return {
-        path: path.resolve(__dirname, 'dist'),
-            library: targetModuleName,
-            libraryTarget: 'amd',
-            filename: outputFile,
-            globalObject: 'this',
-            sourceMapFilename: '[file].map',
-            libraryExport: 'default'
-
-    };
-}
-
-function buildUmdOutput(outputFile) {
-    return {
-        path: path.resolve(__dirname, 'dist'),
-            library: 'Handlebars',
-            libraryTarget: 'umd',
-            filename: outputFile,
-            globalObject: 'this',
-            sourceMapFilename: '[file].map',
-            libraryExport: 'default'
-
-    };
-}
-
-
-