Merge pull request antvis#343 from antvis/chore/fix-export-esm

Chore/fix export esm
andyhuang18 · Jun 12, 2023 · d26dea5 · d26dea5
2 parents d668294 + 4fd8896
commit d26dea5
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/packages/gi-site/src/hooks/common.ts b/packages/gi-site/src/hooks/common.ts
@@ -25,7 +25,7 @@ export function beautifyCode(code: string) {
 }
 
 export const getActivePackage = (activeAssets: GIAssets) => {
-  const { services, components, elements, layouts } = activeAssets;
+  const { components, elements, layouts } = activeAssets;
 
   const componentsMap = new Map<string, any>();
   const elementsMap = new Map<string, any>();
@@ -108,7 +108,15 @@ export const getActivePackageName = (activeAssets: GIAssets): string[] => {
 };
 
 export const getConstantFiles = opts => {
-  const { config, id, engineId, activeAssets, theme = 'light', data, schemaData } = opts;
+  const { config, id, engineId, theme = 'light', data, schemaData } = opts;
+
+  const activeAssets = {
+    ...opts.activeAssets,
+    services: opts.activeAssets.services.filter(item => {
+      return item.id === 'GI' || item.id === engineId;
+    }),
+  };
+
   // const GI_SERVICES_OPTIONS = beautifyCode(JSON.stringify(serviceConfig));
   const THEME_STYLE = Object.entries(ThemeVars[theme])
     //@ts-ignore

diff --git a/packages/gi-site/src/hooks/useNodeModule.ts b/packages/gi-site/src/hooks/useNodeModule.ts
@@ -14,7 +14,14 @@ function serialize(data: Record<string, any>) {
 }
 
 function getCSBData(opts) {
-  const { activeAssets, activeAssetsKeys, theme } = opts;
+  const { activeAssetsKeys, theme, engineId } = opts;
+  const activeAssets = {
+    ...opts.activeAssets,
+    services: opts.activeAssets.services.filter(item => {
+      return item.id === 'GI' || item.id === engineId;
+    }),
+  };
+
   const nodemodules = getActivePackage(activeAssets);
 
   const ext = '.tsx';
@@ -55,7 +62,7 @@ function getCSBData(opts) {
           return itemComponent.info.id;
         })
         .join(',');
-      console.log('umd', UMD);
+
       return `const { ${componentIds} } = ${UMD}.components;`;
     })
     .join('\n');
@@ -70,7 +77,7 @@ function getCSBData(opts) {
           return itemComponent.info.id;
         })
         .join(',');
-      console.log('umd', UMD);
+
       return `const { ${componentIds} } = ${UMD}.elements;`;
     })
     .join('\n');
@@ -84,7 +91,7 @@ function getCSBData(opts) {
           return itemComponent.info.id;
         })
         .join(',');
-      console.log('umd', UMD);
+
       return `const { ${componentIds} } = ${UMD}.layouts;`;
     })
     .join('\n');