Skip to content

Commit 3dabc43

Browse files
sokrasokra
authored
Merge pull request webpack#6738 from rhysd/fix-typos
Fix typos
2 parents 0732314 + 9f92969 commit 3dabc43

File tree

9 files changed

+30
-30
lines changed

9 files changed

+30
-30
lines changed

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<h1>webpack</h1>
3434
<p>
3535
webpack is a module bundler. Its main purpose is to bundle JavaScript files for usage in a browser, yet it is also capable of transforming, bundling, or packaging just about any resource or asset.
36-
<p>
36+
</p>
3737
</div>
3838

3939
<h2 align="center">Install</h2>
@@ -182,7 +182,7 @@ or are automatically applied via regex from your webpack configuration.
182182

183183
|Name|Status|Description|
184184
|:--:|:----:|:----------|
185-
|<a href="https://github.com/webpack/style-loader">`<style>`|![style-npm]|Add exports of a module as style to DOM|
185+
|<a href="https://github.com/webpack/style-loader">`<style>`</a>|![style-npm]|Add exports of a module as style to DOM|
186186
|<a href="https://github.com/webpack/css-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/css-3.svg"></a>|![css-npm]|Loads CSS file with resolved imports and returns CSS code|
187187
|<a href="https://github.com/webpack/less-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/less-63.svg"></a>|![less-npm]|Loads and compiles a LESS file|
188188
|<a href="https://github.com/jtangelder/sass-loader"><img width="48" height="48" src="https://worldvectorlogo.com/logos/sass-1.svg"></a>|![sass-npm]|Loads and compiles a SASS/SCSS file|
@@ -342,7 +342,7 @@ If you have discovered a 🐜 or have a feature suggestion, feel free to create
342342
<a href="https://github.com/spacek33z">Kees Kluskens</a>
343343
<p>Development</p>
344344
<br>
345-
<p>Sponsor<p>
345+
<p>Sponsor</p>
346346
<a href="https://codeyellow.nl/">
347347
<img height="15px" src="https://cloud.githubusercontent.com/assets/1365881/20286583/ad62eb04-aac7-11e6-9c14-a0fef35b9b56.png">
348348
</a>

