github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 09:19:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

use the buildNum to bust require.js cache, fixes #1574

Browse source
This commit is contained in:
Spencer Alger 2014-10-09 13:28:23 -07:00
parent 032f8a57e8
commit 05f0b00183
3 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/kibana/index.html
View file

@ -6,17 +6,20 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width">
<title>Kibana 4</title>
<!-- load the root require context -->
<script src="/bower_components/requirejs/require.js"></script>
<script src="/require.config.js"></script>
<script>require(['kibana'], function (kibana) { kibana.init(); });</script>
<link rel="stylesheet" href="/styles/main.css" >
<script>
window.KIBANA_VERSION='@@version';
window.KIBANA_BUILD_NUM='@@buildNum';
window.KIBANA_COMMIT_SHA='@@commitSha';
</script>
<link rel="stylesheet" href="/styles/main.css?_b=@@buildNum">
<script src="/bower_components/requirejs/require.js?_b=@@buildNum"></script>
<script src="/require.config.js?_b=@@buildNum"></script>
<script>
require.config({ urlArgs: '_b=' + window.KIBANA_BUILD_NUM });
require(['kibana'], function (kibana) { kibana.init(); });
</script>
</head>
<body ng-controller="kibana" ng-class="'application-'+activeApp">
<kbn-notifications list="notifList"></kbn-notifications>

1
tasks/build.js
View file

@ -7,6 +7,7 @@ module.exports = function (grunt) {
'less',
'copy:kibana_src',
'touch_config',
'replace:build_props',
'requirejs',
'clean:unneeded_source_in_build',
'copy:server_src',

22
tasks/config/replace.js
View file

@ -5,14 +5,14 @@ module.exports = function (grunt) {
var app = grunt.config.get('app');
var config = {
options: {
patterns: [
{ match: 'version', replacement: '<%= pkg.version %>' },
{ match: 'buildNum', replacement: '<%= buildNum %>' },
{ match: 'commitSha', replacement: '<%= commitSha %>' }
]
},
dist: {
options: {
patterns: [
{ match: 'version', replacement: '<%= pkg.version %>' },
{ match: 'buildNum', replacement: '<%= buildNum %>' },
{ match: 'commitSha', replacement: '<%= commitSha %>' }
]
},
files: [
{
src: [join(src, 'server', 'bin', 'kibana.sh')],
@ -22,10 +22,14 @@ module.exports = function (grunt) {
{
src: [join(src, 'server', 'bin', 'kibana.bat')],
dest: join(build, 'dist', 'kibana', 'bin', 'kibana.bat')
},
}
]
},
build_props: {
files: [
{
src: [join(app, 'index.html')],
dest: join(build, 'kibana', 'public', 'index.html')
dest: join(build, 'src', 'index.html')
}
]
}