Skip to content

Commit

Permalink
Merge branch 'master' into bugfix/cookieAuthentication
Browse files Browse the repository at this point in the history
  • Loading branch information
sudiptosarkar authored Nov 4, 2023
2 parents e93dd55 + 048ef5d commit 9b5332a
Show file tree
Hide file tree
Showing 57 changed files with 4,415 additions and 30,914 deletions.
23 changes: 21 additions & 2 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -1,10 +1,29 @@
[production]
[node-production]
maintained node versions

[node-development]
node 20.3.0

[browser-production]
> 1%
last 2 versions
Firefox ESR
not dead

[browser-development]
last 1 chrome version
last 1 firefox version
last 1 safari version

[isomorphic-production]
> 1%
last 2 versions
Firefox ESR
not dead
maintained node versions

[development]
[isomorphic-development]
last 1 chrome version
last 1 firefox version
last 1 safari version
node 20.3.0
8 changes: 4 additions & 4 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Use Node.js 16.x
- name: Use Node.js 20.x
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20

- name: Cache Node Modules and Cypress binary
uses: actions/cache@v3
Expand Down Expand Up @@ -61,10 +61,10 @@ jobs:
steps:
- uses: actions/checkout@v3

- name: Use Node.js 16.x
- name: Use Node.js 20.x
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20

- name: Cache Node Modules and Cypress binary
uses: actions/cache@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-swagger-ui-react.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20

- name: Prepare SwaggerUI dist
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-swagger-ui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 16
node-version: 20

- name: Determine the next release version
uses: cycjimmy/semantic-release-action@v3
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.13.2
20.3.0
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# We don't declare them here — take a look at our docs.
# https://github.com/swagger-api/swagger-ui/blob/master/docs/usage/configuration.md

FROM nginx:1.25.2-alpine
FROM nginx:1.25.3-alpine

RUN apk update && apk add --no-cache "nodejs>=18.14.1-r0" && apk add --no-cache "tiff>=4.4.0-r4"

Expand Down
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

This repository publishes three different NPM modules:

