Skip to content

Commit b2ba3f7

Browse files
vegarringdalvegarringdal
committed
chore(all): new build
1 parent f234892 commit b2ba3f7

File tree

4 files changed

+39
-99
lines changed

4 files changed

+39
-99
lines changed

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

Lines changed: 0 additions & 9 deletions
This file was deleted.

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

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎dist/commonjs/fuse-box-aurelia-loader.js‎

Lines changed: 38 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
1717
});
1818
};
1919
var __generator = (this && this.__generator) || function (thisArg, body) {
20-
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t;
21-
return { next: verb(0), "throw": verb(1), "return": verb(2) };
20+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
21+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
2222
function verb(n) { return function (v) { return step([n, v]); }; }
2323
function step(op) {
2424
if (f) throw new TypeError("Generator is already executing.");
@@ -48,9 +48,6 @@ var aurelia_metadata_1 = require("aurelia-metadata");
4848
var aurelia_loader_1 = require("aurelia-loader");
4949
var aurelia_pal_1 = require("aurelia-pal");
5050
var aurelia_logging_1 = require("aurelia-logging");
51-
var aurelia_dependency_injection_1 = require("aurelia-dependency-injection");
52-
var aurelia_framework_1 = require("aurelia-framework");
53-
var fuse_box_aurelia_hmr_plugin_1 = require("./fuse-box-aurelia-hmr-plugin");
5451
var log = aurelia_logging_1.getLogger('fuse-box-aurelia-loader');
5552
var TextTemplateLoader = (function () {
5653
function TextTemplateLoader() {
@@ -60,11 +57,11 @@ var TextTemplateLoader = (function () {
6057
var text;
6158
return __generator(this, function (_a) {
6259
switch (_a.label) {
63-
case 0: return [4 /*yield*/, loader.loadText(entry.address)];
60+
case 0: return [4, loader.loadText(entry.address)];
6461
case 1:
6562
text = _a.sent();
6663
entry.template = aurelia_pal_1.DOM.createTemplateFromMarkup(text);
67-
return [2 /*return*/];
64+
return [2];
6865
}
6966
});
7067
});
@@ -126,12 +123,12 @@ var FuseBoxAureliaLoader = (function (_super) {
126123
case 0:
127124
debugPrint('info', 'template-registry-entry- fetch =>', address);
128125
entry = this.getOrCreateTemplateRegistryEntry(address);
129-
if (!!entry.templateIsLoaded) return [3 /*break*/, 2];
130-
return [4 /*yield*/, this.templateLoader.loadTemplate(this, entry)];
126+
if (!!entry.templateIsLoaded) return [3, 2];
127+
return [4, this.templateLoader.loadTemplate(this, entry)];
131128
case 1:
132129
_a.sent();
133130
_a.label = 2;
134-
case 2: return [2 /*return*/, entry];
131+
case 2: return [2, entry];
135132
}
136133
});
137134
}); }
@@ -173,20 +170,20 @@ var FuseBoxAureliaLoader = (function (_super) {
173170
debugPrint('info', 'loadModule => ', moduleId);
174171
existing = this.moduleRegistry[moduleId];
175172
if (existing) {
176-
return [2 /*return*/, existing];
173+
return [2, existing];
177174
}
178175
beingLoaded = this.modulesBeingLoaded.get(moduleId);
179176
if (beingLoaded) {
180-
return [2 /*return*/, beingLoaded];
177+
return [2, beingLoaded];
181178
}
182179
beingLoaded = this._import(moduleId);
183180
this.modulesBeingLoaded.set(moduleId, beingLoaded);
184-
return [4 /*yield*/, beingLoaded];
181+
return [4, beingLoaded];
185182
case 1:
186183
moduleExports = _a.sent();
187184
this.moduleRegistry[moduleId] = ensureOriginOnExports(moduleExports, moduleId);
188185
this.modulesBeingLoaded.delete(moduleId);
189-
return [2 /*return*/, moduleExports];
186+
return [2, moduleExports];
190187
}
191188
});
192189
});
@@ -202,25 +199,39 @@ var FuseBoxAureliaLoader = (function (_super) {
202199
;
203200
FuseBoxAureliaLoader.prototype._import = function (address) {
204201
return __awaiter(this, void 0, void 0, function () {
205-
var addressParts, moduleId, loaderPlugin, plugin, module;
202+
var addressParts, moduleId, loaderPlugin, plugin, err_1, modulePath, module;
206203
return __generator(this, function (_a) {
207204
switch (_a.label) {
208205
case 0:
209206
addressParts = address.split('!');
210207
moduleId = addressParts.splice(addressParts.length - 1, 1)[0];
211208
loaderPlugin = addressParts.length === 1 ? addressParts[0] : null;
212-
if (!loaderPlugin) return [3 /*break*/, 2];
209+
_a.label = 1;
210+
case 1:
211+
_a.trys.push([1, 4, , 5]);
212+
if (!loaderPlugin) return [3, 3];
213213
plugin = this.loaderPlugins[loaderPlugin];
214214
if (!plugin) {
215215
throw new Error("Plugin " + loaderPlugin + " is not registered in the loader.");
216216
}
217-
return [4 /*yield*/, plugin.fetch(moduleId)];
218-
case 1: return [2 /*return*/, _a.sent()];
219-
case 2:
220-
module = this.loadWithFusebox(this.findFuseBoxPath(moduleId));
221-
module = ensureOriginOnExports(module, moduleId);
222-
this.moduleRegistry[moduleId] = module;
223-
return [2 /*return*/, Promise.resolve(module)];
217+
return [4, plugin.fetch(moduleId)];
218+
case 2: return [2, _a.sent()];
219+
case 3: return [3, 5];
220+
case 4:
221+
err_1 = _a.sent();
222+
throw new Error("\n Fusebox-loader _import() telling this not registered in the loader:" + address + ", module id was: " + moduleId + "\n Did you forget to add it to bundle?\n\n " + err_1 + "\n ");
223+
case 5:
224+
modulePath = this.findFuseBoxPath(moduleId);
225+
try {
226+
module = this.loadWithFusebox(modulePath);
227+
module = ensureOriginOnExports(module, moduleId);
228+
this.moduleRegistry[moduleId] = module;
229+
return [2, Promise.resolve(module)];
230+
}
231+
catch (err) {
232+
throw new Error("\n Fusebox-loader _import() telling this not registered in the loader:" + address + ", module path returned: " + modulePath + "\n Did you forget to add it to bundle?\n\n " + err + "\n ");
233+
}
234+
return [2];
224235
}
225236
});
226237
});
@@ -265,7 +276,8 @@ var FuseBoxAureliaLoader = (function (_super) {
265276
retunValue = moduleId + "/" + entry;
266277
}
267278
if (!this.fuseBoxExist(retunValue)) {
268-
debugPrint('error', 'findFuseBoxPath() failed to find', arguments);
279+
debugPrint('error', 'findFuseBoxPath() failed to find', path);
280+
throw new Error("\n fusebox-loader - findFuseBoxPath() failed to find:" + path + "\n Did you forget to add it to bundle??\n\n ");
269281
}
270282
}
271283
break;
@@ -278,7 +290,8 @@ var FuseBoxAureliaLoader = (function (_super) {
278290
retunValue = '~/' + path;
279291
break;
280292
default:
281-
debugPrint('error', 'findFuseBoxPath() failed to find', arguments);
293+
debugPrint('error', 'findFuseBoxPath() failed to find', path);
294+
throw new Error("\n fusebox-loader - findFuseBoxPath() failed to find:" + path + "\n Did you forget to add it to bundle??\n\n ");
282295
}
283296
}
284297
return retunValue;
@@ -287,20 +300,3 @@ var FuseBoxAureliaLoader = (function (_super) {
287300
}(aurelia_loader_1.Loader));
288301
exports.FuseBoxAureliaLoader = FuseBoxAureliaLoader;
289302
aurelia_pal_1.PLATFORM.Loader = FuseBoxAureliaLoader;
290-
document.addEventListener('aurelia-started', function () {
291-
var env;
292-
try {
293-
env = FuseBox.import('process').env;
294-
}
295-
catch (e) {
296-
env = {};
297-
console.log(e);
298-
}
299-
var hmr = env.FB_AU_HMR || window.FUSEBOX_AURELIA_LOADER_HMR;
300-
var reload = env.FB_AU_RELOAD || window.FUSEBOX_AURELIA_LOADER_RELOAD;
301-
if (hmr || reload) {
302-
var container = aurelia_dependency_injection_1.Container.instance;
303-
var aurelia = container.get(aurelia_framework_1.Aurelia);
304-
FuseBox.plugins.push(new fuse_box_aurelia_hmr_plugin_1.FuseBoxAureliaHmrPlugin(aurelia.loader, reload));
305-
}
306-
});

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fuse-box-aurelia-loader",
3-
"version": "2.0.2",
3+
"version": "2.0.0",
44
"description": "Fuse-Box loader for Aurelia framework",
55
"keywords": [
66
"aurelia",

0 commit comments

Comments
 (0)