@cocreate/cli 1.37.0 → 1.39.0

package/.github/workflows/automated.yml

@@ -1,82 +1,70 @@
-name: Automated
-"on":
-    push:
-        branches:
-            - master
-jobs:
-    about:
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v3
-            - name: setup nodejs
-              uses: actions/setup-node@v3
-              with:
-                  node-version: 16
-            - name: Jaid/action-sync-node-meta
-              uses: jaid/action-sync-node-meta@v1.4.0
-              with:
-                  direction: overwrite-github
-                  githubToken: "${{ secrets.GITHUB }}"
-    release:
-        runs-on: ubuntu-latest
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v3
-            - name: setup nodejs
-              uses: actions/setup-node@v3
-              with:
-                  node-version: 14
-            - name: Semantic Release
-              uses: cycjimmy/semantic-release-action@v3
-              id: semantic
-              with:
-                  extra_plugins: |
-                      @semantic-release/changelog
-                      @semantic-release/git
-                      @semantic-release/github
-              env:
-                  GITHUB_TOKEN: "${{ secrets.GITHUB }}"
-                  NPM_TOKEN: "${{ secrets.NPM_TOKEN }}"
-        outputs:
-            new_release_published: "${{ steps.semantic.outputs.new_release_published }}"
-            new_release_version: "${{ steps.semantic.outputs.new_release_version }}"
-    upload:
-      runs-on: ubuntu-latest
-
-      steps:
-        - name: Checkout
-          uses: actions/checkout@v3
-
-        - name: Setup Node.js
-          uses: actions/setup-node@v3
-          with:
-            node-version: 16
-
-        - name: Get Environment Variables
-          run: |
-            echo "organization_id=${{ secrets.COCREATE_ORGANIZATION_ID }}" >> $GITHUB_ENV
-            echo "key=${{ secrets.COCREATE_KEY }}" >> $GITHUB_ENV
-            echo "host=${{ secrets.COCREATE_HOST }}" >> $GITHUB_ENV
-
-        - name: Install @cocreate/cli
-          run: npm install -g @cocreate/cli
-
-        - name: CoCreate CLI Upload
-          run: coc upload
-
-    # docs:
-    #     runs-on: ubuntu-latest
-    #     steps:
-    #         - name: Checkout
-    #           uses: actions/checkout@v3
-    #         - name: setup nodejs
-    #           uses: actions/setup-node@v3
-    #           with:
-    #               node-version: 16
-    #         - name: update documentation
-    #           uses: CoCreate-app/CoCreate-docs@master
-    #           env:
-    #             organization_id: ${{ secrets.COCREATE_ORGANIZATION_ID }}
-    #             key: ${{ secrets.COCREATE_KEY }}
-    #             host: ${{ secrets.COCREATE_HOST }}
+name: Automated Workflow
+on:
+  push:
+    branches:
+      - master
+jobs:
+  about:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+      - name: Jaid/action-sync-node-meta
+        uses: jaid/action-sync-node-meta@v1.4.0
+        with:
+          direction: overwrite-github
+          githubToken: "${{ secrets.GITHUB }}"
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 14
+      - name: Semantic Release
+        uses: cycjimmy/semantic-release-action@v3
+        id: semantic
+        with:
+          extra_plugins: |
+            @semantic-release/changelog
+            @semantic-release/git
+            @semantic-release/github
+        env:
+          GITHUB_TOKEN: "${{ secrets.GITHUB }}"
+          NPM_TOKEN: "${{ secrets.NPM_TOKEN }}"
+    outputs:
+      new_release_published: "${{ steps.semantic.outputs.new_release_published }}"
+      new_release_version: "${{ steps.semantic.outputs.new_release_version }}"
+  upload:
+    runs-on: ubuntu-latest
+    needs: release
+    if: needs.release.outputs.new_release_published == 'true'
+    env:
+      VERSION: "${{ needs.release.outputs.new_release_version }}"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16
+      - name: Set npm registry auth
+        run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
+      - name: Install dependencies
+        run: yarn install
+      - name: Build
+        run: yarn build
+      - name: Set Environment Variables
+        run: |
+          echo "organization_id=${{ secrets.COCREATE_ORGANIZATION_ID }}" >> $GITHUB_ENV
+          echo "key=${{ secrets.COCREATE_KEY }}" >> $GITHUB_ENV
+          echo "host=${{ secrets.COCREATE_HOST }}" >> $GITHUB_ENV
+      - name: CoCreate Upload
+        run: coc upload
+

package/CHANGELOG.md

