Merge pull request #26 from thekip/master

Fix sourcemaps errors and update test

Author: Andrey

.editorconfig

@@ -0,0 +1,10 @@
+# editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true

.gitattributes

@@ -0,0 +1 @@
+* text eol=lf

.travis.yml

@@ -1,7 +1,7 @@
 language: node_js
 
 node_js:
-  - "0.12"
+  - "5"
 
 script:
   - npm test

acceptance-test.sh

@@ -24,7 +24,8 @@ angular.module('test', [])
 	.controller('someCtrl', someCtrl);
 
 function toAnnotate($scope) {
-  'ngInject';
+  	'ngInject';
+	console.log('hi'); // should be function body, otherwise babel remove directive prologue
 }
 
 class someCtrl {

examples/babel/file-to-annotate.js renamed to cases/babel/file-to-annotate.js

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

examples/babel/annotated-reference.js renamed to cases/babel/reference/build.js

@@ -1,11 +1,8 @@
-// Note: this example babel and equires babel-loader
-// npm install babel babel-loader
-
 var path = require('path');
 
 module.exports = {
-	context: __dirname, 
-    entry: './file-to-annotate',
+	context: __dirname,
+    entry: './file-to-annotate.js',
     output: {
         path: __dirname + '/dist',
         filename: 'build.js'
@@ -15,8 +12,11 @@ module.exports = {
 	},
     module: {
 	    loaders: [
-			{test: /\.js$/, loaders: ['loader', 'babel']},
+			{
+				test: /\.js$/,
+				loaders: ['loader', 'babel?presets[]=es2015'],
+			},
     	]
 	},
-  devtool: 'source-map'
+  	devtool: 'source-map'
 }

cases/babel/reference/sourcemap-checkpoints.js

@@ -0,0 +1,10 @@
+module.exports = [
+  {
+    original: { source: 'webpack:///file-to-annotate.js', line: 24, column: 5 },
+    generated: { line: 71, column: 3},
+  },
+  {
+    original: { source: 'webpack:///file-to-annotate.js', line: 11, column: 5 },
+    generated: { line: 58, column: 3 },
+  },
+];

examples/babel/to-import.js renamed to cases/babel/to-import.js

@@ -14,5 +14,6 @@ module.exports = {
 	    loaders: [
 			{test: /\.js$/, loaders: ['loader']},
     	]
-	}
+	},
+	devtool: 'source-map'
 }

examples/babel/webpack.config.js renamed to cases/babel/webpack.config.js

@@ -0,0 +1,43 @@
+'use strict';
+
+declare const angular: any;
+
+import babelTestMsg from './to-import';
+console.log(babelTestMsg);
+
+angular.module('test', [])
+	.controller('testCtrl', function($scope) {
+
+	})
+	.factory('testFactory', function($cacheFactory) {
+		return {};
+	})
+	.service('testNotAnnotated', function() {
+		return {};
+	})
+	.directive('testDirective', function ($timeout) {
+		return {
+			restrict: 'E',
+			controller: function($scope) {
+
+			}
+		};
+	})
+	.controller('someCtrl', someCtrl);
+  
+function toAnnotate($scope) {
+  	'ngInject';
+	console.log('hi'); // should be function body, otherwise babel remove directive prologue
+}
+
+class someCtrl {
+	constructor($scope) {
+		this.doSomething();
+	}
+
+	doSomething() {
+
+	}
+}
+
+console.log('after annotated function');