Skip to content

Commit 7a4e5ae

Browse files
committed
Build - renamed file vendors to dependencies.
+ updated dependencies list.
1 parent f7df5bb commit 7a4e5ae

17 files changed

Lines changed: 45 additions & 30 deletions

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
node_modules
22
bower_components
3-
js/vendors.js
3+
js/dependencies.js
44
js/ui-models/doc/
5-
dist/vendors.js
5+
dist/dependencies.js
66
js/models
77
js/ui-models/chinook
88
*.xml

Gruntfile.js

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,16 @@ module.exports = function (grunt) {
1212
'/* <%= pkg.copyright %> */\n' +
1313
'/* https://github.com/evoluteur/evolutility */\n',
1414

15+
bannerDependencies: '/*\n <%= pkg.name %> v<%= pkg.version %> dependencies: \n' +
16+
' bootstrap 3.3.4, jquery 2.1.4, backbone 1.1.2, backbone.localStorage v1.1.7, underscore 1.8.3, d3 3.5.5, bootstrap-datepicker" 1.4.0, select2 3.5.2. */\n',
17+
1518
// *************************************************************************************
1619
// CONCAT
1720
// *************************************************************************************
1821
concat: {
19-
vendors:{
22+
dependencies:{
2023
options: {
24+
banner: '<%= bannerDependencies %>',
2125
separator: ';\n'
2226
},
2327
src: [
@@ -47,7 +51,7 @@ module.exports = function (grunt) {
4751
'bower_components/bootstrap-datepicker/js/bootstrap-datepicker.js',
4852
'bower_components/select2/select2.js'
4953
],
50-
dest: '<%= pkg.target %>/vendors.js'
54+
dest: '<%= pkg.target %>/dependencies.js'
5155
},
5256
js:{
5357
options: {
@@ -171,15 +175,15 @@ module.exports = function (grunt) {
171175
}
172176
]
173177
},
174-
vendors: {
178+
dependencies: {
175179
options: {
176-
banner: '/* <%= pkg.name %> v<%= pkg.version %> dependencies: \n jquery + backbone + underscore + backbone.localStorage + bootstrap-datepicker */',
180+
banner: '<%= bannerDependencies %>',
177181
mangle: true
178182
},
179183
files: [
180184
{
181-
src: '<%= pkg.target %>/vendors.js',
182-
dest: '<%= pkg.target %>/vendors.min.js'
185+
src: '<%= pkg.target %>/dependencies.js',
186+
dest: '<%= pkg.target %>/dependencies.min.js'
183187
}
184188
]
185189
}
@@ -204,7 +208,7 @@ module.exports = function (grunt) {
204208
compress: true
205209
},
206210
files: {
207-
"dist/css/vendors.min.css": "less/vendors.less",
211+
"dist/css/dependencies.min.css": "less/dependencies.less",
208212
"dist/css/evolutility.min.css": "less/evol.less"
209213
}
210214
}
@@ -233,7 +237,7 @@ module.exports = function (grunt) {
233237
grunt.registerTask('dev', ['concat:js', 'less:dev', 'less:demo']);
234238

235239
// Prod task(s).
236-
grunt.registerTask('prod', ['jshint', 'copy', 'dev', 'concat:demo', 'concat:vendors', 'less:prod', 'uglify']);
240+
grunt.registerTask('prod', ['jshint', 'copy', 'dev', 'concat:demo', 'concat:dependencies', 'less:prod', 'uglify']);
237241

238242
};
239243

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ Javascript, HTML5, CSS3,
256256
[Bootstrap-datepicker] (http://eternicode.github.io/bootstrap-datepicker/),
257257
[Select2] (http://ivaynberg.github.io/select2/).
258258

259-
Note: For convenience, all dependencies are minified together in a single file "vendors.min.js". The dependencies list is specified in "Gruntfile.js".
259+
Note: For convenience, all dependencies are minified together in a single file "dependencies.min.js". The dependencies list is specified in "Gruntfile.js".
260260

261261
## Documentation
262262

demo/custom-app.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
<meta name="keywords" content="open source metadata UI SPA Backbone View Model Bootstrap" />
99
<meta name="description" content="Evolutility :: Demo Single Page App" /></head>
1010

11-
<link href="../dist/css/vendors.min.css" rel="stylesheet" />
11+
<link href="../dist/css/dependencies.min.css" rel="stylesheet" />
1212
<link href="../dist/css/demo.css" rel="stylesheet" />
1313
<link href="../dist/css/evolutility.min.css" rel="stylesheet" />
1414

15-
<script src="../dist/vendors.min.js" type="text/javascript"></script>
15+
<script src="../dist/dependencies.min.js" type="text/javascript"></script>
1616
<script src="../dist/evolutility.min.js" type="text/javascript"></script>
1717
<script src="demo.js" type="text/javascript"></script>
1818
<script src="demo-data.min.js" type="text/javascript"></script>

demo/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<meta name="keywords" content="CRUD framework open source metadata UI SPA MVC Backbone View Model ui-model" />
99
<meta name="description" content="Evolutility :: Demo Single Page App" /></head>
1010

11-
<link href="../dist/css/vendors.min.css" rel="stylesheet" />
11+
<link href="../dist/css/dependencies.min.css" rel="stylesheet" />
1212
<link href="../dist/css/demo.css" rel="stylesheet" />
1313
<link href="../dist/css/evolutility.min.css" rel="stylesheet" />
1414

@@ -18,7 +18,7 @@
1818
<script src="../js/ui-models/apps/todo.js" type="text/javascript"></script>
1919
<script src="../js/ui-models/apps/winecellar.js" type="text/javascript"></script>
2020
<script src="../js/ui-models/apps/comics.js" type="text/javascript"></script>
21-
<script src="../dist/vendors.min.js" type="text/javascript"></script>
21+
<script src="../dist/dependencies.min.js" type="text/javascript"></script>
2222
<script src="../dist/evolutility.js" type="text/javascript"></script>
2323

2424
<title id="headTitle">Demo :: Evolutility</title>

demo/test.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77

88
<meta name="description" content="Evolutility :: Test" /></head>
99

10-
<link href="../dist/css/vendors.min.css" rel="stylesheet" />
10+
<link href="../dist/css/dependencies.min.css" rel="stylesheet" />
1111
<link href="../dist/css/demo.css" rel="stylesheet" />
1212
<link href="../dist/css/evolutility.css" rel="stylesheet" />
1313

14-
<script src="../dist/vendors.min.js" type="text/javascript"></script>
14+
<script src="../dist/dependencies.min.js" type="text/javascript"></script>
1515
<script src="demo.js" type="text/javascript"></script>
1616
<script src="../js/ui-models/apps/test.data.js" type="text/javascript"></script>
1717
<script src="../js/ui-models/apps/test.js" type="text/javascript"></script>

dico/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
55
<meta name="viewport" content="width=device-width,initial-scale=1">
66

7-
<link href="../dist/css/vendors.min.css" rel="stylesheet" />
7+
<link href="../dist/css/dependencies.min.css" rel="stylesheet" />
88
<link href="../dist/css/demo.css" rel="stylesheet" />
99
<link href="../dist/css/evolutility.css" rel="stylesheet" />
1010
<link rel="icon" type="image/png" href="../favicon.png">
1111

12-
<script src="../dist/vendors.min.js" type="text/javascript"></script>
12+
<script src="../dist/dependencies.min.js" type="text/javascript"></script>
1313
<script src="../dist/evolutility.js" type="text/javascript"></script>
1414
<script src="../js/ui-models/dico/entity.js" type="text/javascript"></script>
1515
<script src="../js/ui-models/dico/field.js" type="text/javascript"></script>

dist/css/dependencies.min.css

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/css/vendors.min.css

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)