Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ In case you are suggesting a new feature, we will match your idea with our curre

## Editor Config

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.
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.

## Dependencies

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

## Branching Model

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.
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.

## Naming a branch

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

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

There are two types of branches:

Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ name: webpack-cli
on:
push:
branches:
- master
- main
- next
pull_request:
branches:
- master
- main
- next

permissions:
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
### BREAKING CHANGES

- the minimum required Node.js version is `18.12.0`
- removed `init`, `loader` and `plugin` commands in favor [`create-webpack-app`](https://github.com/webpack/webpack-cli/tree/master/packages/create-webpack-app)
- removed `init`, `loader` and `plugin` commands in favor [`create-webpack-app`](https://github.com/webpack/webpack-cli/tree/main/packages/create-webpack-app)
- dropped support for `webpack-dev-server@v4`
- minimum supported webpack version is `5.82.0`
- The `--define-process-env-node-env` option was renamed to `--config-node-env`
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Get to know what are the available commands and arguments [here](./packages/webp

## Packages

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).
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).

A summary of supported commands is described below.

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

[npm]: https://img.shields.io/npm/v/webpack-cli.svg
[npm-url]: https://www.npmjs.com/package/webpack-cli
[build-status]: https://github.com/webpack/webpack-cli/workflows/webpack-cli/badge.svg?branch=master
[build-status]: https://github.com/webpack/webpack-cli/workflows/webpack-cli/badge.svg
[build-status-url]: https://github.com/webpack/webpack-cli/actions
[codecov-badge]: https://codecov.io/gh/webpack/webpack-cli/branch/master/graph/badge.svg?token=6B6NxtsZc3
[codecov-badge]: https://codecov.io/gh/webpack/webpack-cli/graph/badge.svg?token=mDP3mQJNnn
[codecov-url]: https://codecov.io/gh/webpack/webpack-cli
[size]: https://packagephobia.com/badge?p=webpack-cli
[size-url]: https://packagephobia.com/result?p=webpack-cli
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"version": {
"message": "chore(release): publish new version",
"conventionalCommits": true,
"allowBranch": ["master", "next"]
"allowBranch": ["main", "next"]
}
}
}
4 changes: 2 additions & 2 deletions open-bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -224,11 +224,11 @@ rules:
minimum: 1d
maximum: 1w
pull_request:
head_ref: "^master$"
head_ref: "^main$"
permission: "read|none"
actions:
comment:
identifier: "head-master"
identifier: "head-main"
edit: true
message: |-
Hi @{{pull_request.user.login}}.
Expand Down
10 changes: 5 additions & 5 deletions packages/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ This folder is the collection of those packages.

## Packages

