Change the way we load plugins

Signed-off-by: soupette <cyril.lpz@gmail.com>

packages/strapi-admin/admin/src/app.js

@@ -57,16 +57,20 @@ const { dispatch } = store;
 const MOUNT_NODE =
   document.getElementById('app') || document.createElement('div');
 
-Object.keys(plugins).forEach(plugin => {
+Object.keys(plugins).forEach(current => {
-  const currentPlugin = plugins[plugin];
+  const registerPlugin = plugin => {
+    return plugin;
+  };
+  const currentPluginFn = plugins[current];
+  const plugin = currentPluginFn({ registerPlugin });
 
   const pluginTradsPrefixed = languages.reduce((acc, lang) => {
-    const currentLocale = currentPlugin.trads[lang];
+    const currentLocale = plugin.trads[lang];
 
     if (currentLocale) {
       const localeprefixedWithPluginId = Object.keys(currentLocale).reduce(
         (acc2, current) => {
-          acc2[`${plugins[plugin].id}.${current}`] = currentLocale[current];
+          acc2[`${plugin.id}.${current}`] = currentLocale[current];
 
           return acc2;
         },
@@ -81,7 +85,7 @@ Object.keys(plugins).forEach(plugin => {
 
   try {
     merge(translationMessages, pluginTradsPrefixed);
-    dispatch(pluginLoaded(currentPlugin));
+    dispatch(pluginLoaded(plugin));
   } catch (err) {
     console.log({ err });
   }

packages/strapi-admin/admin/src/containers/Admin/tests/index.test.js

@@ -92,8 +92,9 @@ describe('<Admin />', () => {
     it('should render the routes', () => {
       const renderedComponent = shallow(<Admin {...props} />);
       const { renderRoute } = renderedComponent.instance();
+      const Compo = () => <div>compo</div>;
 
-      expect(renderRoute()).not.toBeNull();
+      expect(renderRoute({}, Compo)).not.toBeNull();
     });
   });
 

packages/strapi-plugin-content-manager/admin/src/index.js

@@ -1,5 +1,3 @@
-import React from 'react';
-
 import pluginPkg from '../../package.json';
 import pluginId from './pluginId';
 import App from './containers/Main';
@@ -7,31 +5,29 @@ import Initializer from './containers/Initializer';
 import lifecycles from './lifecycles';
 import trads from './translations';
 
-const pluginDescription = pluginPkg.strapi.description || pluginPkg.description;
+export default strapi => {
+  const pluginDescription =
+    pluginPkg.strapi.description || pluginPkg.description;
+  const plugin = {
+    blockerComponent: null,
+    blockerComponentProps: {},
+    description: pluginDescription,
+    icon: pluginPkg.strapi.icon,
+    id: pluginId,
+    initializer: Initializer,
+    injectedComponents: [],
+    isReady: false,
+    layout: null,
+    lifecycles,
+    leftMenuLinks: [],
+    leftMenuSections: [],
+    mainComponent: App,
+    name: pluginPkg.strapi.name,
+    preventComponentRendering: false,
+    suffixUrl: () => '/ctm-configurations/models',
+    suffixUrlToReplaceForLeftMenuHighlight: '/models',
+    trads,
+  };
 
-function Comp(props) {
+  return strapi.registerPlugin(plugin);
-  return <App {...props} />;
-}
-
-const plugin = {
-  blockerComponent: null,
-  blockerComponentProps: {},
-  description: pluginDescription,
-  icon: pluginPkg.strapi.icon,
-  id: pluginId,
-  initializer: Initializer,
-  injectedComponents: [],
-  isReady: false,
-  layout: null,
-  lifecycles,
-  leftMenuLinks: [],
-  leftMenuSections: [],
-  mainComponent: Comp,
-  name: pluginPkg.strapi.name,
-  preventComponentRendering: false,
-  suffixUrl: () => '/ctm-configurations/models',
-  suffixUrlToReplaceForLeftMenuHighlight: '/models',
-  trads,
 };
-
-export default plugin;

packages/strapi-plugin-content-type-builder/admin/src/index.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import pluginPkg from '../../package.json';
 import App from './containers/App';
 import Initializer from './containers/Initializer';
@@ -8,47 +7,45 @@ import lifecycles from './lifecycles';
 import trads from './translations';
 import pluginId from './pluginId';
 
-const pluginDescription = pluginPkg.strapi.description || pluginPkg.description;
+export default strapi => {
-
+  const pluginDescription =
-function Comp(props) {
+    pluginPkg.strapi.description || pluginPkg.description;
-  return <App {...props} />;
+  const plugin = {
-}
+    blockerComponent: null,
-
+    blockerComponentProps: {},
-const plugin = {
+    description: pluginDescription,
-  blockerComponent: null,
+    icon: pluginPkg.strapi.icon,
-  blockerComponentProps: {},
+    id: pluginId,
-  description: pluginDescription,
+    initializer: Initializer,
-  icon: pluginPkg.strapi.icon,
+    injectedComponents: [
-  id: pluginId,
+      {
-  initializer: Initializer,
+        plugin: 'content-manager.editView',
-  injectedComponents: [
+        area: 'right.links',
-    {
+        component: Link,
-      plugin: 'content-manager.editView',
+        key: 'content-type-builder.link',
-      area: 'right.links',
+        props: {
-      component: Link,
+          message: {
-      key: 'content-type-builder.link',
+            id: 'content-manager.containers.Edit.Link.Fields',
-      props: {
+          },
-        message: {
+          icon: 'fa-cog',
-          id: 'content-manager.containers.Edit.Link.Fields',
         },
-        icon: 'fa-cog',
       },
-    },
+      {
-    {
+        plugin: 'content-manager.editSettingsView',
-      plugin: 'content-manager.editSettingsView',
+        area: 'left.links',
-      area: 'left.links',
+        component: Button,
-      component: Button,
+        key: 'content-type-builder.form',
-      key: 'content-type-builder.form',
+      },
-    },
+    ],
-  ],
+    layout: null,
-  layout: null,
+    lifecycles,
-  lifecycles,
+    leftMenuLinks: [],
-  leftMenuLinks: [],
+    leftMenuSections: [],
-  leftMenuSections: [],
+    mainComponent: App,
-  mainComponent: Comp,
+    name: pluginPkg.strapi.name,
-  name: pluginPkg.strapi.name,
+    preventComponentRendering: false,
-  preventComponentRendering: false,
+    trads,
-  trads,
+  };
-};
 
-export default plugin;
+  return strapi.registerPlugin(plugin);
+};

packages/strapi-plugin-documentation/admin/src/index.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import pluginPkg from '../../package.json';
 import pluginId from './pluginId';
 import App from './containers/App';
@@ -6,29 +5,27 @@ import Initializer from './containers/Initializer';
 import lifecycles from './lifecycles';
 import trads from './translations';
 
-const pluginDescription = pluginPkg.strapi.description || pluginPkg.description;
+export default strapi => {
+  const pluginDescription =
+    pluginPkg.strapi.description || pluginPkg.description;
+  const plugin = {
+    blockerComponent: null,
+    blockerComponentProps: {},
+    description: pluginDescription,
+    icon: pluginPkg.strapi.icon,
+    id: pluginId,
+    initializer: Initializer,
+    injectedComponents: [],
+    isReady: false,
+    layout: null,
+    lifecycles,
+    leftMenuLinks: [],
+    leftMenuSections: [],
+    mainComponent: App,
+    name: pluginPkg.strapi.name,
+    preventComponentRendering: false,
+    trads,
+  };
 
-function Comp(props) {
+  return strapi.registerPlugin(plugin);
-  return <App {...props} />;
-}
-
-const plugin = {
-  blockerComponent: null,
-  blockerComponentProps: {},
-  description: pluginDescription,
-  icon: pluginPkg.strapi.icon,
-  id: pluginId,
-  initializer: Initializer,
-  injectedComponents: [],
-  isReady: false,
-  layout: null,
-  lifecycles,
-  leftMenuLinks: [],
-  leftMenuSections: [],
-  mainComponent: Comp,
-  name: pluginPkg.strapi.name,
-  preventComponentRendering: false,
-  trads,
 };
-
-export default plugin;

packages/strapi-plugin-email/admin/src/index.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import pluginPkg from '../../package.json';
 import pluginId from './pluginId';
 import App from './containers/App';
@@ -6,28 +5,27 @@ import Initializer from './containers/Initializer';
 import lifecycles from './lifecycles';
 import trads from './translations';
 
-const pluginDescription = pluginPkg.strapi.description || pluginPkg.description;
+export default strapi => {
+  const pluginDescription =
+    pluginPkg.strapi.description || pluginPkg.description;
 
-function Comp(props) {
+  const plugin = {
-  return <App {...props} />;
+    blockerComponent: null,
-}
+    blockerComponentProps: {},
+    description: pluginDescription,
+    icon: pluginPkg.strapi.icon,
+    id: pluginId,
+    initializer: Initializer,
+    injectedComponents: [],
+    layout: null,
+    lifecycles,
+    leftMenuLinks: [],
+    leftMenuSections: [],
+    mainComponent: App,
+    name: pluginPkg.strapi.name,
+    preventComponentRendering: false,
+    trads,
+  };
 
-const plugin = {
+  return strapi.registerPlugin(plugin);
-  blockerComponent: null,
-  blockerComponentProps: {},
-  description: pluginDescription,
-  icon: pluginPkg.strapi.icon,
-  id: pluginId,
-  initializer: Initializer,
-  injectedComponents: [],
-  layout: null,
-  lifecycles,
-  leftMenuLinks: [],
-  leftMenuSections: [],
-  mainComponent: Comp,
-  name: pluginPkg.strapi.name,
-  preventComponentRendering: false,
-  trads,
 };
-
-export default plugin;

packages/strapi-plugin-upload/admin/src/index.js

@@ -1,34 +1,30 @@
-import React from 'react';
 import pluginPkg from '../../package.json';
 import App from './containers/App';
 import Initializer from './containers/Initializer';
-
 import lifecycles from './lifecycles';
 import trads from './translations';
 import pluginId from './pluginId';
 
-const pluginDescription = pluginPkg.strapi.description || pluginPkg.description;
+export default strapi => {
+  const pluginDescription =
+    pluginPkg.strapi.description || pluginPkg.description;
+  const plugin = {
+    blockerComponent: null,
+    blockerComponentProps: {},
+    description: pluginDescription,
+    icon: pluginPkg.strapi.icon,
+    id: pluginId,
+    initializer: Initializer,
+    injectedComponents: [],
+    layout: null,
+    lifecycles,
+    leftMenuLinks: [],
+    leftMenuSections: [],
+    mainComponent: App,
+    name: pluginPkg.strapi.name,
+    preventComponentRendering: false,
+    trads,
+  };
 
-function Comp(props) {
+  return strapi.registerPlugin(plugin);
-  return <App {...props} />;
-}
-
-const plugin = {
-  blockerComponent: null,
-  blockerComponentProps: {},
-  description: pluginDescription,
-  icon: pluginPkg.strapi.icon,
-  id: pluginId,
-  initializer: Initializer,
-  injectedComponents: [],
-  layout: null,
-  lifecycles,
-  leftMenuLinks: [],
-  leftMenuSections: [],
-  mainComponent: Comp,
-  name: pluginPkg.strapi.name,
-  preventComponentRendering: false,
-  trads,
 };
-
-export default plugin;

packages/strapi-plugin-users-permissions/admin/src/index.js

@@ -1,4 +1,3 @@
-import React from 'react';
 import pluginPkg from '../../package.json';
 import layout from '../../config/layout';
 import pluginId from './pluginId';
@@ -7,30 +6,29 @@ import Initializer from './containers/Initializer';
 import lifecycles from './lifecycles';
 import trads from './translations';
 
-const pluginDescription = pluginPkg.strapi.description || pluginPkg.description;
+export default strapi => {
+  const pluginDescription =
+    pluginPkg.strapi.description || pluginPkg.description;
 
-function Comp(props) {
+  const plugin = {
-  return <App {...props} />;
+    blockerComponent: null,
-}
+    blockerComponentProps: {},
+    description: pluginDescription,
+    icon: pluginPkg.strapi.icon,
+    id: pluginId,
+    initializer: Initializer,
+    injectedComponents: [],
+    layout,
+    lifecycles,
+    leftMenuLinks: [],
+    leftMenuSections: [],
+    mainComponent: App,
+    name: pluginPkg.strapi.name,
+    preventComponentRendering: false,
+    suffixUrl: () => '/roles',
+    suffixUrlToReplaceForLeftMenuHighlight: '/roles',
+    trads,
+  };
 
-const plugin = {
+  return strapi.registerPlugin(plugin);
-  blockerComponent: null,
-  blockerComponentProps: {},
-  description: pluginDescription,
-  icon: pluginPkg.strapi.icon,
-  id: pluginId,
-  initializer: Initializer,
-  injectedComponents: [],
-  layout,
-  lifecycles,
-  leftMenuLinks: [],
-  leftMenuSections: [],
-  mainComponent: Comp,
-  name: pluginPkg.strapi.name,
-  preventComponentRendering: false,
-  suffixUrl: () => '/roles',
-  suffixUrlToReplaceForLeftMenuHighlight: '/roles',
-  trads,
 };
-
-export default plugin;