Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}

- uses: pnpm/action-setup@v4
with:
version: 10

- uses: actions/setup-node@v4
with:
Expand Down
68 changes: 24 additions & 44 deletions .github/workflows/update-velt-versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,46 +27,7 @@ on:
- '**/package.json'

jobs:
check-updates:
runs-on: ubuntu-latest
outputs:
has_changes: ${{ steps.check.outputs.has_changes }}
mode: ${{ steps.mode.outputs.mode }}

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Determine run mode
id: mode
run: |
if [ "${{ github.event_name }}" == "pull_request" ]; then
echo "mode=check" >> $GITHUB_OUTPUT
elif [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
echo "mode=${{ inputs.mode }}" >> $GITHUB_OUTPUT
else
echo "mode=update" >> $GITHUB_OUTPUT
fi

- name: Check for version updates
id: check
run: |
# Run dry-run and capture output
output=$(node scripts/update-velt-versions.js --dry-run 2>&1)
echo "$output"

# Check if any files would be modified
if echo "$output" | grep -q "Files would be modified: 0"; then
echo "has_changes=false" >> $GITHUB_OUTPUT
echo "✅ No version updates needed - skipping pipeline"
else
echo "has_changes=true" >> $GITHUB_OUTPUT
echo "📦 Version updates detected - continuing pipeline"
fi

update-versions:
needs: check-updates
if: needs.check-updates.outputs.has_changes == 'true' || needs.check-updates.outputs.mode == 'check'
runs-on: ubuntu-latest
permissions:
contents: write
Expand All @@ -86,25 +47,44 @@ jobs:

- name: Setup pnpm
uses: pnpm/action-setup@v4
with:
version: 10

- name: Determine run mode
id: mode
run: |
if [ "${{ github.event_name }}" == "pull_request" ]; then
echo "mode=check" >> $GITHUB_OUTPUT
elif [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
echo "mode=${{ inputs.mode }}" >> $GITHUB_OUTPUT
else
echo "mode=update" >> $GITHUB_OUTPUT
fi

- name: Run version check (PR)
if: needs.check-updates.outputs.mode == 'check'
if: steps.mode.outputs.mode == 'check'
run: node scripts/update-velt-versions.js --check

- name: Run version update (dry-run)
if: needs.check-updates.outputs.mode == 'dry-run'
if: steps.mode.outputs.mode == 'dry-run'
run: node scripts/update-velt-versions.js --dry-run

- name: Run version update
if: needs.check-updates.outputs.mode == 'update'
if: steps.mode.outputs.mode == 'update'
run: |
node scripts/update-velt-versions.js

# Check if there are changes
if git diff --quiet; then
echo "No version changes needed"
exit 0
fi

# Install dependencies to update lockfile
pnpm install --no-frozen-lockfile

- name: Commit and push changes
if: needs.check-updates.outputs.mode == 'update' && github.event_name == 'push'
if: steps.mode.outputs.mode == 'update' && github.event_name == 'push'
run: |
git config --local user.email "github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
Expand All @@ -115,7 +95,7 @@ jobs:
fi

- name: Create Pull Request (manual trigger)
if: needs.check-updates.outputs.mode == 'update' && github.event_name == 'workflow_dispatch'
if: steps.mode.outputs.mode == 'update' && github.event_name == 'workflow_dispatch'
uses: peter-evans/create-pull-request@v6
with:
token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
5 changes: 2 additions & 3 deletions apps/master-sample-app/vercel.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"buildCommand": "pnpm run build",
"installCommand": "pnpm install",
"ignoreCommand": "npx turbo-ignore",
"buildCommand": "npm run build",
"installCommand": "cd ../.. && npm install",
Copy link

Choose a reason for hiding this comment

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

Vercel config uses npm instead of pnpm

The Vercel configuration was changed to use npm run build and npm install while the monorepo uses pnpm (as specified by packageManager: "[email protected]" in the root package.json). Using npm will not respect the pnpm-lock.yaml lockfile, potentially installing different dependency versions and not properly handling pnpm workspace configurations. The installCommand of cd ../.. && npm install further suggests misalignment with the pnpm-based monorepo setup.

Fix in Cursor Fix in Web

"framework": "nextjs"
}

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 0 additions & 6 deletions apps/react/comments/tables/ag-grid/multiple-tools/vercel.json

This file was deleted.

6 changes: 0 additions & 6 deletions apps/react/comments/tables/ag-grid/single-tool/vercel.json

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 0 additions & 6 deletions apps/react/comments/tables/tanstack/single-tool/vercel.json

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@
"lint": "next lint"
},
"dependencies": {
"@tiptap/core": "3.14.0",
"@tiptap/pm": "3.14.0",
"@tiptap/extension-text-align": "3.14.0",
"@tiptap/extension-underline": "3.14.0",
"@tiptap/react": "3.14.0",
"@tiptap/starter-kit": "3.14.0",
"@tiptap/core": "^2.26.4",
"@tiptap/extension-text-align": "^2.26.4",
"@tiptap/extension-underline": "^2.26.4",
"@tiptap/react": "^2.26.4",
"@tiptap/starter-kit": "^2.26.4",
"@veltdev/react": "^4.6.10",
"@veltdev/tiptap-velt-comments": "4.5.8-beta.1",
"clsx": "^2.1.1",
Expand Down

This file was deleted.

6 changes: 0 additions & 6 deletions apps/react/crdt/canvas/reactflow/reactflow-demo/vercel.json

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@
"lint": "next lint"
},
"dependencies": {
"@tiptap/core": "3.14.0",
"@tiptap/pm": "3.14.0",
"@tiptap/extension-bubble-menu": "3.14.0",
"@tiptap/extension-text-align": "3.14.0",
"@tiptap/extension-underline": "3.14.0",
"@tiptap/react": "3.14.0",
"@tiptap/starter-kit": "3.14.0",
"@tiptap/y-tiptap": "3.0.0",
"@tiptap/core": "^3.14.0",
"@tiptap/extension-bubble-menu": "^3.14.0",
"@tiptap/extension-text-align": "^3.14.0",
"@tiptap/extension-underline": "^3.14.0",
"@tiptap/react": "^3.14.0",
"@tiptap/starter-kit": "^3.14.0",
"@tiptap/y-tiptap": "^3.0.0",
"@veltdev/react": "^4.6.10",
"@veltdev/tiptap-crdt": "^4.5.9-beta.4",
"@veltdev/tiptap-crdt-react": "^4.5.9-beta.4",
Expand Down

This file was deleted.

22 changes: 9 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
"new:demo": "tsx scripts/new-demo.ts",
"velt:update": "node scripts/update-velt-versions.js",
"velt:check": "node scripts/update-velt-versions.js --check",
"velt:dry-run": "node scripts/update-velt-versions.js --dry-run",
"vercel:config": "node scripts/add-vercel-config.js"
"velt:dry-run": "node scripts/update-velt-versions.js --dry-run"
},
"repository": {
"type": "git",
Expand All @@ -40,16 +39,13 @@
"packages/*"
],
"packageManager": "[email protected]",
"pnpm": {
"overrides": {
"@veltdev/crdt": "4.5.8",
"@veltdev/crdt-react": "4.5.8",
"@veltdev/tiptap-crdt-react": "^4.5.9-beta.4",
"@veltdev/blocknote-crdt-react": "4.5.0-beta.3",
"@veltdev/codemirror-crdt-react": "4.5.8",
"@veltdev/reactflow-crdt": "4.5.8",
Copy link

Choose a reason for hiding this comment

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

pnpm overrides moved to wrong field, no longer applied

The overrides field was moved from pnpm.overrides to a root-level overrides field. In pnpm, package overrides must be placed under pnpm.overrides in package.json. The root-level overrides field is an npm-specific feature and is ignored by pnpm. This is confirmed by the pnpm-lock.yaml diff which shows the overrides: section was completely removed from the lockfile, meaning the version overrides for @veltdev/* packages are no longer being applied. This could cause version conflicts and unexpected dependency resolution.

Fix in Cursor Fix in Web

"@veltdev/react": "^4.6.10",
"@codemirror/state": "^6.5.2"
}
"overrides": {
"@veltdev/crdt": "4.5.8",
"@veltdev/crdt-react": "4.5.8",
"@veltdev/tiptap-crdt-react": "^4.5.9-beta.4",
"@veltdev/blocknote-crdt-react": "4.5.0-beta.3",
"@veltdev/codemirror-crdt-react": "4.5.8",
"@veltdev/reactflow-crdt": "4.5.8",
"@veltdev/react": "^4.6.10"
}
}
Loading
Loading