Merge pull request #74 from caridy/es6

solves #67: massive refactor to use ES6 modules under the hood

Author: andyearnshaw

.gitignore

@@ -12,3 +12,6 @@ cldr/
 
 # NPM packages installed locally
 node_modules
+
+lib/
+tmp/

.npmignore

@@ -14,3 +14,9 @@ cldr/
 # (It doesn't need anything used during development of this library.)
 tools/
 tests/
+
+coverage/
+tasks/
+tmp/
+.travis.yml
+Gruntfile.js

CONTRIBUTING.md

@@ -12,14 +12,28 @@ To run the unit tests:
 
     npm test
 
-To build files:
+To build files in `dist/` and `lib/`:
 
-    npm run build
+    grunt
+
+To build files in `locale-data/` based on CLDR:
+
+    grunt cldr
+
+
+Source Code
+-----------
+
+All the source code is in `src/` folder, written as ES6 modules, and transpiled
+using `es6-module-transpiler` into the `lib/` and `dist/` folders.
+
+The `dist/` is in git because of bower, make sure you commit those files as well.
 
 Release checklist
 -----------------
 
-* build all files using `npm run build`
+* build all files using `grunt`
+* run all tests using `npm test`
 * verify that [README.md] is updated
 * bump the version in [package.json]
 * commit to master

Gruntfile.js

@@ -2,31 +2,69 @@ module.exports = function (grunt) {
 
     grunt.initConfig({
         pkg: grunt.file.readJSON('package.json'),
+
+        clean: {
+            dist: 'dist/',
+            lib : 'lib/',
+            tmp : 'tmp/'
+        },
+
+        copy: {
+            tmp: {
+                expand : true,
+                flatten: true,
+                src    : ['tmp/src/*.js'],
+                dest   : 'lib/'
+            }
+        },
+
+        concat: {
+            complete: {
+                src: ['dist/Intl.min.js', 'locale-data/complete.js'],
+                dest: 'dist/Intl.complete.js',
+            }
+        },
+
         jshint: {
-            all: ['Intl.js']
+            all: ['index.js', 'src/*.js', '*.json']
         },
+
+        bundle_jsnext: {
+            dest: 'dist/Intl.js',
+            options: {
+                namespace: 'IntlPolyfill'
+            }
+        },
+
+        cjs_jsnext: {
+            dest: 'tmp/'
+        },
+
         uglify: {
             options: {
                 preserveComments: 'some'
             },
             build: {
                 files: {
-                    'Intl.min.js': ['Intl.js']
+                    'dist/Intl.min.js': ['dist/Intl.js']
                 }
             }
         }
-
     });
 
     grunt.loadTasks('./tasks');
+    grunt.loadNpmTasks('grunt-contrib-clean');
+    grunt.loadNpmTasks('grunt-contrib-copy');
+    grunt.loadNpmTasks('grunt-contrib-concat');
     grunt.loadNpmTasks('grunt-contrib-jshint');
     grunt.loadNpmTasks('grunt-contrib-uglify');
+    grunt.loadNpmTasks('grunt-bundle-jsnext-lib');
 
-    grunt.registerTask('default', function () {
-        grunt.task.run('jshint');
-        grunt.task.run('uglify');
+    grunt.registerTask('build', [
+        'bundle_jsnext', 'uglify', 'cjs_jsnext', 'copy', 'concat'
+    ]);
 
-        if (grunt.option('complete'))
-            grunt.task.run('compile-data');
-    });
+    grunt.registerTask('cldr', ['compile-data']);
+
+    grunt.registerTask('default', ['jshint', 'clean', 'build']);
 };