upgrade to new plugin format

css.js

@@ -23,33 +23,34 @@ var webkitLoadCheck = function(link, callback) {
 
 var noop = function() {}
 
-var loadCSS = function(url, callback, errback) {
-  var timeout = setTimeout(function() {
-    errback('Unable to load CSS');
-  }, waitSeconds * 1000);
-  var _callback = function() {
-    clearTimeout(timeout);
-    link.onload = noop;
-    setTimeout(callback, 7);
-  }
-  var link = document.createElement('link')  ;
-  link.type = 'text/css';
-  link.rel = 'stylesheet';
-  link.href = url;
-
-  if (!isWebkit)
-    link.onload = _callback;
-  else
-    webkitLoadCheck(link, _callback);
-
-  head.appendChild(link);
+var loadCSS = function(url) {
+  return new Promise(function(resolve, reject) {
+    var timeout = setTimeout(function() {
+      reject('Unable to load CSS');
+    }, waitSeconds * 1000);
+    var _callback = function() {
+      clearTimeout(timeout);
+      link.onload = noop;
+      setTimeout(resolve, 7);
+    }
+    var link = document.createElement('link')  ;
+    link.type = 'text/css';
+    link.rel = 'stylesheet';
+    link.href = url;
+
+    if (!isWebkit)
+      link.onload = _callback;
+    else
+      webkitLoadCheck(link, _callback);
+
+    head.appendChild(link);
+  });
 }
 
-
-module.exports = function(name, address, fetch, callback, errback) {
+exports.fetch = function(load) {
   // dont reload styles loaded in the head
   for (var i = 0; i < linkHrefs.length; i++)
-    if (address == linkHrefs[i])
+    if (load.address == linkHrefs[i])
       return callback();
-  loadCSS(address, callback, errback);
+  return loadCSS(load.address);
 }

test.css

@@ -0,0 +1,3 @@
+body {
+  background-color: red;
+}

test.html

@@ -0,0 +1,5 @@
+<script src="../es6-module-loader/dist/es6-module-loader.js"></script>
+<script src="../systemjs/dist/system.js"></script>
+<script>
+  System.import('test.css!');
+</script>