Skip to content

Commit 7668082

Browse files
authored
Merge branch 'next' into plugin-api-rewrite
2 parents 344c44e + 7018c23 commit 7668082

19 files changed

+51
-34
lines changed

src/content/api/cli.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ sort: 2
44
contributors:
55
- ev1stensberg
66
- simon04
7+
- tbroadley
78
related:
89
- title: Analyzing Build Statistics
910
url: https://survivejs.com/webpack/optimizing-build/analyzing-build-statistics/
@@ -150,7 +151,7 @@ Parameter | Explanation | Input
150151
`--output-filename` | The output filename of the bundle | string | [name].js
151152
`--output-jsonp-function` | The name of the JSONP function used for chunk loading | string | webpackJsonp
152153
`--output-library` | Expose the exports of the entry point as library | string |
153-
`--output-library-target` | The type for exposing the exports of the entry,point as library | string | var
154+
`--output-library-target` | The type for exposing the exports of the entry point as library | string | var
154155
`--output-path` | The output path for compilation assets | string | Current directory
155156
`--output-pathinfo` | Include a comment with the request for every dependency | boolean | false
156157
`--output-public-path` | The public path for the assets | string | /
@@ -238,7 +239,7 @@ These allow you to configure the webpack [resolver](/configuration/resolve/) wit
238239
Parameter | Explanation | Example
239240
---------------------- | ------------------------------------------------------- | -------------
240241
--resolve-alias | Setup a module alias for resolving | --resolve-alias jquery-plugin=jquery.plugin
241-
--resolve-extensions | Setup extensions that should be used to resolve,modules | --resolve-extensions .es6 .js .ts
242+
--resolve-extensions | Setup extensions that should be used to resolve modules | --resolve-extensions .es6 .js .ts
242243
--resolve-loader-alias | Minimize javascript and switches loaders to minimizing |
243244

244245

src/content/api/hot-module-replacement.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ title: Hot Module Replacement
33
contributors:
44
- sokra
55
- skipjack
6+
- tbroadley
67
related:
78
- title: Concepts - Hot Module Replacement
89
url: /concepts/hot-module-replacement
@@ -117,7 +118,7 @@ The optional `options` object can include the following properties:
117118

118119
- `ignoreUnaccepted` (boolean): Ignore changes made to unaccepted modules.
119120
- `ignoreDeclined` (boolean): Ignore changes made to declined modules.
120-
- `ignoreErrored` (boolean): Ignore errors throw in accept handlers, error handlers and while reevaulating module.
121+
- `ignoreErrored` (boolean): Ignore errors throw in accept handlers, error handlers and while reevaluating module.
121122
- `onDeclined` (function(info)): Notifier for declined modules
122123
- `onUnaccepted` (function(info)): Notifier for unaccepted modules
123124
- `onAccepted` (function(info)): Notifier for accepted modules

src/content/api/index.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
---
22
title: Introduction
33
sort: 1
4+
contributors:
5+
- tbroadley
46
---
57

68
A variety of interfaces are available to customize the compilation process. Some
@@ -32,7 +34,7 @@ module syntaxes -- specifically the [methods](/api/module-methods) and
3234

3335
While most users can get away with just using the CLI along with a configuration
3436
file, more fine-grained control of the compilation can be achieved via the Node
35-
interface. This includes passing multiple configurations, programatically running
37+
interface. This includes passing multiple configurations, programmatically running
3638
or watching, and collecting stats.
3739

3840
[Learn more!](/api/node)
@@ -42,7 +44,7 @@ or watching, and collecting stats.
4244

4345
Loaders are transformations that are applied to the source code of a module. They
4446
are written as functions that accept source code as a parameter and return a new
45-
version of that code with tranformations applied.
47+
version of that code with transformations applied.
4648

4749
[Learn more!](/api/loaders)
4850

src/content/api/loaders.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ sort: 4
44
contributors:
55
- TheLarkInn
66
- jhnns
7+
- tbroadley
78
---
89

