prefer es6 import over require

sokra · sokra · commit fb350d1ce198 · 2016-11-09T17:45:12.000+01:00
diff --git a/content/concepts/module-resolution.md b/content/concepts/module-resolution.md
@@ -8,9 +8,9 @@ A resolver is a library which helps find the absolute path of a module.
 A module can be required as a dependency from another module as
 
 ```js
-require('/path/to/module')
-//or
-import mymodule from '/path/to/module'
+import mymodule from 'path/to/module'
+// or
+require('path/to/module')
 ```
 
 The dependency module can be from the application code or a third party library. The resolver helps
@@ -24,26 +24,26 @@ The dependency module can be from the application code or a third party library.
 * Absolute paths
 
 ```js
-require("/home/me/file");
-require("C:\\Home\\me\\file");
+import "/home/me/file";
+import "C:\\Users\\me\\file";
 ```
 
 Since we already have the absolute path to the file, no further resolution is required.
 
 * Relative paths
 
 ```js
-require("../src/file");
-require("./file");
+import "../src/file";
+import "./file";
 ```
 
 In this case, the directory of the resource file is taken to be the context directory (the directory of the currently processed file). The given relative path is joined to the context path to produce the absolute path to the file.
 
 * Module path
 
 ```js
-require("module");
-require("module/lib/file");
+import "module";
+import "module/lib/file";
 ```
 
 Modules are searched for inside directories which are specified using `resolve.modules`, which is can be an array comprising of different paths.
diff --git a/content/concepts/modules.md b/content/concepts/modules.md
@@ -18,8 +18,8 @@ webpack builds on lessons learned from these systems and applies the concept of
 
 In contrast to Node.js modules, webpack _modules_ can express their _dependencies_ in a variety of ways. A few examples are:
 
-* A JavaScript `require()` statement
 * An ECMAScript2015 `import` statement
+* A JavaScript `require()` statement
 * An AMD `define` and `require` statement
 * An `@import` statement inside of a css/sass/less file.
 * An image url in a stylesheet (`url(...)`) or html (`<img src=...>`) file.
diff --git a/content/configuration/resolve.md b/content/configuration/resolve.md
@@ -56,7 +56,7 @@ import Test1 from 'xyz'; // Success, file.js is resolved and imported
 import Test2 from 'xyz/file.js'; // Error, /path/to/file.js/file.js is invalid
 ```
 
-| `alias:` | `require("xyz")` | `require("xyz/file.js")` |
+| `alias:` | `import "xyz"` | `import "xyz/file.js"` |
 | -------- | ---------------- | -------------------------|
 | `{}` | `/abc/node_modules/xyz/index.js` | `/abc/node_modules/xyz/file.js` |
 | `{ xyz: "/abs/path/to/file.js" }` | `/abs/path/to/file.js` | error |
diff --git a/content/index.md b/content/index.md
@@ -1,20 +1,18 @@
 ## Write your code.
 
-**index.js**
+**app.js**
 
 ```js
-const foo = require('./foo.js')
+import bar from './foo';
 
-foo.bar()
+bar():
 ```
 
 **foo.js**
 
 ```js
-module.exports = {
-  bar: function () {
-    //
-  }
+export function bar() {
+  //
 }
 ```
 
@@ -24,9 +22,9 @@ module.exports = {
 
 ```js
 module.exports = {
-  entry: './index.js',
+  entry: './app.js',
   output: {
-    path: 'bundle.js'
+    filename: 'bundle.js'
   }
 }
 ```
@@ -40,7 +38,7 @@ module.exports = {
   </head>
   <body>
     ...
-    <script src="/bundle.js"></script>
+    <script src="bundle.js"></script>
   </body>
 </html>
 ```
