Skip to content

Conversation

@artemmufazalov
Copy link
Member

@artemmufazalov artemmufazalov commented Dec 1, 2025

By mistake I made my rsbuild PR with 10 npm: #3137

Now package.lock is regenerated with correct 11 npm, dependency conflict with canvas is fixed

CI Results

Test Status: ⚠️ FLAKY

📊 Full Report

Total Passed Failed Flaky Skipped
378 374 0 2 2
Test Changes Summary ⏭️2

⏭️ Skipped Tests (2)

  1. Scroll to row, get shareable link, navigate to URL and verify row is scrolled into view (tenant/diagnostics/tabs/queries.test.ts)
  2. Copy result button copies to clipboard (tenant/queryEditor/queryEditor.test.ts)

Bundle Size: ✅

Current: 62.32 MB | Main: 62.32 MB
Diff: 0.00 KB (0.00%)

✅ Bundle size unchanged.

ℹ️ CI Information
  • Test recordings for failed tests are available in the full report.
  • Bundle size is measured for the entire 'dist' directory.
  • 📊 indicates links to detailed reports.
  • 🔺 indicates increase, 🔽 decrease, and ✅ no change in bundle size.

Greptile Overview

Greptile Summary

This PR regenerates package-lock.json with npm 11 (correcting the previous npm 10 version used in PR #3137) and resolves a canvas dependency conflict by adding it to the overrides section.

Key changes:

  • Added canvas ^2.11.2 to package.json overrides to resolve peer dependency conflict
  • Regenerated package-lock.json with npm 11, resulting in lockfileVersion 3 format
  • canvas package added as optional dependency with native build support via @mapbox/node-pre-gyp
  • Adjusted peer dependency flags across multiple packages (some removed, some added) as part of npm 11's dependency resolution

The changes are administrative in nature - no functional code is modified. This ensures proper dependency alignment and resolves the canvas conflict that may have been causing installation issues.

Confidence Score: 5/5

  • This PR is safe to merge with no risks
  • Score reflects that this is a lockfile regeneration and dependency override fix with no code changes. The canvas dependency conflict resolution is correctly implemented using npm overrides, and the lockfile regeneration with npm 11 follows standard npm upgrade patterns. No functional code is modified.
  • No files require special attention

Important Files Changed

File Analysis

Filename Score Overview
package.json 5/5 Added canvas ^2.11.2 to overrides section to resolve peer dependency conflict
package-lock.json 5/5 Regenerated with npm 11, added canvas as optional dependency with @mapbox/node-pre-gyp support, adjusted peer dependency flags

Sequence Diagram

sequenceDiagram
    participant Dev as Developer
    participant npm as npm 11
    participant pkg as package.json
    participant lock as package-lock.json
    participant canvas as canvas package
    
    Dev->>pkg: Add canvas to overrides
    Note over pkg: canvas: ^2.11.2
    Dev->>npm: Run npm install
    npm->>pkg: Read package.json
    npm->>pkg: Process overrides section
    npm->>canvas: Resolve canvas dependency
    canvas->>npm: Return version 2.11.2
    npm->>lock: Generate lockfileVersion 3
    Note over lock: Update peer flags
    Note over lock: Add @mapbox/node-pre-gyp
    lock-->>npm: Lockfile updated
    npm-->>Dev: Installation complete
Loading

"typescript": "$typescript",
"monaco-editor": "$monaco-editor"
"monaco-editor": "$monaco-editor",
"canvas": "^2.11.2"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's optional peer in jest-environment-jsdom@30.2.0 - it requires canvas@3.0.0. Also it's required by paranoid.

jest-environment-jsdom is used for tests and works well with lower canvas version, so I set version to what is required by paranoid.

This override can be deleted, when we get rid of paranoid and move to graph.

@artemmufazalov artemmufazalov marked this pull request as ready for review December 1, 2025 15:09
Copilot AI review requested due to automatic review settings December 1, 2025 15:09
@artemmufazalov artemmufazalov added this pull request to the merge queue Dec 1, 2025
Copy link
Contributor

@greptile-apps greptile-apps bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1 file reviewed, no comments

Edit Code Review Agent Settings | Greptile

Merged via the queue into main with commit 3e64426 Dec 1, 2025
13 checks passed
@artemmufazalov artemmufazalov deleted the npm-11 branch December 1, 2025 15:14
Copilot finished reviewing on behalf of artemmufazalov December 1, 2025 15:15
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR regenerates package-lock.json with npm 11 (correcting the mistake from PR #3137 which used npm 10) and resolves a dependency conflict with the canvas package by adding it to the overrides section.

Key changes:

  • Added canvas: ^2.11.2 to package.json overrides to resolve dependency conflicts
  • Regenerated package-lock.json with npm 11, which updates peer dependency metadata
  • Canvas package is correctly marked as optional since it's only needed for Node.js server-side rendering (used by the qrcode library)

Reviewed changes

Copilot reviewed 1 out of 2 changed files in this pull request and generated no comments.

File Description
package.json Added canvas: ^2.11.2 to overrides section to resolve dependency conflict with the qrcode package
package-lock.json Regenerated lockfile with npm 11, updating peer dependency flags and adding canvas 2.11.2 as an optional dependency

You can also share your feedback on Copilot code review for a chance to win a $100 gift card. Take the survey.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants