cloudcommerce 2.4.1 → 2.4.3

package/packages/events/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/events",
   "type": "module",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "description": "E-Com Plus Cloud Commerce app events",
   "main": "lib/index.js",
   "exports": {
@@ -44,7 +44,7 @@
     "@cloudcommerce/firebase": "workspace:*",
     "@cloudcommerce/ssr": "workspace:*",
     "firebase-admin": "^12.0.0",
-    "firebase-functions": "^4.6.0",
+    "firebase-functions": "^4.7.0",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {

package/packages/feeds/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/feeds",
   "type": "module",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "description": "E-Com Plus Cloud Commerce catalog feeds",
   "main": "lib/index.js",
   "exports": {

package/packages/firebase/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/firebase",
   "type": "module",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "description": "E-Com Plus Cloud Commerce on Firebase",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -32,10 +32,10 @@
   "dependencies": {
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/config": "workspace:*",
-    "@google-cloud/pubsub": "^4.2.0",
-    "dotenv": "^16.4.1",
+    "@google-cloud/pubsub": "^4.3.1",
+    "dotenv": "^16.4.2",
     "firebase-admin": "^12.0.0",
-    "firebase-functions": "^4.6.0",
+    "firebase-functions": "^4.7.0",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {

package/packages/i18n/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/i18n",
   "type": "module",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "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": "2.4.1",
+  "version": "2.4.3",
   "description": "E-Com Plus Cloud Commerce modules API",
   "main": "lib/index.cjs",
   "exports": {
@@ -49,7 +49,7 @@
     "ajv-formats": "^2.1.1",
     "axios": "^1.6.7",
     "firebase-admin": "^12.0.0",
-    "firebase-functions": "^4.6.0",
+    "firebase-functions": "^4.7.0",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {

package/packages/passport/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/passport",
   "type": "module",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "description": "E-Com Plus Cloud Commerce customers authentication (passport) API",
   "main": "lib/index.js",
   "exports": {
@@ -26,7 +26,7 @@
     "@cloudcommerce/api": "workspace:*",
     "@cloudcommerce/firebase": "workspace:*",
     "firebase-admin": "^12.0.0",
-    "firebase-functions": "^4.6.0",
+    "firebase-functions": "^4.7.0",
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {

package/packages/ssr/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/ssr",
   "type": "module",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "description": "E-Com Plus Cloud Commerce storefront SSR",
   "main": "lib/index.js",
   "exports": {
@@ -36,14 +36,14 @@
     "astro-capo": "^0.0.1",
     "axios": "^1.6.7",
     "firebase-admin": "^12.0.0",
-    "firebase-functions": "^4.6.0",
+    "firebase-functions": "^4.7.0",
     "mitt": "^3.0.1",
-    "vue": "^3.4.15",
+    "vue": "^3.4.18",
     "yaml": "^2.3.4"
   },
   "devDependencies": {
     "@cloudcommerce/types": "workspace:*",
-    "@cloudflare/workers-types": "^4.20240129.0",
+    "@cloudflare/workers-types": "^4.20240208.0",
     "@firebase/app-types": "^0.9.0",
     "typescript": "~5.2.2"
   }

package/packages/storefront/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/storefront",
   "type": "module",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "description": "E-Com Plus Cloud Commerce storefront with Astro",
   "bin": {
     "storefront": "./scripts/build-prod.sh"
@@ -40,32 +40,32 @@
     "@iconify-json/fa6-brands": "^1.1.18",
     "@iconify-json/heroicons": "^1.1.19",
     "@iconify-json/logos": "^1.1.42",
-    "@types/gtag.js": "^0.0.18",
+    "@types/gtag.js": "^0.0.19",
     "@vite-pwa/astro": "^0.2.0",
     "@vueuse/core": "10.7.2",
+    "@webcontainer/api": "^1.1.9",
     "astro": "4.3.5",
     "astro-capo": "^0.0.1",
     "chroma-js": "^2.4.2",
-    "dotenv": "^16.4.1",
+    "dotenv": "^16.4.2",
     "firebase": "^10.8.0",
     "image-size": "^1.1.1",
     "mime": "^3.0.0",
     "mitt": "^3.0.1",
-    "semver": "^7.5.4",
+    "semver": "^7.6.0",
     "sharp": "^0.32.6",
     "tailwindcss": "^3.4.1",
     "unocss": "^0.58.5",
     "unplugin-auto-import": "^0.17.5",
     "vite": "^5.0.11",
-    "vite-plugin-pwa": "^0.17.5",
-    "vue": "^3.4.15",
+    "vite-plugin-pwa": "^0.18.1",
+    "vue": "^3.4.18",
     "wade": "0.3.3",
     "yaml": "^2.3.4"
   },
   "devDependencies": {
     "@cloudcommerce/eslint": "workspace:*",
     "@cloudcommerce/types": "workspace:*",
-    "@types/react": "^18.2.55",
-    "@webcontainer/api": "^1.1.9"
+    "@types/react": "^18.2.55"
   }
 }

package/packages/storefront/src/decap-cms/gen-preview-container.ts

@@ -1,77 +1,49 @@
 import type NReact from 'react';
-import afetch from '../helpers/afetch';
 import { initWebcontainer } from './preview/webcontainer';
 
-const getRepoCommits = async (repo: string, ghToken?: string) => {
-  const headers: Record<string, string> = {
-    Accept: 'application/vnd.github+json',
-    'X-GitHub-Api-Version': '2022-11-28',
-  };
-  if (ghToken) {
-    headers.Authorization = `Bearer ${ghToken}`;
-  }
-  const res = await afetch(`https://api.github.com/repos/${repo}/commits`, {
-    headers,
-  });
-  if (res.ok) {
-    return res.json();
-  }
-  const err: any = new Error('Failed reading repository commits on GitHub API');
-  err.res = res;
-  err.text = await res.text();
-  throw new Error(err);
-};
-
-export const genPreviewContainer = ({
-  React,
-  WebContainer,
-  cmsConfig,
-  ghToken,
-}: {
+export const genPreviewContainer = ({ React, cmsConfig, ghToken }: {
   React: typeof NReact,
-  WebContainer: any,
   cmsConfig: Record<string, any>,
   ghToken?: string,
 }) => {
   const { repo } = cmsConfig.backend;
   const cliTextareaId = 'webcontainerCli';
+  const serverIframeId = 'serverPreview';
   // https://github.com/decaporg/decap-cms/issues/2183#issuecomment-997373169
   return class Prevew extends React.Component {
     render() {
       const { entry } = (this as any).props;
       console.log({ entry });
-      const { host } = window.location;
       const slug = '';
-      const isLocal = host.startsWith('localhost') || host.startsWith('127.0.0.');
-      const src = `${isLocal ? 'http' : 'https'}://${host}/~preview/${slug}`;
+      const urlPath = `/~preview/${slug}`;
       const html = `
       <textarea id="${cliTextareaId}"></textarea>
-      <code>${src}</code>`;
+      <iframe
+        id="${serverIframeId}"
+        data-url="${urlPath}"
+        border="0"
+        width="100%"
+        height="100%"
+        style="border: 1px solid #EEE; height: calc(100vh - 30px)"
+      ></iframe>`;
       return React.createElement('div', {
         dangerouslySetInnerHTML: { __html: html },
       });
     }
     componentDidMount() {
-      let commitSha: string | undefined;
-      (async () => {
-        try {
-          const commits = await getRepoCommits(repo, ghToken);
-          commitSha = commits[0]?.sha;
-        } catch (err) {
-          console.error(err);
-        }
-      })();
       const iframe = document.getElementById('preview-pane') as HTMLIFrameElement;
       const cliTextarea = iframe.contentWindow!.document
         .getElementById(cliTextareaId) as HTMLTextAreaElement;
-      initWebcontainer({
-        repo,
-        ghToken,
-        WebContainer,
-        cliTextarea,
-      }).then(({ startDevServer }) => {
-        startDevServer(commitSha);
-      });
+      const previewIframe = iframe.contentWindow!.document
+        .getElementById(serverIframeId) as HTMLIFrameElement;
+      initWebcontainer({ repo, ghToken, cliTextarea })
+        .then(({ webcontainerInstance, startDevServer }) => {
+          webcontainerInstance.on('server-ready', (port, url) => {
+            console.log({ port, url });
+            previewIframe.src = url;
+          });
+          startDevServer();
+        });
     }
   };
 };