diff --git a/src/app/components/require.config.js b/src/app/components/require.config.js index 37b91735e35..2b554e8a04f 100644 --- a/src/app/components/require.config.js +++ b/src/app/components/require.config.js @@ -3,7 +3,7 @@ */ require.config({ baseUrl: 'app', - // urlArgs: 'r=@REV@', + paths: { config: ['../config', '../config.sample'], settings: 'components/settings', diff --git a/tasks/build_task.js b/tasks/build_task.js index afee147d16e..3a96c5bf985 100644 --- a/tasks/build_task.js +++ b/tasks/build_task.js @@ -11,40 +11,27 @@ module.exports = function(grunt) { 'htmlmin:build', 'ngtemplates', 'cssmin:build', + 'build:grafanaVersion', 'ngmin:build', 'requirejs:build', 'concat:js', 'filerev', 'usemin', 'clean:temp', - 'build:write_revision', 'uglify:dest' ]); - // run a string replacement on the require config, using the latest revision number as the cache buster - grunt.registerTask('build:write_revision', function() { - grunt.event.once('git-describe', function (desc) { - grunt.config('string-replace.config', { - files: { - '<%= destDir %>/app/components/require.config.js': '<%= destDir %>/app/components/require.config.js', - '<%= destDir %>/app/app.js': '<%= destDir %>/app/app.js' - }, - options: { - replacements: [ - { - pattern: /@REV@/g, - replacement: desc.object - }, - { - pattern: /@grafanaVersion@/g, - replacement: '<%= pkg.version %>' - } - ] - } - }); - grunt.task.run('string-replace:config'); + grunt.registerTask('build:grafanaVersion', function() { + grunt.config('string-replace.config', { + files: { + '<%= tempDir %>/app/app.js': '<%= tempDir %>/app/app.js' + }, + options: { + replacements: [{ pattern: /@grafanaVersion@/g, replacement: '<%= pkg.version %>' }] + } }); - grunt.task.run('git-describe'); + grunt.task.run('string-replace:config'); }); + };