oneportal-scripts 3.7.5 → 3.7.7

package/config/downloadAndExtract.js

@@ -19,10 +19,10 @@ class DownloadAndExtractPlugin {
     const url = `${fontdoorUrl}/${oneenv}/${libPath}/${lib.name}-ts.tgz?v=${Math.random()}`;
 
     try {
-      const response = await axios({ method: "get", url, responseType: "stream" });
+      const response = await axios({ method: "get", url, responseType: "stream", timeout: 30000 });
       await pipeline(response.data, tar.x({ C: destDir }));
     } catch (err) {
-      console.error("Error downloading or extracting file:", err);
+      console.warn(`Warning: Could not download type definitions for ${lib.name}: ${err.message}`);
     }
   }
 

package/config/glasses.json

@@ -1,21 +1,4 @@
 {
-  "name": "oneportal-app",
-  "version": "1.0.0",
-  "publicPath": "/",
-  "port": 3000,
-  "libs": [],
-  "remotelibs": [],
-  "activeshared": true,
-  "eager": false,
-  "contenthash": true,
-  "enabledts": false,
-  "exposes": {
-    "./App": "./src/App"
-  },
-  "environmentVariables": {
-    "ONEPORTAL_FRONT_DOOR": "https://localhost:3000",
-    "ONEPORTAL_ENV": "dev"
-  },
   "sharedlibrary": {
     "development": {
       "href": "https://sharenet.blob.core.windows.net/sharedlibrary"

package/config/paths.js

@@ -46,7 +46,7 @@ module.exports = {
   appPublic: resolveApp("public"),
   appHtml: resolveApp("public/index.html"),
   appIndexJs: resolveModule(resolveApp, "src/index"),
-  extension: resolveApp("config/glasses.json"),
+  extension: resolveApp("extension.json"),
   appPackageJson: resolveApp("package.json"),
   appSrc: resolveApp("src"),
   appTsConfig: resolveApp("tsconfig.json"),

package/config/webpack.config.js

@@ -26,65 +26,42 @@ function isValidURL(url) {
   }
 }
 
-function loadRemoteEntry(appName, frontDoor, appPath) {
-  return new Promise((resolve) => {
-    const scriptId = appName + "-remoteEntry";
-    const existingScript = document.getElementById(scriptId);
+function dynamicRemote(env, appName, isApp) {
+  const appPath = isApp ? `apps/${appName}` : appName;
+  const frontDoor = env.ONEPORTAL_FRONT_DOOR;
 
-    const makeProxy = () => ({
-      get: (request) => window[appName].get(request),
-      init: (arg) => {
-        try {
-          return window[appName].init(arg);
-        } catch (_e) {
-          console.warn(`Remote container ${appName} failed to initialize.`, _e);
+  return `promise new Promise(function(resolve) {
+    var scriptId = '${appName}-remoteEntry';
+    var existingScript = document.getElementById(scriptId);
+    function makeProxy() {
+      return {
+        get: function(request) { return window['${appName}'].get(request); },
+        init: function(arg) {
+          try { return window['${appName}'].init(arg); }
+          catch(e) { console.warn('Remote container ${appName} failed to initialize.', e); }
         }
-      },
-    });
-
+      };
+    }
     if (existingScript) {
       resolve(makeProxy());
     } else {
-      const script = document.createElement("script");
+      var script = document.createElement('script');
       script.id = scriptId;
-
-      const localURL = localStorage.getItem(appName);
+      var localURL = localStorage.getItem('${appName}');
       if (localURL) {
-        script.src = localURL.concat("/remoteEntry.js");
+        script.src = localURL + '/remoteEntry.js';
       } else {
-        const version = window["oneportalextension"][appName];
-        const versionApps = window["oneportalextension"]["apps"].find(
-          (app) => app.name === appName,
-        );
-        const oneenv = window["oneportalextension"].env;
-        script.src =
-          frontDoor +
-          "/" +
-          oneenv +
-          "/" +
-          appPath +
-          "/remoteEntry.js?v=" +
-          (version ?? versionApps?.version);
+        var ext = window['oneportalextension'] || {};
+        var version = ext['${appName}'];
+        var apps = ext['apps'] || [];
+        var versionApp = apps.find(function(a) { return a.name === '${appName}'; });
+        var oneenv = ext['env'];
+        script.src = '${frontDoor}/' + oneenv + '/${appPath}/remoteEntry.js?v=' + (version !== undefined ? version : (versionApp ? versionApp.version : ''));
       }
-
-      script.onload = () => resolve(makeProxy());
+      script.onload = function() { resolve(makeProxy()); };
       document.head.appendChild(script);
     }
-  });
-}
-
-function toPromiseRemote(fn, ...argValues) {
-  return () => fn(...argValues);
-}
-
-function dynamicRemote(env, appName, isApp) {
-  const appPath = isApp ? `apps/${appName}` : appName;
-  return toPromiseRemote(
-    loadRemoteEntry,
-    appName,
-    env.ONEPORTAL_FRONT_DOOR,
-    appPath,
-  );
+  })`;
 }
 
 module.exports = function webpackConfig(mode) {
@@ -307,6 +284,7 @@ module.exports = function webpackConfig(mode) {
                       `${config.name}-ts.tgz`,
                     ),
                     fileList: ["types"],
+                  }),
                   new TarWebpackPlugin({
                     action: "c",
                     gzip: true,

package/config/webpackDevServer.config.js

@@ -13,6 +13,13 @@ const sockPath = config.sockPath || "/ws";
 const sockPort = config.port || 13009;
 
 module.exports = function webpackDevServerConfig(proxyConfig, allowedHost) {
+  const httpsConfig = getHttpsConfig();
+  const serverOption = httpsConfig === false
+    ? "http"
+    : typeof httpsConfig === "object"
+      ? { type: "https", options: httpsConfig }
+      : "https";
+
   return {
     hot: true,
     allowedHosts:
@@ -46,22 +53,21 @@ module.exports = function webpackDevServerConfig(proxyConfig, allowedHost) {
     devMiddleware: {
       publicPath: paths.publicUrlOrPath.slice(0, -1),
     },
-    https: getHttpsConfig(),
+    server: serverOption,
     host,
     historyApiFallback: {
       disableDotRule: true,
       index: paths.publicUrlOrPath,
     },
     proxy: proxyConfig,
-    onBeforeSetupMiddleware(devServer) {
-      devServer.app.use(evalSourceMapMiddleware(devServer));
+    setupMiddlewares(middlewares, devServer) {
+      middlewares.unshift(evalSourceMapMiddleware(devServer));
       if (fs.existsSync(paths.proxySetup)) {
         require(paths.proxySetup)(devServer.app);
       }
-    },
-    onAfterSetupMiddleware(devServer) {
-      devServer.app.use(redirectServedPath(paths.publicUrlOrPath));
-      devServer.app.use(noopServiceWorkerMiddleware(paths.publicUrlOrPath));
+      middlewares.push(redirectServedPath(paths.publicUrlOrPath));
+      middlewares.push(noopServiceWorkerMiddleware(paths.publicUrlOrPath));
+      return middlewares;
     },
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oneportal-scripts",
-  "version": "3.7.5",
+  "version": "3.7.7",
   "description": "Build scripts and configuration for OnePortal micro-frontend projects with Module Federation support.",
   "engines": {
     "node": ">=14.0.0"

package/scripts/build.js

@@ -42,8 +42,7 @@ function build() {
           errors: true,
         });
 
-        messages =
-          typeof statsJson === "string" ? formatWebpackMessages(statsJson) : {};
+        messages = formatWebpackMessages(statsJson);
       }
 
       if (messages.errors?.length) {
@@ -89,4 +88,17 @@ function build() {
     });
   });
 }
-build();
+build()
+  .then(({ warnings }) => {
+    if (warnings && warnings.length) {
+      console.log(chalk.yellow("Compiled with warnings.\n"));
+      console.log(warnings.join("\n\n"));
+    } else {
+      console.log(chalk.green("Compiled successfully.\n"));
+    }
+  })
+  .catch((err) => {
+    console.log(chalk.red("Failed to compile.\n"));
+    console.log((err.message || err) + "\n");
+    process.exit(1);
+  });