‎examples/chunkhash/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,12 @@ module.exports = {
9595
/******/ var result;
9696
/******/ for(var i = 0; i < deferredModules.length; i++) {
9797
/******/ var deferredModule = deferredModules[i];
98-
/******/ var fullfilled = true;
98+
/******/ var fulfilled = true;
9999
/******/ for(var j = 1; j < deferredModule.length; j++) {
100100
/******/ var depId = deferredModule[j];
101-
/******/ if(installedChunks[depId] !== 0) fullfilled = false;
101+
/******/ if(installedChunks[depId] !== 0) fulfilled = false;
102102
/******/ }
103-
/******/ if(fullfilled) {
103+
/******/ if(fulfilled) {
104104
/******/ deferredModules.splice(i--, 1);
105105
/******/ result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
106106
/******/ }

‎examples/common-chunk-and-vendor-chunk/README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -178,12 +178,12 @@ module.exports = "utility3";
178178
/******/ var result;
179179
/******/ for(var i = 0; i < deferredModules.length; i++) {
180180
/******/ var deferredModule = deferredModules[i];
181-
/******/ var fullfilled = true;
181+
/******/ var fulfilled = true;
182182
/******/ for(var j = 1; j < deferredModule.length; j++) {
183183
/******/ var depId = deferredModule[j];
184-
/******/ if(installedChunks[depId] !== 0) fullfilled = false;
184+
/******/ if(installedChunks[depId] !== 0) fulfilled = false;
185185
/******/ }
186-
/******/ if(fullfilled) {
186+
/******/ if(fulfilled) {
187187
/******/ deferredModules.splice(i--, 1);
188188
/******/ result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
189189
/******/ }
@@ -351,12 +351,12 @@ module.exports = "utility1";
351351
/******/ var result;
352352
/******/ for(var i = 0; i < deferredModules.length; i++) {
353353
/******/ var deferredModule = deferredModules[i];
354-
/******/ var fullfilled = true;
354+
/******/ var fulfilled = true;
355355
/******/ for(var j = 1; j < deferredModule.length; j++) {
356356
/******/ var depId = deferredModule[j];
357-
/******/ if(installedChunks[depId] !== 0) fullfilled = false;
357+
/******/ if(installedChunks[depId] !== 0) fulfilled = false;
358358
/******/ }
359-
/******/ if(fullfilled) {
359+
/******/ if(fulfilled) {
360360
/******/ deferredModules.splice(i--, 1);
361361
/******/ result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
362362
/******/ }
@@ -510,12 +510,12 @@ module.exports = "pageB";
510510
/******/ var result;
511511
/******/ for(var i = 0; i < deferredModules.length; i++) {
512512
/******/ var deferredModule = deferredModules[i];
513-
/******/ var fullfilled = true;
513+
/******/ var fulfilled = true;
514514
/******/ for(var j = 1; j < deferredModule.length; j++) {
515515
/******/ var depId = deferredModule[j];
516-
/******/ if(installedChunks[depId] !== 0) fullfilled = false;
516+
/******/ if(installedChunks[depId] !== 0) fulfilled = false;
517517
/******/ }
518-
/******/ if(fullfilled) {
518+
/******/ if(fulfilled) {
519519
/******/ deferredModules.splice(i--, 1);
520520
/******/ result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
521521
/******/ }

‎examples/hybrid-routing/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -214,12 +214,12 @@ module.exports = webpackAsyncContext;
214214
/******/ var result;
215215
/******/ for(var i = 0; i < deferredModules.length; i++) {
216216
/******/ var deferredModule = deferredModules[i];
217-
/******/ var fullfilled = true;
217+
/******/ var fulfilled = true;
218218
/******/ for(var j = 1; j < deferredModule.length; j++) {
219219
/******/ var depId = deferredModule[j];
220-
/******/ if(installedChunks[depId] !== 0) fullfilled = false;
220+
/******/ if(installedChunks[depId] !== 0) fulfilled = false;
221221
/******/ }
222-
/******/ if(fullfilled) {
222+
/******/ if(fulfilled) {
223223
/******/ deferredModules.splice(i--, 1);
224224
/******/ result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
225225
/******/ }

‎examples/multiple-entry-points/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,12 +143,12 @@ module.exports = "Common";
143143
/******/ var result;
144144
/******/ for(var i = 0; i < deferredModules.length; i++) {
145145
/******/ var deferredModule = deferredModules[i];
146-
/******/ var fullfilled = true;
146+
/******/ var fulfilled = true;
147147
/******/ for(var j = 1; j < deferredModule.length; j++) {
148148
/******/ var depId = deferredModule[j];
149-
/******/ if(installedChunks[depId] !== 0) fullfilled = false;
149+
/******/ if(installedChunks[depId] !== 0) fulfilled = false;
150150
/******/ }
151-
/******/ if(fullfilled) {
151+
/******/ if(fulfilled) {
152152
/******/ deferredModules.splice(i--, 1);
153153
/******/ result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
154154
/******/ }
@@ -366,12 +366,12 @@ __webpack_require__.e(/*! AMD require */ 0).then(function() { var __WEBPACK_AMD_
366366
/******/ var result;
367367
/******/ for(var i = 0; i < deferredModules.length; i++) {
368368
/******/ var deferredModule = deferredModules[i];
369-
/******/ var fullfilled = true;
369+
/******/ var fulfilled = true;
370370
/******/ for(var j = 1; j < deferredModule.length; j++) {
371371
/******/ var depId = deferredModule[j];
372-
/******/ if(installedChunks[depId] !== 0) fullfilled = false;
372+
/******/ if(installedChunks[depId] !== 0) fulfilled = false;
373373
/******/ }
374-
/******/ if(fullfilled) {
374+
/******/ if(fulfilled) {
375375
/******/ deferredModules.splice(i--, 1);
376376
/******/ result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
377377
/******/ }

‎lib/dependencies/HarmonyImportSpecifierDependency.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
107107
return [err];
108108
}
109109

110-
// implement this method to allow the occurence order plugin to count correctly
110+
// implement this method to allow the occurrence order plugin to count correctly
111111
getNumberOfIdOccurrences() {
112112
return 0;
113113
}

‎lib/web/JsonpMainTemplatePlugin.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,14 +255,14 @@ class JsonpMainTemplatePlugin {
255255
"for(var i = 0; i < deferredModules.length; i++) {",
256256
Template.indent([
257257
"var deferredModule = deferredModules[i];",
258-
"var fullfilled = true;",
258+
"var fulfilled = true;",
259259
"for(var j = 1; j < deferredModule.length; j++) {",
260260
Template.indent([
261261
"var depId = deferredModule[j];",
262-
"if(installedChunks[depId] !== 0) fullfilled = false;"
262+
"if(installedChunks[depId] !== 0) fulfilled = false;"
263263
]),
264264
"}",
265-
"if(fullfilled) {",
265+
"if(fulfilled) {",
266266
Template.indent([
267267
"deferredModules.splice(i--, 1);",
268268
"result = " +

‎test/cases/parsing/evaluate/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ if("shouldn't evaluate expression", function() {
1010
x.should.be.eql("ok");
1111
});
1212

13-
it("should short-circut evaluating", function() {
13+
it("should short-circuit evaluating", function() {
1414
var expr;
1515
var a = false && expr ? require("fail") : require("./a");
1616
var b = true || expr ? require("./a") : require("fail");

‎test/statsCases/commons-plugin-issue-4980/expected.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Child
1717
Time: Xms
1818
Built at: Thu Jan 01 1970 00:00:00 GMT
1919
Asset Size Chunks Chunk Names
20-
app.js 5.6 KiB 0 [emitted] app
20+
app.js 5.59 KiB 0 [emitted] app
2121
vendor.c0e73bece4137a7015c2.js 619 bytes 1 [emitted] vendor
2222
Entrypoint app = vendor.c0e73bece4137a7015c2.js app.js
2323
[./constants.js] 87 bytes {1} [built]

0 commit comments

Comments
 (0)