1
0
Fork 0

replaced deprecated assets attribute with grunt js tasks - #1391

This commit is contained in:
Heiko Kernbach 2015-06-29 15:58:18 +02:00
parent aa9be8d919
commit dfe5778d3d
8 changed files with 21425 additions and 73 deletions

View File

@ -17,6 +17,33 @@
"frontend/js/lib/underscore.js",
"frontend/js/lib/backbone.js",
"frontend/js/lib/bootstrap.js"
],
css: [
"frontend/css/swagger/hightlight.default.css",
"frontend/css/bootstrap.css",
"frontend/css/jquery-ui-1.9.2.custom.css",
"frontend/css/jquery.contextmenu.css",
"frontend/css/select2.css",
"frontend/css/jquery.dataTables.css",
"frontend/css/nv.d3.css",
"frontend/css/swaggerView.css",
"frontend/css/ansi.css",
"frontend/css/jsoneditor.css",
"frontend/ttf/arangofont/style.css"
],
documentation: [
"frontend/js/lib/jquery-2.1.0.min.js",
"frontend/js/lib/handlebars-1.0.rc.1.js",
"frontend/js/lib/underscore.js",
"frontend/js/lib/backbone.js",
"frontend/js/lib/swagger.js",
"frontend/js/lib/swagger-ui.js",
"frontend/js/lib/highlight.7.3.pack.js",
"frontend/js/arango/arango.js",
"frontend/js/shell/browser.js",
"frontend/js/bootstrap/module-internal.js",
"frontend/js/client/bootstrap/module-internal.js",
"frontend/js/documentation/documentation.js"
]
},
standalone: {
@ -139,6 +166,17 @@
}
},
concat: {
css: {
src: ['<%=project.shared.css %>'],
dest: 'build/extra.css'
},
documentation: {
src: ['<%=project.shared.documentation %>'],
dest: "build/documentation.js"
}
},
concat_in_order: {
default: {
files: {
@ -312,6 +350,7 @@
});
grunt.loadNpmTasks("grunt-sass");
grunt.loadNpmTasks("grunt-contrib-concat");
require('matchdep').filterDev('grunt-*').forEach(grunt.loadNpmTasks);
grunt.loadNpmTasks('grunt-text-replace');
@ -320,6 +359,7 @@
'sass:dev',
'jshint:default',
'replace',
'concat',
'concat_in_order:sharedLibs',
'concat_in_order:default',
'concat_in_order:jsCluster',
@ -332,6 +372,7 @@
grunt.registerTask('devel', [
'sass:dev',
'replace',
'concat',
'concat_in_order:sharedLibs',
'concat_in_order:default',
'concat_in_order:jsCluster',

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -8,6 +8,7 @@
<meta name="author" content="Florian Bartels, Michael Hackstein, gschwab">
<link href="css/style.css" rel="stylesheet">
<link href="css/cluster.css" rel="stylesheet">
<link href="css/generated.css" rel="stylesheet">
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
<script id="dashboardView.ejs" type="text/template">

View File

@ -5,4 +5,5 @@
<meta name="author" content="Florian Bartels, Michael Hackstein, gschwab">
<link href="css/style.css" rel="stylesheet">
<link href="css/cluster.css" rel="stylesheet">
<link href="css/generated.css" rel="stylesheet">
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">

View File

@ -5,5 +5,6 @@
<meta name="description" content="ArangoDB Admin Web Interface">
<meta name="author" content="Heiko Kernbach, Michael Hackstein">
<link href="css/style.css" rel="stylesheet">
<link href="css/generated.css" rel="stylesheet">
<link href="css/sass.css" rel="stylesheet">
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">

View File

@ -14,7 +14,7 @@
"contributors": [
{
"name": "Heiko Kernbach",
"email": "h.kernbach@triagens.de"
"email": "heiko@arangodb.com"
},
{
"name": "Michael Hackstein",
@ -34,83 +34,15 @@
"/templates": "foxxTemplates.js"
},
"assets": {
"documentation.js": {
"files": [
"frontend/js/lib/jquery-2.1.0.min.js",
"frontend/js/lib/handlebars-1.0.rc.1.js",
"frontend/js/lib/underscore.js",
"frontend/js/lib/backbone.js",
"frontend/js/lib/swagger.js",
"frontend/js/lib/swagger-ui.js",
"frontend/js/lib/highlight.7.3.pack.js",
"frontend/js/arango/arango.js",
"frontend/js/shell/browser.js",
"frontend/js/bootstrap/module-internal.js",
"frontend/js/client/bootstrap/module-internal.js",
"frontend/js/documentation/documentation.js"
]
},
"libs.js": {
"files": [
"frontend/js/lib/jquery-ui-1.9.2.custom.js",
"frontend/js/lib/jquery.snippet.js",
"frontend/js/lib/jquery.slideto.min.js",
"frontend/js/lib/jquery.wiggle.min.js",
"frontend/js/lib/jquery.contextmenu.js",
"frontend/js/lib/jquery.hotkeys.js",
"frontend/js/lib/jquery.form.js",
"frontend/js/lib/jquery.uploadfile.js",
"frontend/js/lib/select2.min.js",
"frontend/js/lib/handlebars-1.0.rc.1.js",
"frontend/js/lib/underscore.js",
"frontend/js/lib/backbone.js",
"frontend/js/lib/jsoneditor-min.js",
"frontend/js/lib/d3.v3.min.js",
"frontend/js/lib/nv.d3.js",
"frontend/js/lib/strftime-min.js",
"frontend/js/lib/dygraph-combined.js",
"frontend/js/lib/d3.fisheye.js",
"frontend/js/lib/bootstrap-pagination.js",
"frontend/js/lib/jqconsole.min.js",
"frontend/js/lib/swagger.js",
"frontend/js/lib/swagger-ui.js",
"frontend/js/lib/highlight.7.3.pack.js",
"frontend/js/lib/joi.browser.js",
"frontend/js/lib/md5.js"
]
},
"css/style.css": {
"files": [
"frontend/css/swagger/hightlight.default.css",
"frontend/css/bootstrap.css",
"frontend/css/jquery-ui-1.9.2.custom.css",
"frontend/css/jquery.contextmenu.css",
"frontend/css/select2.css",
"frontend/css/jquery.dataTables.css",
"frontend/css/nv.d3.css",
"frontend/css/swaggerView.css",
"frontend/css/ansi.css",
"frontend/css/jsoneditor.css",
"frontend/ttf/arangofont/style.css"
]
},
"css/cluster.css": {
"files": [
"frontend/scss/cluster.css",
"frontend/scss/generated.css"
]
}
},
"files": {
"/documentation.js": "build/documentation.js",
"/documentation.html": "frontend/html/documentation.html",
"/standalone.html": "frontend/build/standalone.html",
"/cluster.html": "clusterFrontend/build/cluster.html",
"/css/sass.css": "frontend/build/style.css",
"/css/style.css": "build/extra.css",
"css/cluster.css": "frontend/scss/cluster.css",
"css/generated.css": "frontend/scss/generated.css",
"/cluster.js": "clusterFrontend/build/cluster.js",
"/ace.js": "frontend/src/ace.js",
"/sharedLibs.js": "build/sharedLibs.js",

View File

@ -11,6 +11,7 @@
"grunt": "^0.4.5",
"grunt-cli": "^0.1.13",
"grunt-concat-in-order": "^0.1.6",
"grunt-contrib-concat": "^0.5.1",
"grunt-contrib-jshint": "^0.11.0",
"grunt-contrib-sass": "^0.8.1",
"grunt-contrib-uglify": "^0.7.0",