Consolidate loading of extensions to injectable instead of setup-code

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
This commit is contained in:
Janne SavolainenandMikko Aspiala committed 2022-05-11 08:18:34 +03:00
1 parent 5c31203e50
commit 18abef67bb
4 files changed
+56 -25

No files matched your search

@@ -16,8 +16,8 @@ import installExtensionsInjectable from "../extension-installer/install-extensio
const extensionDiscoveryInjectable = getInjectable({
id: "extension-discovery",
instantiate: (di) =>
new ExtensionDiscovery({
instantiate: (di) => {
const extensionDiscovery = new ExtensionDiscovery({
extensionLoader: di.inject(extensionLoaderInjectable),
extensionsStore: di.inject(extensionsStoreInjectable),
@@ -37,7 +37,13 @@ const extensionDiscoveryInjectable = getInjectable({
extensionPackageRootDirectory: di.inject(
extensionPackageRootDirectoryInjectable,
),
}),
});
// TODO: Missing await
extensionDiscovery.init();
return extensionDiscovery;
},
});
export default extensionDiscoveryInjectable;
@@ -12,13 +12,21 @@ import extensionInstallationCounterInjectable from "./extension-installation-cou
const extensionLoaderInjectable = getInjectable({
id: "extension-loader",
instantiate: (di) =>
new ExtensionLoader({
instantiate: (di) => {
const extensionLoader = new ExtensionLoader({
updateExtensionsState: di.inject(updateExtensionsStateInjectable),
createExtensionInstance: di.inject(createExtensionInstanceInjectable),
extensionRegistrators: di.injectMany(extensionRegistratorInjectionToken),
extensionInstallationCounter: di.inject(extensionInstallationCounterInjectable),
}),
extensionInstallationCounter: di.inject(
extensionInstallationCounterInjectable,
),
});
// TODO: Missing await
extensionLoader.init();
return extensionLoader;
},
});
export default extensionLoaderInjectable;