@blocklet/pages-kit 0.4.65 → 0.4.66

package/lib/esm/utils/inject-global-components.js

@@ -79,7 +79,11 @@ export function injectGlobalComponents() {
             // handle builtin module
             const builtinModule = this.modules[module];
             if (builtinModule) {
-                return builtinModule;
+                return {
+                    // 针对某些包，比如 react-dom，需要同时导出 default 和非 default 的值
+                    ...(builtinModule.default ? { ...builtinModule.default } : {}),
+                    ...builtinModule,
+                };
             }
             // handle relative path import
             if (isRelativeModule(module)) {
@@ -159,11 +163,20 @@ export function injectGlobalComponents() {
         const imports = Object.entries(modulesResolved).reduce((acc, [modulePath, moduleContent]) => {
             const moduleContentResolved = moduleContent;
             const namedExports = Object.keys(moduleContentResolved).filter((key) => key !== 'default');
+            const namedExportsMap = namedExports.reduce((acc, key) => {
+                acc[key] = moduleContentResolved[key];
+                return acc;
+            }, {});
             const hasDefaultExport = 'default' in moduleContentResolved;
+            // default exports 优先级低于 named exports
+            const defaultExports = hasDefaultExport
+                ? Object.keys(moduleContentResolved.default).filter((key) => !namedExportsMap[key])
+                : [];
             // create module code
             const moduleCode = `// GENERATED FILE. DO NOT EDIT.
 const moduleSource = window['${BuiltinModulesGlobalVariableName}'].modules['${modulePath}'];       
 ${namedExports.map((name) => `export const ${name} = moduleSource['${name}'];`).join('\n')}
+${defaultExports.map((name) => `export const ${name} = moduleSource.default['${name}'];`).join('\n')}
 export default ${hasDefaultExport ? 'moduleSource.default' : 'moduleSource'};
 `;
             // create base64 code

package/lib/types/builtin/react-dom.d.ts

@@ -1,3 +1,2 @@
-import ReactDOM from 'react-dom';
-export * from 'react-dom';
+import * as ReactDOM from 'react-dom';
 export default ReactDOM;