chore: upgrade deps

closes #1316
This commit is contained in:
Roman Hotsiy 2020-07-25 19:06:22 +03:00
parent 1976dd4ee2
commit aedfa47ba4
No known key found for this signature in database
GPG Key ID: 5CB7B3ACABA57CB0
6 changed files with 7911 additions and 6562 deletions

View File

@ -1,5 +1,5 @@
import * as CopyWebpackPlugin from 'copy-webpack-plugin'; import * as CopyWebpackPlugin from 'copy-webpack-plugin';
import * as ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin'; import ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
import * as HtmlWebpackPlugin from 'html-webpack-plugin'; import * as HtmlWebpackPlugin from 'html-webpack-plugin';
import { compact } from 'lodash'; import { compact } from 'lodash';
import { resolve } from 'path'; import { resolve } from 'path';
@ -7,17 +7,14 @@ import * as webpack from 'webpack';
const VERSION = JSON.stringify(require('../package.json').version); const VERSION = JSON.stringify(require('../package.json').version);
const REVISION = JSON.stringify( const REVISION = JSON.stringify(
require('child_process') require('child_process').execSync('git rev-parse --short HEAD').toString().trim(),
.execSync('git rev-parse --short HEAD')
.toString()
.trim(),
); );
function root(filename) { function root(filename) {
return resolve(__dirname + '/' + filename); return resolve(__dirname + '/' + filename);
} }
const tsLoader = env => ({ const tsLoader = (env) => ({
loader: 'ts-loader', loader: 'ts-loader',
options: { options: {
compilerOptions: { compilerOptions: {
@ -27,7 +24,7 @@ const tsLoader = env => ({
}, },
}); });
const babelLoader = mode => ({ const babelLoader = (mode) => ({
loader: 'babel-loader', loader: 'babel-loader',
options: { options: {
generatorOpts: { generatorOpts: {
@ -161,7 +158,9 @@ export default (env: { playground?: boolean; bench?: boolean } = {}, { mode }) =
ignore(/js-yaml\/dumper\.js$/), ignore(/js-yaml\/dumper\.js$/),
ignore(/json-schema-ref-parser\/lib\/dereference\.js/), ignore(/json-schema-ref-parser\/lib\/dereference\.js/),
ignore(/^\.\/SearchWorker\.worker$/), ignore(/^\.\/SearchWorker\.worker$/),
new CopyWebpackPlugin(['demo/openapi.yaml']), new CopyWebpackPlugin({
patterns: ['demo/openapi.yaml'],
}),
], ],
}); });

14305
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -52,79 +52,79 @@
"docker:build": "docker build -f config/docker/Dockerfile -t redoc ." "docker:build": "docker build -f config/docker/Dockerfile -t redoc ."
}, },
"devDependencies": { "devDependencies": {
"@babel/core": "7.8.7", "@babel/core": "^7.10.5",
"@babel/plugin-syntax-decorators": "7.8.3", "@babel/plugin-syntax-decorators": "^7.10.4",
"@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-syntax-dynamic-import": "^7.8.3",
"@babel/plugin-syntax-jsx": "7.8.3", "@babel/plugin-syntax-jsx": "^7.10.4",
"@babel/plugin-syntax-typescript": "7.8.3", "@babel/plugin-syntax-typescript": "^7.10.4",
"@cypress/webpack-preprocessor": "4.1.3", "@cypress/webpack-preprocessor": "^5.4.2",
"@hot-loader/react-dom": "^16.12.0", "@hot-loader/react-dom": "^16.12.0",
"@types/chai": "4.2.10", "@types/chai": "^4.2.12",
"@types/dompurify": "^2.0.1", "@types/dompurify": "^2.0.2",
"@types/enzyme": "^3.10.5", "@types/enzyme": "^3.10.5",
"@types/enzyme-to-json": "^1.5.3", "@types/enzyme-to-json": "^1.5.3",
"@types/jest": "^25.1.4", "@types/jest": "^26.0.7",
"@types/json-pointer": "^1.0.30", "@types/json-pointer": "^1.0.30",
"@types/lodash": "^4.14.149", "@types/lodash": "^4.14.158",
"@types/lunr": "^2.3.2", "@types/lunr": "^2.3.3",
"@types/mark.js": "^8.11.5", "@types/mark.js": "^8.11.5",
"@types/marked": "^0.7.3", "@types/marked": "^1.1.0",
"@types/prismjs": "^1.16.0", "@types/prismjs": "^1.16.1",
"@types/prop-types": "^15.7.3", "@types/prop-types": "^15.7.3",
"@types/react": "^16.9.23", "@types/react": "^16.9.43",
"@types/react-dom": "^16.9.5", "@types/react-dom": "^16.9.8",
"@types/react-tabs": "^2.3.1", "@types/react-tabs": "^2.3.2",
"@types/styled-components": "^4.4.1", "@types/styled-components": "^5.1.1",
"@types/tapable": "1.0.5", "@types/tapable": "^1.0.6",
"@types/webpack": "^4.41.7", "@types/webpack": "^4.41.21",
"@types/webpack-env": "^1.15.1", "@types/webpack-env": "^1.15.2",
"@types/yargs": "^13.0.3", "@types/yargs": "^15.0.5",
"@typescript-eslint/eslint-plugin": "^2.24.0", "@typescript-eslint/eslint-plugin": "^3.7.0",
"@typescript-eslint/parser": "^2.24.0", "@typescript-eslint/parser": "^3.7.0",
"babel-loader": "8.0.6", "babel-loader": "^8.1.0",
"babel-plugin-styled-components": "^1.10.7", "babel-plugin-styled-components": "^1.10.7",
"beautify-benchmark": "^0.2.4", "beautify-benchmark": "^0.2.4",
"bundlesize": "^0.18.0", "bundlesize": "^0.18.0",
"conventional-changelog-cli": "^2.0.31", "conventional-changelog-cli": "^2.0.34",
"copy-webpack-plugin": "^5.1.1", "copy-webpack-plugin": "^6.0.3",
"core-js": "^3.5.0", "core-js": "^3.6.5",
"coveralls": "^3.0.9", "coveralls": "^3.1.0",
"css-loader": "^3.4.2", "css-loader": "^3.6.0",
"cypress": "~3.7.0", "cypress": "^4.11.0",
"deploy-to-gh-pages": "^1.3.7", "deploy-to-gh-pages": "^1.3.7",
"enzyme": "^3.11.0", "enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.2", "enzyme-adapter-react-16": "^1.15.2",
"enzyme-to-json": "^3.4.4", "enzyme-to-json": "^3.5.0",
"eslint": "^6.8.0", "eslint": "^7.5.0",
"eslint-plugin-import": "^2.20.1", "eslint-plugin-import": "^2.22.0",
"eslint-plugin-react": "^7.19.0", "eslint-plugin-react": "^7.20.3",
"fork-ts-checker-webpack-plugin": "3.1.1", "fork-ts-checker-webpack-plugin": "^5.0.11",
"html-webpack-plugin": "^3.1.0", "html-webpack-plugin": "^4.3.0",
"jest": "^24.9.0", "jest": "^26.1.0",
"license-checker": "^25.0.1", "license-checker": "^25.0.1",
"lodash": "^4.17.15", "lodash": "^4.17.19",
"mobx": "^4.3.1", "mobx": "^5.15.4",
"prettier": "^1.19.1", "prettier": "^2.0.5",
"raf": "^3.4.1", "raf": "^3.4.1",
"react": "^16.13.0", "react": "^16.13.1",
"react-dom": "^16.13.0", "react-dom": "^16.13.1",
"react-hot-loader": "^4.12.19", "react-hot-loader": "^4.12.21",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"shelljs": "^0.8.3", "shelljs": "^0.8.4",
"source-map-loader": "^0.2.4", "source-map-loader": "^1.0.1",
"style-loader": "^1.1.3", "style-loader": "^1.2.1",
"styled-components": "^4.4.1", "styled-components": "^5.1.1",
"ts-jest": "24.2.0", "ts-jest": "^26.1.3",
"ts-loader": "6.2.1", "ts-loader": "^8.0.1",
"ts-node": "^8.6.2", "ts-node": "^8.10.2",
"typescript": "^3.8.3", "typescript": "^3.9.7",
"unfetch": "^4.1.0", "unfetch": "^4.1.0",
"url-polyfill": "^1.1.8", "url-polyfill": "^1.1.10",
"webpack": "^4.42.0", "webpack": "^4.44.0",
"webpack-cli": "^3.3.11", "webpack-cli": "^3.3.12",
"webpack-dev-server": "^3.10.3", "webpack-dev-server": "^3.11.0",
"webpack-node-externals": "^1.6.0", "webpack-node-externals": "^2.5.0",
"workerize-loader": "^1.1.0", "workerize-loader": "^1.3.0",
"yaml-js": "^0.2.3" "yaml-js": "^0.2.3"
}, },
"peerDependencies": { "peerDependencies": {
@ -138,26 +138,26 @@
"@types/node": "^13.11.1", "@types/node": "^13.11.1",
"classnames": "^2.2.6", "classnames": "^2.2.6",
"decko": "^1.2.0", "decko": "^1.2.0",
"dompurify": "^2.0.8", "dompurify": "^2.0.12",
"eventemitter3": "^4.0.0", "eventemitter3": "^4.0.4",
"json-pointer": "^0.6.0", "json-pointer": "^0.6.0",
"json-schema-ref-parser": "^6.1.0", "json-schema-ref-parser": "^6.1.0",
"lunr": "2.3.8", "lunr": "2.3.8",
"mark.js": "^8.11.1", "mark.js": "^8.11.1",
"marked": "^0.7.0", "marked": "^0.7.0",
"memoize-one": "~5.1.1", "memoize-one": "~5.1.1",
"mobx-react": "6.1.5", "mobx-react": "^6.2.2",
"openapi-sampler": "^1.0.0-beta.16", "openapi-sampler": "^1.0.0-beta.16",
"perfect-scrollbar": "^1.4.0", "perfect-scrollbar": "^1.4.0",
"polished": "^3.4.4", "polished": "^3.6.5",
"prismjs": "^1.19.0", "prismjs": "^1.20.0",
"prop-types": "^15.7.2", "prop-types": "^15.7.2",
"react-dropdown-aria": "^2.0.6", "react-dropdown-aria": "^2.0.6",
"react-tabs": "^3.1.0", "react-tabs": "^3.1.1",
"slugify": "^1.4.0", "slugify": "^1.4.4",
"stickyfill": "^1.1.1", "stickyfill": "^1.1.1",
"swagger2openapi": "^5.3.4", "swagger2openapi": "^6.2.1",
"tslib": "^1.11.1", "tslib": "^2.0.0",
"url-template": "^2.0.8" "url-template": "^2.0.8"
}, },
"bundlesize": [ "bundlesize": [

View File

@ -19,7 +19,7 @@ export async function loadAndBundleSpec(specUrlOrObject: object | string): Promi
export function convertSwagger2OpenAPI(spec: any): Promise<OpenAPISpec> { export function convertSwagger2OpenAPI(spec: any): Promise<OpenAPISpec> {
console.warn('[ReDoc Compatibility mode]: Converting OpenAPI 2.0 to OpenAPI 3.0'); console.warn('[ReDoc Compatibility mode]: Converting OpenAPI 2.0 to OpenAPI 3.0');
return new Promise<OpenAPISpec>((resolve, reject) => return new Promise<OpenAPISpec>((resolve, reject) =>
convertObj(spec, { patch: true, warnOnly: true, text: '{}' }, (err, res) => { convertObj(spec, { patch: true, warnOnly: true, text: '{}', anchors: true }, (err, res) => {
// TODO: log any warnings // TODO: log any warnings
if (err) { if (err) {
return reject(err); return reject(err);

View File

@ -2,16 +2,6 @@ import * as styledComponents from 'styled-components';
// FIXME // FIXME
declare module 'styled-components' { declare module 'styled-components' {
export interface ThemedStyledFunction<
C extends keyof JSX.IntrinsicElements | React.ComponentType<any>,
T extends object,
O extends object = {},
A extends keyof any = never
> extends ThemedStyledFunctionBase<C, T, O, A> {
withConfig(config: any): any;
// tslint:enable:unified-signatures
}
interface ThemedStyledComponentsModule<T> { interface ThemedStyledComponentsModule<T> {
keyframes( keyframes(
strings: TemplateStringsArray | string[], strings: TemplateStringsArray | string[],

View File

@ -1,12 +1,12 @@
/* tslint:disable:no-implicit-dependencies */ /* tslint:disable:no-implicit-dependencies */
import * as ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin'; import ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
import * as webpack from 'webpack'; import * as webpack from 'webpack';
import * as path from 'path'; import * as path from 'path';
const nodeExternals = require('webpack-node-externals')({ const nodeExternals = require('webpack-node-externals')({
// bundle in modules that need transpiling + non-js (e.g. css) // bundle in modules that need transpiling + non-js (e.g. css)
whitelist: [ allowlist: [
'swagger2openapi', 'swagger2openapi',
/reftools/, /reftools/,
'oas-resolver', 'oas-resolver',
@ -21,10 +21,7 @@ let REVISION;
try { try {
REVISION = JSON.stringify( REVISION = JSON.stringify(
require('child_process') require('child_process').execSync('git rev-parse --short HEAD').toString().trim(),
.execSync('git rev-parse --short HEAD')
.toString()
.trim(),
); );
} catch (e) { } catch (e) {
console.error('Skipping REDOC_REVISION'); console.error('Skipping REDOC_REVISION');
@ -145,7 +142,7 @@ export default (env: { standalone?: boolean } = {}, { mode }) => ({
__REDOC_VERSION__: VERSION, __REDOC_VERSION__: VERSION,
__REDOC_REVISION__: REVISION, __REDOC_REVISION__: REVISION,
}), }),
new ForkTsCheckerWebpackPlugin({ silent: true }), new ForkTsCheckerWebpackPlugin({ logger: { infrastructure: 'silent', issues: 'console' } }),
new webpack.BannerPlugin(BANNER), new webpack.BannerPlugin(BANNER),
ignore(/js-yaml\/dumper\.js$/), ignore(/js-yaml\/dumper\.js$/),
ignore(/json-schema-ref-parser\/lib\/dereference\.js/), ignore(/json-schema-ref-parser\/lib\/dereference\.js/),