feat(webpack): webpack bundler exceptions fixed

socketstream · Feb 11, 2015 · f7ed22a · f7ed22a
1 parent c5adac7
commit f7ed22a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/lib/client/bundler/webpack.js b/lib/client/bundler/webpack.js
@@ -17,7 +17,7 @@ module.exports = function(webpack) {
 
         html: assetHTML,
         loader: assetLoader,
-        includeSystemModule: includeSystemModule,
+        systemModule: systemModule,
         js: assetJS,
         worker: assetWorker,
         start: assetStart,
@@ -89,7 +89,7 @@ module.exports = function(webpack) {
      * @param cb
      */
     function assetLoader() {
-      return { type: 'loader', content: ';/* loader */' };
+      return { type: 'loader', names: [], content: ';/* loader */' };
     }
 
     /**
@@ -129,9 +129,9 @@ module.exports = function(webpack) {
      * @param cb
      * @returns {*}
      */
-    function assetStart(cb) {
+    function assetStart() {
       var output = ss.bundler.startCode(bundler.client);
-      return cb(output);
+      return output;
     }
 
     /**

diff --git a/lib/client/serve/dev.js b/lib/client/serve/dev.js
@@ -55,9 +55,8 @@ module.exports = function (ss, router, options) {
     var thisUrl = url.parse(request.url),
       params = qs.parse(thisUrl.query);
 
-    ss.bundler.get(params).asset.launch(function(output) {
-      return utils.serve.js(output, response);
-    });
+    var start = ss.bundler.get(params).asset.start() || {};
+    return utils.serve.js(start.content || '', response);
   });
 
   // CSS