Merge branch 'develop' of github.com:filestack/filestack-js into develop

Author: pcholuj

.github/workflows/deploy.yml

@@ -0,0 +1,65 @@
+name: filestack-js
+on:
+  create:
+    tags:
+      - v*
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    # - uses: voxmedia/github-action-slack-notify-build@v1
+    #   with:
+    #     channel: team-charlie
+    #     status: STARTED
+    #     color: good
+    #   env:
+    #     SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+    - uses: actions/checkout@v2
+    - name: Setup repository env
+      uses: actions/setup-node@v1
+      with:
+        node-version: '14.x'
+        registry-url: "https://registry.npmjs.org"
+    - name: Install deps
+      run: npm install
+    - name: Run tests
+      run: npm test
+    - name: Update code cov report
+      run: npm run test:codecov
+    - name: Prepare docs
+      run: npm run docs
+    - name: Publish package to cdn
+      run: npm run publish:s3
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        AWS_REGION: ${{ secrets.AWS_REGION }}
+    - name: Publush to NPM (only on tag)
+      run: npm publish --access public
+      env:
+        NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+    - name: Deploy docs
+      uses: crazy-max/ghaction-github-pages@v2
+      with:
+          target_branch: gh-pages
+          build_dir: build/docs
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    # - name: Notify slack success
+    #   if: success()
+    #   env:
+    #     SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+    #   uses: voxmedia/github-action-slack-notify-build@v1
+    #   with:
+    #     channel: team-charlie
+    #     status: SUCCESS
+    #     color: good
+    # - name: Notify slack fail
+    #   if: failure()
+    #   env:
+    #     SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
+    #   uses: voxmedia/github-action-slack-notify-build@v1
+    #   with:
+    #     channel: team-charlie
+    #     status: FAILED
+    #     color: danger

.github/workflows/deploy_beta.yml

