diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 282726443c..cdc3a9f132 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -9,7 +9,7 @@ on: - 'src/**.js' push: branches: - - master + - main - restructure paths: - 'src/**.js' @@ -41,12 +41,12 @@ jobs: artifact: npm-package workflow: ci.yml required: false - - run: mv preact.tgz preact-master.tgz + - run: mv preact.tgz preact-main.tgz - name: Upload base preact package uses: actions/upload-artifact@v3 with: name: bench-environment - path: preact-master.tgz + path: preact-main.tgz bench_todo: name: Bench todo diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f4e4a9b3d0..6790d7c4bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: - '**' push: branches: - - master + - main - restructure jobs: diff --git a/.github/workflows/pr-reporter.yml b/.github/workflows/pr-reporter.yml index b5e2f1ba90..18c1311b60 100644 --- a/.github/workflows/pr-reporter.yml +++ b/.github/workflows/pr-reporter.yml @@ -46,6 +46,6 @@ jobs: uses: andrewiggins/tachometer-reporter-action@v2 with: path: results/*.json - base-bench-name: preact-master + base-bench-name: preact-main pr-bench-name: preact-local summarize: 'duration, usedJSHeapSize' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cba03a0498..5bab739ed1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,7 @@ on: create jobs: build: if: github.ref_type == 'tag' - uses: preactjs/preact/.github/workflows/ci.yml@master + uses: preactjs/preact/.github/workflows/ci.yml@main release: runs-on: ubuntu-latest diff --git a/.github/workflows/saucelabs.yml b/.github/workflows/saucelabs.yml index 049a006b05..ec92294d94 100644 --- a/.github/workflows/saucelabs.yml +++ b/.github/workflows/saucelabs.yml @@ -3,7 +3,7 @@ name: Saucelabs on: push: branches: - - master + - main - restructure jobs: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 54fefe4f6c..851550025c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -74,7 +74,7 @@ Unique to Preact we do support several ways to hook into our renderer. All our a ## Important Branches -We merge every PR into the `master` branch which is the one that we'll use to publish code to npm. For the previous Preact release line we have a branch called `8` which is in maintenance mode. As a new contributor you won't have to deal with that ;) +We merge every PR into the `main` branch which is the one that we'll use to publish code to npm. For the previous Preact release line we have a branch called `8` which is in maintenance mode. As a new contributor you won't have to deal with that ;) ## Creating your first Pull-Request @@ -82,7 +82,7 @@ We try to make it as easy as possible to contribute to Preact and make heavy use Once a PR or a Draft PR has been created our community typically joins the discussion about the proposed change. Sometimes that includes ideas for test cases or even different ways to go about implementing a feature. Often this also includes ideas on how to make the code smaller. We usually refer to the latter as "code-golfing" or just "golfing". -When everything is good to go someone will approve the PR and the changes will be merged into the `master` branch and we usually cut a release a few days/ a week later. +When everything is good to go someone will approve the PR and the changes will be merged into the `main` branch and we usually cut a release a few days/ a week later. _The big takeaway for you here is, that we will guide you along the way. We're here to help to make a PR ready for approval!_ @@ -90,7 +90,7 @@ The short summary is: 1. Make changes and submit a PR 2. Modify change according to feedback (if there is any) -3. PR will be merged into `master` +3. PR will be merged into `main` 4. A new release will be cut (every 2-3 weeks). ## Commonly used scripts for contributions @@ -172,7 +172,7 @@ rights to publish new releases on npm. 1. Make a PR where **only** the version number is incremented in `package.json` and everywhere else. A simple search and replace works. (note: We follow `SemVer` conventions) 2. Wait until the PR is approved and merged. -3. Switch back to the `master` branch and pull the merged PR +3. Switch back to the `main` branch and pull the merged PR 4. Create and push a tag for the new version you want to publish: 1. `git tag 10.0.0` 2. `git push --tags` @@ -195,7 +195,7 @@ rights to publish new releases on npm. 1. I'd recommend writing them in an offline editor because each edit to a draft will change the URL in GitHub. 2. Make a PR where **only** the version number is incremented in `package.json` (note: We follow `SemVer` conventions) 3. Wait until the PR is approved and merged. -4. Switch back to the `master` branch and pull the merged PR +4. Switch back to the `main` branch and pull the merged PR 5. Run `npm run build && npm publish` 1. Make sure you have 2FA enabled in npm, otherwise the above command will fail. 2. If you're doing a pre-release add `--tag next` to the `npm publish` command to publish it under a different tag (default is `latest`) diff --git a/README.md b/README.md index 8795a0e781..e27535a579 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ [![OpenCollective Backers](https://opencollective.com/preact/backers/badge.svg)](#backers) [![OpenCollective Sponsors](https://opencollective.com/preact/sponsors/badge.svg)](#sponsors) -[![coveralls](https://img.shields.io/coveralls/preactjs/preact/master.svg)](https://coveralls.io/github/preactjs/preact) +[![coveralls](https://img.shields.io/coveralls/preactjs/preact/main.svg)](https://coveralls.io/github/preactjs/preact) [![gzip size](http://img.badgesize.io/https://unpkg.com/preact/dist/preact.min.js?compression=gzip&label=gzip)](https://unpkg.com/preact/dist/preact.min.js) [![brotli size](http://img.badgesize.io/https://unpkg.com/preact/dist/preact.min.js?compression=brotli&label=brotli)](https://unpkg.com/preact/dist/preact.min.js) @@ -185,6 +185,6 @@ MIT [![Preact](https://i.imgur.com/YqCHvEW.gif)](https://preactjs.com) -[preact/compat]: https://github.com/preactjs/preact/tree/master/compat +[preact/compat]: https://github.com/preactjs/preact/tree/main/compat [hyperscript]: https://github.com/dominictarr/hyperscript [DevTools]: https://github.com/preactjs/preact-devtools diff --git a/benches/proxy-packages/preact-master-proxy/package.json b/benches/proxy-packages/preact-master-proxy/package.json index 57f641badf..f34ced6c6a 100644 --- a/benches/proxy-packages/preact-master-proxy/package.json +++ b/benches/proxy-packages/preact-master-proxy/package.json @@ -5,6 +5,6 @@ "type": "module", "main": "index.js", "dependencies": { - "preact": "file:../../../preact-master.tgz" + "preact": "file:../../../preact-main.tgz" } } diff --git a/benches/scripts/bench.js b/benches/scripts/bench.js index f9f5119265..a5513280e0 100644 --- a/benches/scripts/bench.js +++ b/benches/scripts/bench.js @@ -21,7 +21,7 @@ export const defaultBenchOptions = { // GitHub Action minutes timeout: 1, 'window-size': '1024,768', - framework: IS_CI ? ['preact-master', 'preact-local', 'preact-hooks'] : null, + framework: IS_CI ? ['preact-main', 'preact-local', 'preact-hooks'] : null, trace: false }; diff --git a/benches/scripts/config.js b/benches/scripts/config.js index 6897a3a364..cbc2809df0 100644 --- a/benches/scripts/config.js +++ b/benches/scripts/config.js @@ -49,14 +49,13 @@ export const frameworks = [ } }, { - label: 'preact-master', + label: 'preact-main', dependencies: { - framework: - 'file:' + repoRoot('benches/proxy-packages/preact-master-proxy') + framework: 'file:' + repoRoot('benches/proxy-packages/preact-main-proxy') }, async isValid() { try { - await stat(repoRoot('preact-master.tgz')); + await stat(repoRoot('preact-main.tgz')); return validateFileDep(this.dependencies.framework); } catch (e) { return false; diff --git a/benches/scripts/index.js b/benches/scripts/index.js index 4eeb21a898..e66ddbcd58 100644 --- a/benches/scripts/index.js +++ b/benches/scripts/index.js @@ -30,7 +30,7 @@ prog .example('bench text*') .example('bench *.html') .example('bench all') - .example('bench many* -f preact-local -f preact-master') + .example('bench many* -f preact-local -f preact-main') .option( '--browser, -b', 'Which browsers to launch in automatic mode, comma-delimited (chrome, chrome-headless, firefox, firefox-headless, safari, edge, ie)', @@ -72,7 +72,7 @@ prog // Tests: // - (no args) // - many* -// - many* -f preact-local -f preact-master +// - many* -f preact-local -f preact-main prog .command('deopts [benchmark]') .describe( @@ -81,7 +81,7 @@ prog .example('deopts many_updates.html') .example('deopts many*') .example('deopts many* -f preact-local') - .example('deopts many* -f preact-local -f preact-master') + .example('deopts many* -f preact-local -f preact-main') .option( '--framework, -f', 'The framework to run the benchmark with.', diff --git a/sizereport.config.js b/sizereport.config.js index 36c9d2dfce..9511c8cbd6 100644 --- a/sizereport.config.js +++ b/sizereport.config.js @@ -1,5 +1,5 @@ module.exports = { repo: 'preactjs/preact', path: ['./{compat,debug,hooks,}/dist/**/!(*.map)'], - branch: 'master' + branch: 'main' };