Merge pull request #998 from wycats/babel

Add full support for es6

.eslintrc

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

Gruntfile.js

@@ -1,16 +1,16 @@
-var childProcess = require('child_process');
-
+/*eslint-disable no-process-env */
 module.exports = function(grunt) {
 
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
 
-    jshint: {
+    eslint: {
       options: {
-        jshintrc: '.jshintrc'
       },
       files: [
-        'dist/cjs/**/!(*.min|parser).js'
+        '*.js',
+        'lib/**/!(*.min|parser).js',
+        'spec/**/!(*.amd|json2|require).js'
       ]
     },
 
@@ -19,7 +19,7 @@ module.exports = function(grunt) {
     copy: {
       dist: {
         options: {
-          processContent: function(content, path) {
+          processContent: function(content) {
             return grunt.template.process('/*!\n\n <%= pkg.name %> v<%= pkg.version %>\n\n<%= grunt.file.read("LICENSE") %>\n@license\n*/\n')
                 + content;
           }
@@ -41,54 +41,78 @@ module.exports = function(grunt) {
       }
     },
 
-    packager: {
-      global: {
-        type: 'umd',
-        export: 'Handlebars',
-        files: [{
-          cwd: 'lib/',
-          expand: true,
-          src: ['handlebars*.js'],
-          dest: 'dist/'
-        }]
+    babel: {
+      options: {
+        loose: ['es6.modules']
       },
-
       amd: {
-        type: 'amd',
-        anonymous: true,
+        options: {
+          modules: 'amd'
+        },
         files: [{
           expand: true,
           cwd: 'lib/',
-          src: '**/!(index).js',
+          src: '**/!(index|precompiler).js',
           dest: 'dist/amd/'
         }]
       },
 
       cjs: {
-        type: 'cjs',
+        options: {
+          modules: 'common'
+        },
         files: [{
-          expand: true,
           cwd: 'lib/',
+          expand: true,
           src: '**/!(index).js',
           dest: 'dist/cjs/'
         }]
       }
     },
+    webpack: {
+      options: {
+        context: __dirname,
+        module: {
+          loaders: [
+            // the optional 'runtime' transformer tells babel to require the runtime instead of inlining it.
+            { test: /\.jsx?$/, exclude: /node_modules/, loader: 'babel-loader?optional=runtime&loose=es6.modules' }
+          ]
+        },
+        output: {
+          path: 'dist/',
+          library: 'Handlebars',
+          libraryTarget: 'umd'
+        }
+      },
+      handlebars: {
+        entry: './lib/handlebars.js',
+        output: {
+          filename: 'handlebars.js'
+        }
+      },
+      runtime: {
+        entry: './lib/handlebars.runtime.js',
+        output: {
+          filename: 'handlebars.runtime.js'
+        }
+      }
+    },
+
     requirejs: {
       options: {
-        optimize: "none",
-        baseUrl: "dist/amd/"
+        optimize: 'none',
+        baseUrl: 'dist/amd/'
       },
       dist: {
         options: {
-          name: "handlebars",
-          out: "dist/handlebars.amd.js"
+          name: 'handlebars',
+          out: 'dist/handlebars.amd.js'
         }
       },
       runtime: {
         options: {
-          name: "handlebars.runtime",
-          out: "dist/handlebars.runtime.amd.js"
+          name: 'handlebars.runtime',
+          out: 'dist/handlebars.runtime.amd.js'
         }
       }
     },
@@ -172,30 +196,31 @@ module.exports = function(grunt) {
   });
 
   // Build a new version of the library
-  this.registerTask('build', "Builds a distributable version of the current project", [
+  this.registerTask('build', 'Builds a distributable version of the current project', [
+                    'eslint',
                     'parser',
                     'node',
-                    'globals',
-                    'jshint']);
+                    'globals']);
 
-  this.registerTask('amd', ['packager:amd', 'requirejs']);
-  this.registerTask('node', ['packager:cjs']);
-  this.registerTask('globals', ['packager:global']);
+  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', ['amd', 'jshint', 'uglify', 'copy:dist', 'copy:components', 'copy:cdnjs']);
+  this.registerTask('release', 'Build final packages', ['eslint', 'amd', 'uglify', 'copy:dist', 'copy:components', 'copy:cdnjs']);
 
   // Load tasks from npm
   grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-contrib-concat');
   grunt.loadNpmTasks('grunt-contrib-connect');
   grunt.loadNpmTasks('grunt-contrib-copy');
   grunt.loadNpmTasks('grunt-contrib-requirejs');
-  grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-watch');
+  grunt.loadNpmTasks('grunt-babel');
+  grunt.loadNpmTasks('grunt-eslint');
   grunt.loadNpmTasks('grunt-saucelabs');
-  grunt.loadNpmTasks('es6-module-packager');
+  grunt.loadNpmTasks('grunt-webpack');
 
   grunt.task.loadTasks('tasks');