mirror of
https://github.com/grafana/grafana.git
synced 2025-08-06 01:00:24 +08:00

* chore(plugins): bump systemjs to latest version * refactor(plugins): switch runtime over to use latest systemjs, add typings * refactor(plugins): use latest systemjs APIs for runtime dependency resolution * refactor(plugins): return valid urls from backend for latest systemjs import to work * revert(plugins): remove cfg from assetpath in favour of relative paths * fix(plugins): useDefault for systemjs deps to solve undefined errors * feat(plugins): add basic support for loading plugins via CDN * fix(plugins): load nested plugins with latest systemjs * feat(plugins): add back ability to transform plugin src for cdns * feat(plugins): get caching for module.js working, clean up * refactor(plugin_loader): create buildImportMap fn and more clean up * refactor(angularapp): use buildImportMap for dependencies and clean up * test(plugin_loader): fix failing test due to systemjs update * test(jest): mock systemjs amd extra in tests to prevent it breaking tests * chore(plugins): remove systemjs module-types extra, already included with system * fix(plugins): update key for invalidating cached plugins * fix: move systemjs amd define to another global so monaco can load * refactor(plugins): clean up cache buster and tests * chore(plugins): remove debug * refactor(plugins): move systemjs define to keep global cleaner * fix(plugins): set useDefault so system modules lodash references dont fail * feat(plugins): hook systemjs onload so stylesheets are applied to the dom * refactor(plugins): wrap amd formatted plugins in iife to prevent define collision * feat(plugins): support system module format for legacy plugins * test(plugincachebuster): update tests to match latest implementation * test(plugins-loader): fix up tests post module property change * fix test * Update pkg/plugins/manager/loader/assetpath/assetpath.go Co-authored-by: Will Browne <wbrowne@users.noreply.github.com> * chore(plugin_loader): remove stray import from merge conflict * Revert "Update pkg/plugins/manager/loader/assetpath/assetpath.go" This reverts commit 0df57d1cf20f49c22c93369001c70aae46a97c42. * fix(plugin_loader): set use default for shared plugin dependencies * refactor(plugins): use leading slash for Module and BaseUrl * fix(plugins): fix resolve appending extension to cache query param * refactor(plugins): align baseurl and module paths * refactor(plugins): update builtInPlugins keys to match naming convention * refactor(plugins): minor loader clean up, fix up types * test(plugins): fix failing tests * refactor(plugins): rename cache buster systemjs plugin to cache * refactor(plugins): separate plugin_loader into smaller files * chore(plugins): clean up plugin_loader types * chore(plugin_sandbox): fix typescript error * chore(npm): remove unplug debug and pin systemjs to 6.14.1 * refactor(plugins-cdn): update loaders to use absolute module url from backend * fix(plugins): escape period in systemjs module regex * chore(plugins): delete redundant systemjs plugins * refactor(plugin_loader): move hooks into own file, add types * test(plugins): add tests for systemjs loader hooks * chore(plugins): rename systemjshooks file * chore(plugins): remove redundant systemjs cdn backend code * fix(plugins): handle loading with config.appSubUrl * chore(plugins): delete redundant plugin-cdn angular code * test(plugins): fix failing systemjs test missing pluginsCDNBaseUrl * refactor(plugins): backend provides base and module properties with AppSubUrl * fix(plugins): consider AppSubUrl for plugin logos * fix(plugins): use isHostedOnCDN util when checking for cdn hosted plugins * add new appSubURL field to config * refactor relative URL func * fix path for core app * refactor asset path input * fix(plugins): catch errors in loadPluginCss * feat(plugins-cdn): selectively transform sourceMapURL * re-add deleted test case * chore(plugins): bump to latest systemjs@6.14.2 * feat(plugins): add systemjs-cjs-extra for loading commonjs plugins --------- Co-authored-by: Will Browne <will.browne@grafana.com> Co-authored-by: Will Browne <wbrowne@users.noreply.github.com>
79 lines
2.3 KiB
Go
79 lines
2.3 KiB
Go
package bootstrap
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"github.com/grafana/grafana/pkg/plugins"
|
|
"github.com/grafana/grafana/pkg/plugins/log"
|
|
"github.com/grafana/grafana/pkg/plugins/manager/loader/assetpath"
|
|
)
|
|
|
|
type pluginFactoryFunc func(p plugins.FoundPlugin, pluginClass plugins.Class, sig plugins.Signature) (*plugins.Plugin, error)
|
|
|
|
// DefaultPluginFactory is the default plugin factory used by the Construct step of the Bootstrap stage.
|
|
//
|
|
// It creates the plugin using plugin information found during the Discovery stage and makes use of the assetPath
|
|
// service to set the plugin's BaseURL, Module, Logos and Screenshots fields.
|
|
type DefaultPluginFactory struct {
|
|
assetPath *assetpath.Service
|
|
}
|
|
|
|
// NewDefaultPluginFactory returns a new DefaultPluginFactory.
|
|
func NewDefaultPluginFactory(assetPath *assetpath.Service) *DefaultPluginFactory {
|
|
return &DefaultPluginFactory{assetPath: assetPath}
|
|
}
|
|
|
|
func (f *DefaultPluginFactory) createPlugin(p plugins.FoundPlugin, class plugins.Class,
|
|
sig plugins.Signature) (*plugins.Plugin, error) {
|
|
info := assetpath.NewPluginInfo(p.JSONData, class, p.FS)
|
|
baseURL, err := f.assetPath.Base(info)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("base url: %w", err)
|
|
}
|
|
moduleURL, err := f.assetPath.Module(info)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("module url: %w", err)
|
|
}
|
|
plugin := &plugins.Plugin{
|
|
JSONData: p.JSONData,
|
|
Class: class,
|
|
FS: p.FS,
|
|
BaseURL: baseURL,
|
|
Module: moduleURL,
|
|
Signature: sig.Status,
|
|
SignatureType: sig.Type,
|
|
SignatureOrg: sig.SigningOrg,
|
|
}
|
|
|
|
plugin.SetLogger(log.New(fmt.Sprintf("plugin.%s", plugin.ID)))
|
|
if err = setImages(plugin, f.assetPath); err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return plugin, nil
|
|
}
|
|
|
|
func setImages(p *plugins.Plugin, assetPath *assetpath.Service) error {
|
|
info := assetpath.NewPluginInfo(p.JSONData, p.Class, p.FS)
|
|
var err error
|
|
for _, dst := range []*string{&p.Info.Logos.Small, &p.Info.Logos.Large} {
|
|
if len(*dst) == 0 {
|
|
*dst = assetPath.DefaultLogoPath(p.Type)
|
|
continue
|
|
}
|
|
|
|
*dst, err = assetPath.RelativeURL(info, *dst)
|
|
if err != nil {
|
|
return fmt.Errorf("logo: %w", err)
|
|
}
|
|
}
|
|
for i := 0; i < len(p.Info.Screenshots); i++ {
|
|
screenshot := &p.Info.Screenshots[i]
|
|
screenshot.Path, err = assetPath.RelativeURL(info, screenshot.Path)
|
|
if err != nil {
|
|
return fmt.Errorf("screenshot %d relative url: %w", i, err)
|
|
}
|
|
}
|
|
return nil
|
|
}
|