@esmx/core 3.0.0-rc.62 → 3.0.0-rc.64

package/package.json

@@ -59,7 +59,7 @@
         "build": "unbuild"
     },
     "dependencies": {
-        "@esmx/import": "3.0.0-rc.62",
+        "@esmx/import": "3.0.0-rc.64",
         "@types/serialize-javascript": "^5.0.4",
         "es-module-lexer": "^1.7.0",
         "find": "^0.3.0",
@@ -77,7 +77,7 @@
         "unbuild": "3.6.0",
         "vitest": "3.2.4"
     },
-    "version": "3.0.0-rc.62",
+    "version": "3.0.0-rc.64",
     "type": "module",
     "private": false,
     "exports": {
@@ -100,5 +100,5 @@
         "template",
         "public"
     ],
-    "gitHead": "e5a1e811403bf1db4437dff88c3ea8bc6b576f64"
+    "gitHead": "8c103750d1e623fa4fa23b6ed9149f39e4a9bd58"
 }

package/src/core.ts

@@ -853,7 +853,7 @@ export class Esmx {
             const manifests = await this.getManifestList(env);
             let json: ImportMap = {};
             switch (env) {
-                case 'client':
+                case 'client': {
                     json = getImportMap({
                         manifests,
                         getScope(name, scope) {
@@ -864,6 +864,7 @@ export class Esmx {
                         }
                     });
                     break;
+                }
                 case 'server':
                     json = getImportMap({
                         manifests,

package/src/manifest-json.ts

@@ -9,10 +9,6 @@ export interface ManifestJson {
      * Module name
      */
     name: string;
-    /**
-     * Import mappings
-     */
-    imports: Record<string, string>;
     /**
      * Scope-specific import mappings
      * Type: Record<scope name, import mappings within that scope>

package/src/module-config.test.ts

@@ -313,6 +313,37 @@ describe('Module Config Parser', () => {
                 expect(emptyScope.existing).toBe('existing-value');
                 expect(emptyScope.lodash).toBe('test-module/lodash');
             });
+
+            it('should verify the specific scopes merging logic with imports', () => {
+                const config: ModuleConfig = {
+                    imports: {
+                        react: 'react',
+                        vue: 'vue'
+                    },
+                    scopes: {
+                        utils: {
+                            lodash: 'lodash'
+                        },
+                        '': {
+                            existing: 'existing-value'
+                        }
+                    }
+                };
+                const result = getEnvironments(config, 'client', 'test-module');
+
+                // 验证核心逻辑：imports 被合并到空字符串 scope 中
+                expect(result.scopes['']).toBeDefined();
+                expect(result.scopes[''].existing).toBe('existing-value'); // 保留现有内容
+                expect(result.scopes[''].react).toBe('react'); // 合并 imports
+                expect(result.scopes[''].vue).toBe('vue'); // 合并 imports
+
+                // 验证其他 scopes 不受影响
+                expect(result.scopes.utils.lodash).toBe('lodash');
+
+                // 验证 result.imports 也包含相同的 imports
+                expect(result.imports.react).toBe('react');
+                expect(result.imports.vue).toBe('vue');
+            });
         });
 
         describe('addPackageExportsToScopes', () => {

package/src/module-config.ts

@@ -145,7 +145,13 @@ export function getEnvironments(
 ): ParsedModuleConfigEnvironment {
     const imports = getEnvironmentImports(env, config.imports);
     const exports = getEnvironmentExports(config, env);
-    const scopes = getEnvironmentScopes(env, config.scopes);
+    const scopes = getEnvironmentScopes(env, {
+        ...config.scopes,
+        '': {
+            ...config.scopes?.[''],
+            ...imports
+        }
+    });
     addPackageExportsToScopes(exports, scopes, moduleName);
     return {
         imports,