@@ -0,0 +1,27 @@
+name: filestack-js
+on:
+  create:
+    tags:
+      - v*
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup repository env
+      uses: actions/setup-node@v1
+      with:
+        node-version: '14.x'
+        registry-url: "https://registry.npmjs.org"
+    - name: Install deps
+      run: npm install
+    - name: Run tests
+      run: npm test
+    - name: Prepare docs
+      run: npm run docs
+    - name: Publish package to cdn - beta version
+      run: npm run publish:s3:beta
+      env:
+        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+        AWS_REGION: ${{ secrets.AWS_REGION }}

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [3.21.1](https://github.com/filestack/filestack-js/compare/v3.21.0...v3.21.1) (2021-01-25)
+
+
+### Bug Fixes
+
+* **picker:** fix accept option in picker, bump version to 1.20.1 ([7e48a30](https://github.com/filestack/filestack-js/commit/7e48a307f898a40f131e2b72c188adc3c259bab5))
+
 ## [3.21.0](https://github.com/filestack/filestack-js/compare/v3.20.0...v3.21.0) (2021-01-13)
 
 

README.md

@@ -19,7 +19,7 @@
   <a href="https://static.filestackapi.com/filestack-js/3.x.x/filestack.min.js"><img src="https://img.badgesize.io/https://static.filestackapi.com/filestack-js/3.x.x/filestack.min.js?color=green" /></a>
   <img src="https://img.shields.io/badge/module%20formats-umd%2C%20esm%2C%20cjs-green.svg" />
   <br/>
-  <img src="https://badges.herokuapp.com/browsers?labels=none&googlechrome=latest&firefox=latest&microsoftedge=latest&iexplore=11&safari=latest&iphone=latest" />
+  <img src="https://badges.herokuapp.com/browsers?labels=none&googlechrome=latest&firefox=latest&microsoftedge=latest&edge=latest&safari=latest&iphone=latest" />
 </p>
 <hr/>
 
@@ -174,6 +174,7 @@ Please see our examples above to learn more about customizing the picker for you
 ## Polyfills
 
 If you target IE11 or iOS before 8.0 you will need to add additional polyfills to your page or application.
+(We are no longer support IE11 and older browser, so it can stop working on this browser)
 
 Polyfills we recommend:**
 

manual_tests/request.ts

@@ -15,34 +15,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const nock = require('nock');
+// const nock = require('nock');
 import { FsRequest } from './../src/lib/request/index';
-import { FsCancelToken } from './../src/lib/request/token';
+// import { FsCancelToken } from './../src/lib/request/token';
 
-nock('http://www.filestacktest.com')
-  .get('/123')
-  .once()
-  // .delay(1000)
-  .reply(404, '<html></html>', { 'content-type': 'text/plain' })
-  .get('/123')
-  .reply(200, '<html></html>', { 'content-type': 'text/plain' });
+// nock('http://www.filestacktest.com')
+//   .get('/123')
+//   .once()
+//   // .delay(1000)
+//   .reply(404, '<html></html>', { 'content-type': 'text/plain' })
+//   .get('/123')
+//   .reply(200, '<html></html>', { 'content-type': 'text/plain' });
 
-const token = new FsCancelToken();
+// const token = new FsCancelToken();
 
 // setTimeout(() => {
 //   token.cancel();
 // }, 1000);
 
-FsRequest.get('http://www.filestacktest.com/123', {
-  cancelToken: token,
-  timeout: 500,
-  retry: {
-    retry: 2,
-    retryFactor: 2,
-    retryMaxTime: 1500,
-  },
+FsRequest.get('https://cdn.filestackcontent.com/llIbWqvRX25JPxCBqkoV', {
+  // cancelToken: token,
+  // timeout: 500,
 }).then((resp) => {
-  console.log('Response:', resp);
+  console.log('Response:', resp.data);
+  console.log(resp.data.file.length);
 }).catch((e) => {
   console.error('Catch Errror', e);
 });

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "filestack-js",
-  "version": "3.21.0",
+  "version": "3.21.1",
   "description": "Official JavaScript library for Filestack",
   "main": "build/main/index.js",
   "module": "build/module/index.js",
@@ -30,8 +30,8 @@
     "docs:publish": "npm run docs && gh-pages -d build/docs",
     "release": "standard-version",
     "prepare": "npm run build",
-    "publish:beta": "npm run build && node scripts/publish.js --beta",
-    "publish": "npm run docs:publish && node scripts/publish.js --current --latest",
+    "publish:s3:beta": "npm run build && node scripts/publish.js --beta",
+    "publish:s3": "npm run docs:publish && node scripts/publish.js --current --latest",
     "cache:clean": "node scripts/cache.js --current --latest",
     "cache:clean:beta": "node scripts/cache.js --beta",
     "examples": "npm run build && node ./examples/examples.js"
@@ -54,7 +54,7 @@
     "lodash.clonedeep": "^4.5.0",
     "p-queue": "^4.0.0",
     "spark-md5": "^3.0.0",
-    "ts-node": "^8.10.1"
+    "ts-node": "^8.10.2"
   },
   "devDependencies": {
     "@babel/core": "^7.8.4",

package.json

@@ -11,6 +11,10 @@ const git = require('git-state');
 
 const s3 = new AWS.S3();
 const DEPLOY_BRANCH = 'master';
+const repositoryExists = git.isGitSync(path);
+const currentBranch = git.checkSync(path);
+
+console.log('CURRENT BRANCH IS: ', currentBranch);
 
 const figureOutFileMimetype = (filePath) => {
   const type = mime.lookup(Path.extname(filePath));
@@ -21,7 +25,7 @@ const figureOutFileMimetype = (filePath) => {
   return 'application/octet-stream';
 };
 
-const pushOneFileToS3 = (basePath, to, cacheControllDays = 1) => {
+const pushOneFileToS3 = (basePath, to, cacheControll = 1) => {
   return new Promise(async (resolve, reject) => {
     file = Path.basename(basePath);
 
@@ -33,7 +37,7 @@ const pushOneFileToS3 = (basePath, to, cacheControllDays = 1) => {
       Bucket: to.bucket,
       Key: uploadKey,
       Body: content,
-      CacheControl: `max-age=${cacheControll * 60 * 60 * 24}` || 'max-age=86400',
+      CacheControl: `max-age=${cacheControllDays * 60 * 60 * 24}` || 'max-age=86400',
       ContentType: figureOutFileMimetype(basePath),
     };
 
@@ -50,14 +54,11 @@ const pushOneFileToS3 = (basePath, to, cacheControllDays = 1) => {
 
 const canDeploy = () => {
   const path = './';
-  const repositoryExists = git.isGitSync(path);
 
   if (!repositoryExists) {
     throw new Error('Cannot read repository')
   }
 
-  const currentBranch = git.checkSync(path);
-
   // if we cant get info about branch stop deploy
   if (!currentBranch) {
     throw new Error('Cant get info about branch');

scripts/publish.js

@@ -18,7 +18,7 @@
 /**
  * @private
  */
-const PICKER_VERSION = '1.20.0';
+const PICKER_VERSION = '1.20.1';
 
 /**
  * @private

src/config.ts

@@ -31,13 +31,13 @@
  * limitations under the License.
  */
 
-import { retrieve, remove, metadata } from './file';
+import { retrieve, remove, metadata, download } from './file';
 import { FsRequest } from './../request';
 import { Session } from '../client';
 import { config } from './../../config';
 
 jest.mock('./../request');
-jest.mock('./../filelink');
+// jest.mock('./../filelink');
 
 const mockedSession: Session = {
   apikey: 'fakeApikey',
@@ -95,6 +95,19 @@ describe('FileAPI', () => {
     });
   });
 
+  describe('Download', () => {
+    it('should return buffer on download request', async () => {
+      const testResp = Buffer.from('123');
+      const methodMocked = jest.fn(() => Promise.resolve(testResp));
+
+      // @ts-ignore
+      FsRequest.dispatch.mockImplementation(methodMocked);
+      const resp = await download(mockedSession, 'gNDNCDWNTKqoGFISdd2A');
+
+      expect(resp).toEqual(testResp);
+    });
+  });
+
   describe('Remove', () => {
     it('should call remove', async () => {
       const deleteMocked = jest.fn(() => Promise.resolve({ data: {} }));