Merge branch 'master' into development

filestack · Jan 3, 2024 · bee0827 · bee0827
2 parents aa3705d + 208570b
commit bee0827
Show file tree

Hide file tree

Showing 32 changed files with 21,479 additions and 16,905 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -0,0 +1,143 @@
+module.exports = {
+    "env": {
+        "browser": true,
+        "node": true
+    },
+    "extends": [
+        "prettier"
+    ],
+    "parser": "@typescript-eslint/parser",
+    "parserOptions": {
+        "project": "tsconfig.json",
+        "sourceType": "module"
+    },
+    "plugins": [
+        "eslint-plugin-import",
+        "eslint-plugin-jsdoc",
+        "@typescript-eslint"
+    ],
+    "root": true,
+    "rules": {
+        "@typescript-eslint/await-thenable": "error",
+        "@typescript-eslint/consistent-type-assertions": "error",
+        "@typescript-eslint/member-delimiter-style": "off",
+        "@typescript-eslint/naming-convention": [
+            "error",
+            {
+                "selector": "variable",
+                "format": [
+                    "camelCase",
+                    "UPPER_CASE",
+                    "PascalCase"
+                ],
+                "leadingUnderscore": "allow",
+                "trailingUnderscore": "forbid"
+            }
+        ],
+        "@typescript-eslint/no-empty-function": "error",
+        "@typescript-eslint/no-floating-promises": "error",
+        "@typescript-eslint/no-misused-new": "error",
+        "@typescript-eslint/no-unnecessary-qualifier": "error",
+        "@typescript-eslint/no-unnecessary-type-assertion": "error",
+        "@typescript-eslint/no-unused-expressions": [
+            "error",
+            {
+                "allowTaggedTemplates": true,
+                "allowShortCircuit": true
+            }
+        ],
+        "@typescript-eslint/no-unused-vars": "off",
+        "@typescript-eslint/prefer-namespace-keyword": "error",
+        "@typescript-eslint/quotes": "off",
+        "@typescript-eslint/semi": "off",
+        "@typescript-eslint/triple-slash-reference": [
+            "error",
+            {
+                "path": "always",
+                "types": "prefer-import",
+                "lib": "always"
+            }
+        ],
+        "@typescript-eslint/type-annotation-spacing": "error",
+        "@typescript-eslint/unified-signatures": "error",
+        "brace-style": [
+            "error",
+            "1tbs"
+        ],
+        "comma-dangle": [
+            "error",
+            {
+                "objects": "always-multiline",
+                "arrays": "always-multiline",
+                "functions": "never"
+            }
+        ],
+        "curly": [
+            "error",
+            "multi-line"
+        ],
+        "eol-last": "error",
+        "eqeqeq": [
+            "error",
+            "smart"
+        ],
+        "id-denylist": [
+            "error",
+            "any",
+            "Number",
+            "number",
+            "String",
+            "string",
+            "Boolean",
+            "boolean",
+            "Undefined",
+            "undefined"
+        ],
+        "id-match": "error",
+        "import/no-deprecated": "off",
+        "jsdoc/check-alignment": "error",
+        "jsdoc/check-indentation": "off",
+        "jsdoc/newline-after-description": "off",
+        "new-parens": "error",
+        "no-caller": "error",
+        "no-cond-assign": "error",
+        "no-constant-condition": "error",
+        "no-control-regex": "error",
+        "no-duplicate-imports": "error",
+        "no-empty": "error",
+        "no-empty-function": "off",
+        "no-eval": "error",
+        "no-fallthrough": "error",
+        "no-invalid-regexp": "error",
+        "no-multiple-empty-lines": "error",
+        "no-redeclare": "error",
+        "no-regex-spaces": "error",
+        "no-return-await": "error",
+        "no-throw-literal": "error",
+        "no-trailing-spaces": "error",
+        "no-underscore-dangle": "off",
+        "no-unused-expressions": "off",
+        "no-unused-labels": "error",
+        "no-unused-vars": "off",
+        "no-var": "error",
+        "one-var": [
+            "error",
+            "never"
+        ],
+        "radix": "error",
+        "space-in-parens": [
+            "error",
+            "never"
+        ],
+        "spaced-comment": [
+            "error",
+            "always",
+            {
+                "markers": [
+                    "/"
+                ]
+            }
+        ],
+        "use-isnan": "error"
+    }
+};
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v12.6.0
+v20.10.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 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.28.0](https://github.com/filestack/filestack-js/compare/v3.27.0...v3.28.0) (2023-12-12)
+
+### Updgrade
+  * **Dependency-upgrade:** Upgraded packages to the latest possible version while maintaining backward compatibility. 
+
+## [3.27.0](https://github.com/filestack/filestack-js/compare/v3.26.1...v3.27.0) (2023-08-07)
+
+### Fix
+  * **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)).
+
 ## [3.26.1](https://github.com/filestack/filestack-js/compare/v3.26.0...v3.26.1) (2023-04-06)
 
 ### Fix

diff --git a/examples/examples.js b/examples/examples.js
@@ -101,7 +101,7 @@ app.get('/*', (req, res) => {
       return;
     }
 
-    const config = yaml.safeLoad(filesContent.config);
+    const config = yaml.load(filesContent.config);
     let tpl = template + '';
     tpl = tpl.replace('{{title}}', config.name || '')
       .replace('{{content}}', filesContent.index)

diff --git a/jest.config.js b/jest.config.js
@@ -1,5 +1,4 @@
 module.exports = {
-  name: 'filestack-js',
   collectCoverage: true,
   clearMocks: true,
   projects: [
@@ -11,11 +10,11 @@ module.exports = {
     moduleFileExtensions: ['js'],
   }, {
     displayName: 'Browser',
-    testMatch: ['<rootDir>/src/**/*.browser.spec.ts'],
+    testMatch: ['<rootDir>/build/main/**/*.spec.browser.js'],
     clearMocks: true,
     testEnvironment: 'jsdom',
+    setupFilesAfterEnv: ['<rootDir>/build/main/jest_browser_setup.js'],
     setupFiles: ['jest-localstorage-mock'],
-    testMatch: [ '<rootDir>/build/main/**/*.spec.browser.js'],
     moduleFileExtensions: ['js'],
     moduleNameMapper: {
       "\(.*)\\.node": "$1.browser",