diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 05e02989..40bc2038 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-20.04, windows-2019] + os: [ubuntu-22.04, windows-2019] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v2 diff --git a/.npmrc b/.npmrc new file mode 100644 index 00000000..8ed8f2b6 --- /dev/null +++ b/.npmrc @@ -0,0 +1,6 @@ +registry=https://registry.npmjs.org/ +@advanced-rest-client:registry=https://registry.npmjs.org/ +@mulesoft:registry=https://registry.npmjs.org/ +@salesforce:registry=https://registry.npmjs.org/ +always-auth=false +strict-ssl=true diff --git a/package-lock.json b/package-lock.json index 1ad0e61e..1ac861db 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "api-console", - "version": "6.6.48", + "version": "6.6.49", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "api-console", - "version": "6.6.48", + "version": "6.6.49", "license": "CPAL-1.0", "dependencies": { "@advanced-rest-client/arc-icons": "^3.2.2", @@ -49,6 +49,7 @@ "express": "^4.17.1", "fs-extra": "^9.1.0", "husky": "^4.3.8", + "js-yaml": "^4.1.0", "lint-staged": "^10.2.2", "multer": "^1.4.2", "node-cache": "^5.1.0", @@ -1023,9 +1024,10 @@ } }, "node_modules/@api-components/api-example-generator": { - "version": "4.4.32", - "resolved": "https://registry.npmjs.org/@api-components/api-example-generator/-/api-example-generator-4.4.32.tgz", - "integrity": "sha512-8U7j8q252PzOUJgwXnJU9L9Atwr6O8MoY3uhaTCQjtgqfzIqwR5NSzBJEKXWaMdiBygW8A6MM36Tl8E19F75Tw==", + "version": "4.4.34", + "resolved": "https://registry.npmjs.org/@api-components/api-example-generator/-/api-example-generator-4.4.34.tgz", + "integrity": "sha512-jG7Tc6YskLX7SwirPiopQbULiJrcI9AcjmIP8ewwRKCy4l+03T2BswK8qIv9pyz7reLW+WfKrLf3sQCy5OZ9/w==", + "license": "Apache-2.0", "dependencies": { "@api-components/amf-helper-mixin": "^4.5.24", "lit-element": "^2.4.0" @@ -5856,6 +5858,20 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@eslint/eslintrc/node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, "node_modules/@eslint/eslintrc/node_modules/type-fest": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", @@ -11816,6 +11832,20 @@ "node": ">=8" } }, + "node_modules/eslint/node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "license": "MIT", + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, "node_modules/eslint/node_modules/strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -14540,18 +14570,25 @@ "dev": true }, "node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, + "license": "MIT", "dependencies": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" + "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, + "node_modules/js-yaml/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true, + "license": "Python-2.0" + }, "node_modules/jsesc": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", @@ -24658,9 +24695,9 @@ } }, "@api-components/api-example-generator": { - "version": "4.4.32", - "resolved": "https://registry.npmjs.org/@api-components/api-example-generator/-/api-example-generator-4.4.32.tgz", - "integrity": "sha512-8U7j8q252PzOUJgwXnJU9L9Atwr6O8MoY3uhaTCQjtgqfzIqwR5NSzBJEKXWaMdiBygW8A6MM36Tl8E19F75Tw==", + "version": "4.4.34", + "resolved": "https://registry.npmjs.org/@api-components/api-example-generator/-/api-example-generator-4.4.34.tgz", + "integrity": "sha512-jG7Tc6YskLX7SwirPiopQbULiJrcI9AcjmIP8ewwRKCy4l+03T2BswK8qIv9pyz7reLW+WfKrLf3sQCy5OZ9/w==", "requires": { "@api-components/amf-helper-mixin": "^4.5.24", "lit-element": "^2.4.0" @@ -28316,6 +28353,16 @@ "type-fest": "^0.20.2" } }, + "js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, "type-fest": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", @@ -33018,6 +33065,16 @@ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true }, + "js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "dev": true, + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, "strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -35267,13 +35324,20 @@ "dev": true }, "js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, "requires": { - "argparse": "^1.0.7", - "esprima": "^4.0.0" + "argparse": "^2.0.1" + }, + "dependencies": { + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + } } }, "jsesc": { diff --git a/package.json b/package.json index a0e8813b..b49ad138 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "api-console", "description": "The API Console to automatically generate API documentation from RAML and OAS files.", - "version": "6.6.48", + "version": "6.6.49", "license": "CPAL-1.0", "main": "index.js", "module": "index.js", @@ -73,6 +73,7 @@ "express": "^4.17.1", "fs-extra": "^9.1.0", "husky": "^4.3.8", + "js-yaml": "^4.1.0", "lint-staged": "^10.2.2", "multer": "^1.4.2", "node-cache": "^5.1.0", @@ -97,10 +98,10 @@ "format:eslint": "eslint --ext .js,.html . --fix --ignore-path .gitignore", "lint": "npm run lint:eslint", "format": "npm run format:eslint", - "test": "web-test-runner test/*.test.js --coverage --node-resolve --playwright --browsers chromium firefox webkit && npm run test:visual", - "test:visual": "web-test-runner test/visual/*.test.js --coverage --node-resolve --playwright --browsers chromium firefox webkit", + "test": "web-test-runner test/*.test.js --coverage --node-resolve --playwright --browsers chromium firefox && npm run test:visual", + "test:visual": "web-test-runner test/visual/*.test.js --coverage --node-resolve --playwright --browsers chromium firefox", "test:watch": "web-test-runner test/*.test.js --node-resolve --watch --playwright --browsers chromium", - "test:visual:update": "web-test-runner test/**/*.test.js --coverage --node-resolve --playwright --browsers chromium firefox webkit --update-visual-baseline\n", + "test:visual:update": "web-test-runner test/**/*.test.js --coverage --node-resolve --playwright --browsers chromium firefox --update-visual-baseline\n", "build": "rimraf dist && rollup -c rollup.config.js", "build:vendor": "node tasks/prepare.js", "build:models": "node demo/model.js",