-
Notifications
You must be signed in to change notification settings - Fork 557
pnpm dedupe #25559
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
pnpm dedupe #25559
Changes from all commits
d6f1b12
f88be53
fbaf73d
76f2f47
5727146
536d811
9c9c81f
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -99,7 +99,7 @@ | |
| "@fluid-tools/build-cli": "^0.57.0", | ||
| "@fluidframework/build-common": "^2.0.3", | ||
| "@fluidframework/build-tools": "^0.57.0", | ||
| "@microsoft/api-extractor": "^7.45.1", | ||
| "@microsoft/api-extractor": "^7.52.11", | ||
| "c8": "^10.1.3", | ||
| "changesets-format-with-issue-links": "^0.3.0", | ||
| "concurrently": "^8.2.1", | ||
|
|
@@ -138,11 +138,11 @@ | |
| }, | ||
| "pnpm": { | ||
| "commentsOverrides": [ | ||
| "@types/node is overridden to v18 to ensure all packages are building using the v18 types.", | ||
| "@types/node is overridden to v20 to ensure all packages are building using the v20 types, matching the version of note required according to the readme. This also fixes a compile error due to conflicting overloads from multiple versions of the globals in @types/node/module.d.ts", | ||
| "oclif includes some AWS-related features, but we don't use them, so we override those dependencies with empty packages. This helps reduce lockfile churn since the deps release very frequently." | ||
| ], | ||
| "overrides": { | ||
| "@types/node@<18": "^18.19.39", | ||
| "@types/node": "~20.0.0", | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Without this change, the build was filing with a compile error from conflicting global. I made this specific change to align with the readme's required node version. Annoyingly this doesn't seem to fully work as the lock file still has another version in it, but it fixed it enough for the build to work. |
||
| "oclif>@aws-sdk/client-cloudfront": "npm:[email protected]", | ||
| "oclif>@aws-sdk/client-s3": "npm:[email protected]", | ||
| "qs": "^6.11.0", | ||
|
|
@@ -159,7 +159,7 @@ | |
| ] | ||
| }, | ||
| "patchedDependencies": { | ||
| "@microsoft/api-extractor@7.45.1": "patches/@microsoft__api-extractor@7.45.1.patch" | ||
| "@microsoft/api-extractor@7.52.11": "patches/@microsoft__api-extractor@7.52.11.patch" | ||
| } | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,7 +34,7 @@ | |
| "@fluidframework/build-tools": "^0.57.0", | ||
| "@fluidframework/eslint-config-fluid": "^6.0.0", | ||
| "@fluidframework/gitresources-previous": "npm:@fluidframework/[email protected]", | ||
| "@microsoft/api-extractor": "^7.45.1", | ||
| "@microsoft/api-extractor": "^7.52.11", | ||
| "concurrently": "^8.2.1", | ||
| "copyfiles": "^2.4.1", | ||
| "eslint": "~8.55.0", | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -37,7 +37,7 @@ | |
| "@fluidframework/build-tools": "^0.57.0", | ||
| "@fluidframework/eslint-config-fluid": "^6.0.0", | ||
| "@fluidframework/server-kafka-orderer-previous": "npm:@fluidframework/[email protected]", | ||
| "@types/node": "^18.19.39", | ||
| "@types/node": "~20.0.0", | ||
| "concurrently": "^8.2.1", | ||
| "eslint": "~8.55.0", | ||
| "prettier": "~3.0.3", | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -76,11 +76,11 @@ | |
| "@fluidframework/build-tools": "^0.57.0", | ||
| "@fluidframework/eslint-config-fluid": "^6.0.0", | ||
| "@fluidframework/server-local-server-previous": "npm:@fluidframework/[email protected]", | ||
| "@microsoft/api-extractor": "^7.45.1", | ||
| "@microsoft/api-extractor": "^7.52.11", | ||
| "@types/jsrsasign": "^10.5.12", | ||
| "@types/mocha": "^10.0.1", | ||
| "@types/nock": "^9.3.0", | ||
| "@types/node": "^18.19.39", | ||
| "@types/node": "~20.0.0", | ||
| "@types/sinon": "^17.0.3", | ||
| "c8": "^10.1.3", | ||
| "concurrently": "^8.2.1", | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -70,10 +70,10 @@ | |
| "@fluidframework/build-tools": "^0.57.0", | ||
| "@fluidframework/eslint-config-fluid": "^6.0.0", | ||
| "@fluidframework/protocol-base-previous": "npm:@fluidframework/[email protected]", | ||
| "@microsoft/api-extractor": "^7.45.1", | ||
| "@microsoft/api-extractor": "^7.52.11", | ||
| "@types/assert": "^1.5.1", | ||
| "@types/mocha": "^10.0.1", | ||
| "@types/node": "^18.19.39", | ||
| "@types/node": "~20.0.0", | ||
| "c8": "^10.1.3", | ||
| "concurrently": "^8.2.1", | ||
| "copyfiles": "^2.4.1", | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -79,11 +79,11 @@ | |
| "@fluidframework/build-tools": "^0.57.0", | ||
| "@fluidframework/eslint-config-fluid": "^6.0.0", | ||
| "@fluidframework/server-services-client-previous": "npm:@fluidframework/[email protected]", | ||
| "@microsoft/api-extractor": "^7.45.1", | ||
| "@microsoft/api-extractor": "^7.52.11", | ||
| "@types/debug": "^4.1.5", | ||
| "@types/jsrsasign": "^10.5.12", | ||
| "@types/mocha": "^10.0.1", | ||
| "@types/node": "^18.19.39", | ||
| "@types/node": "~20.0.0", | ||
| "axios-mock-adapter": "^1.19.0", | ||
| "c8": "^10.1.3", | ||
| "concurrently": "^8.2.1", | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -65,7 +65,7 @@ | |
| "@fluidframework/eslint-config-fluid": "^6.0.0", | ||
| "@fluidframework/server-services-telemetry-previous": "npm:@fluidframework/[email protected]", | ||
| "@types/mocha": "^10.0.1", | ||
| "@types/node": "^18.19.39", | ||
| "@types/node": "~20.0.0", | ||
| "@types/sinon": "^17.0.3", | ||
| "@types/supertest": "^2.0.5", | ||
| "c8": "^10.1.3", | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -76,7 +76,7 @@ | |
| "@fluidframework/server-test-utils-previous": "npm:@fluidframework/[email protected]", | ||
| "@types/lodash": "^4.14.118", | ||
| "@types/mocha": "^10.0.1", | ||
| "@types/node": "^18.19.39", | ||
| "@types/node": "~20.0.0", | ||
| "@types/sinon": "^17.0.3", | ||
| "@types/string-hash": "^1.1.1", | ||
| "c8": "^10.1.3", | ||
|
|
||
This file was deleted.
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,44 @@ | ||||||||||||||
| diff --git a/lib/enhancers/ValidationEnhancer.js b/lib/enhancers/ValidationEnhancer.js | ||||||||||||||
| index cdb0b22ed2e06592ea1c5f9dd3d18ae2c51b2484..202d2f0b44dad1206fff946e0275bba1e6691ade 100644 | ||||||||||||||
| --- a/lib/enhancers/ValidationEnhancer.js | ||||||||||||||
| +++ b/lib/enhancers/ValidationEnhancer.js | ||||||||||||||
| @@ -187,7 +187,8 @@ class ValidationEnhancer { | ||||||||||||||
| else { | ||||||||||||||
| continue; | ||||||||||||||
| } | ||||||||||||||
| - if (collectorEntity && collectorEntity.consumable) { | ||||||||||||||
| + // BUG MITIGATION: Always check release tag compatibility. | ||||||||||||||
|
||||||||||||||
| + // BUG MITIGATION: Always check release tag compatibility. | |
| + // BUG MITIGATION: Previously, release tag compatibility was only checked when collectorEntity.consumable was true. | |
| + // This led to missed analyzer issues when entities were not marked as consumable, causing incorrect API surface validation. | |
| + // To ensure all relevant symbols are checked for release tag compatibility, this block always performs the comparison, | |
| + // regardless of the consumable status. This mitigates bugs where incompatible release tags were not reported. |
Copilot
AI
Sep 26, 2025
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[nitpick] The comment 'PATCH: Don't emit imports' should explain why imports are not being emitted. This could help future maintainers understand the reasoning behind this patch modification.
| + // PATCH: Don't emit imports | |
| + // PATCH: Don't emit imports. | |
| + // This patch disables emitting import statements in the generated API report. | |
| + // Rationale: Emitting imports can cause issues with downstream consumers of the API report, | |
| + // such as breaking type resolution or introducing unwanted dependencies. By omitting imports, | |
| + // we ensure the API report remains self-contained and compatible with our tooling and usage patterns. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The dedup caused the exact version of @microsoft/api-extractor to change, and since we have a patch for it, that broke.
To fix it I just updated the version to match client, which also removed the imports from the API reports.