IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-23 01:16:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(build): fixed build issues with concat not including require_config

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-12-02 18:22:47 +01:00
parent 24324939e1
commit 8eb3e48bc7
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -21,7 +21,7 @@
"grunt-contrib-connect": "~0.5.0",
"grunt-contrib-copy": "~0.5.0",
"grunt-contrib-cssmin": "~0.6.1",
"grunt-contrib-htmlmin": "~0.1.3",
"grunt-contrib-htmlmin": "~0.6.0",
"grunt-contrib-jshint": "~0.10.0",
"grunt-contrib-less": "~0.7.0",
"grunt-contrib-requirejs": "~0.4.4",

8
public/views/index.html
View File

@ -9,15 +9,15 @@
<title>Grafana</title>
[[if .User.LightTheme]]
<link rel="stylesheet" href="[[.AppSubUrl]]/css/grafana.light.min.css">
<link rel="stylesheet" href="[[.AppSubUrl]]/public/css/grafana.light.min.css">
[[else]]
<link rel="stylesheet" href="[[.AppSubUrl]]/css/grafana.dark.min.css">
<link rel="stylesheet" href="[[.AppSubUrl]]/public/css/grafana.dark.min.css">
[[end]]
<link rel="icon" type="image/png" href="[[.AppSubUrl]]/img/fav32.png">
<link rel="icon" type="image/png" href="[[.AppSubUrl]]/public/img/fav32.png">
<base href="[[.AppSubUrl]]/" />
<!-- build:js [[.AppSubUrl]]/app/app.js -->
<!-- build:js [[.AppSubUrl]]/public/app/app.js -->
<script src="[[.AppSubUrl]]/public/vendor/requirejs/require.js"></script>
<script src="[[.AppSubUrl]]/public/app/require_config.js"></script>
<!-- endbuild -->

6
tasks/build_task.js
View File

@ -13,7 +13,7 @@ module.exports = function(grunt) {
'karma:test',
'phantomjs',
'css',
'htmlmin:build',
// 'htmlmin:build',
'ngtemplates',
'cssmin:build',
'ngAnnotate:build',
@ -34,8 +34,8 @@ module.exports = function(grunt) {
for(var key in summary){
if(summary.hasOwnProperty(key)){
var orig = key.replace(root, root+'/[[.AppSubUrl]]');
var revved = summary[key].replace(root, root+'/[[.AppSubUrl]]');
var orig = key.replace(root, root+'/[[.AppSubUrl]]/public');
var revved = summary[key].replace(root, root+'/[[.AppSubUrl]]/public');
fixed[orig] = revved;
}
}

2
tasks/options/concat.js
View File

@ -27,7 +27,7 @@ module.exports = function(config) {
js: {
src: [
'<%= tempDir %>/vendor/requirejs/require.js',
'<%= tempDir %>/app/components/require.config.js',
'<%= tempDir %>/app/require_config.js',
'<%= tempDir %>/app/app.js',
],
dest: '<%= genDir %>/app/app.js'