Skip to content

Commit bf65b7b

Browse files
fixed indention, added ng-annotate loader
1 parent 0008a65 commit bf65b7b

File tree

2 files changed

+35
-31
lines changed

2 files changed

+35
-31
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"eslint-config-moment": "^1.5.0",
2020
"eslint-loader": "1.1.0",
2121
"mocha": "2.3.4",
22+
"ng-annotate-loader": "^0.1.0",
2223
"webpack": "1.12.9"
2324
},
2425
"repository": {

webpack.config.js

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,41 +8,44 @@ var libraryName = 'angular-url-encode';
88
var plugins = [], outputFile;
99

1010
if (env === 'build') {
11-
plugins.push(new UglifyJsPlugin({ minimize: true }));
12-
outputFile = libraryName + '.min.js';
11+
plugins.push(new UglifyJsPlugin({ minimize: true }));
12+
outputFile = libraryName + '.min.js';
1313
} else {
14-
outputFile = libraryName + '.js';
14+
outputFile = libraryName + '.js';
1515
}
1616

1717
var config = {
18-
entry: __dirname + '/src/index.js',
19-
devtool: 'source-map',
20-
output: {
21-
path: __dirname + '/dist',
22-
filename: outputFile,
23-
library: libraryName,
24-
libraryTarget: 'umd',
25-
umdNamedDefine: true
26-
},
27-
module: {
28-
loaders: [
29-
{
30-
test: /(\.jsx|\.js)$/,
31-
loader: 'babel',
32-
exclude: /(node_modules|bower_components)/
33-
},
34-
{
35-
test: /(\.jsx|\.js)$/,
36-
loader: "eslint-loader",
37-
exclude: /node_modules/
38-
}
39-
]
40-
},
41-
resolve: {
42-
root: path.resolve('./src'),
43-
extensions: ['', '.js']
44-
},
45-
plugins: plugins
18+
entry: __dirname + '/src/index.js',
19+
devtool: 'source-map',
20+
output: {
21+
path: __dirname + '/dist',
22+
filename: outputFile,
23+
library: libraryName,
24+
libraryTarget: 'umd',
25+
umdNamedDefine: true
26+
},
27+
module: {
28+
loaders: [
29+
{
30+
test: /\.js$/,
31+
exclude: /(node_modules|bower_components)/,
32+
loaders: [
33+
'ng-annotate',
34+
'babel-loader'
35+
]
36+
},
37+
{
38+
test: /(\.jsx|\.js)$/,
39+
loader: 'eslint-loader',
40+
exclude: /node_modules/
41+
}
42+
]
43+
},
44+
resolve: {
45+
root: path.resolve('./src'),
46+
extensions: ['', '.js']
47+
},
48+
plugins: plugins
4649
};
4750

4851
module.exports = config;

0 commit comments

Comments
 (0)