Skip to content
This repository was archived by the owner on Feb 18, 2021. It is now read-only.

Commit 234dad5

Browse files
erkobrideeerkobridee
committed
Merge branch 'dev'
2 parents 60802e7 + 4891403 commit 234dad5

File tree

7 files changed

+136
-244
lines changed

7 files changed

+136
-244
lines changed

‎package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angularjs-ee-boilerplate",
3-
"version": "1.5.1",
3+
"version": "1.6.0",
44
"private": true,
55
"description": "angularjs enterprise edition boilerplate",
66
"keywords": [
@@ -18,7 +18,9 @@
1818
},
1919
"author": "Erko Bridee de Almeida Cabrera <[email protected]>",
2020
"collaborators": [
21+
"Arlindo Pereira Jr. <[email protected]>",
2122
"Janderson Fernandes Cardoso <[email protected]>",
23+
"Jota Feldmann <[email protected]>",
2224
"Mario de Souza Junior <[email protected]>",
2325
"Vinicius Camara de Oliveira <[email protected]>"
2426
]

‎src/deps.config.js

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
1+
function getConfig() {
2+
return {
3+
4+
// libraries dependencies (fallback support)
5+
paths: {
6+
7+
jquery: [
8+
'vendor/jquery/2.1.3/jquery.min'
9+
],
10+
11+
bootstrap: [
12+
'vendor/bootstrap/3.3.2/js/bootstrap.min'
13+
],
14+
15+
16+
angular: [
17+
'vendor/angular.js/1.3.11/angular.min'
18+
],
19+
20+
angularResource: [
21+
'vendor/angular.js/1.3.11/angular-resource.min'
22+
],
23+
24+
angularAnimate: [
25+
'vendor/angular.js/1.3.11/angular-animate.min'
26+
],
27+
28+
29+
uiBootstrap: [
30+
'vendor/angular-ui/bootstrap/0.12.0/ui-bootstrap-tpls.min'
31+
],
32+
33+
uiRouter: [
34+
'vendor/angular-ui/ui-router/0.2.13/angular-ui-router.min'
35+
],
36+
37+
toaster: [
38+
'vendor/toaster/0.3.0/toaster'
39+
],
40+
41+
ngProgress: [
42+
'vendor/ngProgress/1.0.3/ngProgress.min'
43+
],
44+
45+
46+
// @begin: mock libs
47+
angularMocks: [
48+
'vendor/angular.js/1.3.11/angular-mocks'
49+
],
50+
51+
angularMocksBackend: [
52+
'vendor/angular-mocks-backend/0.1.7/angular-mocks-backend'
53+
],
54+
// @end: mock libs
55+
56+
57+
lokijs: [
58+
'vendor/lokijs/1.0.1/lokijs.min'
59+
]
60+
61+
},
62+
63+
// define js scripts dependencies
64+
shim: {
65+
66+
'bootstrap': {
67+
deps: ['jquery']
68+
},
69+
70+
'angular': {
71+
deps: ['bootstrap'],
72+
exports: 'angular'
73+
},
74+
75+
'angularResource': {
76+
deps: ['angular']
77+
},
78+
79+
'angularAnimate': {
80+
deps: ['angular']
81+
},
82+
83+
'uiBootstrap': {
84+
deps: ['bootstrap', 'angular']
85+
},
86+
87+
'uiRouter': {
88+
deps: ['angular']
89+
},
90+
91+
'ngProgress': {
92+
deps: ['angular']
93+
},
94+
95+
'toaster': {
96+
deps:['angularAnimate']
97+
},
98+
99+
100+
// @begin: mock js shim/deps
101+
'angularMocks': {
102+
deps: ['angular']
103+
},
104+
105+
'angularMocksBackend': {
106+
deps: ['angularMocks']
107+
}
108+
// @end: mock js shim/deps
109+
110+
},
111+
112+
priority: [
113+
'angular'
114+
],
115+
116+
deps: null
117+
118+
};
119+
}

‎src/require.config.js

Lines changed: 4 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -1,117 +1,5 @@
1-
require({
2-
3-
// libraries dependencies (fallback support)
4-
paths: {
5-
6-
jquery: [
7-
'vendor/jquery/2.1.3/jquery.min'
8-
],
9-
10-
bootstrap: [
11-
'vendor/bootstrap/3.3.2/js/bootstrap.min'
12-
],
13-
14-
15-
angular: [
16-
'vendor/angular.js/1.3.11/angular.min'
17-
],
18-
19-
angularResource: [
20-
'vendor/angular.js/1.3.11/angular-resource.min'
21-
],
22-
23-
angularAnimate: [
24-
'vendor/angular.js/1.3.11/angular-animate.min'
25-
],
26-
27-
28-
uiBootstrap: [
29-
'vendor/angular-ui/bootstrap/0.12.0/ui-bootstrap-tpls.min'
30-
],
31-
32-
uiRouter: [
33-
'vendor/angular-ui/ui-router/0.2.13/angular-ui-router.min'
34-
],
35-
36-
toaster: [
37-
'vendor/toaster/0.3.0/toaster'
38-
],
39-
40-
ngProgress: [
41-
'vendor/ngProgress/1.0.3/ngProgress.min'
42-
],
43-
44-
45-
// @begin: mock libs
46-
angularMocks: [
47-
'vendor/angular.js/1.3.11/angular-mocks'
48-
],
49-
50-
angularMocksBackend: [
51-
'vendor/angular-mocks-backend/0.1.7/angular-mocks-backend'
52-
],
53-
// @end: mock libs
54-
55-
56-
lokijs: [
57-
'vendor/lokijs/1.0.1/lokijs.min'
58-
]
59-
60-
},
61-
62-
// define js scripts dependencies
63-
shim: {
64-
65-
'bootstrap': {
66-
deps: ['jquery']
67-
},
68-
69-
'angular': {
70-
deps: ['bootstrap'],
71-
exports: 'angular'
72-
},
73-
74-
'angularResource': {
75-
deps: ['angular']
76-
},
77-
78-
'angularAnimate': {
79-
deps: ['angular']
80-
},
81-
82-
'uiBootstrap': {
83-
deps: ['bootstrap', 'angular']
84-
},
85-
86-
'uiRouter': {
87-
deps: ['angular']
88-
},
89-
90-
'ngProgress': {
91-
deps: ['angular']
92-
},
93-
94-
'toaster': {
95-
deps:['angularAnimate']
96-
},
97-
98-
99-
// @begin: mock js shim/deps
100-
'angularMocks': {
101-
deps: ['angular']
102-
},
103-
104-
'angularMocksBackend': {
105-
deps: ['angularMocks']
106-
}
107-
// @end: mock js shim/deps
108-
109-
},
110-
111-
priority: [
112-
'angular'
113-
],
114-
115-
deps: ['./ng.app']
116-
1+
require(['deps.config'], function(){
2+
var _config = getConfig();
3+
_config.deps = ['./ng.app'];
4+
require(_config);
1175
});

‎tools/config.karma.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ module.exports = {
1717
{pattern: 'src/vendor/**/*.{js,map,css}', included: false, served: true, watched:false},
1818

1919
// load app source and test's specs
20+
'src/deps.config.js',
2021
'tools/helpers/tests/require.config.js',
2122

2223
// app source, tests specs and html for cache templates

‎tools/helpers/grunt/config/browserSync.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,7 @@ grunt.config('browserSync', {
9999
}
100100

101101
}
102-
103-
},
104-
102+
}
105103

106104
});
107105

0 commit comments

Comments
 (0)