cloudcommerce 0.7.1 → 0.8.0

package/packages/storefront/astro.config.mjs

@@ -5,8 +5,6 @@ import { defineConfig } from 'astro/config';
 import node from '@astrojs/node';
 import vue from '@astrojs/vue';
 import image from '@astrojs/image';
-// import partytown from '@astrojs/partytown';
-// import prefetch from '@astrojs/prefetch';
 import UnoCSS from 'unocss/astro';
 import AstroPWA from '@vite-pwa/astro';
 import dictionaryDir from '@cloudcommerce/i18n/lib/dirname';
@@ -16,6 +14,8 @@ const __dirname = new URL('.', import.meta.url).pathname;
 dotenv.config();
 
 const isSSG = process.env.BUILD_OUTPUT === 'static';
+const outDir = process.env.BUILD_OUT_DIR || (isSSG ? './dist/client' : './dist');
+const isToServerless = !isSSG && process.env.DEPLOY_RUNTIME === 'serverless';
 const deployRand = process.env.DEPLOY_RAND || '_';
 
 const {
@@ -136,17 +136,27 @@ const _vitePWAOptions = {
   },
 };
 
+const viteAlias = [];
+if (isToServerless) {
+  viteAlias.push({
+    find: '@@sf/components/Picture.astro',
+    replacement: joinPath(__dirname, 'src/serverless/Picture.runtime.astro'),
+  });
+}
+viteAlias.push(
+  { find: '@@i18n', replacement: `@cloudcommerce/i18n/src/${lang}.ts` },
+  { find: '@@sf', replacement: joinPath(__dirname, 'src/lib') },
+  { find: '~', replacement: joinPath(process.cwd(), 'src') },
+  { find: 'content', replacement: joinPath(process.cwd(), 'content') },
+  { find: '/img', replacement: joinPath(process.cwd(), 'public/img') },
+  { find: '/assets', replacement: joinPath(process.cwd(), 'public/assets') },
+);
+
 const genAstroConfig = ({
   site = `https://${domain}`,
   vitePWAOptions = _vitePWAOptions,
-} = {}) => ({
-  output: isSSG ? 'static' : 'server',
-  adapter: isSSG ? undefined : node({
-    mode: 'middleware',
-  }),
-  outDir: process.env.BUILD_OUT_DIR || (isSSG ? './dist/client' : './dist'),
-  integrations: [
-    image(),
+} = {}) => {
+  const integrations = [
     vue({
       appEntrypoint: '/src/pages/_vue',
       template: {
@@ -155,49 +165,53 @@ const genAstroConfig = ({
         },
       },
     }),
-    // partytown(),
-    // prefetch(),
     UnoCSS({
       injectReset: false,
       injectEntry: false,
     }),
     AstroPWA(vitePWAOptions),
-  ],
-  site,
-  vite: {
-    plugins: [
-      {
-        name: 'vue-i18n',
-        transform(code, id) {
-          if (!/\.vue$/.test(id)) {
-            return;
-          }
-          // eslint-disable-next-line consistent-return
-          return code.replace(/\$t\.i19([a-z][\w$]+)/g, (match, p1) => {
-            try {
-              const text = readFileSync(joinPath(dictionaryDir, lang, `i19${p1}.txt`));
-              return `'${text}'`;
-            } catch (e) {
-              console.error(e);
-              return match;
+  ];
+  if (!isToServerless) {
+    integrations.push(image({
+      serviceEntryPoint: '@astrojs/image/sharp',
+    }));
+  }
+  return {
+    output: isSSG ? 'static' : 'server',
+    adapter: isSSG ? undefined : node({
+      mode: 'middleware',
+    }),
+    outDir,
+    integrations,
+    site,
+    vite: {
+      plugins: [
+        {
+          name: 'vue-i18n',
+          transform(code, id) {
+            if (!/\.vue$/.test(id)) {
+              return;
             }
-          });
+            // eslint-disable-next-line consistent-return
+            return code.replace(/\$t\.i19([a-z][\w$]+)/g, (match, p1) => {
+              try {
+                const text = readFileSync(joinPath(dictionaryDir, lang, `i19${p1}.txt`));
+                return `'${text}'`;
+              } catch (e) {
+                console.error(e);
+                return match;
+              }
+            });
+          },
         },
-      },
-    ],
-    resolve: {
-      preserveSymlinks: lstatSync(joinPath(process.cwd(), 'src/components')).isSymbolicLink(),
-      alias: [
-        { find: '@@i18n', replacement: `@cloudcommerce/i18n/src/${lang}.ts` },
-        { find: '@@sf', replacement: joinPath(__dirname, 'src/lib') },
-        { find: '~', replacement: joinPath(process.cwd(), 'src') },
-        { find: 'content', replacement: joinPath(process.cwd(), 'content') },
-        { find: '/img', replacement: joinPath(process.cwd(), 'public/img') },
-        { find: '/assets', replacement: joinPath(process.cwd(), 'public/assets') },
       ],
+      resolve: {
+        preserveSymlinks: lstatSync(joinPath(process.cwd(), 'src/components')).isSymbolicLink(),
+        alias: viteAlias,
+      },
     },
-  },
-});
+  };
+};
 
 const astroConfig = genAstroConfig();
 

package/packages/storefront/dist/server/chunks/pages/{all.3a2f4354.mjs → all.d97031a1.mjs}

@@ -1,11 +1,12 @@
 import mime from 'mime';
-import { dim, bold, red, yellow, cyan, green } from 'kleur/colors';
-import sizeOf from 'image-size';
-import fs from 'node:fs/promises';
-import { fileURLToPath } from 'node:url';
+import sharp$1 from 'sharp';
+import 'kleur/colors';
+import 'node:fs/promises';
 import { resolve, join } from 'node:path';
+import 'node:url';
 import 'http-cache-semantics';
 import 'node:os';
+import sizeOf from 'image-size';
 import 'magic-string';
 import 'node:stream';
 import { c as createAstro, a as createComponent, r as renderTemplate, b as addAttribute, d as renderComponent, u as unescapeHTML, F as Fragment, m as maybeRenderHead, e as renderSlot, f as renderHead, s as spreadAttributes } from '../astro.9781c0a7.mjs';
@@ -14,7 +15,7 @@ import { reactive, computed, defineComponent, inject, useSSRContext, mergeProps,
 import { img, price, formatMoney, nickname, onPromotion } from '@ecomplus/utils';
 import { ssrRenderAttrs, ssrRenderSlot, ssrRenderClass, ssrRenderVNode, ssrRenderComponent, ssrRenderStyle, ssrRenderList, ssrIncludeBooleanAttr, ssrRenderAttr, ssrRenderTeleport, ssrInterpolate } from 'vue/server-renderer';
 /* empty css                           */import { EventEmitter } from 'node:events';
-import fs$1, { readFileSync } from 'node:fs';
+import fs, { readFileSync } from 'node:fs';
 import config from '@cloudcommerce/config';
 /* empty css                               */import { resolve as resolve$1 } from 'path';
 import { useScroll, useElementHover, useDebounceFn, useTimeout, promiseTimeout } from '@vueuse/core';
@@ -28,85 +29,12 @@ const _export_sfc = (sfc, props) => {
   return target;
 };
 
-const PREFIX = "@astrojs/image";
-const dateTimeFormat = new Intl.DateTimeFormat([], {
-  hour: "2-digit",
-  minute: "2-digit",
-  second: "2-digit"
-});
-const levels = {
-  debug: 20,
-  info: 30,
-  warn: 40,
-  error: 50,
-  silent: 90
-};
-function getPrefix(level, timestamp) {
-  let prefix = "";
-  if (timestamp) {
-    prefix += dim(dateTimeFormat.format(new Date()) + " ");
-  }
-  switch (level) {
-    case "debug":
-      prefix += bold(green(`[${PREFIX}] `));
-      break;
-    case "info":
-      prefix += bold(cyan(`[${PREFIX}] `));
-      break;
-    case "warn":
-      prefix += bold(yellow(`[${PREFIX}] `));
-      break;
-    case "error":
-      prefix += bold(red(`[${PREFIX}] `));
-      break;
-  }
-  return prefix;
-}
-const log = (_level, dest) => ({ message, level, prefix = true, timestamp = true }) => {
-  if (levels[_level] >= levels[level]) {
-    dest(`${prefix ? getPrefix(level, timestamp) : ""}${message}`);
-  }
-};
-const error = log("error", console.error);
-
-async function metadata(src, data) {
-  const file = data || await fs.readFile(src);
-  const { width, height, type, orientation } = await sizeOf(file);
-  const isPortrait = (orientation || 0) >= 5;
-  if (!width || !height || !type) {
-    return void 0;
-  }
-  return {
-    src: fileURLToPath(src),
-    width: isPortrait ? height : width,
-    height: isPortrait ? width : height,
-    format: type,
-    orientation
-  };
-}
-
-function isRemoteImage$1(src) {
-  return /^(https?:)?\/\//.test(src);
-}
-function removeQueryString(src) {
-  const index = src.lastIndexOf("?");
-  return index > 0 ? src.substring(0, index) : src;
-}
-function extname(src) {
-  const base = basename(src);
-  const index = base.lastIndexOf(".");
-  if (index <= 0) {
-    return "";
-  }
-  return base.substring(index);
-}
-function basename(src) {
-  return removeQueryString(src.replace(/^.*[\\\/]/, ""));
-}
-
 function isOutputFormat(value) {
   return ["avif", "jpeg", "jpg", "png", "webp", "svg"].includes(value);
 }
+function isOutputFormatSupportsAlpha(value) {
+  return ["avif", "png", "webp"].includes(value);
+}
 function isAspectRatioString(value) {
   return /^\d*:\d*$/.test(value);
 }
@@ -203,60 +131,7 @@ class BaseSSRService {
   }
 }
 
-const imagePoolModulePromise = import('../image-pool.c24d15b2.mjs');
-class SquooshService extends BaseSSRService {
-  async processAvif(image, transform) {
-    const encodeOptions = transform.quality ? { avif: { quality: transform.quality } } : { avif: {} };
-    await image.encode(encodeOptions);
-    const data = await image.encodedWith.avif;
-    return {
-      data: data.binary,
-      format: "avif"
-    };
-  }
-  async processJpeg(image, transform) {
-    const encodeOptions = transform.quality ? { mozjpeg: { quality: transform.quality } } : { mozjpeg: {} };
-    await image.encode(encodeOptions);
-    const data = await image.encodedWith.mozjpeg;
-    return {
-      data: data.binary,
-      format: "jpeg"
-    };
-  }
-  async processPng(image, transform) {
-    await image.encode({ oxipng: {} });
-    const data = await image.encodedWith.oxipng;
-    return {
-      data: data.binary,
-      format: "png"
-    };
-  }
-  async processWebp(image, transform) {
-    const encodeOptions = transform.quality ? { webp: { quality: transform.quality } } : { webp: {} };
-    await image.encode(encodeOptions);
-    const data = await image.encodedWith.webp;
-    return {
-      data: data.binary,
-      format: "webp"
-    };
-  }
-  async autorotate(transform, inputBuffer) {
-    try {
-      const meta = await metadata(transform.src, inputBuffer);
-      switch (meta == null ? void 0 : meta.orientation) {
-        case 3:
-        case 4:
-          return { type: "rotate", numRotations: 2 };
-        case 5:
-        case 6:
-          return { type: "rotate", numRotations: 1 };
-        case 7:
-        case 8:
-          return { type: "rotate", numRotations: 3 };
-      }
-    } catch {
-    }
-  }
+class SharpService extends BaseSSRService {
   async transform(inputBuffer, transform) {
     if (transform.format === "svg") {
       return {
@@ -264,46 +139,38 @@ class SquooshService extends BaseSSRService {
         format: transform.format
       };
     }
-    const operations = [];
-    if (!isRemoteImage$1(transform.src)) {
-      const autorotate = await this.autorotate(transform, inputBuffer);
-      if (autorotate) {
-        operations.push(autorotate);
-      }
-    } else if (transform.src.startsWith("//")) {
-      transform.src = `https:${transform.src}`;
-    }
+    const sharpImage = sharp$1(inputBuffer, { failOnError: false, pages: -1 });
+    sharpImage.rotate();
     if (transform.width || transform.height) {
       const width = transform.width && Math.round(transform.width);
       const height = transform.height && Math.round(transform.height);
-      operations.push({
-        type: "resize",
+      sharpImage.resize({
         width,
-        height
+        height,
+        fit: transform.fit,
+        position: transform.position,
+        background: transform.background
       });
     }
-    if (!transform.format) {
-      error({
-        level: "info",
-        prefix: false,
-        message: red(`Unknown image output: "${transform.format}" used for ${transform.src}`)
-      });
-      throw new Error(`Unknown image output: "${transform.format}" used for ${transform.src}`);
+    if (transform.format) {
+      sharpImage.toFormat(transform.format, { quality: transform.quality });
+      if (transform.background && !isOutputFormatSupportsAlpha(transform.format)) {
+        sharpImage.flatten({ background: transform.background });
+      }
     }
-    const { processBuffer } = await imagePoolModulePromise;
-    const data = await processBuffer(inputBuffer, operations, transform.format, transform.quality);
+    const { data, info } = await sharpImage.toBuffer({ resolveWithObject: true });
     return {
-      data: Buffer.from(data),
-      format: transform.format
+      data,
+      format: info.format
     };
   }
 }
-const service = new SquooshService();
-var squoosh_default = service;
+const service = new SharpService();
+var sharp_default = service;
 
-const squoosh = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
+const sharp = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
   __proto__: null,
-  default: squoosh_default
+  default: sharp_default
 }, Symbol.toStringTag, { value: 'Module' }));
 
 const fnv1a52 = (str) => {
@@ -331,7 +198,7 @@ const etag = (payload, weak = false) => {
   return prefix + fnv1a52(payload).toString(36) + payload.length.toString(36) + '"';
 };
 
-function isRemoteImage(src) {
+function isRemoteImage$1(src) {
   return /^(https?:)?\/\//.test(src);
 }
 
@@ -350,14 +217,14 @@ async function loadRemoteImage(src) {
 const get = async ({ request }) => {
   try {
     const url = new URL(request.url);
-    const transform = squoosh_default.parseTransform(url.searchParams);
+    const transform = sharp_default.parseTransform(url.searchParams);
     let inputBuffer = void 0;
-    const sourceUrl = isRemoteImage(transform.src) ? new URL(transform.src) : new URL(transform.src, url.origin);
+    const sourceUrl = isRemoteImage$1(transform.src) ? new URL(transform.src) : new URL(transform.src, url.origin);
     inputBuffer = await loadRemoteImage(sourceUrl);
     if (!inputBuffer) {
       return new Response("Not Found", { status: 404 });
     }
-    const { data, format } = await squoosh_default.transform(inputBuffer, transform);
+    const { data, format } = await sharp_default.transform(inputBuffer, transform);
     return new Response(data, {
       status: 200,
       headers: {
@@ -396,15 +263,15 @@ const getCMS = () => {
       if (filename.endsWith('/')) {
         const dirColl = resolve(dirContent, filename);
         return new Promise((resolve) => {
-          const slugs = fs$1.existsSync(dirColl)
-            ? fs$1.readdirSync(dirColl).map((file) => file.replace('.json', ''))
+          const slugs = fs.existsSync(dirColl)
+            ? fs.readdirSync(dirColl).map((file) => file.replace('.json', ''))
             : [];
           resolve(slugs);
         });
       }
       const filepath = resolve(dirContent, `${filename}.json`);
-      const content = fs$1.existsSync(filepath)
-        ? JSON.parse(fs$1.readFileSync(filepath, 'utf8'))
+      const content = fs.existsSync(filepath)
+        ? JSON.parse(fs.readFileSync(filepath, 'utf8'))
         : null;
       return filename === 'settings'
         ? content
@@ -782,6 +649,25 @@ const $$Base = createComponent(async ($$result, $$props, $$slots) => {
   return renderTemplate`${renderComponent($$result, "Base", $$Base$1, { "pageContext": pageContext, "title": title }, { "before-head-end": ($$result2) => renderTemplate`${renderComponent($$result2, "InlineScripts", $$InlineScripts, { "slot": "before-head-end" })}`, "default": ($$result2) => renderTemplate`${renderSlot($$result2, $$slots["default"])}` })}`;
 }, "/home/leo/code/ecomplus/cloud-commerce/packages/storefront/src/layouts/Base.astro");
 
+function isRemoteImage(src) {
+  return /^(https?:)?\/\//.test(src);
+}
+function removeQueryString(src) {
+  const index = src.lastIndexOf("?");
+  return index > 0 ? src.substring(0, index) : src;
+}
+function extname(src) {
+  const base = basename(src);
+  const index = base.lastIndexOf(".");
+  if (index <= 0) {
+    return "";
+  }
+  return base.substring(index);
+}
+function basename(src) {
+  return removeQueryString(src.replace(/^.*[\\\/]/, ""));
+}
+
 function resolveSize(transform) {
   if (transform.width && transform.height) {
     return transform;
@@ -849,7 +735,7 @@ async function getImage(transform) {
   }
   let loader = (_a = globalThis.astroImage) == null ? void 0 : _a.loader;
   if (!loader) {
-    const { default: mod } = await Promise.resolve().then(() => squoosh).catch(() => {
+    const { default: mod } = await Promise.resolve().then(() => sharp).catch(() => {
       throw new Error(
         "[@astrojs/image] Builtin image loader not found. (Did you remember to add the integration to your Astro config?)"
       );
@@ -861,7 +747,7 @@ async function getImage(transform) {
   const resolved = await resolveTransform(transform);
   const attributes = await loader.getImageAttributes(resolved);
   const isDev = (_b = (Object.assign({"BASE_URL":"/","MODE":"production","DEV":false,"PROD":true,"SSR":true,"SITE":"\"https://ecom2-002.web.app\""},{SSR:true,}))) == null ? void 0 : _b.DEV;
-  const isLocalImage = !isRemoteImage$1(resolved.src);
+  const isLocalImage = !isRemoteImage(resolved.src);
   const _loader = isDev && isLocalImage ? globalThis.astroImage.defaultLoader : loader;
   if (!_loader) {
     throw new Error("@astrojs/image: loader not found!");

package/packages/storefront/dist/server/entry.mjs

@@ -14,7 +14,7 @@ import enableDestroy from 'server-destroy';
 import { defineComponent, computed, useSSRContext, mergeProps, h as h$1, createSSRApp } from 'vue';
 import { ssrRenderSlotInner, ssrRenderAttrs, ssrRenderSlot, renderToString } from 'vue/server-renderer';
 import { img, imgSizes, i18n, formatMoney } from '@ecomplus/utils';
-/* empty css                                  */import { _ as _export_sfc, a as _page0, b as _page1, c as _page2, d as _page3, e as _page4, f as _page5 } from './chunks/pages/all.3a2f4354.mjs';
+/* empty css                                  */import { _ as _export_sfc, a as _page0, b as _page1, c as _page2, d as _page3, e as _page4, f as _page5 } from './chunks/pages/all.d97031a1.mjs';
 import 'mime';
 import 'cookie';
 import 'kleur/colors';
@@ -23,12 +23,13 @@ import 'path-to-regexp';
 import 'tls';
 import 'string-width';
 import 'html-escaper';
-import 'image-size';
+import 'sharp';
 import 'node:fs/promises';
-import 'node:url';
 import 'node:path';
+import 'node:url';
 import 'http-cache-semantics';
 import 'node:os';
+import 'image-size';
 import 'magic-string';
 import 'node:stream';
 import '@cloudcommerce/api';
@@ -3058,10 +3059,10 @@ const _renderer1 = {
 	renderToStaticMarkup,
 };
 
-const pageMap = new Map([["../../node_modules/.pnpm/@astrojs+image@0.16.0_astro@2.1.2/node_modules/@astrojs/image/dist/endpoint.js", _page0],["src/pages/index.astro", _page1],["src/pages/fallback.astro", _page2],["src/pages/app/index.astro", _page3],["src/pages/app/account.astro", _page4],["src/pages/[...slug].astro", _page5],]);
+const pageMap = new Map([["../../node_modules/.pnpm/@astrojs+image@0.16.0_astro@2.1.2+sharp@0.31.3/node_modules/@astrojs/image/dist/endpoint.js", _page0],["src/pages/index.astro", _page1],["src/pages/fallback.astro", _page2],["src/pages/app/index.astro", _page3],["src/pages/app/account.astro", _page4],["src/pages/[...slug].astro", _page5],]);
 const renderers = [Object.assign({"name":"astro:jsx","serverEntrypoint":"astro/jsx/server.js","jsxImportSource":"astro"}, { ssr: server_default }),Object.assign({"name":"@astrojs/vue","clientEntrypoint":"@astrojs/vue/client.js","serverEntrypoint":"@astrojs/vue/server.js"}, { ssr: _renderer1 }),];
 
-const _manifest = Object.assign(deserializeManifest({"adapterName":"@astrojs/node","routes":[{"file":"","links":[],"scripts":[],"routeData":{"type":"endpoint","route":"/_image","pattern":"^\\/_image$","segments":[[{"content":"_image","dynamic":false,"spread":false}]],"params":[],"component":"../../node_modules/.pnpm/@astrojs+image@0.16.0_astro@2.1.2/node_modules/@astrojs/image/dist/endpoint.js","pathname":"/_image","prerender":false,"_meta":{"trailingSlash":"ignore"}}},{"file":"","links":["_astro/_...slug_.0607a6ef.css","_astro/index.0c833781.css"],"scripts":[{"type":"external","value":"_astro/hoisted.721ad75d.js"}],"routeData":{"route":"/","type":"page","pattern":"^\\/$","segments":[],"params":[],"component":"src/pages/index.astro","pathname":"/","prerender":false,"_meta":{"trailingSlash":"ignore"}}},{"file":"","links":["_astro/_...slug_.0607a6ef.css"],"scripts":[{"type":"external","value":"_astro/hoisted.721ad75d.js"}],"routeData":{"route":"/fallback","type":"page","pattern":"^\\/fallback\\/?$","segments":[[{"content":"fallback","dynamic":false,"spread":false}]],"params":[],"component":"src/pages/fallback.astro","pathname":"/fallback","prerender":false,"_meta":{"trailingSlash":"ignore"}}},{"file":"","links":[],"scripts":[],"routeData":{"route":"/app","type":"page","pattern":"^\\/app\\/?$","segments":[[{"content":"app","dynamic":false,"spread":false}]],"params":[],"component":"src/pages/app/index.astro","pathname":"/app","prerender":false,"_meta":{"trailingSlash":"ignore"}}},{"file":"","links":[],"scripts":[],"routeData":{"route":"/app/account","type":"page","pattern":"^\\/app\\/account\\/?$","segments":[[{"content":"app","dynamic":false,"spread":false}],[{"content":"account","dynamic":false,"spread":false}]],"params":[],"component":"src/pages/app/account.astro","pathname":"/app/account","prerender":false,"_meta":{"trailingSlash":"ignore"}}},{"file":"","links":["_astro/_...slug_.0607a6ef.css"],"scripts":[{"type":"external","value":"_astro/hoisted.721ad75d.js"}],"routeData":{"route":"/[...slug]","type":"page","pattern":"^(?:\\/(.*?))?\\/?$","segments":[[{"content":"...slug","dynamic":true,"spread":true}]],"params":["...slug"],"component":"src/pages/[...slug].astro","prerender":false,"_meta":{"trailingSlash":"ignore"}}}],"site":"https://ecom2-002.web.app","base":"/","markdown":{"drafts":false,"syntaxHighlight":"shiki","shikiConfig":{"langs":[],"theme":"github-dark","wrap":false},"remarkPlugins":[],"rehypePlugins":[],"remarkRehype":{},"gfm":true,"smartypants":true},"pageMap":null,"propagation":[],"renderers":[],"entryModules":{"\u0000@astrojs-ssr-virtual-entry":"_@astrojs-ssr-virtual-entry.mjs","/home/leo/code/ecomplus/cloud-commerce/packages/storefront/node_modules/@astrojs/image/dist/vendor/squoosh/image-pool.js":"chunks/image-pool.c24d15b2.mjs","@@sf/components/ProductCard.vue":"_astro/ProductCard.7e891c08.js","~/components/Prices.vue":"_astro/Prices.55399c72.js","~/components/PitchBar.vue":"_astro/PitchBar.db7cd775.js","@astrojs/vue/client.js":"_astro/client.0de2f274.js","/astro/hoisted.js?q=0":"_astro/hoisted.721ad75d.js","/home/leo/code/ecomplus/cloud-commerce/node_modules/workbox-window/build/workbox-window.prod.es5.mjs":"_astro/workbox-window.prod.es5.295a6886.js","~/components/ShopHeader.vue":"_astro/ShopHeader.e93c8274.js","/home/leo/code/ecomplus/cloud-commerce/packages/storefront/src/lib/scripts/firebase-app.ts":"_astro/firebase-app.72e91a3e.js","astro:scripts/before-hydration.js":""},"assets":["/_astro/index.0c833781.css","/_astro/server.1bc2fa51.css","/_astro/_...slug_.0607a6ef.css","/manifest.webmanifest","/robots.txt","/sw.js","/workbox-e0d788d4.js","/_astro/PitchBar.db7cd775.js","/_astro/Prices.55399c72.js","/_astro/ProductCard.7e891c08.js","/_astro/ShopHeader.e93c8274.js","/_astro/_plugin-vue_export-helper.77ed7c18.js","/_astro/client.0de2f274.js","/_astro/firebase-app.72e91a3e.js","/_astro/format-money.ab6b71eb.js","/_astro/hoisted.721ad75d.js","/_astro/idle-callback.889bf0ea.js","/_astro/index.16f33784.js","/_astro/modules-info.06ac0727.js","/_astro/preload-helper.101896b7.js","/_astro/runtime-dom.esm-bundler.d2f39f33.js","/_astro/session-utm.72684b84.js","/_astro/workbox-window.prod.es5.295a6886.js","/admin/config.json","/assets/cms-preview.css","/assets/cms.css","/assets/cvv.png","/assets/img-placeholder.png","/assets/payments.png","/assets/ssl-safe.png","/img/icon.png","/img/large-icon.png","/img/uploads/banner1.png","/img/uploads/banner2.png","/img/uploads/banner2.webp","/img/uploads/favicon.png","/img/uploads/headless.png","/img/uploads/headphone.png","/img/uploads/headphone.webp","/img/uploads/icon.png","/img/uploads/large-icon.png","/img/uploads/logo.png","/img/uploads/logo.webp","/img/uploads/og-image.png","/img/uploads/passion.png","/img/uploads/passion.webp","/img/uploads/pwa-reliable.png","/img/uploads/rect8589.png","/img/uploads/rect859.png","/img/uploads/rect89.png","/img/uploads/rect89.webp","/img/uploads/ssl-safe.png"]}), {
+const _manifest = Object.assign(deserializeManifest({"adapterName":"@astrojs/node","routes":[{"file":"","links":[],"scripts":[],"routeData":{"type":"endpoint","route":"/_image","pattern":"^\\/_image$","segments":[[{"content":"_image","dynamic":false,"spread":false}]],"params":[],"component":"../../node_modules/.pnpm/@astrojs+image@0.16.0_astro@2.1.2+sharp@0.31.3/node_modules/@astrojs/image/dist/endpoint.js","pathname":"/_image","prerender":false,"_meta":{"trailingSlash":"ignore"}}},{"file":"","links":["_astro/_...slug_.0607a6ef.css","_astro/index.0c833781.css"],"scripts":[{"type":"external","value":"_astro/hoisted.721ad75d.js"}],"routeData":{"route":"/","type":"page","pattern":"^\\/$","segments":[],"params":[],"component":"src/pages/index.astro","pathname":"/","prerender":false,"_meta":{"trailingSlash":"ignore"}}},{"file":"","links":["_astro/_...slug_.0607a6ef.css"],"scripts":[{"type":"external","value":"_astro/hoisted.721ad75d.js"}],"routeData":{"route":"/fallback","type":"page","pattern":"^\\/fallback\\/?$","segments":[[{"content":"fallback","dynamic":false,"spread":false}]],"params":[],"component":"src/pages/fallback.astro","pathname":"/fallback","prerender":false,"_meta":{"trailingSlash":"ignore"}}},{"file":"","links":[],"scripts":[],"routeData":{"route":"/app","type":"page","pattern":"^\\/app\\/?$","segments":[[{"content":"app","dynamic":false,"spread":false}]],"params":[],"component":"src/pages/app/index.astro","pathname":"/app","prerender":false,"_meta":{"trailingSlash":"ignore"}}},{"file":"","links":[],"scripts":[],"routeData":{"route":"/app/account","type":"page","pattern":"^\\/app\\/account\\/?$","segments":[[{"content":"app","dynamic":false,"spread":false}],[{"content":"account","dynamic":false,"spread":false}]],"params":[],"component":"src/pages/app/account.astro","pathname":"/app/account","prerender":false,"_meta":{"trailingSlash":"ignore"}}},{"file":"","links":["_astro/_...slug_.0607a6ef.css"],"scripts":[{"type":"external","value":"_astro/hoisted.721ad75d.js"}],"routeData":{"route":"/[...slug]","type":"page","pattern":"^(?:\\/(.*?))?\\/?$","segments":[[{"content":"...slug","dynamic":true,"spread":true}]],"params":["...slug"],"component":"src/pages/[...slug].astro","prerender":false,"_meta":{"trailingSlash":"ignore"}}}],"site":"https://ecom2-002.web.app","base":"/","markdown":{"drafts":false,"syntaxHighlight":"shiki","shikiConfig":{"langs":[],"theme":"github-dark","wrap":false},"remarkPlugins":[],"rehypePlugins":[],"remarkRehype":{},"gfm":true,"smartypants":true},"pageMap":null,"propagation":[],"renderers":[],"entryModules":{"\u0000@astrojs-ssr-virtual-entry":"_@astrojs-ssr-virtual-entry.mjs","@@sf/components/ProductCard.vue":"_astro/ProductCard.7e891c08.js","@astrojs/vue/client.js":"_astro/client.0de2f274.js","~/components/PitchBar.vue":"_astro/PitchBar.db7cd775.js","~/components/Prices.vue":"_astro/Prices.55399c72.js","/astro/hoisted.js?q=0":"_astro/hoisted.721ad75d.js","/home/leo/code/ecomplus/cloud-commerce/node_modules/workbox-window/build/workbox-window.prod.es5.mjs":"_astro/workbox-window.prod.es5.295a6886.js","~/components/ShopHeader.vue":"_astro/ShopHeader.e93c8274.js","/home/leo/code/ecomplus/cloud-commerce/packages/storefront/src/lib/scripts/firebase-app.ts":"_astro/firebase-app.72e91a3e.js","astro:scripts/before-hydration.js":""},"assets":["/_astro/index.0c833781.css","/_astro/server.1bc2fa51.css","/_astro/_...slug_.0607a6ef.css","/manifest.webmanifest","/robots.txt","/sw.js","/workbox-e0d788d4.js","/_astro/PitchBar.db7cd775.js","/_astro/Prices.55399c72.js","/_astro/ProductCard.7e891c08.js","/_astro/ShopHeader.e93c8274.js","/_astro/_plugin-vue_export-helper.77ed7c18.js","/_astro/client.0de2f274.js","/_astro/firebase-app.72e91a3e.js","/_astro/format-money.ab6b71eb.js","/_astro/hoisted.721ad75d.js","/_astro/idle-callback.889bf0ea.js","/_astro/index.16f33784.js","/_astro/modules-info.06ac0727.js","/_astro/preload-helper.101896b7.js","/_astro/runtime-dom.esm-bundler.d2f39f33.js","/_astro/session-utm.72684b84.js","/_astro/workbox-window.prod.es5.295a6886.js","/admin/config.json","/assets/cms-preview.css","/assets/cms.css","/assets/cvv.png","/assets/img-placeholder.png","/assets/payments.png","/assets/ssl-safe.png","/img/icon.png","/img/large-icon.png","/img/uploads/banner1.png","/img/uploads/banner2.png","/img/uploads/banner2.webp","/img/uploads/favicon.png","/img/uploads/headless.png","/img/uploads/headphone.png","/img/uploads/headphone.webp","/img/uploads/icon.png","/img/uploads/large-icon.png","/img/uploads/logo.png","/img/uploads/logo.webp","/img/uploads/og-image.png","/img/uploads/passion.png","/img/uploads/passion.webp","/img/uploads/pwa-reliable.png","/img/uploads/rect8589.png","/img/uploads/rect859.png","/img/uploads/rect89.png","/img/uploads/rect89.webp","/img/uploads/ssl-safe.png"]}), {
 	pageMap: pageMap,
 	renderers: renderers
 });

package/packages/storefront/package.json

@@ -1,8 +1,11 @@
 {
   "name": "@cloudcommerce/storefront",
   "type": "module",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "description": "E-Com Plus Cloud Commerce storefront with Astro",
+  "bin": {
+    "storefront": "./scripts/build-prod.sh"
+  },
   "main": "src/index.js",
   "repository": {
     "type": "git",
@@ -20,16 +23,15 @@
     "start": "astro dev --host",
     "build": "astro build",
     "build:static": "BUILD_OUTPUT=static astro build",
+    "build:prod": "sh scripts/build-prod.sh",
     "preview": "astro preview",
     "astro": "astro",
     "prepare-monorepo": "sh scripts/prepare-monorepo.sh"
   },
   "dependencies": {
-    "@astrojs/image": "^0.16.0",
-    "@astrojs/node": "^5.1.0",
-    "@astrojs/partytown": "^1.1.0",
-    "@astrojs/prefetch": "^0.2.0",
-    "@astrojs/vue": "^2.1.0",
+    "@astrojs/image": "0.16.0",
+    "@astrojs/node": "5.1.0",
+    "@astrojs/vue": "2.1.0",
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/config": "workspace:*",
     "@cloudcommerce/i18n": "workspace:*",
@@ -41,12 +43,14 @@
     "@iconify-json/logos": "^1.1.23",
     "@vite-pwa/astro": "^0.0.5",
     "@vueuse/core": "9.12.0",
-    "astro": "^2.1.2",
+    "astro": "2.1.2",
     "chroma-js": "^2.4.2",
     "dotenv": "^16.0.3",
     "firebase": "^9.17.2",
     "image-size": "^1.0.2",
+    "mime": "^3.0.0",
     "semver": "^7.3.8",
+    "sharp": "^0.31.3",
     "tailwindcss": "^3.2.7",
     "unocss": "^0.50.4",
     "vite": "^4.1.4",

package/packages/storefront/scripts/build-prod.sh

@@ -1,7 +1,19 @@
 #!/bin/bash
 
 BUILD_OUTPUT=static BUILD_OUT_DIR=./.cloudcommerce/sf-tmp-dist npx astro build
-npx astro build
+DEPLOY_RUNTIME=serverless npx astro build
+
 mv ./.cloudcommerce/sf-tmp-dist/_astro/*.{webp,avif} ./dist/client/_astro/
 rm -rf ./.cloudcommerce/sf-tmp-dist
-identify -format "%f,%w,%h\n" ./dist/client/_astro/*.{webp,avif} > ./dist/server/images.manifest.csv
+
+identify -format "%f,%w,%h\n" \
+  ./dist/client/_astro/*.{webp,avif} > ./dist/server/images.dist.csv
+
+identify -format "assets/%f,%w,%h\n" \
+  ./public/assets/*.{png,jpg,jpeg,gif,ico,webp,avif} > ./dist/server/images.src.csv 2>/dev/null
+identify -format "img/%f,%w,%h\n" \
+  ./public/img/*.{png,jpg,jpeg,gif,ico,webp,avif} >> ./dist/server/images.src.csv 2>/dev/null
+identify -format "img/uploads/%f,%w,%h\n" \
+  ./public/img/uploads/*.{png,jpg,jpeg,gif,ico,webp,avif} >> ./dist/server/images.src.csv 2>/dev/null
+
+exit 0

package/packages/storefront/src/lib/components/Picture.astro

@@ -1,16 +1,11 @@
 ---
-import type {
-  PictureComponentLocalImageProps,
-  PictureComponentRemoteImageProps,
-} from '@astrojs/image/components/';
+import type { PictureComponentRemoteImageProps } from '@astrojs/image/components/';
 import { resolve as resolvePath } from 'path';
 import imageSize from 'image-size';
 import { getPicture } from '@astrojs/image';
 
-type PictureProps = PictureComponentLocalImageProps | PictureComponentRemoteImageProps;
-
-export type Props = Omit<PictureProps, 'aspectRatio'> & {
-  aspectRatio?: PictureProps['aspectRatio'],
+export type Props = Omit<PictureComponentRemoteImageProps, 'aspectRatio'> & {
+  aspectRatio?: PictureComponentRemoteImageProps['aspectRatio'],
   fetchpriority?: 'high' | 'low' | 'auto',
 };