1.0 Spec Rewrite - Work in Progress

.travis.yml

@@ -15,9 +15,9 @@ env:
     - PARSER="babel"
 matrix:
   include:
-    - node_js: "0.10"
+    - node_js: "0.12"
       env: SAUCE_LABS=true PARSER="traceur"
-    - node_js: "0.10"
+    - node_js: "0.12"
       env: SAUCE_LABS=true PARSER="babel"
 #    - node_js: "0.10"
 #      env: SAUCE_LABS=true PARSER="traceur" OPTIONS="--ie8"

Gruntfile.js

@@ -21,47 +21,28 @@ 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/loader.js',
+            'src/dynamic-only.js',
+            'src/transpiler.js',
+            'src/url.js',
+            'src/system.js',
+            'src/module-tag.js',
             'src/polyfill-wrapper-end.js'
           ],
-          'dist/<%= pkg.name %>-sans-promises.src.js': [
+          'dist/<%= pkg.name %>-dev.src.js': [
             'src/polyfill-wrapper-start.js',
-            'dist/<%= pkg.name %>.js',
+            'src/loader.js',
+            'src/declarative.js',
+            'src/transpiler.js',
+            'src/url.js',
+            'src/system.js',
+            'src/module-tag.js',
             'src/polyfill-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',
@@ -71,27 +52,21 @@ module.exports = function (grunt) {
         sourceMap: true
       },
       dist: {
-        options: {
-          banner: '<%= meta.banner %>\n'
-        },
         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'
+      distDev: {
+        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.loadNpmTasks('grunt-contrib-uglify');
 
   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']);
 };

demo/index.html

@@ -48,7 +48,7 @@ <h1>Module Loader Polyfill</h1>
   <script src="../node_modules/traceur/bin/traceur.js"></script>
   <script src="../dist/es6-module-loader.js"></script>
   <script type="module">
-    import { hello } from 'test1';
+    import { hello } from './test1.js';
     console.log(hello); // -> world
 
     // es6 syntax
@@ -59,7 +59,7 @@ <h1>Module Loader Polyfill</h1>
   <script>
     function buttonClick() {
       // dynamic loading API
-      System.import('test2').then(function(module) {
+      System.import('./test2.js').then(function(module) {
         new module.Foo();
       });
     }