Merge branch 'master' into video-overlay-bug-fix

.gitignore

@@ -73,4 +73,3 @@ maven
 # Storybook
 storybook-static/
 storybook-static-old/
-.npmrc

lerna.json

@@ -2,5 +2,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "5.0.72"
+  "version": "5.0.73"
 }

package.json

@@ -54,7 +54,6 @@
     "packages/*"
   ],
   "dependencies": {
-    "pro-gallery": "3.1.38",
     "start-server-and-test": "^1.10.6"
   }
 }

packages/blueprints/.eslintrc

@@ -14,5 +14,6 @@
         "prettier/@typescript-eslint"
     ],
     "rules": {
+        "@typescript-eslint/no-explicit-any": "off"
     }
 }

packages/blueprints/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pro-gallery-blueprints",
-  "version": "5.0.72",
+  "version": "5.0.73",
   "private": false,
   "author": {
     "name": "Nir Naor",
@@ -27,10 +27,10 @@
     "lint:fix": "npm run lint -- --fix"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^4.8.1",
-    "@typescript-eslint/parser": "^4.8.1",
+    "@typescript-eslint/eslint-plugin": "6.12.0",
+    "@typescript-eslint/parser": "6.12.0",
     "chai": "^4.2.0",
-    "eslint": "^7.13.0",
+    "eslint": "8.54.0",
     "eslint-config-prettier": "^6.15.0",
     "eslint-plugin-prettier": "^3.1.4",
     "lodash": "^4.17.21",
@@ -41,8 +41,8 @@
     "typescript": "^4.9.5"
   },
   "dependencies": {
-    "pro-gallery-lib": "5.0.72",
-    "pro-layouts": "5.0.72"
+    "pro-gallery-lib": "5.0.73",
+    "pro-layouts": "5.0.73"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"

packages/gallery/eslintTSConfig.js

@@ -1,4 +1,6 @@
 module.exports = {
   extends: ['plugin:@typescript-eslint/eslint-recommended', 'plugin:@typescript-eslint/recommended'],
-  rules: {},
+  rules: {
+    '@typescript-eslint/no-explicit-any': 'off',
+  },
 };

packages/gallery/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "pro-gallery",
-  "version": "5.0.72",
+  "version": "5.0.73",
   "sideEffects": [
     "./src/components/styles/gallery.scss"
   ],
@@ -38,9 +38,9 @@
   "dependencies": {
     "@vimeo/player": "2.8.2",
     "hls.js": "1.4.12",
-    "pro-gallery-blueprints": "5.0.72",
-    "pro-gallery-lib": "5.0.72",
-    "pro-layouts": "5.0.72",
+    "pro-gallery-blueprints": "5.0.73",
+    "pro-gallery-lib": "5.0.73",
+    "pro-layouts": "5.0.73",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-player": "2.11.0",
@@ -55,14 +55,14 @@
     "@testing-library/react": "^14.0.0",
     "@types/react": "^18.2.0",
     "@types/three": "0.143.1",
-    "@typescript-eslint/eslint-plugin": "^4.8.1",
-    "@typescript-eslint/parser": "^4.8.1",
+    "@typescript-eslint/eslint-plugin": "6.12.0",
+    "@typescript-eslint/parser": "6.12.0",
     "babel-jest": "^29.6.2",
     "babelify": "^10.0.0",
     "chai": "^4.2.0",
     "chai-spies": "^0.7.1",
     "concurrently": "^6.1.0",
-    "eslint": "^7.13.0",
+    "eslint": "8.54.0",
     "eslint-config-prettier": "^6.15.0",
     "eslint-plugin-prettier": "^3.1.4",
     "jest": "^29.6.2",

packages/layouts/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "pro-layouts",
   "sideEffects": false,
-  "version": "5.0.72",
+  "version": "5.0.73",
   "author": {
     "name": "Guy Sopher",
     "email": "[email protected]"
@@ -26,11 +26,11 @@
     "lint:fix": "npm run lint -- --fix"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^4.8.1",
-    "@typescript-eslint/parser": "^4.8.1",
+    "@typescript-eslint/eslint-plugin": "6.12.0",
+    "@typescript-eslint/parser": "6.12.0",
     "chai": "^4.2.0",
     "deep-freeze": "0.0.1",
-    "eslint": "^7.13.0",
+    "eslint": "8.54.0",
     "eslint-config-prettier": "^6.15.0",
     "eslint-plugin-prettier": "^3.1.4",
     "mocha": "^8.2.1",
@@ -43,6 +43,6 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "pro-gallery-lib": "5.0.72"
+    "pro-gallery-lib": "5.0.73"
   }
 }

packages/lib/.eslintrc

@@ -13,7 +13,7 @@
         "plugin:prettier/recommended",
         "prettier/@typescript-eslint"
     ],
