Skip to content

fix: resolve merge conflicts between dependabot production-deps bump and main #707

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Copilot wants to merge 4 commits into from
Closed

fix: resolve merge conflicts between dependabot production-deps bump and main #707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
35c296d
chore(deps)(deps): bump the production-dependencies group with 8 updates
dependabot[bot] Feb 18, 2026
9d71642
Initial plan
Copilot Feb 18, 2026
d7ecdd1
fix: resolve merge conflict by updating devDependencies to match main
Copilot Feb 18, 2026
5e72049
merge: resolve conflicts between dependabot branch and main
Copilot Feb 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/patch-release.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@objectstack/spec": patch
---

Migrate CLI architecture to oclif framework
Comment on lines +1 to +5
Copy link

Copilot AI Feb 18, 2026

Choose a reason for hiding this comment

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

The changeset content describes "Migrate CLI architecture to oclif framework" which doesn't match this PR's purpose of resolving merge conflicts. This changeset should either be removed or replaced with one that describes the dependency updates from the dependabot PR.

Copilot uses AI. Check for mistakes.
2 changes: 1 addition & 1 deletion ROADMAP.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ObjectStack Protocol — Road Map

> **Last Updated:** 2026-02-16
> **Current Version:** v3.0.2
> **Current Version:** v3.0.6
Copy link

Copilot AI Feb 18, 2026

Choose a reason for hiding this comment

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

The ROADMAP version has been bumped from v3.0.2 to v3.0.6, which is a significant jump (4 patch versions). Please verify that this version accurately reflects the current state. If this PR is simply resolving merge conflicts for a dependabot update, the version change might be premature or should be explained in the PR description.

Copilot uses AI. Check for mistakes.
> **Status:** Protocol Specification Complete · Runtime Implementation In Progress

