Skip to content

Commit 23977e9

Browse files
committed
fix(dev): Simplifying the grunt task so it would be easy to understand it.
1 parent f1ec5d1 commit 23977e9

29 files changed

+150
-279
lines changed

Gruntfile.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
global._ = require('lodash');
2-
31
module.exports = function (grunt) {
42
require('load-grunt-config')(grunt);
53
};
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

grunt/aliases.yaml

Lines changed: 31 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,115 +1,52 @@
11
test:
2-
- 'jshint'
3-
- 'test-unit'
4-
- 'test-e2e'
2+
- 'jshint'
3+
- 'test-unit'
4+
- 'test-e2e'
55

66
test-unit:
7-
- 'karma:unit'
8-
9-
test-unit-chrome:
10-
- 'karma:unit-chrome'
7+
- 'karma:unit'
118

129
test-e2e:
13-
- 'shell:protractor_update'
14-
- 'connect:testserver'
15-
- 'protractor:run'
10+
- 'shell:protractor_update'
11+
- 'connect:testserver'
12+
- 'protractor:run'
1613

1714
test-e2e-firefox:
18-
- 'shell:protractor_update'
19-
- 'connect:testserver'
20-
- 'protractor:firefox'
21-
22-
test-coverage:
23-
- 'karma:unit_coverage'
15+
- 'shell:protractor_update'
16+
- 'connect:testserver'
17+
- 'protractor:firefox'
2418

2519
coverage:
26-
- 'karma:unit_coverage'
27-
- 'open:coverage'
28-
- 'connect:coverage'
20+
- 'karma:unit_coverage'
21+
- 'open:coverage'
22+
- 'connect:coverage'
2923

3024
install:
31-
- 'shell:npm_install'
32-
- 'bower:install'
33-
- 'shell:protractor_update'
25+
- 'shell:npm_install'
26+
- 'bower:install'
27+
- 'shell:protractor_update'
3428

3529
default:
36-
- 'build'
37-
38-
# cause zsh always puts me in grunt folder
39-
d:
40-
- 'default'
41-
42-
dev:
43-
- 'connect:devserver'
44-
- 'open:devserver'
45-
- 'watch:source'
46-
47-
dev-chrome:
48-
- 'connect:devserver'
49-
- 'open:devserver'
50-
- 'watch:chrome'
51-
52-
spec: #continuos running specs
53-
- 'fast-build'
54-
- 'concurrent:unit-mocha'
55-
56-
spec-chrome:
57-
- 'fast-build'
58-
- 'concurrent:chrome'
59-
60-
serve:
61-
- 'concurrent:watchServe'
62-
63-
s:
64-
- 'serve'
30+
- 'build'
6531

6632
fast-build:
67-
- 'clean:dist'
68-
- 'jshint'
69-
- 'concat:dist'
70-
- 'concat:distMapped'
71-
- 'ngAnnotate'
72-
73-
d-watch:
74-
- 'fast-build'
75-
- 'concurrent:unit'
33+
- 'clean:dist'
34+
- 'jshint'
35+
- 'concat:dist'
36+
- 'ngAnnotate'
7637

7738
build:
78-
- 'fast-build'
79-
- 'uglify'
80-
- 'test-unit'
81-
- 'concat:license'
82-
- 'clean:pre'
39+
- 'fast-build'
40+
- 'uglify'
41+
- 'test-unit'
42+
- 'concat:license'
43+
- 'clean:pre'
8344

8445
travis:
85-
- 'fast-build'
86-
- 'bower:install'
87-
- 'test-unit'
88-
89-
bump-@:
90-
- 'changelog'
91-
- 'bump-only'
92-
- 'default'
93-
- 'graph'
94-
- 'bump-commit'
95-
96-
bump-@-minor:
97-
- 'changelog'
98-
- 'bump-only:minor'
99-
- 'default'
100-
- 'graph'
101-
- 'bump-commit'
102-
103-
bump-@-major:
104-
- 'changelog'
105-
- 'bump-only:major'
106-
- 'default'
107-
- 'graph'
108-
- 'bump-commit'
46+
- 'fast-build'
47+
- 'bower:install'
48+
- 'test-unit'
10949

11050
examples:
111-
- 'shell:examples'
112-
- 'concat:examples'
113-
114-
graph:
115-
- 'angular_architecture_graph'
51+
- 'shell:examples'
52+
- 'concat:examples'

grunt/bower.js

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

grunt/bower.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"install": {
3+
}
4+
}

grunt/clean.js

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

grunt/clean.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"dist": ["dist/"],
3+
"pre": ["dist/*.pre.js"]
4+
}

grunt/concat.js

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

grunt/concat.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"dist": {
3+
"options": {
4+
"banner": "/*!\n* <%= pkg.name %> <%= pkgFunction().version %> <%= grunt.template.today(\"yyyy-mm-dd\") %>\n* <%= pkg.description %>\n* <%= pkg.repository.type %>: <%= pkg.repository.url %>\n*/\n(function(angular){\n'use strict';\n",
5+
"footer": "\n}(angular));"
6+
},
7+
"src": [
8+
"src/directives/leaflet.js",
9+
"src/services/*.js",
10+
"src/**/*.js"
11+
12+
],
13+
"dest": "dist/angular-leaflet-directive.pre.js"
14+
},
15+
"license": {
16+
"src": [
17+
"src/header-MIT-license.txt",
18+
"dist/angular-leaflet-directive.min.no-header.js"
19+
],
20+
"dest": "dist/angular-leaflet-directive.min.js"
21+
},
22+
"examples": {
23+
"options": {
24+
"banner": "(function(angular){ \nvar app = angular.module('webapp');\n",
25+
"footer": "}(angular));"
26+
},
27+
"src": ["examples/js/controllers/*.js"],
28+
"dest": "examples/js/controllers.js"
29+
}
30+
}

grunt/jshint.js

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

grunt/jshint.json

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
{
2+
"options": {
3+
"node": true,
4+
"browser": true,
5+
"esnext": true,
6+
"bitwise": true,
7+
"curly": false,
8+
"eqeqeq": true,
9+
"immed": true,
10+
"indent": 4,
11+
"latedef": true,
12+
"newcap": true,
13+
"noarg": true,
14+
"regexp": true,
15+
"undef": true,
16+
"unused": true,
17+
"trailing": true,
18+
"smarttabs": true,
19+
"globals": {
20+
"angular": false,
21+
"L": false,
22+
"lvector": false,
23+
"cartodb": false,
24+
"jasmine": false,
25+
"isCommonJS": false,
26+
"exports": false,
27+
"spyOn": false,
28+
"it": false,
29+
"xit": false,
30+
"expect": false,
31+
"runs": false,
32+
"waits": false,
33+
"waitsFor": false,
34+
"beforeEach": false,
35+
"afterEach": false,
36+
"describe": false,
37+
"xdescribe": false,
38+
"protractor": false,
39+
"browser": false,
40+
"by": false,
41+
"element": false
42+
}
43+
},
44+
"source": {
45+
"src": ["src/directives/*.js", "src/services/*.js"]
46+
},
47+
"tests": {
48+
"src": ["test/unit/*.js", "test/e2e/*.js"]
49+
},
50+
"grunt": {
51+
"src": ["Gruntfile.js"]
52+
}
53+
}

grunt/karma.js

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

0 commit comments

Comments
 (0)