diff --git a/.rebase-pr.sh b/.rebase-pr.sh deleted file mode 100755 index 0d05e55e..00000000 --- a/.rebase-pr.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -# Rebase a PR branch onto origin/main, auto-resolving the workspace version bump -# that every branch carries and that therefore conflicts on every merge. Any -# conflict outside those package.json files stops the script for a human read. -set -uo pipefail -cd /Users/e-hu/Workspace/pace -BRANCH="$1"; VERSION="$2" -git checkout "$BRANCH" >/dev/null 2>&1 || exit 1 -git rebase origin/main >/dev/null 2>&1 -while [ -d .git/rebase-merge ] || [ -d .git/rebase-apply ]; do - UNMERGED=$(git diff --diff-filter=U --name-only) - if [ -z "$UNMERGED" ]; then - git -c core.editor=true rebase --continue >/dev/null 2>&1 || { echo "STUCK: rebase --continue failed"; exit 1; } - continue - fi - OTHER=$(echo "$UNMERGED" | grep -v -E '(^|/)package\.json$' || true) - if [ -n "$OTHER" ]; then - echo "MANUAL CONFLICT:"; echo "$OTHER"; exit 2 - fi - echo "$UNMERGED" | xargs git checkout --ours -- - ./.setver.sh "$VERSION" >/dev/null - echo "$UNMERGED" | xargs git add - git -c core.editor=true rebase --continue >/dev/null 2>&1 || { echo "STUCK after resolve"; exit 1; } -done -# The bump commit may have been rebased before the version reached its final value. -CURRENT=$(node -p "require('/Users/e-hu/Workspace/pace/package.json').version") -if [ "$CURRENT" != "$VERSION" ]; then - ./.setver.sh "$VERSION" >/dev/null - git commit -aqm "chore: bump the workspace version, which check-version requires of every PR" -fi -echo "REBASED $BRANCH onto $(git rev-parse --short origin/main) at version $VERSION" -git log --oneline origin/main..HEAD diff --git a/.setver.sh b/.setver.sh deleted file mode 100755 index bb2aa0db..00000000 --- a/.setver.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# Set every workspace package.json that is version-locked to the workspace release train. -set -euo pipefail -cd /Users/e-hu/Workspace/pace -V="$1" -for f in package.json apps/admin/package.json apps/space/package.json apps/web/package.json \ - packages/codemods/package.json packages/constants/package.json packages/editor/package.json \ - packages/hooks/package.json packages/i18n/package.json packages/propel/package.json \ - packages/services/package.json packages/shared-state/package.json \ - packages/tailwind-config/package.json packages/types/package.json \ - packages/typescript-config/package.json packages/ui/package.json packages/utils/package.json; do - [ -f "$f" ] || continue - node -e ' - const fs=require("fs"); const [f,v]=process.argv.slice(1); - let s=fs.readFileSync(f,"utf8"); - const out=s.replace(/^(\s*"version":\s*")[^"]+(",?)$/m, `$1${v}$2`); - if(!/^\s*"version":\s*"/m.test(s)) { console.error("no version field in "+f); process.exit(1); } - fs.writeFileSync(f,out); - ' "$f" "$V" -done -echo "all package.json set to $V" diff --git a/apps/admin/package.json b/apps/admin/package.json index 82bdc417..37517bfa 100644 --- a/apps/admin/package.json +++ b/apps/admin/package.json @@ -1,6 +1,6 @@ { "name": "admin", - "version": "1.4.43", + "version": "1.4.44", "private": true, "description": "Admin UI for Pace", "license": "AGPL-3.0", diff --git a/apps/space/package.json b/apps/space/package.json index f08b1b6a..8ed7a530 100644 --- a/apps/space/package.json +++ b/apps/space/package.json @@ -1,6 +1,6 @@ { "name": "space", - "version": "1.4.43", + "version": "1.4.44", "private": true, "license": "AGPL-3.0", "type": "module", diff --git a/apps/web/package.json b/apps/web/package.json index aaa518d1..bfe5be69 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -1,6 +1,6 @@ { "name": "web", - "version": "1.4.43", + "version": "1.4.44", "private": true, "license": "AGPL-3.0", "type": "module", diff --git a/package.json b/package.json index 4b65980b..4a398755 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pace", - "version": "1.4.43", + "version": "1.4.44", "private": true, "description": "Project management that keeps pace with the work", "license": "AGPL-3.0", diff --git a/packages/codemods/package.json b/packages/codemods/package.json index 824c9684..9395c8ea 100644 --- a/packages/codemods/package.json +++ b/packages/codemods/package.json @@ -1,6 +1,6 @@ { "name": "@pace/codemods", - "version": "1.4.43", + "version": "1.4.44", "private": true, "scripts": { "check:format": "oxfmt --check .", diff --git a/packages/constants/package.json b/packages/constants/package.json index 4a27cbc2..9bf4c1e5 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -1,6 +1,6 @@ { "name": "@pace/constants", - "version": "1.4.43", + "version": "1.4.44", "private": true, "license": "AGPL-3.0", "type": "module", diff --git a/packages/editor/package.json b/packages/editor/package.json index 808cff97..baf4e0ba 100644 --- a/packages/editor/package.json +++ b/packages/editor/package.json @@ -1,6 +1,6 @@ { "name": "@pace/editor", - "version": "1.4.43", + "version": "1.4.44", "private": true, "description": "Core Editor that powers Pace", "keywords": [ diff --git a/packages/hooks/package.json b/packages/hooks/package.json index 338ad769..2db8c109 100644 --- a/packages/hooks/package.json +++ b/packages/hooks/package.json @@ -1,6 +1,6 @@ { "name": "@pace/hooks", - "version": "1.4.43", + "version": "1.4.44", "private": true, "description": "React hooks that are shared across multiple apps internally", "license": "AGPL-3.0", diff --git a/packages/i18n/package.json b/packages/i18n/package.json index 8b288d0e..224127e9 100644 --- a/packages/i18n/package.json +++ b/packages/i18n/package.json @@ -1,6 +1,6 @@ { "name": "@pace/i18n", - "version": "1.4.43", + "version": "1.4.44", "private": true, "description": "I18n shared across multiple apps internally", "license": "AGPL-3.0", diff --git a/packages/propel/package.json b/packages/propel/package.json index af113e6f..3abd01a9 100644 --- a/packages/propel/package.json +++ b/packages/propel/package.json @@ -1,6 +1,6 @@ { "name": "@pace/propel", - "version": "1.4.43", + "version": "1.4.44", "private": true, "license": "AGPL-3.0", "type": "module", diff --git a/packages/services/package.json b/packages/services/package.json index fd29baa9..1fad9afc 100644 --- a/packages/services/package.json +++ b/packages/services/package.json @@ -1,6 +1,6 @@ { "name": "@pace/services", - "version": "1.4.43", + "version": "1.4.44", "private": true, "license": "AGPL-3.0", "type": "module", diff --git a/packages/shared-state/package.json b/packages/shared-state/package.json index 0a1a9b76..00733efe 100644 --- a/packages/shared-state/package.json +++ b/packages/shared-state/package.json @@ -1,6 +1,6 @@ { "name": "@pace/shared-state", - "version": "1.4.43", + "version": "1.4.44", "private": true, "description": "Shared state shared across multiple apps internally", "license": "AGPL-3.0", diff --git a/packages/tailwind-config/package.json b/packages/tailwind-config/package.json index 8a5cb175..6bc9b245 100644 --- a/packages/tailwind-config/package.json +++ b/packages/tailwind-config/package.json @@ -1,6 +1,6 @@ { "name": "@pace/tailwind-config", - "version": "1.4.43", + "version": "1.4.44", "private": true, "description": "common tailwind configuration across monorepo", "license": "AGPL-3.0", diff --git a/packages/types/package.json b/packages/types/package.json index 38ddbc59..1f8d58f5 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@pace/types", - "version": "1.4.43", + "version": "1.4.44", "private": true, "license": "AGPL-3.0", "type": "module", diff --git a/packages/typescript-config/package.json b/packages/typescript-config/package.json index 0c40a8e9..fc2d195f 100644 --- a/packages/typescript-config/package.json +++ b/packages/typescript-config/package.json @@ -1,6 +1,6 @@ { "name": "@pace/typescript-config", - "version": "1.4.43", + "version": "1.4.44", "private": true, "license": "AGPL-3.0", "files": [ diff --git a/packages/ui/package.json b/packages/ui/package.json index 3125215f..fa4f9895 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -1,6 +1,6 @@ { "name": "@pace/ui", - "version": "1.4.43", + "version": "1.4.44", "private": true, "description": "UI components shared across multiple apps internally", "license": "AGPL-3.0", diff --git a/packages/utils/package.json b/packages/utils/package.json index d0070cd9..049b10dc 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@pace/utils", - "version": "1.4.43", + "version": "1.4.44", "private": true, "description": "Helper functions shared across multiple apps internally", "license": "AGPL-3.0",