cloudcommerce 0.0.70 → 0.0.73

package/packages/storefront/storefront.config.mjs

@@ -1,5 +1,5 @@
 import { fileURLToPath } from 'url';
-import { readFileSync } from 'fs';
+import fs from 'fs';
 import { resolve as resolvePath } from 'path';
 import config from '@cloudcommerce/config';
 
@@ -9,8 +9,6 @@ export default () => {
     VITE_ECOM_STORE_ID,
   } = import.meta.env || process.env;
 
-  const { storeId, lang } = config.get();
-
   let baseDir;
   if (STOREFRONT_BASE_DIR) {
     const currentDir = fileURLToPath(new URL('.', import.meta.url));
@@ -23,9 +21,24 @@ export default () => {
     config.set({ storeId: Number(VITE_ECOM_STORE_ID) });
   }
 
-  const settings = JSON.parse(
-    readFileSync(resolvePath(dirContent, 'settings.json'), 'utf8'),
-  );
+  const {
+    storeId,
+    lang,
+    countryCode,
+    currency,
+    currencySymbol,
+  } = config.get();
+
+  const cms = (filename) => {
+    if (filename.endsWith('/')) {
+      const dirColl = resolvePath(dirContent, filename);
+      return fs.readdirSync(dirColl).map((_filename) => _filename.replace('.json', ''));
+    }
+    const filepath = resolvePath(dirContent, `${filename}.json`);
+    return JSON.parse(fs.readFileSync(filepath, 'utf8'));
+  };
+
+  const settings = cms('settings');
   const { domain } = settings;
   const primaryColor = settings.primary_color || '#20c997';
   const secondaryColor = settings.secondary_color || '#343a40';
@@ -33,9 +46,13 @@ export default () => {
   return {
     storeId,
     lang,
+    countryCode,
+    currency,
+    currencySymbol,
     domain,
     primaryColor,
     secondaryColor,
     settings,
+    cms,
   };
 };

package/packages/storefront/tsconfig.json

@@ -1,3 +1,6 @@
 {
-  "extends": "astro/tsconfigs/base"
+  "extends": "astro/tsconfigs/base",
+  "compilerOptions": {
+    "jsx": "preserve"
+  }
 }

package/packages/types/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/types",
   "type": "module",
-  "version": "0.0.70",
+  "version": "0.0.73",
   "description": "E-Com Plus Cloud Commerce reusable type definitions",
   "main": "index.ts",
   "repository": {

package/turbo.json

@@ -12,12 +12,6 @@
     },
     "test": {
       "outputs": []
-    },
-    "prerelease": {
-      "outputs": []
-    },
-    "postrelease": {
-      "outputs": []
     }
   },
   "globalDependencies": [

package/packages/storefront/src/types.ts

@@ -1,18 +0,0 @@
-import type { BaseConfig } from '@cloudcommerce/config';
-import settings from '../content/settings.json';
-
-type CmsSettings = typeof settings;
-
-type StorefrontConfig = {
-  storeId: BaseConfig['storeId'],
-  lang: BaseConfig['lang'],
-  domain: CmsSettings['domain'],
-  primaryColor: CmsSettings['primary_color'],
-  secondaryColor: CmsSettings['secondary_color'],
-  settings: CmsSettings,
-};
-
-export type {
-  StorefrontConfig,
-  CmsSettings,
-};