Merge branch 'bump-601' into 'dev'

Bump v6.0.1 See merge request turris/reforis/foris-js!222
Bump v6.0.1
2024-11-14 17:35:35 +01:00 · 2024-06-26 15:00:58 +02:00 · 2024-06-26 15:59:26 +03:00 · 2024-06-26 15:57:31 +03:00 · 2024-06-26 15:52:57 +03:00 · 2024-06-26 14:24:49 +02:00
6 changed files with 71 additions and 54 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -8,6 +8,17 @@ and this project adheres to

 ## [Unreleased]

+## [6.0.1] - 2024-06-26
+
+### Added
+
+-   Add className prop to Switch component
+
+### Changed
+
+-   Update dependencies in package.json
+-   NPM audit fix
+
 ## [6.0.0] - 2024-06-11

 ### Added
@ -314,7 +325,8 @@ and this project adheres to
 ## [0.0.7] - 2019-09-02

 [unreleased]:
-    https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.0.0...master
+    https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.0.1...master
+[6.0.1]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v6.0.0...v6.0.1
 [6.0.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.6.1...v6.0.0
 [5.6.1]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.6.0...v5.6.1
 [5.6.0]: https://gitlab.nic.cz/turris/reforis/foris-js/-/compare/v5.5.0...v5.6.0
--- a/package-lock.json
+++ b/package-lock.json
@ -1,12 +1,12 @@
 {
    "name": "foris",
-    "version": "6.0.0",
+    "version": "6.0.1",
    "lockfileVersion": 2,
    "requires": true,
    "packages": {
        "": {
            "name": "foris",
-            "version": "6.0.0",
+            "version": "6.0.1",
            "license": "GPL-3.0",
            "dependencies": {
                "axios": "^1.7.2",
@ -35,7 +35,7 @@
                "jest-environment-jsdom": "^29.7.0",
                "jest-mock-axios": "^4.7.3",
                "moment-timezone": "^0.5.45",
-                "prettier": "^3.3.1",
+                "prettier": "^3.3.2",
                "prop-types": "15.8.1",
                "react": "16.9.0",
                "react-dom": "16.9.0",
@ -43,7 +43,7 @@
                "react-styleguidist": "^12.0.1",
                "snapshot-diff": "^0.10.0",
                "style-loader": "^1.2.1",
-                "webpack": "^5.91.0"
+                "webpack": "^5.92.1"
            },
            "peerDependencies": {
                "bootstrap": "^5.3.3",
@ -4314,6 +4314,16 @@
                "acorn-walk": "^8.0.2"
            }
        },
+        "node_modules/acorn-import-attributes": {
+            "version": "1.9.5",
+            "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
+            "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
+            "dev": true,
+            "license": "MIT",
+            "peerDependencies": {
+                "acorn": "^8"
+            }
+        },
        "node_modules/acorn-jsx": {
            "version": "5.3.2",
            "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
@ -15071,10 +15081,11 @@
            }
        },
        "node_modules/prettier": {
-            "version": "3.3.1",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.1.tgz",
-            "integrity": "sha512-7CAwy5dRsxs8PHXT3twixW9/OEll8MLE0VRPCJyl7CkS6VHGPSlsVaWTiASPTyGyYRyApxlaWTzwUxVNrhcwDg==",
+            "version": "3.3.2",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz",
+            "integrity": "sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==",
            "dev": true,
+            "license": "MIT",
            "bin": {
                "prettier": "bin/prettier.cjs"
            },
@ -18145,10 +18156,11 @@
            }
        },
        "node_modules/webpack": {
-            "version": "5.91.0",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.91.0.tgz",
-            "integrity": "sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==",
+            "version": "5.92.1",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.92.1.tgz",
+            "integrity": "sha512-JECQ7IwJb+7fgUFBlrJzbyu3GEuNBcdqr1LD7IbSzwkSmIevTm8PF+wej3Oxuz/JFBUZ6O1o43zsPkwm1C4TmA==",
            "dev": true,
+            "license": "MIT",
            "dependencies": {
                "@types/eslint-scope": "^3.7.3",
                "@types/estree": "^1.0.5",
@ -18156,10 +18168,10 @@
                "@webassemblyjs/wasm-edit": "^1.12.1",
                "@webassemblyjs/wasm-parser": "^1.12.1",
                "acorn": "^8.7.1",
-                "acorn-import-assertions": "^1.9.0",
+                "acorn-import-attributes": "^1.9.5",
                "browserslist": "^4.21.10",
                "chrome-trace-event": "^1.0.2",
-                "enhanced-resolve": "^5.16.0",
+                "enhanced-resolve": "^5.17.0",
                "es-module-lexer": "^1.2.1",
                "eslint-scope": "5.1.1",
                "events": "^3.2.0",
@ -18404,15 +18416,6 @@
                "lodash": "^4.17.15"
            }
        },
-        "node_modules/webpack/node_modules/acorn-import-assertions": {
-            "version": "1.9.0",
-            "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
-            "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
-            "dev": true,
-            "peerDependencies": {
-                "acorn": "^8"
-            }
-        },
        "node_modules/webpack/node_modules/schema-utils": {
            "version": "3.3.0",
            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
@ -18694,10 +18697,11 @@
            }
        },
        "node_modules/ws": {
-            "version": "8.17.0",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz",
-            "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==",
+            "version": "8.17.1",
+            "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+            "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
            "dev": true,
+            "license": "MIT",
            "engines": {
                "node": ">=10.0.0"
            },
@ -22083,6 +22087,13 @@
                "acorn-walk": "^8.0.2"
            }
        },
