changed the way the ejected files receive their names, it is now addi…

…ng the project name first
wpdas · May 22, 2024 · 3ff86ba · 3ff86ba
1 parent 395b827
commit 3ff86ba
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 5 deletions.
diff --git a/gateway/config/flags.js b/gateway/config/flags.js
@@ -2,6 +2,7 @@ const envConfig = document.getElementById("env-config").textContent;
 const config = JSON.parse(envConfig);
 
 export const flags = {
+  mainWidgetSrc: config.mainWidgetSrc,
   mainWidgetLink: config.mainWidgetLink,
   network: process.env.NETWORK || config.network || "mainnet",
   bosLoaderUrl:

diff --git a/gateway/src/index.js b/gateway/src/index.js
@@ -75,6 +75,12 @@ function Home() {
   const { components: redirectMap } = useRedirectMap();
   const widgets = {};
 
+  // Force going to the main widget src (indexer)
+  if (location.pathname === "/" && flags.mainWidgetSrc) {
+    navigate(flags.mainWidgetSrc);
+    return "";
+  }
+
   Object.keys(redirectMap).forEach((key) => {
     const parts = key.split("/widget/");
     if (!widgets[parts[0]]) {

diff --git a/lib/actions/getProjectName.js b/lib/actions/getProjectName.js
@@ -1,12 +1,18 @@
 const { read_alem_config } = require("../config");
 
 /**
- * Get the project name
+ * Get the project name based on configuration
  * @returns
  */
-const getProjectName = () => {
+const getProjectName = (skipCheckers = false) => {
   const appConfig = read_alem_config();
   let projectName = appConfig.name.replaceAll(" ", "-").toLowerCase();
+
+  // Se ignorar a checagem do nome final do projeto
+  if (skipCheckers) {
+    return projectName;
+  }
+
   projectName = appConfig.isIndex ? "Index" : projectName;
   return appConfig.options?.createLoaderWidget
     ? `${projectName}Loader`

diff --git a/lib/actions/loadFilesContent.js b/lib/actions/loadFilesContent.js
@@ -1,5 +1,6 @@
 const parseAlemFeatures = require("../config/parseAlemFeatures");
 const { scapeBacktick } = require("../helpers");
+const getProjectName = require("./getProjectName");
 const transformSchemaToWidget = require("./transformSchemaToWidget");
 
 /**
@@ -41,8 +42,12 @@ const loadComponentCodesObjectByFileSchemas = (fileSchemas, network) => {
 
     // Ejectables - Arquivos a serem criado fora do indexador principal
     if (fileSchema.toBeEjected) {
+      // O nome do projeto deve vir na frente para evitar conflitos com outros
+      // aplicativos publicados na mesma conta
+      const newWidgetName = `${getProjectName(true)}.${fileSchema.widgetName}`;
+
       ejectedFiles.push({
-        name: fileSchema.widgetName,
+        name: newWidgetName,
         content: fileSchema.finalFileBundle,
       });
     }

diff --git a/lib/actions/processChildrenWidget.js b/lib/actions/processChildrenWidget.js
@@ -7,6 +7,7 @@ const extractJSXChildren = require("../parsers/extractJSXChildren");
 const extractPropsFromJSX = require("../parsers/extractPropsFromJSX");
 const extractTopLevelJSXElements = require("../parsers/extractTopLevelJSXElements");
 const replaceJSXElement = require("../parsers/replaceJSXElement");
+const getProjectName = require("./getProjectName");
 
 /**
  * Usado para remover o endChar do texto se o endChar for a última caractere no texto
@@ -72,7 +73,10 @@ const processChildrenWidget = (htmlContent, fileSchemas, account) => {
       htmlElement = `const TempMethod = () => { return ${htmlElement} \n}`;
 
       if (componentSchema.toBeEjected) {
-        const src = `"${account}/widget/${componentElementName}"`;
+        // O nome do projeto deve vir na frente para evitar conflitos com outros
+        // aplicativos publicados na mesma conta
+        const newWidgetName = `${getProjectName(true)}.${componentElementName}`;
+        const src = `"${account}/widget/${newWidgetName}"`;
 
         htmlElement = replaceJSXElement(
           htmlElement,

diff --git a/lib/actions/transformSchemaToWidget.js b/lib/actions/transformSchemaToWidget.js
@@ -34,6 +34,7 @@ const wrapCodeInGetFunction = require("../parsers/wrapCodeInGetFunction");
 const getFunctionExportDeclarationKeys = require("../parsers/getFunctionExportDeclarationKeys");
 const { read_alem_config } = require("../config");
 const filterReturn = require("../parsers/filterReturn");
+const getProjectName = require("./getProjectName");
 
 const config = read_alem_config();
 
@@ -559,7 +560,10 @@ const swapComponentsForStatelessFiles = (fileSchemas, fileSchema) => {
 
             // Transform components generated by .jsx / .tsx into <Widget code={code} .../>
             if (importItemWidget.toBeEjected) {
-              const src = `"${account}/widget/${importItemWidgetComponentName}"`;
+              // O nome do projeto deve vir na frente para evitar conflitos com outros
+              // aplicativos publicados na mesma conta
+              const newWidgetName = `${getProjectName(true)}.${importItemWidgetComponentName}`;
+              const src = `"${account}/widget/${newWidgetName}"`;
               fileBundle = replaceJSXElement(
                 fileBundle,
                 importItemWidgetComponentName,

diff --git a/lib/dev.js b/lib/dev.js
@@ -212,6 +212,7 @@ async function serveDevJson({ useSocket, useGateway, useOpen, port, network }) {
               return res.status(404).send("Something went wrong.");
             }
             const envConfig = JSON.stringify({
+              mainWidgetSrc: `${account}/widget/${projectName}`,
               mainWidgetLink: `http://127.0.0.1:${port}/${account}/widget/${projectName}`,
               bosLoaderWs: `ws://127.0.0.1:${port}`,
               bosLoaderUrl: `http://127.0.0.1:${port}/api/loader`,