You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
main has commits that never came back to development, so the development → main PR conflicts. This merges main into development so that PR merges cleanly.
Resolution
Conflict in package.json/bun.lock: took main's newer dependency set. development only bumped @screenly/edge-apps to ^1.2.1, and main already has ^26.8.0.
Verification
bun install --frozen-lockfile, format:check, lint, build and test pass locally on this branch.
Dependabot's grouped bun update bumps TypeScript to 7.0.2, which breaks
`bun run lint`:
TypeError: undefined is not an object (evaluating 'ts.Extension.Cjs')
at @typescript-eslint/typescript-estree/dist/create-program/shared.js
`@screenly/edge-apps` lints via typescript-eslint 8.x, whose supported
TypeScript range is `>=4.8.4 <6.1.0`. TypeScript 7 is outside it, so the
ESLint TypeScript parser fails to load before any rule runs.
This applies every other dependency in the group and keeps TypeScript on
6.x, and adds a Dependabot `ignore` entry for `typescript >=7` so the
break is not reproposed each month. Drop that entry once typescript-eslint
declares TypeScript 7 support.
Verified locally: `bun run lint`, `type-check`, `test` and `build` all pass.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
main has commits that never came back to development, so a development -> main
PR conflicts. Bring them in here first.
Conflict in `package.json`/`bun.lock`: took `main`'s newer dependency set. `development` only bumped `@screenly/edge-apps` to ^1.2.1, and `main` already has ^26.8.0.
The reason will be displayed to describe this comment to others. Learn more.
🟡 Changes recommended
The Dependabot ignore rule permits TypeScript 6.1 updates despite the lint toolchain requiring versions below 6.1, which could cause bun run lint to fail.
This pull request synchronizes development with main by adopting the newer dependency set and regenerating the Bun lockfile, allowing the branches to merge cleanly.
Changes:
Updates application and development dependencies in package.json.
Regenerates bun.lock with the corresponding dependency graph.
Adds a Dependabot TypeScript version safeguard.
Review note: The Dependabot ignore rule should also prevent upgrades to TypeScript 6.1 and later, since the lint toolchain supports versions below 6.1.
File
Description
package.json
Updates project dependency versions.
bun.lock
Records resolved versions and transitive dependency changes.
.github/dependabot.yml
Adds TypeScript version-management constraints for Dependabot.
The reason will be displayed to describe this comment to others. Learn more.
🔵 Needs a closer look
Active moderate issues remain because TypeScript 6.0.3 is incompatible with the locked lint toolchain’s <6.0.0 peer range, and the Dependabot ignore threshold does not prevent that unsupported upgrade.
No open issues 🎉
1 previously missed issue
In code that hasn't changed since last review
TypeScript 6.0.3 is incompatible with the lint toolchain
package.json:33
This direct compiler version is outside the peer range of the lint toolchain selected in the lockfile: typescript-eslint@8.57.2 and its parser packages declare typescript >=4.8.4 <6.0.0, but this change installs TypeScript 6.0.3. That leaves edge-apps-scripts lint on an unsupported TypeScript/parser combination; keep the project on the supported 5.9 line or upgrade the edge-apps lint stack together.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
mainhas commits that never came back todevelopment, so thedevelopment→mainPR conflicts. This mergesmainintodevelopmentso that PR merges cleanly.Resolution
Conflict in
package.json/bun.lock: tookmain's newer dependency set.developmentonly bumped@screenly/edge-appsto ^1.2.1, andmainalready has ^26.8.0.Verification
bun install --frozen-lockfile,format:check,lint,buildandtestpass locally on this branch.Merge this first, then the
development→mainPR.