---
Expand Down
12 changes: 6 additions & 6 deletions apps/docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,22 @@
"postinstall": "fumadocs-mdx"
},
"dependencies": {
"fumadocs-core": "16.5.2",
"fumadocs-core": "16.6.3",
"fumadocs-mdx": "14.2.7",
"fumadocs-ui": "16.5.2",
"lucide-react": "^0.563.0",
"fumadocs-ui": "16.6.3",
"lucide-react": "^0.574.0",
"next": "16.1.6",
"react": "^19.2.4",
"react-dom": "^19.2.4",
"tailwind-merge": "^3.4.0"
"tailwind-merge": "^3.4.1"
},
"devDependencies": {
"@objectstack/spec": "workspace:*",
"@tailwindcss/postcss": "^4.1.18",
"@types/mdx": "^2.0.13",
"@types/negotiator": "^0.6.4",
"@types/node": "^25.2.2",
"@types/react": "^19.2.13",
"@types/node": "^25.2.3",
"@types/react": "^19.2.14",
"@types/react-dom": "^19.2.3",
"negotiator": "^1.0.0",
"postcss": "^8.5.6",
Expand Down
14 changes: 7 additions & 7 deletions apps/studio/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,21 +42,21 @@
"@radix-ui/react-tooltip": "^1.2.8",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"lucide-react": "^0.563.0",
"lucide-react": "^0.574.0",
"react": "^19.2.4",
"react-dom": "^19.2.4",
"react-resizable-panels": "^4.6.2",
"tailwind-merge": "^3.4.0"
"react-resizable-panels": "^4.6.4",
"tailwind-merge": "^3.4.1"
},
"devDependencies": {
"@objectstack/cli": "workspace:*",
"@tailwindcss/postcss": "^4.1.18",
"@types/react": "^19.2.13",
"@types/react": "^19.2.14",
"@types/react-dom": "^19.2.3",
"@vitejs/plugin-react": "^5.1.3",
"@vitejs/plugin-react": "^5.1.4",
"autoprefixer": "^10.4.24",
"happy-dom": "^20.5.3",
"msw": "^2.12.9",
"happy-dom": "^20.6.2",
"msw": "^2.12.10",
"postcss": "^8.5.6",
"tailwindcss": "^4.1.18",
"typescript": "^5.0.0",
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
"license": "Apache-2.0",
"devDependencies": {
"@changesets/cli": "^2.27.1",
"@types/node": "^25.2.2",
"@types/node": "^25.2.3",
"tsup": "^8.0.2",
"tsx": "^4.21.0",
"turbo": "^2.8.3",
"turbo": "^2.8.9",
"typescript": "^5.3.0"
},
"dependencies": {
Expand All @@ -42,7 +42,7 @@
"@objectstack/plugin-hono-server": "workspace:*",
"@objectstack/runtime": "workspace:*",
"@objectstack/spec": "workspace:*",
"lucide-react": "^0.563.0"
"lucide-react": "^0.574.0"
},
"engines": {
"node": ">=18.0.0"
Expand Down
8 changes: 4 additions & 4 deletions packages/adapters/nestjs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
"test:watch": "vitest"
},
"peerDependencies": {
"@nestjs/common": "^11.1.13",
"@nestjs/core": "^11.1.13",
"@nestjs/common": "^11.1.14",
"@nestjs/core": "^11.1.14",
"@objectstack/runtime": "workspace:*"
},
"devDependencies": {
"@nestjs/common": "^11.1.13",
"@nestjs/core": "^11.1.13",
"@nestjs/common": "^11.1.14",
"@nestjs/core": "^11.1.14",
"@objectstack/runtime": "workspace:*",
"typescript": "^5.0.0",
"vitest": "^4.0.18"
Expand Down
4 changes: 2 additions & 2 deletions packages/adapters/sveltekit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
},
"peerDependencies": {
"@objectstack/runtime": "workspace:*",
"@sveltejs/kit": "^2.21.5"
"@sveltejs/kit": "^2.52.0"
},
"devDependencies": {
"@objectstack/runtime": "workspace:*",
"@sveltejs/kit": "^2.21.5",
"@sveltejs/kit": "^2.52.0",
"typescript": "^5.0.0",
"vitest": "^4.0.18"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"devDependencies": {
"@oclif/plugin-help": "^6.2.37",
"@oclif/plugin-plugins": "^5.4.56",
"@types/node": "^25.2.2",
"@types/node": "^25.2.3",
"tsup": "^8.0.2",
"typescript": "^5.3.3",
"vitest": "^4.0.18"
Expand Down
2 changes: 1 addition & 1 deletion packages/client-react/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@objectstack/core": "workspace:*"
},
"devDependencies": {
"@types/react": "^19.2.13",
"@types/react": "^19.2.14",
"typescript": "^5.0.0"
}
}
2 changes: 1 addition & 1 deletion packages/client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@objectstack/plugin-hono-server": "workspace:*",
"@objectstack/plugin-msw": "workspace:*",
"@objectstack/runtime": "workspace:*",
"msw": "^2.12.9",
"msw": "^2.12.10",
"typescript": "^5.0.0",
"vitest": "^4.0.18"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
"devDependencies": {
"typescript": "^5.0.0",
"vitest": "^4.0.18",
"@types/node": "^25.2.2"
"@types/node": "^25.2.3"
},
"dependencies": {
"@objectstack/spec": "workspace:*",
"pino": "^10.3.0",
"pino": "^10.3.1",
"pino-pretty": "^13.1.3",
"zod": "^4.3.6"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/create-objectstack/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"commander": "^14.0.3"
},
"devDependencies": {
"@types/node": "^25.2.2",
"@types/node": "^25.2.3",
"tsup": "^8.0.2",
"typescript": "^5.3.3"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/metadata/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,14 @@
"@objectstack/core": "workspace:*",
"@objectstack/spec": "workspace:*",
"@objectstack/types": "workspace:*",
"glob": "^13.0.1",
"glob": "^13.0.5",
"js-yaml": "^4.1.0",
"chokidar": "^5.0.0",
"zod": "^4.3.6"
},
"devDependencies": {
"@types/js-yaml": "^4.0.9",
"@types/node": "^25.2.2",
"@types/node": "^25.2.3",
"typescript": "^5.0.0",
"vitest": "^4.0.18"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/driver-memory/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"mingo": "^7.1.1"
},
"devDependencies": {
"@types/node": "^25.2.2",
"@types/node": "^25.2.3",
"typescript": "^5.0.0",
"vitest": "^4.0.18"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/plugin-auth/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},
"devDependencies": {
"@objectstack/cli": "workspace:*",
"@types/node": "^25.2.2",
"@types/node": "^25.2.3",
"typescript": "^5.0.0",
"vitest": "^4.0.18"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/plugin-dev/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"@objectstack/plugin-hono-server": "workspace:*",
"@objectstack/plugin-security": "workspace:*",
"@objectstack/rest": "workspace:*",
"@types/node": "^25.2.2",
"@types/node": "^25.2.3",
"typescript": "^5.0.0",
"vitest": "^4.0.18"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/plugin-hono-server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"hono": "^4.11.9"
},
"devDependencies": {
"@types/node": "^25.2.2",
"@types/node": "^25.2.3",
"typescript": "^5.0.0",
"vitest": "^4.0.18"
}
Expand Down
4 changes: 2 additions & 2 deletions packages/plugins/plugin-msw/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
"@objectstack/objectql": "workspace:*",
"@objectstack/spec": "workspace:*",
"@objectstack/types": "workspace:*",
"msw": "^2.12.9"
"msw": "^2.12.10"
},
"devDependencies": {
"@objectstack/runtime": "workspace:*",
"@types/node": "^25.2.2",
"@types/node": "^25.2.3",
"typescript": "^5.0.0",
"vitest": "^4.0.18"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/plugin-security/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@objectstack/spec": "workspace:*"
},
"devDependencies": {
"@types/node": "^25.2.2",
"@types/node": "^25.2.3",
"typescript": "^5.0.0",
"vitest": "^4.0.18"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/services/service-cache/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
"devDependencies": {
"typescript": "^5.0.0",
"vitest": "^4.0.18",
"@types/node": "^25.2.2"
"@types/node": "^25.2.3"
}
}
2 changes: 1 addition & 1 deletion packages/services/service-job/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
"devDependencies": {
"typescript": "^5.0.0",
"vitest": "^4.0.18",
"@types/node": "^25.2.2"
"@types/node": "^25.2.3"
}
}
2 changes: 1 addition & 1 deletion packages/services/service-queue/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
"devDependencies": {
"typescript": "^5.0.0",
"vitest": "^4.0.18",
"@types/node": "^25.2.2"
"@types/node": "^25.2.3"
}
}
2 changes: 1 addition & 1 deletion packages/services/service-storage/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@
"devDependencies": {
"typescript": "^5.0.0",
"vitest": "^4.0.18",
"@types/node": "^25.2.2"
"@types/node": "^25.2.3"
}
}
2 changes: 1 addition & 1 deletion packages/spec/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
],
"author": "ObjectStack",
"devDependencies": {
"@types/node": "^25.2.2",
"@types/node": "^25.2.3",
"@vitest/coverage-v8": "^4.0.18",
"tsx": "^4.21.0",
"typescript": "^5.3.0",
Expand Down
Loading