Merge branch '4.x' into merge-4.x

lib/.eslintrc.js

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

lib/handlebars/compiler/code-gen.js

@@ -8,7 +8,7 @@ try {
   if (typeof define !== 'function' || !define.amd) {
     // We don't support this in AMD environments. For these environments, we assume that
     // they are running on the browser and thus have no need for the source-map library.
-    let SourceMap = require('source-map');
+    let SourceMap = require('source-map'); // eslint-disable-line no-undef
     SourceNode = SourceMap.SourceNode;
   }
 } catch (err) {

lib/handlebars/helpers/each.js

@@ -44,9 +44,9 @@ export default function(instance) {
             execIteration(i, i, i === context.length - 1);
           }
         }
-      } else if (global.Symbol && context[global.Symbol.iterator]) {
+      } else if (typeof Symbol === 'function' && context[Symbol.iterator]) {
         const newContext = [];
-        const iterator = context[global.Symbol.iterator]();
+        const iterator = context[Symbol.iterator]();
         for (let it = iterator.next(); !it.done; it = iterator.next()) {
           newContext.push(it.value);
         }

lib/handlebars/internal/proto-access.js

@@ -1,5 +1,5 @@
 import { createNewLookupObject } from './create-new-lookup-object';
-import * as logger from '../logger';
+import logger from '../logger';
 
 const loggedProperties = Object.create(null);
 

lib/handlebars/no-conflict.js

@@ -1,6 +1,6 @@
 export default function(Handlebars) {
   /* istanbul ignore next */
-  let root = typeof global !== 'undefined' ? global : window,
+  let root = typeof global !== 'undefined' ? global : window, // eslint-disable-line no-undef
     $Handlebars = root.Handlebars;
   /* istanbul ignore next */
   Handlebars.noConflict = function() {

lib/index.js

@@ -1,5 +1,6 @@
 // USAGE:
 // var handlebars = require('handlebars');
+/* eslint-env node */
 /* eslint-disable no-var */
 
 // var local = handlebars.create();

lib/precompiler.js

@@ -1,3 +1,4 @@
+/* eslint-env node */
 /* eslint-disable no-console */
 import Async from 'neo-async';
 import fs from 'fs';