Skip to content

Commit c181294

Browse files
sokrasokra
committed
rename master to main
1 parent 18e93eb commit c181294

File tree

15 files changed

+236
-184
lines changed

15 files changed

+236
-184
lines changed

‎.github/workflows/test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ name: Test
66
on:
77
push:
88
branches:
9-
- master
9+
- main
1010
- dev-1
1111
pull_request:
1212
branches:
13-
- master
13+
- main
1414
- dev-1
1515

1616
jobs:

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ language: node_js
44
branches:
55
only:
66
- webpack-4
7-
- master
7+
- main
88
- next
99
- dev-1
1010

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ Contributions go far beyond pull requests and commits. Although we love giving y
287287
- [Blogging, speaking about, or creating tutorials](https://github.com/webpack-contrib/awesome-webpack) about one of webpack's many features.
288288
- Helping others in our webpack [gitter channel](https://gitter.im/webpack/webpack).
289289

290-
To get started have a look at our [documentation on contributing](https://github.com/webpack/webpack/blob/master/CONTRIBUTING.md).
290+
To get started have a look at our [documentation on contributing](https://github.com/webpack/webpack/blob/main/CONTRIBUTING.md).
291291

292292
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!
293293

@@ -715,11 +715,11 @@ src="https://static.monei.net/monei-logo.svg" height="30" alt="MONEI"></a>
715715
[node-url]: https://nodejs.org
716716
[deps]: https://img.shields.io/david/webpack/webpack.svg
717717
[deps-url]: https://david-dm.org/webpack/webpack
718-
[tests]: https://img.shields.io/travis/webpack/webpack/master.svg
718+
[tests]: https://img.shields.io/travis/webpack/webpack/main.svg
719719
[tests-url]: https://travis-ci.org/webpack/webpack
720720
[prs]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg
721721
[prs-url]: https://webpack.js.org/contribute/
722-
[builds-url]: https://ci.appveyor.com/project/sokra/webpack/branch/master
722+
[builds-url]: https://ci.appveyor.com/project/sokra/webpack/branch/main
723723
[builds]: https://ci.appveyor.com/api/projects/status/github/webpack/webpack?svg=true
724724
[builds2]: https://dev.azure.com/webpack/webpack/_apis/build/status/webpack.webpack
725725
[builds2-url]: https://dev.azure.com/webpack/webpack/_build/latest?definitionId=3

‎appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
branches:
55
only:
66
- webpack-4
7-
- master
7+
- main
88
- next
99
- dev-1
1010

‎codecov.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
codecov:
2-
branch: master
2+
branch: main
33
coverage:
44
precision: 2
55
round: down

‎examples/dll-entry-only/README.md

+79-55
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ Module `cjs.js` is left as is since it's in CommonJS format.
2121
The manifest includes `example.js` as the only exposed module and lists the exports as `["a","b","c"]`
2222
from the corresponding modules `a.js`, `b.js`, and `cjs.js`. None of the other modules are exposed.
2323

24-
Also, see [tree shaking](https://github.com/webpack/webpack/tree/master/examples/harmony-unused)
25-
and [scope hoisting example](https://github.com/webpack/webpack/tree/master/examples/scope-hoisting).
24+
Also, see [tree shaking](https://github.com/webpack/webpack/tree/main/examples/harmony-unused)
25+
and [scope hoisting example](https://github.com/webpack/webpack/tree/main/examples/scope-hoisting).
2626

2727
# example.js
2828

@@ -142,66 +142,90 @@ exports.c = "c";
142142
143143
<details><summary><code>/* webpack runtime code */</code></summary>
144144
145-
``` js
145+
```js
146146
/************************************************************************/
147-
/******/ // The module cache
148-
/******/ var __webpack_module_cache__ = {};
149-
/******/
150-
/******/ // The require function
151-
/******/ function __webpack_require__(moduleId) {
152-
/******/ // Check if module is in cache
153-
/******/ if(__webpack_module_cache__[moduleId]) {
154-
/******/ return __webpack_module_cache__[moduleId].exports;
155-
/******/ }
156-
/******/ // Create a new module (and put it into the cache)
157-
/******/ var module = __webpack_module_cache__[moduleId] = {
158-
/******/ // no module.id needed
159-
/******/ // no module.loaded needed
160-
/******/ exports: {}
161-
/******/ };
162-
/******/
163-
/******/ // Execute the module function
164-
/******/ __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
165-
/******/
166-
/******/ // Return the exports of the module
167-
/******/ return module.exports;
168-
/******/ }
169-
/******/
147+
/******/ // The module cache
148+
/******/ var __webpack_module_cache__ = {};
149+
/******/
150+
/******/ // The require function
151+
/******/ function __webpack_require__(moduleId) {
152+
/******/ // Check if module is in cache
153+
/******/ if (__webpack_module_cache__[moduleId]) {
154+
/******/ return __webpack_module_cache__[moduleId].exports;
155+
/******/
156+
}
157+
/******/ // Create a new module (and put it into the cache)
158+
/******/ var module = (__webpack_module_cache__[moduleId] = {
159+
/******/ // no module.id needed
160+
/******/ // no module.loaded needed
161+
/******/ exports: {}
162+
/******/
163+
});
164+
/******/
165+
/******/ // Execute the module function
166+
/******/ __webpack_modules__[moduleId](
167+
module,
168+
module.exports,
169+
__webpack_require__
170+
);
171+
/******/
172+
/******/ // Return the exports of the module
173+
/******/ return module.exports;
174+
/******/
175+
}
176+
/******/
170177
/************************************************************************/
171-
/******/ /* webpack/runtime/define property getters */
172-
/******/ (() => {
173-
/******/ // define getter functions for harmony exports
174-
/******/ __webpack_require__.d = (exports, definition) => {
175-
/******/ for(var key in definition) {
176-
/******/ if(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {
177-
/******/ Object.defineProperty(exports, key, { enumerable: true, get: definition[key] });
178-
/******/ }
179-
/******/ }
180-
/******/ };
181-
/******/ })();
182-
/******/
183-
/******/ /* webpack/runtime/hasOwnProperty shorthand */
184-
/******/ (() => {
185-
/******/ __webpack_require__.o = (obj, prop) => Object.prototype.hasOwnProperty.call(obj, prop)
186-
/******/ })();
187-
/******/
188-
/******/ /* webpack/runtime/make namespace object */
189-
/******/ (() => {
190-
/******/ // define __esModule on exports
191-
/******/ __webpack_require__.r = (exports) => {
192-
/******/ if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
193-
/******/ Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
194-
/******/ }
195-
/******/ Object.defineProperty(exports, '__esModule', { value: true });
196-
/******/ };
197-
/******/ })();
198-
/******/
178+
/******/ /* webpack/runtime/define property getters */
179+
/******/ (() => {
180+
/******/ // define getter functions for harmony exports
181+
/******/ __webpack_require__.d = (exports, definition) => {
182+
/******/ for (var key in definition) {
183+
/******/ if (
184+
__webpack_require__.o(definition, key) &&
185+
!__webpack_require__.o(exports, key)
186+
) {
187+
/******/ Object.defineProperty(exports, key, {
188+
enumerable: true,
189+
get: definition[key]
190+
});
191+
/******/
192+
}
193+
/******/
194+
}
195+
/******/
196+
};
197+
/******/
198+
})();
199+
/******/
200+
/******/ /* webpack/runtime/hasOwnProperty shorthand */
201+
/******/ (() => {
202+
/******/ __webpack_require__.o = (obj, prop) =>
203+
Object.prototype.hasOwnProperty.call(obj, prop);
204+
/******/
205+
})();
206+
/******/
207+
/******/ /* webpack/runtime/make namespace object */
208+
/******/ (() => {
209+
/******/ // define __esModule on exports
210+
/******/ __webpack_require__.r = exports => {
211+
/******/ if (typeof Symbol !== "undefined" && Symbol.toStringTag) {
212+
/******/ Object.defineProperty(exports, Symbol.toStringTag, {
213+
value: "Module"
214+
});
215+
/******/
216+
}
217+
/******/ Object.defineProperty(exports, "__esModule", { value: true });
218+
/******/
219+
};
220+
/******/
221+
})();
222+
/******/
199223
/************************************************************************/
200224
```
201225
202226
</details>
203227
204-
``` js
228+
```js
205229
/******/ // module exports must be returned from runtime so entry inlining is disabled
206230
/******/ // startup
207231
/******/ // Load entry module and return exports

‎examples/dll-entry-only/template.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ Module `cjs.js` is left as is since it's in CommonJS format.
2121
The manifest includes `example.js` as the only exposed module and lists the exports as `["a","b","c"]`
2222
from the corresponding modules `a.js`, `b.js`, and `cjs.js`. None of the other modules are exposed.
2323

24-
Also, see [tree shaking](https://github.com/webpack/webpack/tree/master/examples/harmony-unused)
25-
and [scope hoisting example](https://github.com/webpack/webpack/tree/master/examples/scope-hoisting).
24+
Also, see [tree shaking](https://github.com/webpack/webpack/tree/main/examples/harmony-unused)
25+
and [scope hoisting example](https://github.com/webpack/webpack/tree/main/examples/scope-hoisting).
2626

2727
# example.js
2828

‎examples/dll-user/README.md

+33-26
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[DllPlugin documentation](https://webpack.js.org/plugins/dll-plugin)
44

5-
This is the _user_ bundle, which uses the manifest from [dll-reference example](https://github.com/webpack/webpack/tree/master/examples/dll)
5+
This is the _user_ bundle, which uses the manifest from [dll-reference example](https://github.com/webpack/webpack/tree/main/examples/dll)
66

77
# webpack.config.js
88

@@ -141,37 +141,44 @@ module.exports = (__webpack_require__(/*! dll-reference alpha_bb584d575dc3369666
141141
142142
<details><summary><code>/* webpack runtime code */</code></summary>
143143
144-
``` js
144+
```js
145145
/************************************************************************/
146-
/******/ // The module cache
147-
/******/ var __webpack_module_cache__ = {};
148-
/******/
149-
/******/ // The require function
150-
/******/ function __webpack_require__(moduleId) {
151-
/******/ // Check if module is in cache
152-
/******/ if(__webpack_module_cache__[moduleId]) {
153-
/******/ return __webpack_module_cache__[moduleId].exports;
154-
/******/ }
155-
/******/ // Create a new module (and put it into the cache)
156-
/******/ var module = __webpack_module_cache__[moduleId] = {
157-
/******/ // no module.id needed
158-
/******/ // no module.loaded needed
159-
/******/ exports: {}
160-
/******/ };
161-
/******/
162-
/******/ // Execute the module function
163-
/******/ __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
164-
/******/
165-
/******/ // Return the exports of the module
166-
/******/ return module.exports;
167-
/******/ }
168-
/******/
146+
/******/ // The module cache
147+
/******/ var __webpack_module_cache__ = {};
148+
/******/
149+
/******/ // The require function
150+
/******/ function __webpack_require__(moduleId) {
151+
/******/ // Check if module is in cache
152+
/******/ if (__webpack_module_cache__[moduleId]) {
153+
/******/ return __webpack_module_cache__[moduleId].exports;
154+
/******/
155+
}
156+
/******/ // Create a new module (and put it into the cache)
157+
/******/ var module = (__webpack_module_cache__[moduleId] = {
158+
/******/ // no module.id needed
159+
/******/ // no module.loaded needed
160+
/******/ exports: {}
161+
/******/
162+
});
163+
/******/
164+
/******/ // Execute the module function
165+
/******/ __webpack_modules__[moduleId](
166+
module,
167+
module.exports,
168+
__webpack_require__
169+
);
170+
/******/
171+
/******/ // Return the exports of the module
172+
/******/ return module.exports;
173+
/******/
174+
}
175+
/******/
169176
/************************************************************************/
170177
```
171178
172179
</details>
173180
174-
``` js
181+
```js
175182
(() => {
176183
/*!********************!*\
177184
!*** ./example.js ***!

‎examples/dll-user/template.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[DllPlugin documentation](https://webpack.js.org/plugins/dll-plugin)
44

5-
This is the _user_ bundle, which uses the manifest from [dll-reference example](https://github.com/webpack/webpack/tree/master/examples/dll)
5+
This is the _user_ bundle, which uses the manifest from [dll-reference example](https://github.com/webpack/webpack/tree/main/examples/dll)
66

77
# webpack.config.js
88

‎examples/dll/README.md

+33-26
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[DllPlugin documentation](https://webpack.js.org/plugins/dll-plugin)
44

5-
This is the _reference_ bundle (with the manifests) for [dll user example](https://github.com/webpack/webpack/tree/master/examples/dll-user)
5+
This is the _reference_ bundle (with the manifests) for [dll user example](https://github.com/webpack/webpack/tree/main/examples/dll-user)
66

77
# webpack.config.js
88

@@ -90,37 +90,44 @@ module.exports = "module";
9090
9191
<details><summary><code>/* webpack runtime code */</code></summary>
9292
93-
``` js
93+
```js
9494
/************************************************************************/
95-
/******/ // The module cache
96-
/******/ var __webpack_module_cache__ = {};
97-
/******/
98-
/******/ // The require function
99-
/******/ function __webpack_require__(moduleId) {
100-
/******/ // Check if module is in cache
101-
/******/ if(__webpack_module_cache__[moduleId]) {
102-
/******/ return __webpack_module_cache__[moduleId].exports;
103-
/******/ }
104-
/******/ // Create a new module (and put it into the cache)
105-
/******/ var module = __webpack_module_cache__[moduleId] = {
106-
/******/ // no module.id needed
107-
/******/ // no module.loaded needed
108-
/******/ exports: {}
109-
/******/ };
110-
/******/
111-
/******/ // Execute the module function
112-
/******/ __webpack_modules__[moduleId](module, module.exports, __webpack_require__);
113-
/******/
114-
/******/ // Return the exports of the module
115-
/******/ return module.exports;
116-
/******/ }
117-
/******/
95+
/******/ // The module cache
96+
/******/ var __webpack_module_cache__ = {};
97+
/******/
98+
/******/ // The require function
99+
/******/ function __webpack_require__(moduleId) {
100+
/******/ // Check if module is in cache
101+
/******/ if (__webpack_module_cache__[moduleId]) {
102+
/******/ return __webpack_module_cache__[moduleId].exports;
103+
/******/
104+
}
105+
/******/ // Create a new module (and put it into the cache)
106+
/******/ var module = (__webpack_module_cache__[moduleId] = {
107+
/******/ // no module.id needed
108+
/******/ // no module.loaded needed
109+
/******/ exports: {}
110+
/******/
111+
});
112+
/******/
113+
/******/ // Execute the module function
114+
/******/ __webpack_modules__[moduleId](
115+
module,
116+
module.exports,
117+
__webpack_require__
118+
);
119+
/******/
120+
/******/ // Return the exports of the module
121+
/******/ return module.exports;
122+
/******/
123+
}
124+
/******/
118125
/************************************************************************/
119126
```
120127
121128
</details>
122129
123-
``` js
130+
```js
124131
/******/ // module exports must be returned from runtime so entry inlining is disabled
125132
/******/ // startup
126133
/******/ // Load entry module and return exports

0 commit comments

Comments
 (0)