upgrade webpack 1 to 2

Author: moeriki

README.md

@@ -1,48 +1,82 @@
 # ng-annotate-loader [![Build Status](https://img.shields.io/travis/huston007/ng-annotate-loader.svg?style=flat-square)](https://travis-ci.org/huston007/ng-annotate-loader)
+
 Webpack loader to annotate angular applications. Generates a sourcemaps as well.
 
 ## Installation
 
 ```
-npm install --save-dev ng-annotate-loader 
+npm install --save-dev ng-annotate-loader
 ```
 
 ## Usage:
 
-```
+```js
 module: {
-    loaders: [
-      {test: /src.*\.js$/, loaders: ['ng-annotate']},
-    ]
-  }
+  loaders: [
+    {
+      test: /src.*\.js$/,
+      use: [{ loader: 'ng-annotate-loader' }],
+    }
+  ]
+}
 ```
 
-#### Passing parameters: 
+#### Passing parameters:
 
-```
-	{test: /src.*\.js$/, loaders: ['ng-annotate?add=false&map=false']}
+```js
+{
+  test: /src.*\.js$/,
+  use: [
+    {
+      loader: 'ng-annotate-loader',
+      options: {
+        add: false,
+        map: false,
+      }
+    }
+  ]
+}
 ```
 
 [More about `ng-annotate` parameters](https://github.com/olov/ng-annotate#library-api)
 
-#### Using ng-annotate plugins: 
+#### Using ng-annotate plugins:
 
-```
-	{test: /src.*\.js$/, loaders: ['ng-annotate?plugin[]=ng-annotate-adf-plugin']}
+```js
+{
+  test: /src.*\.js$/,
+  use: [
+    {
+      loader: 'ng-annotate-loader',
+      options: {
+        plugin: ['ng-annotate-adf-plugin']
+      }
+    }
+  ]
+}
 ```
 
 #### Works great with js compilers, `babel` for example:
 
-```
-    {test: /src.*\.js$/, loaders: ['ng-annotate', 'babel-loader']},
+```js
+{
+  test: /src.*\.js$/,
+  use: [
+    { loader: 'ng-annotate-loader' },
+    { loader: 'babel-loader' },
+  ]
+},
 ```
 
 ## Contributing
+
 #### Compiling examples and run acceptance test
+
 Run on the root folder:
+
 ```
 npm install
 npm test
 ```
 
-[Using loaders](http://webpack.github.io/docs/using-loaders.html)
+[Using loaders](https://webpack.js.org/concepts/loaders/)

cases/babel/file-to-annotate.js

@@ -3,6 +3,14 @@
 import babelTestMsg from './to-import';
 console.log(babelTestMsg);
 
+class someCtrl {
+  constructor($scope) {
+    this.doSomething();
+  }
+  doSomething() {
+  }
+}
+
 angular.module('test', [])
   .controller('testCtrl', function($scope) {
   })
@@ -26,12 +34,4 @@ function toAnnotate($scope) {
   console.log('hi'); // should be function body, otherwise babel remove directive prologue
 }
 
-class someCtrl {
-  constructor($scope) {
-    this.doSomething();
-  }
-  doSomething() {
-  }
-}
-
 console.log('after annotated function');

cases/babel/reference/build.js

@@ -1,10 +1,10 @@
 module.exports = [
   {
     original: { source: 'webpack:///file-to-annotate.js', line: 33, column: 2 },
-    generated: { line: 84, column: 3 },
+    generated: { line: 129, column: 2 },
   },
   {
     original: { source: 'webpack:///file-to-annotate.js', line: 41, column: 0 },
-    generated: { line: 95, column: 0 },
+    generated: { line: 134, column: 12 },
   },
 ];

cases/babel/reference/sourcemap-checkpoints.js

@@ -8,13 +8,19 @@ module.exports = {
     filename: 'build.js',
   },
   resolveLoader: {
-    fallback: path.resolve(__dirname, '../../'),
+    modules: [
+      'node_modules',
+      path.resolve(__dirname, '../../'),
+    ],
   },
   module: {
-    loaders: [
+    rules: [
       {
         test: /\.js$/,
-        loaders: ['loader', 'babel?presets[]=es2015'],
+        use: [
+          { loader: 'loader' },
+          { loader: 'babel-loader', options: { presets: ['es2015'] } },
+        ],
       },
     ],
   },

cases/babel/webpack.config.js

@@ -1,5 +1,9 @@
 'use strict';
 
+function namedFunction($dep) {
+  $dep.do();
+}
+
 angular.module('test', [])
   .controller('testCtrl', function($scope) {
   })
@@ -17,7 +21,3 @@ angular.module('test', [])
     };
   })
   .service('namedFunction', namedFunction);
-
-function namedFunction($dep) {
-  $dep.do();
-}