1. [configtest](https://github.com/webpack/webpack-cli/tree/master/packages/configtest)
2. [create-webpack-app](https://github.com/webpack/webpack-cli/tree/master/packages/create-webpack-app)
3. [info](https://github.com/webpack/webpack-cli/tree/master/packages/info)
4. [serve](https://github.com/webpack/webpack-cli/tree/master/packages/serve)
5. [webpack-cli](https://github.com/webpack/webpack-cli/tree/master/packages/webpack-cli)
1. [configtest](https://github.com/webpack/webpack-cli/tree/main/packages/configtest)
2. [create-webpack-app](https://github.com/webpack/webpack-cli/tree/main/packages/create-webpack-app)
3. [info](https://github.com/webpack/webpack-cli/tree/main/packages/info)
4. [serve](https://github.com/webpack/webpack-cli/tree/main/packages/serve)
5. [webpack-cli](https://github.com/webpack/webpack-cli/tree/main/packages/webpack-cli)

## Generic Installation

Expand Down
2 changes: 1 addition & 1 deletion packages/configtest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@webpack-cli/configtest",
"version": "3.0.1",
"description": "Validate a webpack configuration.",
"homepage": "https://github.com/webpack/webpack-cli/tree/master/packages/configtest",
"homepage": "https://github.com/webpack/webpack-cli/tree/main/packages/configtest",
"repository": {
"type": "git",
"url": "https://github.com/webpack/webpack-cli.git"
Expand Down
2 changes: 1 addition & 1 deletion packages/create-webpack-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"web",
"frameworks"
],
"homepage": "https://github.com/webpack/webpack-cli/tree/master/packages/create-webpack-app",
"homepage": "https://github.com/webpack/webpack-cli/tree/main/packages/create-webpack-app",
"bugs": "https://github.com/webpack/webpack-cli/issues",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion packages/info/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@webpack-cli/info",
"version": "3.0.1",
"description": "Outputs info about system and webpack config",
"homepage": "https://github.com/webpack/webpack-cli/tree/master/packages/info",
"homepage": "https://github.com/webpack/webpack-cli/tree/main/packages/info",
"repository": {
"type": "git",
"url": "https://github.com/webpack/webpack-cli.git"
Expand Down
2 changes: 1 addition & 1 deletion packages/serve/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ npx webpack-cli serve

### Options

Checkout [`SERVE-OPTIONS-v4.md`](https://github.com/webpack/webpack-cli/blob/master/SERVE-OPTIONS-v4.md) or [`SERVE-OPTIONS-v5.md`](https://github.com/webpack/webpack-cli/blob/master/SERVE-OPTIONS-v5.md) to see list of all available options for `serve` command for respective [`webpack-dev-server`](https://github.com/webpack/webpack-dev-server) version.
Checkout [`SERVE-OPTIONS-v4.md`](https://github.com/webpack/webpack-cli/blob/main/SERVE-OPTIONS-v4.md) or [`SERVE-OPTIONS-v5.md`](https://github.com/webpack/webpack-cli/blob/main/SERVE-OPTIONS-v5.md) to see list of all available options for `serve` command for respective [`webpack-dev-server`](https://github.com/webpack/webpack-dev-server) version.

[downloads]: https://img.shields.io/npm/dm/@webpack-cli/serve.svg
[downloads-url]: https://www.npmjs.com/package/@webpack-cli/serve
2 changes: 1 addition & 1 deletion packages/serve/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "3.0.1",
"description": "",
"keywords": [],
"homepage": "https://github.com/webpack/webpack-cli/tree/master/packages/serve",
"homepage": "https://github.com/webpack/webpack-cli/tree/main/packages/serve",
"repository": {
"type": "git",
"url": "https://github.com/webpack/webpack-cli.git"
Expand Down
2 changes: 1 addition & 1 deletion packages/webpack-cli/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
### BREAKING CHANGES

- the minimum required Node.js version is `18.12.0`
- removed `init`, `loader` and `plugin` commands in favor [`create-webpack-app`](https://github.com/webpack/webpack-cli/tree/master/packages/create-webpack-app)
- removed `init`, `loader` and `plugin` commands in favor [`create-webpack-app`](https://github.com/webpack/webpack-cli/tree/main/packages/create-webpack-app)
- dropped support for `webpack-dev-server@v4`
- minimum supported webpack version is `5.82.0`

Expand Down
2 changes: 1 addition & 1 deletion packages/webpack-cli/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ Global options:
-h, --help [verbose] Display help for commands and options.
```

Checkout [`OPTIONS.md`](https://github.com/webpack/webpack-cli/blob/master/OPTIONS.md) to see list of all available options.
Checkout [`OPTIONS.md`](https://github.com/webpack/webpack-cli/blob/main/OPTIONS.md) to see list of all available options.

## Exit codes and their meanings

Expand Down
2 changes: 1 addition & 1 deletion packages/webpack-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"bundler",
"web"
],
"homepage": "https://github.com/webpack/webpack-cli/tree/master/packages/webpack-cli",
"homepage": "https://github.com/webpack/webpack-cli/tree/main/packages/webpack-cli",
"bugs": "https://github.com/webpack/webpack-cli/issues",
"repository": {
"type": "git",
Expand Down
Loading