Merge branch 'master' into next

.github/workflows/dependabot-merge.yml

@@ -2,6 +2,7 @@ name: Merge me!
 
 on:
   pull_request_target:
+    branches: [ master, next ]
 
 jobs:
   merge-me:

.github/workflows/nodejs.yml

@@ -7,7 +7,7 @@ on:
   push:
     branches: [ master ]
   pull_request:
-    branches: [ master ]
+    branches: [ master, next ]
 
 env:
   CYPRESS_CACHE_FOLDER: cypress/cache

.nvmrc

@@ -1 +1 @@
-16.8
+16.13.2

Dockerfile

@@ -4,7 +4,7 @@
 
 FROM nginx:1.23.3-alpine
 
-RUN apk update && apk add --no-cache "nodejs>=16.17.1-r0"
+RUN apk update && apk add --no-cache "nodejs>=18.14.1-r0 "
 
 LABEL maintainer="fehguy"
 

docker/docker-entrypoint.d/40-swagger-ui.sh

@@ -39,6 +39,11 @@ if [[ -f "$SWAGGER_JSON" ]]; then
   sed -i "s|http://example.com/api|$REL_PATH|g" $INITIALIZER_SCRIPT
 fi
 
+# enable/disable the address and port for IPv6 addresses that nginx listens on
+if [[ -n "${PORT_IPV6}" ]]; then
+    sed -i "s|8080;|8080;\n    listen            [::]:${PORT_IPV6};|g" $NGINX_CONF
+fi
+
 # replace the PORT that nginx listens on if PORT is supplied
 if [[ -n "${PORT}" ]]; then
     sed -i "s|8080|${PORT}|g" $NGINX_CONF

docs/development/setting-up.md

@@ -5,10 +5,7 @@ Swagger UI includes a development server that provides hot module reloading and
 ### Prerequisites
 
 - git, any version
-
-SwaggerUI Node.js support closely follows [Node.js Release Statuses](https://nodejs.org/en/about/releases/)
-and is only expected to work on `Current`, `Active LTS` and `Maintanenace LTS` versions of Node.js.
-SwaggerUI may also work on `Pending` or `EOL` versions of Node.js, but it's not guaranteed.
+- **Node.js >=16.13.2** and **npm >=8.1.2** are the minimum required versions that this repo runs on, but we recommend using the latest version of Node.js@16
 
 ### Steps
 

docs/usage/installation.md

@@ -4,9 +4,11 @@
 
 ### NPM Registry
 
-We publish two modules to npm: **`swagger-ui`** and **`swagger-ui-dist`**.
+We publish three modules to npm: **`swagger-ui`**, **`swagger-ui-dist`** and **`swagger-ui-react`**.
 
-**`swagger-ui`** is meant for consumption by JavaScript web projects that include module bundlers, such as Webpack, Browserify, and Rollup. Its main file exports Swagger UI's main function, and the module also includes a namespaced stylesheet at `swagger-ui/dist/swagger-ui.css`. Here's an example:
+**`swagger-ui`** is meant for consumption by JavaScript web projects that include module bundlers,
+such as Webpack, Browserify, and Rollup. Its main file exports Swagger UI's main function,
+and the module also includes a namespaced stylesheet at `swagger-ui/dist/swagger-ui.css`. Here's an example:
 
 ```javascript
 import SwaggerUI from 'swagger-ui'

flavors/swagger-ui-react/README.md

@@ -114,6 +114,12 @@ Controls the display of vendor extension (`x-`) fields and values for Operations
 
 ⚠️ This prop is currently only applied once, on mount. Changes to this prop's value will not be propagated to the underlying Swagger UI instance. A future version of this module will remove this limitation, and the change will not be considered a breaking change.
 
+#### `showCommonExtensions`: PropTypes.bool
+
+Controls the display of extensions (pattern, maxLength, minLength, maximum, minimum) fields and values for Parameters.
+
+⚠️ This prop is currently only applied once, on mount. Changes to this prop's value will not be propagated to the underlying Swagger UI instance. A future version of this module will remove this limitation, and the change will not be considered a breaking change.
+
 #### `showMutatedRequest`: PropTypes.bool
 
 If set to `true`, uses the mutated request returned from a requestInterceptor to produce the curl command in the UI, otherwise the request before the requestInterceptor was applied is used.

flavors/swagger-ui-react/index.jsx

@@ -33,6 +33,7 @@ export default class SwaggerUI extends React.Component {
       showMutatedRequest: typeof this.props.showMutatedRequest === "boolean" ? this.props.showMutatedRequest : true,
       deepLinking: typeof this.props.deepLinking === "boolean" ? this.props.deepLinking : false,
       showExtensions: this.props.showExtensions,
+      showCommonExtensions: this.props.showCommonExtensions,
       filter: ["boolean", "string"].includes(typeof this.props.filter) ? this.props.filter : false,
       persistAuthorization: this.props.persistAuthorization,
       withCredentials: this.props.withCredentials,
@@ -122,6 +123,7 @@ SwaggerUI.propTypes = {
   presets: PropTypes.arrayOf(PropTypes.func),
   deepLinking: PropTypes.bool,
   showExtensions: PropTypes.bool,
+  showCommonExtensions: PropTypes.bool,
   filter: PropTypes.oneOfType([
     PropTypes.string,
     PropTypes.bool,
@@ -146,6 +148,7 @@ SwaggerUI.defaultProps = {
   deepLinking: false,
   displayRequestDuration: false,
   showExtensions: false,
+  showCommonExtensions: false,
   filter: false,
   requestSnippetsEnabled: false,
   requestSnippets: {