chore(logo): Fixing packages, distributing from dist folder (#2386)

src/implementations/twig/components/footer-core/footer-core.story.js

@@ -5,9 +5,9 @@ import getSystem from '@ecl/builder/utils/getSystem';
 
 import specsEc from '@ecl/specs-component-footer-core/demo/data--ec';
 import specsEu from '@ecl/specs-component-footer-core/demo/data--eu';
-import logoEc from '@ecl/resources-ec-logo/negative/logo-ec--en.svg';
-import logoEuMobile from '@ecl/resources-eu-logo/condensed-version/positive/logo-eu--en.svg';
-import logoEuDesktop from '@ecl/resources-eu-logo/standard-version/positive/logo-eu--en.svg';
+import logoEc from '@ecl/resources-ec-logo/dist/negative/logo-ec--en.svg';
+import logoEuMobile from '@ecl/resources-eu-logo/dist/condensed-version/positive/logo-eu--en.svg';
+import logoEuDesktop from '@ecl/resources-eu-logo/dist/standard-version/positive/logo-eu--en.svg';
 import footer from './footer-core.html.twig';
 import notes from './README.md';
 

src/implementations/twig/components/footer-harmonised/ec-footer-harmonised.story.js

@@ -2,8 +2,8 @@ import { withNotes } from '@ecl/storybook-addon-notes';
 import withCode from '@ecl/storybook-addon-code';
 import { correctSvgPath } from '@ecl/story-utils';
 
-import logoEcG1 from '@ecl/resources-ec-logo/negative/logo-ec--en.svg';
-import logoEc from '@ecl/resources-ec-logo/positive/logo-ec--en.svg';
+import logoEcG1 from '@ecl/resources-ec-logo/dist/negative/logo-ec--en.svg';
+import logoEc from '@ecl/resources-ec-logo/dist/positive/logo-ec--en.svg';
 import dataGroup1 from '@ecl/specs-component-footer-harmonised/demo/data--group1';
 import dataGroup2 from '@ecl/specs-component-footer-harmonised/demo/data--group2';
 import dataGroup3 from '@ecl/specs-component-footer-harmonised/demo/data--group3';

src/implementations/twig/components/footer-harmonised/eu-footer-harmonised.story.js

@@ -3,8 +3,8 @@ import withCode from '@ecl/storybook-addon-code';
 import { correctSvgPath } from '@ecl/story-utils';
 
 import specsEu from '@ecl/specs-component-footer-standardised/demo/data--eu';
-import logoEuMobile from '@ecl/resources-eu-logo/condensed-version/positive/logo-eu--en.svg';
-import logoEuDesktop from '@ecl/resources-eu-logo/standard-version/positive/logo-eu--en.svg';
+import logoEuMobile from '@ecl/resources-eu-logo/dist/condensed-version/positive/logo-eu--en.svg';
+import logoEuDesktop from '@ecl/resources-eu-logo/dist/standard-version/positive/logo-eu--en.svg';
 import footer from '@ecl/twig-component-footer-standardised/footer-standardised.html.twig';
 import notes from './README-EU.md';
 

src/implementations/twig/components/footer-standardised/ec-footer-standardised.story.js

@@ -5,9 +5,9 @@ import getSystem from '@ecl/builder/utils/getSystem';
 
 import specsEc from '@ecl/specs-component-footer-standardised/demo/data--ec';
 import specsEu from '@ecl/specs-component-footer-standardised/demo/data--eu';
-import logoEc from '@ecl/resources-ec-logo/negative/logo-ec--en.svg';
-import logoEuMobile from '@ecl/resources-eu-logo/condensed-version/positive/logo-eu--en.svg';
-import logoEuDesktop from '@ecl/resources-eu-logo/standard-version/positive/logo-eu--en.svg';
+import logoEc from '@ecl/resources-ec-logo/dist/negative/logo-ec--en.svg';
+import logoEuMobile from '@ecl/resources-eu-logo/dist/condensed-version/positive/logo-eu--en.svg';
+import logoEuDesktop from '@ecl/resources-eu-logo/dist/standard-version/positive/logo-eu--en.svg';
 import footer from './footer-standardised.html.twig';
 import notes from './README.md';
 

src/implementations/twig/components/language-list/language-list.story.js

@@ -3,8 +3,8 @@ import withCode from '@ecl/storybook-addon-code';
 import { correctSvgPath } from '@ecl/story-utils';
 import getSystem from '@ecl/builder/utils/getSystem';
 
-import logoPathEC from '@ecl/resources-ec-logo/logo-ec--mute.svg';
-import logoPathEU from '@ecl/resources-eu-logo/logo-eu--mute.svg';
+import logoPathEC from '@ecl/resources-ec-logo/dist/logo-ec--mute.svg';
+import logoPathEU from '@ecl/resources-eu-logo/dist/logo-eu--mute.svg';
 import dataSplash from '@ecl/specs-component-language-list/demo/data--splash';
 import dataOverlay from '@ecl/specs-component-language-list/demo/data--overlay';
 import languageList from './language-list.html.twig';

src/implementations/twig/components/site-footer/ec-site-footer.story.js

@@ -5,7 +5,7 @@ import { correctSvgPath } from '@ecl/story-utils';
 import dataCore from '@ecl/specs-component-site-footer/demo/data-core--ec';
 import dataStandardised from '@ecl/specs-component-site-footer/demo/data-standardised--ec';
 import dataHarmonised from '@ecl/specs-component-site-footer/demo/data-harmonised--ec';
-import logoEc from '@ecl/resources-ec-logo/negative/logo-ec--en.svg';
+import logoEc from '@ecl/resources-ec-logo/dist/negative/logo-ec--en.svg';
 import footer from './site-footer.html.twig';
 import notes from './README.md';
 

src/implementations/twig/components/site-footer/eu-site-footer.story.js

@@ -4,8 +4,8 @@ import { correctSvgPath } from '@ecl/story-utils';
 
 import dataCore from '@ecl/specs-component-site-footer/demo/data-core--eu';
 import dataHarmonised from '@ecl/specs-component-site-footer/demo/data-harmonised--eu';
-import logoEuMobile from '@ecl/resources-eu-logo/condensed-version/positive/logo-eu--en.svg';
-import logoEuDesktop from '@ecl/resources-eu-logo/standard-version/positive/logo-eu--en.svg';
+import logoEuMobile from '@ecl/resources-eu-logo/dist/condensed-version/positive/logo-eu--en.svg';
+import logoEuDesktop from '@ecl/resources-eu-logo/dist/standard-version/positive/logo-eu--en.svg';
 import footer from './site-footer.html.twig';
 import notes from './README.md';
 

src/implementations/twig/components/site-header-core/site-header-core.story.js

@@ -3,12 +3,12 @@ import { correctSvgPath } from '@ecl/story-utils';
 import getSystem from '@ecl/builder/utils/getSystem';
 import withCode from '@ecl/storybook-addon-code';
 
-import englishBanner from '@ecl/resources-ec-logo/positive/logo-ec--en.svg';
-import frenchBanner from '@ecl/resources-ec-logo/positive/logo-ec--fr.svg';
-import euEnglishBanner from '@ecl/resources-eu-logo/standard-version/positive/logo-eu--en.svg';
-import euFrenchBanner from '@ecl/resources-eu-logo/standard-version/positive/logo-eu--fr.svg';
-import euFrenchMobileBanner from '@ecl/resources-eu-logo/condensed-version/positive/logo-eu--fr.svg';
-import euEnglishMobileBanner from '@ecl/resources-eu-logo/condensed-version/positive/logo-eu--en.svg';
+import englishBanner from '@ecl/resources-ec-logo/dist/positive/logo-ec--en.svg';
+import frenchBanner from '@ecl/resources-ec-logo/dist/positive/logo-ec--fr.svg';
+import euEnglishBanner from '@ecl/resources-eu-logo/dist/standard-version/positive/logo-eu--en.svg';
+import euFrenchBanner from '@ecl/resources-eu-logo/dist/standard-version/positive/logo-eu--fr.svg';
+import euFrenchMobileBanner from '@ecl/resources-eu-logo/dist/condensed-version/positive/logo-eu--fr.svg';
+import euEnglishMobileBanner from '@ecl/resources-eu-logo/dist/condensed-version/positive/logo-eu--en.svg';
 import englishData from '@ecl/specs-component-site-header-core/demo/data';
 import frenchData from '@ecl/specs-component-site-header-core/demo/data--fr';
 import dataMenuEn from '@ecl/specs-component-menu/demo/data--en';

src/implementations/twig/components/site-header-harmonised/ec-site-header-harmonised.story.js

@@ -2,7 +2,7 @@ import { correctSvgPath } from '@ecl/story-utils';
 import { withNotes } from '@ecl/storybook-addon-notes';
 import withCode from '@ecl/storybook-addon-code';
 
-import logoEC from '@ecl/resources-ec-logo/positive/logo-ec--en.svg';
+import logoEC from '@ecl/resources-ec-logo/dist/positive/logo-ec--en.svg';
 import dataGroup1 from '@ecl/specs-component-site-header-harmonised/demo/data--group1';
 import dataGroup2 from '@ecl/specs-component-site-header-harmonised/demo/data--group2';
 import dataGroup3 from '@ecl/specs-component-site-header-harmonised/demo/data--group3';

src/implementations/twig/components/site-header-harmonised/eu-site-header-harmonised.story.js

@@ -2,10 +2,10 @@ import { withNotes } from '@ecl/storybook-addon-notes';
 import { correctSvgPath } from '@ecl/story-utils';
 import withCode from '@ecl/storybook-addon-code';
 
-import euEnglishBanner from '@ecl/resources-eu-logo/standard-version/positive/logo-eu--en.svg';
-import euFrenchBanner from '@ecl/resources-eu-logo/standard-version/positive/logo-eu--fr.svg';
-import euFrenchMobileBanner from '@ecl/resources-eu-logo/condensed-version/positive/logo-eu--fr.svg';
-import euEnglishMobileBanner from '@ecl/resources-eu-logo/condensed-version/positive/logo-eu--en.svg';
+import euEnglishBanner from '@ecl/resources-eu-logo/dist/standard-version/positive/logo-eu--en.svg';
+import euFrenchBanner from '@ecl/resources-eu-logo/dist/standard-version/positive/logo-eu--fr.svg';
+import euFrenchMobileBanner from '@ecl/resources-eu-logo/dist/condensed-version/positive/logo-eu--fr.svg';
+import euEnglishMobileBanner from '@ecl/resources-eu-logo/dist/condensed-version/positive/logo-eu--en.svg';
 import englishData from '@ecl/specs-component-site-header-standardised/demo/data';
 import frenchData from '@ecl/specs-component-site-header-standardised/demo/data--fr';
 import dataMenuEn from '@ecl/specs-component-menu/demo/data--en';

src/implementations/twig/components/site-header-standardised/ec-site-header-standardised.story.js

@@ -2,8 +2,8 @@ import { withNotes } from '@ecl/storybook-addon-notes';
 import { correctSvgPath } from '@ecl/story-utils';
 import withCode from '@ecl/storybook-addon-code';
 
-import englishBanner from '@ecl/resources-ec-logo/positive/logo-ec--en.svg';
-import frenchBanner from '@ecl/resources-ec-logo/positive/logo-ec--fr.svg';
+import englishBanner from '@ecl/resources-ec-logo/dist/positive/logo-ec--en.svg';
+import frenchBanner from '@ecl/resources-ec-logo/dist/positive/logo-ec--fr.svg';
 import englishData from '@ecl/specs-component-site-header-standardised/demo/data';
 import frenchData from '@ecl/specs-component-site-header-standardised/demo/data--fr';
 import dataMenuEn from '@ecl/specs-component-menu/demo/data--en';

src/implementations/twig/components/site-header/ec-site-header.story.js

@@ -4,7 +4,7 @@ import withCode from '@ecl/storybook-addon-code';
 
 // Get data
 import dataFullEC from '@ecl/specs-component-site-header/demo/data--ec';
-import enLogoEC from '@ecl/resources-ec-logo/positive/logo-ec--en.svg';
+import enLogoEC from '@ecl/resources-ec-logo/dist/positive/logo-ec--en.svg';
 import enDataMenu from '@ecl/specs-component-menu/demo/data--en';
 import siteHeader from './site-header.html.twig';
 import notes from './README.md';

src/implementations/twig/components/site-header/eu-site-header.story.js

@@ -4,8 +4,8 @@ import withCode from '@ecl/storybook-addon-code';
 
 // Get data
 import dataFullEU from '@ecl/specs-component-site-header/demo/data--eu';
-import enLogoDesktopEU from '@ecl/resources-eu-logo/standard-version/positive/logo-eu--en.svg';
-import enLogoMobileEU from '@ecl/resources-eu-logo/condensed-version/positive/logo-eu--en.svg';
+import enLogoDesktopEU from '@ecl/resources-eu-logo/dist/standard-version/positive/logo-eu--en.svg';
+import enLogoMobileEU from '@ecl/resources-eu-logo/dist/condensed-version/positive/logo-eu--en.svg';
 import enDataMenu from '@ecl/specs-component-menu/demo/data--en';
 import siteHeader from './site-header.html.twig';
 import notes from './README.md';

src/presets/ec/ecl-builder.config.js

@@ -76,7 +76,7 @@ module.exports = {
       to: path.resolve(outputFolder, 'images/social-icons'),
     },
     {
-      from: path.resolve(nodeModules, '@ecl/resources-ec-logo'),
+      from: path.resolve(nodeModules, '@ecl/resources-ec-logo/dist'),
       to: path.resolve(outputFolder, 'images/logo'),
     },
   ],

