socket-function 0.12.5 → 0.12.6

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "socket-function",
-	"version": "0.12.5",
+	"version": "0.12.6",
 	"main": "index.js",
 	"license": "MIT",
 	"note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

package/require/RequireController.ts

@@ -36,6 +36,7 @@ declare global {
     interface Window {
         clientsideBootTime: number;
     }
+    var suppressUnexpectedModuleWarning: boolean;
 }
 
 export interface SerializedModule {
@@ -108,6 +109,9 @@ class RequireControllerBase {
         }
         if (requireCalls) {
             async function requireAll(calls: string[]) {
+                // NOTE: awaiting isn't just for better and consistent load order, it also greatly improves load efficiency,
+                //  as parallel calls can't know what files will be loaded, so there is a lot of duplicate loading. Loading
+                //  1 at a time allows require to efficiently require only files that previous imports haven't loaded.
                 for (let call of calls) {
                     try {
                         await require(call);

package/require/require.js

@@ -233,6 +233,7 @@
             // TODO: Maybe do a request, making this async, if it isn't found?
             return serializedModule.requests[request];
         };
+        let moduleFolder = module.filename.replace(/\\/g, "/").split("/").slice(0, -1).join("/") + "/";
         return require;
         function require(request, asyncIsFine) {
             if (asyncIsFineOuter) {
@@ -250,12 +251,18 @@
                 resolvedPath = request;
             } else {
                 if (!(request in serializedModule.requests)) {
-                    if (!asyncIsFine) {
+                    if (!asyncIsFine && !globalThis.suppressUnexpectedModuleWarning) {
                         console.warn(`Accessed unexpected module %c${request}%c in %c${module.id}%c\n\tTreating it as an async require.\n\tAll modules require synchronously clientside must be required serverside at a module level.`,
                             "color: red", "color: unset",
                             "color: red", "color: unset",
                         );
                     }
+                    // NOTE: We should still namespace it to the current folder (if it is a relative path),
+                    //  otherwise relative async imports won't work!
+                    //  (This path isn't hit often, as we usually preload, but... sometimes we won't).
+                    if (request.startsWith(".")) {
+                        request = moduleFolder + request;
+                    }
                     return rootRequire(request);
                 }