fix virtual module

dist/index.js

@@ -78,7 +78,7 @@ var bootstrap =
 /******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
 /******/
 /******/ 	// __webpack_public_path__
-/******/ 	__webpack_require__.p = "/boorstrap/1.0.4/";
+/******/ 	__webpack_require__.p = "/boorstrap/1.0.5/";
 /******/
 /******/
 /******/ 	// Load entry module and return exports
@@ -167,14 +167,14 @@ eval("/* WEBPACK VAR INJECTION */(function(global) {/*\n * Support for a \"trans
 
 /***/ }),
 
-/***/ "./node_modules/systemjs/dist/s.js":
+/***/ "./node_modules/systemjs/dist/system.js":
-/*!*****************************************!*\
+/*!**********************************************!*\
-  !*** ./node_modules/systemjs/dist/s.js ***!
+  !*** ./node_modules/systemjs/dist/system.js ***!
-  \*****************************************/
+  \**********************************************/
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-eval("/* WEBPACK VAR INJECTION */(function(global) {/*\n* SJS 6.2.2\n* Minimal SystemJS Build\n*/\n(function () {\n  const hasSelf = typeof self !== 'undefined';\n\n  const hasDocument = typeof document !== 'undefined';\n\n  const envGlobal = hasSelf ? self : global;\n\n  let baseUrl;\n\n  if (hasDocument) {\n    const baseEl = document.querySelector('base[href]');\n    if (baseEl)\n      baseUrl = baseEl.href;\n  }\n\n  if (!baseUrl && typeof location !== 'undefined') {\n    baseUrl = location.href.split('#')[0].split('?')[0];\n    const lastSepIndex = baseUrl.lastIndexOf('/');\n    if (lastSepIndex !== -1)\n      baseUrl = baseUrl.slice(0, lastSepIndex + 1);\n  }\n\n  const backslashRegEx = /\\\\/g;\n  function resolveIfNotPlainOrUrl (relUrl, parentUrl) {\n    if (relUrl.indexOf('\\\\') !== -1)\n      relUrl = relUrl.replace(backslashRegEx, '/');\n    // protocol-relative\n    if (relUrl[0] === '/' && relUrl[1] === '/') {\n      return parentUrl.slice(0, parentUrl.indexOf(':') + 1) + relUrl;\n    }\n    // relative-url\n    else if (relUrl[0] === '.' && (relUrl[1] === '/' || relUrl[1] === '.' && (relUrl[2] === '/' || relUrl.length === 2 && (relUrl += '/')) ||\n        relUrl.length === 1  && (relUrl += '/')) ||\n        relUrl[0] === '/') {\n      const parentProtocol = parentUrl.slice(0, parentUrl.indexOf(':') + 1);\n      // Disabled, but these cases will give inconsistent results for deep backtracking\n      //if (parentUrl[parentProtocol.length] !== '/')\n      //  throw Error('Cannot resolve');\n      // read pathname from parent URL\n      // pathname taken to be part after leading \"/\"\n      let pathname;\n      if (parentUrl[parentProtocol.length + 1] === '/') {\n        // resolving to a :// so we need to read out the auth and host\n        if (parentProtocol !== 'file:') {\n          pathname = parentUrl.slice(parentProtocol.length + 2);\n          pathname = pathname.slice(pathname.indexOf('/') + 1);\n        }\n        else {\n          pathname = parentUrl.slice(8);\n        }\n      }\n      else {\n        // resolving to :/ so pathname is the /... part\n        pathname = parentUrl.slice(parentProtocol.length + (parentUrl[parentProtocol.length] === '/'));\n      }\n\n      if (relUrl[0] === '/')\n        return parentUrl.slice(0, parentUrl.length - pathname.length - 1) + relUrl;\n\n      // join together and split for removal of .. and . segments\n      // looping the string instead of anything fancy for perf reasons\n      // '../../../../../z' resolved to 'x/y' is just 'z'\n      const segmented = pathname.slice(0, pathname.lastIndexOf('/') + 1) + relUrl;\n\n      const output = [];\n      let segmentIndex = -1;\n      for (let i = 0; i < segmented.length; i++) {\n        // busy reading a segment - only terminate on '/'\n        if (segmentIndex !== -1) {\n          if (segmented[i] === '/') {\n            output.push(segmented.slice(segmentIndex, i + 1));\n            segmentIndex = -1;\n          }\n        }\n\n        // new segment - check if it is relative\n        else if (segmented[i] === '.') {\n          // ../ segment\n          if (segmented[i + 1] === '.' && (segmented[i + 2] === '/' || i + 2 === segmented.length)) {\n            output.pop();\n            i += 2;\n          }\n          // ./ segment\n          else if (segmented[i + 1] === '/' || i + 1 === segmented.length) {\n            i += 1;\n          }\n          else {\n            // the start of a new segment as below\n            segmentIndex = i;\n          }\n        }\n        // it is the start of a new segment\n        else {\n          segmentIndex = i;\n        }\n      }\n      // finish reading out the last segment\n      if (segmentIndex !== -1)\n        output.push(segmented.slice(segmentIndex));\n      return parentUrl.slice(0, parentUrl.length - pathname.length) + output.join('');\n    }\n  }\n\n  /*\n   * Import maps implementation\n   *\n   * To make lookups fast we pre-resolve the entire import map\n   * and then match based on backtracked hash lookups\n   *\n   */\n\n  function resolveUrl (relUrl, parentUrl) {\n    return resolveIfNotPlainOrUrl(relUrl, parentUrl) || (relUrl.indexOf(':') !== -1 ? relUrl : resolveIfNotPlainOrUrl('./' + relUrl, parentUrl));\n  }\n\n  /*\n   * SystemJS Core\n   * \n   * Provides\n   * - System.import\n   * - System.register support for\n   *     live bindings, function hoisting through circular references,\n   *     reexports, dynamic import, import.meta.url, top-level await\n   * - System.getRegister to get the registration\n   * - Symbol.toStringTag support in Module objects\n   * - Hookable System.createContext to customize import.meta\n   * - System.onload(err, id, deps) handler for tracing / hot-reloading\n   * \n   * Core comes with no System.prototype.resolve or\n   * System.prototype.instantiate implementations\n   */\n\n  const hasSymbol = typeof Symbol !== 'undefined';\n  const toStringTag = hasSymbol && Symbol.toStringTag;\n  const REGISTRY = hasSymbo
Line truncated
+eval("/* WEBPACK VAR INJECTION */(function(global) {/*\n* SystemJS 6.2.2\n*/\n(function () {\n  const hasSelf = typeof self !== 'undefined';\n\n  const hasDocument = typeof document !== 'undefined';\n\n  const envGlobal = hasSelf ? self : global;\n\n  let baseUrl;\n\n  if (hasDocument) {\n    const baseEl = document.querySelector('base[href]');\n    if (baseEl)\n      baseUrl = baseEl.href;\n  }\n\n  if (!baseUrl && typeof location !== 'undefined') {\n    baseUrl = location.href.split('#')[0].split('?')[0];\n    const lastSepIndex = baseUrl.lastIndexOf('/');\n    if (lastSepIndex !== -1)\n      baseUrl = baseUrl.slice(0, lastSepIndex + 1);\n  }\n\n  const backslashRegEx = /\\\\/g;\n  function resolveIfNotPlainOrUrl (relUrl, parentUrl) {\n    if (relUrl.indexOf('\\\\') !== -1)\n      relUrl = relUrl.replace(backslashRegEx, '/');\n    // protocol-relative\n    if (relUrl[0] === '/' && relUrl[1] === '/') {\n      return parentUrl.slice(0, parentUrl.indexOf(':') + 1) + relUrl;\n    }\n    // relative-url\n    else if (relUrl[0] === '.' && (relUrl[1] === '/' || relUrl[1] === '.' && (relUrl[2] === '/' || relUrl.length === 2 && (relUrl += '/')) ||\n        relUrl.length === 1  && (relUrl += '/')) ||\n        relUrl[0] === '/') {\n      const parentProtocol = parentUrl.slice(0, parentUrl.indexOf(':') + 1);\n      // Disabled, but these cases will give inconsistent results for deep backtracking\n      //if (parentUrl[parentProtocol.length] !== '/')\n      //  throw Error('Cannot resolve');\n      // read pathname from parent URL\n      // pathname taken to be part after leading \"/\"\n      let pathname;\n      if (parentUrl[parentProtocol.length + 1] === '/') {\n        // resolving to a :// so we need to read out the auth and host\n        if (parentProtocol !== 'file:') {\n          pathname = parentUrl.slice(parentProtocol.length + 2);\n          pathname = pathname.slice(pathname.indexOf('/') + 1);\n        }\n        else {\n          pathname = parentUrl.slice(8);\n        }\n      }\n      else {\n        // resolving to :/ so pathname is the /... part\n        pathname = parentUrl.slice(parentProtocol.length + (parentUrl[parentProtocol.length] === '/'));\n      }\n\n      if (relUrl[0] === '/')\n        return parentUrl.slice(0, parentUrl.length - pathname.length - 1) + relUrl;\n\n      // join together and split for removal of .. and . segments\n      // looping the string instead of anything fancy for perf reasons\n      // '../../../../../z' resolved to 'x/y' is just 'z'\n      const segmented = pathname.slice(0, pathname.lastIndexOf('/') + 1) + relUrl;\n\n      const output = [];\n      let segmentIndex = -1;\n      for (let i = 0; i < segmented.length; i++) {\n        // busy reading a segment - only terminate on '/'\n        if (segmentIndex !== -1) {\n          if (segmented[i] === '/') {\n            output.push(segmented.slice(segmentIndex, i + 1));\n            segmentIndex = -1;\n          }\n        }\n\n        // new segment - check if it is relative\n        else if (segmented[i] === '.') {\n          // ../ segment\n          if (segmented[i + 1] === '.' && (segmented[i + 2] === '/' || i + 2 === segmented.length)) {\n            output.pop();\n            i += 2;\n          }\n          // ./ segment\n          else if (segmented[i + 1] === '/' || i + 1 === segmented.length) {\n            i += 1;\n          }\n          else {\n            // the start of a new segment as below\n            segmentIndex = i;\n          }\n        }\n        // it is the start of a new segment\n        else {\n          segmentIndex = i;\n        }\n      }\n      // finish reading out the last segment\n      if (segmentIndex !== -1)\n        output.push(segmented.slice(segmentIndex));\n      return parentUrl.slice(0, parentUrl.length - pathname.length) + output.join('');\n    }\n  }\n\n  /*\n   * Import maps implementation\n   *\n   * To make lookups fast we pre-resolve the entire import map\n   * and then match based on backtracked hash lookups\n   *\n   */\n\n  function resolveUrl (relUrl, parentUrl) {\n    return resolveIfNotPlainOrUrl(relUrl, parentUrl) || (relUrl.indexOf(':') !== -1 ? relUrl : resolveIfNotPlainOrUrl('./' + relUrl, parentUrl));\n  }\n\n  function objectAssign (to, from) {\n    for (let p in from)\n      to[p] = from[p];\n    return to;\n  }\n\n  function resolveAndComposePackages (packages, outPackages, baseUrl, parentMap, parentUrl) {\n    for (let p in packages) {\n      const resolvedLhs = resolveIfNotPlainOrUrl(p, baseUrl) || p;\n      const rhs = packages[p];\n      // package fallbacks not currently supported\n      if (typeof rhs !== 'string')\n        continue;\n      const mapped = resolveImportMap(parentMap, resolveIfNotPlainOrUrl(rhs, baseUrl) || rhs, parentUrl);\n      if (!mapped)\n        targetWarning(p, rhs, 'bare specifier did not resolve');\n      else\n        outPackages[resolvedLhs] = mapped;\n    }\n  }\n\n  function resolveAndComposeImportMap (json, baseUrl, pare
Line truncated
 
 /***/ }),
 
