R11DT-4120 - Bump vulnerable deps in swagger-ui (immutable, dompurify, js-yaml, axios, brace-expansion)

dist/index.html

@@ -49,8 +49,8 @@
       </div>
     </div>
     <div id="swagger-ui"></div>
-    <script src="./swagger-ui-bundle.js?v=b065ff77" charset="UTF-8"></script>
-    <script src="./swagger-ui-standalone-preset.js?v=1e58ec86" charset="UTF-8"></script>
+    <script src="./swagger-ui-bundle.js?v=3b0acc44" charset="UTF-8"></script>
+    <script src="./swagger-ui-standalone-preset.js?v=49cdd566" charset="UTF-8"></script>
     <script>
       window.onload = function () {
         // OutSystems change: url = swagger.json

dist/swagger-ui-bundle.js.LICENSE.txt

@@ -57,12 +57,10 @@
  * Licensed under the MIT License.
  */
 
-/*! @license DOMPurify 3.4.11 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.4.11/LICENSE */
+/*! @license DOMPurify 3.4.12 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.4.12/LICENSE */
 
 /*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
 
-/*! js-yaml 4.2.0 https://github.com/nodeca/js-yaml @license MIT */
-
 /*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
 
 /**

dist/swagger-ui-es-bundle.js.LICENSE.txt

@@ -57,12 +57,10 @@
  * Licensed under the MIT License.
  */
 
-/*! @license DOMPurify 3.4.11 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.4.11/LICENSE */
+/*! @license DOMPurify 3.4.12 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.4.12/LICENSE */
 
 /*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
 
-/*! js-yaml 4.2.0 https://github.com/nodeca/js-yaml @license MIT */
-
 /*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
 
 /**

dist/swagger-ui-standalone-preset.js.LICENSE.txt

@@ -7,8 +7,6 @@
 
 /*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */
 
-/*! js-yaml 4.2.0 https://github.com/nodeca/js-yaml @license MIT */
-
 /*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
 
 /**

package.json

@@ -78,11 +78,11 @@
     "classnames": "^2.5.1",
     "css.escape": "1.5.1",
     "deep-extend": "0.6.0",
-    "dompurify": "=3.4.11",
+    "dompurify": "=3.4.12",
     "ieee754": "^1.2.1",
-    "immutable": "=3.8.3",
+    "immutable": "=4.3.9",
     "js-file-download": "^0.4.12",
-    "js-yaml": "=4.2.0",
+    "js-yaml": "=4.3.0",
     "lodash": "=4.18.1",
     "prop-types": "^15.8.1",
     "randexp": "^0.5.3",
@@ -198,9 +198,9 @@
     "enzyme": {
       "cheerio": "=1.0.0-rc.12"
     },
-    "axios": ">=1.16.0",
+    "axios": ">=1.18.0",
     "@swagger-api/apidom-reference": {
-      "brace-expansion": ">=5.0.6"
+      "brace-expansion": ">=5.0.8"
     }
   },
   "config": {

src/core/components/auth/auths.jsx

@@ -35,9 +35,7 @@ export default class Auths extends React.Component {
     e.preventDefault()
 
     let { authActions, definitions } = this.props
-    let auths = definitions.map( (val, key) => {
-      return key
-    }).toArray()
+    let auths = definitions.keySeq().toArray()
 
     this.setState(auths.reduce((prev, auth) => {
       prev[auth] = ""
@@ -84,7 +82,7 @@ export default class Auths extends React.Component {
                   authorized={authorized}
                   errSelectors={errSelectors}
                   />
-              }).toArray()
+              }).valueSeq().toArray()
             }
             <div className="auth-btn-wrapper">
               {
@@ -111,7 +109,7 @@ export default class Auths extends React.Component {
                             name={ name } />
                   </div>)
                 }
-                ).toArray()
+                ).valueSeq().toArray()
             }
           </div> : null
         }

src/core/components/auth/oauth2.jsx

@@ -255,7 +255,7 @@ export default class Oauth2 extends React.Component {
                   </div>
                 </Row>
               )
-              }).toArray()
+              }).valueSeq().toArray()
             }
           </div> : null
         }

src/core/components/examples-select-value-retainer.jsx

@@ -102,7 +102,7 @@ export default class ExamplesSelectValueRetainer extends React.PureComponent {
 
   _setStateForNamespace = (namespace, obj) => {
     const oldStateForNamespace = this.state[namespace] || Map()
-    const newStateForNamespace = oldStateForNamespace.mergeDeep(obj)
+    const newStateForNamespace = oldStateForNamespace.merge(obj)
     return this.setState({
       [namespace]: newStateForNamespace,
     })

src/core/components/operations.jsx

@@ -31,7 +31,7 @@ export default class Operations extends React.Component {
 
     return (
       <div>
-        { taggedOps.map(this.renderOperationTag).toArray() }
+        { taggedOps.map(this.renderOperationTag).valueSeq().toArray() }
         { taggedOps.size < 1 ? <h3> No operations defined in spec! </h3> : null }
       </div>
     )

src/core/components/overview.jsx

@@ -64,7 +64,7 @@ export default class Overview extends React.Component {
 
                 </div>
                 )
-            }).toArray()
+            }).valueSeq().toArray()
           }
 
           { taggedOps.size < 1 && <h3> No operations defined in spec! </h3> }

src/core/plugins/json-schema-5/components/model.jsx

@@ -78,7 +78,10 @@ export default class Model extends ImmutablePureComponent {
       const refName = this.getModelName($ref)
       const refSchema = this.getRefSchema(refName)
       if (Map.isMap(refSchema)) {
-        schema = refSchema.mergeDeep(schema) 
+        // NOTE(immutable-v4): mergeDeep now concatenates Lists instead of replacing them.
+        // If schema or refSchema contain List properties (e.g. required, enum, allOf),
+        // verify behavior is correct after the immutable v3→v4 upgrade.
+        schema = refSchema.mergeDeep(schema)
         if (!$$ref) {
           schema = schema.set("$$ref", $ref) 
           $$ref = $ref

src/core/plugins/oas31/components/auth/auths.jsx

@@ -38,11 +38,7 @@ class Auths extends React.Component {
     e.preventDefault()
 
     let { authActions, definitions } = this.props
-    let auths = definitions
-      .map((val, key) => {
-        return key
-      })
-      .toArray()
+    let auths = definitions.keySeq().toArray()
 
     this.setState(
       auths.reduce((prev, auth) => {
@@ -99,6 +95,7 @@ class Auths extends React.Component {
                   />
                 )
               })
+              .valueSeq()
               .toArray()}
             <div className="auth-btn-wrapper">
               {nonOauthDefinitions.size === authorizedAuth.size ? (
@@ -154,6 +151,7 @@ class Auths extends React.Component {
                   </div>
                 )
               })
+              .valueSeq()
               .toArray()}
           </div>
         ) : null}
@@ -173,6 +171,7 @@ class Auths extends React.Component {
                   />
                 )
               })
+              .valueSeq()
               .toArray()}
           </div>
         )}

src/core/utils/index.js

@@ -42,7 +42,7 @@ export function arrayify (thing) {
     return []
 
   if(thing.toArray)
-    return thing.toArray()
+    return Im.isKeyed(thing) ? thing.valueSeq().toArray() : thing.toArray()
 
   return normalizeArray(thing)
 }