Manager part

ec-europa · Jan 27, 2020 · c473639 · c473639
1 parent 505673c
commit c473639
Show file tree

Hide file tree

Showing 9 changed files with 52 additions and 20 deletions.
diff --git a/src/systems/ec/implementations/react/components/card/stories/Index.jsx b/src/systems/ec/implementations/react/components/card/stories/Index.jsx
@@ -6,7 +6,7 @@ import { withKnobs, text, array } from '@storybook/addon-knobs';
 import demoContentCard from '@ecl/ec-specs-card/demo/data--card';
 import demoContentTile from '@ecl/ec-specs-card/demo/data--tile';
 
-import { Template } from './Template';
+import { Template as template } from './Template';
 
 import Card from '../src/Card';
 
@@ -97,4 +97,4 @@ storiesOf('Components|Card', module)
 
     return <Card title={title} description={description} links={links} />;
   })
-  .add('template', Template);
+  .add('template', template);
diff --git a/src/systems/ec/implementations/react/storybook/.storybook/main.js b/src/systems/ec/implementations/react/storybook/.storybook/main.js
@@ -15,7 +15,22 @@ const addons = [
   '@storybook/addon-viewport',
   '@storybook/addon-a11y',
   '@storybook/addon-cssresources',
-  // '../../../../../../tools/storybook-addon-code/register.jsx',
 ];
 
-module.exports = { stories, addons };
+const managerEntries = [
+  '../../../../../../src/tools/storybook-addon-code/register',
+];
+
+const managerWebpack = async baseConfig => {
+  // Babel loader: include "src"
+  baseConfig.module.rules[0].include.push(
+    path.resolve(__dirname, '../../../../../..')
+  );
+
+  // Exclude node_modules
+  baseConfig.module.rules[0].exclude = /node_modules/;
+
+  return baseConfig;
+};
+
+module.exports = { stories, addons, managerEntries, managerWebpack };
diff --git a/src/systems/ec/implementations/react/storybook/.storybook/preview.js b/src/systems/ec/implementations/react/storybook/.storybook/preview.js
@@ -2,11 +2,11 @@ import { addDecorator, addParameters } from '@storybook/react';
 import { withA11y } from '@storybook/addon-a11y';
 import { INITIAL_VIEWPORTS } from '@storybook/addon-viewport';
 import { withCssResources } from '@storybook/addon-cssresources';
-// import { withCode } from '../../../../../../tools/storybook-addon-code';
+import { withCode } from '../../../../../../tools/storybook-addon-code';
 
 import './ECL';
 
-// addDecorator(withCode);
+addDecorator(withCode);
 addDecorator(withA11y);
 addDecorator(withCssResources);
 

diff --git a/src/systems/eu/implementations/react/components/card/stories/Index.jsx b/src/systems/eu/implementations/react/components/card/stories/Index.jsx
@@ -6,7 +6,7 @@ import { withKnobs, text, array } from '@storybook/addon-knobs';
 import demoContentCard from '@ecl/eu-specs-card/demo/data--card';
 import demoContentTile from '@ecl/eu-specs-card/demo/data--tile';
 
-import template from './Template';
+import { Template as template } from './Template';
 
 import Card from '../src/Card';
 

diff --git a/src/systems/eu/implementations/react/components/card/stories/Template.jsx b/src/systems/eu/implementations/react/components/card/stories/Template.jsx
@@ -6,7 +6,9 @@ import demoContentTile from '@ecl/eu-specs-card/demo/data--tile';
 
 import Card from '../src/Card';
 
