Merge tag 'v3.36.2' of github.com:swagger-api/swagger-ui

Jenkins Git plugin tagging with v3.36.2

* tag 'v3.36.2' of github.com:swagger-api/swagger-ui: (337 commits)
  chore(release): cut the v3.36.2 release
  fix: duplicate labels in Servers UI (swagger-api#6568)
  fix: externalDocs url for tags when using swagger v2.0 (swagger-api#6579)
  fix(schema example): xml gen should follow json gen behavior (swagger-api#6555)
  fix(cypress): oas3-request-body-required flakineess (swagger-api#6583)
  housekeeping(dev-deps): webpack-stats-plugin@1.0.2 (swagger-api#6576)
  chore: enforce commit message conventions (swagger-api#6577)
  chore(release): cut the v3.36.1 release
  housekeeping(deps): swagger-client@3.12.0 (swagger-api#6575)
  housekeeping(dev-deps): nightwatch@1.5.1
  fix(cypress): oas3-multiple-media-types flakiness (swagger-api#6571)
  housekeeping(dev-deps): file-loader@6.2.0
  housekeeping(dev-deps): mini-css-extract-plugin@1.2.1
  housekeeping(dev-deps): cypress@5.5.0
  ci(GA): add lint-errors step (swagger-api#6564)
  ci(GA): add test:artifact job (swagger-api#6562)
  ci(GA): add release job step (swagger-api#6558)
  ci(GA): use github actions as CI (swagger-api#6557)
  housekeeping(dev-deps): mini-css-extract-plugin@1.2.0
  housekeeping(dev-deps): @jest/globals@26.6.1
  ...

.commitlintrc.json

@@ -0,0 +1,25 @@
+{
+  "extends": [
+    "@commitlint/config-conventional"
+  ],
+  "rules": {
+    "header-max-length": [
+      2,
+      "always",
+      69
+    ],
+    "scope-case": [
+      2,
+      "always",
+      [
+        "camel-case",
+        "kebab-case",
+        "upper-case"
+      ]
+    ],
+    "subject-case": [
+      0,
+      "always"
+    ]
+  }
+}

.eslintignore

@@ -0,0 +1 @@
+dist/

.eslintrc

@@ -3,6 +3,8 @@ env:
   browser: true
   node: true
   es6: true
+  jest: true
+  jest/globals: true
 parserOptions:
   ecmaFeatures:
     jsx: true
@@ -13,6 +15,7 @@ plugins:
   - react
   - mocha
   - import
+  - jest
 settings:
   react:
     pragma: React

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -1,6 +1,6 @@
 ---
 name: Feature request
-about: Suggest an new feature or enhancement for this project
+about: Suggest a new feature or enhancement for this project
 
 ---
 

.github/workflows/nodejs.yml

@@ -0,0 +1,63 @@
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Node.js CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [10.13.x, 10.x, 12.x, 14.x]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - name: Install dependencies
+      run: npm ci
+    - name: Lint code for errors only
+      run: npm run lint-errors
+    - name: Run all tests
+      run: npm test
+      env:
+        CI: true
+
+  artifact-bundle:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [10.x, 12.x, 14.x]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - name: Install dependencies
+      run: npm ci
+    - name: Build and Run all artifact tests
+      run: npm run test:artifact
+
+  release:
+    if: contains(github.ref, 'master')
+    runs-on: ubuntu-latest
+    needs: [build]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js
+      uses: actions/setup-node@v1
+      with:
+        node-version: 14.x

.gitignore

@@ -8,11 +8,17 @@ npm-debug.log*
 .eslintcache
 *.iml
 selenium-debug.log
+chromedriver.log
 test/e2e/db.json
 docs/_book
+dev-helpers/examples
 
+# dist
 flavors/**/dist/*
+/lib
+/es
+dist/log*
 
 # Cypress
 test/e2e-cypress/screenshots
-test/e2e-cypress/videos
+test/e2e-cypress/videos

.huskyrc

@@ -0,0 +1,6 @@
+{
+  "hooks": {
+    "pre-commit": "lint-staged",
+    "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
+  }
+}

.lintstagedrc

@@ -0,0 +1,3 @@
+{
+  "*.js": "eslint"
+}

.mocharc.yaml

@@ -0,0 +1,2 @@
+recursive: true
+require: ['esm','@babel/register','source-map-support', 'test/mocha/setup.js']

.npmignore

@@ -6,6 +6,10 @@
 !dist/swagger-ui.js.map
 !dist/swagger-ui-standalone-preset.js
 !dist/swagger-ui-standalone-preset.js.map
+!dist/swagger-ui-es-bundle.js
+!dist/swagger-ui-es-bundle.js.map
+!dist/swagger-ui-es-bundle-core.js
+!dist/swagger-ui-es-bundle-core.js.map
 !dist/swagger-ui.css
 !dist/swagger-ui.css.map
 !dist/oauth2-redirect.html

.npmrc

@@ -0,0 +1 @@
+save-prefix="="

Dockerfile

@@ -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.17-alpine
+FROM nginx:1.19-alpine
 
 RUN apk --no-cache add nodejs
 
@@ -12,6 +12,7 @@ ENV API_KEY "**None**"
 ENV SWAGGER_JSON "/app/swagger.json"
 ENV PORT 8080
 ENV BASE_URL ""
+ENV SWAGGER_JSON_URL ""
 
 COPY ./docker/nginx.conf ./docker/cors.conf /etc/nginx/
 

README.md

@@ -15,7 +15,7 @@
 **🕰️ Looking for the older version of Swagger UI?** Refer to the [*2.x* branch](https://github.com/swagger-api/swagger-ui/tree/2.x).
 
 
-This repository publishes to three different NPM modules:
+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-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.
@@ -57,6 +57,9 @@ Swagger UI Version | Release Date | OpenAPI Spec compatibility | Notes
 - [Setting up](docs/development/setting-up.md)
 - [Scripts](docs/development/scripts.md)
 
+#### Contributing
+- [Contributing](https://github.com/swagger-api/.github/blob/master/CONTRIBUTING.md)
+
 ##### Integration Tests
 
 You will need JDK of version 7 or higher as instructed here