Merge pull request #346 from ModuleLoader/0.17

0.17 wip

Author: guybedford

.agignore

@@ -0,0 +1 @@
+dist/

Gruntfile.js

@@ -21,47 +21,30 @@ module.exports = function (grunt) {
       dist: {
         files: {
           'dist/<%= pkg.name %>.src.js': [
-            'node_modules/when/es6-shim/Promise.js',
-            'src/polyfill-wrapper-start.js',
-            'dist/<%= pkg.name %>.js',
-            'src/polyfill-wrapper-end.js'
+            'src/wrapper-start.js',
+            'src/loader.js',
+            'src/dynamic-only.js',
+            'src/url-polyfill.js',
+            'src/system.js',
+            'src/system-resolve.js',
+            'src/system-fetch.js',
+            'src/wrapper-end.js'
           ],
-          'dist/<%= pkg.name %>-sans-promises.src.js': [
-            'src/polyfill-wrapper-start.js',
-            'dist/<%= pkg.name %>.js',
-            'src/polyfill-wrapper-end.js'
+          'dist/<%= pkg.name %>-dev.src.js': [
+            'src/wrapper-start.js',
+            'src/loader.js',
+            'src/declarative.js',
+            'src/transpiler.js',
+            'src/url-polyfill.js',
+            'src/system.js',
+            'src/system-resolve.js',
+            'src/system-fetch.js',
+            'src/module-tag.js',
+            'src/wrapper-end.js'
           ]
         }
       }
     },
-    esnext: {
-      dist: {
-        src: [
-          'src/loader.js',
-          'src/transpiler.js',
-          'src/system.js'
-        ],
-        dest: 'dist/<%= pkg.name %>.js'
-      }
-    },
-    'string-replace': {
-      dist: {
-        files: {
-          'dist/<%= pkg.name %>.js': 'dist/<%= pkg.name %>.js'
-        },
-        options: {
-          replacements:[{
-            pattern: 'var $__Object$getPrototypeOf = Object.getPrototypeOf;\n' +
-              'var $__Object$defineProperty = Object.defineProperty;\n' +
-              'var $__Object$create = Object.create;',
-            replacement: ''
-          }, {
-            pattern: '$__Object$getPrototypeOf(SystemLoader.prototype).constructor',
-            replacement: '$__super'
-          }]
-        }
-      }
-    },
     uglify: {
       options: {
         banner: '<%= meta.banner %>\n',
@@ -77,21 +60,21 @@ module.exports = function (grunt) {
         src: 'dist/<%= pkg.name %>.src.js',
         dest: 'dist/<%= pkg.name %>.js'
       },
-      distSansPromises: {
-        src: 'dist/<%= pkg.name %>-sans-promises.src.js',
-        dest: 'dist/<%= pkg.name %>-sans-promises.js'
+      devDist: {
+        options: {
+          banner: '<%= meta.banner %>\n'
+        },
+        src: 'dist/<%= pkg.name %>-dev.src.js',
+        dest: 'dist/<%= pkg.name %>-dev.js'
       }
     }
   });
 
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-contrib-uglify');
-  grunt.loadNpmTasks('grunt-esnext');
   grunt.loadNpmTasks('grunt-contrib-concat');
-  grunt.loadNpmTasks('grunt-string-replace');
 
   grunt.registerTask('lint', ['jshint']);
-  grunt.registerTask('compile', ['esnext', 'string-replace', 'concat']);
-  grunt.registerTask('default', [/*'jshint', */'esnext', 'string-replace', 
-                     'concat', 'uglify']);
+  grunt.registerTask('compile', ['concat']);
+  grunt.registerTask('default', [/*'jshint', */'concat', 'uglify']);
 };

README.md

@@ -4,7 +4,7 @@ _For upgrading to ES6 Module Loader 0.16, [read the release notes here](https://
 
 Dynamically loads ES6 modules in browsers and [NodeJS](#nodejs-use) with support for loading existing and custom module formats through loader hooks.
 
-This project implements dynamic module loading through `System` exactly to the previous ES6-specified loader API at [2014-08-24 ES6 Specification Draft Rev 27, Section 15](http://wiki.ecmascript.org/doku.php?id=harmony:specification_drafts#august_24_2014_draft_rev_27) and is being converted to track the newly redrafted specification at https://github.com/whatwg/loader (work in progress at https://github.com/ModuleLoader/es6-module-loader/tree/1.0).
+This project implements dynamic module loading through `System` exactly to the previous ES6-specified loader API at [2014-08-24 ES6 Specification Draft Rev 27, Section 15](http://wiki.ecmascript.org/doku.php?id=harmony:specification_drafts#august_24_2014_draft_rev_27). The new loader implementing the [WhatWG loader spec](https://github.com/whatwg/loader) is pending alpha release on the [1.0 branch](https://github.com/ModuleLoader/es6-module-loader/tree/1.0).
 
 * Provides an asynchronous loader (`System.import`) to [dynamically load ES6 modules](#getting-started).
 * Supports both [Traceur](https://github.com/google/traceur-compiler) and [Babel](http://babeljs.io/) for compiling ES6 modules and syntax into ES5 in the browser with source map support.

index.js

@@ -1,16 +1,20 @@
-var System = require('./dist/es6-module-loader.src');
+if (typeof Promise === 'undefined')
+  require('when/es6-shim/Promise');
+
+var System = require('./dist/es6-module-loader-dev.src');
+
+var filePrefix = 'file:' + (process.platform.match(/^win/) ? '/' : '') + '//';
 
-System.transpiler = 'traceur';
 try {
-  System.paths.traceur = 'file:' + require.resolve('traceur/bin/traceur.js');
+  System.paths.traceur = filePrefix + require.resolve('traceur/bin/traceur.js');
 }
 catch(e) {}
 try {
-  System.paths.babel = 'file:' + require.resolve('babel-core/browser.js');
+  System.paths.babel = filePrefix + require.resolve('babel-core/browser.js');
 }
 catch(e) {}
 try {
-  System.paths.babel = System.paths.babel || 'file:' + require.resolve('babel/browser.js');
+  System.paths.babel = System.paths.babel || filePrefix + require.resolve('babel/browser.js');
 }
 catch(e) {}
 

karma.conf.js

@@ -39,7 +39,8 @@ module.exports = function(config) {
 
     [!options.ie8 ? (!options['babel'] ? 'node_modules/traceur/bin/traceur.js' : 'node_modules/babel-core/browser.js') : ''],
 
-    'dist/es6-module-loader' + (options.polyfill ? '' : '-sans-promises') + '.src.js',
+    [options.polyfill ? 'node_modules/when/es6-shim/Promise' : ''],
+    'dist/es6-module-loader-dev.src.js',
 
     'test/_browser.js',
     'test/browser-script-type-module.js',

package.json

@@ -29,8 +29,6 @@
     "grunt-contrib-concat": "^0.5.0",
     "grunt-contrib-jshint": "~0.6.0",
     "grunt-contrib-uglify": "~0.6.0",
-    "grunt-esnext": "0.0.3",
-    "grunt-string-replace": "^0.2.7",
     "karma": "^0.12.28",
     "karma-benchmark": "^0.4.0",
     "karma-benchmark-reporter": "^0.1.1",