piral-core 1.3.1-beta.6128 → 1.3.1-beta.6133

package/dist/codegen.js

@@ -99,7 +99,7 @@ var require_polyfills = __commonJS({
             var start = Date.now();
             var backoff = 0;
             fs$rename(from, to, function CB(er) {
-              if (er && (er.code === "EACCES" || er.code === "EPERM") && Date.now() - start < 6e4) {
+              if (er && (er.code === "EACCES" || er.code === "EPERM" || er.code === "EBUSY") && Date.now() - start < 6e4) {
                 setTimeout(function() {
                   fs2.stat(to, function(stater, st) {
                     if (stater && stater.code === "ENOENT")
@@ -974,14 +974,16 @@ var require_CachedInputFileSystem = __commonJS({
         } catch (err) {
           this._storeResult(path, err, void 0);
           this._enterSyncModeWhenIdle();
-          if (callbacks)
+          if (callbacks) {
             runCallbacks(callbacks, err, void 0);
+          }
           throw err;
         }
         this._storeResult(path, void 0, result);
         this._enterSyncModeWhenIdle();
-        if (callbacks)
+        if (callbacks) {
           runCallbacks(callbacks, void 0, result);
+        }
         return result;
       }
       purge(what) {
@@ -2339,7 +2341,7 @@ var require_lib = __commonJS({
 var require_createInnerContext = __commonJS({
   "../../../node_modules/enhanced-resolve/lib/createInnerContext.js"(exports, module2) {
     "use strict";
-    module2.exports = function createInnerContext(options, message, messageOptional) {
+    module2.exports = function createInnerContext(options, message) {
       let messageReported = false;
       let innerLog = void 0;
       if (options.log) {
@@ -2355,7 +2357,7 @@ var require_createInnerContext = __commonJS({
           innerLog = options.log;
         }
       }
-      const childContext = {
+      return {
         log: innerLog,
         yield: options.yield,
         fileDependencies: options.fileDependencies,
@@ -2363,7 +2365,6 @@ var require_createInnerContext = __commonJS({
         missingDependencies: options.missingDependencies,
         stack: options.stack
       };
-      return childContext;
     };
   }
 });
@@ -2585,7 +2586,7 @@ var require_Resolver = __commonJS({
       PathType
     } = require_path();
     function toCamelCase(str) {
-      return str.replace(/-([a-z])/g, (str2) => str2.substr(1).toUpperCase());
+      return str.replace(/-([a-z])/g, (str2) => str2.slice(1).toUpperCase());
     }
     var Resolver = class {
       static createStackEntry(hook, request) {
@@ -2607,18 +2608,19 @@ var require_Resolver = __commonJS({
         }
         name = toCamelCase(name);
         if (/^before/.test(name)) {
-          return this.ensureHook(name[6].toLowerCase() + name.substr(7)).withOptions({
+          return this.ensureHook(name[6].toLowerCase() + name.slice(7)).withOptions({
             stage: -10
           });
         }
         if (/^after/.test(name)) {
-          return this.ensureHook(name[5].toLowerCase() + name.substr(6)).withOptions({
+          return this.ensureHook(name[5].toLowerCase() + name.slice(6)).withOptions({
             stage: 10
           });
         }
         const hook = this.hooks[name];
         if (!hook) {
-          return this.hooks[name] = new AsyncSeriesBailHook(["request", "resolveContext"], name);
+          this.hooks[name] = new AsyncSeriesBailHook(["request", "resolveContext"], name);
+          return this.hooks[name];
         }
         return hook;
       }
@@ -2628,12 +2630,12 @@ var require_Resolver = __commonJS({
         }
         name = toCamelCase(name);
         if (/^before/.test(name)) {
-          return this.getHook(name[6].toLowerCase() + name.substr(7)).withOptions({
+          return this.getHook(name[6].toLowerCase() + name.slice(7)).withOptions({
             stage: -10
           });
         }
         if (/^after/.test(name)) {
-          return this.getHook(name[5].toLowerCase() + name.substr(6)).withOptions({
+          return this.getHook(name[5].toLowerCase() + name.slice(6)).withOptions({
             stage: 10
           });
         }
@@ -2685,8 +2687,9 @@ var require_Resolver = __commonJS({
             yieldCalled = true;
           };
           finishYield = (result) => {
-            if (result)
+            if (result) {
               yield_(result);
+            }
             callback(null);
           };
         }
@@ -2716,8 +2719,9 @@ var require_Resolver = __commonJS({
           }, (err, result) => {
             if (err)
               return callback(err);
-            if (yieldCalled || result && yield_)
+            if (yieldCalled || result && yield_) {
               return finishYield(result);
+            }
             if (result)
               return finishResolved(result);
             return finishWithoutResolve(log);
@@ -2733,8 +2737,9 @@ var require_Resolver = __commonJS({
           }, (err, result) => {
             if (err)
               return callback(err);
-            if (yieldCalled || result && yield_)
+            if (yieldCalled || result && yield_) {
               return finishYield(result);
+            }
             if (result)
               return finishResolved(result);
             const log = [];
@@ -2745,8 +2750,9 @@ var require_Resolver = __commonJS({
             }, (err2, result2) => {
               if (err2)
                 return callback(err2);
-              if (yieldCalled || result2 && yield_)
+              if (yieldCalled || result2 && yield_) {
                 return finishYield(result2);
+              }
               return finishWithoutResolve(log);
             });
           });
@@ -2808,7 +2814,7 @@ var require_Resolver = __commonJS({
           part.module = this.isModule(part.request);
           part.directory = this.isDirectory(part.request);
           if (part.directory) {
-            part.request = part.request.substr(0, part.request.length - 1);
+            part.request = part.request.slice(0, -1);
           }
         }
         return part;
@@ -2932,7 +2938,7 @@ var require_forEachBail = __commonJS({
             while (next())
               ;
           loop = true;
-        });
+        }, i);
         if (!loop)
           loop = false;
         return loop;
@@ -3053,7 +3059,7 @@ var require_DescriptionFileUtils = __commonJS({
       const p = i < 0 ? j : j < 0 ? i : i < j ? j : i;
       if (p < 0)
         return null;
-      return directory.substr(0, p || 1);
+      return directory.slice(0, p || 1);
     }
     exports.loadDescriptionFile = loadDescriptionFile;
     exports.getField = getField;
@@ -3179,7 +3185,7 @@ var require_AliasPlugin = __commonJS({
           forEachBail(this.options, (item, callback2) => {
             let shouldStop = false;
             if (innerRequest === item.name || !item.onlyModule && (request.request ? innerRequest.startsWith(`${item.name}/`) : isSubPath(innerRequest, item.name))) {
-              const remainingRequest = innerRequest.substr(item.name.length);
+              const remainingRequest = innerRequest.slice(item.name.length);
               const resolveWithAlias = (alias, callback3) => {
                 if (alias === false) {
                   const ignoreObj = {
@@ -3325,7 +3331,7 @@ var require_DescriptionFilePlugin = __commonJS({
                 resolveContext.log(`No description file found in ${directory} or above`);
               return callback();
             }
-            const relativePath = "." + path.substr(result.directory.length).replace(/\\/g, "/");
+            const relativePath = "." + path.slice(result.directory.length).replace(/\\/g, "/");
             const obj = {
               ...request,
               descriptionFilePath: result.path,
@@ -3395,19 +3401,20 @@ var require_entrypoints = __commonJS({
     var slashCode = "/".charCodeAt(0);
     var dotCode = ".".charCodeAt(0);
     var hashCode = "#".charCodeAt(0);
+    var patternRegEx = /\*/g;
     module2.exports.processExportsField = function processExportsField(exportsField) {
-      return createFieldProcessor(buildExportsFieldPathTree(exportsField), assertExportsFieldRequest, assertExportTarget);
+      return createFieldProcessor(buildExportsField(exportsField), (request) => request.length === 0 ? "." : "./" + request, assertExportsFieldRequest, assertExportTarget);
     };
     module2.exports.processImportsField = function processImportsField(importsField) {
-      return createFieldProcessor(buildImportsFieldPathTree(importsField), assertImportsFieldRequest, assertImportTarget);
+      return createFieldProcessor(buildImportsField(importsField), (request) => "#" + request, assertImportsFieldRequest, assertImportTarget);
     };
-    function createFieldProcessor(treeRoot, assertRequest, assertTarget) {
+    function createFieldProcessor(field, normalizeRequest, assertRequest, assertTarget) {
       return function fieldProcessor(request, conditionNames) {
         request = assertRequest(request);
-        const match = findMatch(request, treeRoot);
+        const match = findMatch(normalizeRequest(request), field);
         if (match === null)
           return [];
-        const [mapping, remainRequestIndex] = match;
+        const [mapping, remainingRequest, isSubpathMapping, isPattern] = match;
         let direct = null;
         if (isConditionalMapping(mapping)) {
           direct = conditionalMapping(mapping, conditionNames);
@@ -3416,8 +3423,7 @@ var require_entrypoints = __commonJS({
         } else {
           direct = mapping;
         }
-        const remainingRequest = remainRequestIndex === request.length + 1 ? void 0 : remainRequestIndex < 0 ? request.slice(-remainRequestIndex - 1) : request.slice(remainRequestIndex);
-        return directMapping(remainingRequest, remainRequestIndex < 0, direct, conditionNames, assertTarget);
+        return directMapping(remainingRequest, isPattern, isSubpathMapping, direct, conditionNames, assertTarget);
       };
     }
     function assertExportsFieldRequest(request) {
@@ -3464,108 +3470,101 @@ var require_entrypoints = __commonJS({
         throw new Error(expectFolder ? `Expecting folder to folder mapping. ${JSON.stringify(imp)} should end with "/"` : `Expecting file to file mapping. ${JSON.stringify(imp)} should not end with "/"`);
       }
     }
-    function findMatch(request, treeRoot) {
-      if (request.length === 0) {
-        const value2 = treeRoot.files.get("");
-        return value2 ? [value2, 1] : null;
-      }
-      if (treeRoot.children === null && treeRoot.folder === null && treeRoot.wildcards === null) {
-        const value2 = treeRoot.files.get(request);
-        return value2 ? [value2, request.length + 1] : null;
-      }
-      let node = treeRoot;
-      let lastNonSlashIndex = 0;
-      let slashIndex = request.indexOf("/", 0);
-      let lastFolderMatch = null;
-      const applyFolderMapping = () => {
-        const folderMapping = node.folder;
-        if (folderMapping) {
-          if (lastFolderMatch) {
-            lastFolderMatch[0] = folderMapping;
-            lastFolderMatch[1] = -lastNonSlashIndex - 1;
-          } else {
-            lastFolderMatch = [folderMapping, -lastNonSlashIndex - 1];
-          }
-        }
-      };
-      const applyWildcardMappings = (wildcardMappings, remainingRequest2) => {
-        if (wildcardMappings) {
-          for (const [key, target] of wildcardMappings) {
-            if (remainingRequest2.startsWith(key)) {
-              if (!lastFolderMatch) {
-                lastFolderMatch = [target, lastNonSlashIndex + key.length];
-              } else if (lastFolderMatch[1] < lastNonSlashIndex + key.length) {
-                lastFolderMatch[0] = target;
-                lastFolderMatch[1] = lastNonSlashIndex + key.length;
-              }
-            }
+    function patternKeyCompare(a, b) {
+      const aPatternIndex = a.indexOf("*");
+      const bPatternIndex = b.indexOf("*");
+      const baseLenA = aPatternIndex === -1 ? a.length : aPatternIndex + 1;
+      const baseLenB = bPatternIndex === -1 ? b.length : bPatternIndex + 1;
+      if (baseLenA > baseLenB)
+        return -1;
+      if (baseLenB > baseLenA)
+        return 1;
+      if (aPatternIndex === -1)
+        return 1;
+      if (bPatternIndex === -1)
+        return -1;
+      if (a.length > b.length)
+        return -1;
+      if (b.length > a.length)
+        return 1;
+      return 0;
+    }
+    function findMatch(request, field) {
+      if (Object.prototype.hasOwnProperty.call(field, request) && !request.includes("*") && !request.endsWith("/")) {
+        const target2 = field[request];
+        return [target2, "", false, false];
+      }
+      let bestMatch = "";
+      let bestMatchSubpath;
+      const keys = Object.getOwnPropertyNames(field);
+      for (let i = 0; i < keys.length; i++) {
+        const key = keys[i];
+        const patternIndex = key.indexOf("*");
+        if (patternIndex !== -1 && request.startsWith(key.slice(0, patternIndex))) {
+          const patternTrailer = key.slice(patternIndex + 1);
+          if (request.length >= key.length && request.endsWith(patternTrailer) && patternKeyCompare(bestMatch, key) === 1 && key.lastIndexOf("*") === patternIndex) {
+            bestMatch = key;
+            bestMatchSubpath = request.slice(patternIndex, request.length - patternTrailer.length);
           }
+        } else if (key[key.length - 1] === "/" && request.startsWith(key) && patternKeyCompare(bestMatch, key) === 1) {
+          bestMatch = key;
+          bestMatchSubpath = request.slice(key.length);
         }
-      };
-      while (slashIndex !== -1) {
-        applyFolderMapping();
-        const wildcardMappings = node.wildcards;
-        if (!wildcardMappings && node.children === null)
-          return lastFolderMatch;
-        const folder = request.slice(lastNonSlashIndex, slashIndex);
-        applyWildcardMappings(wildcardMappings, folder);
-        if (node.children === null)
-          return lastFolderMatch;
-        const newNode = node.children.get(folder);
-        if (!newNode) {
-          return lastFolderMatch;
-        }
-        node = newNode;
-        lastNonSlashIndex = slashIndex + 1;
-        slashIndex = request.indexOf("/", lastNonSlashIndex);
-      }
-      const remainingRequest = lastNonSlashIndex > 0 ? request.slice(lastNonSlashIndex) : request;
-      const value = node.files.get(remainingRequest);
-      if (value) {
-        return [value, request.length + 1];
       }
-      applyFolderMapping();
-      applyWildcardMappings(node.wildcards, remainingRequest);
-      return lastFolderMatch;
+      if (bestMatch === "")
+        return null;
+      const target = field[bestMatch];
+      const isSubpathMapping = bestMatch.endsWith("/");
+      const isPattern = bestMatch.includes("*");
+      return [
+        target,
+        bestMatchSubpath,
+        isSubpathMapping,
+        isPattern
+      ];
     }
     function isConditionalMapping(mapping) {
       return mapping !== null && typeof mapping === "object" && !Array.isArray(mapping);
     }
-    function directMapping(remainingRequest, subpathMapping, mappingTarget, conditionNames, assert) {
+    function directMapping(remainingRequest, isPattern, isSubpathMapping, mappingTarget, conditionNames, assert) {
       if (mappingTarget === null)
         return [];
       if (typeof mappingTarget === "string") {
         return [
-          targetMapping(remainingRequest, subpathMapping, mappingTarget, assert)
+          targetMapping(remainingRequest, isPattern, isSubpathMapping, mappingTarget, assert)
         ];
       }
       const targets = [];
       for (const exp of mappingTarget) {
         if (typeof exp === "string") {
-          targets.push(targetMapping(remainingRequest, subpathMapping, exp, assert));
+          targets.push(targetMapping(remainingRequest, isPattern, isSubpathMapping, exp, assert));
           continue;
         }
         const mapping = conditionalMapping(exp, conditionNames);
         if (!mapping)
           continue;
-        const innerExports = directMapping(remainingRequest, subpathMapping, mapping, conditionNames, assert);
+        const innerExports = directMapping(remainingRequest, isPattern, isSubpathMapping, mapping, conditionNames, assert);
         for (const innerExport of innerExports) {
           targets.push(innerExport);
         }
       }
       return targets;
     }
-    function targetMapping(remainingRequest, subpathMapping, mappingTarget, assert) {
+    function targetMapping(remainingRequest, isPattern, isSubpathMapping, mappingTarget, assert) {
       if (remainingRequest === void 0) {
         assert(mappingTarget, false);
         return mappingTarget;
       }
-      if (subpathMapping) {
+      if (isSubpathMapping) {
         assert(mappingTarget, true);
         return mappingTarget + remainingRequest;
       }
       assert(mappingTarget, false);
-      return mappingTarget.replace(/\*/g, remainingRequest.replace(/\$/g, "$$"));
+      let result = mappingTarget;
+      if (isPattern) {
+        result = result.replace(patternRegEx, remainingRequest.replace(/\$/g, "$$"));
+      }
+      return result;
     }
     function conditionalMapping(conditionalMapping_, conditionNames) {
       let lookup = [[conditionalMapping_, Object.keys(conditionalMapping_), 0]];
@@ -3604,61 +3603,9 @@ var require_entrypoints = __commonJS({
         }
       return null;
     }
-    function createNode() {
-      return {
-        children: null,
-        folder: null,
-        wildcards: null,
-        files: new Map()
-      };
-    }
-    function walkPath(root, path, target) {
-      if (path.length === 0) {
-        root.folder = target;
-        return;
-      }
-      let node = root;
-      let lastNonSlashIndex = 0;
-      let slashIndex = path.indexOf("/", 0);
-      while (slashIndex !== -1) {
-        const folder = path.slice(lastNonSlashIndex, slashIndex);
-        let newNode;
-        if (node.children === null) {
-          newNode = createNode();
-          node.children = new Map();
-          node.children.set(folder, newNode);
-        } else {
-          newNode = node.children.get(folder);
-          if (!newNode) {
-            newNode = createNode();
-            node.children.set(folder, newNode);
-          }
-        }
-        node = newNode;
-        lastNonSlashIndex = slashIndex + 1;
-        slashIndex = path.indexOf("/", lastNonSlashIndex);
-      }
-      if (lastNonSlashIndex >= path.length) {
-        node.folder = target;
-      } else {
-        const file = lastNonSlashIndex > 0 ? path.slice(lastNonSlashIndex) : path;
-        if (file.endsWith("*")) {
-          if (node.wildcards === null)
-            node.wildcards = new Map();
-          node.wildcards.set(file.slice(0, -1), target);
-        } else {
-          node.files.set(file, target);
-        }
-      }
-    }
-    function buildExportsFieldPathTree(field) {
-      const root = createNode();
-      if (typeof field === "string") {
-        root.files.set("", field);
-        return root;
-      } else if (Array.isArray(field)) {
-        root.files.set("", field.slice());
-        return root;
+    function buildExportsField(field) {
+      if (typeof field === "string" || Array.isArray(field)) {
+        return { ".": field };
       }
       const keys = Object.keys(field);
       for (let i = 0; i < keys.length; i++) {
@@ -3672,24 +3619,20 @@ var require_entrypoints = __commonJS({
               }
               i++;
             }
-            root.files.set("", field);
-            return root;
+            return { ".": field };
           }
           throw new Error(`Exports field key should be relative path and start with "." (key: ${JSON.stringify(key)})`);
         }
         if (key.length === 1) {
-          root.files.set("", field[key]);
           continue;
         }
         if (key.charCodeAt(1) !== slashCode) {
           throw new Error(`Exports field key should be relative path and start with "./" (key: ${JSON.stringify(key)})`);
         }
-        walkPath(root, key.slice(2), field[key]);
       }
-      return root;
+      return field;
     }
-    function buildImportsFieldPathTree(field) {
-      const root = createNode();
+    function buildImportsField(field) {
       const keys = Object.keys(field);
       for (let i = 0; i < keys.length; i++) {
         const key = keys[i];
@@ -3702,9 +3645,8 @@ var require_entrypoints = __commonJS({
         if (key.charCodeAt(1) === slashCode) {
           throw new Error(`Imports field key should not start with "#/" (key: ${JSON.stringify(key)})`);
         }
-        walkPath(root, key.slice(1), field[key]);
       }
-      return root;
+      return field;
     }
   }
 });
@@ -3801,12 +3743,26 @@ var require_ExtensionAliasPlugin = __commonJS({
           const requestPath = request.request;
           if (!requestPath || !requestPath.endsWith(extension))
             return callback();
-          const resolve2 = (alias2, callback2) => {
-            resolver.doResolve(target, {
+          const isAliasString = typeof alias === "string";
+          const resolve2 = (alias2, callback2, index) => {
+            const newRequest = `${requestPath.slice(0, -extension.length)}${alias2}`;
+            return resolver.doResolve(target, {
               ...request,
-              request: `${requestPath.slice(0, -extension.length)}${alias2}`,
+              request: newRequest,
               fullySpecified: true
-            }, `aliased from extension alias with mapping '${extension}' to '${alias2}'`, resolveContext, callback2);
+            }, `aliased from extension alias with mapping '${extension}' to '${alias2}'`, resolveContext, (err, result) => {
+              if (!isAliasString && index) {
+                if (index !== this.options.alias.length) {
+                  if (resolveContext.log) {
+                    resolveContext.log(`Failed to alias from extension alias with mapping '${extension}' to '${alias2}' for '${newRequest}': ${err}`);
+                  }
+                  return callback2(null, result);
+                }
+                return callback2(err, result);
+              } else {
+                callback2(err, result);
+              }
+            });
           };
           const stoppingCallback = (err, result) => {
             if (err)
@@ -3815,7 +3771,7 @@ var require_ExtensionAliasPlugin = __commonJS({
               return callback(null, result);
             return callback(null, null);
           };
-          if (typeof alias === "string") {
+          if (isAliasString) {
             resolve2(alias, stoppingCallback);
           } else if (alias.length > 1) {
             forEachBail(alias, resolve2, stoppingCallback);
@@ -3979,7 +3935,9 @@ var require_JoinRequestPartPlugin = __commonJS({
           if (i >= 0 && req.charCodeAt(2) === namespaceStartCharCode) {
             i = req.indexOf("/", i + 1);
           }
-          let moduleName, remainingRequest, fullySpecified;
+          let moduleName;
+          let remainingRequest;
+          let fullySpecified;
           if (i < 0) {
             moduleName = req;
             remainingRequest = ".";
@@ -4015,10 +3973,12 @@ var require_JoinRequestPlugin = __commonJS({
       apply(resolver) {
         const target = resolver.ensureHook(this.target);
         resolver.getHook(this.source).tapAsync("JoinRequestPlugin", (request, resolveContext, callback) => {
+          const requestPath = request.path;
+          const requestRequest = request.request;
           const obj = {
             ...request,
-            path: resolver.join(request.path, request.request),
-            relativePath: request.relativePath && resolver.join(request.relativePath, request.request),
+            path: resolver.join(requestPath, requestRequest),
+            relativePath: request.relativePath && resolver.join(request.relativePath, requestRequest),
             request: void 0
           };
           resolver.doResolve(target, obj, null, resolveContext, callback);
@@ -4078,12 +4038,12 @@ var require_getPaths = __commonJS({
       const paths = [path];
       const segments = [parts[parts.length - 1]];
       let part = parts[parts.length - 1];
-      path = path.substr(0, path.length - part.length - 1);
+      path = path.substring(0, path.length - part.length - 1);
       for (let i = parts.length - 2; i > 2; i -= 2) {
         paths.push(path);
         part = parts[i];
-        path = path.substr(0, path.length - part.length) || "/";
-        segments.push(part.substr(0, part.length - 1));
+        path = path.substring(0, path.length - part.length) || "/";
+        segments.push(part.slice(0, -1));
       }
       part = parts[1];
       segments.push(part);
@@ -4098,7 +4058,7 @@ var require_getPaths = __commonJS({
       const p = i < 0 ? j : j < 0 ? i : i < j ? j : i;
       if (p < 0)
         return null;
-      const s = path.substr(p + 1);
+      const s = path.slice(p + 1);
       return s;
     };
   }
@@ -4605,8 +4565,9 @@ var require_UnsafeCachePlugin = __commonJS({
             if (isYield) {
               if (result)
                 yieldResult.push(result);
-              for (const result2 of yieldResult)
+              for (const result2 of yieldResult) {
                 yieldFn(result2);
+              }
               this.cache[cacheId] = yieldResult;
               return callback(null, null);
             }
@@ -4691,7 +4652,7 @@ var require_ResolverFactory = __commonJS({
         const obj = { name: key, onlyModule: false, alias: alias[key] };
         if (/\$$/.test(key)) {
           obj.onlyModule = true;
-          obj.name = key.substr(0, key.length - 1);
+          obj.name = key.slice(0, -1);
         }
         return obj;
       }) : alias || [];
@@ -4925,14 +4886,15 @@ var require_ResolverFactory = __commonJS({
           plugins.push(new SymlinkPlugin("existing-file", "existing-file"));
         plugins.push(new NextPlugin("existing-file", "resolved"));
       }
+      const resolved = resolver.hooks.resolved;
       if (restrictions.size > 0) {
-        plugins.push(new RestrictionsPlugin(resolver.hooks.resolved, restrictions));
+        plugins.push(new RestrictionsPlugin(resolved, restrictions));
       }
-      plugins.push(new ResultPlugin(resolver.hooks.resolved));
+      plugins.push(new ResultPlugin(resolved));
       for (const plugin of plugins) {
         if (typeof plugin === "function") {
           plugin.call(resolver, resolver);
-        } else {
+        } else if (plugin) {
           plugin.apply(resolver);
         }
       }
@@ -4971,8 +4933,9 @@ var require_CloneBasenamePlugin = __commonJS({
       apply(resolver) {
         const target = resolver.ensureHook(this.target);
         resolver.getHook(this.source).tapAsync("CloneBasenamePlugin", (request, resolveContext, callback) => {
-          const filename = basename(request.path);
-          const filePath = resolver.join(request.path, filename);
+          const requestPath = request.path;
+          const filename = basename(requestPath);
+          const filePath = resolver.join(requestPath, filename);
           const obj = {
             ...request,
             path: filePath,
@@ -5039,7 +5002,7 @@ var require_lib2 = __commonJS({
       extensions: [".js", ".json", ".node"],
       fileSystem: nodeFileSystem2
     });
-    function resolve2(context, path, request, resolveContext, callback) {
+    var resolve2 = (context, path, request, resolveContext, callback) => {
       if (typeof context === "string") {
         callback = resolveContext;
         resolveContext = request;
@@ -5051,27 +5014,26 @@ var require_lib2 = __commonJS({
         callback = resolveContext;
       }
       asyncResolver.resolve(context, path, request, resolveContext, callback);
-    }
+    };
     var syncResolver = ResolverFactory2.createResolver({
       conditionNames: ["node"],
       extensions: [".js", ".json", ".node"],
       useSyncFileSystemCalls: true,
       fileSystem: nodeFileSystem2
     });
-    function resolveSync(context, path, request) {
+    var resolveSync = (context, path, request) => {
       if (typeof context === "string") {
         request = path;
         path = context;
         context = nodeContext2;
       }
       return syncResolver.resolveSync(context, path, request);
-    }
+    };
     function create(options) {
-      options = {
+      const resolver = ResolverFactory2.createResolver({
         fileSystem: nodeFileSystem2,
         ...options
-      };
-      const resolver = ResolverFactory2.createResolver(options);
+      });
       return function(context, path, request, resolveContext, callback) {
         if (typeof context === "string") {
           callback = resolveContext;
@@ -5087,12 +5049,11 @@ var require_lib2 = __commonJS({
       };
     }
     function createSync(options) {
-      options = {
+      const resolver = ResolverFactory2.createResolver({
         useSyncFileSystemCalls: true,
         fileSystem: nodeFileSystem2,
         ...options
-      };
-      const resolver = ResolverFactory2.createResolver(options);
+      });
       return function(context, path, request) {
         if (typeof context === "string") {
           request = path;

package/esm/components/ErrorBoundary.d.ts

@@ -28,5 +28,5 @@ export declare class ErrorBoundary extends React.Component<ErrorBoundaryProps, E
         error: any;
     };
     componentDidCatch(error: Error): void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }

package/esm/components/ExtensionSlot.d.ts

@@ -1,11 +1,11 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { ExtensionSlotProps } from '../types';
 /**
  * The extension slot component to be used when the available
  * extensions of a given name should be rendered at a specific
  * location.
  */
-export declare function ExtensionSlot<T extends string>(props: ExtensionSlotProps<T>): JSX.Element;
+export declare function ExtensionSlot<T extends string>(props: ExtensionSlotProps<T>): React.JSX.Element;
 export declare namespace ExtensionSlot {
     var displayName: string;
 }

package/esm/components/ForeignComponentContainer.d.ts

@@ -14,6 +14,6 @@ export declare class ForeignComponentContainer<T> extends React.Component<Foreig
     componentDidMount(): void;
     componentDidUpdate(): void;
     componentWillUnmount(): void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }
 export {};

package/esm/components/wrapComponent.d.ts

@@ -3,5 +3,5 @@ import type { AnyComponent, ComponentConverters, PiletApi, BaseComponentProps }
 interface CapturedProps {
     piral: PiletApi;
 }
-export declare function wrapComponent<T>(converters: ComponentConverters<T & BaseComponentProps>, component: AnyComponent<T & BaseComponentProps>, captured: CapturedProps, Wrapper: React.FC<T>): React.MemoExoticComponent<(props: T) => JSX.Element> | React.ComponentType<T>;
+export declare function wrapComponent<T>(converters: ComponentConverters<T & BaseComponentProps>, component: AnyComponent<T & BaseComponentProps>, captured: CapturedProps, Wrapper: React.FC<T>): React.MemoExoticComponent<(props: T) => React.JSX.Element> | React.ComponentType<T>;
 export {};

package/esm/defaults/navigator_v5.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { NavigationApi } from '../types';
 export declare function useRouterContext(): import("react-router").RouteComponentProps<{}, import("react-router").StaticContext, unknown>;
 export declare function useCurrentNavigation(): void;
-export declare function createRedirect(to: string): () => JSX.Element;
+export declare function createRedirect(to: string): () => React.JSX.Element;
 export declare function createNavigation(publicPath: string): NavigationApi;

package/esm/defaults/navigator_v6.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { NavigationApi } from '../types';
 export declare function useRouterContext(): unknown;
 export declare function useCurrentNavigation(): void;
-export declare function createRedirect(to: string): () => JSX.Element;
+export declare function createRedirect(to: string): () => React.JSX.Element;
 export declare function createNavigation(publicPath: string): NavigationApi;

package/esm/state/withApi.d.ts

@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { AnyComponent, Errors, PiletApi, BaseComponentProps, GlobalStateContext } from '../types';
-export declare function withApi<TProps>(context: GlobalStateContext, component: AnyComponent<TProps & BaseComponentProps>, piral: PiletApi, errorType: keyof Errors, wrapperType?: string, captured?: {}): React.MemoExoticComponent<(props: TProps) => JSX.Element> | React.ComponentType<TProps>;
+export declare function withApi<TProps>(context: GlobalStateContext, component: AnyComponent<TProps & BaseComponentProps>, piral: PiletApi, errorType: keyof Errors, wrapperType?: string, captured?: {}): React.MemoExoticComponent<(props: TProps) => React.JSX.Element> | React.ComponentType<TProps>;

package/esm/utils/react.d.ts

@@ -1,2 +1,2 @@
 import * as React from 'react';
-export declare function defaultRender(children: React.ReactNode, key?: string): JSX.Element;
+export declare function defaultRender(children: React.ReactNode, key?: string): React.JSX.Element;

package/lib/components/ErrorBoundary.d.ts

@@ -28,5 +28,5 @@ export declare class ErrorBoundary extends React.Component<ErrorBoundaryProps, E
         error: any;
     };
     componentDidCatch(error: Error): void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }

package/lib/components/ExtensionSlot.d.ts

@@ -1,11 +1,11 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { ExtensionSlotProps } from '../types';
 /**
  * The extension slot component to be used when the available
  * extensions of a given name should be rendered at a specific
  * location.
  */
-export declare function ExtensionSlot<T extends string>(props: ExtensionSlotProps<T>): JSX.Element;
+export declare function ExtensionSlot<T extends string>(props: ExtensionSlotProps<T>): React.JSX.Element;
 export declare namespace ExtensionSlot {
     var displayName: string;
 }

package/lib/components/ForeignComponentContainer.d.ts

@@ -14,6 +14,6 @@ export declare class ForeignComponentContainer<T> extends React.Component<Foreig
     componentDidMount(): void;
     componentDidUpdate(): void;
     componentWillUnmount(): void;
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }
 export {};

package/lib/components/wrapComponent.d.ts

@@ -3,5 +3,5 @@ import type { AnyComponent, ComponentConverters, PiletApi, BaseComponentProps }
 interface CapturedProps {
     piral: PiletApi;
 }
-export declare function wrapComponent<T>(converters: ComponentConverters<T & BaseComponentProps>, component: AnyComponent<T & BaseComponentProps>, captured: CapturedProps, Wrapper: React.FC<T>): React.MemoExoticComponent<(props: T) => JSX.Element> | React.ComponentType<T>;
+export declare function wrapComponent<T>(converters: ComponentConverters<T & BaseComponentProps>, component: AnyComponent<T & BaseComponentProps>, captured: CapturedProps, Wrapper: React.FC<T>): React.MemoExoticComponent<(props: T) => React.JSX.Element> | React.ComponentType<T>;
 export {};

package/lib/defaults/navigator_v5.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { NavigationApi } from '../types';
 export declare function useRouterContext(): import("react-router").RouteComponentProps<{}, import("react-router").StaticContext, unknown>;
 export declare function useCurrentNavigation(): void;
-export declare function createRedirect(to: string): () => JSX.Element;
+export declare function createRedirect(to: string): () => React.JSX.Element;
 export declare function createNavigation(publicPath: string): NavigationApi;

package/lib/defaults/navigator_v6.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="react" />
+import * as React from 'react';
 import { NavigationApi } from '../types';
 export declare function useRouterContext(): unknown;
 export declare function useCurrentNavigation(): void;
-export declare function createRedirect(to: string): () => JSX.Element;
+export declare function createRedirect(to: string): () => React.JSX.Element;
 export declare function createNavigation(publicPath: string): NavigationApi;

package/lib/state/withApi.d.ts

@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { AnyComponent, Errors, PiletApi, BaseComponentProps, GlobalStateContext } from '../types';
-export declare function withApi<TProps>(context: GlobalStateContext, component: AnyComponent<TProps & BaseComponentProps>, piral: PiletApi, errorType: keyof Errors, wrapperType?: string, captured?: {}): React.MemoExoticComponent<(props: TProps) => JSX.Element> | React.ComponentType<TProps>;
+export declare function withApi<TProps>(context: GlobalStateContext, component: AnyComponent<TProps & BaseComponentProps>, piral: PiletApi, errorType: keyof Errors, wrapperType?: string, captured?: {}): React.MemoExoticComponent<(props: TProps) => React.JSX.Element> | React.ComponentType<TProps>;

package/lib/utils/react.d.ts

@@ -1,2 +1,2 @@
 import * as React from 'react';
-export declare function defaultRender(children: React.ReactNode, key?: string): JSX.Element;
+export declare function defaultRender(children: React.ReactNode, key?: string): React.JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "piral-core",
-  "version": "1.3.1-beta.6128",
+  "version": "1.3.1-beta.6133",
   "description": "The core library for creating a Piral instance.",
   "keywords": [
     "portal",
@@ -73,8 +73,8 @@
   },
   "dependencies": {
     "path-to-regexp": "^1.8.0",
-    "piral-base": "1.3.1-beta.6128",
-    "piral-debug-utils": "1.3.1-beta.6128",
+    "piral-base": "1.3.1-beta.6133",
+    "piral-debug-utils": "1.3.1-beta.6133",
     "zustand": "^3.0.0"
   },
   "devDependencies": {
@@ -94,5 +94,5 @@
     "react-router-dom",
     "tslib"
   ],
-  "gitHead": "0a7041321aa3b3c86371377f74094df506ec3bae"
+  "gitHead": "753b70c9eb69d73f0277952e22100ab16a3cfd43"
 }