-    "ignorePatterns": ['standaloneValidateCode.js'],
+    "ignorePatterns": ["standaloneValidateCode.js", "optionsMap.js"],
     "rules": {
     }
 }

packages/lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pro-gallery-lib",
-  "version": "5.0.72",
+  "version": "5.0.73",
   "private": false,
   "author": {
     "name": "Rita Bazak",
@@ -28,12 +28,12 @@
     "lint:fix": "npm run lint -- --fix"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^4.8.1",
-    "@typescript-eslint/parser": "^4.8.1",
+    "@typescript-eslint/eslint-plugin": "6.12.0",
+    "@typescript-eslint/parser": "6.12.0",
     "ajv": "^8.6.0",
     "browserify": "^17.0.0",
     "chai": "^4.2.0",
-    "eslint": "^7.13.0",
+    "eslint": "8.54.0",
     "eslint-config-prettier": "^6.15.0",
     "eslint-plugin-prettier": "^3.1.4",
     "lodash": "^4.17.21",

packages/lib/src/core/helpers/optionsConverter.ts

@@ -86,7 +86,7 @@ function process_old_to_new_columnRatios(obj) {
   } else {
     _obj[optionsMap.layoutParams.structure.columnRatios] = _obj[optionsMap.layoutParams.structure.columnRatios]
       ? _obj[optionsMap.layoutParams.structure.columnRatios]?.split
-        ? [..._obj[optionsMap.layoutParams.structure.columnRatios]?.split(',').map(Number)]
+        ? [...(_obj[optionsMap.layoutParams.structure.columnRatios]?.split(',') || []).map(Number)]
         : _obj[optionsMap.layoutParams.structure.columnRatios]
       : undefined;
   }

packages/playground/config/webpack.config.js

@@ -281,22 +281,6 @@ module.exports = function (webpackEnv) {
         // Disable require.ensure as it's not a standard language feature.
         { parser: { requireEnsure: false } },
 
-        // First, run the linter.
-        // It's important to do this before Babel processes the JS.
-        {
-          test: /\.(js|mjs|jsx|ts|tsx)$/,
-          enforce: 'pre',
-          use: [
-            {
-              options: {
-                formatter: require.resolve('react-dev-utils/eslintFormatter'),
-                eslintPath: require.resolve('eslint'),
-              },
-              loader: require.resolve('eslint-loader'),
-            },
-          ],
-          include: paths.appSrc,
-        },
         {
           // "oneOf" will traverse all following loaders until one will
           // match the requirements. When no loader matches it will fall

packages/playground/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pro-playground",
-  "version": "5.0.72",
+  "version": "5.0.73",
   "private": true,
   "scripts": {
     "watch": "sleep 10 && node scripts/start.js",
@@ -22,10 +22,10 @@
     "image-client-api": "^1.3130.0",
     "lodash.clonedeep": "^4.5.0",
     "moment": "2.29.2",
-    "pro-gallery": "5.0.72",
-    "pro-gallery-blueprints": "5.0.72",
-    "pro-gallery-lib": "5.0.72",
-    "pro-layouts": "5.0.72",
+    "pro-gallery": "5.0.73",
+    "pro-gallery-blueprints": "5.0.73",
+    "pro-gallery-lib": "5.0.73",
+    "pro-layouts": "5.0.73",
     "re-resizable": "^6.8.0",
     "react": "^18.2.0",
     "react-color": "^2.17.3",
@@ -43,14 +43,12 @@
     "babel-preset-react-app": "^9.0.0",
     "case-sensitive-paths-webpack-plugin": "^2.2.0",
     "css-loader": "^2.1.1",
-    "eslint": "^7.13.0",
-    "eslint-config-react-app": "^6.0.0",
-    "eslint-loader": "^4.0.2",
-    "eslint-plugin-flowtype": "^5.2.0",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-react": "^7.21.5",
-    "eslint-plugin-react-hooks": "^4.2.0",
+    "eslint": "8.54.0",
+    "eslint-config-react-app": "7.0.1",
+    "eslint-plugin-import": "2.29.0",
+    "eslint-plugin-jsx-a11y": "6.8.0",
+    "eslint-plugin-react": "7.33.2",
+    "eslint-plugin-react-hooks": "4.6.0",
     "file-loader": "^4.1.0",
     "html-webpack-plugin": "^4.0.0-beta.5",
     "jest": "^29.6.2",