next -> main

.github/workflows/merge.yml

@@ -15,13 +15,13 @@ jobs:
     steps:
     - uses: actions/checkout@v4
       with:
-        ref: next
+        ref: main
     - uses: actions/setup-node@v4
       with:
         node-version: 20
     - run: npm ci
     - run: npm run build
-    - run: npx pr-release merge --target release --source next --commit --force --clean --changelog ./docs/recent-changes.md --compact --minimize-semver-change
+    - run: npx pr-release merge --target release --source main --commit --force --clean --changelog ./docs/recent-changes.md --compact --minimize-semver-change
       env:
         GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
 

.github/workflows/pr.yml

@@ -2,7 +2,7 @@ name: pr
 
 on:
   push:
-    branches: [ next ]
+    branches: [ main ]
 
   workflow_dispatch:
 
@@ -19,7 +19,7 @@ jobs:
         node-version: 20
     - run: npm ci
     - run: npm run build
-    - run: npx pr-release pr --verbose --target release --source next --compact --verbose --minimize-semver-change
+    - run: npx pr-release pr --verbose --target release --source main --compact --verbose --minimize-semver-change
       env:
         GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
     # The following will publish a prerelease to npm
@@ -27,5 +27,5 @@ jobs:
       name: Setup NPM Auth
       env:
         NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-    - run: npx pr-release infer-prerelease --preid=next --target release --source next --verbose --publish --minimize-semver-change
+    - run: npx pr-release infer-prerelease --preid=next --target release --source main --verbose --publish --minimize-semver-change
       name: Publish

.github/workflows/push-main.yml

@@ -9,5 +9,3 @@ jobs:
   comment:
     uses: MithrilJS/infra/.github/workflows/reject-pr.yml@main
     secrets: inherit
-    with:
-      correct_branch: next

.github/workflows/rollback.yml

@@ -16,6 +16,6 @@ jobs:
         node-version: 20
     - run: npm ci
     - run: npm run build
-    - run: npx pr-release rollback --verbose --target release --source next --verbose --ignore 'package*' --ignore docs/changelog.md --ignore docs/recent-changes.md
+    - run: npx pr-release rollback --verbose --target release --source main --verbose --ignore 'package*' --ignore docs/changelog.md --ignore docs/recent-changes.md
       env:
         GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}

.github/workflows/test-main-push.yml

@@ -1,8 +1,8 @@
-name: test-next-push
+name: test-main-push
 
 on:
   push:
-    branches: [ next ]
+    branches: [ main ]
   workflow_dispatch:
 
 concurrency: prr:pre-release
@@ -21,7 +21,7 @@ jobs:
         node-version: 20
     - run: npm ci
     - run: npm run build
-    - run: npx pr-release pr --verbose --target release --source next --compact --verbose --minimize-semver-change
+    - run: npx pr-release pr --verbose --target release --source main --compact --verbose --minimize-semver-change
       env:
         GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
     # The following will publish a prerelease to npm
@@ -29,5 +29,5 @@ jobs:
       name: Setup NPM Auth
       env:
         NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-    - run: npx pr-release infer-prerelease --preid=next --target release --source next --verbose --publish --minimize-semver-change
+    - run: npx pr-release infer-prerelease --preid=next --target release --source main --verbose --publish --minimize-semver-change
       name: Publish

.github/workflows/test.yml

@@ -2,7 +2,7 @@ name: test
 
 on:
   pull_request_target:
-    branches: [ next ]
+    branches: [ main ]
   workflow_dispatch:
   workflow_call:
 

README.md

@@ -1,9 +1,9 @@
 # Mithril.js
 
 [![npm Version](https://img.shields.io/npm/v/mithril.svg)](https://www.npmjs.com/package/mithril)  
-[![License](https://img.shields.io/npm/l/mithril.svg)](https://github.com/MithrilJS/mithril.js/blob/next/LICENSE)  
+[![License](https://img.shields.io/npm/l/mithril.svg)](https://github.com/MithrilJS/mithril.js/blob/main/LICENSE)  
 [![npm Downloads](https://img.shields.io/npm/dm/mithril.svg)](https://www.npmjs.com/package/mithril)  
-[![Build Status](https://img.shields.io/github/actions/workflow/status/MithrilJS/mithril.js/.github%2Fworkflows%2Ftest-next-push.yml)](https://www.npmjs.com/package/mithril)  
+[![Build Status](https://img.shields.io/github/actions/workflow/status/MithrilJS/mithril.js/.github%2Fworkflows%2Ftest-main-push.yml)](https://www.npmjs.com/package/mithril)  
 [![Donate at OpenCollective](https://img.shields.io/opencollective/all/mithriljs.svg?colorB=brightgreen)](https://opencollective.com/mithriljs)  
 [![Zulip, join chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://mithril.zulipchat.com/)
 

docs/contributing.md

@@ -38,7 +38,7 @@ To send a pull request:
 
 - fork the repo (button at the top right in GitHub)
 - clone the forked repo to your computer (green button in GitHub)
-- Switch to the `next` branch (run `git checkout next`)
+- Switch to the `main` branch (run `git checkout main`)
 - create a feature branch (run `git checkout -b the-feature-branch-name`)
 - make your changes
 - run the tests (run `npm test`)

docs/releasing.md

@@ -16,7 +16,7 @@ pr-release handles the following:
 
 ## For contributors
 
-Contributors should create their feature branch targetting the default branch `next`.  When this branch is merged `pr-release` will either generate or update a release PR from `next` to `release`.
+Contributors should create their feature branch targetting the default branch `main`.  When this branch is merged `pr-release` will either generate or update a release PR from `main` to `release`.
 
 The description and title will be managed by [pr-release], including the semver version.