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

Merge pull request #6738 from rhysd/fix-typos 

Fix typos
This commit is contained in:
Tobias Koppers 2018-03-14 10:34:19 +01:00 committed by GitHub
parent 07323140fd 9f92969962
commit 3dabc4390b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -33,7 +33,7 @@
<h1>webpack</h1> <h1>webpack</h1>
<p> <p>
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. 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.
<p> </p>
</div> </div>
<h2 align="center">Install</h2> <h2 align="center">Install</h2>
@ -182,7 +182,7 @@ or are automatically applied via regex from your webpack configuration.
|Name|Status|Description| |Name|Status|Description|
|:--:|:----:|:----------| |:--:|:----:|:----------|
|<a href="https://github.com/webpack/style-loader">`<style>`|![style-npm]|Add exports of a module as style to DOM| |<a href="https://github.com/webpack/style-loader">`<style>`</a>|![style-npm]|Add exports of a module as style to DOM|
|<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| |<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|
|<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| |<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|
|<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| |<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
<a href="https://github.com/spacek33z">Kees Kluskens</a> <a href="https://github.com/spacek33z">Kees Kluskens</a>
<p>Development</p> <p>Development</p>
<br> <br>
<p>Sponsor<p> <p>Sponsor</p>
<a href="https://codeyellow.nl/"> <a href="https://codeyellow.nl/">
<img height="15px" src="https://cloud.githubusercontent.com/assets/1365881/20286583/ad62eb04-aac7-11e6-9c14-a0fef35b9b56.png"> <img height="15px" src="https://cloud.githubusercontent.com/assets/1365881/20286583/ad62eb04-aac7-11e6-9c14-a0fef35b9b56.png">
</a> </a>

6
examples/chunkhash/README.md
View File

