IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12096 from grafana/davkal/11446-fix-systemjs-cachebust

Browse Source 
Fix cache busting for systemjs imports for plugins
This commit is contained in:
David 2018-05-30 10:05:46 +02:00 committed by GitHub
commit 40844614bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
public/app/features/plugins/plugin_loader.ts
View File

@ -27,6 +27,13 @@ import 'rxjs/add/observable/from';
import 'rxjs/add/operator/map'; import 'rxjs/add/operator/map';
import 'rxjs/add/operator/combineAll'; import 'rxjs/add/operator/combineAll';
// add cache busting
const bust = `?_cache=${Date.now()}`;
function locate(load) {
return load.address + bust;
}
System.registry.set('plugin-loader', System.newModule({ locate: locate }));
System.config({ System.config({
baseURL: 'public', baseURL: 'public',
defaultExtension: 'js', defaultExtension: 'js',
@ -40,23 +47,14 @@ System.config({
css: 'vendor/plugin-css/css.js', css: 'vendor/plugin-css/css.js',
}, },
meta: { meta: {
'*': { 'plugin*': {
esModule: true, esModule: true,
authorization: true, authorization: true,
loader: 'plugin-loader',
}, },
}, },
}); });
// add cache busting
var systemLocate = System.locate;
System.cacheBust = '?bust=' + Date.now();
System.locate = function(load) {
var System = this;
return Promise.resolve(systemLocate.call(this, load)).then(function(address) {
return address + System.cacheBust;
});
};
function exposeToPlugin(name: string, component: any) { function exposeToPlugin(name: string, component: any) {
System.registerDynamic(name, [], true, function(require, exports, module) { System.registerDynamic(name, [], true, function(require, exports, module) {
module.exports = component; module.exports = component;

3
public/vendor/plugin-css/css.js vendored
View File

@ -1,6 +1,7 @@
"use strict"; "use strict";
if (typeof window !== 'undefined') { if (typeof window !== 'undefined') {
var bust = '?_cache=' + Date.now();
var waitSeconds = 100; var waitSeconds = 100;
var head = document.getElementsByTagName('head')[0]; var head = document.getElementsByTagName('head')[0];
@ -47,7 +48,7 @@ if (typeof window !== 'undefined') {
var link = document.createElement('link'); var link = document.createElement('link');
link.type = 'text/css'; link.type = 'text/css';
link.rel = 'stylesheet'; link.rel = 'stylesheet';
link.href = url; link.href = url + bust;
if (!isWebkit) { if (!isWebkit) {
link.onload = function () { link.onload = function () {
_callback(); _callback();