root
/
webpack
mirror of https://github.com/webpack/webpack.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

rename master to main

This commit is contained in:
Tobias Koppers 2021-06-28 11:46:10 +02:00
parent 18e93eb10e
commit c181294865
15 changed files with 236 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/test.yml vendored
View File

@ -6,11 +6,11 @@ name: Test
on: on:
push: push:
branches: branches:
- master - main
- dev-1 - dev-1
pull_request: pull_request:
branches: branches:
- master - main
- dev-1 - dev-1
jobs: jobs:

2
.travis.yml
View File

@ -4,7 +4,7 @@ language: node_js
branches: branches:
only: only:
- webpack-4 - webpack-4
- master - main
- next - next
- dev-1 - dev-1

6
README.md
View File

@ -287,7 +287,7 @@ Contributions go far beyond pull requests and commits. Although we love giving y
- [Blogging, speaking about, or creating tutorials](https://github.com/webpack-contrib/awesome-webpack) about one of webpack's many features. - [Blogging, speaking about, or creating tutorials](https://github.com/webpack-contrib/awesome-webpack) about one of webpack's many features.
- Helping others in our webpack [gitter channel](https://gitter.im/webpack/webpack). - Helping others in our webpack [gitter channel](https://gitter.im/webpack/webpack).
To get started have a look at our [documentation on contributing](https://github.com/webpack/webpack/blob/master/CONTRIBUTING.md). To get started have a look at our [documentation on contributing](https://github.com/webpack/webpack/blob/main/CONTRIBUTING.md).
If you are worried or don't know where to start, you can **always** reach out to [Sean Larkin (@TheLarkInn) on Twitter](https://twitter.com/thelarkinn) or simply submit an issue and a maintainer can help give you guidance! If you are worried or don't know where to start, you can **always** reach out to [Sean Larkin (@TheLarkInn) on Twitter](https://twitter.com/thelarkinn) or simply submit an issue and a maintainer can help give you guidance!
@ -715,11 +715,11 @@ src="https://static.monei.net/monei-logo.svg" height="30" alt="MONEI"></a>
[node-url]: https://nodejs.org [node-url]: https://nodejs.org
[deps]: https://img.shields.io/david/webpack/webpack.svg [deps]: https://img.shields.io/david/webpack/webpack.svg
[deps-url]: https://david-dm.org/webpack/webpack [deps-url]: https://david-dm.org/webpack/webpack
[tests]: https://img.shields.io/travis/webpack/webpack/master.svg [tests]: https://img.shields.io/travis/webpack/webpack/main.svg
[tests-url]: https://travis-ci.org/webpack/webpack [tests-url]: https://travis-ci.org/webpack/webpack
[prs]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg [prs]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg
[prs-url]: https://webpack.js.org/contribute/ [prs-url]: https://webpack.js.org/contribute/
[builds-url]: https://ci.appveyor.com/project/sokra/webpack/branch/master [builds-url]: https://ci.appveyor.com/project/sokra/webpack/branch/main
[builds]: https://ci.appveyor.com/api/projects/status/github/webpack/webpack?svg=true [builds]: https://ci.appveyor.com/api/projects/status/github/webpack/webpack?svg=true
[builds2]: https://dev.azure.com/webpack/webpack/_apis/build/status/webpack.webpack [builds2]: https://dev.azure.com/webpack/webpack/_apis/build/status/webpack.webpack
[builds2-url]: https://dev.azure.com/webpack/webpack/_build/latest?definitionId=3 [builds2-url]: https://dev.azure.com/webpack/webpack/_build/latest?definitionId=3

2
appveyor.yml
View File

@ -4,7 +4,7 @@
branches: branches:
only: only:
- webpack-4 - webpack-4
- master - main
- next - next
- dev-1 - dev-1

2
codecov.yml
View File

@ -1,5 +1,5 @@
codecov: codecov:
branch: master branch: main
coverage: coverage:
precision: 2 precision: 2
round: down round: down

68
examples/dll-entry-only/README.md
View File

@ -21,8 +21,8 @@ Module `cjs.js` is left as is since it's in CommonJS format.
The manifest includes `example.js` as the only exposed module and lists the exports as `["a","b","c"]` The manifest includes `example.js` as the only exposed module and lists the exports as `["a","b","c"]`
from the corresponding modules `a.js`, `b.js`, and `cjs.js`. None of the other modules are exposed. from the corresponding modules `a.js`, `b.js`, and `cjs.js`. None of the other modules are exposed.
Also, see [tree shaking](https://github.com/webpack/webpack/tree/master/examples/harmony-unused) Also, see [tree shaking](https://github.com/webpack/webpack/tree/main/examples/harmony-unused)
and [scope hoisting example](https://github.com/webpack/webpack/tree/master/examples/scope-hoisting). and [scope hoisting example](https://github.com/webpack/webpack/tree/main/examples/scope-hoisting).
# example.js # example.js
@ -152,20 +152,27 @@ exports.c = "c";
/******/ // Check if module is in cache /******/ // Check if module is in cache
/******/ if (__webpack_module_cache__[moduleId]) { /******/ if (__webpack_module_cache__[moduleId]) {
/******/ return __webpack_module_cache__[moduleId].exports; /******/ return __webpack_module_cache__[moduleId].exports;
/******/ } /******/
}
/******/ // Create a new module (and put it into the cache) /******/ // Create a new module (and put it into the cache)
/******/ var module = __webpack_module_cache__[moduleId] = { /******/ var module = (__webpack_module_cache__[moduleId] = {
/******/ // no module.id needed /******/ // no module.id needed
/******/ // no module.loaded needed /******/ // no module.loaded needed
/******/ exports: {} /******/ exports: {}
/******/ }; /******/
});
/******/ /******/
/******/ // Execute the module function /******/ // Execute the module function
/******/ __webpack_modules__[moduleId](module, module.exports, __webpack_require__); /******/ __webpack_modules__[moduleId](
module,
module.exports,
__webpack_require__
);
/******/ /******/
/******/ // Return the exports of the module /******/ // Return the exports of the module
/******/ return module.exports; /******/ return module.exports;
/******/ } /******/
}
/******/ /******/
/************************************************************************/ /************************************************************************/
/******/ /* webpack/runtime/define property getters */ /******/ /* webpack/runtime/define property getters */
@ -173,28 +180,45 @@ exports.c = "c";
/******/ // define getter functions for harmony exports /******/ // define getter functions for harmony exports
/******/ __webpack_require__.d = (exports, definition) => { /******/ __webpack_require__.d = (exports, definition) => {
/******/ for (var key in definition) { /******/ for (var key in definition) {
/******/ if(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) { /******/ if (
/******/ Object.defineProperty(exports, key, { enumerable: true, get: definition[key] }); __webpack_require__.o(definition, key) &&
/******/ } !__webpack_require__.o(exports, key)
/******/ } ) {
/******/ }; /******/ Object.defineProperty(exports, key, {
/******/ })(); enumerable: true,
get: definition[key]
});
/******/
}
/******/
}
/******/
};
/******/
})();
/******/ /******/
/******/ /* webpack/runtime/hasOwnProperty shorthand */ /******/ /* webpack/runtime/hasOwnProperty shorthand */
/******/ (() => { /******/ (() => {
/******/ __webpack_require__.o = (obj, prop) => Object.prototype.hasOwnProperty.call(obj, prop) /******/ __webpack_require__.o = (obj, prop) =>
/******/ })(); Object.prototype.hasOwnProperty.call(obj, prop);
/******/
})();
/******/ /******/
/******/ /* webpack/runtime/make namespace object */ /******/ /* webpack/runtime/make namespace object */
/******/ (() => { /******/ (() => {
/******/ // define __esModule on exports /******/ // define __esModule on exports
/******/ __webpack_require__.r = (exports) => { /******/ __webpack_require__.r = exports => {
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) { /******/ if (typeof Symbol !== "undefined" && Symbol.toStringTag) {
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' }); /******/ Object.defineProperty(exports, Symbol.toStringTag, {
/******/ } value: "Module"
/******/ Object.defineProperty(exports, '__esModule', { value: true }); });
/******/ }; /******/
/******/ })(); }
/******/ Object.defineProperty(exports, "__esModule", { value: true });
/******/
};
/******/
})();
/******/ /******/
/************************************************************************/ /************************************************************************/
``` ```