@ -95,12 +95,12 @@ module.exports = {
/******/ var result; /******/ var result;
/******/ for(var i = 0; i < deferredModules.length; i++) { /******/ for(var i = 0; i < deferredModules.length; i++) {
/******/ var deferredModule = deferredModules[i]; /******/ var deferredModule = deferredModules[i];
/******/ var fullfilled = true; /******/ var fulfilled = true;
/******/ for(var j = 1; j < deferredModule.length; j++) { /******/ for(var j = 1; j < deferredModule.length; j++) {
/******/ var depId = deferredModule[j]; /******/ var depId = deferredModule[j];
/******/ if(installedChunks[depId] !== 0) fullfilled = false; /******/ if(installedChunks[depId] !== 0) fulfilled = false;
/******/ } /******/ }
/******/ if(fullfilled) { /******/ if(fulfilled) {
/******/ deferredModules.splice(i--, 1); /******/ deferredModules.splice(i--, 1);
/******/ result = __webpack_require__(__webpack_require__.s = deferredModule[0]); /******/ result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
/******/ } /******/ }

18
examples/common-chunk-and-vendor-chunk/README.md
View File

@ -178,12 +178,12 @@ module.exports = "utility3";
/******/ var result; /******/ var result;
/******/ for(var i = 0; i < deferredModules.length; i++) { /******/ for(var i = 0; i < deferredModules.length; i++) {
/******/ var deferredModule = deferredModules[i]; /******/ var deferredModule = deferredModules[i];
/******/ var fullfilled = true; /******/ var fulfilled = true;
/******/ for(var j = 1; j < deferredModule.length; j++) { /******/ for(var j = 1; j < deferredModule.length; j++) {
/******/ var depId = deferredModule[j]; /******/ var depId = deferredModule[j];
/******/ if(installedChunks[depId] !== 0) fullfilled = false; /******/ if(installedChunks[depId] !== 0) fulfilled = false;
/******/ } /******/ }
/******/ if(fullfilled) { /******/ if(fulfilled) {
/******/ deferredModules.splice(i--, 1); /******/ deferredModules.splice(i--, 1);
/******/ result = __webpack_require__(__webpack_require__.s = deferredModule[0]); /******/ result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
/******/ } /******/ }
@ -351,12 +351,12 @@ module.exports = "utility1";
/******/ var result; /******/ var result;
/******/ for(var i = 0; i < deferredModules.length; i++) { /******/ for(var i = 0; i < deferredModules.length; i++) {
/******/ var deferredModule = deferredModules[i]; /******/ var deferredModule = deferredModules[i];
/******/ var fullfilled = true; /******/ var fulfilled = true;
/******/ for(var j = 1; j < deferredModule.length; j++) { /******/ for(var j = 1; j < deferredModule.length; j++) {
/******/ var depId = deferredModule[j]; /******/ var depId = deferredModule[j];
/******/ if(installedChunks[depId] !== 0) fullfilled = false; /******/ if(installedChunks[depId] !== 0) fulfilled = false;
/******/ } /******/ }
/******/ if(fullfilled) { /******/ if(fulfilled) {
/******/ deferredModules.splice(i--, 1); /******/ deferredModules.splice(i--, 1);
/******/ result = __webpack_require__(__webpack_require__.s = deferredModule[0]); /******/ result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
/******/ } /******/ }
@ -510,12 +510,12 @@ module.exports = "pageB";
/******/ var result; /******/ var result;
/******/ for(var i = 0; i < deferredModules.length; i++) { /******/ for(var i = 0; i < deferredModules.length; i++) {
/******/ var deferredModule = deferredModules[i]; /******/ var deferredModule = deferredModules[i];
/******/ var fullfilled = true; /******/ var fulfilled = true;
/******/ for(var j = 1; j < deferredModule.length; j++) { /******/ for(var j = 1; j < deferredModule.length; j++) {
/******/ var depId = deferredModule[j]; /******/ var depId = deferredModule[j];
/******/ if(installedChunks[depId] !== 0) fullfilled = false; /******/ if(installedChunks[depId] !== 0) fulfilled = false;
/******/ } /******/ }
/******/ if(fullfilled) { /******/ if(fulfilled) {
/******/ deferredModules.splice(i--, 1); /******/ deferredModules.splice(i--, 1);
/******/ result = __webpack_require__(__webpack_require__.s = deferredModule[0]); /******/ result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
/******/ } /******/ }

6
examples/hybrid-routing/README.md
View File

@ -214,12 +214,12 @@ module.exports = webpackAsyncContext;
/******/ var result; /******/ var result;
/******/ for(var i = 0; i < deferredModules.length; i++) { /******/ for(var i = 0; i < deferredModules.length; i++) {
/******/ var deferredModule = deferredModules[i]; /******/ var deferredModule = deferredModules[i];
/******/ var fullfilled = true; /******/ var fulfilled = true;
/******/ for(var j = 1; j < deferredModule.length; j++) { /******/ for(var j = 1; j < deferredModule.length; j++) {
/******/ var depId = deferredModule[j]; /******/ var depId = deferredModule[j];
/******/ if(installedChunks[depId] !== 0) fullfilled = false; /******/ if(installedChunks[depId] !== 0) fulfilled = false;
/******/ } /******/ }
/******/ if(fullfilled) { /******/ if(fulfilled) {
/******/ deferredModules.splice(i--, 1); /******/ deferredModules.splice(i--, 1);
/******/ result = __webpack_require__(__webpack_require__.s = deferredModule[0]); /******/ result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
/******/ } /******/ }

12
examples/multiple-entry-points/README.md
View File

@ -143,12 +143,12 @@ module.exports = "Common";
/******/ var result; /******/ var result;
/******/ for(var i = 0; i < deferredModules.length; i++) { /******/ for(var i = 0; i < deferredModules.length; i++) {
/******/ var deferredModule = deferredModules[i]; /******/ var deferredModule = deferredModules[i];
/******/ var fullfilled = true; /******/ var fulfilled = true;
/******/ for(var j = 1; j < deferredModule.length; j++) { /******/ for(var j = 1; j < deferredModule.length; j++) {
/******/ var depId = deferredModule[j]; /******/ var depId = deferredModule[j];
/******/ if(installedChunks[depId] !== 0) fullfilled = false; /******/ if(installedChunks[depId] !== 0) fulfilled = false;
/******/ } /******/ }
/******/ if(fullfilled) { /******/ if(fulfilled) {
/******/ deferredModules.splice(i--, 1); /******/ deferredModules.splice(i--, 1);
/******/ result = __webpack_require__(__webpack_require__.s = deferredModule[0]); /******/ result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
/******/ } /******/ }
@ -366,12 +366,12 @@ __webpack_require__.e(/*! AMD require */ 0).then(function() { var __WEBPACK_AMD_
/******/ var result; /******/ var result;
/******/ for(var i = 0; i < deferredModules.length; i++) { /******/ for(var i = 0; i < deferredModules.length; i++) {
/******/ var deferredModule = deferredModules[i]; /******/ var deferredModule = deferredModules[i];
/******/ var fullfilled = true; /******/ var fulfilled = true;
/******/ for(var j = 1; j < deferredModule.length; j++) { /******/ for(var j = 1; j < deferredModule.length; j++) {
/******/ var depId = deferredModule[j]; /******/ var depId = deferredModule[j];
/******/ if(installedChunks[depId] !== 0) fullfilled = false; /******/ if(installedChunks[depId] !== 0) fulfilled = false;
/******/ } /******/ }
/******/ if(fullfilled) { /******/ if(fulfilled) {
/******/ deferredModules.splice(i--, 1); /******/ deferredModules.splice(i--, 1);
/******/ result = __webpack_require__(__webpack_require__.s = deferredModule[0]); /******/ result = __webpack_require__(__webpack_require__.s = deferredModule[0]);
/******/ } /******/ }

2
lib/dependencies/HarmonyImportSpecifierDependency.js
View File

@ -107,7 +107,7 @@ class HarmonyImportSpecifierDependency extends HarmonyImportDependency {
return [err]; return [err];
} }
// implement this method to allow the occurence order plugin to count correctly // implement this method to allow the occurrence order plugin to count correctly
getNumberOfIdOccurrences() { getNumberOfIdOccurrences() {
return 0; return 0;
} }

6
lib/web/JsonpMainTemplatePlugin.js
View File

@ -255,14 +255,14 @@ class JsonpMainTemplatePlugin {
"for(var i = 0; i < deferredModules.length; i++) {", "for(var i = 0; i < deferredModules.length; i++) {",
Template.indent([ Template.indent([
"var deferredModule = deferredModules[i];", "var deferredModule = deferredModules[i];",
"var fullfilled = true;", "var fulfilled = true;",
"for(var j = 1; j < deferredModule.length; j++) {", "for(var j = 1; j < deferredModule.length; j++) {",
Template.indent([ Template.indent([
"var depId = deferredModule[j];", "var depId = deferredModule[j];",
"if(installedChunks[depId] !== 0) fullfilled = false;" "if(installedChunks[depId] !== 0) fulfilled = false;"
]), ]),
"}", "}",
"if(fullfilled) {", "if(fulfilled) {",
Template.indent([ Template.indent([
"deferredModules.splice(i--, 1);", "deferredModules.splice(i--, 1);",
"result = " + "result = " +

2
test/cases/parsing/evaluate/index.js
View File

@ -10,7 +10,7 @@ if("shouldn't evaluate expression", function() {
x.should.be.eql("ok"); x.should.be.eql("ok");
}); });
it("should short-circut evaluating", function() { it("should short-circuit evaluating", function() {
var expr; var expr;
var a = false && expr ? require("fail") : require("./a"); var a = false && expr ? require("fail") : require("./a");
var b = true || expr ? require("./a") : require("fail"); var b = true || expr ? require("./a") : require("fail");

2
test/statsCases/commons-plugin-issue-4980/expected.txt
View File

@ -17,7 +17,7 @@ Child
Time: Xms Time: Xms
Built at: Thu Jan 01 1970 00:00:00 GMT Built at: Thu Jan 01 1970 00:00:00 GMT
Asset Size Chunks Chunk Names Asset Size Chunks Chunk Names
app.js 5.6 KiB 0 [emitted] app app.js 5.59 KiB 0 [emitted] app
vendor.c0e73bece4137a7015c2.js 619 bytes 1 [emitted] vendor vendor.c0e73bece4137a7015c2.js 619 bytes 1 [emitted] vendor
Entrypoint app = vendor.c0e73bece4137a7015c2.js app.js Entrypoint app = vendor.c0e73bece4137a7015c2.js app.js
[./constants.js] 87 bytes {1} [built] [./constants.js] 87 bytes {1} [built]