Skip to content

Commit d7655a8

Browse files
sethk4783sethk4783
authored
Merge branch 'master' into develop
2 parents 9d5d808 + ec8a950 commit d7655a8

38 files changed

+39350
-14263
lines changed

‎.eslintrc.js‎

Lines changed: 143 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,143 @@
1+
module.exports = {
2+
"env": {
3+
"browser": true,
4+
"node": true
5+
},
6+
"extends": [
7+
"prettier"
8+
],
9+
"parser": "@typescript-eslint/parser",
10+
"parserOptions": {
11+
"project": "tsconfig.json",
12+
"sourceType": "module"
13+
},
14+
"plugins": [
15+
"eslint-plugin-import",
16+
"eslint-plugin-jsdoc",
17+
"@typescript-eslint"
18+
],
19+
"root": true,
20+
"rules": {
21+
"@typescript-eslint/await-thenable": "error",
22+
"@typescript-eslint/consistent-type-assertions": "error",
23+
"@typescript-eslint/member-delimiter-style": "off",
24+
"@typescript-eslint/naming-convention": [
25+
"error",
26+
{
27+
"selector": "variable",
28+
"format": [
29+
"camelCase",
30+
"UPPER_CASE",
31+
"PascalCase"
32+
],
33+
"leadingUnderscore": "allow",
34+
"trailingUnderscore": "forbid"
35+
}
36+
],
37+
"@typescript-eslint/no-empty-function": "error",
38+
"@typescript-eslint/no-floating-promises": "error",
39+
"@typescript-eslint/no-misused-new": "error",
40+
"@typescript-eslint/no-unnecessary-qualifier": "error",
41+
"@typescript-eslint/no-unnecessary-type-assertion": "error",
42+
"@typescript-eslint/no-unused-expressions": [
43+
"error",
44+
{
45+
"allowTaggedTemplates": true,
46+
"allowShortCircuit": true
47+
}
48+
],
49+
"@typescript-eslint/no-unused-vars": "off",
50+
"@typescript-eslint/prefer-namespace-keyword": "error",
51+
"@typescript-eslint/quotes": "off",
52+
"@typescript-eslint/semi": "off",
53+
"@typescript-eslint/triple-slash-reference": [
54+
"error",
55+
{
56+
"path": "always",
57+
"types": "prefer-import",
58+
"lib": "always"
59+
}
60+
],
61+
"@typescript-eslint/type-annotation-spacing": "error",
62+
"@typescript-eslint/unified-signatures": "error",
63+
"brace-style": [
64+
"error",
65+
"1tbs"
66+
],
67+
"comma-dangle": [
68+
"error",
69+
{
70+
"objects": "always-multiline",
71+
"arrays": "always-multiline",
72+
"functions": "never"
73+
}
74+
],
75+
"curly": [
76+
"error",
77+
"multi-line"
78+
],
79+
"eol-last": "error",
80+
"eqeqeq": [
81+
"error",
82+
"smart"
83+
],
84+
"id-denylist": [
85+
"error",
86+
"any",
87+
"Number",
88+
"number",
89+
"String",
90+
"string",
91+
"Boolean",
92+
"boolean",
93+
"Undefined",
94+
"undefined"
95+
],
96+
"id-match": "error",
97+
"import/no-deprecated": "off",
98+
"jsdoc/check-alignment": "error",
99+
"jsdoc/check-indentation": "off",
100+
"jsdoc/newline-after-description": "off",
101+
"new-parens": "error",
102+
"no-caller": "error",
103+
"no-cond-assign": "error",
104+
"no-constant-condition": "error",
105+
"no-control-regex": "error",
106+
"no-duplicate-imports": "error",
107+
"no-empty": "error",
108+
"no-empty-function": "off",
109+
"no-eval": "error",
110+
"no-fallthrough": "error",
111+
"no-invalid-regexp": "error",
112+
"no-multiple-empty-lines": "error",
113+
"no-redeclare": "error",
114+
"no-regex-spaces": "error",
115+
"no-return-await": "error",
116+
"no-throw-literal": "error",
117+
"no-trailing-spaces": "error",
118+
"no-underscore-dangle": "off",
119+
"no-unused-expressions": "off",
120+
"no-unused-labels": "error",
121+
"no-unused-vars": "off",
122+
"no-var": "error",
123+
"one-var": [
124+
"error",
125+
"never"
126+
],
127+
"radix": "error",
128+
"space-in-parens": [
129+
"error",
130+
"never"
131+
],
132+
"spaced-comment": [
133+
"error",
134+
"always",
135+
{
136+
"markers": [
137+
"/"
138+
]
139+
}
140+
],
141+
"use-isnan": "error"
142+
}
143+
};

