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

Sandbox: Use resolveCache to resolve plugin's code file as systemjs does (#75509)

Browse Source 
* Sandbox: Use resolveCache to resolve plugin's code file as systemjs does

* Add clarifying comments
This commit is contained in:
Esteban Beltran
2023-09-27 13:56:35 +02:00
committed by GitHub
parent 720543f483
commit 2bbd5521fe
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/app/features/plugins/sandbox/code_loader.ts
View File

@@ -1,6 +1,7 @@
import { PluginMeta } from '@grafana/data'; import { PluginMeta } from '@grafana/data';
import { transformPluginSourceForCDN } from '../cdn/utils'; import { transformPluginSourceForCDN } from '../cdn/utils';
import { resolveWithCache } from '../loader/cache';
import { isHostedOnCDN } from '../loader/utils'; import { isHostedOnCDN } from '../loader/utils';
import { SandboxEnvironment } from './types'; import { SandboxEnvironment } from './types';
@@ -40,7 +41,7 @@ export async function loadScriptIntoSandbox(url: string, meta: PluginMeta, sandb
export async function getPluginCode(meta: PluginMeta): Promise<string> { export async function getPluginCode(meta: PluginMeta): Promise<string> {
if (isHostedOnCDN(meta.module)) { if (isHostedOnCDN(meta.module)) {
// should load plugin from a CDN // Load plugin from CDN, no need for "resolveWithCache" as CDN URLs already include the version
const url = meta.module; const url = meta.module;
const response = await fetch(url); const response = await fetch(url);
let pluginCode = await response.text(); let pluginCode = await response.text();
@@ -51,8 +52,10 @@ export async function getPluginCode(meta: PluginMeta): Promise<string> {
}); });
return pluginCode; return pluginCode;
} else { } else {
//local plugin loading // local plugin. resolveWithCache will append a query parameter with its version
const response = await fetch(meta.module); // to ensure correct cached version is served
const pluginCodeUrl = resolveWithCache(meta.module);
const response = await fetch(pluginCodeUrl);
let pluginCode = await response.text(); let pluginCode = await response.text();
pluginCode = patchPluginSourceMap(meta, pluginCode); pluginCode = patchPluginSourceMap(meta, pluginCode);
pluginCode = patchPluginAPIs(pluginCode); pluginCode = patchPluginAPIs(pluginCode);