@variousjs/various 5.0.0 → 5.0.2

package/dist/index.dev.js

@@ -45,6 +45,7 @@ function _extends() {
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   BASE_DEPENDENCIES: function() { return /* binding */ BASE_DEPENDENCIES; },
 /* harmony export */   CONFIG_KEY: function() { return /* binding */ CONFIG_KEY; },
 /* harmony export */   DEPENDENCIES_KEY: function() { return /* binding */ DEPENDENCIES_KEY; },
 /* harmony export */   MESSAGE_KEY: function() { return /* binding */ MESSAGE_KEY; },
@@ -60,6 +61,7 @@ const DEPENDENCIES_KEY = Symbol('DEPENDENCIES');
 const ROOT = '#root';
 const VUE_FUNCTION_OPTIONS = ['beforeCreate', 'created', 'beforeMount', 'mounted', 'beforeUpdate', 'updated', 'beforeUnmount', 'unmounted', 'errorCaptured', 'renderTracked', 'renderTriggered', 'activated', 'deactivated', 'setup', 'data', 'render'];
 const VUE_VERSION = 3;
+const BASE_DEPENDENCIES = ['react', 'react-dom', '@variousjs/various', 'app'];
 
 /***/ }),
 
@@ -188,7 +190,8 @@ const createComponent = (config, storeKeys) => {
     };
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_error_boundary__WEBPACK_IMPORTED_MODULE_3__["default"], {
       name: name,
-      module: module
+      module: module,
+      url: url
     }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(C, nextProps));
   };
   component.displayName = 'various-creator';
@@ -469,6 +472,7 @@ class ErrorBoundary extends react__WEBPACK_IMPORTED_MODULE_0__.Component {
       module
     });
   }
