Skip to content

Commit f90b218

Browse files
break-stuffBurton Smith
break-stuff
and
Burton Smith
authored
feat(web-components): co-locate types with es modules (#34487)
Co-authored-by: Burton Smith <[email protected]>
1 parent 4acf19d commit f90b218

File tree

12 files changed

+40
-91
lines changed

12 files changed

+40
-91
lines changed

‎change/@fluentui-chart-web-components-699c66ba-3e7e-4a2c-81a4-e648eee916a4.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "patch",
3+
"comment": "Co-locate ES modules and type definitions. This should not affect users.",
4+
"packageName": "@fluentui/chart-web-components",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎change/@fluentui-web-components-3cc6ccb8-d354-42e6-852b-294dc7669d9e.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "Co-located types with ES modules. This should not affect users.",
4+
"packageName": "@fluentui/web-components",
5+
"email": "[email protected]",
6+
"dependentChangeType": "patch"
7+
}

‎packages/charts/chart-web-components/package.json‎

Lines changed: 9 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -19,48 +19,20 @@
1919
"unpkg": "dist/chart-web-components.min.js",
2020
"files": [
2121
"*.md",
22-
"dist/dts/",
2322
"dist/esm/",
2423
"dist/*.js",
2524
"dist/*.d.ts"
2625
],
2726
"exports": {
28-
".": {
29-
"types": "./dist/dts/index.d.ts",
30-
"default": "./dist/esm/index.js"
31-
},
32-
"./utilities.js": {
33-
"types": "./dist/dts/utils/index.d.ts",
34-
"default": "./dist/esm/utils/index.js"
35-
},
36-
"./*/define.js": {
37-
"types": "./dist/dts/*/*.define.d.ts",
38-
"default": "./dist/esm/*/*.define.js"
39-
},
40-
"./*/definition.js": {
41-
"types": "./dist/dts/*/*.definition.d.ts",
42-
"default": "./dist/esm/*/*.definition.js"
43-
},
44-
"./*/options.js": {
45-
"types": "./dist/dts/*/*.options.d.ts",
46-
"default": "./dist/esm/*/*.options.js"
47-
},
48-
"./*/styles.js": {
49-
"types": "./dist/dts/*/*.styles.d.ts",
50-
"default": "./dist/esm/*/*.styles.js"
51-
},
52-
"./*/template.js": {
53-
"types": "./dist/dts/*/*.template.d.ts",
54-
"default": "./dist/esm/*/*.template.js"
55-
},
56-
"./*/index.js": {
57-
"types": "./dist/dts/*/index.d.ts",
58-
"default": "./dist/esm/*/index.js"
59-
},
60-
"./*.js": {
61-
"types": "./dist/dts/*/define.d.ts",
62-
"default": "./dist/esm/*/define.js"
63-
},
27+
".": "./dist/esm/index.js",
28+
"./utilities.js": "./dist/esm/utils/index.js",
29+
"./*/define.js": "./dist/esm/*/*.define.js",
30+
"./*/definition.js": "./dist/esm/*/*.definition.js",
31+
"./*/options.js": "./dist/esm/*/*.options.js",
32+
"./*/styles.js": "./dist/esm/*/*.styles.js",
33+
"./*/template.js": "./dist/esm/*/*.template.js",
34+
"./*/index.js": "./dist/esm/*/index.js",
35+
"./*.js": "./dist/esm/*/define.js",
6436
"./package.json": "./package.json"
6537
},
6638
"sideEffects": [

‎packages/charts/chart-web-components/scripts/verify-packaging.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,5 @@ function verifyPackaging(options) {
7474
assert.ok(micromatch(processedResultArr, 'dist/*.(min.js|js)').length, 'ships rolluped js');
7575
assert.equal(micromatch(processedResultArr, 'src/*').length, 0, `wont ship source code from "/src"`);
7676

77-
assert.ok(micromatch(processedResultArr, 'dist/esm/**/*.(js|map)').length, 'ships esm');
78-
assert.ok(micromatch(processedResultArr, 'dist/dts/**/*.d.ts').length, 'ships types');
77+
assert.ok(micromatch(processedResultArr, 'dist/esm/**/*.(js|map|d.ts)').length, 'ships esm');
7978
}

‎packages/charts/chart-web-components/tsconfig.lib.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
"module": "NodeNext",
66
"lib": ["ESNext", "DOM"],
77
"declaration": true,
8-
"declarationDir": "dist/dts",
98
"outDir": "dist/esm",
109
"importHelpers": true
1110
},

