frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Concatenate vendor js/css where possible

Browse Source
This commit is contained in:
Nick O'Leary 2015-04-13 00:10:10 +01:00
parent e369ded6c5
commit 1aaef598a5
2 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Gruntfile.js
View File

@ -118,6 +118,24 @@ module.exports = function(grunt) {
"editor/js/ui/touch/radialMenu.js" "editor/js/ui/touch/radialMenu.js"
], ],
dest: "public/red/red.js" dest: "public/red/red.js"
},
vendor: {
files: {
"public/vendor/vendor.js": [
"editor/vendor/jquery/js/jquery-1.11.1.min.js",
"editor/vendor/bootstrap/js/bootstrap.min.js",
"editor/vendor/jquery/js/jquery-ui-1.10.3.custom.min.js",
"editor/vendor/jquery/js/jquery.ui.touch-punch.min.js",
"editor/vendor/marked/marked.min.js",
"editor/vendor/orion/built-editor.min.js",
"editor/vendor/d3/d3.v3.min.js"
],
"public/vendor/vendor.css": [
"editor/vendor/orion/built-editor.css"
// TODO: resolve relative resource paths in
// bootstrap/FA/jquery
]
}
} }
}, },
uglify: { uglify: {
@ -214,7 +232,13 @@ module.exports = function(grunt) {
}, },
{ {
cwd: 'editor/vendor', cwd: 'editor/vendor',
src: '**', src: [
'ace/**',
'bootstrap/css/**',
'bootstrap/img/**',
'jquery/css/**',
'font-awesome/**'
],
expand: true, expand: true,
dest: 'public/vendor/' dest: 'public/vendor/'
}, },
@ -244,7 +268,8 @@ module.exports = function(grunt) {
'nodes/*.demo', 'nodes/*.demo',
'nodes/core/**', 'nodes/core/**',
'red/**', 'red/**',
'public/**' 'public/**',
'editor/templates/**'
], ],
dest: path.resolve('<%= paths.dist %>/node-red-<%= pkg.version %>') dest: path.resolve('<%= paths.dist %>/node-red-<%= pkg.version %>')
}] }]
@ -333,7 +358,7 @@ module.exports = function(grunt) {
grunt.registerTask('build', grunt.registerTask('build',
'Builds editor content', 'Builds editor content',
['clean:build','concat:build','uglify:build','sass:build','copy:build','attachCopyright']); ['clean:build','concat:build','concat:vendor','uglify:build','sass:build','copy:build','attachCopyright']);
grunt.registerTask('dev', grunt.registerTask('dev',
'Developer mode: run node-red, watch for source changes and build/restart', 'Developer mode: run node-red, watch for source changes and build/restart',

12
editor/index.html
View File

@ -23,8 +23,8 @@
<title>Node-RED</title> <title>Node-RED</title>
<link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen"> <link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
<link href="vendor/jquery/css/smoothness/jquery-ui-1.10.3.custom.min.css" rel="stylesheet" media="screen"> <link href="vendor/jquery/css/smoothness/jquery-ui-1.10.3.custom.min.css" rel="stylesheet" media="screen">
<link rel="stylesheet" type="text/css" href="vendor/orion/built-editor.css"/> <link rel="stylesheet" href="vendor/font-awesome/css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="vendor/font-awesome/css/font-awesome.min.css"/> <link rel="stylesheet" href="vendor/vendor.css">
<link rel="stylesheet" href="red/style.min.css"> <link rel="stylesheet" href="red/style.min.css">
</head> </head>
<body spellcheck="false"> <body spellcheck="false">
@ -168,15 +168,9 @@
</div> </div>
</script> </script>
<script src="vendor/jquery/js/jquery-1.11.1.min.js"></script> <script src="vendor/vendor.js"></script>
<script src="vendor/bootstrap/js/bootstrap.min.js"></script>
<script src="vendor/jquery/js/jquery-ui-1.10.3.custom.min.js"></script>
<script src="vendor/jquery/js/jquery.ui.touch-punch.min.js"></script>
<script src="vendor/marked/marked.min.js"></script>
<script src="vendor/orion/built-editor.min.js"></script>
<script src="vendor/ace/ace.js"></script> <script src="vendor/ace/ace.js"></script>
<script src="vendor/ace/ext-language_tools.js"></script> <script src="vendor/ace/ext-language_tools.js"></script>
<script src="vendor/d3/d3.v3.min.js"></script>
<script src="red/red.min.js"></script> <script src="red/red.min.js"></script>
</body> </body>