-const Template = () => {
+// Storybook issues with modules' resolutions https://github.com/storybookjs/storybook/issues/9621
+/* eslint-disable-next-line import/prefer-default-export */
+export const Template = () => {
   const image1 = {
     alt: demoContentCard.image.alt,
     src: demoContentCard.image.src,
@@ -97,5 +99,3 @@ const Template = () => {
     </div>
   );
 };
-
-export default Template;
diff --git a/src/systems/eu/implementations/react/storybook/.storybook/main.js b/src/systems/eu/implementations/react/storybook/.storybook/main.js
@@ -1,3 +1,5 @@
+const path = require('path');
+
 const stories = [
   '../../templates/**/*/stories/*.jsx',
   '../../page-structure/**/*/stories/*.jsx',
@@ -12,7 +14,22 @@ const addons = [
   '@storybook/addon-viewport',
   '@storybook/addon-a11y',
   '@storybook/addon-cssresources',
-  // '../../../../../../tools/storybook-addon-code/register.jsx',
 ];
 
-module.exports = { stories, addons };
+const managerEntries = [
+  '../../../../../../src/tools/storybook-addon-code/register',
+];
+
+const managerWebpack = async baseConfig => {
+  // Babel loader: include "src"
+  baseConfig.module.rules[0].include.push(
+    path.resolve(__dirname, '../../../../../..')
+  );
+
+  // Exclude node_modules
+  baseConfig.module.rules[0].exclude = /node_modules/;
+
+  return baseConfig;
+};
+
+module.exports = { stories, addons, managerEntries, managerWebpack };
diff --git a/src/systems/eu/implementations/react/storybook/.storybook/manager.js b/src/systems/eu/implementations/react/storybook/.storybook/manager.js
@@ -6,7 +6,7 @@ const theme = create({
   colorSecondary: '#004494',
   appBorderRadius: 0,
   inputBorderRadius: 0,
-  brandTitle: 'ECL v2 - EC',
+  brandTitle: 'ECL v2 - EU',
   brandUrl: 'https://github.com/ec-europa/europa-component-library',
   brandImage: null,
 });

diff --git a/src/systems/eu/implementations/react/storybook/.storybook/preview-head.html b/src/systems/eu/implementations/react/storybook/.storybook/preview-head.html
@@ -31,14 +31,14 @@
     // Manually inject styles
     var head = document.head || document.getElementsByTagName('head')[0];
     head.appendChild(
-      createLink('./styles/ecl-ec-preset-legacy-website.css', 'screen')
+      createLink('./styles/ecl-eu-preset-legacy-website.css', 'screen')
     );
     head.appendChild(
-      createLink('./styles/ecl-ec-preset-legacy-website-print.css', 'print')
+      createLink('./styles/ecl-eu-preset-legacy-website-print.css', 'print')
     );
   }
 </script>
 <script
   type="text/javascript"
-  src="./scripts/ecl-ec-preset-legacy-website.js"
+  src="./scripts/ecl-eu-preset-legacy-website.js"
 ></script>
diff --git a/src/systems/eu/implementations/react/storybook/.storybook/preview.js b/src/systems/eu/implementations/react/storybook/.storybook/preview.js
@@ -2,11 +2,11 @@ import { addDecorator, addParameters } from '@storybook/react';
 import { withA11y } from '@storybook/addon-a11y';
 import { INITIAL_VIEWPORTS } from '@storybook/addon-viewport';
 import { withCssResources } from '@storybook/addon-cssresources';
-// import { withCode } from '../../../../../../tools/storybook-addon-code';
+import { withCode } from '../../../../../../tools/storybook-addon-code';
 
 import './ECL';
 
-// addDecorator(withCode);
+addDecorator(withCode);
 addDecorator(withA11y);
 addDecorator(withCssResources);
 
@@ -21,12 +21,12 @@ addParameters({
   cssresources: [
     {
       id: 'ecl-screen',
-      code: `<link rel="stylesheet" type="text/css" href="./styles/ecl-ec-preset-website.css" />`,
+      code: `<link rel="stylesheet" type="text/css" href="./styles/ecl-eu-preset-website.css" />`,
       picked: true,
     },
     {
       id: 'ecl-print',
-      code: `<link rel="stylesheet" type="text/css" href="./styles/ecl-ec-preset-website-print.css" />`,
+      code: `<link rel="stylesheet" type="text/css" href="./styles/ecl-eu-preset-website-print.css" />`,
       picked: false,
     },
     {