Skip to content

Commit 488cd74

Browse files
authored
build: separate legacy/no-legacy api-extractor configs (#21448)
- packages without /legacy exports use api-extractor-base.*.no-legacy.json - packages with /legacy exports use api-extractor-base.esm.cuurent.json api-extractor-base.*.primary.json are replaced. - cjs version is exactly .csj.no-legacy.json. - esm version is now .esm.json but is used via .esm.no-legacy.json or .esm.current.json. The few direct references to api-extractor-base.json are replaced with one of the new three files. api-extractor-base.json no longer specifies reportVariants as api-extractor config inheritance does not handle array overrides well. Future: .esm.legacy.json will be added for packages with /legacy exports and handle those APIs specifically.
1 parent 08d838d commit 488cd74

File tree

94 files changed

+117
-106
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+117
-106
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.current.json"
44
}

common/build/build-common/README.md

+8-11

common/build/build-common/api-extractor-base.cjs.primary.json renamed to common/build/build-common/api-extractor-base.cjs.no-legacy.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
"extends": "./api-extractor-base.json",
44
"mainEntryPointFilePath": "<projectFolder>/dist/index.d.ts",
55
"apiReport": {
6-
"enabled": true
6+
"enabled": true,
7+
"reportVariants": ["public", "beta", "alpha"] // TODO: add "complete"?
78
},
89
// API-Extractor uses the presence of this file in an npm package to determine whether or not its API members
910
// should be considered when making decisions about reports and rollups in consuming packages.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3+
"extends": "./api-extractor-base.esm.json",
4+
"apiReport": {
5+
"reportVariants": ["public", "beta", "alpha"] // TODO: add "complete"?
6+
}
7+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3+
"extends": "./api-extractor-base.esm.json",
4+
"apiReport": {
5+
"reportVariants": ["public", "beta", "alpha"] // TODO: add "complete"?
6+
}
7+
}

common/build/build-common/api-extractor-base.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@
2020
"enabled": true,
2121
"reportFileName": "<unscopedPackageName>",
2222
"reportFolder": "<projectFolder>/api-report/",
23-
"reportTempFolder": "<projectFolder>/_api-extractor-temp/",
24-
"reportVariants": ["public", "beta", "alpha"] // TODO: add "complete"?
23+
"reportTempFolder": "<projectFolder>/_api-extractor-temp/"
24+
// https://github.com/microsoft/rushstack/issues/4786 requires the derived configs
25+
// to have the same length reportVariants or longer. Otherwise, later array entries
26+
// bleed thru. So reportVariants should only be set in derived configs.
27+
// "reportVariants": set-in-derived-configs
2528
},
2629

2730
/**
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../build/build-common/api-extractor-base.json"
3+
"extends": "../../build/build-common/api-extractor-base.cjs.no-legacy.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.no-legacy.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.no-legacy.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../../common/build/build-common/api-extractor-base.esm.no-legacy.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.no-legacy.json"
44
}
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../../common/build/build-common/api-extractor-base.esm.no-legacy.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../../../common/build/build-common/api-extractor-base.esm.no-legacy.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.no-legacy.json"
44
}

experimental/dds/tree/api-extractor.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.json",
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.no-legacy.json",
44
"apiReport": {
55
"enabled": true,
66
// Note: `tree.api.md` is the file used for the upcoming tree DDS's API report.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.no-legacy.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.no-legacy.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.no-legacy.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.no-legacy.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.current.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.current.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.current.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.current.json"
44
}

packages/dds/cell/api-extractor.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.no-legacy.json"
44
}
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.current.json"
44
}

packages/dds/ink/api-extractor.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.no-legacy.json"
44
}

packages/dds/map/api-extractor.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.current.json"
44
}
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.current.json"
44
}
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.current.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.current.json"
44
}
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.no-legacy.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.current.json"
44
}
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.current.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.current.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.current.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.current.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.no-legacy.json"
44
}

packages/dds/tree/api-extractor.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json",
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.no-legacy.json",
44
"compiler": {
55
// api-extractor has trouble with Node16 moduleResolution, but Bundler looks okay.
66
"overrideTsconfig": {
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.current.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.no-legacy.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.current.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.no-legacy.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.current.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.current.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.current.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.no-legacy.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.no-legacy.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.current.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.no-legacy.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.no-legacy.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.current.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.current.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.no-legacy.json"
44
}

packages/framework/client-logger/app-insights-logger/api-extractor.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../../common/build/build-common/api-extractor-base.esm.primary.json",
3+
"extends": "../../../../common/build/build-common/api-extractor-base.esm.no-legacy.json",
44
"messages": {
55
// The following overrides are workarounds for API-Extractor incorrectly running analysis on our application
66
// insights dependency.

packages/framework/client-logger/fluid-telemetry/api-extractor.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../../common/build/build-common/api-extractor-base.esm.primary.json",
3+
"extends": "../../../../common/build/build-common/api-extractor-base.esm.current.json",
44
"messages": {
55
// The following overrides are workarounds for API-Extractor incorrectly running analysis on our application
66
// insights dependency.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.no-legacy.json"
44
}
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
22
"$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
3-
"extends": "../../../common/build/build-common/api-extractor-base.esm.primary.json"
3+
"extends": "../../../common/build/build-common/api-extractor-base.esm.no-legacy.json"
44
}

0 commit comments

Comments
 (0)