Repository navigation
Merge main into development - #18
Merged
Merged
Conversation
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>
chore(deps): apply bun group update, hold TypeScript at 6.x
…#17) Bumps the bun group with 7 updates in the / directory: | Package | From | To | | --- | --- | --- | | [@playwright/test](https://github.com/microsoft/playwright) | `1.63.0` | `1.64.1` | | [@screenly/edge-apps](https://github.com/Screenly/edge-apps-library) | `1.5.0` | `26.8.0` | | [@types/bun](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/bun) | `1.4.2` | `1.4.4` | | [bun-types](https://github.com/oven-sh/bun/tree/HEAD/packages/bun-types) | `1.4.2` | `1.4.4` | | [jsdom](https://github.com/jsdom/jsdom) | `30.1.1` | `30.1.3` | | [npm-run-all2](https://github.com/bcomnes/npm-run-all2) | `9.0.3` | `9.0.4` | | [prettier](https://github.com/prettier/prettier) | `3.9.9` | `3.9.10` | Updates `@playwright/test` from 1.63.0 to 1.64.1 - [Release notes](https://github.com/microsoft/playwright/releases) - [Commits](microsoft/playwright@v1.63.0...v1.64.1) Updates `@screenly/edge-apps` from 1.5.0 to 26.8.0 - [Release notes](https://github.com/Screenly/edge-apps-library/releases) - [Commits](Screenly/edge-apps-library@v1.5.0...v26.8.0) Updates `@types/bun` from 1.4.2 to 1.4.4 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/bun) Updates `bun-types` from 1.4.2 to 1.4.4 - [Release notes](https://github.com/oven-sh/bun/releases) - [Commits](https://github.com/oven-sh/bun/commits/bun-v1.4.4/packages/bun-types) Updates `jsdom` from 30.1.1 to 30.1.3 - [Release notes](https://github.com/jsdom/jsdom/releases) - [Commits](jsdom/jsdom@v30.1.1...v30.1.3) Updates `npm-run-all2` from 9.0.3 to 9.0.4 - [Release notes](https://github.com/bcomnes/npm-run-all2/releases) - [Changelog](https://github.com/bcomnes/npm-run-all2/blob/master/CHANGELOG.md) - [Commits](bcomnes/npm-run-all2@v9.0.3...v9.0.4) Updates `prettier` from 3.9.9 to 3.9.10 - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](prettier/prettier@3.9.9...3.9.10) --- updated-dependencies: - dependency-name: "@playwright/test" dependency-version: 1.64.1 dependency-type: direct:development update-type: version-update:semver-minor dependency-group: bun - dependency-name: "@screenly/edge-apps" dependency-version: 26.8.0 dependency-type: direct:development update-type: version-update:semver-major dependency-group: bun - dependency-name: "@types/bun" dependency-version: 1.4.4 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: bun - dependency-name: bun-types dependency-version: 1.4.4 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: bun - dependency-name: jsdom dependency-version: 30.1.3 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: bun - dependency-name: npm-run-all2 dependency-version: 9.0.4 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: bun - dependency-name: prettier dependency-version: 3.9.10 dependency-type: direct:development update-type: version-update:semver-patch dependency-group: bun ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.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.
There was a problem hiding this comment.
🟡 Changes recommended
An active moderate issue remains because the Dependabot ignore range allows TypeScript 6.1.x, which conflicts with the resolved typescript-eslint peer range and could reintroduce the lint incompatibility.
1 open issue
What changed in this PR
This pull request merges main into development, adopting the newer dependency set and synchronizing the lockfile so the downstream branches can merge cleanly.
Changes:
- Updates development dependencies, including
@screenly/edge-appsand related tooling. - Regenerates
bun.lockwith the corresponding dependency resolutions. - Adds Dependabot TypeScript version filtering.
- The Dependabot restriction should also exclude TypeScript 6.1.x to preserve
typescript-eslintcompatibility.
This pull request requires changes.
| File | Description |
|---|---|
package.json |
Updates development dependency versions. |
bun.lock |
Records the updated dependency resolutions and integrity hashes. |
.github/dependabot.yml |
Configures Dependabot TypeScript upgrade filtering. |
Review effort: Lite
Update TypeScript version constraint for compatibility. Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
There was a problem hiding this comment.
🔵 Needs a closer look
The upgrade from @screenly/edge-apps 1.2.1 to 26.8.0 and accompanying build/test toolchain changes require human confirmation that the external CLI and runtime remain compatible.
No open issues 🎉
1 resolved since last review
Review effort: Lite
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.