@cloudcommerce/cli 0.22.0 → 0.22.2

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 
-> @cloudcommerce/cli@0.21.0 build /home/leo/code/ecomplus/cloud-commerce/packages/cli
+> @cloudcommerce/cli@0.22.1 build /home/leo/code/ecomplus/cloud-commerce/packages/cli
 > bash ../../scripts/build-lib.sh
 

package/lib/build.js

@@ -1,22 +1,33 @@
 import { join as joinPath } from 'node:path';
 import { $, fs } from 'zx';
 
-const copyFunctionsConfig = async () => {
+const copyFunctionsConfig = async (isDev = false) => {
   const functionsDir = joinPath(process.cwd(), 'functions');
+  if (isDev && !fs.existsSync(joinPath(functionsDir, '.env'))) {
+    try {
+      const { storeId } = JSON.parse(fs.readFileSync(joinPath(functionsDir, 'config.json'), 'utf8'));
+      await fs.writeFile(joinPath(functionsDir, '.env'), `ECOM_STORE_ID=${storeId}\n`);
+    } catch {
+      //
+    }
+  }
   const filesToCopy = ['.env', 'config.json', 'ssr/content/settings.json'];
   const dirents = await fs.readdir(functionsDir, { withFileTypes: true });
+  /* eslint-disable no-await-in-loop */
   for (let i = 0; i < dirents.length; i++) {
     if (dirents[i].isDirectory() && dirents[i].name.charAt(0) !== '.') {
       const codebase = dirents[i].name;
       const codebaseDir = joinPath(functionsDir, codebase);
-      // eslint-disable-next-line no-await-in-loop
+      const isSSR = codebase === 'ssr';
       await fs.ensureDir(joinPath(codebaseDir, 'content'));
+      if (isDev && isSSR && !fs.existsSync(joinPath(functionsDir, 'node_modules'))) {
+        await $`npm --prefix "functions/ssr" i`;
+      }
       for (let ii = 0; ii < filesToCopy.length; ii++) {
         const fileToCopy = filesToCopy[ii];
-        if (codebase !== 'ssr' || !fileToCopy.includes('ssr/')) {
+        if (!isSSR || !fileToCopy.includes('ssr/')) {
           const srcPath = joinPath(functionsDir, fileToCopy);
           if (fs.existsSync(srcPath) && srcPath) {
-            // eslint-disable-next-line no-await-in-loop
             await fs.copy(srcPath, joinPath(codebaseDir, fileToCopy.replace('ssr/', '')));
           }
         }

package/lib/cli.js

@@ -1,4 +1,4 @@
-import url from 'node:url';
+import { fileURLToPath } from 'node:url';
 import path from 'node:path';
 import {
   $, argv, fs, echo, chalk,
@@ -11,7 +11,7 @@ import createGhSecrets from './setup-gh.js';
 const { FIREBASE_PROJECT_ID, GOOGLE_APPLICATION_CREDENTIALS, GITHUB_TOKEN } = process.env;
 // https://github.com/google/zx/issues/124
 process.env.FORCE_COLOR = '3';
-const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
+const __dirname = fileURLToPath(new URL('.', import.meta.url));
 const pwd = process.cwd();
 let projectId = FIREBASE_PROJECT_ID;
 if (projectId) {
@@ -146,7 +146,7 @@ Finish by saving the following secrets to your GitHub repository:
 `;
   }
   if (argv._.includes('dev') || !argv._.length) {
-    await prepareCodebases();
+    await prepareCodebases(true);
     return $`npm --prefix "${path.join(pwd, 'functions/ssr')}" run dev`;
   }
   return $`echo 'Hello from @cloudcommerce/cli'`;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/cli",
   "type": "module",
-  "version": "0.22.0",
+  "version": "0.22.2",
   "description": "E-Com Plus Cloud Commerce CLI tools",
   "bin": {
     "cloudcommerce": "./bin/run.mjs"
@@ -26,7 +26,7 @@
     "libsodium-wrappers": "^0.7.11",
     "md5": "^2.3.0",
     "zx": "^7.2.3",
-    "@cloudcommerce/api": "0.22.0"
+    "@cloudcommerce/api": "0.22.2"
   },
   "scripts": {
     "build": "bash ../../scripts/build-lib.sh"

package/src/build.ts

@@ -1,22 +1,35 @@
 import { join as joinPath } from 'node:path';
 import { $, fs } from 'zx';
 
-const copyFunctionsConfig = async () => {
+const copyFunctionsConfig = async (isDev = false) => {
   const functionsDir = joinPath(process.cwd(), 'functions');
+  if (isDev && !fs.existsSync(joinPath(functionsDir, '.env'))) {
+    try {
+      const { storeId } = JSON.parse(
+        fs.readFileSync(joinPath(functionsDir, 'config.json'), 'utf8'),
+      );
+      await fs.writeFile(joinPath(functionsDir, '.env'), `ECOM_STORE_ID=${storeId}\n`);
+    } catch {
+      //
+    }
+  }
   const filesToCopy = ['.env', 'config.json', 'ssr/content/settings.json'];
   const dirents = await fs.readdir(functionsDir, { withFileTypes: true });
+  /* eslint-disable no-await-in-loop */
   for (let i = 0; i < dirents.length; i++) {
     if (dirents[i].isDirectory() && dirents[i].name.charAt(0) !== '.') {
       const codebase = dirents[i].name;
       const codebaseDir = joinPath(functionsDir, codebase);
-      // eslint-disable-next-line no-await-in-loop
+      const isSSR = codebase === 'ssr';
       await fs.ensureDir(joinPath(codebaseDir, 'content'));
+      if (isDev && isSSR && !fs.existsSync(joinPath(functionsDir, 'node_modules'))) {
+        await $`npm --prefix "functions/ssr" i`;
+      }
       for (let ii = 0; ii < filesToCopy.length; ii++) {
         const fileToCopy = filesToCopy[ii];
-        if (codebase !== 'ssr' || !fileToCopy.includes('ssr/')) {
+        if (!isSSR || !fileToCopy.includes('ssr/')) {
           const srcPath = joinPath(functionsDir, fileToCopy);
           if (fs.existsSync(srcPath) && srcPath) {
-            // eslint-disable-next-line no-await-in-loop
             await fs.copy(
               srcPath,
               joinPath(codebaseDir, fileToCopy.replace('ssr/', '')),

package/src/cli.ts

@@ -1,4 +1,4 @@
-import url from 'node:url';
+import { fileURLToPath } from 'node:url';
 import path from 'node:path';
 import {
   $,
@@ -21,7 +21,7 @@ const {
 // https://github.com/google/zx/issues/124
 process.env.FORCE_COLOR = '3';
 
-const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
+const __dirname = fileURLToPath(new URL('.', import.meta.url));
 const pwd = process.cwd();
 
 let projectId = FIREBASE_PROJECT_ID;
@@ -179,7 +179,7 @@ Finish by saving the following secrets to your GitHub repository:
   }
 
   if (argv._.includes('dev') || !argv._.length) {
-    await prepareCodebases();
+    await prepareCodebases(true);
     return $`npm --prefix "${path.join(pwd, 'functions/ssr')}" run dev`;
   }
   return $`echo 'Hello from @cloudcommerce/cli'`;