Merge pull request #103 from Hyperkid123/update-sdk-4

Upgrade dynamic plugin SDK to v4

Author: Hyperkid123

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@scalprum/core",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "Includes core functions for scalprum scaffolding.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -20,6 +20,6 @@
     "start:cjs": "npm run build:cjs -- -w"
   },
   "dependencies": {
-    "@openshift/dynamic-plugin-sdk": "^3.0.0"
+    "@openshift/dynamic-plugin-sdk": "^4.0.0"
   }
 }

packages/core/package.json

@@ -93,7 +93,6 @@ describe('scalprum', () => {
         disableReason: undefined,
         enabled: true,
         manifest: { baseURL: '/foo/bar', extensions: [], loadScripts: [], registrationMethod: 'custom', name: 'testScope', version: '1.0.0' },
-        pluginName: 'testScope',
         status: 'loaded',
       },
     ];
@@ -103,7 +102,7 @@ describe('scalprum', () => {
       init: jest.fn(),
       get: jest.fn().mockReturnValue(jest.fn().mockReturnValue(jest.fn())),
     };
-    await getScalprum().pluginStore.loadPlugin('http://foobar', testManifest);
+    await getScalprum().pluginStore.loadPlugin(testManifest);
     expect(getScalprum().pluginStore.getPluginInfo()).toEqual(expectedPlugins);
   });
 
@@ -115,7 +114,7 @@ describe('scalprum', () => {
       init: jest.fn(),
       get: jest.fn().mockReturnValue(jest.fn().mockReturnValue(jest.fn())),
     };
-    await getScalprum().pluginStore.loadPlugin('http://foobar', testManifest);
+    await getScalprum().pluginStore.loadPlugin(testManifest);
     // @ts-ignore
     expect(getCachedModule('testScope', './testModule')).toHaveProperty('cachedModule');
     /**
@@ -133,7 +132,7 @@ describe('scalprum', () => {
       init: jest.fn(),
       get: jest.fn().mockReturnValue(jest.fn()),
     };
-    await getScalprum().pluginStore.loadPlugin('http://foobar', testManifest);
+    await getScalprum().pluginStore.loadPlugin(testManifest);
     // @ts-ignore
     expect(getCachedModule('testScope', './testModule', true)).toEqual({});
   });

packages/core/src/index.test.ts

@@ -1,4 +1,4 @@
-import { PluginLoader, PluginStore, FeatureFlags, PluginLoaderOptions, PluginStoreOptions, PluginManifest } from '@openshift/dynamic-plugin-sdk';
+import { PluginStore, FeatureFlags, PluginLoaderOptions, PluginStoreOptions, PluginManifest } from '@openshift/dynamic-plugin-sdk';
 import { warnDuplicatePkg } from './warnDuplicatePkg';
 export const GLOBAL_NAMESPACE = '__scalprum__';
 export type AppMetadata<T extends {} = {}> = T & {
@@ -200,17 +200,15 @@ export const initialize = <T extends Record<string, any> = Record<string, any>>(
     ...options,
   };
 
-  // Create new plugin loader instance
-  const pluginLoader = new PluginLoader({
-    sharedScope: getSharedScope(defaultOptions.enableScopeWarning),
-    getPluginEntryModule: ({ name }) => (window as { [key: string]: any })[name],
-    ...pluginLoaderOptions,
-  });
-
   // Create new plugin store
-  const pluginStore = new PluginStore(pluginStoreOptions);
-  pluginLoader.registerPluginEntryCallback();
-  pluginStore.setLoader(pluginLoader);
+  const pluginStore = new PluginStore({
+    ...pluginStoreOptions,
+    loaderOptions: {
+      sharedScope: getSharedScope(defaultOptions.enableScopeWarning),
+      getPluginEntryModule: ({ name }) => (window as { [key: string]: any })[name],
+      ...pluginLoaderOptions,
+    },
+  });
   pluginStore.setFeatureFlags(pluginStoreFeatureFlags);
 
   scalprum = {
@@ -318,7 +316,8 @@ export async function processManifest(url: string, scope: string, module: string
         baseURL,
       };
     }
-    await pluginStore.loadPlugin(sdkManifest.baseURL, sdkManifest);
+
+    await pluginStore.loadPlugin(sdkManifest);
     try {
       const exposedModule = await pluginStore.getExposedModule<ExposedScalprumModule>(scope, module);
       setExposedModule(getModuleIdentifier(scope, module), exposedModule);

packages/core/src/index.ts

@@ -1,6 +1,6 @@
 {
   "name": "@scalprum/react-core",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "React binding for @scalprum/core package.",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
@@ -26,8 +26,8 @@
     "@types/react-router-dom": "^5.3.1"
   },
   "dependencies": {
-    "@openshift/dynamic-plugin-sdk": "^3.0.0",
-    "@scalprum/core": "^0.5.2",
+    "@openshift/dynamic-plugin-sdk": "^4.0.0",
+    "@scalprum/core": "^0.5.4",
     "lodash": "^4.17.0"
   },
   "peerDependencies": {

packages/react-core/package.json

@@ -19,7 +19,7 @@ describe('<ScalprumComponent />', () => {
     name: 'testApp',
     registrationMethod: 'custom',
     version: '1.0.0',
-    baseURL: '/',
+    baseURL: 'http://foobar/',
   };
   const mockInitScalprumConfig: AppsConfig = {
     appOne: {
@@ -275,7 +275,7 @@ describe('<ScalprumComponent />', () => {
     };
     ScalprumCore.initialize({ appsConfig: mockInitScalprumConfig });
     ScalprumCore.getScalprum().exposedModules[`cachedScope#./test`] = cachedModule;
-    await ScalprumCore.getScalprum().pluginStore.loadPlugin('http://foobar', testManifest);
+    await ScalprumCore.getScalprum().pluginStore.loadPlugin(testManifest);
 
     const props: ScalprumComponentProps = {
       scope: 'cachedScope',

packages/react-core/src/scalprum-component.test.tsx

@@ -36,6 +36,16 @@ const config: AppsConfig<{ assetsHost?: string }> = {
 const Entry = () => {
   return (
     <ScalprumProvider
+      pluginSDKOptions={{
+        pluginLoaderOptions: {
+          postProcessManifest(manifest) {
+            return {
+              ...manifest,
+              loadScripts: manifest.loadScripts.map((script) => `${manifest.baseURL}/${script}`),
+            };
+          },
+        },
+      }}
       api={{
         chrome: {
           foo: 'bar',