@@ -1,3 +1,28 @@
+# [1.39.0](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.38.0...v1.39.0) (2023-08-21)
+
+
+### Features
+
+* Update cocreate dependencies for the latest features and bug fixes ([6019645](https://github.com/CoCreate-app/CoCreate-cli/commit/6019645ffdb5914a2aa3415e337b8792d48960e0))
+
+# [1.38.0](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.37.0...v1.38.0) (2023-08-21)
+
+
+### Bug Fixes
+
+* /dist/CoCreate.js updated to https://CoCreate.app/dist/CoCreate.js ([54d696f](https://github.com/CoCreate-app/CoCreate-cli/commit/54d696fee5fb5b6a40145f4d029e3bebdfa27244))
+* if -- remove from arg ([c6afdc0](https://github.com/CoCreate-app/CoCreate-cli/commit/c6afdc034e92950e7431b3eed51a67ffa8252267))
+* replace cdn with /dist ([11fb652](https://github.com/CoCreate-app/CoCreate-cli/commit/11fb652063021b429e951bd6cea0ba6e6f287964))
+* update automated syntax ([de581dd](https://github.com/CoCreate-app/CoCreate-cli/commit/de581dd6fc7119249a4f0286b66b8a820429c809))
+* update file uploader ([8abf683](https://github.com/CoCreate-app/CoCreate-cli/commit/8abf683a261977e28ec497d0e4de1c6603ade116))
+
+
+### Features
+
+* add loaders/replace-unicode.js ([9b226ed](https://github.com/CoCreate-app/CoCreate-cli/commit/9b226edb42f48b301116ade0dce924c15ffcfcda))
+* create a spawn for letsencrypt and extract the txt value that needs to be added in the dns ([5b505cd](https://github.com/CoCreate-app/CoCreate-cli/commit/5b505cd29ac917c7297725d30640c1fa48cfffc5))
+* option support to define a custom configPath ([64a5363](https://github.com/CoCreate-app/CoCreate-cli/commit/64a53630e0d26843ac0e951a89f496da72e344a9))
+
 # [1.37.0](https://github.com/CoCreate-app/CoCreate-cli/compare/v1.36.0...v1.37.0) (2023-08-17)
 
 

package/docs/index.html

@@ -272,6 +272,6 @@
             </div>
         </main>
         <script src="/apikey.js"></script>
-        <script src="https://cdn.cocreate.app/latest/CoCreate.min.js"></script>
+        <script src="https://CoCreate.app/dist/CoCreate.js"></script>
     </body>
 </html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/cli",
-  "version": "1.37.0",
+  "version": "1.39.0",
   "description": "Polyrepo management bash CLI tool. Run all git commands and yarn commands on multiple repositories. Also includes a few custom macros for cloning, installing, etc.",
   "keywords": [
     "cli",
@@ -33,8 +33,6 @@
     "manual": "nodejs src/commands/fs/manual.js",
     "package": "nodejs src/commands/fs/package.js",
     "readme": "nodejs src/commands/fs/readme.js",
-    "remove": "nodejs src/commands/remove.js",
-    "replace": "nodejs src/commands/replace.js",
     "webpack": "nodejs src/commands/fs/webpack.js",
     "permissions": "chmod +rwx /home/ubuntu/.nvm/versions/node/v19.8.1/bin/coc"
   },
@@ -57,8 +55,8 @@
     "coc": "src/coc.js"
   },
   "dependencies": {
-    "@cocreate/config": "^1.2.0",
-    "@cocreate/file": "^1.4.0",
+    "@cocreate/config": "^1.4.0",
+    "@cocreate/file": "^1.5.3",
     "glob": "^7.1.7",
     "prettier": "^2.3.2"
   }

package/src/commands/config.js

@@ -4,7 +4,10 @@ module.exports = async function (repos, args) {
     let object = {}
     for (let arg of args) {
         arg = arg.split('=')
-        object[arg[0].substring(2)] = { value: arg[1] }
+        if (arg[0].startsWith('--'))
+            arg[0] = arg[0].substring(2)
+
+        object[arg[0]] = { value: arg[1] }
     }
 
     await config(object)

package/src/commands/fs/automated.js

@@ -4,24 +4,18 @@ const path = require("path")
 
 function globUpdater(er, files) {
 
-  if (er)
-    console.log(files, 'glob resolving issue')
-  else
-    files.forEach(filename => {
-
-      console.log(filename + '/automated.yml', 'glob resolving issue')
-      update(filename + '/automated.yml')
-    })
-
+    if (er)
+        console.log(files, 'glob resolving issue')
+    else
+        files.forEach(filename => {
+            update(filename + '/automated.yml')
+        })
+    console.log('Completed')
 }
 
-
-
-
 function update(YmlPath) {
-  let name = path.basename(path.resolve(path.dirname(YmlPath), '../..')).substring(9);
-  let fileContent = `name: Automated Workflow
-'on':
+    let fileContent = `name: Automated Workflow
+on:
   push:
     branches:
       - master
@@ -31,7 +25,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: setup nodejs
+      - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
           node-version: 16
@@ -39,103 +33,73 @@ jobs:
         uses: jaid/action-sync-node-meta@v1.4.0
         with:
           direction: overwrite-github
-          githubToken: '\${{ secrets.GITHUB }}'
+          githubToken: "\${{ secrets.GITHUB }}"
   release:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: setup nodejs
+      - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 14
       - name: Semantic Release
         uses: cycjimmy/semantic-release-action@v3
         id: semantic
         with:
           extra_plugins: |
             @semantic-release/changelog
-            @semantic-release/npm
             @semantic-release/git
             @semantic-release/github
         env:
-          GITHUB_TOKEN: '\${{ secrets.GITHUB_TOKEN }}'
-          NPM_TOKEN: '\${{ secrets.NPM_TOKEN }}'
+          GITHUB_TOKEN: "\${{ secrets.GITHUB }}"
+          NPM_TOKEN: "\${{ secrets.NPM_TOKEN }}"
     outputs:
-      new_release_published: '\${{ steps.semantic.outputs.new_release_published }}'
-      new_release_version: '\${{ steps.semantic.outputs.new_release_version }}'
-  cdn:
+      new_release_published: "\${{ steps.semantic.outputs.new_release_published }}"
+      new_release_version: "\${{ steps.semantic.outputs.new_release_version }}"
+  upload:
     runs-on: ubuntu-latest
     needs: release
     if: needs.release.outputs.new_release_published == 'true'
     env:
-      VERSION: '\${{ needs.release.outputs.new_release_version }}'
+      VERSION: "\${{ needs.release.outputs.new_release_version }}"
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: setup nodejs
+      - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
           node-version: 16
-      - name: yarn install
-        run: >
-          echo "//registry.npmjs.org/:_authToken=\${{ secrets.NPM_TOKEN }}" >
-          .npmrc
-
-          yarn install
-      - name: yarn build
+      - name: Set npm registry auth
+        run: echo "//registry.npmjs.org/:_authToken=\${{ secrets.NPM_TOKEN }}" > ~/.npmrc
+      - name: Install dependencies
+        run: yarn install
+      - name: Build
         run: yarn build
-      - name: upload bundle as version
-        uses: CoCreate-app/CoCreate-s3@master
-        with:
-          aws-key-id: '\${{ secrets.AWSACCESSKEYID }}'
-          aws-access-key: '\${{ secrets.AWSSECERTACCESSKEY }}'
-          bucket: testcrudbucket
-          source: ./dist
-          destination: '/${name}/\${{env.VERSION}}'
-          acl: public-read
-      - name: upload bundle as latest
-        uses: CoCreate-app/CoCreate-s3@master
-        with:
-          aws-key-id: '\${{ secrets.AWSACCESSKEYID }}'
-          aws-access-key: '\${{ secrets.AWSSECERTACCESSKEY }}'
-          bucket: testcrudbucket
-          source: ./dist
-          destination: /${name}/latest
-          acl: public-read
-          invalidations: true
-  docs:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: setup nodejs
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16
-      
-      - name: update documentation
-        uses: CoCreate-app/CoCreate-docs@master
+      - name: Set Environment Variables
+        run: |
+          echo "organization_id=\${{ secrets.COCREATE_ORGANIZATION_ID }}" >> $GITHUB_ENV
+          echo "key=\${{ secrets.COCREATE_KEY }}" >> $GITHUB_ENV
+          echo "host=\${{ secrets.COCREATE_HOST }}" >> $GITHUB_ENV
+      - name: CoCreate Upload
+        run: coc upload
 
 `;
-  // process.exit()
-  if (fs.existsSync(YmlPath))
-    fs.unlinkSync(YmlPath)
-  fs.writeFileSync(YmlPath, fileContent)
+    // process.exit()
+    if (fs.existsSync(YmlPath))
+        fs.unlinkSync(YmlPath)
+    fs.writeFileSync(YmlPath, fileContent)
 
 }
 
 
 
-// glob("../CoCreate-components/CoCreate-action/.github/workflows", globUpdater)
-glob("../CoCreate-components/*/.github/workflows/", globUpdater)
-glob("../CoCreate-apps/*/.github/workflows/", globUpdater)
-glob("../CoCreate-plugins/*/.github/workflows/", globUpdater)
-
-// substrin (9) removes CoCreateC leving namme as SS
-// glob("../CoCreateCSS/.github/workflows/", globUpdater)
-
-// does not need to add name... will require for name to be removed from destination
-// glob("../CoCreateJS/.github/workflows/", globUpdater)
+// glob("/home/cocreate/CoCreate/CoCreate-components/CoCreate-actions/.github/workflows", globUpdater)
+glob("/home/cocreate/CoCreate/CoCreate-components/*/.github/workflows/", globUpdater)
+glob("/home/cocreate/CoCreate/CoCreate-apps/*/.github/workflows/", globUpdater)
+glob("/home/cocreate/CoCreate/CoCreate-plugins/*/.github/workflows/", globUpdater)
 
-console.log('finished')
+glob("/home/cocreate/CoCreate/CoCreate-admin/.github/workflows/", globUpdater)
+glob("/home/cocreate/CoCreate/CoCreateCSS/.github/workflows/", globUpdater)
+glob("/home/cocreate/CoCreate/CoCreateJS/.github/workflows/", globUpdater)
+glob("/home/cocreate/CoCreate/CoCreate-wesite/.github/workflows/", globUpdater)

package/src/commands/other/certBotWildcard.js

@@ -1,3 +1,5 @@
+#!/usr/bin/env node
+
 const { spawn } = require('child_process');
 
 function runCertbot() {
@@ -9,24 +11,35 @@ function runCertbot() {
             '-d', '*.cocreate.zone',
             '-d', 'cocreate.zone',
             '--agree-tos',
-            '-m', 'admin@cocreate.app',
+            '-m', 'admin@cocreate.zone',
             '--preferred-challenges', 'dns-01',
             '--server', 'https://acme-v02.api.letsencrypt.org/directory'
         ]);
 
-        let promptsCount = 0;
+        // let promptsCount = 0;
 
         certbotProcess.stdout.on('data', (data) => {
             const output = data.toString();
-            if (output.includes('Enter your response here')) {
-                promptsCount++;
-                if (promptsCount === 1) {
-                    certbotProcess.stdin.write('Your first response\n');
-                } else if (promptsCount === 2) {
-                    certbotProcess.stdin.write('Your second response\n');
-                } else if (promptsCount === 3) {
-                    certbotProcess.stdin.write('Your third response\n');
+            if (output.includes('Please deploy a DNS TXT record under the name:')) {
+                const namePattern = /Please deploy a DNS TXT record under the name:\s+([\w\.-]+)\./;
+                const valuePattern = /with the following value:\s+([\w\d]+)\s+/;
+
+                const nameMatch = output.match(namePattern);
+                const valueMatch = output.match(valuePattern);
+
+                if (nameMatch && valueMatch) {
+                    const name = nameMatch[1];
+                    const value = valueMatch[1];
+
+                    console.log("Name:", name);
+                    console.log("Value:", value);
+                } else {
+                    console.log("Name or value not found in the text.");
                 }
+                // TODO: send name and value to client and wait for clients response before continuing
+                certbotProcess.stdin.write('\n');
+            } else if (output.includes('Press Enter to Continue')) {
+                certbotProcess.stdin.write('\n');
             }
         });
 

package/src/commands/upload.js

@@ -1,5 +1,42 @@
 const file = require('@cocreate/file')
+const path = require('path');
+const fs = require('fs');
 
 module.exports = async function upload(repos, args) {
-    await file()
+    let CoCreateConfig
+    if (!args.length) {
+        let configFile = path.resolve(process.cwd(), 'CoCreate.config.js');
+        if (!CoCreateConfig && fs.existsSync(configFile)) {
+            CoCreateConfig = require(configFile);
+        } else {
+            console.log('CoCreate.config.js could not be found.')
+            process.exit()
+        }
+
+        await file(CoCreateConfig)
+
+    } else {
+        for (let arg of args) {
+            try {
+                CoCreateConfig = JSON.parse(arg)
+            } catch (error) { }
+
+
+            if (!CoCreateConfig) {
+                try {
+                    let configPath = path.resolve(process.cwd(), arg)
+                    if (fs.existsSync(configPath)) {
+                        CoCreateConfig = require(configPath);
+                        if (CoCreateConfig)
+                            await file(CoCreateConfig, configPath)
+
+                    } else {
+                        console.log(arg + ' could not be found.')
+                        process.exit()
+                    }
+
+                } catch (error) { }
+            }
+        }
+    }
 }

package/src/loaders/replace-unicode.js

@@ -0,0 +1,3 @@
+module.exports = function (source) {
+    return source.replace(/\$'/g, '\\u0024\'');
+};