@kausal/themes 0.8.0 → 0.8.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kausal/themes",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "description": "Themes for Kausal products",
   "type": "module",
   "main": "setup.cjs",

package/props.js

@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
 
-const { number, exact, string, oneOfType, bool, array, object, arrayOf } =
+const { number, exact, string, oneOfType, bool, array, object, oneOf, objectOf, arrayOf } =
   PropTypes;
 
 export function makeThemePropType(cssv = null) {
@@ -110,8 +110,8 @@ export function makeThemePropType(cssv = null) {
     }).isRequired,
     headingsColor: cssv('color'),
     headingsFontWeight: cssv('font-weight').isRequired,
-    iconActionsUrl: string.isRequired,
-    iconIndicatorsUrl: string.isRequired,
+    iconActionsUrl: cssv('path').allowEmpty,
+    iconIndicatorsUrl: cssv('path').allowEmpty,
     imageOverlay: string.isRequired,
     inputBg: string.isRequired,
     inputBorderRadius: string.isRequired,
@@ -151,8 +151,8 @@ export function makeThemePropType(cssv = null) {
       light: string.isRequired,
       white: string.isRequired,
     }).isRequired,
-    themeLogoUrl: string.isRequired,
-    themeLogoWhiteUrl: string.isRequired,
+    themeLogoUrl: cssv('hashedFile').isRequired,
+    themeLogoWhiteUrl: cssv('hashedFile').isRequired,
     phaseTimelineColor: string.isRequired,
     textColor: exact({
       primary: cssv('color').isRequired,
@@ -192,9 +192,19 @@ export function makeThemePropType(cssv = null) {
         categoryPageHideCategoryLabel: bool,
       }),
       hiddenLocales: arrayOf(string),
-      fundingInstruments: array.isRequired,
+      fundingInstruments: arrayOf(exact({
+        id: string,
+        name: string,
+        logo: string,
+        link: string,
+      })).isRequired,
       leftAlignCategoryPages: bool,
-      otherLogos: array.isRequired,
+      otherLogos: arrayOf(exact({
+        id: string,
+        name: string,
+        logo: string,
+        link: string,
+      })).isRequired,
       attentionBannerContent: object,
       footerLogoOnly: bool,
       footerStatement: string,
@@ -225,13 +235,13 @@ export function makeThemePropType(cssv = null) {
       showActionDescriptionHeader: bool,
       showFeedbackLink: bool,
     }),
-    icons: object.isRequired,
+    icons: objectOf(cssv('hashedFile')).isRequired,
     favicons: exact({
-      apple: string,
-      ico: string,
-      svg: string,
+      apple: cssv('hashedFile').isRequired,
+      ico: cssv('hashedFile').isRequired,
+      svg: cssv('hashedFile').isRequired,
     }),
-    mainCssFile: string.isRequired,
+    mainCssFile: cssv('hashedFile').isRequired,
   };
   return exact(props);
 }

package/setup.cjs

@@ -22,7 +22,10 @@ function generateThemeSymlinks(destPath, opts) {
   const themesPath = path.join(__dirname, 'dist', 'themes');
   const statRes = fs.lstatSync(destPath, { throwIfNoEntry: false });
   if (statRes) {
-    if (!statRes.isSymbolicLink()) {
+    if (statRes.isDirectory()) {
+      fs.rmdirSync(destPath);
+    } else if (!statRes.isSymbolicLink()) {
+      console.error(statRes);
       throw new Error(`${destPath} already exists and is not a symlink`);
     }
     const existingTarget = fs.readlinkSync(destPath);

package/types.ts

@@ -178,7 +178,10 @@ export interface Theme {
     };
     hiddenLocales?: string[];
     fundingInstruments: {
+      id: string;
+      name: string;
       logo: string;
+      link: string;
     }[];
     leftAlignCategoryPages?: boolean;
     otherLogos: {