From 33e3fc70b286e0a1ebee901006e8f70b63b69198 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torkel=20=C3=96degaard?= Date: Wed, 31 Dec 2014 19:01:10 +0100 Subject: [PATCH] trying to get revision asset replacements to work with different paths --- package.json | 2 +- src/views/index.html | 58 ++++++++++++++++++++++++++++++++++ tasks/build_task.js | 2 +- tasks/options/concat.js | 4 ++- tasks/options/usemin.js | 8 ++++- tasks/options/useminPrepare.js | 5 ++- 6 files changed, 74 insertions(+), 5 deletions(-) create mode 100644 src/views/index.html diff --git a/package.json b/package.json index 305d778c4c0..284e8fc30b6 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "grunt-karma": "~0.8.3", "grunt-ngmin": "0.0.3", "grunt-string-replace": "~0.2.4", - "grunt-usemin": "^2.1.1", + "grunt-usemin": "3.0.0", "jshint-stylish": "~0.1.5", "karma": "~0.12.21", "karma-chrome-launcher": "~0.1.4", diff --git a/src/views/index.html b/src/views/index.html new file mode 100644 index 00000000000..0cb3e2cd2d7 --- /dev/null +++ b/src/views/index.html @@ -0,0 +1,58 @@ + + + + + + + + Grafana + + + + + + + + + + + + + + + + + + + +
+ + + +
+
+ +
{{alert.title}}
+
+
+
+ +
+ +
+ + + + + diff --git a/tasks/build_task.js b/tasks/build_task.js index 0c85a52d716..47f4605373e 100644 --- a/tasks/build_task.js +++ b/tasks/build_task.js @@ -20,7 +20,7 @@ module.exports = function(grunt) { 'filerev', 'usemin', 'clean:temp', - 'uglify:dest' + //'uglify:dest' ]); grunt.registerTask('build:grafanaVersion', function() { diff --git a/tasks/options/concat.js b/tasks/options/concat.js index c0aca70df23..6257547f399 100644 --- a/tasks/options/concat.js +++ b/tasks/options/concat.js @@ -1,4 +1,6 @@ module.exports = function(config) { + "use strict"; + return { cssDark: { src: [ @@ -28,7 +30,7 @@ module.exports = function(config) { js: { src: [ '<%= destDir %>/vendor/require/require.js', - '<%= destDir %>/app/components/require.standalone.js', + '<%= destDir %>/app/components/require.<%= mode %>.js', '<%= destDir %>/app/app.js', ], dest: '<%= destDir %>/app/app.js' diff --git a/tasks/options/usemin.js b/tasks/options/usemin.js index 0abd8ed4ec5..8c09fd0a6e7 100644 --- a/tasks/options/usemin.js +++ b/tasks/options/usemin.js @@ -1,5 +1,11 @@ module.exports = function(config) { return { - html: '<%= destDir %>/index.html', + html: [ + '<%= destDir %>/views/index.html', + '<%= destDir %>/index.html', + ], + options: { + assetsDirs: ['<%= destDir %>'] + } }; }; diff --git a/tasks/options/useminPrepare.js b/tasks/options/useminPrepare.js index 23bab7e3f22..17123ac8790 100644 --- a/tasks/options/useminPrepare.js +++ b/tasks/options/useminPrepare.js @@ -1,5 +1,8 @@ module.exports = function(config) { return { - html: 'tmp/index.html', + html: [ + 'tmp/index.html', + 'tmp/views/index.html', + ] }; };