+        "acorn-import-attributes": {
+            "version": "1.9.5",
+            "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz",
+            "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==",
+            "dev": true,
+            "requires": {}
+        },
        "acorn-jsx": {
            "version": "5.3.2",
            "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
@ -30150,9 +30161,9 @@
            "dev": true
        },
        "prettier": {
-            "version": "3.3.1",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.1.tgz",
-            "integrity": "sha512-7CAwy5dRsxs8PHXT3twixW9/OEll8MLE0VRPCJyl7CkS6VHGPSlsVaWTiASPTyGyYRyApxlaWTzwUxVNrhcwDg==",
+            "version": "3.3.2",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz",
+            "integrity": "sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==",
            "dev": true
        },
        "prettier-linter-helpers": {
@ -32451,9 +32462,9 @@
            "dev": true
        },
        "webpack": {
-            "version": "5.91.0",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.91.0.tgz",
-            "integrity": "sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==",
+            "version": "5.92.1",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.92.1.tgz",
+            "integrity": "sha512-JECQ7IwJb+7fgUFBlrJzbyu3GEuNBcdqr1LD7IbSzwkSmIevTm8PF+wej3Oxuz/JFBUZ6O1o43zsPkwm1C4TmA==",
            "dev": true,
            "requires": {
                "@types/eslint-scope": "^3.7.3",
@ -32462,10 +32473,10 @@
                "@webassemblyjs/wasm-edit": "^1.12.1",
                "@webassemblyjs/wasm-parser": "^1.12.1",
                "acorn": "^8.7.1",
-                "acorn-import-assertions": "^1.9.0",
+                "acorn-import-attributes": "^1.9.5",
                "browserslist": "^4.21.10",
                "chrome-trace-event": "^1.0.2",
-                "enhanced-resolve": "^5.16.0",
+                "enhanced-resolve": "^5.17.0",
                "es-module-lexer": "^1.2.1",
                "eslint-scope": "5.1.1",
                "events": "^3.2.0",
@ -32482,13 +32493,6 @@
                "webpack-sources": "^3.2.3"
            },
            "dependencies": {
-                "acorn-import-assertions": {
-                    "version": "1.9.0",
-                    "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
-                    "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
-                    "dev": true,
-                    "requires": {}
-                },
                "schema-utils": {
                    "version": "3.3.0",
                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
@ -32853,9 +32857,9 @@
            }
        },
        "ws": {
-            "version": "8.17.0",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz",
-            "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==",
+            "version": "8.17.1",
+            "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+            "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
            "dev": true,
            "requires": {}
        },
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "foris",
-    "version": "6.0.0",
+    "version": "6.0.1",
    "description": "Foris JS library is a set of components and utils for reForis application and plugins.",
    "author": "CZ.NIC, z.s.p.o.",
    "repository": {
@ -47,7 +47,7 @@
        "jest-environment-jsdom": "^29.7.0",
        "jest-mock-axios": "^4.7.3",
        "moment-timezone": "^0.5.45",
-        "prettier": "^3.3.1",
+        "prettier": "^3.3.2",
        "prop-types": "15.8.1",
        "react": "16.9.0",
        "react-dom": "16.9.0",
@ -55,7 +55,7 @@
        "react-styleguidist": "^12.0.1",
        "snapshot-diff": "^0.10.0",
        "style-loader": "^1.2.1",
-        "webpack": "^5.91.0"
+        "webpack": "^5.92.1"
    },
    "scripts": {
        "lint": "eslint src",
--- a/src/bootstrap/Switch.js
+++ b/src/bootstrap/Switch.js
@ -19,15 +19,16 @@ Switch.propTypes = {
    ]).isRequired,
    helpText: PropTypes.string,
    switchHeading: PropTypes.bool,
+    className: PropTypes.string,
 };

