ci: 👷🦋 version packages

Update dev branch

.changeset/config.json

@@ -4,8 +4,8 @@
 	"commit": false,
 	"fixed": [],
 	"linked": [],
-	"access": "restricted",
-	"baseBranch": "main",
+	"access": "public",
+	"baseBranch": "dev",
 	"updateInternalDependencies": "patch",
 	"ignore": [],
 	"privatePackages": {

.github/workflows/checks.yml

@@ -5,8 +5,16 @@ on:
     branches:
       - dev
       - main
+      - changeset-release/main
   pull_request:
-    types: [opened, synchronize, reopened]
+    branches:
+      - dev
+      - main
+      - changeset-release/main
+    types:
+      - opened
+      - synchronize
+      - reopened
 
 jobs:
   linting:

.github/workflows/deploy-preview.yml

@@ -1,11 +1,18 @@
-name: ▲ Deploy preview to Vercel
+name: ▲ Deploy preview
 
 on:
   push:
     branches:
       - dev
   pull_request:
-    types: [opened, synchronize, reopened]
+    branches:
+      - dev
+      - main
+      - changeset-release/main
+    types:
+      - opened
+      - synchronize
+      - reopened
 
 jobs:
   deploy:

.github/workflows/deploy.yml

@@ -1,8 +1,10 @@
-name: ▲ Deploy to Vercel
+name: ▲ Deploy
 
 on:
   workflow_run:
-    workflows: [🧪 Code checking, 🎉 Release]
+    workflows:
+      - 🧪 Code checking
+      - 🎉 Release
     types:
       - completed
     branches:

.github/workflows/release-branch.yml

@@ -0,0 +1,49 @@
+name: 🦋 Release branch
+
+on:
+  push:
+    branches:
+      - dev
+      - main
+
+concurrency: ${{ github.workflow }}-${{ github.ref }}
+
+jobs:
+  update-release:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    name: Update/Create release branch
+    env:
+      HUSKY: 0
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Setup environment
+        uses: ./.github/actions/pnpm-setup
+
+      - name: Update release PR
+        id: changesets
+        uses: loreddev/changeset-action@main
+        with:
+          branch: main
+          commit: 'ci: 👷🦋 version packages'
+          title: 🦋 Release branch
+          publish: pnpm run release
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Update dev branch
+        if: steps.changesets.outputs.hasChangesets == 'false'
+        uses: devmasx/merge-branch@master
+        with:
+          type: now
+          from_branch: changeset-release/main
+          target_branch: dev
+          message: 'ci: 👷 update dev branch'
+          github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release-preview.yml

@@ -0,0 +1,34 @@
+name: 👷 Release preview
+
+on:
+  workflow_run:
+    workflows:
+      - 🧪 Code checking
+    types:
+      - completed
+    branches:
+      - dev
+
+jobs:
+  release:
+    if: ${{ github.event.workflow_run.conclusion == 'success' && github.repository == 'loreddev/marknow' }}
+    name: Release preview
+    env:
+      HUSKY: 0
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Setup environment
+        uses: ./.github/actions/pnpm-setup
+
+      - name: Update versions
+        run: pnpm changeset version --snapshot next
+
+      - name: Release packages
+        run: pnpm run release --tag next
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/release.yml

@@ -1,40 +0,0 @@
-name: 🎉 Release
-
-on:
-  workflow_run:
-    workflows: [🧪 Code checking]
-    types:
-      - completed
-    branches:
-      - main
-
-concurrency: ${{ github.workflow }}-${{ github.ref }}
-
-jobs:
-  release:
-    if: ${{ github.event.workflow_run.conclusion == 'success' && github.repository == 'loreddev/marknow' }}
-    permissions:
-      contents: write
-      pull-requests: write
-    name: Release
-    env:
-      HUSKY: 0
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Setup environment
-        uses: ./.github/actions/pnpm-setup
-      - name: Create Release PR or Public to NPM
-        id: changesets
-        uses: changesets/action@v1
-        with:
-          publish: pnpm release
-          commit: 'chore: 🔗🦋 version packages'
-          title: '🦋 Changeset: Version packages'
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

package.json

@@ -17,7 +17,7 @@
 		"build:pkg": "turbo run build --filter='./packages/*'",
 		"dev": "turbo run dev --filter=\"@marknow/www\"",
 		"preview": "turbo run preview --filter=\"@marknow/www\"",
-		"release": "pnpm run build:pkg && changeset publish --access public"
+		"release": "pnpm run build:pkg && changeset publish"
 	},
 	"devDependencies": {
 		"@antfu/eslint-config": "^0.39.5",

packages/banners/package.json

@@ -42,5 +42,8 @@
 	},
 	"directories": {
 		"test": "tests"
+	},
+	"publishConfig": {
+		"access": "public"
 	}
 }