src/presets/eu/ecl-builder.config.js

@@ -76,7 +76,7 @@ module.exports = {
       to: path.resolve(outputFolder, 'images/social-icons'),
     },
     {
-      from: path.resolve(nodeModules, '@ecl/resources-eu-logo'),
+      from: path.resolve(nodeModules, '@ecl/resources-eu-logo/dist'),
       to: path.resolve(outputFolder, 'images/logo'),
     },
   ],

src/resources/logo-ec/.npmignore

@@ -0,0 +1 @@
+src

src/resources/logo-ec/package.json

@@ -7,6 +7,16 @@
   "publishConfig": {
     "access": "public"
   },
+  "scripts" :{
+    "build:clean": "rimraf dist",
+    "build:copy": "ncp src dist",
+    "prepublish": "run-s build:*"
+  },
+  "dependencies": {
+    "rimraf": "3.0.2",
+    "ncp": "2.0.0",
+    "npm-run-all": "4.1.5"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ec-europa/europa-component-library.git"

src/resources/logo-eu/.npmignore

@@ -0,0 +1 @@
+src

src/resources/logo-eu/package.json

@@ -7,6 +7,16 @@
   "publishConfig": {
     "access": "public"
   },
+  "scripts" :{
+    "build:clean": "rimraf dist",
+    "build:copy": "ncp src dist",
+    "prepublish": "run-s build:*"
+  },
+  "dependencies": {
+    "rimraf": "3.0.2",
+    "ncp": "2.0.0",
+    "npm-run-all": "4.1.5"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ec-europa/europa-component-library.git"