@@ -245,7 +245,7 @@ eval("\nObject.defineProperty(exports, \"__esModule\", { value: true });\nclass
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-eval("\nvar __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }\n    return new (P || (P = Promise))(function (resolve, reject) {\n        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n        function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\n        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }\n        step((generator = generator.apply(thisArg, _arguments || [])).next());\n    });\n};\nObject.defineProperty(exports, \"__esModule\", { value: true });\n__webpack_require__(/*! systemjs/dist/s */ \"./node_modules/systemjs/dist/s.js\");\n__webpack_require__(/*! systemjs/dist/extras/amd */ \"./node_modules/systemjs/dist/extras/amd.js\");\n__webpack_require__(/*! systemjs/dist/extras/named-register */ \"./node_modules/systemjs/dist/extras/named-register.js\");\n__webpack_require__(/*! systemjs/dist/extras/named-exports */ \"./node_modules/systemjs/dist/extras/named-exports.js\");\n__webpack_require__(/*! systemjs/dist/extras/transform */ \"./node_modules/systemjs/dist/extras/transform.js\");\nconst history_1 = __webpack_require__(/*! history */ \"./node_modules/history/esm/history.js\");\nconst apps_1 = __webpack_require__(/*! ./apps */ \"./src/apps.ts\");\nconst virtual_module_1 = __webpack_require__(/*! ./virtual-module */ \"./src/virtual-module.ts\");\nconst systemJSImport = (requestUrl) => __awaiter(void 0, void 0, void 0, function* () {\n    const { default: component, mount, unmount } = yield System.import(requestUrl);\n    return { component, mount, unmount };\n});\n// const defaultNavigations = {\n//   login: '/login',\n//   main: '/main',\n//   news: '/news',\n//   org: '/org',\n//   sections: '/sections',\n//   'news.details': '/news/{{id}}',\n//   'org.details': '/org/{{name}}',\n//   'sections.details': '/sections/{{name}}'\n// }\n// const defaultApps = {\n//   login: { version: '1.0.0', name: 'login' },\n//   main: { version: '1.0.1', name: 'main' },\n//   news: { version: '1.0.0', name: 'news' },\n//   org: { version: '1.0.0', name: 'org' },\n//   sections: { version: '1.0.0', name: 'sections' }\n// }\nexports.default = ({ apps: rawApps, navigations, config }) => __awaiter(void 0, void 0, void 0, function* () {\n    virtual_module_1.defineVirtualModule({ navigations, config });\n    const apps = new apps_1.Apps(rawApps);\n    const history = history_1.createBrowserHistory();\n    let prevPathname = window.location.pathname;\n    const app = apps.findApp(history.location.pathname);\n    const publicPath = `/${app.name}/${app.version}`;\n    __webpack_require__.p = `${config.baseUrl}${publicPath}${__webpack_require__.p}`;\n    const appPath = `${config.baseUrl}${publicPath}/index.js`;\n    const { component, mount, unmount } = yield systemJSImport(appPath);\n    mount(component.default);\n    history.listen((location) => {\n        if (location.pathname !== prevPathname) {\n            prevPathname = location.pathname;\n            unmount();\n        }\n    });\n});\n\n\n//# sourceURL=webpack://bootstrap/./src/main.ts?");
+eval("\nvar __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }\n    return new (P || (P = Promise))(function (resolve, reject) {\n        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n        function rejected(value) { try { step(generator[\"throw\"](value)); } catch (e) { reject(e); } }\n        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }\n        step((generator = generator.apply(thisArg, _arguments || [])).next());\n    });\n};\nObject.defineProperty(exports, \"__esModule\", { value: true });\n__webpack_require__(/*! systemjs/dist/system */ \"./node_modules/systemjs/dist/system.js\");\n__webpack_require__(/*! systemjs/dist/extras/amd */ \"./node_modules/systemjs/dist/extras/amd.js\");\n__webpack_require__(/*! systemjs/dist/extras/named-register */ \"./node_modules/systemjs/dist/extras/named-register.js\");\n__webpack_require__(/*! systemjs/dist/extras/named-exports */ \"./node_modules/systemjs/dist/extras/named-exports.js\");\n__webpack_require__(/*! systemjs/dist/extras/transform */ \"./node_modules/systemjs/dist/extras/transform.js\");\nconst history_1 = __webpack_require__(/*! history */ \"./node_modules/history/esm/history.js\");\nconst apps_1 = __webpack_require__(/*! ./apps */ \"./src/apps.ts\");\nconst virtual_module_1 = __webpack_require__(/*! ./virtual-module */ \"./src/virtual-module.ts\");\nconst systemJSImport = (requestUrl) => __awaiter(void 0, void 0, void 0, function* () {\n    const { default: component, mount, unmount } = yield System.import(requestUrl);\n    return { component, mount, unmount };\n});\n// const defaultNavigations = {\n//   login: '/login',\n//   main: '/main',\n//   news: '/news',\n//   org: '/org',\n//   sections: '/sections',\n//   'news.details': '/news/{{id}}',\n//   'org.details': '/org/{{name}}',\n//   'sections.details': '/sections/{{name}}'\n// }\n// const defaultApps = {\n//   login: { version: '1.0.0', name: 'login' },\n//   main: { version: '1.0.1', name: 'main' },\n//   news: { version: '1.0.0', name: 'news' },\n//   org: { version: '1.0.0', name: 'org' },\n//   sections: { version: '1.0.0', name: 'sections' }\n// }\nexports.default = ({ apps: rawApps, navigations, config }) => __awaiter(void 0, void 0, void 0, function* () {\n    virtual_module_1.defineVirtualModule({ navigations, config });\n    const apps = new apps_1.Apps(rawApps);\n    const history = history_1.createBrowserHistory();\n    let prevPathname = window.location.pathname;\n    const app = apps.findApp(history.location.pathname);\n    const publicPath = `/${app.name}/${app.version}`;\n    __webpack_require__.p = `${config.baseUrl}${publicPath}${__webpack_require__.p}`;\n    const appPath = `${config.baseUrl}${publicPath}/index.js`;\n    const { component, mount, unmount } = yield systemJSImport(appPath);\n    mount(component.default);\n    history.listen((location) => {\n        if (location.pathname !== prevPathname) {\n            prevPathname = location.pathname;\n            unmount();\n        }\n    });\n});\n\n\n//# sourceURL=webpack://bootstrap/./src/main.ts?");
 
 /***/ }),
 