-function Switch({ label, helpText, switchHeading, ...props }) {
+function Switch({ label, helpText, switchHeading, className, ...props }) {
    const uid = useUID();

    return (
        <div
-            className={`form-check form-switch mb-3 ${
-                switchHeading ? "d-flex align-items-center" : null
+            className={`form-check form-switch ${className || "mb-3"} ${
+                switchHeading ? "d-flex align-items-center" : ""
            }`.trim()}
        >
            <input
--- a/src/bootstrap/tests/snapshots/Switch.test.js.snap
+++ b/src/bootstrap/tests/snapshots/Switch.test.js.snap
@ -2,7 +2,7 @@

 exports[`<Switch/> Render switch 1`] = `
 <div
-  class="form-check form-switch mb-3 null"
+  class="form-check form-switch mb-3"
 >
  <input
    checked=""
@ -29,7 +29,7 @@ exports[`<Switch/> Render switch 1`] = `

 exports[`<Switch/> Render uncheked switch 1`] = `
 <div
-  class="form-check form-switch mb-3 null"
+  class="form-check form-switch mb-3"
 >
  <input
    class="form-check-input"
--- a/src/common/WiFiSettings/tests/snapshots/WiFiSettings.test.js.snap
+++ b/src/common/WiFiSettings/tests/snapshots/WiFiSettings.test.js.snap
@ -536,7 +536,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +         </div>
 +       </div>
 +       <div
-+         class="form-check form-switch mb-3 null"
+         class="form-check form-switch mb-3"
 +       >
 +         <input
 +           class="form-check-input"
@ -920,7 +920,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +         </div>
 +       </div>
 +       <div
-+         class="form-check form-switch mb-3 null"
+         class="form-check form-switch mb-3"
 +       >
 +         <input
 +           class="form-check-input"
@ -943,7 +943,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +         </div>
 +       </div>
 +       <div
-+         class="form-check form-switch mb-3 null"
+         class="form-check form-switch mb-3"
 +       >
 +         <input
 +           class="form-check-input"
Author	SHA1	Message	Date
Aleksandr Gumroian	17e5a959f7	Merge branch 'bump-601' into 'dev' Bump v6.0.1 See merge request turris/reforis/foris-js!222	2024-06-26 15:00:58 +02:00
Aleksandr Gumroian	3b48510246	Bump v6.0.1 * Add className prop to Switch component * Update dependencies in package.json * NPM audit fix	2024-06-26 15:59:26 +03:00
Aleksandr Gumroian	8bac4f18f4	NPM audit fix	2024-06-26 15:57:31 +03:00
Aleksandr Gumroian	6cb2a5388e	Update dependencies in package.json Update Webpack and Prettier to latest versions	2024-06-26 15:52:57 +03:00
Aleksandr Gumroian	0b02bead71	Merge branch 'add-classname-prop-to-switch' into 'dev' Add className prop to Switch See merge request turris/reforis/foris-js!221	2024-06-26 14:24:49 +02:00
Aleksandr Gumroian	12c6d05ca6	Update Snapshots	2024-06-26 14:11:54 +03:00
Aleksandr Gumroian	923bbab6d5	Add className prop to Switch component	2024-06-26 14:11:16 +03:00