Skip to content

Merge main into development - #19

Merged
salmanfarisvp merged 4 commits into
developmentfrom
sync/default-into-development
Oct 29, 2026
Merged

salmanfarisvp merged 4 commits into
developmentfrom
sync/default-into-development

Conversation

@salmanfarisvp

Copy link
Copy Markdown
Member

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 ^1.5.0.

Verification

bun install --frozen-lockfile, format:check, lint, build and test pass locally on this branch.

Merge this first, then the development → main PR.

vpetersson-bot and others added 3 commits September 29, 2026 08:16
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
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 ^1.5.0.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🟡 Changes recommended

The Dependabot ignore range still permits unsupported TypeScript 6.1+ updates, leaving an active compatibility issue that could break linting.

1 open issue
What changed in this PR

This pull request synchronizes development with main by adopting main’s newer dependency set and refreshing the Bun lockfile so the downstream merge can proceed cleanly.

Changes:

  • Updates development dependencies, including @screenly/edge-apps, Playwright, JSDOM, Bun types, Prettier, and npm-run-all2.
  • Regenerates bun.lock with the updated dependency graph and resolved packages.
  • Configures Dependabot grouping and TypeScript version exclusions.

Review note: .github/dependabot.yml has a moderate issue (3 votes): its >=7 ignore range does not prevent updates to unsupported TypeScript 6.1.x releases. The ignored range should start at 6.1 or otherwise cover all unsupported versions.

This pull request requires changes.

File Description
package.json Updates the project’s development dependency versions.
bun.lock Records the resolved versions and dependency graph for the updated packages.
.github/​dependabot.yml Configures grouped Bun updates and a TypeScript version ignore rule.

Review effort: Lite

Comment thread .github/dependabot.yml Outdated
Update TypeScript version constraint to support linting.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Copilot AI lite review requested due to automatic review settings October 29, 2026 17:53
@salmanfarisvp
salmanfarisvp merged commit 8f01593 into development Oct 29, 2026
1 of 2 checks passed
@salmanfarisvp
salmanfarisvp deleted the sync/default-into-development branch October 29, 2026 17:54

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

🟢 Approval recommended

No outstanding review blockers remain for the dependency and lockfile synchronization changes.

No open issues 🎉

1 resolved since last review

Review effort: Lite

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