* [swagger-ui](https://www.npmjs.com/package/swagger-ui) is a traditional npm module intended for use in single-page applications that are capable of resolving dependencies (via Webpack, Browserify, etc).
* [swagger-ui](https://www.npmjs.com/package/swagger-ui) is a traditional npm module intended for use in single-page applications that are capable of resolving dependencies (via Webpack, Browserify, etc.).
* [swagger-ui-dist](https://www.npmjs.com/package/swagger-ui-dist) is a dependency-free module that includes everything you need to serve Swagger UI in a server-side project, or a single-page application that can't resolve npm module dependencies.
* [swagger-ui-react](https://www.npmjs.com/package/swagger-ui-react) is Swagger UI packaged as a React component for use in React applications.

Expand All @@ -33,17 +33,17 @@ If you are looking for plain ol' HTML/JS/CSS, [download the latest release](http
## Compatibility
The OpenAPI Specification has undergone 5 revisions since initial creation in 2010. Compatibility between Swagger UI and the OpenAPI Specification is as follows:

Swagger UI Version | Release Date | OpenAPI Spec compatibility | Notes
------------------ |--------------|----------------------------------------| -----
5.0.0 | 2023-06-12 | 2.0, 3.0.0, 3.0.1, 3.0.2, 3.0.3, 3.1.0 | [tag v5.0.0](https://github.com/swagger-api/swagger-ui/tree/v5.0.0)
4.0.0 | 2021-11-03 | 2.0, 3.0.0, 3.0.1, 3.0.2, 3.0.3 | [tag v4.0.0](https://github.com/swagger-api/swagger-ui/tree/v4.0.0)
3.18.3 | 2018-08-03 | 2.0, 3.0.0, 3.0.1, 3.0.2, 3.0.3 | [tag v3.18.3](https://github.com/swagger-api/swagger-ui/tree/v3.18.3)
3.0.21 | 2017-07-26 | 2.0 | [tag v3.0.21](https://github.com/swagger-api/swagger-ui/tree/v3.0.21)
2.2.10 | 2017-01-04 | 1.1, 1.2, 2.0 | [tag v2.2.10](https://github.com/swagger-api/swagger-ui/tree/v2.2.10)
2.1.5 | 2016-07-20 | 1.1, 1.2, 2.0 | [tag v2.1.5](https://github.com/swagger-api/swagger-ui/tree/v2.1.5)
2.0.24 | 2014-09-12 | 1.1, 1.2 | [tag v2.0.24](https://github.com/swagger-api/swagger-ui/tree/v2.0.24)
1.0.13 | 2013-03-08 | 1.1, 1.2 | [tag v1.0.13](https://github.com/swagger-api/swagger-ui/tree/v1.0.13)
1.0.1 | 2011-10-11 | 1.0, 1.1 | [tag v1.0.1](https://github.com/swagger-api/swagger-ui/tree/v1.0.1)
| Swagger UI Version | Release Date | OpenAPI Spec compatibility | Notes |
|--------------------|--------------|----------------------------------------|-----------------------------------------------------------------------|
| 5.0.0 | 2023-06-12 | 2.0, 3.0.0, 3.0.1, 3.0.2, 3.0.3, 3.1.0 | [tag v5.0.0](https://github.com/swagger-api/swagger-ui/tree/v5.0.0) |
| 4.0.0 | 2021-11-03 | 2.0, 3.0.0, 3.0.1, 3.0.2, 3.0.3 | [tag v4.0.0](https://github.com/swagger-api/swagger-ui/tree/v4.0.0) |
| 3.18.3 | 2018-08-03 | 2.0, 3.0.0, 3.0.1, 3.0.2, 3.0.3 | [tag v3.18.3](https://github.com/swagger-api/swagger-ui/tree/v3.18.3) |
| 3.0.21 | 2017-07-26 | 2.0 | [tag v3.0.21](https://github.com/swagger-api/swagger-ui/tree/v3.0.21) |
| 2.2.10 | 2017-01-04 | 1.1, 1.2, 2.0 | [tag v2.2.10](https://github.com/swagger-api/swagger-ui/tree/v2.2.10) |
| 2.1.5 | 2016-07-20 | 1.1, 1.2, 2.0 | [tag v2.1.5](https://github.com/swagger-api/swagger-ui/tree/v2.1.5) |
| 2.0.24 | 2014-09-12 | 1.1, 1.2 | [tag v2.0.24](https://github.com/swagger-api/swagger-ui/tree/v2.0.24) |
| 1.0.13 | 2013-03-08 | 1.1, 1.2 | [tag v1.0.13](https://github.com/swagger-api/swagger-ui/tree/v1.0.13) |
| 1.0.1 | 2011-10-11 | 1.0, 1.1 | [tag v1.0.1](https://github.com/swagger-api/swagger-ui/tree/v1.0.1) |

## Documentation

Expand Down
209 changes: 85 additions & 124 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,179 +1,140 @@
module.exports = {
"env": {
"esm": {
"presets": [
[
"@babel/env",
{
"debug": true,
"modules": false,
"ignoreBrowserslistConfig": false,
"useBuiltIns": false,
"include": [
"@babel/plugin-proposal-logical-assignment-operators"
]
}
],
"@babel/preset-react"
],
"plugins": [
[
"@babel/plugin-transform-runtime",
{
"corejs": 3,
"absoluteRuntime": false,
"version": "^7.11.2"
}
],
[
"transform-react-remove-prop-types",
{
"additionalLibraries": [
"react-immutable-proptypes"
]
}
],
[
"babel-plugin-module-resolver",
{
"alias": {
"root": ".",
"core": "./src/core",
}
}
const browser = {
presets: [
[
"@babel/preset-env",
{
debug: false,
modules: "auto",
useBuiltIns: false,
forceAllTransforms: false,
ignoreBrowserslistConfig: false,
}
],
"@babel/preset-react",
],
plugins: [
[
"@babel/plugin-transform-runtime",
{
corejs: { version: 3, proposals: false },
absoluteRuntime: false,
helpers: true,
regenerator: false,
version: "^7.22.11",
}
],
[
"transform-react-remove-prop-types",
{
additionalLibraries: [
"react-immutable-proptypes"
]
]
},
"test": {
"presets": [
}
],
[
"babel-plugin-module-resolver",
{
alias: {
root: ".",
core: "./src/core",
}
}
]
],
}

module.exports = {
env: {
commonjs: {
presets: [
[
"@babel/env",
"@babel/preset-env",
{
"targets": {
"node": "16.13.2"
},
"ignoreBrowserslistConfig": true,
"useBuiltIns": false,
debug: false,
modules: "commonjs",
loose: true,
useBuiltIns: false,
forceAllTransforms: false,
ignoreBrowserslistConfig: false,
}
],
"@babel/preset-react"
"@babel/preset-react",
],
"plugins": [
plugins: [
[
"@babel/plugin-transform-runtime",
{
"corejs": 3,
"absoluteRuntime": false,
"version": "^7.11.2"
corejs: { version: 3, proposals: false },
absoluteRuntime: false,
helpers: true,
regenerator: false,
version: "^7.22.11",
}
],
[
"transform-react-remove-prop-types",
{
"additionalLibraries": [
additionalLibraries: [
"react-immutable-proptypes"
]
}
],
[
"babel-plugin-module-resolver",
{
"alias": {
"root": ".",
"core": "./src/core",
alias: {
root: ".",
core: "./src/core",
}
}
]
]
},
"development": {
"presets": [
[
"@babel/env",
{
"ignoreBrowserslistConfig": false,
"useBuiltIns": false,
"include": [
"@babel/plugin-proposal-logical-assignment-operators"
]
}
],
"@babel/preset-react"
],
"plugins": [
[
"@babel/plugin-transform-runtime",
{
"corejs": 3,
"absoluteRuntime": false,
"version": "^7.11.2"
}
],
[
"transform-react-remove-prop-types",
{
"additionalLibraries": [
"react-immutable-proptypes"
]
}
],
[
"babel-plugin-module-resolver",
{
"alias": {
"root": ".",
"core": "./src/core",
}
}
]
]
},
"production": {
"presets": [
esm: {
presets: [
[
"@babel/env",
{
"ignoreBrowserslistConfig": false,
"useBuiltIns": false,
"include": [
"@babel/plugin-proposal-logical-assignment-operators"
]
debug: false,
modules: false,
ignoreBrowserslistConfig: false,
useBuiltIns: false,
}
],
"@babel/preset-react"
],
"plugins": [
"@babel/plugin-transform-class-properties",
"@babel/plugin-transform-nullish-coalescing-operator",
"@babel/plugin-transform-object-rest-spread",
"@babel/plugin-transform-optional-chaining",
plugins: [
[
"@babel/plugin-transform-runtime",
{
"corejs": 3,
"absoluteRuntime": false,
"version": "^7.11.2"
corejs: { version: 3, proposals: false },
absoluteRuntime: false,
helpers: true,
regenerator: false,
version: "^7.22.11",
}
],
[
"transform-react-remove-prop-types",
{
"additionalLibraries": [
additionalLibraries: [
"react-immutable-proptypes"
]
}
],
[
"babel-plugin-module-resolver",
{
"alias": {
"root": ".",
"core": "./src/core",
alias: {
root: ".",
core: "./src/core",
}
}
]
]
},
}
development: browser,
production: browser,
},
}

1 change: 1 addition & 0 deletions config/jest/jest.artifact.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ module.exports = {
rootDir: path.join(__dirname, '..', '..'),
testEnvironment: 'jsdom',
testMatch: ['**/test/build-artifacts/**/*.js'],
setupFiles: ['<rootDir>/test/unit/jest-shim.js'],
transformIgnorePatterns: ['/node_modules/(?!(swagger-client|react-syntax-highlighter)/)'],
};
2 changes: 1 addition & 1 deletion dist/swagger-ui-bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/swagger-ui-bundle.js.map

Large diffs are not rendered by default.

Loading

0 comments on commit 9b5332a

Please sign in to comment.