Skip to content

Commit 358a966

Browse files
authored
Merge pull request #344 from NejcZdovc/doc/typos
Doc fixed
2 parents 83a7fe3 + a798499 commit 358a966

File tree

8 files changed

+15
-15
lines changed

8 files changed

+15
-15
lines changed

content/concepts/configuration.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Because it's a standard node.js CommonJs module, you **can do the following**:
1111

1212
* import other files via `require(...)`
1313
* use utilities on npm via `require(...)`
14-
* use JS controlflow expressions i. e. the `?:` operator
14+
* use JavaScript control flow expressions i. e. the `?:` operator
1515
* use constants or variables for often used values
1616
* write and execute function to generate a part of the configuration
1717

@@ -151,7 +151,7 @@ export class NgCliWebpackConfig {
151151

152152
## Using JSX
153153

154-
In the example below JSX (React JS Markup) and Babel to create a JSON Configuration that webpack can understand. (Courtesy of [Jason Miller](https://twitter.com/_developit))
154+
In the example below JSX (React JavaScript Markup) and Babel to create a JSON Configuration that webpack can understand. (Courtesy of [Jason Miller](https://twitter.com/_developit))
155155

156156
```javascript
157157
import h from 'jsxobj';

content/concepts/plugins.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ConsoleLogOnBuildWebpackPlugin.prototype.apply = function(compiler) {
3131
};
3232
```
3333

34-
T> As clever JS developer you may remember the `Function.prototype.apply` method. Because of this method you can pass any function as plugin (`this` will point to the `compiler`). You can use this style to inline custom plugins in your configuration.
34+
T> As clever JavaScript developer you may remember the `Function.prototype.apply` method. Because of this method you can pass any function as plugin (`this` will point to the `compiler`). You can use this style to inline custom plugins in your configuration.
3535

3636
## Usage
3737

content/configuration/externals.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ externals: {
6868
}
6969
```
7070

71-
`subtract: ['./math', 'subtract']` converts to a parent child contruct, where `./math` is the parent module and your bundle only requires the subset under `subtract` variable.
71+
`subtract: ['./math', 'subtract']` converts to a parent child construct, where `./math` is the parent module and your bundle only requires the subset under `subtract` variable.
7272

7373
### object
7474

content/configuration/output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ See [`output.devtoolModuleFilenameTemplate`](#output-devtoolmodulefilenametempla
4848

4949
`boolean | object`
5050

51-
(Deprecated: Not really used, not really useable, write an issue if you have a other opinion)
51+
(Deprecated: Not really used, not really usable, write an issue if you have a other opinion)
5252

5353
Enables line to line mapping for all or some modules. This produces a simple source map where each line of the generated source is mapped to the same line of the original source. This is a performance optimization and should only be used if all input lines match generated lines.
5454

content/guides/code-splitting-css.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ contributors:
55
- pksjce
66
---
77

8-
In webpack, when you use the css-loader and import CSS into your JavaScript files, the CSS is bundled along with your Javascript.
8+
In webpack, when you use the css-loader and import CSS into your JavaScript files, the CSS is bundled along with your JavaScript.
99
This has the disadvantage that, you will not be able to utilize the browser's ability to load CSS asynchronously and parallel. Instead, your page will have to wait until your whole JavaScript bundle is loaded, to style itself.
1010
webpack can help with this problem by bundling the CSS separately using [extract-text-webpack-plugin](https://github.com/webpack/extract-text-webpack-plugin) and the [css-loader](https://github.com/webpack/css-loader).
1111

content/guides/hmr-react.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ after their source is changed and they are replaced.
1616

1717
This guide will be demonstrating the use of HMR with Babel,
1818
React, and PostCSS (using CSS Modules).
19-
To follow along, please add the following deps to your `package.json`:
19+
To follow along, please add the following dependencies to your `package.json`:
2020

2121
To use HMR, you'll need the following dependencies:
2222

@@ -47,7 +47,7 @@ Your `.babelrc` file should look like the following:
4747
//See https://tc39.github.io/process-document/
4848

4949
"react"
50-
//Transpile React components to JS
50+
//Transpile React components to JavaScript
5151
],
5252
"plugins": [
5353
"react-hot-loader/babel"
@@ -145,7 +145,7 @@ You may benefit from reading the
145145
on webpack dev server, and the [other articles](https://webpack.js.org/concepts/)
146146
here on webpack.js.org.
147147

148-
The basic assumption here is that your JS entry is located at `./src/index.js`,
148+
The basic assumption here is that your JavaScript entry is located at `./src/index.js`,
149149
and that you're using CSS Modules for your styling.
150150

151151
Please see the comments inline that explain each portion of the config. The main

content/guides/hmr.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ HMR is particularly useful in applications using a single state tree,
1212
since components are "dumb" and will reflect the latest application state, even
1313
after their source is changed and they are replaced.
1414

15-
Webpack's power lies in its customizablity, and there are MANY ways of configuring HMR
15+
Webpack's power lies in its customizability, and there are MANY ways of configuring HMR
1616
given the needs of a particular project. The approach described below uses Babel and
1717
React, but these tools are not necessary for HMR to work.
1818
If you'd like to see examples of other approaches,
@@ -21,7 +21,7 @@ please request them or, better yet,
2121

2222
This guide will be demonstrating the use of HMR with Babel,
2323
React, and PostCSS (using CSS Modules).
24-
To follow along, please add the following deps to your `package.json`:
24+
To follow along, please add the following dependencies to your `package.json`:
2525

2626
To use HMR, you'll need the following dependencies:
2727

@@ -52,7 +52,7 @@ Your `.babelrc` file should look like the following:
5252
//See https://tc39.github.io/process-document/
5353

5454
"react"
55-
//Transpile React components to JS
55+
//Transpile React components to JavaScript
5656
],
5757
"plugins": [
5858
"react-hot-loader/babel"
@@ -150,7 +150,7 @@ You may benefit from reading the
150150
on webpack dev server, and the [other articles](https://webpack.js.org/concepts/)
151151
here on webpack.js.org.
152152

153-
The basic assumption here is that your JS entry is located at `./src/index.js`,
153+
The basic assumption here is that your JavaScript entry is located at `./src/index.js`,
154154
and that you're using CSS Modules for your styling.
155155

156156
Please see the comments inline that explain each portion of the config. The main
@@ -216,7 +216,7 @@ export default App;
216216
```
217217

218218
Now, the above code is using React, but it doesn't need to be. In fact,
219-
the only thing that matters above is the code refering to `module`.
219+
the only thing that matters above is the code referring to `module`.
220220
First, we wrap the HMR code inside of `module.hot` check;
221221
webpack exposes `module` to the code, and if we are running with `hot: true` configured,
222222
we'll enter the inside of the conditional.

content/guides/shimming.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ module.exports = {
2727

2828
## ProvidePlugin
2929
The [ProvidePlugin](/concepts/plugins#ProvidePlugin) makes a module available as a variable in every other module required by `webpack`. The module is required only if you use the variable.
30-
Most legacy modules rely on the presence of specific globals, like jQuery plugins do on `$` or `jQuery`. In this scenario, you can configure webpack to prepend `var $ = require(“jquery”)` everytime it encounters the global `$` identifier.
30+
Most legacy modules rely on the presence of specific globals, like jQuery plugins do on `$` or `jQuery`. In this scenario, you can configure webpack to prepend `var $ = require(“jquery”)` every time it encounters the global `$` identifier.
3131

3232
``` javascript
3333
var webpack = require("webpack");

0 commit comments

Comments
 (0)