Skip to content

Commit 4c4f38f

Browse files
committed
core: compressImportMap deletes empty scopes; adjust types and tests
1 parent 48877fe commit 4c4f38f

File tree

2 files changed

+10
-15
lines changed

2 files changed

+10
-15
lines changed

packages/core/src/utils/import-map.test.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1638,8 +1638,7 @@ describe('compressImportMap', () => {
16381638

16391639
const result = compressImportMap(importMap);
16401640
assert.deepEqual(result, {
1641-
imports: { vue: '/a/vue.final.mjs' },
1642-
scopes: {}
1641+
imports: { vue: '/a/vue.final.mjs' }
16431642
});
16441643
});
16451644

@@ -1672,8 +1671,7 @@ describe('compressImportMap', () => {
16721671
imports: {
16731672
vue: '/shared/vue.final.mjs',
16741673
lodash: '/a/lodash.final.mjs'
1675-
},
1676-
scopes: {}
1674+
}
16771675
};
16781676
assert.deepEqual(result, expected);
16791677
});
@@ -1689,8 +1687,7 @@ describe('compressImportMap', () => {
16891687

16901688
const result = compressImportMap(importMap);
16911689
assert.deepEqual(result, {
1692-
imports: { vue: '/shared/vue.final.mjs' },
1693-
scopes: {}
1690+
imports: { vue: '/shared/vue.final.mjs' }
16941691
});
16951692
});
16961693

@@ -1704,8 +1701,7 @@ describe('compressImportMap', () => {
17041701
};
17051702
const result = compressImportMap(importMap);
17061703
assert.deepEqual(result, {
1707-
imports: { vue: '/x/vue.final.mjs' },
1708-
scopes: {}
1704+
imports: { vue: '/x/vue.final.mjs' }
17091705
});
17101706
});
17111707

packages/core/src/utils/import-map.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,8 @@ export function fixImportMapNestedScopes(
126126
return importMap;
127127
}
128128

129-
export function compressImportMap(
130-
importMap: Required<ImportMap>
131-
): Required<ImportMap> {
132-
const compressed: Required<ImportMap> = {
129+
export function compressImportMap(importMap: Required<ImportMap>): ImportMap {
130+
const compressed: ImportMap = {
133131
imports: { ...importMap.imports },
134132
scopes: {}
135133
};
@@ -179,6 +177,9 @@ export function compressImportMap(
179177
}
180178
});
181179

180+
if (Object.keys(compressed.scopes ?? {}).length === 0) {
181+
Reflect.deleteProperty(compressed, 'scopes');
182+
}
182183
return compressed;
183184
}
184185

@@ -196,9 +197,7 @@ export function createImportMap({
196197
};
197198
}
198199

199-
export function createClientImportMap(
200-
options: GetImportMapOptions
201-
): Required<ImportMap> {
200+
export function createClientImportMap(options: GetImportMapOptions): ImportMap {
202201
const base = createImportMap(options);
203202
const fixed = fixImportMapNestedScopes(base);
204203
return compressImportMap(fixed);

0 commit comments

Comments
 (0)