diff --git a/.github/workflows/merge-main-to-development.yml b/.github/workflows/merge-main-to-development.yml index c6ccb86c1c..88a9350f12 100644 --- a/.github/workflows/merge-main-to-development.yml +++ b/.github/workflows/merge-main-to-development.yml @@ -16,13 +16,19 @@ jobs: - name: Checkout repo uses: actions/checkout@v6 with: - ref: development + ref: main token: ${{ secrets.GITHUB_TOKEN }} fetch-depth: 0 - - name: Merge main into development - uses: devmasx/merge-branch@v1.4.0 + - name: Create Pull Request + uses: peter-evans/create-pull-request@v7 with: - type: now - from_branch: main - target_branch: development - github_token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + token: ${{ secrets.GITHUB_TOKEN }} + branch: sync-main-to-development + base: development + title: "chore: sync main to development" + body: | + Automated PR to sync changes from `main` to `development`. + + This PR is created automatically when changes are pushed to `main`. + labels: automated + delete-branch: true \ No newline at end of file diff --git a/apps/admin/package.json b/apps/admin/package.json index ecd94f564b..8a5e7a5c1d 100644 --- a/apps/admin/package.json +++ b/apps/admin/package.json @@ -1,6 +1,6 @@ { "name": "packrat-admin-app", - "version": "2.0.21", + "version": "2.0.22", "private": true, "scripts": { "build": "next build", diff --git a/apps/expo/app.config.ts b/apps/expo/app.config.ts index 363d4a96c3..9ed48acde2 100644 --- a/apps/expo/app.config.ts +++ b/apps/expo/app.config.ts @@ -37,7 +37,7 @@ export default (): ExpoConfig => { name: getAppName(), slug: 'packrat', - version: '2.0.21', + version: '2.0.22', scheme: 'packrat', web: { bundler: 'metro', diff --git a/apps/expo/package.json b/apps/expo/package.json index 11cc2cab1d..9c2655ee02 100644 --- a/apps/expo/package.json +++ b/apps/expo/package.json @@ -1,6 +1,6 @@ { "name": "packrat-expo-app", - "version": "2.0.21", + "version": "2.0.22", "private": true, "main": "expo-router/entry", "scripts": { diff --git a/apps/guides/package.json b/apps/guides/package.json index 4ec7437c17..064d02cb51 100644 --- a/apps/guides/package.json +++ b/apps/guides/package.json @@ -1,6 +1,6 @@ { "name": "packrat-guides-app", - "version": "2.0.21", + "version": "2.0.22", "private": true, "scripts": { "build": "bun run build-content && next build", diff --git a/apps/landing/package.json b/apps/landing/package.json index a900a1a408..7819a6e559 100644 --- a/apps/landing/package.json +++ b/apps/landing/package.json @@ -1,6 +1,6 @@ { "name": "packrat-landing-app", - "version": "2.0.21", + "version": "2.0.22", "private": true, "scripts": { "build": "next build", diff --git a/bun.lock b/bun.lock index 76fa357243..63be0cdbea 100644 --- a/bun.lock +++ b/bun.lock @@ -19,7 +19,7 @@ }, "apps/admin": { "name": "packrat-admin-app", - "version": "2.0.21", + "version": "2.0.22", "dependencies": { "@packrat/web-ui": "workspace:*", "@radix-ui/react-alert-dialog": "catalog:", @@ -42,6 +42,7 @@ "next-themes": "^0.4.6", "react": "catalog:", "react-dom": "catalog:", + "recharts": "3.8.1", "sonner": "^2.0.7", "tailwind-merge": "^2.5.5", "zod": "catalog:", @@ -58,7 +59,7 @@ }, "apps/expo": { "name": "packrat-expo-app", - "version": "2.0.21", + "version": "2.0.22", "dependencies": { "@ai-sdk/react": "^2.0.11", "@expo/react-native-action-sheet": "^4.1.1", @@ -181,7 +182,7 @@ }, "apps/guides": { "name": "packrat-guides-app", - "version": "2.0.21", + "version": "2.0.22", "dependencies": { "@ai-sdk/openai": "^2.0.11", "@hookform/resolvers": "^3.10.0", @@ -264,7 +265,7 @@ }, "apps/landing": { "name": "packrat-landing-app", - "version": "2.0.21", + "version": "2.0.22", "dependencies": { "@emotion/is-prop-valid": "^1.3.1", "@hookform/resolvers": "^3.10.0", @@ -329,7 +330,7 @@ }, "packages/analytics": { "name": "@packrat/analytics", - "version": "2.0.21", + "version": "2.0.22", "dependencies": { "@duckdb/node-api": "1.5.0-r.1", "@packrat/env": "workspace:*", @@ -345,7 +346,7 @@ }, "packages/api": { "name": "@packrat/api", - "version": "2.0.21", + "version": "2.0.22", "dependencies": { "@ai-sdk/google": "^2.0.62", "@ai-sdk/openai": "^2.0.11", @@ -399,18 +400,18 @@ }, "packages/api-client": { "name": "@packrat/api-client", - "version": "2.0.21", + "version": "2.0.22", "devDependencies": { "typescript": "catalog:", }, }, "packages/checks": { "name": "@packrat/checks", - "version": "2.0.21", + "version": "2.0.22", }, "packages/cli": { "name": "@packrat/cli", - "version": "2.0.21", + "version": "2.0.22", "bin": { "packrat": "./src/index.ts", }, @@ -430,25 +431,25 @@ }, "packages/config": { "name": "@packrat/config", - "version": "2.0.21", + "version": "2.0.22", }, "packages/env": { "name": "@packrat/env", - "version": "2.0.21", + "version": "2.0.22", "dependencies": { "zod": "catalog:", }, }, "packages/guards": { "name": "@packrat/guards", - "version": "2.0.21", + "version": "2.0.22", "dependencies": { "radash": "catalog:", }, }, "packages/mcp": { "name": "@packrat/mcp", - "version": "2.0.21", + "version": "2.0.22", "dependencies": { "@modelcontextprotocol/sdk": "^1.11.0", "@packrat/api-client": "workspace:*", @@ -466,14 +467,14 @@ }, "packages/ui": { "name": "@packrat/ui", - "version": "2.0.21", + "version": "2.0.22", "dependencies": { "@packrat-ai/nativewindui": "^2.0.2", }, }, "packages/web-ui": { "name": "@packrat/web-ui", - "version": "2.0.21", + "version": "2.0.22", "dependencies": { "@packrat/guards": "workspace:*", "@radix-ui/react-accordion": "catalog:", @@ -530,9 +531,6 @@ "recharts": "3.8.1", "tailwindcss": "catalog:", }, - "optionalPeers": [ - "recharts", - ], }, }, "trustedDependencies": [ diff --git a/package.json b/package.json index 954cdcfa2e..67ca422219 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "packrat-monorepo", - "version": "2.0.21", + "version": "2.0.22", "workspaces": [ "apps/*", "packages/*" diff --git a/packages/analytics/package.json b/packages/analytics/package.json index 7eba221f8d..acc2397bd3 100644 --- a/packages/analytics/package.json +++ b/packages/analytics/package.json @@ -1,6 +1,6 @@ { "name": "@packrat/analytics", - "version": "2.0.21", + "version": "2.0.22", "private": true, "type": "module", "scripts": { diff --git a/packages/api-client/package.json b/packages/api-client/package.json index 969a2fc260..f404be3a77 100644 --- a/packages/api-client/package.json +++ b/packages/api-client/package.json @@ -1,6 +1,6 @@ { "name": "@packrat/api-client", - "version": "2.0.21", + "version": "2.0.22", "private": true, "description": "PackRat typed API client — authenticated HTTP client with error handling and MCP result helpers", "type": "module", diff --git a/packages/api/container_src/package.json b/packages/api/container_src/package.json index 090389a273..01b7d02499 100644 --- a/packages/api/container_src/package.json +++ b/packages/api/container_src/package.json @@ -1,6 +1,6 @@ { "name": "container", - "version": "2.0.21", + "version": "2.0.22", "type": "module", "dependencies": { "@aws-sdk/client-s3": "^3.0.0", diff --git a/packages/api/package.json b/packages/api/package.json index 5388a3a58a..8fc2527c4b 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "@packrat/api", - "version": "2.0.21", + "version": "2.0.22", "scripts": { "check-types": "tsc --noEmit", "check-types-watch": "tsc --noEmit --watch", diff --git a/packages/checks/package.json b/packages/checks/package.json index 57b2918104..3ef42b55dd 100644 --- a/packages/checks/package.json +++ b/packages/checks/package.json @@ -1,6 +1,6 @@ { "name": "@packrat/checks", - "version": "2.0.21", + "version": "2.0.22", "private": true, "type": "module", "scripts": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 347cd1f174..cc504e6ed4 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "@packrat/cli", - "version": "2.0.21", + "version": "2.0.22", "private": true, "type": "module", "bin": { diff --git a/packages/config/package.json b/packages/config/package.json index 28a2057d9f..92fa2d1ad1 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -1,6 +1,6 @@ { "name": "@packrat/config", - "version": "2.0.21", + "version": "2.0.22", "private": true, "type": "module", "exports": { diff --git a/packages/env/package.json b/packages/env/package.json index 9c4ea9dd53..89685a0bdb 100644 --- a/packages/env/package.json +++ b/packages/env/package.json @@ -1,6 +1,6 @@ { "name": "@packrat/env", - "version": "2.0.21", + "version": "2.0.22", "private": true, "type": "module", "exports": { diff --git a/packages/guards/package.json b/packages/guards/package.json index 9aaa40d389..ea7faa6479 100644 --- a/packages/guards/package.json +++ b/packages/guards/package.json @@ -1,6 +1,6 @@ { "name": "@packrat/guards", - "version": "2.0.21", + "version": "2.0.22", "private": true, "type": "module", "exports": { diff --git a/packages/mcp/package.json b/packages/mcp/package.json index 0d1cf8fdd5..b80681b7f7 100644 --- a/packages/mcp/package.json +++ b/packages/mcp/package.json @@ -1,6 +1,6 @@ { "name": "@packrat/mcp", - "version": "2.0.21", + "version": "2.0.22", "private": true, "description": "PackRat MCP Server — outdoor adventure planning via Model Context Protocol", "scripts": { diff --git a/packages/ui/package.json b/packages/ui/package.json index e021478a15..be3b727eac 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,6 +1,6 @@ { "name": "@packrat/ui", - "version": "2.0.21", + "version": "2.0.22", "private": true, "dependencies": { "@packrat-ai/nativewindui": "^2.0.2" diff --git a/packages/web-ui/package.json b/packages/web-ui/package.json index 9884e1781f..4a607ca5cc 100644 --- a/packages/web-ui/package.json +++ b/packages/web-ui/package.json @@ -1,6 +1,6 @@ { "name": "@packrat/web-ui", - "version": "2.0.21", + "version": "2.0.22", "private": true, "type": "module", "exports": {