From 3f0424769ecc30af957521081de2a3e19c961c35 Mon Sep 17 00:00:00 2001
From: Aqib Mirza <aaron.smith@nninjatechnolabs.com>
Date: Mon, 4 Sep 2023 12:23:06 +0530
Subject: [PATCH 1/2] fix: npm loader

---
 .../packages/lowcoder/src/comps/comps/remoteComp/loaders.tsx  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/packages/lowcoder/src/comps/comps/remoteComp/loaders.tsx b/client/packages/lowcoder/src/comps/comps/remoteComp/loaders.tsx
index 9c689f781..d7934490b 100644
--- a/client/packages/lowcoder/src/comps/comps/remoteComp/loaders.tsx
+++ b/client/packages/lowcoder/src/comps/comps/remoteComp/loaders.tsx
@@ -7,7 +7,7 @@ async function npmLoader(remoteInfo: RemoteCompInfo): Promise<CompConstructor |
   // log.info("load npm plugin:", remoteInfo);
   const { packageName, packageVersion = "latest", compName } = remoteInfo;
   const entry = `${NPM_PLUGIN_ASSETS_BASE_URL}/${packageName}@${packageVersion}/index.js`;
-  const module = await import(/* @vite-ignore */ entry);
+  const module = await import(/* webpackIgnore: true */ entry);
   const comp = module.default?.[compName];
   if (!comp) {
     throw new Error(trans("npm.compNotFound", { compName }));
@@ -18,7 +18,7 @@ async function npmLoader(remoteInfo: RemoteCompInfo): Promise<CompConstructor |
 async function bundleLoader(remoteInfo: RemoteCompInfo): Promise<CompConstructor | null> {
   const { packageName, packageVersion = "latest", compName } = remoteInfo;
   const entry = `/${packageName}/${packageVersion}/index.js?v=${REACT_APP_COMMIT_ID}`;
-  const module = await import(/* @vite-ignore */ entry);
+  const module = await import(/* webpackIgnore: true */ entry);
   const comp = module.default?.[compName];
   if (!comp) {
     throw new Error(trans("npm.compNotFound", { compName }));

From a02d547317401fe26f030d6974d11475c9b7be06 Mon Sep 17 00:00:00 2001
From: Aqib Mirza <aaron.smith@nninjatechnolabs.com>
Date: Mon, 4 Sep 2023 13:08:03 +0530
Subject: [PATCH 2/2] fix: lowcoder comp loader fix

---
 .../src/comps/comps/remoteComp/loaders.tsx    | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/client/packages/lowcoder/src/comps/comps/remoteComp/loaders.tsx b/client/packages/lowcoder/src/comps/comps/remoteComp/loaders.tsx
index d7934490b..dc1b4bc0e 100644
--- a/client/packages/lowcoder/src/comps/comps/remoteComp/loaders.tsx
+++ b/client/packages/lowcoder/src/comps/comps/remoteComp/loaders.tsx
@@ -7,12 +7,23 @@ async function npmLoader(remoteInfo: RemoteCompInfo): Promise<CompConstructor |
   // log.info("load npm plugin:", remoteInfo);
   const { packageName, packageVersion = "latest", compName } = remoteInfo;
   const entry = `${NPM_PLUGIN_ASSETS_BASE_URL}/${packageName}@${packageVersion}/index.js`;
-  const module = await import(/* webpackIgnore: true */ entry);
-  const comp = module.default?.[compName];
-  if (!comp) {
+  console.log("Entry", entry);
+  try {
+    const module = await import(/* webpackIgnore: true */ entry);
+    // let module = moduleGlobe;
+    // if (packageName !== "openblocks-comps-workmeet") {
+    //   module = await import(entry);
+    // }
+    console.log("Entry 1", module);
+    const comp = module.default?.[compName];
+    if (!comp) {
+      throw new Error(trans("npm.compNotFound", { compName }));
+    }
+    return comp;
+  } catch (e) {
+    console.log("eeeee", e);
     throw new Error(trans("npm.compNotFound", { compName }));
   }
-  return comp;
 }
 
 async function bundleLoader(remoteInfo: RemoteCompInfo): Promise<CompConstructor | null> {