4
examples/dll-entry-only/template.md
View File

@ -21,8 +21,8 @@ Module `cjs.js` is left as is since it's in CommonJS format.
The manifest includes `example.js` as the only exposed module and lists the exports as `["a","b","c"]` The manifest includes `example.js` as the only exposed module and lists the exports as `["a","b","c"]`
from the corresponding modules `a.js`, `b.js`, and `cjs.js`. None of the other modules are exposed. from the corresponding modules `a.js`, `b.js`, and `cjs.js`. None of the other modules are exposed.
Also, see [tree shaking](https://github.com/webpack/webpack/tree/master/examples/harmony-unused) Also, see [tree shaking](https://github.com/webpack/webpack/tree/main/examples/harmony-unused)
and [scope hoisting example](https://github.com/webpack/webpack/tree/master/examples/scope-hoisting). and [scope hoisting example](https://github.com/webpack/webpack/tree/main/examples/scope-hoisting).
# example.js # example.js

19
examples/dll-user/README.md
View File

@ -2,7 +2,7 @@
[DllPlugin documentation](https://webpack.js.org/plugins/dll-plugin) [DllPlugin documentation](https://webpack.js.org/plugins/dll-plugin)
This is the _user_ bundle, which uses the manifest from [dll-reference example](https://github.com/webpack/webpack/tree/master/examples/dll) This is the _user_ bundle, which uses the manifest from [dll-reference example](https://github.com/webpack/webpack/tree/main/examples/dll)
# webpack.config.js # webpack.config.js
@ -151,20 +151,27 @@ module.exports = (__webpack_require__(/*! dll-reference alpha_bb584d575dc3369666
/******/ // Check if module is in cache /******/ // Check if module is in cache
/******/ if (__webpack_module_cache__[moduleId]) { /******/ if (__webpack_module_cache__[moduleId]) {
/******/ return __webpack_module_cache__[moduleId].exports; /******/ return __webpack_module_cache__[moduleId].exports;
/******/ } /******/
}
/******/ // Create a new module (and put it into the cache) /******/ // Create a new module (and put it into the cache)
/******/ var module = __webpack_module_cache__[moduleId] = { /******/ var module = (__webpack_module_cache__[moduleId] = {
/******/ // no module.id needed /******/ // no module.id needed
/******/ // no module.loaded needed /******/ // no module.loaded needed
/******/ exports: {} /******/ exports: {}
/******/ }; /******/
});
/******/ /******/
/******/ // Execute the module function /******/ // Execute the module function
/******/ __webpack_modules__[moduleId](module, module.exports, __webpack_require__); /******/ __webpack_modules__[moduleId](
module,
module.exports,
__webpack_require__
);
/******/ /******/
/******/ // Return the exports of the module /******/ // Return the exports of the module
/******/ return module.exports; /******/ return module.exports;
/******/ } /******/
}
/******/ /******/
/************************************************************************/ /************************************************************************/
``` ```

2
examples/dll-user/template.md
View File

@ -2,7 +2,7 @@
[DllPlugin documentation](https://webpack.js.org/plugins/dll-plugin) [DllPlugin documentation](https://webpack.js.org/plugins/dll-plugin)
This is the _user_ bundle, which uses the manifest from [dll-reference example](https://github.com/webpack/webpack/tree/master/examples/dll) This is the _user_ bundle, which uses the manifest from [dll-reference example](https://github.com/webpack/webpack/tree/main/examples/dll)
# webpack.config.js # webpack.config.js

19
examples/dll/README.md
View File

@ -2,7 +2,7 @@
[DllPlugin documentation](https://webpack.js.org/plugins/dll-plugin) [DllPlugin documentation](https://webpack.js.org/plugins/dll-plugin)
This is the _reference_ bundle (with the manifests) for [dll user example](https://github.com/webpack/webpack/tree/master/examples/dll-user) This is the _reference_ bundle (with the manifests) for [dll user example](https://github.com/webpack/webpack/tree/main/examples/dll-user)
# webpack.config.js # webpack.config.js
@ -100,20 +100,27 @@ module.exports = "module";
/******/ // Check if module is in cache /******/ // Check if module is in cache
/******/ if (__webpack_module_cache__[moduleId]) { /******/ if (__webpack_module_cache__[moduleId]) {
/******/ return __webpack_module_cache__[moduleId].exports; /******/ return __webpack_module_cache__[moduleId].exports;
/******/ } /******/
}
/******/ // Create a new module (and put it into the cache) /******/ // Create a new module (and put it into the cache)
/******/ var module = __webpack_module_cache__[moduleId] = { /******/ var module = (__webpack_module_cache__[moduleId] = {
/******/ // no module.id needed /******/ // no module.id needed
/******/ // no module.loaded needed /******/ // no module.loaded needed
/******/ exports: {} /******/ exports: {}
/******/ }; /******/
});
/******/ /******/
/******/ // Execute the module function /******/ // Execute the module function
/******/ __webpack_modules__[moduleId](module, module.exports, __webpack_require__); /******/ __webpack_modules__[moduleId](
module,
module.exports,
__webpack_require__
);
/******/ /******/
/******/ // Return the exports of the module /******/ // Return the exports of the module
/******/ return module.exports; /******/ return module.exports;
/******/ } /******/
}
/******/ /******/
/************************************************************************/ /************************************************************************/
``` ```

2
examples/dll/template.md
View File

@ -2,7 +2,7 @@
[DllPlugin documentation](https://webpack.js.org/plugins/dll-plugin) [DllPlugin documentation](https://webpack.js.org/plugins/dll-plugin)
This is the _reference_ bundle (with the manifests) for [dll user example](https://github.com/webpack/webpack/tree/master/examples/dll-user) This is the _reference_ bundle (with the manifests) for [dll user example](https://github.com/webpack/webpack/tree/main/examples/dll-user)
# webpack.config.js # webpack.config.js

36
examples/multi-part-library/README.md
View File

@ -10,7 +10,7 @@ You can see that webpack automatically wraps your module so that it is consumabl
Note: You can also use the `library` and `libraryTarget` options without multiple entry points. Then you don't need `[name]`. Note: You can also use the `library` and `libraryTarget` options without multiple entry points. Then you don't need `[name]`.
Note: When your library has dependencies that should not be included in the compiled version, you can use the `externals` option. See [externals example](https://github.com/webpack/webpack/tree/master/examples/externals). Note: When your library has dependencies that should not be included in the compiled version, you can use the `externals` option. See [externals example](https://github.com/webpack/webpack/tree/main/examples/externals).
# webpack.config.js # webpack.config.js
@ -73,20 +73,27 @@ module.exports = "alpha";
/******/ // Check if module is in cache /******/ // Check if module is in cache
/******/ if (__webpack_module_cache__[moduleId]) { /******/ if (__webpack_module_cache__[moduleId]) {
/******/ return __webpack_module_cache__[moduleId].exports; /******/ return __webpack_module_cache__[moduleId].exports;
/******/ } /******/
}
/******/ // Create a new module (and put it into the cache) /******/ // Create a new module (and put it into the cache)
/******/ var module = __webpack_module_cache__[moduleId] = { /******/ var module = (__webpack_module_cache__[moduleId] = {
/******/ // no module.id needed /******/ // no module.id needed
/******/ // no module.loaded needed /******/ // no module.loaded needed
/******/ exports: {} /******/ exports: {}
/******/ }; /******/
});
/******/ /******/
/******/ // Execute the module function /******/ // Execute the module function
/******/ __webpack_modules__[moduleId](module, module.exports, __webpack_require__); /******/ __webpack_modules__[moduleId](
module,
module.exports,
__webpack_require__
);
/******/ /******/
/******/ // Return the exports of the module /******/ // Return the exports of the module
/******/ return module.exports; /******/ return module.exports;
/******/ } /******/
}
/******/ /******/
/************************************************************************/ /************************************************************************/
``` ```
@ -146,20 +153,27 @@ module.exports = "beta";
/******/ // Check if module is in cache /******/ // Check if module is in cache
/******/ if (__webpack_module_cache__[moduleId]) { /******/ if (__webpack_module_cache__[moduleId]) {
/******/ return __webpack_module_cache__[moduleId].exports; /******/ return __webpack_module_cache__[moduleId].exports;
/******/ } /******/
}
/******/ // Create a new module (and put it into the cache) /******/ // Create a new module (and put it into the cache)
/******/ var module = __webpack_module_cache__[moduleId] = { /******/ var module = (__webpack_module_cache__[moduleId] = {
/******/ // no module.id needed /******/ // no module.id needed
/******/ // no module.loaded needed /******/ // no module.loaded needed
/******/ exports: {} /******/ exports: {}
/******/ }; /******/
});
/******/ /******/
/******/ // Execute the module function /******/ // Execute the module function
/******/ __webpack_modules__[moduleId](module, module.exports, __webpack_require__); /******/ __webpack_modules__[moduleId](
module,
module.exports,
__webpack_require__
);
/******/ /******/
/******/ // Return the exports of the module /******/ // Return the exports of the module
/******/ return module.exports; /******/ return module.exports;
/******/ } /******/
}
/******/ /******/
/************************************************************************/ /************************************************************************/
``` ```

2
examples/multi-part-library/template.md
View File

@ -10,7 +10,7 @@ You can see that webpack automatically wraps your module so that it is consumabl
Note: You can also use the `library` and `libraryTarget` options without multiple entry points. Then you don't need `[name]`. Note: You can also use the `library` and `libraryTarget` options without multiple entry points. Then you don't need `[name]`.
Note: When your library has dependencies that should not be included in the compiled version, you can use the `externals` option. See [externals example](https://github.com/webpack/webpack/tree/master/examples/externals). Note: When your library has dependencies that should not be included in the compiled version, you can use the `externals` option. See [externals example](https://github.com/webpack/webpack/tree/main/examples/externals).
# webpack.config.js # webpack.config.js

24
open-bot.yaml
View File

@ -129,7 +129,7 @@ rules:
@{{issue.user.login}} Please check if this is appliable to your PR and if you can add more test cases. @{{issue.user.login}} Please check if this is appliable to your PR and if you can add more test cases.
Read the [test readme](https://github.com/webpack/webpack/blob/master/test/README.md) for details how to write test cases. Read the [test readme](https://github.com/webpack/webpack/blob/main/test/README.md) for details how to write test cases.
# add conflict label to pull requests with conflict # add conflict label to pull requests with conflict
# on conflict all result labels are removed # on conflict all result labels are removed
@ -229,16 +229,16 @@ rules:
actions: actions:
label: "PR: unreviewed" label: "PR: unreviewed"
# add non-master, webpack-4 and next label to pull request to other branch # add non-main, webpack-4 and next label to pull request to other branch
- filters: - filters:
pull_request: pull_request:
base_ref: "^master$" base_ref: "^main$"
actions: actions:
label: label:
remove: remove:
- "PR: next" - "PR: next"
- "PR: webpack-4" - "PR: webpack-4"
- "PR: non-master" - "PR: non-main"
- filters: - filters:
pull_request: pull_request:
base_ref: "^next$" base_ref: "^next$"
@ -247,7 +247,7 @@ rules:
add: "PR: next" add: "PR: next"
remove: remove:
- "PR: webpack-4" - "PR: webpack-4"
- "PR: non-master" - "PR: non-main"
- filters: - filters:
pull_request: pull_request:
base_ref: "^webpack-4$" base_ref: "^webpack-4$"
@ -256,36 +256,36 @@ rules:
add: "PR: webpack-4" add: "PR: webpack-4"
remove: remove:
- "PR: next" - "PR: next"
- "PR: non-master" - "PR: non-main"
- filters: - filters:
pull_request: pull_request:
base_ref: "^(?!master$)(?!webpack-4$)(?!next$)" base_ref: "^(?!main$)(?!webpack-4$)(?!next$)"
actions: actions:
label: label:
add: "PR: non-master" add: "PR: non-main"
remove: remove:
- "PR: next" - "PR: next"
- "PR: webpack-4" - "PR: webpack-4"
# add non-master label to pull request to other branch # add non-main label to pull request to other branch
- filters: - filters:
open: true open: true
age: age:
minimum: 1d minimum: 1d
maximum: 1w maximum: 1w
pull_request: pull_request:
head_ref: "^master$" head_ref: "^main$"
permission: "read|none" permission: "read|none"
actions: actions:
comment: comment:
identifier: "head-master" identifier: "head-main"
edit: true edit: true
message: |- message: |-
Hi @{{pull_request.user.login}}. Hi @{{pull_request.user.login}}.
Just a little hint from a friendly bot about the best practice when submitting pull requests: Just a little hint from a friendly bot about the best practice when submitting pull requests:
> Don't submit pull request from your own `master` branch. It's recommended to create a feature branch for the PR. > Don't submit pull request from your own `main` branch. It's recommended to create a feature branch for the PR.
*You don't have to change it for this PR, just make sure to follow this hint the next time you submit a PR.* *You don't have to change it for this PR, just make sure to follow this hint the next time you submit a PR.*

2
test/configCases/asset-modules/https-url/index.js
View File

@ -1,4 +1,4 @@
import codeOfConduct from "https://raw.githubusercontent.com/webpack/webpack/master/CODE_OF_CONDUCT.md"; import codeOfConduct from "https://raw.githubusercontent.com/webpack/webpack/main/CODE_OF_CONDUCT.md";
it("https url request should be supported", () => { it("https url request should be supported", () => {
expect(codeOfConduct.includes("CODE_OF_CONDUCT")).toBeTruthy(); expect(codeOfConduct.includes("CODE_OF_CONDUCT")).toBeTruthy();