@cocreate/file 1.5.2 → 1.5.3

package/.github/workflows/automated.yml

@@ -1,123 +1,70 @@
-name: Automated
-"on":
-    push:
-        branches:
-            - master
+name: Automated Workflow
+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 }}"
-    cdn:
-        runs-on: ubuntu-latest
-        needs: release
-        if: needs.release.outputs.new_release_published == 'true'
+  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:
-            VERSION: "${{ needs.release.outputs.new_release_version }}"
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v3
-            - name: setup nodejs
-              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
-              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: "/file/${{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: /file/latest
-                  acl: public-read
-                  invalidations: true
-    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
+          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
 
-    # 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 }}

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [1.5.3](https://github.com/CoCreate-app/CoCreate-file/compare/v1.5.2...v1.5.3) (2023-08-21)
+
+
+### Bug Fixes
+
+* /dist/CoCreate.js updated to https://CoCreate.app/dist/CoCreate.js ([0903b42](https://github.com/CoCreate-app/CoCreate-file/commit/0903b4285c3e798b5631e6bd251d58ff3bf9e619))
+* removed handeling of resolving static configPath CoCreate.config.js ([53604bb](https://github.com/CoCreate-app/CoCreate-file/commit/53604bbdb25d8e89e53469d725ae90d90d1ab4d7))
+* replace cdn with /dist ([b305020](https://github.com/CoCreate-app/CoCreate-file/commit/b305020846b839ac147f26b19c68f881c7b0b41c))
+* update file uploader ([9fa12e8](https://github.com/CoCreate-app/CoCreate-file/commit/9fa12e8dd0c7a396778bb5aa7c71b745ef1945af))
+
 ## [1.5.2](https://github.com/CoCreate-app/CoCreate-file/compare/v1.5.1...v1.5.2) (2023-08-18)
 
 

package/demo/index.html

@@ -60,6 +60,6 @@
 
         <!-- <script src="../dist/CoCreate-file.js"></script> -->
         <script src="../../../CoCreateJS/dist/CoCreate.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/docs/index.html

@@ -378,6 +378,6 @@
             </button>
         </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/file",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "A headless file uploader that uses HTML5 attributes for customization. Allows easy upload of files to server.",
   "keywords": [
     "file",

package/src/server.js

@@ -77,16 +77,7 @@ const mimeTypes = {
     ".7z": "application/x-7z-compressed"
 }
 
-module.exports = async function file(CoCreateConfig) {
-
-    let configFile = path.resolve(process.cwd(), 'CoCreate.config.js');
-    if (fs.existsSync(configFile)) {
-        CoCreateConfig = require(configFile);
-    } else {
-        console.log('CoCreate.config.js could not be found.')
-        process.exit()
-    }
-
+module.exports = async function file(CoCreateConfig, configPath) {
     let { directories, sources } = CoCreateConfig;
     let config = await Config({
         organization_id: {
@@ -113,7 +104,7 @@ module.exports = async function file(CoCreateConfig) {
                 }
             }
         }
-    })
+    }, null, null, configPath)
 
     if (!config.organization_id || !config.host || !config.key && (!config.password || config.email)) {
         console.log('One or more required config params could not be found')
@@ -170,7 +161,15 @@ module.exports = async function file(CoCreateConfig) {
         let files = fs.readdirSync(entry);
 
         for (let file of files) {
-            if (exclude && exclude.includes(file)) continue
+            let skip = false
+            for (let i = 0; i < exclude.length; i++) {
+                if (file.includes(exclude)) {
+                    skip = true
+                    break;
+                }
+            }
+            if (skip) continue
+
 
             let isDirectory = fs.existsSync(`${entry}/${file}`) && fs.lstatSync(`${entry}/${file}`).isDirectory();
             let name = file
@@ -199,8 +198,6 @@ module.exports = async function file(CoCreateConfig) {
             else
                 pathName = '/' + name
 
-            if (exclude && exclude.includes(pathName)) continue
-
             if (isDirectory)
                 mimeType = "text/directory"
             else
@@ -377,6 +374,8 @@ module.exports = async function file(CoCreateConfig) {
 
     async function runStore(data) {
         try {
+            if (data.object.name === 'prism-chunk.js')
+                console.log('prism-chunk.js')
             let response;
             if (!data.object._id && !data.filter) {
                 response = await crud.send({
@@ -424,9 +423,8 @@ module.exports = async function file(CoCreateConfig) {
 
             delete newConfig.url
             delete newConfig.broadcast
-            const write_str = `module.exports = ${JSON.stringify(newConfig, null, 4)};`;
 
-            fs.writeFileSync(configFile, write_str);
+            fs.writeFileSync(configPath, `module.exports = ${JSON.stringify(newConfig, null, 4)};`);
         }
 
         console.log('upload complete!');