‎packages/web-components/custom-elements-manifest.config.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ export default {
2626
modulePathResolverPlugin({
2727
modulePathTemplate: (modulePath, name, tagName) => `./dist/esm/${getFolderName(name)}/${getFileName(name)}`,
2828
definitionPathTemplate: (modulePath, name, tagName) => `./dist/esm/${getFolderName(name)}/define.js`,
29-
typeDefinitionPathTemplate: (modulePath, name, tagName) => `./dist/dts/${getFolderName(name)}/index.d.ts`,
3029
}),
3130
typeParserPlugin(),
3231
cemInheritancePlugin(),

‎packages/web-components/docs/web-components.api.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4528,7 +4528,7 @@ export const zIndexPriority = "var(--zIndexPriority)";
45284528

45294529
// Warnings were encountered during analysis:
45304530
//
4531-
// dist/dts/accordion-item/accordion-item.d.ts:14:5 - (ae-forgotten-export) The symbol "StaticallyComposableHTML" needs to be exported by the entry point index.d.ts
4531+
// dist/esm/accordion-item/accordion-item.d.ts:15:5 - (ae-forgotten-export) The symbol "StaticallyComposableHTML" needs to be exported by the entry point index.d.ts
45324532

45334533
// (No @packageDocumentation comment for this package)
45344534

‎packages/web-components/package.json‎

Lines changed: 11 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -20,57 +20,23 @@
2020
"unpkg": "dist/web-components.min.js",
2121
"files": [
2222
"*.md",
23-
"dist/dts/",
2423
"dist/esm/",
2524
"dist/*.js",
2625
"dist/*.d.ts",
2726
"custom-elements.json"
2827
],
2928
"exports": {
30-
".": {
31-
"types": "./dist/dts/index.d.ts",
32-
"default": "./dist/esm/index.js"
33-
},
34-
"./utilities.js": {
35-
"types": "./dist/dts/utils/index.d.ts",
36-
"default": "./dist/esm/utils/index.js"
37-
},
38-
"./theme/*.js": {
39-
"types": "./dist/dts/theme/*.d.ts",
40-
"default": "./dist/esm/theme/*.js"
41-
},
42-
"./*/base.js": {
43-
"types": "./dist/dts/*/*.base.d.ts",
44-
"default": "./dist/esm/*/*.base.js"
45-
},
46-
"./*/define.js": {
47-
"types": "./dist/dts/*/*.define.d.ts",
48-
"default": "./dist/esm/*/*.define.js"
49-
},
50-
"./*/definition.js": {
51-
"types": "./dist/dts/*/*.definition.d.ts",
52-
"default": "./dist/esm/*/*.definition.js"
53-
},
54-
"./*/options.js": {
55-
"types": "./dist/dts/*/*.options.d.ts",
56-
"default": "./dist/esm/*/*.options.js"
57-
},
58-
"./*/styles.js": {
59-
"types": "./dist/dts/*/*.styles.d.ts",
60-
"default": "./dist/esm/*/*.styles.js"
61-
},
62-
"./*/template.js": {
63-
"types": "./dist/dts/*/*.template.d.ts",
64-
"default": "./dist/esm/*/*.template.js"
65-
},
66-
"./*/index.js": {
67-
"types": "./dist/dts/*/index.d.ts",
68-
"default": "./dist/esm/*/index.js"
69-
},
70-
"./*.js": {
71-
"types": "./dist/dts/*/define.d.ts",
72-
"default": "./dist/esm/*/define.js"
73-
},
29+
".": "./dist/esm/index.js",
30+
"./utilities.js": "./dist/esm/utils/index.js",
31+
"./theme/*.js": "./dist/esm/theme/*.js",
32+
"./*/base.js": "./dist/esm/*/*.base.js",
33+
"./*/define.js": "./dist/esm/*/define.js",
34+
"./*/definition.js": "./dist/esm/*/*.definition.js",
35+
"./*/options.js": "./dist/esm/*/*.options.js",
36+
"./*/styles.js": "./dist/esm/*/*.styles.js",
37+
"./*/template.js": "./dist/esm/*/*.template.js",
38+
"./*/index.js": "./dist/esm/*/index.js",
39+
"./*.js": "./dist/esm/*/define.js",
7440
"./custom-elements.json": "./custom-elements.json",
7541
"./package.json": "./package.json"
7642
},

‎packages/web-components/scripts/verify-packaging.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,5 @@ function verifyPackaging(options) {
7070
assert.ok(micromatch(processedResultArr, 'dist/*.(min.js|js)').length, 'ships rolluped js');
7171
assert.equal(micromatch(processedResultArr, 'src/*').length, 0, `wont ship source code from "/src"`);
7272

73-
assert.ok(micromatch(processedResultArr, 'dist/esm/**/*.(js|map)').length, 'ships esm');
74-
assert.ok(micromatch(processedResultArr, 'dist/dts/**/*.d.ts').length, 'ships types');
73+
assert.ok(micromatch(processedResultArr, 'dist/esm/**/*.(js|map|d.ts)').length, 'ships esm');
7574
}

‎packages/web-components/src/accordion-item/accordion-item.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import { applyMixins } from '../utils/apply-mixins.js';
66
import { BaseAccordionItem } from './accordion-item.base.js';
77
import { AccordionItemMarkerPosition, AccordionItemSize } from './accordion-item.options.js';
88

9+
export type { StaticallyComposableHTML } from '../utils/index.js';
10+
911
/**
1012
* Accordion Item configuration options
1113
*

0 commit comments

Comments
 (0)