Skip to content

Commit 0a6d88a

Browse files
refactor: migrate on the main (#4540)
1 parent e50d978 commit 0a6d88a

File tree

15 files changed

+26
-25
lines changed

15 files changed

+26
-25
lines changed

.github/CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ In case you are suggesting a new feature, we will match your idea with our curre
122122

123123
## Editor Config
124124

125-
The [.editorconfig](https://github.com/webpack/webpack-cli/blob/master/.editorconfig) in the root should ensure consistent formatting. Please make sure you've [installed the plugin](http://editorconfig.org/#download) if your text editor needs one.
125+
The [.editorconfig](https://github.com/webpack/webpack-cli/blob/main/.editorconfig) in the root should ensure consistent formatting. Please make sure you've [installed the plugin](http://editorconfig.org/#download) if your text editor needs one.
126126

127127
## Dependencies
128128

@@ -134,7 +134,7 @@ To update dependencies, import each dependency and make sure the command line bu
134134

135135
## Branching Model
136136

137-
We base our branching model on [git flow](http://nvie.com/posts/a-successful-git-branching-model/). Instead of working with a `develop` base branch, we use the `master` branch. We do it to ease the workflow a bit. However, we find that adding prefixes to the branches is useful.
137+
We base our branching model on [git flow](http://nvie.com/posts/a-successful-git-branching-model/). Instead of working with a `develop` base branch, we use the `main` branch. We do it to ease the workflow a bit. However, we find that adding prefixes to the branches is useful.
138138

139139
## Naming a branch
140140

@@ -143,7 +143,7 @@ Making a branch in your fork for your contribution is helpful in the following w
143143
- It allows you to submit more than one contribution in a single PR.
144144
- It allows us to identify what your contribution is about from the branch name.
145145

146-
You will want to checkout the `master` branch locally before creating your new branch.
146+
You will want to checkout the `main` branch locally before creating your new branch.
147147

148148
There are two types of branches:
149149

.github/workflows/nodejs.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ name: webpack-cli
33
on:
44
push:
55
branches:
6-
- master
6+
- main
7+
- next
78
pull_request:
89
branches:
9-
- master
10+
- main
1011
- next
1112

1213
permissions:

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
### BREAKING CHANGES
1010

1111
- the minimum required Node.js version is `18.12.0`
12-
- removed `init`, `loader` and `plugin` commands in favor [`create-webpack-app`](https://github.com/webpack/webpack-cli/tree/master/packages/create-webpack-app)
12+
- removed `init`, `loader` and `plugin` commands in favor [`create-webpack-app`](https://github.com/webpack/webpack-cli/tree/main/packages/create-webpack-app)
1313
- dropped support for `webpack-dev-server@v4`
1414
- minimum supported webpack version is `5.82.0`
1515
- The `--define-process-env-node-env` option was renamed to `--config-node-env`

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Get to know what are the available commands and arguments [here](./packages/webp
4848

4949
## Packages
5050

51-
We organize webpack CLI as a multi-package repository using [lerna](https://github.com/lerna/lerna). The main CLI logic using options, resides in [`packages/webpack-cli`](https://github.com/webpack/webpack-cli/tree/master/packages/webpack-cli), while commands supported by the CLI, has dedicated subfolders in the folder [`packages`](https://github.com/webpack/webpack-cli/tree/master/packages).
51+
We organize webpack CLI as a multi-package repository using [lerna](https://github.com/lerna/lerna). The main CLI logic using options, resides in [`packages/webpack-cli`](https://github.com/webpack/webpack-cli/tree/main/packages/webpack-cli), while commands supported by the CLI, has dedicated subfolders in the folder [`packages`](https://github.com/webpack/webpack-cli/tree/master/packages).
5252

5353
A summary of supported commands is described below.
5454

@@ -97,9 +97,9 @@ If you like **webpack**, please consider donating through [Open Collective](http
9797

9898
[npm]: https://img.shields.io/npm/v/webpack-cli.svg
9999
[npm-url]: https://www.npmjs.com/package/webpack-cli
100-
[build-status]: https://github.com/webpack/webpack-cli/workflows/webpack-cli/badge.svg?branch=master
100+
[build-status]: https://github.com/webpack/webpack-cli/workflows/webpack-cli/badge.svg
101101
[build-status-url]: https://github.com/webpack/webpack-cli/actions
102-
[codecov-badge]: https://codecov.io/gh/webpack/webpack-cli/branch/master/graph/badge.svg?token=6B6NxtsZc3
102+
[codecov-badge]: https://codecov.io/gh/webpack/webpack-cli/graph/badge.svg?token=mDP3mQJNnn
103103
[codecov-url]: https://codecov.io/gh/webpack/webpack-cli
104104
[size]: https://packagephobia.com/badge?p=webpack-cli
105105
[size-url]: https://packagephobia.com/result?p=webpack-cli

lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"version": {
88
"message": "chore(release): publish new version",
99
"conventionalCommits": true,
10-
"allowBranch": ["master", "next"]
10+
"allowBranch": ["main", "next"]
1111
}
1212
}
1313
}

open-bot.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,11 +224,11 @@ rules:
224224
minimum: 1d
225225
maximum: 1w
226226
pull_request:
227-
head_ref: "^master$"
227+
head_ref: "^main$"
228228
permission: "read|none"
229229
actions:
230230
comment:
231-
identifier: "head-master"
231+
identifier: "head-main"
232232
edit: true
233233
message: |-
234234
Hi @{{pull_request.user.login}}.

packages/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ This folder is the collection of those packages.
1313

1414
## Packages
1515

16-
1. [configtest](https://github.com/webpack/webpack-cli/tree/master/packages/configtest)
17-
2. [create-webpack-app](https://github.com/webpack/webpack-cli/tree/master/packages/create-webpack-app)
18-
3. [info](https://github.com/webpack/webpack-cli/tree/master/packages/info)
19-
4. [serve](https://github.com/webpack/webpack-cli/tree/master/packages/serve)
20-
5. [webpack-cli](https://github.com/webpack/webpack-cli/tree/master/packages/webpack-cli)
16+
1. [configtest](https://github.com/webpack/webpack-cli/tree/main/packages/configtest)
17+
2. [create-webpack-app](https://github.com/webpack/webpack-cli/tree/main/packages/create-webpack-app)
18+
3. [info](https://github.com/webpack/webpack-cli/tree/main/packages/info)
19+
4. [serve](https://github.com/webpack/webpack-cli/tree/main/packages/serve)
20+
5. [webpack-cli](https://github.com/webpack/webpack-cli/tree/main/packages/webpack-cli)
2121

2222
## Generic Installation
2323

packages/configtest/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@webpack-cli/configtest",
33
"version": "3.0.1",
44
"description": "Validate a webpack configuration.",
5-
"homepage": "https://github.com/webpack/webpack-cli/tree/master/packages/configtest",
5+
"homepage": "https://github.com/webpack/webpack-cli/tree/main/packages/configtest",
66
"repository": {
77
"type": "git",
88
"url": "https://github.com/webpack/webpack-cli.git"

packages/create-webpack-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"web",
1212
"frameworks"
1313
],
14-
"homepage": "https://github.com/webpack/webpack-cli/tree/master/packages/create-webpack-app",
14+
"homepage": "https://github.com/webpack/webpack-cli/tree/main/packages/create-webpack-app",
1515
"bugs": "https://github.com/webpack/webpack-cli/issues",
1616
"repository": {
1717
"type": "git",

packages/info/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@webpack-cli/info",
33
"version": "3.0.1",
44
"description": "Outputs info about system and webpack config",
5-
"homepage": "https://github.com/webpack/webpack-cli/tree/master/packages/info",
5+
"homepage": "https://github.com/webpack/webpack-cli/tree/main/packages/info",
66
"repository": {
77
"type": "git",
88
"url": "https://github.com/webpack/webpack-cli.git"

0 commit comments

Comments
 (0)