Skip to content

Merge stable into develop - #10057

Closed
polmichel wants to merge 6 commits into
developfrom
pmi-merge-stable-into-develop-1
Closed

Merge stable into develop#10057
polmichel wants to merge 6 commits into
developfrom
pmi-merge-stable-into-develop-1

Conversation

@polmichel

@polmichel polmichel commented Jul 28, 2026

Copy link
Copy Markdown
Contributor

Supersedes #10056, which was blocked on merge conflicts.

Summary

Merges stable into develop. This is a dependency/lockfile-only sync — stable contributed no backend Python changes, so there is no source-level merge risk.

Conflicts resolved

  • python_sdk (submodule, diverged) — kept --ours (SDK infrahub-develop tip 681b458); develop continues tracking infrahub-develop per AGENTS.md. Stable's SDK release 1.22.2 (13f26b0) and its percent-encode-branch-name fix land on develop later via the SDK's own stable → infrahub-develop sync PR, not this superproject merge. (b31814a0)
  • frontend/pnpm-lock.yaml — the lockfile moved from frontend/app/ (stable) to the frontend/ pnpm-workspace root (develop); regenerated with the pinned pnpm@10.33.2 --lockfile-only at develop's workspace layout. (4c548599)

Auto-merged (no conflict)

  • frontend/app/package.jsonreact-router ^7.18.0 → ^8.3.0 (stable bump)
  • uv.lockgitpython 3.1.52 → 3.1.54
  • docs/package-lock.json, frontend/packages/plugins/template/* — dependency bumps

Validation

  • uv lock --check — lock matches pyproject.toml
  • pnpm@10.33.2 install --lockfile-only — lockfile resolves cleanly, no conflict markers
  • Not run (no running stack / out of scope for a dep-only sync): backend/frontend test suites, frontend build

🤖 Generated with Claude Code

Review in cubic

dependabot Bot and others added 6 commits July 27, 2026 07:30
Bumps the uv group with 1 update in the / directory: [gitpython](https://github.com/gitpython-developers/GitPython).


Updates `gitpython` from 3.1.52 to 3.1.54
- [Release notes](https://github.com/gitpython-developers/GitPython/releases)
- [Changelog](https://github.com/gitpython-developers/GitPython/blob/main/CHANGES)
- [Commits](gitpython-developers/GitPython@3.1.52...3.1.54)

---
updated-dependencies:
- dependency-name: gitpython
  dependency-version: 3.1.54
  dependency-type: direct:production
  dependency-group: uv
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Update python_sdk to version v1.22.2 against stable
…updates (#10043)

Bumps the npm_and_yarn group with 1 update in the /frontend/app directory: [react-router](https://github.com/remix-run/react-router/tree/HEAD/packages/react-router).
Bumps the npm_and_yarn group with 2 updates in the /frontend/packages/plugins/template directory: [brace-expansion](https://github.com/juliangruber/brace-expansion) and [postcss](https://github.com/postcss/postcss).


Updates `react-router` from 7.18.0 to 8.3.0
- [Release notes](https://github.com/remix-run/react-router/releases)
- [Changelog](https://github.com/remix-run/react-router/blob/main/packages/react-router/CHANGELOG.md)
- [Commits](https://github.com/remix-run/react-router/commits/react-router@8.3.0/packages/react-router)

Updates `brace-expansion` from 1.1.16 to 5.0.8
- [Release notes](https://github.com/juliangruber/brace-expansion/releases)
- [Commits](juliangruber/brace-expansion@v1.1.16...v5.0.8)

Updates `postcss` from 8.5.15 to 8.5.23
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](postcss/postcss@8.5.15...8.5.23)

Updates `esbuild` from 0.25.2 to 0.25.12
- [Release notes](https://github.com/evanw/esbuild/releases)
- [Changelog](https://github.com/evanw/esbuild/blob/main/CHANGELOG-2025.md)
- [Commits](evanw/esbuild@v0.25.2...v0.25.12)

---
updated-dependencies:
- dependency-name: react-router
  dependency-version: 8.3.0
  dependency-type: direct:production
  dependency-group: npm_and_yarn
- dependency-name: brace-expansion
  dependency-version: 5.0.8
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: postcss
  dependency-version: 8.5.23
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: esbuild
  dependency-version: 0.25.12
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…to-develop-1

# Conflicts:
#	frontend/pnpm-lock.yaml
#	python_sdk
The lockfile moved from frontend/app/ (stable) to the frontend/ pnpm
workspace root (develop). Regenerated with the pinned pnpm@10.33.2
(--lockfile-only) at develop's workspace layout.
@github-actions github-actions Bot added type/documentation Improvements or additions to documentation group/frontend Issue related to the frontend (React) labels Jul 28, 2026
@codspeed-hq

codspeed-hq Bot commented Jul 28, 2026

Copy link
Copy Markdown

Merging this PR will not alter performance

✅ 12 untouched benchmarks


Comparing pmi-merge-stable-into-develop-1 (4c54859) with develop (fe8fb2c)

Open in CodSpeed

@cubic-dev-ai cubic-dev-ai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

2 issues found across 6 files

Confidence score: 2/5

  • In frontend/packages/plugins/template/package.json, setting eslint to ^10.8.0 while the template still uses .eslintrc.cjs means linting in this template can stop working outright (ESLint v10 expects flat config), which is a concrete regression for anyone generating or validating projects — migrate to eslint.config.* or keep ESLint on a compatible major until that migration is done.
  • In frontend/packages/plugins/template/package.json, eslint-plugin-react-hooks@4.6.0 is peer-incompatible with ESLint 10, so strict installs (for example with pnpm peer checks) can warn or fail and block setup/CI for consumers of the template — bump eslint-plugin-react-hooks to a version that declares ESLint 10 support.
Prompt for AI agents (unresolved issues)

Check if these issues are valid — if so, understand the root cause of each and fix them. If appropriate, use sub-agents to investigate and fix each issue separately.


<file name="frontend/packages/plugins/template/package.json">

<violation number="1" location="frontend/packages/plugins/template/package.json:29">
P1: eslint-plugin-react-hooks@4.6.0 is peer-dependency incompatible with eslint ^10.8.0 — the plugin's peerDependencies cap at eslint ^8, so installs with pnpm (or strict peer checks) will warn or fail. Bump the plugin to a release that supports eslint 10 (e.g. ^7.1.1).</violation>

<violation number="2" location="frontend/packages/plugins/template/package.json:29">
P1: The eslint bump from v8 to v10 (`^10.8.0`) is incompatible with the template's `.eslintrc.cjs` config file. ESLint v10 requires flat config (`eslint.config.*`) and no longer loads `.eslintrc.*` files. Running `pnpm lint` in the template would produce no meaningful lint results or fail entirely.

To resolve this, either: (1) revert eslint to `^9.17.x` (the latest v9, which still supports `.eslintrc.*` via its compatibility mode), or (2) migrate the template to flat config (`eslint.config.js`) and keep eslint v10.</violation>
</file>

Shadow auto-approve: would not auto-approve because issues were found.

Re-trigger cubic

"@typescript-eslint/parser": "^8.65.0",
"@vitejs/plugin-react": "^4.2.1",
"eslint": "^8.57.0",
"eslint": "^10.8.0",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

P1: eslint-plugin-react-hooks@4.6.0 is peer-dependency incompatible with eslint ^10.8.0 — the plugin's peerDependencies cap at eslint ^8, so installs with pnpm (or strict peer checks) will warn or fail. Bump the plugin to a release that supports eslint 10 (e.g. ^7.1.1).

Prompt for AI agents
Check if this issue is valid — if so, understand the root cause and fix it. At frontend/packages/plugins/template/package.json, line 29:

<comment>eslint-plugin-react-hooks@4.6.0 is peer-dependency incompatible with eslint ^10.8.0 — the plugin's peerDependencies cap at eslint ^8, so installs with pnpm (or strict peer checks) will warn or fail. Bump the plugin to a release that supports eslint 10 (e.g. ^7.1.1).</comment>

<file context>
@@ -16,17 +16,17 @@
+    "@typescript-eslint/parser": "^8.65.0",
     "@vitejs/plugin-react": "^4.2.1",
-    "eslint": "^8.57.0",
+    "eslint": "^10.8.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.6",
</file context>

"@typescript-eslint/parser": "^8.65.0",
"@vitejs/plugin-react": "^4.2.1",
"eslint": "^8.57.0",
"eslint": "^10.8.0",

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

P1: The eslint bump from v8 to v10 (^10.8.0) is incompatible with the template's .eslintrc.cjs config file. ESLint v10 requires flat config (eslint.config.*) and no longer loads .eslintrc.* files. Running pnpm lint in the template would produce no meaningful lint results or fail entirely.

To resolve this, either: (1) revert eslint to ^9.17.x (the latest v9, which still supports .eslintrc.* via its compatibility mode), or (2) migrate the template to flat config (eslint.config.js) and keep eslint v10.

Prompt for AI agents
Check if this issue is valid — if so, understand the root cause and fix it. At frontend/packages/plugins/template/package.json, line 29:

<comment>The eslint bump from v8 to v10 (`^10.8.0`) is incompatible with the template's `.eslintrc.cjs` config file. ESLint v10 requires flat config (`eslint.config.*`) and no longer loads `.eslintrc.*` files. Running `pnpm lint` in the template would produce no meaningful lint results or fail entirely.

To resolve this, either: (1) revert eslint to `^9.17.x` (the latest v9, which still supports `.eslintrc.*` via its compatibility mode), or (2) migrate the template to flat config (`eslint.config.js`) and keep eslint v10.</comment>

<file context>
@@ -16,17 +16,17 @@
+    "@typescript-eslint/parser": "^8.65.0",
     "@vitejs/plugin-react": "^4.2.1",
-    "eslint": "^8.57.0",
+    "eslint": "^10.8.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.6",
</file context>

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

Labels

group/frontend Issue related to the frontend (React) type/documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants