v4.0.13

Related to #1497

.gitignore

@@ -10,5 +10,3 @@ node_modules
 *.sublime-workspace
 npm-debug.log
 sauce_connect.log*
-.idea
-yarn-error.log

.travis.yml

@@ -3,7 +3,6 @@ before_install:
 - npm install -g grunt-cli
 script:
 - grunt --stack travis
-- multi-nodejs-test/run-tests.sh 0.10 0.12 4 5 6 7 8 9 10 11
 email:
   on_failure: change
   on_success: never
@@ -14,11 +13,12 @@ env:
   - secure: Nm4AgSfsgNB21kgKrF9Tl7qVZU8YYREhouQunFracTcZZh2NZ2XH5aHuSiXCj88B13Cr/jGbJKsZ4T3QS3wWYtz6lkyVOx3H3iI+TMtqhD9RM3a7A4O+4vVN8IioB2YjhEu0OKjwgX5gp+0uF+pLEi7Hpj6fupD3AbbL5uYcKg8=
 matrix:
   include:
-  - node_js: '10'
+  - node_js: '5'
     env:
     - PUBLISH=true
     - secure: pLTzghtVll9yGKJI0AaB0uI8GypfWxLTaIB0ZL8//yN3nAEIKMhf/RRilYTsn/rKj2NUa7vt2edYILi3lttOUlCBOwTc9amiRms1W8Lwr/3IdWPeBLvLuH1zNJRm2lBAwU4LBSqaOwhGaxOQr6KHTnWudhNhgOucxpZfvfI/dFw=
     - secure: yERYCf7AwL11D9uMtacly/THGV8BlzsMmrt+iQVvGA3GaY6QMmfYqf6P6cCH98sH5etd1Y+1e6YrPeMjqI6lyRllT7FptoyOdHulazQe86VQN4sc0EpqMlH088kB7gGjTut9Z+X9ViooT5XEh9WA5jXEI9pXhQJNoIHkWPuwGuY=
+  - node_js: '4'
 cache:
   directories:
   - node_modules

CONTRIBUTING.md

@@ -81,9 +81,7 @@ npm link handlebars
 npm test
 ```
 
-## Releasing the latest version
-
-*When releasing a previous version of Handlebars, please look into the CONTRIBUNG.md in the corresponding branch.*
+## Releasing
 
 Handlebars utilizes the [release yeoman generator][generator-release] to perform most release tasks.
 
@@ -99,15 +97,7 @@ gem build handlebars-source.gemspec
 gem push handlebars-source-*.gem
 ```
 
