Merge pull request #20 from vegarringdal/new_loader

fix(hmr-css), needs fusebox 1.3.123-preview.11 ++

Author: vegarringdal

dist/commonjs/fuse-box-aurelia-hmr-plugin.d.ts

@@ -3,6 +3,7 @@ export declare class FuseBoxAureliaHmrPlugin {
     private context;
     private reloadPageOnly;
     private timer;
+    private loader;
     constructor(loader: FuseBoxAureliaLoader, reloadPageOnly: boolean);
-    hmrUpdate(data: any): Promise<boolean>;
+    hmrUpdate(data: any): boolean;
 }

dist/commonjs/fuse-box-aurelia-hmr-plugin.js

@@ -1,81 +1,46 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t;
-    return { next: verb(0), "throw": verb(1), "return": verb(2) };
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = y[op[0] & 2 ? "return" : op[0] ? "throw" : "next"]) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [0, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 var FuseBoxAureliaHmrPlugin = (function () {
     function FuseBoxAureliaHmrPlugin(loader, reloadPageOnly) {
         if (!reloadPageOnly) {
             var HmrContext = require('aurelia-hot-module-reload').HmrContext;
             this.context = new HmrContext(loader);
+            this.loader = loader;
         }
         this.reloadPageOnly = reloadPageOnly;
     }
     FuseBoxAureliaHmrPlugin.prototype.hmrUpdate = function (data) {
-        return __awaiter(this, void 0, void 0, function () {
-            var moduleId;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!this.reloadPageOnly) return [3 /*break*/, 1];
-                        clearTimeout(this.timer);
-                        this.timer = setTimeout(function () {
-                            document.location.reload();
-                        }, 250);
-                        return [3 /*break*/, 5];
-                    case 1:
-                        if (!(data.type === 'js')) return [3 /*break*/, 5];
-                        FuseBox.flush();
-                        FuseBox.dynamic(data.path, data.content);
-                        if (FuseBox.mainFile) {
-                            FuseBox.import(FuseBox.mainFile);
-                        }
-                        if (!(data.path.indexOf('.html') >= 0)) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.context.handleViewChange(data.path)];
-                    case 2:
-                        _a.sent();
-                        return [2 /*return*/, true];
-                    case 3:
-                        moduleId = data.path.substr(0, data.path.length - 3);
-                        return [4 /*yield*/, this.context.handleModuleChange(moduleId, {})];
-                    case 4:
-                        _a.sent();
-                        return [2 /*return*/, true];
-                    case 5: return [2 /*return*/, false];
+        if (this.reloadPageOnly) {
+            clearTimeout(this.timer);
+            this.timer = setTimeout(function () {
+                document.location.reload();
+            }, 250);
+        }
+        else {
+            if (data.type === 'js') {
+                FuseBox.flush();
+                FuseBox.dynamic(data.path, data.content);
+                if (FuseBox.mainFile) {
+                    FuseBox.import(FuseBox.mainFile);
+                }
+                if (data.path.indexOf('.html') >= 0) {
+                    this.context.handleViewChange(data.path);
+                    return true;
                 }
-            });
-        });
+                else {
+                    if (data.path.indexOf('.css') >= 0) {
+                        this.loader.moduleRegistry[data.path] = true;
+                        this.context.reloadCss(data.path);
+                        return true;
+                    }
+                    else {
+                        var moduleId = data.path.substr(0, data.path.length - 3);
+                        this.context.handleModuleChange(moduleId, {});
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
     };
     return FuseBoxAureliaHmrPlugin;
 }());

src/fuse-box-aurelia-hmr-plugin.ts

@@ -7,16 +7,18 @@ export class FuseBoxAureliaHmrPlugin {
     private context: any;
     private reloadPageOnly: boolean;
     private timer: number;
+    private loader: any;
     constructor(loader: FuseBoxAureliaLoader, reloadPageOnly: boolean) {
         if (!reloadPageOnly) {
             // no need to have this if they are using the reload only
             let HmrContext = require('aurelia-hot-module-reload').HmrContext;
             this.context = new HmrContext(loader);
+            this.loader = loader;
         }
         this.reloadPageOnly = reloadPageOnly;
     }
 
-    public async hmrUpdate(data: any): Promise<boolean> {
+    public hmrUpdate(data: any): boolean {
 
         if (this.reloadPageOnly) {
 
@@ -39,12 +41,18 @@ export class FuseBoxAureliaHmrPlugin {
 
                 // call Aurelia HMR module
                 if (data.path.indexOf('.html') >= 0) {
-                    await this.context.handleViewChange(data.path);
+                    this.context.handleViewChange(data.path); // <- returns promise...
                     return true;
                 } else {
-                    let moduleId = data.path.substr(0, data.path.length - 3); // remove .js
-                    await this.context.handleModuleChange(moduleId, {});
-                    return true;
+                    if (data.path.indexOf('.css') >= 0) {
+                        this.loader.moduleRegistry[data.path] = true; // need to have this module without css-resouses!
+                        this.context.reloadCss(data.path);
+                        return true;
+                    } else {
+                        let moduleId = data.path.substr(0, data.path.length - 3); // remove .js
+                        this.context.handleModuleChange(moduleId, {}); // <- returns promise...
+                        return true;
+                    }
                 }
             }
         }