910
A loader is just a JavaScript module that exports a function. The [loader runner](https://github.com/webpack/loader-runner) calls this function and passes the result of the previous loader or the resource file into it. The `this` context of the function is filled-in by webpack and the [loader runner](https://github.com/webpack/loader-runner) with some useful methods that allow the loader (among other things) to change its invocation style to async, or get query parameters.
@@ -210,7 +211,7 @@ this.callback(
210211

211212
T> It can be useful to pass an abstract syntax tree (AST), like [`ESTree`](https://github.com/estree/estree), as the fourth argument (`meta`) to speed up the build time if you want to share common ASTs between loaders.
212213

213-
In case this function is called, you should return undefined to avoid ambigious loader results.
214+
In case this function is called, you should return undefined to avoid ambiguous loader results.
214215

215216

216217
### `this.async`
@@ -391,7 +392,7 @@ Access to the `compilation`'s `inputFileSystem` property.
391392
392393
## Deprecated context properties
393394
394-
W> The usage of these properties is highly discouraged since we are planing to remove them from the context. They are still listed here for documentation purposes.
395+
W> The usage of these properties is highly discouraged since we are planning to remove them from the context. They are still listed here for documentation purposes.
395396
396397
397398
### `this.exec`

src/content/api/module-variables.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ contributors:
66
- skipjack
77
- sokra
88
- ahmehri
9+
- tbroadley
910
related:
1011
- title: CommonJS
1112
url: https://en.wikipedia.org/wiki/CommonJS
@@ -50,7 +51,7 @@ W> This CANNOT be used in an asynchronous function.
5051

5152
### `exports` (CommonJS)
5253

53-
This variable is equal ot default value of `module.exports` (i.e. an object). If `module.exports` gets overwritten, `exports` will no longer be exported.
54+
This variable is equal to default value of `module.exports` (i.e. an object). If `module.exports` gets overwritten, `exports` will no longer be exported.
5455

5556
``` javascript
5657
exports.someValue = 42;

src/content/configuration/performance.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ title: Performance
33
sort: 14
44
contributors:
55
- thelarkinn
6+
- tbroadley
67
---
78

89
These options allows you to control how webpack notifies you of assets and entrypoints that exceed a specific file limit.
@@ -12,7 +13,7 @@ This feature was inspired by the idea of [webpack Performance Budgets](https://g
1213

1314
`object`
1415

15-
Configure how performance hints are shown. For example if you have an asset that is over 250kb, webpack will emit a warning notifiying you of this.
16+
Configure how performance hints are shown. For example if you have an asset that is over 250kb, webpack will emit a warning notifying you of this.
1617

1718

1819
## `performance.hints`

src/content/configuration/resolve.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ contributors:
77
- SpaceK33z
88
- pksjce
99
- sebastiandeutsch
10+
- tbroadley
1011
---
1112

1213
These options change how modules are resolved. webpack provides reasonable defaults, but it is possible to change the resolving in detail. Have a look at [Module Resolution](/concepts/module-resolution) for more explanation of how the resolver works.
@@ -216,7 +217,7 @@ With an absolute path, it will only search in the given directory.
216217
modules: ["node_modules"]
217218
```
218219

219-
If you want to add a directory to search in that takes precedences over `node_modules/`:
220+
If you want to add a directory to search in that takes precedence over `node_modules/`:
220221

221222
``` js
222223
modules: [path.resolve(__dirname, "src"), "node_modules"]

src/content/configuration/target.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ contributors:
77
- skipjack
88
- SpaceK33z
99
- pastelsky
10+
- tbroadley
1011
---
1112

1213
webpack can compile for multiple environments or _targets_. To understand what a `target` is in detail, read through [the targets concept page](/concepts/targets).
@@ -15,7 +16,7 @@ webpack can compile for multiple environments or _targets_. To understand what a
1516

1617
`string | function(compiler)`
1718

18-
Intructs webpack to target a specific environment.
19+
Instructs webpack to target a specific environment.
1920

2021

2122
### `string`

src/content/contribute/debugging.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ title: Debugging
33
sort: 7
44
contributors:
55
- skipjack
6+
- tbroadley
67
related:
78
- title: Learn and Debug webpack with Chrome DevTools!
89
url: https://medium.com/webpack/webpack-bits-learn-and-debug-webpack-with-chrome-dev-tools-da1c5b19554b
@@ -36,7 +37,7 @@ On top of that, the official [analyze tool](https://github.com/webpack/analyse)
3637

3738
While [`console`](https://nodejs.org/api/console.html) statements may work well in simpler scenarios, sometimes a more robust solution is needed. As most front-end developers already know, Chrome DevTools are a life saver when debugging web applications, _but they don’t have to stop there_. As of Node v6.3.0+, developers can use the built-in `--inspect` flag to debug a node program in DevTools.
3839

39-
This gives you the power to easily create breakpoints, debug memory usage, expose and examine objects in the console, and much more. In this short demo, we'll utilize the [`node-nightly`](https://github.com/hemanth/node-nightly) package which provides access to the latest and greatest inpecting capabilites.
40+
This gives you the power to easily create breakpoints, debug memory usage, expose and examine objects in the console, and much more. In this short demo, we'll utilize the [`node-nightly`](https://github.com/hemanth/node-nightly) package which provides access to the latest and greatest inspecting capabilities.
4041

4142
W> The `--inspect` interface has been available since v6.3.0 so feel to try it out with your local version, but be warned that certain features and flags may differ from the ones in this demo.
4243

src/content/contribute/index.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ contributors:
66
- scottdj92
77
- harrynewsome
88
- dhedgecock
9+
- tbroadley
910
---
1011

1112
The people who contribute to webpack do so for the love of open source, our users and ecosystem, and most importantly, pushing the web forward together. Because of our [Open Collective](http://opencollective.com/webpack) model for funding and transparency, we are able to funnel support and funds through contributors, dependent projects, and the contributor and core teams. To make a donation, simply click the button below...
@@ -34,7 +35,7 @@ Anybody can help by doing any of the following:
3435

3536
### Encouraging Employers
3637

37-
You can ask your employer to improve your workflow by leveraging webpack: an all-in-one tool for fonts, images and image optimiziation, and json. Explain to them how webpack will attempt to bundle your code and assets the best it can for the smallest file size, leading to speedier sites and applications.
38+
You can ask your employer to improve your workflow by leveraging webpack: an all-in-one tool for fonts, images and image optimization, and json. Explain to them how webpack will attempt to bundle your code and assets the best it can for the smallest file size, leading to speedier sites and applications.
3839

3940
### Your Contributions
4041

0 commit comments

Comments
 (0)