8000 Merge pull request #3 from nkbt/eslint · packetloop/angular-webpack@052e94b · GitHub
[go: up one dir, main page]
Skip to content
This repository was archived by the owner on Jan 21, 2019. It is now read-only.

Commit 052e94b

Browse files
nkbtnkbt
committed
Merge pull request #3 from nkbt/eslint
ES6 and ESLint
2 parents 40deb54 + c76c7a5 commit 052e94b

38 files changed

+28848
-727
lines changed

‎.eslintignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
coverage
2+
dest
3+
node_modules
4+
vendor

‎.eslintrc

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"extends": "./src/.eslintrc",
3+
"env": {
4+
"browser": false,
5+
"es6": false
6+
},
7+
"rules": {
8+
"object-shorthand": 0,
9+
"no-var": 0,
10+
"no-console": 0,
11+
"no-process-env": 0
12+
}
13+
}

‎.jshintrc

Lines changed: 0 additions & 129 deletions
This file was deleted.

‎gulp/lint_report.js

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎gulpfile.js

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎karma.conf.js

Lines changed: 43 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,58 @@
1-
'use strict';
1+
var path = require('path');
2+
var hasCoverage = global.process.argv.reduce(function (result, arg) {
3+
return arg.indexOf('coverage') !== -1 || result;
4+
});
25

3-
var webpackConfig = require('./webpack.config');
4-
webpackConfig.cache = true;
5-
webpackConfig.module.postLoaders = [{
6-
test: /\.js$/,
7-
exclude: /(_spec|vendor|node_modules)/,
8-
loader: 'istanbul-instrumenter'
9-
}];
6+
var include = [
7+
path.resolve('./src')
8+
];
9+
10+
var preLoaders = hasCoverage ? [
11+
12+
// Process test code with Babel
13+
{test: /_spec\.js$/, loader: 'babel', include: include},
14+
15+
// Process all non-test code with Isparta
16+
{test: /\.js$/, loader: 'isparta', include: include, exclude: /_spec\.js$/}
17+
] : [
18+
{test: /\.js$/, loader: 'babel', include: include}
19+
];
20+
var loaders = [
21+
{test: /\.sass$/, loader: 'style!css?sourceMap!sass?sourceMap&indentedSyntax=true'},
22+
{test: /\.png$/, loader: 'null'},
23+
{test: /\.jpg$/, loader: 'null'},
24+
25+
// Loader for JSON, may be used in some tests
26+
{test: /\.json$/, loader: 'json'},
27+
28+
// Need some real loaders for HTML, because angular directives are coupled with templates
29+
{test: /\.haml$/, loader: 'hamlc-loader'},
30+
{test: /\.html$/, loader: 'ng-cache?prefix=[dir]/[dir]'}
31+
];
1032

1133

1234
module.exports = function (config) {
1335
config.set({
1436
basePath: '',
1537
frameworks: ['jasmine'],
1638
files: [
17-
'node_modules/angular/angular.js',
18-
'node_modules/angular-mocks/angular-mocks.js',
19-
'src/**/*_spec.js'
39+
'spec.js'
2040
],
2141
webpack: {
22-
resolve: webpackConfig.resolve,
23-
module: webpackConfig.module
42+
devtool: 'eval',
43+
module: {
44+
loaders: loaders,
45+
preLoaders: preLoaders
46+
},
47+
cache: true
48+
},
49+
webpackMiddleware: {
50+
stats: {
51+
colors: true
52+
}
2453
},
25-
exclude: [
26-
'*.sass',
27-
'*.html'
28-
],
2954
preprocessors: {
30-
'src/**/*_spec.js': ['webpack']
55+
'spec.js': ['webpack']
3156
},
3257
reporters: ['progress', 'coverage'],
3358
coverageReporter: {

0 commit comments

Comments
 (0)
0