@cara/porter
Advanced tools
Comparing version 4.0.0-beta.12 to 4.0.0-beta.13
@@ -250,3 +250,4 @@ /* eslint-env browser */ | ||
var isRootEntry = registry[id].parent.id in system.entries; | ||
var mod = registry[id]; | ||
var isRootEntry = !mod.parent || (mod.parent.id in system.entries); | ||
var obj = parseId(id); | ||
@@ -528,6 +529,5 @@ var name = obj.name; | ||
var mod = registry[id] || new Module(id); | ||
mod.deps = deps; | ||
mod.factory = factory; | ||
mod.status = MODULE_FETCHED; | ||
if (mod.status < MODULE_FETCHED) mod.status = MODULE_FETCHED; | ||
mod.resolve(); | ||
@@ -557,3 +557,3 @@ } | ||
return function(id) { | ||
var url = basePath + resolve(context, suffix(id)); | ||
var url = parseUri(resolve(context, suffix(id))); | ||
return function createWorker() { | ||
@@ -560,0 +560,0 @@ return new Worker([url, 'main'].join(url.indexOf('?') > 0 ? '&' : '?')); |
{ | ||
"name": "@cara/porter", | ||
"description": "A middleware for web modules", | ||
"version": "4.0.0-beta.12", | ||
"version": "4.0.0-beta.13", | ||
"main": "src/porter.js", | ||
@@ -43,3 +43,3 @@ "repository": { | ||
"license": "BSD-3-Clause", | ||
"gitHead": "352e6cafca7441bbbc71796aa5f7c2056bed5b14" | ||
"gitHead": "1fa6682e4e002f4f1f20ccb5b3a08d178175e246" | ||
} |
@@ -567,4 +567,4 @@ 'use strict'; | ||
for (const mod of Object.values(this.entries)) { | ||
if (mod.isRootEntry) entries.push(mod.file); | ||
for (const mod of Object.values(this.files)) { | ||
if (mod.isRootEntry || mod.file.endsWith('.wasm')) entries.push(mod.file); | ||
} | ||
@@ -611,2 +611,8 @@ | ||
for (const file in files) { | ||
if (file.endsWith('.wasm')) { | ||
bundles[file] = await this.compile(file, opts); | ||
} | ||
} | ||
for (const entry in entries) { | ||
@@ -618,8 +624,2 @@ if (entry.endsWith('.js') && entries[entry].isRootEntry) { | ||
for (const file in files) { | ||
if (file.endsWith('.wasm')) { | ||
bundles[file] = await this.compile(file, opts); | ||
} | ||
} | ||
bundles[main] = await this.compile([], opts); | ||
@@ -626,0 +626,0 @@ } |
117292
3080