fix/solve medusa next plugin post issues (#471)

* fix: solve NextMedusaPlugin issues

* chore: add remoteBasePath option

* chore: add skipPost option

Author: brunos3d

dashboard-plugin/FederationDashboardPlugin.js

@@ -51,7 +51,7 @@ class AddRuntimeRequiremetToPromiseExternal {
     compiler.hooks.compilation.tap(
       "AddRuntimeRequiremetToPromiseExternal",
       compilation => {
-        const {RuntimeGlobals} = compiler.webpack;
+        const { RuntimeGlobals } = compiler.webpack;
         if (compilation.outputOptions.trustedTypes) {
           compilation.hooks.additionalModuleRuntimeRequirements.tap(
             "AddRuntimeRequiremetToPromiseExternal",
@@ -83,7 +83,7 @@ class FederationDashboardPlugin {
    */
   constructor(options) {
     this._options = Object.assign(
-      {debug: false, filename: "dashboard.json", fetchClient: false},
+      { debug: false, filename: "dashboard.json", fetchClient: false },
       options
     );
     this._dashData = null;
@@ -125,6 +125,7 @@ class FederationDashboardPlugin {
       "__REMOTE_VERSION__",
       ""
     );
+
     compiler.hooks.thisCompilation.tap(PLUGIN_NAME, compilation => {
       compilation.hooks.processAssets.tapPromise(
         {
@@ -195,14 +196,18 @@ class FederationDashboardPlugin {
     if (graphData) {
       const dashData = (this._dashData = JSON.stringify(graphData));
 
-      if (this._options.dashboardURL && !this._options.nextjs) {
-        this.postDashboardData(dashData).catch(err => {
-          if (err) {
-            curCompiler.errors.push(err);
-            // eslint-disable-next-line promise/no-callback-in-promise
-            throw err;
-          }
-        });
+      if (this._options.skipPost) {
+        console.info('Skipping post to dashboard')
+      } else {
+        if (this._options.dashboardURL && !this._options.nextjs) {
+          this.postDashboardData(dashData).catch(err => {
+            if (err) {
+              curCompiler.errors.push(err);
+              // eslint-disable-next-line promise/no-callback-in-promise
+              throw err;
+            }
+          });
+        }
       }
 
       return Promise.resolve().then(() => {
@@ -248,6 +253,7 @@ class FederationDashboardPlugin {
             typeof rawData.version === "string"
               ? `_${rawData.version.split(".").join("_")}`
               : `_${rawData.version.toString()}`;
+
           let codeSource;
           if (!remoteEntry.source._value && remoteEntry.source.source) {
             codeSource = remoteEntry.source.source();
@@ -311,7 +317,7 @@ class FederationDashboardPlugin {
       const stringifiableChunk = Array.from(subset).map(sub => {
         const cleanSet = Object.getOwnPropertyNames(sub).reduce((acc, key) => {
           if (key === "_groups") return acc;
-          return Object.assign(acc, {[key]: sub[key]});
+          return Object.assign(acc, { [key]: sub[key] });
         }, {});
 
         return this.mapToObjectRec(cleanSet);
@@ -422,9 +428,9 @@ class FederationDashboardPlugin {
     if (this._options.filename) {
       const hashPath = path.join(stats.outputPath, this._options.filename);
       if (!fs.existsSync(stats.outputPath)) {
-        fs.mkdirSync(stats.outputPath, {recursive: true});
+        fs.mkdirSync(stats.outputPath, { recursive: true });
       }
-      fs.writeFileSync(hashPath, dashData, {encoding: "utf-8"});
+      fs.writeFileSync(hashPath, dashData, { encoding: "utf-8" });
     }
     if (this._options.debug) {
       console.log(
@@ -436,7 +442,7 @@ class FederationDashboardPlugin {
     try {
       file = assets[this.FederationPluginOptions.filename]._value;
 
-      const {version} = JSON.parse(dashData);
+      const { version } = JSON.parse(dashData);
       if (!version) {
         throw new Error("no version provided, cannot version remote");
       }
@@ -451,7 +457,7 @@ class FederationDashboardPlugin {
       }
       fs.mkdir(
         path.join(stats.outputPath, version),
-        {recursive: true},
+        { recursive: true },
         err => {
           if (err) throw err;
           fs.writeFile(
@@ -485,16 +491,26 @@ class FederationDashboardPlugin {
     fs.writeFile(
       statsPath,
       JSON.stringify(stats),
-      {encoding: "utf-8"},
+      { encoding: "utf-8" },
       () => {
       }
     );
   }
+}
 
+class NextMedusaPlugin {
+  constructor(options) {
+    this._options = options;
+    if (this._options.debug) {
+      console.log("NextMedusaPlugin constructor", options);
+    }
+  }
   async postDashboardData(dashData) {
+
     if (!this._options.dashboardURL) {
       return Promise.resolve();
     }
+
     const client = this._options.fetchClient
       ? this._options.fetchClient
       : fetch;
@@ -509,22 +525,15 @@ class FederationDashboardPlugin {
       });
 
       if (!res.ok) throw new Error(res.statusText);
+
+      return res
     } catch (err) {
       console.warn(
         `Error posting data to dashboard URL: ${this._options.dashboardURL}`
       );
       console.error(err);
     }
   }
-}
-
-class NextMedusaPlugin {
-  constructor(options) {
-    this._options = options;
-    if (this._options.debug) {
-      console.log("medusa plugin constructor", options);
-    }
-  }
 
   apply(compiler) {
     if (
@@ -560,40 +569,39 @@ class NextMedusaPlugin {
       nextjs: true
     }).apply(compiler);
 
-    return;
+    const hostData = path.join(
+      compiler.options.output.path,
+      compiler.options.name + "-" + filename
+    );
     compiler.hooks.done.tap(PLUGIN_NAME, () => {
-      const sidecarData = path.join(
-        compiler.options.output.path,
-        `child-dashboard.json`
-      );
-      const hostData = path.join(
-        compiler.options.output.path,
-        "dashboard.json"
-      );
-      console.log("sidecar data", sidecarData);
-      console.log("host data", hostData);
-      if (fs.existsSync(sidecarData) && fs.existsSync(hostData)) {
-        console.log("will write merged files");
+      if (fs.existsSync(hostData)) {
         fs.writeFileSync(
           hostData,
-          JSON.stringify(mergeGraphs(require(sidecarData), require(hostData)))
+          JSON.stringify(require(hostData))
         );
       }
     });
 
-    compiler.hooks.afterDone.tap("NextMedusaPlugin", (stats, done) => {
-      if (fs.existsSync(sidecarData) && fs.existsSync(hostData)) {
+    compiler.hooks.afterDone.tap("NextMedusaPlugin", (stats) => {
+      if (fs.existsSync(hostData)) {
         const dashboardData = fs.readFileSync(hostData, "utf8");
-        MedusaPlugin.postDashboardData(dashboardData)
-          .then(done)
-          .catch(done);
-      } else {
-        done();
+        if (this._options.skipPost) {
+          console.info('Skipping post to dashboard')
+        } else {
+          this.postDashboardData(dashboardData)
+            .then(() => {
+              console.info('Data has been successfully sent to the dashboard')
+            })
+            .catch((error) => {
+              console.error('Failed to send data to the dashboard:', error)
+            });
+        }
       }
     });
+
   }
 }
 
 module.exports = FederationDashboardPlugin;
 module.exports.clientVersion = require("./client-version");
-module.exports.NextMedusaPlugin = NextMedusaPlugin;
+module.exports.NextMedusaPlugin = NextMedusaPlugin;

dashboard-plugin/client-version.js

@@ -1,4 +1,4 @@
-module.exports = ({ currentHost, remoteName, dashboardURL }) => {
+module.exports = ({ currentHost, remoteName, dashboardURL, remoteBasePath }) => {
   //language=JS
   return `promise new Promise((resolve, reject) => {
     fetch("${dashboardURL}&currentHost=${currentHost}&remoteName=${remoteName}", {
@@ -13,8 +13,9 @@ module.exports = ({ currentHost, remoteName, dashboardURL }) => {
       .then(function (data) {
         var name = data.name + "_" + data.version;
         var filename = data.version + '.remoteEntry.js';
-        var url = new URL(filename, data.remoteURL)
-        
+        var path = \`${remoteBasePath}/\${filename}\`.replace(/\\/\\/+/g, '/');
+        var url = new URL(path, data.remoteURL);
+
         new Promise(function (resolve, reject) {
           var __webpack_error__ = new Error()
           if (typeof window[name] !== 'undefined') return resolve();