@cloudcommerce/cli 0.0.37 → 0.0.40

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
-@cloudcommerce/cli:build: cache hit, replaying output 2eb5ab719eda5391
+@cloudcommerce/cli:build: cache hit, replaying output ee35a172bed95a9c
 @cloudcommerce/cli:build: 
-@cloudcommerce/cli:build: > @cloudcommerce/cli@0.0.36 build /home/leo/code/ecomplus/cloud-commerce/packages/cli
+@cloudcommerce/cli:build: > @cloudcommerce/cli@0.0.39 build /home/leo/code/ecomplus/cloud-commerce/packages/cli
 @cloudcommerce/cli:build: > sh ../../scripts/build-lib.sh
 @cloudcommerce/cli:build: 

package/config/firebase.json

@@ -3,10 +3,28 @@
     "rules": "firestore.rules",
     "indexes": "firestore.indexes.json"
   },
-  "functions": {
-    "predeploy": "npm --prefix \"$RESOURCE_DIR\" run build",
-    "source": "functions"
-  },
+  "functions": [
+    {
+      "predeploy": "npm run build -- --codebase core --dir \"$RESOURCE_DIR\"",
+      "source": "functions/core",
+      "codebase": "core"
+    },
+    {
+      "predeploy": "npm run build -- --codebase modules --dir \"$RESOURCE_DIR\"",
+      "source": "functions/modules",
+      "codebase": "modules"
+    },
+    {
+      "predeploy": "npm run build -- --codebase passport --dir \"$RESOURCE_DIR\"",
+      "source": "functions/passport",
+      "codebase": "passport"
+    },
+    {
+      "predeploy": "npm run build -- --codebase ssr --dir \"$RESOURCE_DIR\"",
+      "source": "functions/ssr",
+      "codebase": "ssr"
+    }
+  ],
   "hosting": {
     "public": "public",
     "ignore": [

package/lib/build.js

@@ -0,0 +1,18 @@
+import path from 'path';
+import { fs } from 'zx';
+
+const copyFunctionsConfig = async () => {
+  const functionsDir = path.join(process.cwd(), 'functions');
+  const filesToCopy = ['.env', 'config.json'];
+  const dirents = await fs.readdir(functionsDir, { withFileTypes: true });
+  for (let i = 0; i < dirents.length; i++) {
+    if (dirents[i].isDirectory() && dirents[i].name.charAt(0) !== '.') {
+      for (let ii = 0; ii < filesToCopy.length; ii++) {
+        // eslint-disable-next-line no-await-in-loop
+        await fs.copy(path.join(functionsDir, filesToCopy[ii]), path.join(functionsDir, dirents[i].name, filesToCopy[ii]));
+      }
+    }
+  }
+};
+
+export default copyFunctionsConfig;

package/lib/index.js

@@ -4,6 +4,7 @@ import {
   $, argv, fs, echo, chalk,
 } from 'zx';
 import login from './login.js';
+import build from './build.js';
 
 const { FIREBASE_PROJECT_ID, GOOGLE_APPLICATION_CREDENTIALS } = process.env;
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
@@ -33,7 +34,7 @@ if (projectId) {
 }
 
 export default async () => {
-  fs.copySync(path.join(__dirname, '..', 'config'), pwd);
+  await fs.copy(path.join(__dirname, '..', 'config'), pwd);
   const options = Object.keys(argv).reduce((opts, key) => {
     if (key !== '_' && key !== 'deploy' && key !== 'commit') {
       // eslint-disable-next-line no-param-reassign
@@ -45,6 +46,7 @@ export default async () => {
     return $`firebase --project=${projectId} ${cmd}${options}`;
   };
   if (argv._.includes('serve')) {
+    await build();
     return $firebase('emulators:start').catch(async (err) => {
       await echo`
 Try killing open emulators with: 
@@ -62,6 +64,9 @@ ${chalk.bold('npx kill-port 4000 9099 5001 8080 5000 8085 9199 4400 4500')}
   if (argv._.find((cmd) => /^(\w+:)?logs?$/.test(cmd))) {
     return $firebase('functions:log');
   }
+  if (argv._.includes('build')) {
+    return build();
+  }
   if (argv._.includes('deploy')) {
     return $firebase('deploy');
   }
@@ -71,7 +76,7 @@ ${chalk.bold('npx kill-port 4000 9099 5001 8080 5000 8085 9199 4400 4500')}
   }
   if (argv._.includes('setup')) {
     const { storeId, authenticationId, apiKey } = await login();
-    fs.writeFileSync(path.join(pwd, 'functions', '.env'), `ECOM_AUTHENTICATION_ID=${authenticationId}
+    await fs.writeFile(path.join(pwd, 'functions', '.env'), `ECOM_AUTHENTICATION_ID=${authenticationId}
 ECOM_API_KEY=${apiKey}
 ECOM_STORE_ID=${storeId}
 `);
@@ -79,7 +84,8 @@ ECOM_STORE_ID=${storeId}
       await $firebase('deploy');
     }
     if (argv.commit !== false) {
-      fs.writeFileSync(path.join(pwd, 'functions', 'config.json'), JSON.stringify({ storeId }, null, 2));
+      await fs.writeFile(path.join(pwd, 'functions', 'config.json'), JSON.stringify({ storeId }, null, 2));
+      await build();
       try {
         await $`git add .firebaserc functions/config.json`;
         await $`git commit -m "Setup store [skip ci]"`;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/cli",
   "type": "module",
-  "version": "0.0.37",
+  "version": "0.0.40",
   "description": "E-Com Plus Cloud Commerce CLI tools",
   "bin": {
     "cloudcommerce": "./bin/run.mjs"
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/ecomplus/cloud-commerce/tree/main/packages/cli#readme",
   "dependencies": {
-    "@cloudcommerce/api": "0.0.37",
+    "@cloudcommerce/api": "0.0.40",
     "md5": "^2.3.0",
     "zx": "^7.0.7"
   },

package/src/build.ts

@@ -0,0 +1,21 @@
+import path from 'path';
+import { fs } from 'zx';
+
+const copyFunctionsConfig = async () => {
+  const functionsDir = path.join(process.cwd(), 'functions');
+  const filesToCopy = ['.env', 'config.json'];
+  const dirents = await fs.readdir(functionsDir, { withFileTypes: true });
+  for (let i = 0; i < dirents.length; i++) {
+    if (dirents[i].isDirectory() && dirents[i].name.charAt(0) !== '.') {
+      for (let ii = 0; ii < filesToCopy.length; ii++) {
+        // eslint-disable-next-line no-await-in-loop
+        await fs.copy(
+          path.join(functionsDir, filesToCopy[ii]),
+          path.join(functionsDir, dirents[i].name, filesToCopy[ii]),
+        );
+      }
+    }
+  }
+};
+
+export default copyFunctionsConfig;

package/src/index.ts

@@ -8,6 +8,7 @@ import {
   chalk,
 } from 'zx';
 import login from './login';
+import build from './build';
 
 const {
   FIREBASE_PROJECT_ID,
@@ -45,7 +46,7 @@ if (projectId) {
 }
 
 export default async () => {
-  fs.copySync(path.join(__dirname, '..', 'config'), pwd);
+  await fs.copy(path.join(__dirname, '..', 'config'), pwd);
 
   const options = Object.keys(argv).reduce((opts, key) => {
     if (key !== '_' && key !== 'deploy' && key !== 'commit') {
@@ -59,6 +60,7 @@ export default async () => {
   };
 
   if (argv._.includes('serve')) {
+    await build();
     return $firebase('emulators:start').catch(async (err: any) => {
       await echo`
 Try killing open emulators with: 
@@ -77,6 +79,9 @@ ${chalk.bold('npx kill-port 4000 9099 5001 8080 5000 8085 9199 4400 4500')}
   if (argv._.find((cmd) => /^(\w+:)?logs?$/.test(cmd))) {
     return $firebase('functions:log');
   }
+  if (argv._.includes('build')) {
+    return build();
+  }
   if (argv._.includes('deploy')) {
     return $firebase('deploy');
   }
@@ -87,7 +92,7 @@ ${chalk.bold('npx kill-port 4000 9099 5001 8080 5000 8085 9199 4400 4500')}
 
   if (argv._.includes('setup')) {
     const { storeId, authenticationId, apiKey } = await login();
-    fs.writeFileSync(
+    await fs.writeFile(
       path.join(pwd, 'functions', '.env'),
       `ECOM_AUTHENTICATION_ID=${authenticationId}
 ECOM_API_KEY=${apiKey}
@@ -98,10 +103,11 @@ ECOM_STORE_ID=${storeId}
       await $firebase('deploy');
     }
     if (argv.commit !== false) {
-      fs.writeFileSync(
+      await fs.writeFile(
         path.join(pwd, 'functions', 'config.json'),
         JSON.stringify({ storeId }, null, 2),
       );
+      await build();
       try {
         await $`git add .firebaserc functions/config.json`;
         await $`git commit -m "Setup store [skip ci]"`;