From c4ed88790c74b2d1034421ae839fc8f1570e7025 Mon Sep 17 00:00:00 2001 From: alexander-akait Date: Thu, 11 Sep 2025 16:29:50 +0300 Subject: [PATCH] refactor: migrate to main --- .github/workflows/nodejs.yml | 4 ++-- CHANGELOG.md | 10 +++++----- CONTRIBUTING.md | 2 +- DOCUMENTATION-v4.md | 10 +++++----- README.md | 2 +- migration-v4.md | 2 +- package.json | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 24289f5388..74945cdeb6 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -3,12 +3,12 @@ name: webpack-dev-server on: push: branches: - - master + - main - next - v4 pull_request: branches: - - master + - main - next - v4 diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d99dd4206..3483dc65f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -88,7 +88,7 @@ The above changes may make the dev server not work if you relied on such behavio ## [5.0.0](https://github.com/webpack/webpack-dev-server/compare/v4.15.1...v5.0.0) (2024-02-12) -[Migration Guide and Changes](https://github.com/webpack/webpack-dev-server/blob/master/migration-v5.md). +[Migration Guide and Changes](https://github.com/webpack/webpack-dev-server/blob/main/migration-v5.md). ### [4.15.1](https://github.com/webpack/webpack-dev-server/compare/v4.15.0...v4.15.1) (2023-06-09) @@ -324,7 +324,7 @@ The above changes may make the dev server not work if you relied on such behavio ### Features * add `--web-socket-server-type` option for CLI ([#4001](https://github.com/webpack/webpack-dev-server/issues/4001)) ([17c390a](https://github.com/webpack/webpack-dev-server/commit/17c390a04e474a675255eb25132b423e0614253f)) -* show deprecation warning for `https`/`http2` option, [migration guide for `https`](https://github.com/webpack/webpack-dev-server/tree/master/examples/server/https) and [migration guide for `http2`](https://github.com/webpack/webpack-dev-server/tree/master/examples/server/spdy) (because we use [`spdy`](https://github.com/spdy-http2/node-spdy) for http2 due `express` doesn't support http2) ([#4003](https://github.com/webpack/webpack-dev-server/issues/4003)) ([521cf85](https://github.com/webpack/webpack-dev-server/commit/521cf852a81c5913e17cf36c90140c566d4218e5)) +* show deprecation warning for `https`/`http2` option, [migration guide for `https`](https://github.com/webpack/webpack-dev-server/tree/main/examples/server/https) and [migration guide for `http2`](https://github.com/webpack/webpack-dev-server/tree/main/examples/server/spdy) (because we use [`spdy`](https://github.com/spdy-http2/node-spdy) for http2 due `express` doesn't support http2) ([#4003](https://github.com/webpack/webpack-dev-server/issues/4003)) ([521cf85](https://github.com/webpack/webpack-dev-server/commit/521cf852a81c5913e17cf36c90140c566d4218e5)) ### Bug Fixes @@ -441,7 +441,7 @@ module.exports = { ## Notes: -- migration guide from v3 to v4 can be found [here](https://github.com/webpack/webpack-dev-server/blob/master/migration-v4.md) +- migration guide from v3 to v4 can be found [here](https://github.com/webpack/webpack-dev-server/blob/main/migration-v4.md) ### Bug Fixes @@ -453,7 +453,7 @@ module.exports = { ## Notes: -- migration guide from v3 to v4 can be found [here](https://github.com/webpack/webpack-dev-server/blob/master/migration-v4.md) +- migration guide from v3 to v4 can be found [here](https://github.com/webpack/webpack-dev-server/blob/main/migration-v4.md) ### Features @@ -475,7 +475,7 @@ module.exports = { ## Notes: -- migration guide from v3 to v4 can be found [here](https://github.com/webpack/webpack-dev-server/blob/master/migration-v4.md) +- migration guide from v3 to v4 can be found [here](https://github.com/webpack/webpack-dev-server/blob/main/migration-v4.md) ### ⚠ BREAKING CHANGES diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5a355352d7..7adb34b1e9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -21,7 +21,7 @@ Following these guidelines helps to communicate that you respect the time of the - It is advised to first create an issue (if there is not one already) before making a pull request. This way the maintainers can first discuss with you if they agree and it also helps with providing some context. -- Run the relevant [examples](https://github.com/webpack/webpack-dev-server/tree/master/examples) to see if all functionality still works. When introducing new functionality, also add an example. This helps the maintainers to understand it and check if it still works. +- Run the relevant [examples](https://github.com/webpack/webpack-dev-server/tree/main/examples) to see if all functionality still works. When introducing new functionality, also add an example. This helps the maintainers to understand it and check if it still works. - Write tests. diff --git a/DOCUMENTATION-v4.md b/DOCUMENTATION-v4.md index 467a6ab8c9..61fd73364e 100644 --- a/DOCUMENTATION-v4.md +++ b/DOCUMENTATION-v4.md @@ -1,6 +1,6 @@ [webpack-dev-server](https://github.com/webpack/webpack-dev-server) can be used to quickly develop an application. See the [development guide](/guides/development/) to get started. -This page describes the options that affect the behavior of webpack-dev-server (short: dev-server) `v4.0.0+`. Migration guide from `v3` to `v4` can be found [here](https://github.com/webpack/webpack-dev-server/blob/master/migration-v4.md). +This page describes the options that affect the behavior of webpack-dev-server (short: dev-server) `v4.0.0+`. Migration guide from `v3` to `v4` can be found [here](https://github.com/webpack/webpack-dev-server/blob/main/migration-v4.md). > **Warning** > @@ -41,7 +41,7 @@ When the server is started, there will be a message prior to the list of resolve that will give some background on where the server is located and what it's serving. -If you're using dev-server through the Node.js API, the options in `devServer` will be ignored. Pass the options as the first parameter instead: `new WebpackDevServer({...}, compiler)`. [See here](https://github.com/webpack/webpack-dev-server/tree/master/examples/api/simple) for an example of how to use webpack-dev-server through the Node.js API. +If you're using dev-server through the Node.js API, the options in `devServer` will be ignored. Pass the options as the first parameter instead: `new WebpackDevServer({...}, compiler)`. [See here](https://github.com/webpack/webpack-dev-server/tree/main/examples/api/simple) for an example of how to use webpack-dev-server through the Node.js API. > **Warning** > @@ -71,7 +71,7 @@ You can invoke webpack-dev-server via CLI by: npx webpack serve ``` -A list of CLI options for `serve` is available [here](https://github.com/webpack/webpack-cli/blob/master/SERVE-OPTIONS-v4.md) +A list of CLI options for `serve` is available [here](https://github.com/webpack/webpack-cli/blob/main/SERVE-OPTIONS-v4.md) ### Usage via API @@ -457,7 +457,7 @@ npx webpack serve --client-web-socket-transport ws --web-socket-server ws > > When providing a custom client and server implementation make sure that they are compatible with one another to communicate successfully. -To create a custom client implementation, create a class that extends [`BaseClient`](https://github.com/webpack/webpack-dev-server/blob/master/client-src/clients/BaseClient.js). +To create a custom client implementation, create a class that extends [`BaseClient`](https://github.com/webpack/webpack-dev-server/blob/main/client-src/clients/BaseClient.js). Using path to `CustomClient.js`, a custom WebSocket client implementation, along with the compatible `'ws'` server: @@ -1986,7 +1986,7 @@ module.exports = { }; ``` -To create a custom server implementation, create a class that extends [`BaseServer`](https://github.com/webpack/webpack-dev-server/blob/master/lib/servers/BaseServer.js). +To create a custom server implementation, create a class that extends [`BaseServer`](https://github.com/webpack/webpack-dev-server/blob/main/lib/servers/BaseServer.js). Using path to `CustomServer.js`, a custom WebSocket server implementation, along with the compatible `'ws'` client: diff --git a/README.md b/README.md index 7314c0e1b2..ca701218bf 100644 --- a/README.md +++ b/README.md @@ -311,7 +311,7 @@ This project is heavily inspired by [peerigon/nof5](https://github.com/peerigon/ [node-url]: https://nodejs.org [tests]: https://github.com/webpack/webpack-dev-server/workflows/webpack-dev-server/badge.svg [tests-url]: https://github.com/webpack/webpack-dev-server/actions?query=workflow%3Awebpack-dev-server -[cover]: https://codecov.io/gh/webpack/webpack-dev-server/branch/master/graph/badge.svg +[cover]: https://codecov.io/gh/webpack/webpack-dev-server/graph/badge.svg [cover-url]: https://codecov.io/gh/webpack/webpack-dev-server [discussion]: https://img.shields.io/github/discussions/webpack/webpack [discussion-url]: https://github.com/webpack/webpack/discussions diff --git a/migration-v4.md b/migration-v4.md index 93824a52b1..bc1383a5e7 100644 --- a/migration-v4.md +++ b/migration-v4.md @@ -730,4 +730,4 @@ There are a lot of other bug fixes. ); ``` - - [See here](https://github.com/webpack/webpack-dev-server/tree/master/examples/api/simple) for an example of how to use `webpack-dev-server` through the Node.js API. + - [See here](https://github.com/webpack/webpack-dev-server/tree/main/examples/api/simple) for an example of how to use `webpack-dev-server` through the Node.js API. diff --git a/package.json b/package.json index ec94fa2cae..63c75ecfa4 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "fix:code": "npm run lint:code -- --fix", "fix:prettier": "npm run lint:prettier -- --write", "fix": "npm-run-all -l fix:code fix:prettier", - "commitlint": "commitlint --from=master", + "commitlint": "commitlint --from=main", "build:client": "rimraf -g ./client/* && babel client-src/ --out-dir client/ --ignore \"client-src/webpack.config.js\" --ignore \"client-src/modules\" && webpack --config client-src/webpack.config.js", "build:types": "rimraf -g ./types/* && tsc --declaration --emitDeclarationOnly --outDir types && node ./scripts/extend-webpack-types.js && prettier \"types/**/*.ts\" --write && prettier \"types/**/*.ts\" --write", "build": "npm-run-all -p \"build:**\"",