Skip to content

Commit d0b20f8

Browse files
committed
replace ES6 with ES2015
1 parent cef37d1 commit d0b20f8

File tree

7 files changed

+13
-13
lines changed

7 files changed

+13
-13
lines changed

content/api/node.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Then require the webpack module in your Node.js script:
2020
``` js
2121
const webpack = require("webpack");
2222

23-
// Or if you prefer ES6:
23+
// Or if you prefer ES2015:
2424
import webpack from "webpack";
2525
```
2626

content/concepts/modules.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ webpack builds on lessons learned from these systems and applies the concept of
1818

1919
In contrast to Node.js modules, webpack _modules_ can express their _dependencies_ in a variety of ways. A few examples are:
2020

21-
* An ECMAScript2015 `import` statement
21+
* An ES2015 `import` statement
2222
* A JavaScript `require()` statement
2323
* An AMD `define` and `require` statement
2424
* An `@import` statement inside of a css/sass/less file.

content/configuration/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ T> Notice that throughout the configuration we use Node's built-in [path module]
5050
// the name of the exported library
5151
5252
<details><summary>[libraryTarget](/configuration/output#output-librarytarget): "umd", // enum</summary>
53-
[libraryTarget](/configuration/output#output-librarytarget): "umd-module", // ES6 module wrapped in UMD
54-
[libraryTarget](/configuration/output#output-librarytarget): "commonjs-module", // ES6 module wrapped in CommonJs
53+
[libraryTarget](/configuration/output#output-librarytarget): "umd-module", // ES2015 module wrapped in UMD
54+
[libraryTarget](/configuration/output#output-librarytarget): "commonjs-module", // ES2015 module wrapped in CommonJs
5555
[libraryTarget](/configuration/output#output-librarytarget): "commonjs2", // exported with module.exports
5656
[libraryTarget](/configuration/output#output-librarytarget): "commonjs", // exported as properties to exports
5757
[libraryTarget](/configuration/output#output-librarytarget): "amd", // defined with AMD defined method

content/configuration/output.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ Configure how the library will be exposed. Any one of the following options can
225225

226226
`libraryTarget: "commonjs2"` - Expose it using the `module.exports` object (`output.library` is ignored)
227227

228-
`libraryTarget: "commonjs-module"` - Expose it using the `module.exports` object (`output.library` is ignored), `__esModule` is defined (it's threaded as ES6 Module in interop mode)
228+
`libraryTarget: "commonjs-module"` - Expose it using the `module.exports` object (`output.library` is ignored), `__esModule` is defined (it's threaded as ES2015 Module in interop mode)
229229

230230
`libraryTarget: "this"` - Expose it as a property of `this` (i.e. `this["MyLibrary"] = ...`)
231231

content/configuration/resolve.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Have a look at [Module Resolution](/concepts/module-resolution) for more explana
1414

1515
`object`
1616

17-
Configure how modules are resolved. For example, when calling `import "lodash"` in ES6, the `resolve` options can change where webpack goes to look for `"lodash"` (see [`modules`](#resolve-modules)).
17+
Configure how modules are resolved. For example, when calling `import "lodash"` in ES2015, the `resolve` options can change where webpack goes to look for `"lodash"` (see [`modules`](#resolve-modules)).
1818

1919
## `resolve.alias`
2020

content/get-started/why-webpack.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ webpack however is not the only module bundler out there. If you are choosing be
5555
| Preprocessing | **loaders, [transforms](https://github.com/webpack/transform-loader)** | loaders | transforms | plugin translate | plugin transforms | compilers, optimizers |
5656
| Replacement for browser | `web_modules`, `.web.js`, package.json field, alias config option | alias option | package.json field, alias option | package.json, alias option | no |
5757
| Requirable files | file system | **web** | file system | through plugins | file system or through plugins | file system |
58-
| Runtime overhead | **243B + 20B per module + 4B per dependency** | 14.7kB + 0B per module + (3B + X) per dependency | 415B + 25B per module + (6B + 2X) per dependency | 5.5kB for self-executing bundles, 38kB for full loader and polyfill, 0 plain modules, 293B CJS, 139B ES6 System.register before gzip | **none for ES2015 modules** (other formats may have)
58+
| Runtime overhead | **243B + 20B per module + 4B per dependency** | 14.7kB + 0B per module + (3B + X) per dependency | 415B + 25B per module + (6B + 2X) per dependency | 5.5kB for self-executing bundles, 38kB for full loader and polyfill, 0 plain modules, 293B CJS, 139B ES2015 System.register before gzip | **none for ES2015 modules** (other formats may have)
5959
| Watch mode | yes | not required | yes | not needed in dev | no | yes |
6060

6161
♦ in production mode (opposite in development mode)

content/how-to/upgrade-from-webpack-1.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ plugins: [
166166

167167
A dependency with only an expression (i. e. `require(expr)`) will now create an empty context instead of an context of the complete directory.
168168

169-
Best refactor this code as it won't work with ES6 Modules. If this is not possible you can use the `ContextReplacementPlugin` to hint the compiler to the correct resolving.
169+
Best refactor this code as it won't work with ES2015 Modules. If this is not possible you can use the `ContextReplacementPlugin` to hint the compiler to the correct resolving.
170170

171171
?> Link to an article about dynamic dependencies.
172172

@@ -235,7 +235,7 @@ To keep compatibility with old loaders, loaders can be switched to debug mode vi
235235
]
236236
```
237237

238-
### Code Splitting with ES6
238+
### Code Splitting with ES2015
239239

240240
In webpack v1, you could use `require.ensure` as a method to lazily-load chunks for your application:
241241

@@ -245,7 +245,7 @@ require.ensure([], function(require) {
245245
});
246246
```
247247

248-
The ES6 Loader spec defines `System.import` as method to load ES6 Modules dynamically on runtime.
248+
The ES2015 Loader spec defines `System.import` as method to load ES2015 Modules dynamically on runtime.
249249

250250
webpack treats `System.import` as a split-point and puts the requested module in a separate chunk.
251251

@@ -285,12 +285,12 @@ function route(path, query) {
285285
// This creates a separate chunk for each possible route
286286
```
287287

288-
### Mixing ES6 with AMD and CommonJS
288+
### Mixing ES2015 with AMD and CommonJS
289289

290290
As for AMD and CommonJS you can freely mix all three module types (even within the same file). Webpack behaves similar to babel in this case:
291291

292292
```javascript
293-
// CommonJS consuming ES6 Module
293+
// CommonJS consuming ES2015 Module
294294
var book = require("./book");
295295

296296
book.currentPage;
@@ -299,7 +299,7 @@ book.default === "This is a book";
299299
```
300300

301301
```javascript
302-
// ES6 Module consuming CommonJS
302+
// ES2015 Module consuming CommonJS
303303
import fs from "fs"; // module.exports map to default
304304
import { readFileSync } from "fs"; // named exports are read from returned object+
305305

0 commit comments

Comments
 (0)