-After the release, you should check that all places have really been updated. Especially verify that the `latest`-tags
-in those places still point to the latest version
-
-* [The npm-package](https://www.npmjs.com/package/handlebars) (check latest-tag)
-* [The bower package](https://github.com/components/handlebars.js) (check the package.json)
-* [The AWS S3 Bucket](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.
+After this point the handlebars site needs to be updated to point to the new version numbers. The jsfiddle link should be updated to point to the most recent distribution for all instances in our documentation.
 
 [generator-release]: https://github.com/walmartlabs/generator-release
 [pull-request]: https://github.com/wycats/handlebars.js/pull/new/master

Gruntfile.js

@@ -12,8 +12,7 @@ module.exports = function(grunt) {
         'bench/**/*.js',
         'tasks/**/*.js',
         'lib/**/!(*.min|parser).js',
-        'spec/**/!(*.amd|json2|require).js',
-        'multi-nodejs-test/*.js'
+        'spec/**/!(*.amd|json2|require).js'
       ]
     },
 
@@ -167,8 +166,8 @@ module.exports = function(grunt) {
           browsers: [
             {browserName: 'chrome'},
             {browserName: 'firefox', platform: 'Linux'},
-            // {browserName: 'safari', version: 9, platform: 'OS X 10.11'},
-            // {browserName: 'safari', version: 8, platform: 'OS X 10.10'},
+            {browserName: 'safari', version: 9, platform: 'OS X 10.11'},
+            {browserName: 'safari', version: 8, platform: 'OS X 10.10'},
             {browserName: 'internet explorer', version: 11, platform: 'Windows 8.1'},
             {browserName: 'internet explorer', version: 10, platform: 'Windows 8'}
           ]
@@ -187,14 +186,6 @@ module.exports = function(grunt) {
       }
     },
 
-    bgShell: {
-      checkTypes: {
-        cmd: 'npm run checkTypes',
-        bg: false,
-        fail: true
-      }
-    },
-
     watch: {
       scripts: {
         options: {
@@ -210,7 +201,6 @@ module.exports = function(grunt) {
   // Build a new version of the library
   this.registerTask('build', 'Builds a distributable version of the current project', [
                     'eslint',
-                    'bgShell:checkTypes',
                     'parser',
                     'node',
                     'globals']);
@@ -231,7 +221,6 @@ module.exports = function(grunt) {
   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('grunt-saucelabs');
   grunt.loadNpmTasks('grunt-webpack');
@@ -239,7 +228,7 @@ module.exports = function(grunt) {
   grunt.task.loadTasks('tasks');
 
   grunt.registerTask('bench', ['metrics']);
-  grunt.registerTask('sauce', process.env.SAUCE_USERNAME ? ['tests', 'connect', 'saucelabs-mocha'] : []);
+  grunt.registerTask('sauce', [] /* process.env.SAUCE_USERNAME ? ['tests', 'connect', 'saucelabs-mocha'] : [] */);
 
   grunt.registerTask('travis', process.env.PUBLISH ? ['default', 'sauce', 'metrics', 'publish:latest'] : ['default']);
 

bench/dist-size.js

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

components/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "handlebars",
-  "version": "4.1.2-0",
+  "version": "4.0.13",
   "main": "handlebars.js",
   "license": "MIT",
   "dependencies": {}

components/handlebars.js.nuspec

@@ -2,7 +2,7 @@
 <package>
 	<metadata>
 		<id>handlebars.js</id>
-		<version>4.1.2-0</version>
+		<version>4.0.13</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,5 @@
 {
-  "name": "handlebars",
-  "version": "4.1.2-0",
+  "version": "4.0.11",
   "license": "MIT",
   "jspm": {
     "main": "handlebars",

lib/handlebars/base.js

@@ -4,7 +4,7 @@ import {registerDefaultHelpers} from './helpers';
 import {registerDefaultDecorators} from './decorators';
 import logger from './logger';
 
-export const VERSION = '4.1.2-0';
+export const VERSION = '4.0.13';
 export const COMPILER_REVISION = 7;
 
 export const REVISION_CHANGES = {

lib/handlebars/compiler/helpers.js

@@ -24,7 +24,7 @@ export function SourceLocation(source, locInfo) {
 
 export function id(token) {
   if (/^\[.*\]$/.test(token)) {
-    return token.substring(1, token.length - 1);
+    return token.substr(1, token.length - 2);
   } else {
     return token;
   }

lib/handlebars/helpers/lookup.js

@@ -1,11 +1,5 @@
 export default function(instance) {
   instance.registerHelper('lookup', function(obj, field) {
-    if (!obj) {
-      return obj;
-    }
-    if (field === 'constructor' && !obj.propertyIsEnumerable(field)) {
-      return undefined;
-    }
-    return obj[field];
+    return obj && obj[field];
   });
 }

lib/precompiler.js

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

multi-nodejs-test/.eslintrc.js

@@ -1,114 +0,0 @@
-module.exports = {
-  "extends": "eslint:recommended",
-  "globals": {
-    "self": false
-  },
-  "env": {
-    "node": true
-  },
-  "rules": {
-    // overrides eslint:recommended defaults
-    "no-sparse-arrays": "off",
-    "no-func-assign": "off",
-    "no-console": "off",
-    "no-debugger": "warn",
-    "no-unreachable": "warn",
-
-    // Possible Errors //
-    //-----------------//
-    "no-unsafe-negation": "error",
-
-
-    // Best Practices //
-    //----------------//
-    "curly": "error",
-    "default-case": "warn",
-    "dot-notation": ["error", { "allowKeywords": false }],
-    "guard-for-in": "warn",
-    "no-alert": "error",
-    "no-caller": "error",
-    "no-div-regex": "warn",
-    "no-eval": "error",
-    "no-extend-native": "error",
-    "no-extra-bind": "error",
-    "no-floating-decimal": "error",
-    "no-implied-eval": "error",
-    "no-iterator": "error",
-    "no-labels": "error",
-    "no-lone-blocks": "error",
-    "no-loop-func": "error",
-    "no-multi-spaces": "error",
-    "no-multi-str": "warn",
-    "no-global-assign": "error",
-    "no-new": "error",
-    "no-new-func": "error",
-    "no-new-wrappers": "error",
-    "no-octal-escape": "error",
-    "no-process-env": "error",
-    "no-proto": "error",
-    "no-return-assign": "error",
-    "no-script-url": "error",
-    "no-self-compare": "error",
-    "no-sequences": "error",
-    "no-throw-literal": "error",
-    "no-unused-expressions": "error",
-    "no-warning-comments": "warn",
-    "no-with": "error",
-    "radix": "error",
-    "wrap-iife": "error",
-
-
-    // Variables //
-    //-----------//
-    "no-catch-shadow": "error",
-    "no-label-var": "error",
-    "no-shadow-restricted-names": "error",
-    "no-undef-init": "error",
-    "no-use-before-define": ["error", "nofunc"],
-
-
-    // Stylistic Issues //
-    //------------------//
-    "comma-dangle": ["error", "never"],
-    "quote-props": ["error", "as-needed", { "keywords": true, "unnecessary": false }],
-    "brace-style": ["error", "1tbs", { "allowSingleLine": true }],
-    "camelcase": "error",
-    "comma-spacing": ["error", { "before": false, "after": true }],
-    "comma-style": ["error", "last"],
-    "consistent-this": ["warn", "self"],
-    "eol-last": "error",
-    "func-style": ["error", "declaration"],
-    "key-spacing": ["error", {
-      "beforeColon": false,
-      "afterColon": true
-    }],
-    "new-cap": "error",
-    "new-parens": "error",
-    "no-array-constructor": "error",
-    "no-lonely-if": "error",
-    "no-mixed-spaces-and-tabs": "error",
-    "no-nested-ternary": "warn",
-    "no-new-object": "error",
-    "no-spaced-func": "error",
-    "no-trailing-spaces": "error",
-    "no-extra-parens": ["error", "functions"],
-    "quotes": ["error", "single", "avoid-escape"],
-    "semi": "error",
-    "semi-spacing": ["error", { "before": false, "after": true }],
-    "keyword-spacing": "error",
-    "space-before-blocks": ["error", "always"],
-    "space-before-function-paren": ["error", { "anonymous": "never", "named": "never" }],
-    "space-in-parens": ["error", "never"],
-    "space-infix-ops": "error",
-    "space-unary-ops": "error",
-    "spaced-comment": ["error", "always", { "markers": [","] }],
-    "wrap-regex": "warn",
-
-    // ECMAScript 6 //
-    //--------------//
-    "no-var": "off"
-  },
-  "parserOptions": {
-    "sourceType": "module"
-  }
-}

multi-nodejs-test/expected.txt

@@ -1 +0,0 @@
-Author: Yehuda

multi-nodejs-test/run-handlebars.js

@@ -1,13 +0,0 @@
-// This test should run with node 0.10 as long as Handlebars has been compiled before
-var Handlebars = require('../');
-var fs = require('fs');
-
-console.log('Testing build Handlebars with Node version ' + process.version);
-var template = fs.readFileSync(require.resolve('./template.txt.hbs'), 'utf-8');
-var compiledOutput = Handlebars.compile(template)({author: 'Yehuda'}).trim();
-var expectedOutput = fs.readFileSync(require.resolve('./expected.txt'), 'utf-8').trim();
-
-if (compiledOutput !== expectedOutput) {
-    throw new Error('Compiled output (' + compiledOutput + ') did not match expected output (' + expectedOutput + ')');
-}
-console.log('Success');

multi-nodejs-test/run-tests.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-cd "$( dirname "$( readlink -f "$0" )" )"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-
-# This script tests with precompiler and the built distribution with multiple NodeJS version.
-# The rest of the travis-build will only work with newer NodeJS versions, because the build
-# tools don't support older versions.
-# However, the built distribution should work with older NodeJS versions as well.
-# This test is simple by design. It merely ensures, that calling Handlebars does not fail with old versions.
-# It does (almost) not test for correctness, because that is already done in the mocha-tests.
-# And it does not use any NodeJS based testing framwork to make this part independent of the Node version.
-
-# A list of NodeJS versions is expected as cli-args
-echo "Handlebars should be able to run in various versions of NodeJS"
-for i in "$@" ; do
-    nvm install "$i"
-    nvm exec "$i" node ./run-handlebars.js >/dev/null || exit 1
-    nvm exec "$i" node ../bin/handlebars template.txt.hbs >/dev/null || exit 1
-    echo Success
-done

multi-nodejs-test/template.txt.hbs

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

package.json

@@ -1,7 +1,7 @@
 {
   "name": "handlebars",
   "barename": "handlebars",
-  "version": "4.1.2-0",
+  "version": "4.0.13",
   "description": "Handlebars provides the power necessary to let you build semantic templates effectively with no frustration",
   "homepage": "http://www.handlebarsjs.com/",
   "keywords": [
@@ -10,6 +10,9 @@
     "template",
     "html"
   ],
+  "publishConfig": {
+    "tag": "4.0-patch"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/wycats/handlebars.js.git"
@@ -21,7 +24,7 @@
     "node": ">=0.4.7"
   },
   "dependencies": {
-    "neo-async": "^2.6.0",
+    "async": "^2.5.0",
     "optimist": "^0.6.1",
     "source-map": "^0.6.1"
   },
@@ -33,12 +36,10 @@
     "babel-loader": "^5.0.0",
     "babel-runtime": "^5.1.10",
     "benchmark": "~1.0",
-    "dtslint": "^0.5.5",
     "dustjs-linkedin": "^2.0.2",
     "eco": "~1.1.0-rc-3",
     "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",
@@ -48,7 +49,7 @@
     "grunt-contrib-uglify": "^1",
     "grunt-contrib-watch": "^1.1.0",
     "grunt-eslint": "^20.1.0",
-    "grunt-saucelabs": "9.x",
+    "grunt-saucelabs": "8.x",
     "grunt-webpack": "^1.0.8",
     "istanbul": "^0.3.0",
     "jison": "~0.3.0",
@@ -56,22 +57,15 @@
     "mock-stdin": "^0.3.0",
     "mustache": "^2.1.3",
     "semver": "^5.0.1",
-    "typescript": "^3.4.3",
     "underscore": "^1.5.1",
     "webpack": "^1.12.6",
     "webpack-dev-server": "^1.12.1"
   },
   "main": "lib/index.js",
-  "types": "types/index.d.ts",
-  "browser": {
-    ".": "./dist/handlebars.min.js",
-    "./runtime": "./dist/handlebars.runtime.min.js"
-  },
   "bin": {
     "handlebars": "bin/handlebars"
   },
   "scripts": {
-    "checkTypes": "dtslint types",
     "test": "grunt"
   },
   "jspm": {
@@ -91,7 +85,6 @@
     "lib",
     "print-script",
     "release-notes.md",
-    "runtime.js",
-    "types/*.d.ts"
+    "runtime.js"
   ]
 }

release-notes.md

@@ -2,55 +2,12 @@
 
 ## Development
 
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.1.2-0...master)
+[Commits](https://github.com/wycats/handlebars.js/compare/v4.0.13...master)
 
-## v4.1.2-0 - August 25th, 2019
-[#1540](https://github.com/wycats/handlebars.js/pull/1540) - added browser to package.json, resolves #1102 ([@ouijan](https://api.github.com/users/ouijan))
-
-Compatibility notes:
-- We are not sure if imports via webpack are still working, which is why this release is a pre-release
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.1.2...v4.1.2-0)
-
-## v4.1.2 - April 13th, 2019
-Chore/Test:
-- [#1515](https://github.com/wycats/handlebars.js/pull/1515) - Port over linting and test for typings ([@zimmi88](https://api.github.com/users/zimmi88))
-- chore: add missing typescript dependency, add package-lock.json - 594f1e3
-- test: remove safari from saucelabs - 871accc
-
-Bugfixes: 
-- fix: prevent RCE through the "lookup"-helper - cd38583
-
-Compatibility notes:
-
-Access to the constructor of a class thought `{{lookup obj "constructor" }}` is now prohibited. This closes 
-a leak that only half closed in versions 4.0.13 and 4.1.0, but it is a slight incompatibility.
-
-This kind of access is not the intended use of Handlebars and leads to the vulnerability described
-in #1495. We will **not** increase the major version, because such use is not intended or documented, 
-and because of the potential impact of the issue (we fear that most people won't use a new major version
-and the issue may not be resolved on many systems). 
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.1.1...v4.1.2)
-
-## v4.1.1 - March 16th, 2019
-Bugfixes:
-- fix: add "runtime.d.ts" to allow "require('handlebars/runtime')" in TypeScript - 5cedd62
-
-Refactorings:
-- replace "async" with "neo-async" - 048f2ce
-- use "substring"-function instead of "substr" - 445ae12
-
-Compatibility notes:
-- This is a bugfix release. There are no breaking change and no new features.
-
-
-[Commits](https://github.com/wycats/handlebars.js/compare/v4.1.0...v4.1.1)
-
-## v4.1.0 - February 7th, 2019
+## v4.0.13 - February 7th, 2019
 New Features
 
-- import TypeScript typings - 27ac1ee
+- none
 
 Security fixes:
 
@@ -60,7 +17,6 @@ Housekeeping
 
 - chore: fix components/handlebars package.json and auto-update on release - bacd473
 - chore: Use node 10 to build handlebars - 78dd89c
-- chore/doc: Add more release docs - 6b87c21
 
 Compatibility notes:
 
@@ -84,6 +40,66 @@ This kind of access is not the intended use of Handlebars and leads to the vulne
 
 [Commits](https://github.com/wycats/handlebars.js/compare/v4.0.12...v4.1.0)
 
+[Commits](https://github.com/wycats/handlebars.js/compare/v4.0.12...v4.0.13)
+
+## v4.0.12 - September 4th, 2018
+New features:
+
+- none
+
+Various dependency updates
+
+- [#1464](https://github.com/wycats/handlebars.js/pull/1464) - Bump versions of grunt-plugins to 1.x
+- [#1398](https://github.com/wycats/handlebars.js/pull/1398) - Chore: updated various dev dependencies
+- upgrade uglify-js - d3d3942
+- Update grunt-eslint to 20.1.0 - 7729aa9
+- Update dependencies "async" to 2.5.0 and "source-map" to 0.6.1 (73d5637)
+
+Bugfixes:
+
+- [components/handlebars.js#24](https://github.com/components/handlebars.js#24) Add package.json to components shim
+- Updated `source-map`-package should work better with `rollup`[#1463](https://github.com/wycats/handlebars.js/issues/1463)
+
+Removed obsolete code:
+
+- unnecessary check - 0ddff8b
+- Use `files` field - 69c6ca5
+- Update jsfiddle to 4.0.11 - 8947dd0
+
+Compatibility notes:
+- No compatibility issues are to be expected
+
+[Commits](https://github.com/wycats/handlebars.js/compare/v4.0.12...v4.0.12)
+
+## v4.0.12 - September 4th, 2018
+New features:
+
+- none
+
+Various dependency updates
+
+- [#1464](https://github.com/wycats/handlebars.js/pull/1464) - Bump versions of grunt-plugins to 1.x
+- [#1398](https://github.com/wycats/handlebars.js/pull/1398) - Chore: updated various dev dependencies
+- upgrade uglify-js - d3d3942
+- Update grunt-eslint to 20.1.0 - 7729aa9
+- Update dependencies "async" to 2.5.0 and "source-map" to 0.6.1 (73d5637)
+
+Bugfixes:
+
+- [components/handlebars.js#24](https://github.com/components/handlebars.js#24) Add package.json to components shim
+- Updated `source-map`-package should work better with `rollup`[#1463](https://github.com/wycats/handlebars.js/issues/1463)
+
+Removed obsolete code:
+
+- unnecessary check - 0ddff8b
+- Use `files` field - 69c6ca5
+- Update jsfiddle to 4.0.11 - 8947dd0
+
+Compatibility notes:
+- No compatibility issues are to be expected
+
+[Commits](https://github.com/wycats/handlebars.js/compare/v4.0.12...v4.0.12)
+
 ## v4.0.12 - September 4th, 2018
 New features:
 

runtime.d.ts

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

spec/security.js

@@ -2,34 +2,22 @@ describe('security issues', function() {
     describe('GH-1495: Prevent Remote Code Execution via constructor', function() {
         it('should not allow constructors to be accessed', function() {
             shouldCompileTo('{{constructor.name}}', {}, '');
-            shouldCompileTo('{{lookup (lookup this "constructor") "name"}}', {}, '');
         });
 
         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');
-            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() {
-            }
-
-            Object.defineProperty(TestClass.prototype, 'abc', {
-                get: function() {
+            class TestClass {
+                get abc() {
                     return 'xyz';
                 }
-
-            });
-
+            }
             shouldCompileTo('{{#with this as |obj|}}{{obj.abc}}{{/with}}',
                 new TestClass(), 'xyz');
-            shouldCompileTo('{{#with this as |obj|}}{{lookup obj "abc"}}{{/with}}',
-                new TestClass(), 'xyz');
-
         });
     });
 });

src/handlebars.l

@@ -4,7 +4,7 @@
 %{
 
 function strip(start, end) {
-  return yytext = yytext.substring(start, yyleng - end + start);
+  return yytext = yytext.substr(start, yyleng-end);
 }
 
 %}
@@ -59,7 +59,7 @@ ID    [^\s!"#%-,\.\/;->@\[-\^`\{-~]+/{LOOKAHEAD}
                                   if (this.conditionStack[this.conditionStack.length-1] === 'raw') {
                                     return 'CONTENT';
                                   } else {
-                                    strip(5, 9);
+                                    yytext = yytext.substr(5, yyleng-9);
                                     return 'END_RAW_BLOCK';
                                   }
                                  }

tasks/metrics.js

@@ -1,5 +1,5 @@
 var _ = require('underscore'),
-    async = require('neo-async'),
+    async = require('async'),
     metrics = require('../bench');
 
 module.exports = function(grunt) {

tasks/publish.js

@@ -1,5 +1,5 @@
 var _ = require('underscore'),
-    async = require('neo-async'),
+    async = require('async'),
     AWS = require('aws-sdk'),
     git = require('./util/git'),
     semver = require('semver');
@@ -66,7 +66,7 @@ module.exports = function(grunt) {
     var s3 = new AWS.S3(),
         bucket = process.env.S3_BUCKET_NAME;
 
-    async.each(_.keys(files), function(file, callback) {
+    async.forEach(_.keys(files), function(file, callback) {
         var params = {Bucket: bucket, Key: file, Body: grunt.file.read(files[file])};
         s3.putObject(params, function(err) {
           if (err) {

tasks/version.js

@@ -1,4 +1,4 @@
-var async = require('neo-async'),
+var async = require('async'),
     git = require('./util/git'),
     semver = require('semver');
 
@@ -20,7 +20,6 @@ module.exports = function(grunt) {
     async.each([
         ['lib/handlebars/base.js', (/const VERSION = ['"](.*)['"];/), 'const VERSION = \'' + version + '\';'],
         ['components/bower.json', (/"version":.*/), '"version": "' + version + '",'],
-        ['components/package.json', /"version":.*/, '"version": "' + version + '",'],
         ['components/handlebars.js.nuspec', (/<version>.*<\/version>/), '<version>' + version + '</version>']
       ],
       function(args, callback) {

types/index.d.ts

@@ -1,357 +0,0 @@
-/* These definitions were imported from https://github.com/DefinitelyTyped/DefinitelyTyped
- * and includes previous contributions from the DefinitelyTyped community by:
- *   - Albert Willemsen <https://github.com/AlbertWillemsen-Centric>
- *   - Boris Yankov <https://github.com/borisyankov>
- *   - Jessica Franco <https://github.com/Kovensky>
- *   - Masahiro Wakame <https://github.com/vvakame>
- *   - Raanan Weber <https://github.com/RaananW>
- *   - Sergei Dorogin <https://github.com/evil-shrike>
- *   - webbiesdk <https://github.com/webbiesdk>
- * For full history prior to their migration to handlebars.js, please see:
- * https://github.com/DefinitelyTyped/DefinitelyTyped/commits/1ce60bdc07f10e0b076778c6c953271c072bc894/types/handlebars/index.d.ts
- */
-// TypeScript Version: 2.3
-
-declare namespace Handlebars {
-  export interface TemplateDelegate<T = any> {
-      (context: T, options?: RuntimeOptions): string;
-  }
-
-  export type Template<T = any> = TemplateDelegate<T>|string;
-
-  export interface RuntimeOptions {
-      partial?: boolean;
-      depths?: any[];
-      helpers?: { [name: string]: Function };
-      partials?: { [name: string]: HandlebarsTemplateDelegate };
-      decorators?: { [name: string]: Function };
-      data?: any;
-      blockParams?: any[];
-  }
-
-  export interface HelperOptions {
-      fn: TemplateDelegate;
-      inverse: TemplateDelegate;
-      hash: any;
-      data?: any;
-  }
-
-  export interface HelperDelegate {
-      (context?: any, arg1?: any, arg2?: any, arg3?: any, arg4?: any, arg5?: any, options?: HelperOptions): any;
-  }
-  export interface HelperDeclareSpec {
-      [key: string]: HelperDelegate;
-  }
-
-  export interface ParseOptions {
-      srcName?: string,
-      ignoreStandalone?: boolean
-  }
-
-  export function registerHelper(name: string, fn: HelperDelegate): void;
-  export function registerHelper(name: HelperDeclareSpec): void;
-  export function unregisterHelper(name: string): void;
-
-  export function registerPartial(name: string, fn: Template): void;
-  export function registerPartial(spec: { [name: string]: HandlebarsTemplateDelegate }): void;
-  export function unregisterPartial(name: string): void;
-
-  // TODO: replace Function with actual signature
-  export function registerDecorator(name: string, fn: Function): void;
-  export function unregisterDecorator(name: string): void;
-
-  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 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>;
-
-  export function create(): typeof Handlebars;
-
-  export const escapeExpression: typeof Utils.escapeExpression;
-  //export const Utils: typeof hbs.Utils;
-  export const logger: Logger;
-  export const templates: HandlebarsTemplates;
-  export const helpers: { [name: string]: HelperDelegate };
-  export const partials: { [name: string]: any };
-  // TODO: replace Function with actual signature
-  export const decorators: { [name: string]: Function };
-
-  export function noConflict(): typeof Handlebars;
-
-  export class SafeString {
-      constructor(str: string);
-      toString(): string;
-      toHTML(): string;
-  }
-
-  export namespace Utils {
-      export function escapeExpression(str: string): string;
-      export function createFrame(object: any): any;
-      export function blockParams(obj: any[], ids: any[]): any[];
-      export function isEmpty(obj: any) : boolean;
-      export function extend(obj: any, ...source: any[]): any;
-      export function toString(obj: any): string;
-      export function isArray(obj: any): boolean;
-      export function isFunction(obj: any): boolean;
-  }
-
-  export namespace AST {
-      export const helpers: hbs.AST.helpers;
-  }
-
-  interface ICompiler {
-      accept(node: hbs.AST.Node): void;
-      Program(program: hbs.AST.Program): void;
-      BlockStatement(block: hbs.AST.BlockStatement): void;
-      PartialStatement(partial: hbs.AST.PartialStatement): void;
-      PartialBlockStatement(partial: hbs.AST.PartialBlockStatement): void;
-      DecoratorBlock(decorator: hbs.AST.DecoratorBlock): void;
-      Decorator(decorator: hbs.AST.Decorator): void;
-      MustacheStatement(mustache: hbs.AST.MustacheStatement): void;
-      ContentStatement(content: hbs.AST.ContentStatement): void;
-      CommentStatement(comment?: hbs.AST.CommentStatement): void;
-      SubExpression(sexpr: hbs.AST.SubExpression): void;
-      PathExpression(path: hbs.AST.PathExpression): void;
-      StringLiteral(str: hbs.AST.StringLiteral): void;
-      NumberLiteral(num: hbs.AST.NumberLiteral): void;
-      BooleanLiteral(bool: hbs.AST.BooleanLiteral): void;
-      UndefinedLiteral(): void;
-      NullLiteral(): void;
-      Hash(hash: hbs.AST.Hash): void;
-  }
-
-  export class Visitor implements ICompiler {
-      accept(node: hbs.AST.Node): void;
-      acceptKey(node: hbs.AST.Node, name: string): void;
-      acceptArray(arr: hbs.AST.Expression[]): void;
-      Program(program: hbs.AST.Program): void;
-      BlockStatement(block: hbs.AST.BlockStatement): void;
-      PartialStatement(partial: hbs.AST.PartialStatement): void;
-      PartialBlockStatement(partial: hbs.AST.PartialBlockStatement): void;
-      DecoratorBlock(decorator: hbs.AST.DecoratorBlock): void;
-      Decorator(decorator: hbs.AST.Decorator): void;
-      MustacheStatement(mustache: hbs.AST.MustacheStatement): void;
-      ContentStatement(content: hbs.AST.ContentStatement): void;
-      CommentStatement(comment?: hbs.AST.CommentStatement): void;
-      SubExpression(sexpr: hbs.AST.SubExpression): void;
-      PathExpression(path: hbs.AST.PathExpression): void;
-      StringLiteral(str: hbs.AST.StringLiteral): void;
-      NumberLiteral(num: hbs.AST.NumberLiteral): void;
-      BooleanLiteral(bool: hbs.AST.BooleanLiteral): void;
-      UndefinedLiteral(): void;
-      NullLiteral(): void;
-      Hash(hash: hbs.AST.Hash): void;
-  }
-}
-
-/**
-* Implement this interface on your MVW/MVVM/MVC views such as Backbone.View
-**/
-interface HandlebarsTemplatable {
-  template: HandlebarsTemplateDelegate;
-}
-
-// NOTE: for backward compatibility of this typing
-type HandlebarsTemplateDelegate<T = any> = Handlebars.TemplateDelegate<T>;
-
-interface HandlebarsTemplates {
-  [index: string]: HandlebarsTemplateDelegate;
-}
-
-interface TemplateSpecification {
-
-}
-
-// for backward compatibility of this typing
-type RuntimeOptions = Handlebars.RuntimeOptions;
-
-interface CompileOptions {
-  data?: boolean;
-  compat?: boolean;
-  knownHelpers?: {
-      helperMissing?: boolean;
-      blockHelperMissing?: boolean;
-      each?: boolean;
-      if?: boolean;
-      unless?: boolean;
-      with?: boolean;
-      log?: boolean;
-      lookup?: boolean;
-  };
-  knownHelpersOnly?: boolean;
-  noEscape?: boolean;
-  strict?: boolean;
-  assumeObjects?: boolean;
-  preventIndent?: boolean;
-  ignoreStandalone?: boolean;
-  explicitPartialContext?: boolean;
-}
-
-interface PrecompileOptions extends CompileOptions {
-  srcName?: string;
-  destName?: string;
-}
-
-declare namespace hbs {
-  // for backward compatibility of this typing
-  type SafeString = Handlebars.SafeString;
-
-  type Utils = typeof Handlebars.Utils;
-}
-
-interface Logger {
-  DEBUG: number;
-  INFO: number;
-  WARN: number;
-  ERROR: number;
-  level: number;
-
-  methodMap: { [level: number]: string };
-
-  log(level: number, obj: string): void;
-}
-
-declare namespace hbs {
-  namespace AST {
-      interface Node {
-          type: string;
-          loc: SourceLocation;
-      }
-
-      interface SourceLocation {
-          source: string;
-          start: Position;
-          end: Position;
-      }
-
-      interface Position {
-          line: number;
-          column: number;
-      }
-
-      interface Program extends Node {
-          body: Statement[];
-          blockParams: string[];
-      }
-
-      interface Statement extends Node {}
-
-      interface MustacheStatement extends Statement {
-          path: PathExpression | Literal;
-          params: Expression[];
-          hash: Hash;
-          escaped: boolean;
-          strip: StripFlags;
-      }
-
-      interface Decorator extends MustacheStatement { }
-
-      interface BlockStatement extends Statement {
-          path: PathExpression;
-          params: Expression[];
-          hash: Hash;
-          program: Program;
-          inverse: Program;
-          openStrip: StripFlags;
-          inverseStrip: StripFlags;
-          closeStrip: StripFlags;
-      }
-
-      interface DecoratorBlock extends BlockStatement { }
-
-      interface PartialStatement extends Statement {
-          name: PathExpression | SubExpression;
-          params: Expression[];
-          hash: Hash;
-          indent: string;
-          strip: StripFlags;
-      }
-
-      interface PartialBlockStatement extends Statement {
-          name: PathExpression | SubExpression;
-          params: Expression[];
-          hash: Hash;
-          program: Program;
-          openStrip: StripFlags;
-          closeStrip: StripFlags;
-      }
-
-      interface ContentStatement extends Statement {
-          value: string;
-          original: StripFlags;
-      }
-
-      interface CommentStatement extends Statement {
-          value: string;
-          strip: StripFlags;
-      }
-
-      interface Expression extends Node {}
-
-      interface SubExpression extends Expression {
-          path: PathExpression;
-          params: Expression[];
-          hash: Hash;
-      }
-
-      interface PathExpression extends Expression {
-          data: boolean;
-          depth: number;
-          parts: string[];
-          original: string;
-      }
-
-      interface Literal extends Expression {}
-      interface StringLiteral extends Literal {
-          value: string;
-          original: string;
-      }
-
-      interface BooleanLiteral extends Literal {
-          value: boolean;
-          original: boolean;
-      }
-
-      interface NumberLiteral extends Literal {
-          value: number;
-          original: number;
-      }
-
-      interface UndefinedLiteral extends Literal {}
-
-      interface NullLiteral extends Literal {}
-
-      interface Hash extends Node {
-          pairs: HashPair[];
-      }
-
-      interface HashPair extends Node {
-          key: string;
-          value: Expression;
-      }
-
-      interface StripFlags {
-          open: boolean;
-          close: boolean;
-      }
-
-      interface helpers {
-          helperExpression(node: Node): boolean;
-          scopeId(path: PathExpression): boolean;
-          simpleId(path: PathExpression): boolean;
-      }
-  }
-}
-
-declare module "handlebars" {
-  export = Handlebars;
-}
-
-declare module "handlebars/runtime" {
-  export = Handlebars;
-}

types/test.ts

@@ -1,91 +0,0 @@
-/* These test cases were imported from https://github.com/DefinitelyTyped/DefinitelyTyped
- * and includes previous contributions from the DefinitelyTyped community.
- * For full history prior to their migration to handlebars.js, please see:
- * https://github.com/DefinitelyTyped/DefinitelyTyped/commits/1ce60bdc07f10e0b076778c6c953271c072bc894/types/handlebars/handlebars-tests.ts
- */
-
-import * as Handlebars from 'handlebars';
-
-const context = {
-  author: { firstName: 'Alan', lastName: 'Johnson' },
-  body: 'I Love Handlebars',
-  comments: [{
-    author: { firstName: 'Yehuda', lastName: 'Katz' },
-    body: 'Me too!'
-  }]
-};
-Handlebars.registerHelper('fullName', (person: typeof context.author) => {
-  return person.firstName + ' ' + person.lastName;
-});
-
-Handlebars.registerHelper('agree_button', function(this: any) {
-  return new Handlebars.SafeString(
-    '<button>I agree. I ' + this.emotion + ' ' + this.name + '</button>'
-  );
-});
-
-const source1 = '<p>Hello, my name is {{name}}. I am from {{hometown}}. I have ' +
-                '{{kids.length}} kids:</p>' +
-                '<ul>{{#kids}}<li>{{name}} is {{age}}</li>{{/kids}}</ul>';
-const template1 = Handlebars.compile(source1);
-template1({ name: "Alan", hometown: "Somewhere, TX", kids: [{name: "Jimmy", age: 12}, {name: "Sally", age: 4}]});
-
-Handlebars.registerHelper('link_to', (context: typeof post) => {
-  return '<a href="' + context.url + '">' + context.body + '</a>';
-});
-const post = { url: "/hello-world", body: "Hello World!" };
-const context2 = { posts: [post] };
-const source2 = '<ul>{{#posts}}<li>{{{link_to this}}}</li>{{/posts}}</ul>';
-const template2: HandlebarsTemplateDelegate<{ posts: { url: string, body: string }[] }> = Handlebars.compile(source2);
-template2(context2);
-
-Handlebars.registerHelper('link_to', (title: string, context: typeof post) => {
-  return '<a href="/posts' + context.url + '">' + title + '!</a>';
-});
-const context3 = { posts: [{url: '/hello-world', body: 'Hello World!'}] };
-const source3 = '<ul>{{#posts}}<li>{{{link_to "Post" this}}}</li>{{/posts}}</ul>';
-const template3 = Handlebars.compile<typeof context3>(source3);
-template3(context3);
-
-const source4 = '<ul>{{#people}}<li>{{#link}}{{name}}{{/link}}</li>{{/people}}</ul>';
-Handlebars.registerHelper('link', function(this: any, context: any) {
-  return '<a href="/people/' + this.id + '">' + context.fn(this) + '</a>';
-});
-const template4 = Handlebars.compile<{ people: { name: string, id: number }[] }>(source4);
-const data2 = { 'people': [
-    { 'name': 'Alan', 'id': 1 },
-    { 'name': 'Yehuda', 'id': 2 }
-]};
-template4(data2);
-
-const source5 = '<ul>{{#people}}<li>{{> link}}</li>{{/people}}</ul>';
-Handlebars.registerPartial('link', '<a href="/people/{{id}}">{{name}}</a>');
-const template5 = Handlebars.compile(source5);
-const data3 = { 'people': [
-    { 'name': 'Alan', 'id': 1 },
-    { 'name': 'Yehuda', 'id': 2 }
-]};
-template5(data3);
-
-const source6 = '{{#list nav}}<a href="{{url}}">{{title}}</a>{{/list}}';
-const template6 = Handlebars.compile(source6);
-Handlebars.registerHelper('list', (context, options: Handlebars.HelperOptions) => {
-  let ret = "<ul>";
-  for(let i=0, j=context.length; i<j; i++) {
-    ret = ret + "<li>" + options.fn(context[i]) + "</li>";
-  }
-  return ret + "</ul>";
-});
-template6([{url:"", title:""}])
-
-
-const escapedExpression = Handlebars.Utils.escapeExpression('<script>alert(\'xss\');</script>');
-
-Handlebars.helpers !== undefined;
-
-const parsedTmpl = Handlebars.parse('<p>Hello, my name is {{name}}.</p>', {
-  srcName: "/foo/bar/baz.hbs",
-  ignoreStandalone: true
-});
-
-const parsedTmplWithoutOptions = Handlebars.parse('<p>Hello, my name is {{name}}.</p>');

types/tsconfig.json

@@ -1,16 +0,0 @@
-{
-  "compilerOptions": {
-    "module": "commonjs",
-    "lib": ["es6"],
-    "noImplicitAny": true,
-    "noImplicitThis": true,
-    "strictNullChecks": true,
-    "strictFunctionTypes": true,
-    "noEmit": true,
-
-    "baseUrl": ".",
-    "paths": {
-      "handlebars": ["."]
-    }
-  }
-}

types/tslint.json

@@ -1,79 +0,0 @@
-{
-  "extends": "dtslint/dtslint.json",
-  "rules": {
-    "adjacent-overload-signatures": false,
-    "array-type": false,
-    "arrow-return-shorthand": false,
-    "ban-types": false,
-    "callable-types": false,
-    "comment-format": false,
-    "dt-header": false,
-    "eofline": false,
-    "export-just-namespace": false,
-    "import-spacing": false,
-    "interface-name": false,
-    "interface-over-type-literal": false,
-    "jsdoc-format": false,
-    "max-line-length": false,
-    "member-access": false,
-    "new-parens": false,
-    "no-any-union": false,
-    "no-boolean-literal-compare": false,
-    "no-conditional-assignment": false,
-    "no-consecutive-blank-lines": false,
-    "no-construct": false,
-    "no-declare-current-package": false,
-    "no-duplicate-imports": false,
-    "no-duplicate-variable": false,
-    "no-empty-interface": false,
-    "no-for-in-array": false,
-    "no-inferrable-types": false,
-    "no-internal-module": false,
-    "no-irregular-whitespace": false,
-    "no-mergeable-namespace": false,
-    "no-misused-new": false,
-    "no-namespace": false,
-    "no-object-literal-type-assertion": false,
-    "no-padding": false,
-    "no-redundant-jsdoc": false,
-    "no-redundant-jsdoc-2": false,
-    "no-redundant-undefined": false,
-    "no-reference-import": false,
-    "no-relative-import-in-test": false,
-    "no-self-import": false,
-    "no-single-declare-module": false,
-    "no-string-throw": false,
-    "no-unnecessary-callback-wrapper": false,
-    "no-unnecessary-class": false,
-    "no-unnecessary-generics": false,
-    "no-unnecessary-qualifier": false,
-    "no-unnecessary-type-assertion": false,
-    "no-useless-files": false,
-    "no-var-keyword": false,
-    "no-var-requires": false,
-    "no-void-expression": false,
-    "no-trailing-whitespace": false,
-    "object-literal-key-quotes": false,
-    "object-literal-shorthand": false,
-    "one-line": false,
-    "one-variable-per-declaration": false,
-    "only-arrow-functions": false,
-    "prefer-conditional-expression": false,
-    "prefer-const": false,
-    "prefer-declare-function": false,
-    "prefer-for-of": false,
-    "prefer-method-signature": false,
-    "prefer-template": false,
-    "radix": false,
-    "semicolon": false,
-    "space-before-function-paren": false,
-    "space-within-parens": false,
-    "strict-export-declare-modifiers": false,
-    "trim-file": false,
-    "triple-equals": false,
-    "typedef-whitespace": false,
-    "unified-signatures": false,
-    "void-return": false,
-    "whitespace": false
-  }
-}