@@ -257,7 +257,7 @@ eval("\nvar __awaiter = (this && this.__awaiter) || function (thisArg, _argument
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-eval("/* WEBPACK VAR INJECTION */(function(global) {\nObject.defineProperty(exports, \"__esModule\", { value: true });\nexports.defineVirtualModule = (params) => {\n    const virtualModule = createVirtualModule(params);\n    // @ts-ignore\n    global.define('@ijl/fire.app', [], virtualModule);\n};\nconst createVirtualModule = ({ config, navigations }) => ({\n    getConfig: () => config,\n    getConfigValue: (key) => config[key],\n    getNavigations: () => navigations,\n    getNavigationsValue: (key) => navigations[key],\n});\n\n/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../node_modules/webpack/buildin/global.js */ \"./node_modules/webpack/buildin/global.js\")))\n\n//# sourceURL=webpack://bootstrap/./src/virtual-module.ts?");
+eval("\nObject.defineProperty(exports, \"__esModule\", { value: true });\nconst createVirtualModule = ({ config, navigations }) => ({\n    getConfig: () => config,\n    getConfigValue: (key) => config[key],\n    getNavigations: () => navigations,\n    getNavigationsValue: (key) => navigations[key],\n});\nexports.defineVirtualModule = (params) => {\n    const virtualModule = createVirtualModule(params);\n    // @ts-ignore\n    System.set('root.scope', Object.assign({}, virtualModule));\n};\n\n\n//# sourceURL=webpack://bootstrap/./src/virtual-module.ts?");
 
 /***/ })
 