‎.github/workflows/deploy_beta.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: filestack-js-beta
22
on:
33
push:
4-
branches: [ develop ]
4+
branches: [ development ]
55
jobs:
66
build:
77
runs-on: ubuntu-latest

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v12.6.0
1+
v20.10.0

‎CHANGELOG.md‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,31 @@
22

33
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.
44

5+
## [3.29.0](https://github.com/filestack/filestack-js/compare/v3.28.0...v3.29.0) (2024-01-05)
6+
7+
### Updgrade
8+
* **file-type:** Upgraded file-type to v16.5.4.
9+
10+
## [3.28.0](https://github.com/filestack/filestack-js/compare/v3.27.0...v3.28.0) (2023-12-12)
11+
12+
### Updgrade
13+
* **Dependency-upgrade:** Upgraded packages to the latest possible version while maintaining backward compatibility.
14+
15+
## [3.27.0](https://github.com/filestack/filestack-js/compare/v3.26.1...v3.27.0) (2023-08-07)
16+
17+
### Fix
18+
* **fast-xml-parser:** It's a security upgrade based on ([#518](https://github.com/filestack/filestack-js/issues/518)) . Dependabot did the version bump and then fixed the tests([#521](https://github.com/filestack/filestack-js/pull/521)).
19+
20+
## [3.26.1](https://github.com/filestack/filestack-js/compare/v3.26.0...v3.26.1) (2023-04-06)
21+
22+
### Fix
23+
* **picker:** Fixed console error during file select and upload
24+
25+
## [3.26.0](https://github.com/filestack/filestack-js/compare/v3.25.0...v3.26.0) (2023-03-30)
26+
### Feature
27+
* **picker:** Added possibility to predefine the results for the imagesearch in Picker
28+
* **picker:** Picker - Display Unsplash Search and Good Old Image Search as two tabs of one "source"
29+
530
## [3.25.0](https://github.com/filestack/filestack-js/compare/v3.24.1...v3.25.0) (2021-10-05)
631

732

‎examples/examples.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ app.get('/*', (req, res) => {
101101
return;
102102
}
103103

104-
const config = yaml.safeLoad(filesContent.config);
104+
const config = yaml.load(filesContent.config);
105105
let tpl = template + '';
106106
tpl = tpl.replace('{{title}}', config.name || '')
107107
.replace('{{content}}', filesContent.index)

‎jest.config.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
module.exports = {
2-
name: 'filestack-js',
32
collectCoverage: true,
43
clearMocks: true,
54
projects: [
@@ -11,11 +10,11 @@ module.exports = {
1110
moduleFileExtensions: ['js'],
1211
}, {
1312
displayName: 'Browser',
14-
testMatch: ['<rootDir>/src/**/*.browser.spec.ts'],
13+
testMatch: ['<rootDir>/build/main/**/*.spec.browser.js'],
1514
clearMocks: true,
1615
testEnvironment: 'jsdom',
16+
setupFilesAfterEnv: ['<rootDir>/build/main/jest_browser_setup.js'],
1717
setupFiles: ['jest-localstorage-mock'],
18-
testMatch: [ '<rootDir>/build/main/**/*.spec.browser.js'],
1918
moduleFileExtensions: ['js'],
2019
moduleNameMapper: {
2120
"\(.*)\\.node": "$1.browser",

0 commit comments

Comments
 (0)