cloudcommerce 0.6.10 → 0.6.12

package/packages/cli/lib/cli.js

@@ -52,7 +52,9 @@ export default async () => {
     return $`firebase --project=${projectId} ${cmd} ${options}`;
   };
   if (argv._.includes('serve')) {
-    await build();
+    if (argv.build !== false) {
+      await build(argv.codebase);
+    }
     return $firebase('emulators:start').catch(async (err) => {
       await echo`
 Try killing open emulators with: 
@@ -71,7 +73,7 @@ ${chalk.bold('npx kill-port 4000 9099 5001 8080 5000 8085 9199 4400 4500')}
     return $firebase('functions:log');
   }
   if (argv._.includes('build')) {
-    return build();
+    return build(argv.codebase);
   }
   if (argv._.includes('deploy')) {
     return $firebase('deploy');
@@ -91,7 +93,7 @@ ECOM_STORE_ID=${storeId}
     }
     if (argv.commit !== false) {
       await fs.writeFile(path.join(pwd, 'functions', 'config.json'), JSON.stringify({ storeId }, null, 2));
-      await build();
+      await build(argv.codebase);
       try {
         await $`git add .firebaserc functions/config.json`;
         await $`git commit -m "Setup store [skip ci]"`;

package/packages/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/cli",
   "type": "module",
-  "version": "0.6.10",
+  "version": "0.6.12",
   "description": "E-Com Plus Cloud Commerce CLI tools",
   "bin": {
     "cloudcommerce": "./bin/run.mjs"

package/packages/cli/src/build.ts

@@ -1,5 +1,5 @@
 import { join as joinPath } from 'node:path';
-import { fs } from 'zx';
+import { $, fs } from 'zx';
 
 const copyFunctionsConfig = async () => {
   const functionsDir = joinPath(process.cwd(), 'functions');
@@ -28,4 +28,14 @@ const copyFunctionsConfig = async () => {
   }
 };
 
-export default copyFunctionsConfig;
+const buildCodebase = async (codebase?: string) => {
+  copyFunctionsConfig();
+  if (codebase === 'ssr') {
+    await $`npm --prefix "functions/ssr" run build 2>ssr-build-warns.log &&
+      printf '\n--- // ---\n' && cat ssr-build-warns.log`;
+  }
+};
+
+export default buildCodebase;
+
+export { buildCodebase, copyFunctionsConfig };

package/packages/cli/src/cli.ts

@@ -67,7 +67,9 @@ export default async () => {
   };
 
   if (argv._.includes('serve')) {
-    await build();
+    if (argv.build !== false) {
+      await build(argv.codebase);
+    }
     return $firebase('emulators:start').catch(async (err: any) => {
       await echo`
 Try killing open emulators with: 
@@ -87,7 +89,7 @@ ${chalk.bold('npx kill-port 4000 9099 5001 8080 5000 8085 9199 4400 4500')}
     return $firebase('functions:log');
   }
   if (argv._.includes('build')) {
-    return build();
+    return build(argv.codebase);
   }
   if (argv._.includes('deploy')) {
     return $firebase('deploy');
@@ -116,7 +118,7 @@ ECOM_STORE_ID=${storeId}
         JSON.stringify({ storeId }, null, 2),
       );
 
-      await build();
+      await build(argv.codebase);
       try {
         await $`git add .firebaserc functions/config.json`;
         await $`git commit -m "Setup store [skip ci]"`;

package/packages/config/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/config",
   "type": "module",
-  "version": "0.6.10",
+  "version": "0.6.12",
   "description": "E-Com Plus Cloud Commerce base config",
   "main": "lib/config.js",
   "exports": {

package/packages/emails/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/emails",
   "type": "module",
-  "version": "0.6.10",
+  "version": "0.6.12",
   "description": "E-Com Plus Cloud Commerce",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/packages/events/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/events",
   "type": "module",
-  "version": "0.6.10",
+  "version": "0.6.12",
   "description": "E-Com Plus Cloud Commerce app events",
   "main": "lib/index.js",
   "exports": {

package/packages/firebase/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/firebase",
   "type": "module",
-  "version": "0.6.10",
+  "version": "0.6.12",
   "description": "E-Com Plus Cloud Commerce on Firebase",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/packages/i18n/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/i18n",
   "type": "module",
-  "version": "0.6.10",
+  "version": "0.6.12",
   "description": "E-Com Plus Cloud Commerce i18n",
   "main": "lib/all.js",
   "exports": {

package/packages/modules/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/modules",
   "type": "module",
-  "version": "0.6.10",
+  "version": "0.6.12",
   "description": "E-Com Plus Cloud Commerce modules API",
   "main": "lib/index.cjs",
   "exports": {

package/packages/passport/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/passport",
   "type": "module",
-  "version": "0.6.10",
+  "version": "0.6.12",
   "description": "E-Com Plus Cloud Commerce customers authentication (passport) API",
   "main": "lib/index.js",
   "exports": {

package/packages/ssr/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/ssr",
   "type": "module",
-  "version": "0.6.10",
+  "version": "0.6.12",
   "description": "E-Com Plus Cloud Commerce storefront SSR",
   "main": "lib/index.js",
   "exports": {
@@ -30,13 +30,12 @@
     "@cloudcommerce/i18n": "workspace:*",
     "@ecomplus/utils": "1.5.0-rc.3",
     "@headlessui/vue": "^1.7.11",
-    "@vueuse/core": "^9.12.0",
+    "@vueuse/core": "9.12.0",
     "astro": "^2.0.16",
     "firebase-admin": "^11.5.0",
     "firebase-functions": "^4.2.1",
     "image-size": "^1.0.2",
     "semver": "^7.3.8",
-    "sharp": "^0.31.3",
     "vue": "^3.2.47"
   },
   "devDependencies": {

package/packages/storefront/astro.config.mjs

@@ -82,7 +82,7 @@ const _vitePWAOptions = {
       urlPattern: /^\/_image$/,
       handler: 'StaleWhileRevalidate',
       options: {
-        cacheName: 'sharp-images',
+        cacheName: 'optim-images',
         expiration: {
           maxEntries: 50,
           maxAgeSeconds: 60 * 60 * 24 * 30, // 30 days
@@ -146,9 +146,7 @@ const genAstroConfig = ({
   }),
   outDir: isSSG ? './dist/client' : './dist',
   integrations: [
-    image({
-      serviceEntryPoint: '@astrojs/image/sharp',
-    }),
+    image(),
     vue({
       appEntrypoint: '/src/pages/_vue',
       template: {

package/packages/storefront/dist/client/sw.js

@@ -1 +1 @@
-if(!self.define){let e,s={};const r=(r,n)=>(r=new URL(r+".js",n).href,s[r]||new Promise((s=>{if("document"in self){const e=document.createElement("script");e.src=r,e.onload=s,document.head.appendChild(e)}else e=r,importScripts(r),s()})).then((()=>{let e=s[r];if(!e)throw new Error(`Module ${r} didn’t register its module`);return e})));self.define=(n,i)=>{const o=e||("document"in self?document.currentScript.src:"")||location.href;if(s[o])return;let l={};const a=e=>r(e,o),u={module:{uri:o},exports:l,require:a};s[o]=Promise.all(n.map((e=>u[e]||a(e)))).then((e=>(i(...e),l)))}}define(["./workbox-e0d788d4"],(function(e){"use strict";self.skipWaiting(),e.clientsClaim(),e.precacheAndRoute([{url:"_astro/_...slug_.0607a6ef.css",revision:null},{url:"_astro/_plugin-vue_export-helper.77ed7c18.js",revision:null},{url:"_astro/client.0de2f274.js",revision:null},{url:"_astro/firebase-app.7ce2ebb1.js",revision:null},{url:"_astro/format-money.ab6b71eb.js",revision:null},{url:"_astro/hoisted.721ad75d.js",revision:null},{url:"_astro/idle-callback.889bf0ea.js",revision:null},{url:"_astro/index.0c833781.css",revision:null},{url:"_astro/index.16f33784.js",revision:null},{url:"_astro/modules-info.06ac0727.js",revision:null},{url:"_astro/PitchBar.db7cd775.js",revision:null},{url:"_astro/preload-helper.101896b7.js",revision:null},{url:"_astro/Prices.55399c72.js",revision:null},{url:"_astro/ProductCard.7e891c08.js",revision:null},{url:"_astro/runtime-dom.esm-bundler.d2f39f33.js",revision:null},{url:"_astro/server.1bc2fa51.css",revision:null},{url:"_astro/session-utm.72684b84.js",revision:null},{url:"_astro/ShopHeader.301e109b.js",revision:null},{url:"_astro/workbox-window.prod.es5.295a6886.js",revision:null},{url:"img/uploads/large-icon.png",revision:"0b35db516cfa7475b1c2f8c081e8d54d"},{url:"manifest.webmanifest",revision:"6a858866b0560997f368e27ab5418e15"}],{ignoreURLParametersMatching:[/.*/]}),e.cleanupOutdatedCaches(),e.registerRoute(new e.NavigationRoute(e.createHandlerBoundToURL("/404"))),e.registerRoute(/^\/$/,new e.NetworkFirst,"GET"),e.registerRoute(/\/((?!(?:admin|assets|img)(\/|$))[^.]+)(\.(?!js|css|xml|txt|png|jpg|jpeg|webp|avif|svg|gif)[^.]+)*$/,new e.NetworkFirst({cacheName:"pages",plugins:[new e.ExpirationPlugin({maxEntries:50,purgeOnQuotaError:!0})]}),"GET"),e.registerRoute(/^\/assets\//,new e.StaleWhileRevalidate({cacheName:"assets",plugins:[]}),"GET"),e.registerRoute(/^\/_image$/,new e.StaleWhileRevalidate({cacheName:"sharp-images",plugins:[new e.ExpirationPlugin({maxEntries:50,maxAgeSeconds:2592e3,purgeOnQuotaError:!0})]}),"GET"),e.registerRoute(/^\/img\/uploads\/.*\.(?:png|jpg|jpeg|webp|avif|svg|gif)$/,new e.StaleWhileRevalidate({cacheName:"cms-images",plugins:[new e.ExpirationPlugin({maxEntries:20,maxAgeSeconds:2592e3,purgeOnQuotaError:!0})]}),"GET"),e.registerRoute(/^https:\/\/ecomplus\.io/,new e.NetworkFirst({cacheName:"store-api",plugins:[new e.ExpirationPlugin({maxEntries:50,purgeOnQuotaError:!0})]}),"GET"),e.registerRoute(/^https:\/\/(((\w+\.)?ecoms\d)|(ecom[\w-]+(\.\w+)*\.digitaloceanspaces))\.com.*\/imgs\/normal\//,new e.CacheFirst({cacheName:"product-thumbnails",plugins:[new e.ExpirationPlugin({maxEntries:100,maxAgeSeconds:2592e3,purgeOnQuotaError:!0})]}),"GET"),e.registerRoute(/^https:\/\/(((\w+\.)?ecoms\d)|(ecom[\w-]+(\.\w+)*\.digitaloceanspaces))\.com.*\/imgs\/big\//,new e.CacheFirst({cacheName:"product-pictures",plugins:[new e.ExpirationPlugin({maxEntries:10,maxAgeSeconds:604800,purgeOnQuotaError:!0})]}),"GET")}));
+if(!self.define){let e,s={};const r=(r,n)=>(r=new URL(r+".js",n).href,s[r]||new Promise((s=>{if("document"in self){const e=document.createElement("script");e.src=r,e.onload=s,document.head.appendChild(e)}else e=r,importScripts(r),s()})).then((()=>{let e=s[r];if(!e)throw new Error(`Module ${r} didn’t register its module`);return e})));self.define=(n,i)=>{const o=e||("document"in self?document.currentScript.src:"")||location.href;if(s[o])return;let l={};const a=e=>r(e,o),t={module:{uri:o},exports:l,require:a};s[o]=Promise.all(n.map((e=>t[e]||a(e)))).then((e=>(i(...e),l)))}}define(["./workbox-e0d788d4"],(function(e){"use strict";self.skipWaiting(),e.clientsClaim(),e.precacheAndRoute([{url:"_astro/_...slug_.0607a6ef.css",revision:null},{url:"_astro/_plugin-vue_export-helper.77ed7c18.js",revision:null},{url:"_astro/client.0de2f274.js",revision:null},{url:"_astro/firebase-app.7ce2ebb1.js",revision:null},{url:"_astro/format-money.ab6b71eb.js",revision:null},{url:"_astro/hoisted.721ad75d.js",revision:null},{url:"_astro/idle-callback.889bf0ea.js",revision:null},{url:"_astro/index.0c833781.css",revision:null},{url:"_astro/index.16f33784.js",revision:null},{url:"_astro/modules-info.06ac0727.js",revision:null},{url:"_astro/PitchBar.db7cd775.js",revision:null},{url:"_astro/preload-helper.101896b7.js",revision:null},{url:"_astro/Prices.55399c72.js",revision:null},{url:"_astro/ProductCard.7e891c08.js",revision:null},{url:"_astro/runtime-dom.esm-bundler.d2f39f33.js",revision:null},{url:"_astro/server.1bc2fa51.css",revision:null},{url:"_astro/session-utm.72684b84.js",revision:null},{url:"_astro/ShopHeader.301e109b.js",revision:null},{url:"_astro/workbox-window.prod.es5.295a6886.js",revision:null},{url:"img/uploads/large-icon.png",revision:"0b35db516cfa7475b1c2f8c081e8d54d"},{url:"manifest.webmanifest",revision:"6a858866b0560997f368e27ab5418e15"}],{ignoreURLParametersMatching:[/.*/]}),e.cleanupOutdatedCaches(),e.registerRoute(new e.NavigationRoute(e.createHandlerBoundToURL("/404"))),e.registerRoute(/^\/$/,new e.NetworkFirst,"GET"),e.registerRoute(/\/((?!(?:admin|assets|img)(\/|$))[^.]+)(\.(?!js|css|xml|txt|png|jpg|jpeg|webp|avif|svg|gif)[^.]+)*$/,new e.NetworkFirst({cacheName:"pages",plugins:[new e.ExpirationPlugin({maxEntries:50,purgeOnQuotaError:!0})]}),"GET"),e.registerRoute(/^\/assets\//,new e.StaleWhileRevalidate({cacheName:"assets",plugins:[]}),"GET"),e.registerRoute(/^\/_image$/,new e.StaleWhileRevalidate({cacheName:"optim-images",plugins:[new e.ExpirationPlugin({maxEntries:50,maxAgeSeconds:2592e3,purgeOnQuotaError:!0})]}),"GET"),e.registerRoute(/^\/img\/uploads\/.*\.(?:png|jpg|jpeg|webp|avif|svg|gif)$/,new e.StaleWhileRevalidate({cacheName:"cms-images",plugins:[new e.ExpirationPlugin({maxEntries:20,maxAgeSeconds:2592e3,purgeOnQuotaError:!0})]}),"GET"),e.registerRoute(/^https:\/\/ecomplus\.io/,new e.NetworkFirst({cacheName:"store-api",plugins:[new e.ExpirationPlugin({maxEntries:50,purgeOnQuotaError:!0})]}),"GET"),e.registerRoute(/^https:\/\/(((\w+\.)?ecoms\d)|(ecom[\w-]+(\.\w+)*\.digitaloceanspaces))\.com.*\/imgs\/normal\//,new e.CacheFirst({cacheName:"product-thumbnails",plugins:[new e.ExpirationPlugin({maxEntries:100,maxAgeSeconds:2592e3,purgeOnQuotaError:!0})]}),"GET"),e.registerRoute(/^https:\/\/(((\w+\.)?ecoms\d)|(ecom[\w-]+(\.\w+)*\.digitaloceanspaces))\.com.*\/imgs\/big\//,new e.CacheFirst({cacheName:"product-pictures",plugins:[new e.ExpirationPlugin({maxEntries:10,maxAgeSeconds:604800,purgeOnQuotaError:!0})]}),"GET")}));