src/main.ts

@@ -1,4 +1,4 @@
-import "systemjs/dist/s";
+import "systemjs/dist/system";
 import "systemjs/dist/extras/amd";
 import "systemjs/dist/extras/named-register";
 import "systemjs/dist/extras/named-exports";
@@ -34,7 +34,7 @@ const systemJSImport = async (requestUrl: string) => {
 // }
 
 export default async ({ apps: rawApps, navigations, config }) => {
-  defineVirtualModule({navigations, config})
+  defineVirtualModule({ navigations, config })
 
   const apps = new Apps(rawApps)
 

src/virtual-module.ts

@@ -1,12 +1,15 @@
-export const defineVirtualModule = (params) => {
+const createVirtualModule = ({ config, navigations }) => ({
-    const virtualModule = createVirtualModule(params)
-    // @ts-ignore
-    global.define('@ijl/fire.app', [], virtualModule)
-}
-
-const createVirtualModule = ({config, navigations}) => ({
     getConfig: () => config,
     getConfigValue: (key) => config[key],
     getNavigations: () => navigations,
     getNavigationsValue: (key) => navigations[key],
 })
+
+export const defineVirtualModule = (params) => {
+    const virtualModule = createVirtualModule(params)
+    // @ts-ignore
+    System.set('root.scope', {
+        ...virtualModule
+    });
+}
+