+  $self = (0,_helper__WEBPACK_IMPORTED_MODULE_1__.getSelfInfo)(this.props);
   reload = () => {
     this.error = undefined;
     this.setState({
@@ -476,16 +480,11 @@ class ErrorBoundary extends react__WEBPACK_IMPORTED_MODULE_0__.Component {
     });
   };
   render() {
-    const {
-      name,
-      module
-    } = this.props;
     const ErrorNode = _connector__WEBPACK_IMPORTED_MODULE_2__["default"].getErrorComponent();
     const store = (0,_store__WEBPACK_IMPORTED_MODULE_3__.getUserStore)();
     if (this.state.hasError) {
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(ErrorNode, {
-        $name: name,
-        $module: module,
+        $self: this.$self,
         $reload: this.reload,
         $store: store,
         $error: this.error
@@ -514,12 +513,14 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   getConfig: function() { return /* binding */ getConfig; },
 /* harmony export */   getMountedComponents: function() { return /* binding */ getMountedComponents; },
 /* harmony export */   getNameWithModule: function() { return /* binding */ getNameWithModule; },
+/* harmony export */   getSelfInfo: function() { return /* binding */ getSelfInfo; },
 /* harmony export */   isModuleLoaded: function() { return /* binding */ isModuleLoaded; },
 /* harmony export */   isPromiseLike: function() { return /* binding */ isPromiseLike; },
 /* harmony export */   onComponentMounted: function() { return /* binding */ onComponentMounted; },
 /* harmony export */   onError: function() { return /* binding */ onError; },
 /* harmony export */   parseComponentActions: function() { return /* binding */ parseComponentActions; },
 /* harmony export */   preloadModules: function() { return /* binding */ preloadModules; },
+/* harmony export */   removeLoadedModules: function() { return /* binding */ removeLoadedModules; },
 /* harmony export */   resetDependencyConfig: function() { return /* binding */ resetDependencyConfig; },
 /* harmony export */   updateMountedComponent: function() { return /* binding */ updateMountedComponent; },
 /* harmony export */   updateUnMountComponent: function() { return /* binding */ updateUnMountComponent; }
@@ -538,16 +539,24 @@ __webpack_require__.r(__webpack_exports__);
 
 const getUrlHash = url => `${url}?${+new Date()}`;
 const hasModule = (modules, module) => modules.some(c => c.name === module.name && c.module === module.module);
-const preloadModules = name => new Promise((resolve, reject) => {
-  const names = typeof name === 'string' ? [name] : name;
+const preloadModules = names => new Promise((resolve, reject) => {
   window.requirejs(names, resolve, reject);
 });
+const removeLoadedModules = names => {
+  names.forEach(name => {
+    if (!_config__WEBPACK_IMPORTED_MODULE_2__.BASE_DEPENDENCIES.includes(name)) {
+      window.requirejs.undef(name);
+    }
+  });
+};
 const defineDependencies = deps => {
   const dependencies = (0,_store__WEBPACK_IMPORTED_MODULE_0__.getStore)(_config__WEBPACK_IMPORTED_MODULE_2__.DEPENDENCIES_KEY);
   const next = {};
   Object.keys(deps).forEach(name => {
-    next[name] = `${deps[name]}#${name}`;
-    window.requirejs.undef(name);
+    if (!_config__WEBPACK_IMPORTED_MODULE_2__.BASE_DEPENDENCIES.includes(name)) {
+      next[name] = `${deps[name]}#${name}`;
+      window.requirejs.undef(name);
+    }
   });
   window.requirejs.config({
     paths: next
@@ -743,6 +752,19 @@ function updateUnMountComponent(moduleDefined) {
     module
   });
 }
+function getSelfInfo(params) {
+  const {
+    name,
+    module,
+    url
+  } = params;
+  const dependencies = (0,_store__WEBPACK_IMPORTED_MODULE_0__.getStore)(_config__WEBPACK_IMPORTED_MODULE_2__.DEPENDENCIES_KEY);
+  return {
+    name,
+    module,
+    url: url || dependencies[name]
+  };
+}
 
 /***/ }),
 
@@ -1156,6 +1178,11 @@ function reactComponent(config) {
       name,
       module
     });
+    $self = (0,_helper__WEBPACK_IMPORTED_MODULE_2__.getSelfInfo)({
+      name,
+      module,
+      url
+    });
     render() {
       const LoaderNode = _connector__WEBPACK_IMPORTED_MODULE_4__["default"].getLoaderComponent();
       const {
@@ -1177,12 +1204,12 @@ function reactComponent(config) {
           return null;
         }
         return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(LoaderNode, {
-          $name: name,
-          $module: module,
+          $self: this.$self,
           $store: store
         });
       }
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(ComponentNode, (0,_babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0__["default"])({}, $componentProps, {
+        $self: this.$self,
         $dispatch: this.$dispatch,
         $store: store,
         $postMessage: this.$postMessage,
@@ -1215,6 +1242,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _react_component__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./react-component */ "./src/core/react-component.tsx");
 /* harmony import */ var _vue_component__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./vue-component */ "./src/core/vue-component.tsx");
 /* harmony import */ var _helper__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./helper */ "./src/core/helper.ts");
+/* harmony import */ var _error_boundary__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./error-boundary */ "./src/core/error-boundary.tsx");
+
 
 
 
@@ -1248,7 +1277,11 @@ const renderComponent = ({
       $silent,
       $ref
     };
-    const node = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(C, nextProps);
+    const node = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_error_boundary__WEBPACK_IMPORTED_MODULE_5__["default"], {
+      name: name,
+      module: module,
+      url: url
+    }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(C, nextProps));
     root.render(renderNode ? renderNode(node) : node);
     return () => new Promise(resolve => {
       setTimeout(() => {
@@ -1355,6 +1388,11 @@ function vueComponent(config) {
     const errorRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)();
     const isUnMountedRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)(false);
     const ComponentNodeRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)();
+    const selfRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)((0,_helper__WEBPACK_IMPORTED_MODULE_4__.getSelfInfo)({
+      name,
+      module,
+      url
+    }));
     const containerDivRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)(null);
     const propsReactiveRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)();
     const storeReactiveRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)();
@@ -1421,7 +1459,8 @@ function vueComponent(config) {
               $logger,
               $postMessage,
               $t,
-              $store: storeReactiveRef.current.value
+              $store: storeReactiveRef.current.value,
+              $self: selfRef.current
             },
             // eslint-disable-next-line react/no-this-in-sfc
             key: this.key
@@ -1512,8 +1551,7 @@ function vueComponent(config) {
       throw errorRef.current;
     }
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, !componentReady && !$silent && !(0,_helper__WEBPACK_IMPORTED_MODULE_4__.isModuleLoaded)(name) ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(LoaderNode, {
-      $name: name,
-      $module: module,
+      $self: selfRef.current,
       $store: store
     }) : null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
       className: `various-component-${(0,_helper__WEBPACK_IMPORTED_MODULE_4__.getNameWithModule)({
@@ -1647,6 +1685,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   isModuleLoaded: function() { return /* reexport safe */ _helper__WEBPACK_IMPORTED_MODULE_12__.isModuleLoaded; },
 /* harmony export */   onComponentMounted: function() { return /* reexport safe */ _helper__WEBPACK_IMPORTED_MODULE_12__.onComponentMounted; },
 /* harmony export */   preloadModules: function() { return /* reexport safe */ _helper__WEBPACK_IMPORTED_MODULE_12__.preloadModules; },
+/* harmony export */   removeLoadedModules: function() { return /* reexport safe */ _helper__WEBPACK_IMPORTED_MODULE_12__.removeLoadedModules; },
 /* harmony export */   renderComponent: function() { return /* reexport safe */ _render_component__WEBPACK_IMPORTED_MODULE_15__["default"]; },
 /* harmony export */   version: function() { return /* binding */ version; }
 /* harmony export */ });
@@ -1688,7 +1727,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 // eslint-disable-next-line no-undef
-const version = "5.0.0";
+const version = "5.0.2";
 /* harmony default export */ __webpack_exports__["default"] = (config => {
   const {
     dependencies,
@@ -1727,7 +1766,8 @@ const version = "5.0.0";
     }
     render() {
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_error_boundary__WEBPACK_IMPORTED_MODULE_7__["default"], {
-        name: "app"
+        name: "app",
+        url: dependencies.app
       }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(ContainerComponent, null));
     }
   }