diff --git a/webapp/.eslintrc.js b/webapp/.eslintrc.js index 6ea94b8645..dc2abd4303 100644 --- a/webapp/.eslintrc.js +++ b/webapp/.eslintrc.js @@ -106,7 +106,9 @@ module.exports = { 'import/export': 'off', 'import/extensions': 'off', 'import/no-unresolved': 'off', - 'import/no-extraneous-dependencies': 'warn', + // import/no-extraneous-dependencies off because peer dependencies are moved to builder + // todo probably there is a way to tune this (see packageDir option in documentation) + 'import/no-extraneous-dependencies': 'off', 'import/prefer-default-export': 'off', 'import/no-cycle': 'off', 'import-helpers/order-imports': [ diff --git a/webapp/configs/babel-rollup.config.js b/webapp/configs/babel-rollup.config.js deleted file mode 100644 index 04f99be204..0000000000 --- a/webapp/configs/babel-rollup.config.js +++ /dev/null @@ -1,10 +0,0 @@ -module.exports = { - presets: [ - '@babel/preset-react', - ], - plugins: [ - '@babel/plugin-syntax-dynamic-import', - 'react-require', - 'reshadow/babel', - ], -} diff --git a/webapp/configs/babel.config.js b/webapp/configs/babel.config.js deleted file mode 100644 index aa436143dd..0000000000 --- a/webapp/configs/babel.config.js +++ /dev/null @@ -1,17 +0,0 @@ -module.exports = { - presets: [ - "@babel/preset-env", - "@babel/preset-react", - ['@babel/preset-typescript', { isTSX: true, allExtensions: true }], - ], - plugins: [ - '@babel/plugin-transform-runtime', - '@babel/plugin-syntax-dynamic-import', - 'babel-plugin-transform-typescript-metadata', - '@babel/plugin-proposal-optional-chaining', - ['@babel/plugin-proposal-decorators', { legacy: true }], - ['@babel/plugin-proposal-class-properties', { loose: true }], - 'react-require', - 'reshadow/babel', - ], -} diff --git a/webapp/configs/rollup.config.js b/webapp/configs/rollup.config.js deleted file mode 100644 index cfbfa955e0..0000000000 --- a/webapp/configs/rollup.config.js +++ /dev/null @@ -1,81 +0,0 @@ -import babelPlugin from 'rollup-plugin-babel'; -const path = require('path'); -import postcssPlugin from 'rollup-plugin-postcss'; -import nodeResolve from 'rollup-plugin-node-resolve'; -import commonjs from 'rollup-plugin-commonjs'; -import peerDepsExternal from 'rollup-plugin-peer-deps-external'; -import includePaths from 'rollup-plugin-includepaths'; -import typescriptPlugin from 'rollup-plugin-typescript2'; - -const includePathOptions = { - include: {}, - paths: ['src'], - external: [ - - ], - extensions: ['.ts', '.tsx', '.js'] -}; - -export const defaultBuilderOptions = { - babelConfig: path.join(__dirname, './babel-rollup.config.js'), - typescriptConfig: '', // tbd -} - -export function configBuilder(options = defaultBuilderOptions) { - - return { - input: 'src/index.ts', - output: [ - { - dir: 'dist', - format: 'esm', - }, - ], - external: [ - // externals beyond peer dependencies - ], - plugins: [ - includePaths(includePathOptions), - nodeResolve(), - commonjs({ - sourceMap: false, - }), - typescriptPlugin({ - tsconfig: 'tsconfig.build.json', - useTsconfigDeclarationDir: true, - }), - babelPlugin({ - exclude: 'node_modules/**', - extensions: ['.js', '.ts', '.tsx'], - configFile: options.babelConfig, - }), - postcssPlugin({ - extract: false, - // enable CSS modules for .module.css .module.scss files - autoModules: true, - // modules: { - // generateScopedName: "[local]___[hash:base64:5]" - // }, - inject: true, - use: { - sass: { - includePaths: ['node_modules', '../../node_modules'], - } - }, - // this option is added in dkrupenya/rollup-plugin-postcss#develop - // todo to be converted to custom loader - firstPlugin: require('reshadow/postcss'), - plugins: [ - require('postcss-preset-env')({ stage: 0 }), - require('postcss-discard-comments'), - // todo move 'reshadow/postcss' to custom loader to run it before postcss-loader - // require('reshadow/postcss'), - ] - }), - peerDepsExternal(), - ], - }; - -} - -export default configBuilder(defaultBuilderOptions); diff --git a/webapp/configs/webpack/build-plugin.js b/webapp/configs/webpack/build-plugin.js deleted file mode 100644 index df115404ab..0000000000 --- a/webapp/configs/webpack/build-plugin.js +++ /dev/null @@ -1,23 +0,0 @@ -const merge = require('webpack-merge'); -const {resolve} = require('path'); -var PeerDepsExternalsPlugin = require('peer-deps-externals-webpack-plugin'); - -const commonConfig = require('./common'); - -module.exports = (env, argv) => merge(commonConfig(env, argv), { - mode: argv.mode || 'development', - entry: resolve(__dirname, '../../src/index.ts'), // todo - output: { - filename: 'index.js', - path: resolve(__dirname, '../../dist'), - library: 'basicConnectionPlugin', // todo pass from package.js - libraryTarget: 'umd', - }, - externals: [ - /^@dbeaver\/.+$/ - ], - devtool: 'source-map', - plugins: [ - new PeerDepsExternalsPlugin(), // allow to treat all peerDependencies as externals - ], -}); diff --git a/webapp/configs/webpack/common.js b/webapp/configs/webpack/common.js deleted file mode 100644 index becb4f9072..0000000000 --- a/webapp/configs/webpack/common.js +++ /dev/null @@ -1,187 +0,0 @@ -// shared config (dev and prod) -const webpack = require('webpack'); -const ModuleDependencyWarning = require("webpack/lib/ModuleDependencyWarning"); -const path = require('path'); -const CircularDependencyPlugin = require('circular-dependency-plugin'); -const MiniCssExtractPlugin = require('mini-css-extract-plugin'); - - -// Temporary solution to remove wrong warning messages (it's was fixed https://github.com/microsoft/TypeScript/pull/35200 in typescript 3.8) -class IgnoreNotFoundExportPlugin { - apply(compiler) { - const messageRegExp = /export '.*'( \(reexported as '.*'\))? was not found in/ - function doneHook(stats) { - stats.compilation.warnings = stats.compilation.warnings.filter(function (warn) { - if (warn instanceof ModuleDependencyWarning && messageRegExp.test(warn.message)) { - return false - } - return true; - }) - } - if (compiler.hooks) { - compiler.hooks.done.tap("IgnoreNotFoundExportPlugin", doneHook) - } else { - compiler.plugin("done", doneHook) - } - } -} - -module.exports = (env, argv) => { - - function generateStyleLoaders(options = { hasModule: false }) { - const moduleScope = options.hasModule ? 'local' : 'global'; - const modules = { - mode: moduleScope, - localIdentName: '[local]___[hash:base64:5]', - }; - - const postCssPlugins = [ - require('postcss-preset-env')({ stage: 0 }), - require('@csstools/postcss-sass')({ - includePaths: ['node_modules', path.resolve('../../node_modules')], - }), - require('postcss-discard-comments'), - require('reshadow/postcss')({ scopeBehaviour: moduleScope }) - ]; - - // 'use' clause in webpack rules - return [ - { - loader: MiniCssExtractPlugin.loader, - options: { - hot: argv.mode !== 'production', - }, - }, - { - loader: 'css-loader', - options: { - importLoaders: 1, - modules: modules, - } - }, - { - loader: 'postcss-loader', - options: { - syntax: 'postcss-scss', - plugins: postCssPlugins, - }, - }, - ]; - } - - return { - resolve: { - extensions: ['.ts', '.tsx', '.js', '.jsx'], - }, - module: { - rules: [ - { - test: /\.js$/, - use: [ - { - loader: 'babel-loader', - options: { - configFile: path.join(__dirname, '../babel.config.js') - }, - }, - 'source-map-loader' - ], - exclude: /node_modules/, - }, - { - test: /\.tsx?$/, - use: [ - { - loader: 'babel-loader', - options: { - configFile: path.join(__dirname, '../babel.config.js') - }, - }, - { - loader: 'eslint-loader', - // uncomment to fix after rule changes - // options: { - // fix: true, - // }, - } - ], - }, - { - test: /\.(css|scss|sass)$/, - oneOf: [ - // css-module files ( should have *.module mask ) - { - test: /\.module\.(css|scss|sass)$/, - use: generateStyleLoaders({ hasModule: true }), - }, - { - include: /node_modules/, - use: [ - { - loader: MiniCssExtractPlugin.loader, - options: { - hot: argv.mode !== 'production', - }, - }, - 'css-loader', - ] - }, - { - use: generateStyleLoaders({ hasModule: false }), - } - ] - }, - { - test: /\.(png|jpe?g|gif|svg|eot|ttf|woff|woff2)$/i, - loader: 'url-loader', - options: { - limit: 8192, - }, - }, - ], - }, - optimization: { - minimize: false, - namedModules: true, - concatenateModules: false, - }, - plugins: [ - new IgnoreNotFoundExportPlugin(), - new webpack.ProgressPlugin({ - entries: true, - modules: true, - modulesCount: 100, - profile: true, - handler: (percentage, message, ...args) => { - // custom logic - } - }), - new CircularDependencyPlugin({ - // exclude detection of files based on a RegExp - exclude: /a\.js|node_modules/, - // include specific files based on a RegExp - // include: /dir/, - // add errors to webpack instead of warnings - failOnError: false, - // allow import cycles that include an asyncronous import, - // e.g. via import(/* webpackMode: "weak" */ './file.js') - allowAsyncCycles: false, - // set the current working directory for displaying module paths - cwd: process.cwd(), - }), - new MiniCssExtractPlugin({ - // Options similar to the same options in webpackOptions.output - // all options are optional - filename: argv.mode !== 'production' ? '[name].css' : '[name].[hash].css', - chunkFilename: argv.mode !== 'production' ? '[name].css' : '[name].[hash].css', - ignoreOrder: false, // Enable to remove warnings about conflicting order - }), - // new webpack.optimize.LimitChunkCountPlugin({ - // maxChunks: 1, - // }), - ], - performance: { - hints: false, - }, - }; -}; diff --git a/webapp/package.json b/webapp/package.json index 96e895b061..56bd98944c 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -16,6 +16,7 @@ "build": "lerna run build --stream", "serve": "lerna run serve --stream", "serve-plugin": "lerna run serve-plugin --stream --parallel", + "builder-help": "builder help", "clean-dist": "lerna run clean-dist --stream", "test": "echo \"Error: no test specified\" && exit 1" }, @@ -23,10 +24,6 @@ "@babel/runtime": "7.8.4" }, "devDependencies": { - "@types/jest": "^24.0.23", - "@types/node": "^12.7.8", - "@types/react": "^16.9.34", - "@types/react-dom": "^16.9.6", "@typescript-eslint/eslint-plugin": "^2.5.0", "@typescript-eslint/parser": "^2.8.0", "eslint": "^6.6.0", diff --git a/webapp/packages/_plugin-template/package.json b/webapp/packages/_plugin-template/package.json index 9be06fb3cd..6959e39aa3 100644 --- a/webapp/packages/_plugin-template/package.json +++ b/webapp/packages/_plugin-template/package.json @@ -12,16 +12,10 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "devDependencies": { - "@dbeaver/core": "^0.1.0" + "@dbeaver/core": "^0.1.0", + "@dbeaver/builder": "^0.1.0" }, "peerDependencies": { - "@dbeaver/core": "^0.1.0", - "mobx": "^5.15.4", - "mobx-react": "^6.2.2", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "reakit": "^1.0.0-beta.11", - "reshadow": "0.0.1-alpha.77", - "rxjs": "^6.5.5" + "@dbeaver/core": "^0.1.0" } } diff --git a/webapp/packages/_plugin-template/tsconfig.build.json b/webapp/packages/_plugin-template/tsconfig.build.json deleted file mode 100644 index dd700023ea..0000000000 --- a/webapp/packages/_plugin-template/tsconfig.build.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "declarationDir": "dist/types", - "declaration": true, - "noEmit": false, - "outDir": "dist/js" - }, - "exclude": [ - "node_modules", - "@dbeaver/**" - ], - "include": ["src/**/*"] -} diff --git a/webapp/packages/_plugin-template/tsconfig.json b/webapp/packages/_plugin-template/tsconfig.json index 6b4c45f333..e1afdcc3c5 100644 --- a/webapp/packages/_plugin-template/tsconfig.json +++ b/webapp/packages/_plugin-template/tsconfig.json @@ -1,5 +1,9 @@ { "extends": "../../tsconfig.json", + "compilerOptions": { + "declarationDir": "dist/types", + "outDir": "dist/js" + }, "include": [ "src" ], diff --git a/webapp/packages/administration/package.json b/webapp/packages/administration/package.json index ed5bf95113..3ed34d6fc2 100644 --- a/webapp/packages/administration/package.json +++ b/webapp/packages/administration/package.json @@ -12,16 +12,10 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "devDependencies": { - "@dbeaver/core": "^0.1.0" + "@dbeaver/core": "^0.1.0", + "@dbeaver/builder": "^0.1.0" }, "peerDependencies": { - "@dbeaver/core": "^0.1.0", - "mobx": "^5.15.4", - "mobx-react": "^6.2.2", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "reakit": "^1.0.0-beta.11", - "reshadow": "0.0.1-alpha.77", - "rxjs": "^6.5.5" + "@dbeaver/core": "^0.1.0" } } diff --git a/webapp/packages/administration/tsconfig.build.json b/webapp/packages/administration/tsconfig.build.json deleted file mode 100644 index dd700023ea..0000000000 --- a/webapp/packages/administration/tsconfig.build.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "declarationDir": "dist/types", - "declaration": true, - "noEmit": false, - "outDir": "dist/js" - }, - "exclude": [ - "node_modules", - "@dbeaver/**" - ], - "include": ["src/**/*"] -} diff --git a/webapp/packages/administration/tsconfig.json b/webapp/packages/administration/tsconfig.json index cf0afdc7c0..206277ba09 100644 --- a/webapp/packages/administration/tsconfig.json +++ b/webapp/packages/administration/tsconfig.json @@ -1,5 +1,9 @@ { "extends": "../../tsconfig.json", + "compilerOptions": { + "declarationDir": "dist/types", + "outDir": "dist/js" + }, "include": [ "src/**/*" ], diff --git a/webapp/packages/ag-grid-plugin/package.json b/webapp/packages/ag-grid-plugin/package.json index 419a2b1d94..a177353396 100644 --- a/webapp/packages/ag-grid-plugin/package.json +++ b/webapp/packages/ag-grid-plugin/package.json @@ -12,22 +12,18 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "dependencies": { - "@ag-grid-community/all-modules": "^23.0.2", - "@ag-grid-community/core": "^23.0.2", - "ag-grid-community": "^23.0.2", - "ag-grid-react": "^23.0.3" + "@ag-grid-community/all-modules": "^23.1.1", + "@ag-grid-community/core": "^23.1.1", + "ag-grid-community": "^23.1.1", + "ag-grid-react": "^23.1.1" }, "devDependencies": { - "@dbeaver/core": "^0.1.0" + "@dbeaver/core": "^0.1.0", + "@dbeaver/builder": "^0.1.0" }, "peerDependencies": { "@dbeaver/core": "^0.1.0", - "mobx": "^5.15.4", - "mobx-react": "^6.2.2", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "reakit": "^1.0.0-beta.11", - "reshadow": "0.0.1-alpha.77", - "rxjs": "^6.5.5" + "react": "^16.3.0", + "react-dom": "^16.3.0" } } diff --git a/webapp/packages/ag-grid-plugin/tsconfig.build.json b/webapp/packages/ag-grid-plugin/tsconfig.build.json deleted file mode 100644 index fbd011158d..0000000000 --- a/webapp/packages/ag-grid-plugin/tsconfig.build.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "declarationDir": "dist/types", - "declaration": true, - "noEmit": false, - "outDir": "dist/js" - }, - "exclude": [ - "node_modules", - "@dbeaver/core/**" - ], - "include": ["src/**/*"] -} diff --git a/webapp/packages/ag-grid-plugin/tsconfig.json b/webapp/packages/ag-grid-plugin/tsconfig.json index 6b4c45f333..e1afdcc3c5 100644 --- a/webapp/packages/ag-grid-plugin/tsconfig.json +++ b/webapp/packages/ag-grid-plugin/tsconfig.json @@ -1,5 +1,9 @@ { "extends": "../../tsconfig.json", + "compilerOptions": { + "declarationDir": "dist/types", + "outDir": "dist/js" + }, "include": [ "src" ], diff --git a/webapp/packages/authentication/package.json b/webapp/packages/authentication/package.json index 702239de26..79086ac2f4 100644 --- a/webapp/packages/authentication/package.json +++ b/webapp/packages/authentication/package.json @@ -12,16 +12,10 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "devDependencies": { - "@dbeaver/core": "^0.1.0" + "@dbeaver/core": "^0.1.0", + "@dbeaver/builder": "^0.1.0" }, "peerDependencies": { - "@dbeaver/core": "^0.1.0", - "mobx": "^5.15.4", - "mobx-react": "^6.2.2", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "reakit": "^1.0.0-beta.11", - "reshadow": "0.0.1-alpha.76", - "rxjs": "^6.5.5" + "@dbeaver/core": "^0.1.0" } } diff --git a/webapp/packages/authentication/tsconfig.build.json b/webapp/packages/authentication/tsconfig.build.json deleted file mode 100644 index dd700023ea..0000000000 --- a/webapp/packages/authentication/tsconfig.build.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "declarationDir": "dist/types", - "declaration": true, - "noEmit": false, - "outDir": "dist/js" - }, - "exclude": [ - "node_modules", - "@dbeaver/**" - ], - "include": ["src/**/*"] -} diff --git a/webapp/packages/authentication/tsconfig.json b/webapp/packages/authentication/tsconfig.json index cf0afdc7c0..206277ba09 100644 --- a/webapp/packages/authentication/tsconfig.json +++ b/webapp/packages/authentication/tsconfig.json @@ -1,5 +1,9 @@ { "extends": "../../tsconfig.json", + "compilerOptions": { + "declarationDir": "dist/types", + "outDir": "dist/js" + }, "include": [ "src/**/*" ], diff --git a/webapp/packages/basic-connection-plugin/package.json b/webapp/packages/basic-connection-plugin/package.json index 0d3b334c20..6e46802c31 100644 --- a/webapp/packages/basic-connection-plugin/package.json +++ b/webapp/packages/basic-connection-plugin/package.json @@ -13,16 +13,10 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "devDependencies": { - "@dbeaver/core": "^0.1.0" + "@dbeaver/core": "^0.1.0", + "@dbeaver/builder": "^0.1.0" }, "peerDependencies": { - "@dbeaver/core": "^0.1.0", - "mobx": "^5.15.4", - "mobx-react": "^6.2.2", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "reakit": "^1.0.0-beta.11", - "reshadow": "0.0.1-alpha.77", - "rxjs": "^6.5.5" + "@dbeaver/core": "^0.1.0" } } diff --git a/webapp/packages/basic-connection-plugin/tsconfig.build.json b/webapp/packages/basic-connection-plugin/tsconfig.build.json deleted file mode 100644 index dd700023ea..0000000000 --- a/webapp/packages/basic-connection-plugin/tsconfig.build.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "declarationDir": "dist/types", - "declaration": true, - "noEmit": false, - "outDir": "dist/js" - }, - "exclude": [ - "node_modules", - "@dbeaver/**" - ], - "include": ["src/**/*"] -} diff --git a/webapp/packages/basic-connection-plugin/tsconfig.json b/webapp/packages/basic-connection-plugin/tsconfig.json index cf0afdc7c0..206277ba09 100644 --- a/webapp/packages/basic-connection-plugin/tsconfig.json +++ b/webapp/packages/basic-connection-plugin/tsconfig.json @@ -1,5 +1,9 @@ { "extends": "../../tsconfig.json", + "compilerOptions": { + "declarationDir": "dist/types", + "outDir": "dist/js" + }, "include": [ "src/**/*" ], diff --git a/webapp/packages/builder/bin/index.js b/webapp/packages/builder/bin/index.js index 6106aab3b4..e86c2666f2 100644 --- a/webapp/packages/builder/bin/index.js +++ b/webapp/packages/builder/bin/index.js @@ -98,7 +98,9 @@ require('yargs') async function build() { const config = createRollupConfig() for (const moduleConfig of config) { - console.log(`Building ${packageName} ${moduleConfig.output.dir}`); + const module = moduleConfig.output.dir.replace('dist' , '') + const start = Date.now() + console.log(`Building ${packageName}${module}`); try { const bundle = await rollup.rollup(moduleConfig); await bundle.write(moduleConfig.output); @@ -106,7 +108,8 @@ require('yargs') console.error(e) process.exitCode = 1; } finally { - console.log(`Build finished ${packageName} ${moduleConfig.output.dir}`); + const buildTime = Math.floor((Date.now() - start) / 1000); + console.log(`Build finished ${packageName}${module}, ${buildTime} s`); } } } @@ -143,6 +146,7 @@ require('yargs') }, }, function (argv) { + const start = Date.now() const webpackArgv = createWebpackArgv(argv); // console.log(webpackArgv) const configObject = buildConfig({}, webpackArgv) @@ -150,6 +154,8 @@ require('yargs') compiler.run((err, stats) => { console.log(stats.compilation.errors) + const buildTime = Math.floor((Date.now() - start) / 1000); + console.log(`Build app finished in ${buildTime} s`); }); } ) @@ -172,7 +178,7 @@ require('yargs') }, function (argv) { const webpackArgv = createWebpackArgv(argv); - webpackArgv.mode = 'development' + console.log(webpackArgv.mode) webpackArgv.server = argv.server const configObject = devConfig({}, webpackArgv) const WebpackDevServer = require('webpack-dev-server'); diff --git a/webapp/packages/builder/configs/babel-app.config.js b/webapp/packages/builder/configs/babel-app.config.js deleted file mode 100644 index cdc6a0db47..0000000000 --- a/webapp/packages/builder/configs/babel-app.config.js +++ /dev/null @@ -1,17 +0,0 @@ -module.exports = { - presets: [ - "@babel/preset-env", - "@babel/preset-react", - // ['@babel/preset-typescript', { isTSX: true, allExtensions: true }], - ], - plugins: [ - '@babel/plugin-transform-runtime', - '@babel/plugin-syntax-dynamic-import', - // 'babel-plugin-transform-typescript-metadata', - '@babel/plugin-proposal-optional-chaining', - // ['@babel/plugin-proposal-decorators', { legacy: true }], - ['@babel/plugin-proposal-class-properties', { loose: true }], - // 'react-require', - // 'reshadow/babel', - ], -} diff --git a/webapp/packages/builder/configs/rollup.config.js b/webapp/packages/builder/configs/rollup.config.js index 88642c47c3..df2bc21670 100644 --- a/webapp/packages/builder/configs/rollup.config.js +++ b/webapp/packages/builder/configs/rollup.config.js @@ -1,8 +1,8 @@ -const babelPlugin = require('rollup-plugin-babel'); const path = require('path'); +const { nodeResolve } = require('@rollup/plugin-node-resolve'); +const { babel } = require('@rollup/plugin-babel'); +const commonjs = require('@rollup/plugin-commonjs'); const postcssPlugin = require('rollup-plugin-postcss'); -const nodeResolve = require('rollup-plugin-node-resolve'); -const commonjs = require('rollup-plugin-commonjs'); const peerDepsExternal = require('rollup-plugin-peer-deps-external'); const includePaths = require('rollup-plugin-includepaths'); const typescriptPlugin = require('rollup-plugin-typescript2'); @@ -11,28 +11,37 @@ const reshadowLoader = require('./reshadow-loader'); const includePathOptions = { include: {}, paths: ['src'], - external: [ - - ], + external: [], extensions: ['.ts', '.tsx', '.js'] }; -const defaultBuilderOptions = { - babelConfig: path.join(__dirname, 'babel-plugin.config.js'), - typescriptConfig: '', // tbd -} +function configBuilder() { -function configBuilder(options = defaultBuilderOptions) { - - return { + return { input: 'src/index.ts', output: { - dir: 'dist', - format: 'esm', - sourcemap: true, - }, + dir: 'dist', + format: 'esm', + sourcemap: true, + }, external: [ - // externals beyond peer dependencies + // externals beyond peer dependencies - common dependencies of the whole application + 'mobx', + // todo check that @dbeaver/core/blocks provide wrapper for go-split + // todo add go-split to @dbeaver/core dependencies and remove it from here + 'go-split', + 'mobx-react', + 'react', + 'react-dom', + // todo add reakit to @dbeaver/core dependencies and remove it from here + // todo be sure that @dbeaver/core provides all necessary wrappers around reakit + 'reakit', + // todo magic. It nested dependency of reakit and should not be mentioned here + // todo but by unknown reasons without this build fails + // todo should be removed when reakit will be incorporated into @dbeaver/core + 'body-scroll-lock', + 'reshadow', + 'rxjs', ], onwarn(warning, warn) { // hides some warning drom ag-grid-plugin todo to investigate later @@ -42,19 +51,32 @@ function configBuilder(options = defaultBuilderOptions) { plugins: [ includePaths(includePathOptions), nodeResolve({ - preferBuiltins: true, // fix crypto import in core/utils/uuid library. todo replace uuid library with simple uuid generation + preferBuiltins: false, // fix crypto import in core/utils/uuid library. todo replace uuid library with simple uuid generation + }), + typescriptPlugin({ + tsconfig: 'tsconfig.json', + useTsconfigDeclarationDir: true, + }), + babel({ + exclude: ['../../node_modules/**', 'node_modules/**'], // exclude package node_modules and lerna node_modules + extensions: ['.js', '.ts', '.tsx'], + babelHelpers: 'bundled', + configFile: path.join(__dirname, 'babel-plugin.config.js'), }), commonjs({ sourceMap: false, - }), - typescriptPlugin({ - tsconfig: 'tsconfig.build.json', - useTsconfigDeclarationDir: true, - }), - babelPlugin({ - exclude: 'node_modules/**', - extensions: ['.js', '.ts', '.tsx'], - configFile: options.babelConfig, + exclude: [ + /** + * todo Now all plugins after build contain reshadow source code + * todo Expected next line should remove reshadow code from build artifact but it doesnt work. + * todo It was found that reshadow code disappear if to comment 'reshadow/babel' in babel-plugin.config.js + * todo So it is reshadow/babel plugin inject code into the artifact. Further investigations required. + */ + 'node_modules/@reshadow/**', + 'node_modules/react-dom', + 'node_modules/react-dom/server', + 'node_modules/react', + ], }), postcssPlugin({ extract: false, @@ -76,9 +98,9 @@ function configBuilder(options = defaultBuilderOptions) { } ], ], - loaders: [ reshadowLoader ], + loaders: [reshadowLoader], plugins: [ - require('postcss-preset-env')({ stage: 0 }), + require('postcss-preset-env')({stage: 0}), require('postcss-discard-comments'), ] }), @@ -88,4 +110,4 @@ function configBuilder(options = defaultBuilderOptions) { } -module.exports = configBuilder(defaultBuilderOptions); +module.exports = configBuilder(); diff --git a/webapp/packages/builder/configs/webpack-build-config.js b/webapp/packages/builder/configs/webpack-build-config.js index b67f7463e1..02327a3187 100644 --- a/webapp/packages/builder/configs/webpack-build-config.js +++ b/webapp/packages/builder/configs/webpack-build-config.js @@ -12,11 +12,11 @@ module.exports = (env, argv) => merge(commonConfig(env, argv), { path: path.resolve(argv.currentDir, './dist'), publicPath: '', }, - devtool: 'source-map', + devtool: argv.mode === 'production' ? false : 'source-map', plugins: [], optimization: { - minimize: false, - namedModules: true, - concatenateModules: false, + minimize: argv.mode === 'production', + namedModules: argv.mode !== 'production', + concatenateModules: argv.mode === 'production', }, }); diff --git a/webapp/packages/builder/configs/webpack-common-config.js b/webapp/packages/builder/configs/webpack-common-config.js index e3774964e2..62eeb11ebd 100644 --- a/webapp/packages/builder/configs/webpack-common-config.js +++ b/webapp/packages/builder/configs/webpack-common-config.js @@ -88,14 +88,9 @@ module.exports = (env, argv) => { { test: /\.js$/, use: [ - { - loader: 'babel-loader', - options: { - configFile: path.join(__dirname, 'babel-app.config.js') - }, - }, { loader: StringReplacePlugin.replace({ + exclude: /node_modules/, /** * This replacement allows to put into the build the plugins that were mentioned in package.json */ @@ -111,7 +106,6 @@ module.exports = (env, argv) => { }, 'source-map-loader' ], - exclude: /node_modules/, }, ], }, @@ -125,9 +119,9 @@ module.exports = (env, argv) => { }), new CircularDependencyPlugin({ // exclude detection of files based on a RegExp - // exclude: /\.js|node_modules/, + exclude: /node_modules/, // include specific files based on a RegExp - // include: /dir/, + include: /@dbeaver/, // add errors to webpack instead of warnings failOnError: false, // allow import cycles that include an asyncronous import, diff --git a/webapp/packages/builder/configs/webpack-serve-config.js b/webapp/packages/builder/configs/webpack-serve-config.js index a068f77c0b..97e9cb3e9a 100644 --- a/webapp/packages/builder/configs/webpack-serve-config.js +++ b/webapp/packages/builder/configs/webpack-serve-config.js @@ -15,7 +15,7 @@ module.exports = (env, argv) => merge(commonConfig(env, argv), { hot: false, // enable HMR on the server proxy: { '/dbeaver': { - target: argv.server || 'localhost:3100' + target: argv.server || 'localhost:8978' } } }, @@ -33,4 +33,9 @@ module.exports = (env, argv) => merge(commonConfig(env, argv), { // new webpack.HotModuleReplacementPlugin(), // enable HMR globally new webpack.NamedModulesPlugin(), // prints more readable module names in the browser console on HMR updates ], + optimization: { + minimize: argv.mode === 'production', + namedModules: argv.mode !== 'production', + concatenateModules: argv.mode === 'production', + }, }); diff --git a/webapp/packages/builder/package.json b/webapp/packages/builder/package.json index 8a3a58503f..7e0ccdc8e3 100644 --- a/webapp/packages/builder/package.json +++ b/webapp/packages/builder/package.json @@ -7,41 +7,32 @@ "scripts": { "lint": "eslint ./src/ --ext .ts,.tsx" }, - "peerDependencies": { - "@dbeaver/core": "^0.1.0" - }, "dependencies": { "@babel/cli": "^7.7.4", "@babel/core": "^7.7.4", - "@babel/plugin-proposal-class-properties": "^7.8.3", - "@babel/plugin-proposal-decorators": "^7.7.4", - "@babel/plugin-proposal-optional-chaining": "^7.8.3", "@babel/plugin-syntax-dynamic-import": "^7.8.3", "@babel/plugin-transform-runtime": "^7.8.3", "@babel/preset-env": "^7.7.4", "@babel/preset-react": "^7.7.4", - "@babel/preset-typescript": "^7.7.4", "@csstools/postcss-sass": "^4.0.0", + "@dbeaver/core": "^0.1.0", "@material/button": "^4.0.0", "@material/elevation": "^4.0.0", "@material/ripple": "^4.0.0", "@material/theme": "^4.0.0", "@material/typography": "^4.0.0", + "@rollup/plugin-babel": "^5.0.2", + "@rollup/plugin-commonjs": "^12.0.0", + "@rollup/plugin-node-resolve": "^8.0.0", "@types/graphql": "^14.5.0", - "@types/jest": "^24.0.23", "@types/node": "^12.7.8", "@types/react": "^16.9.34", "@types/react-dom": "^16.9.6", - "@typescript-eslint/eslint-plugin": "^2.5.0", - "@typescript-eslint/parser": "^2.8.0", "babel-loader": "^8.0.6", "babel-plugin-react-require": "^3.1.1", - "babel-plugin-transform-typescript-metadata": "^0.2.2", "circular-dependency-plugin": "^5.2.0", "copy-webpack-plugin": "^5.1.0", - "css-loader": "^3.2.1", "extract-css-chunks-webpack-plugin": "^4.7.1", - "file-loader": "^5.0.2", "go-split": "^1.3.2", "graphql": "^14.5.8", "html-webpack-plugin": "^3.2.0", @@ -50,15 +41,9 @@ "mobx-react": "^6.2.2", "node-sass": "^4.13.0", "postcss-discard-comments": "^4.0.2", - "postcss-extend-rule": "^3.0.0", "postcss-import": "^12.0.1", - "postcss-loader": "^3.0.0", - "postcss-scss": "^2.0.0", "preact": "^10.4.1", "preact-render-to-string": "^5.1.6", - "preact-ssr-prepass": "^1.0.1", - "prettier-eslint": "^9.0.0", - "raw-loader": "^3.1.0", "react-dom": "^16.13.1", "react-hot-loader": "^4.12.18", "reakit": "1.0.0-beta.11", @@ -67,23 +52,16 @@ "resolve": "^1.17.0", "rimraf": "^3.0.0", "rollup": "^2.0.6", - "rollup-plugin-babel": "^4.4.0", - "rollup-plugin-commonjs": "^10.1.0", "rollup-plugin-includepaths": "^0.2.3", - "rollup-plugin-node-resolve": "^5.2.0", "rollup-plugin-peer-deps-external": "^2.2.2", "rollup-plugin-postcss": "^3.1.1", "rollup-plugin-typescript2": "^0.26.0", "rxjs": "^6.5.5", - "sass-loader": "^8.0.0", "source-map-loader": "^0.2.4", "string-replace-webpack-plugin": "^0.1.3", - "style-loader": "^1.0.1", - "typescript": "^3.8.3", - "url-loader": "^3.0.0", + "typescript": "^3.9.3", "webpack": "^4.41.2", "webpack-cli": "^3.3.10", - "webpack-dev-middleware": "^3.7.2", "webpack-dev-server": "^3.9.0", "webpack-merge": "^4.2.2", "yargs": "^15.3.1" diff --git a/webapp/packages/builder/tsconfig.json b/webapp/packages/builder/tsconfig.json deleted file mode 100644 index ed0c3a5736..0000000000 --- a/webapp/packages/builder/tsconfig.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "exclude": ["node_modules"], - "include": [ - "src/**/*", - "../**/*.d.ts" - ] -} diff --git a/webapp/packages/dbeaver/.gitignore b/webapp/packages/cloudbeaver/.gitignore similarity index 100% rename from webapp/packages/dbeaver/.gitignore rename to webapp/packages/cloudbeaver/.gitignore diff --git a/webapp/packages/dbeaver/index.html.ejs b/webapp/packages/cloudbeaver/index.html.ejs similarity index 100% rename from webapp/packages/dbeaver/index.html.ejs rename to webapp/packages/cloudbeaver/index.html.ejs diff --git a/webapp/packages/dbeaver/package.json b/webapp/packages/cloudbeaver/package.json similarity index 76% rename from webapp/packages/dbeaver/package.json rename to webapp/packages/cloudbeaver/package.json index b960659eba..cb1f15e445 100644 --- a/webapp/packages/dbeaver/package.json +++ b/webapp/packages/cloudbeaver/package.json @@ -1,5 +1,5 @@ { - "name": "@dbeaver/dbeaver", + "name": "@dbeaver/cloudbeaver", "version": "0.1.0", "description": "", "license": "Apache-2.0", @@ -7,11 +7,7 @@ "build": "npm run clean-dist && builder build-app", "serve": "builder serve-app", "build:analyze": "echo \"no analyze specified\" && exit 0", - "clean-dist": "rimraf dist/*", - "gql:gen": "graphql-codegen", - "gql:gen:dev": "graphql-codegen --watch", - "lint": "eslint ./src/ --ext .ts,.tsx", - "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix" + "clean-dist": "rimraf dist/*" }, "dependencies": { "@dbeaver/administration": "^0.1.0", diff --git a/webapp/packages/dbeaver/plugins-list.js b/webapp/packages/cloudbeaver/plugins-list.js similarity index 83% rename from webapp/packages/dbeaver/plugins-list.js rename to webapp/packages/cloudbeaver/plugins-list.js index 19d2e27b30..e346c2df70 100644 --- a/webapp/packages/dbeaver/plugins-list.js +++ b/webapp/packages/cloudbeaver/plugins-list.js @@ -1,5 +1,5 @@ /** - * Don't mention "@dbeaver/core" here. It will be included by default + * You may omit "@dbeaver/core" here. It will be included by default */ module.exports = [ diff --git a/webapp/packages/core/modules.js b/webapp/packages/core/modules.js index 2f5e275164..2182a036ac 100644 --- a/webapp/packages/core/modules.js +++ b/webapp/packages/core/modules.js @@ -7,8 +7,8 @@ module.exports = [ // The order of modules is important. // The module must be built before it is used in another module 'extensions', - 'di', 'utils', + 'di', 'eventsLog', 'settings', diff --git a/webapp/packages/core/package.json b/webapp/packages/core/package.json index 4deb03d8a8..e8754254bf 100644 --- a/webapp/packages/core/package.json +++ b/webapp/packages/core/package.json @@ -17,33 +17,21 @@ "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix" }, "dependencies": { + "go-split": "^1.3.2", "graphql-request": "^1.8.2", "inversify": "^5.0.1", - "react-sanitized-html": "^2.0.0", - "reflect-metadata": "^0.1.13", - "sanitize-html": "^1.23.0", - "uuid": "^7.0.3" - }, - "devDependencies": { "@material/button": "^4.0.0", "@material/elevation": "^4.0.0", "@material/radio": "^4.0.0", "@material/ripple": "^4.0.0", "@material/theme": "^4.0.0", "@material/typography": "^4.0.0", - "@types/uuid": "^7.0.2", - "graphql-request": "^1.8.2" + "react-sanitized-html": "^2.0.0", + "sanitize-html": "^1.23.0", + "uuid": "^7.0.3" }, - "peerDependencies": { - "go-split": "^1.3.2", - "mobx": "^5.15.4", - "mobx-react": "^6.2.2", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "reakit": "^1.0.0-beta.11", - "reshadow": "0.0.1-alpha.77", - "rxjs": "^6.5.5" + "devDependencies": { + "@types/uuid": "^7.0.2" }, - "buildVersion": "0.13.0", - "dbeaverPlugins": [] + "buildVersion": "0.13.0" } diff --git a/webapp/packages/core/tsconfig.build.json b/webapp/packages/core/tsconfig.build.json deleted file mode 100644 index 0ae3f077c2..0000000000 --- a/webapp/packages/core/tsconfig.build.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "declarationDir": "dist/types", - "declaration": true, - "noEmit": false, - "outDir": "dist/js" - }, - "exclude": [ - "node_modules" - ], - "include": ["src/**/*"] -} diff --git a/webapp/packages/core/tsconfig.json b/webapp/packages/core/tsconfig.json index 892d9beb6b..638b1b0be3 100644 --- a/webapp/packages/core/tsconfig.json +++ b/webapp/packages/core/tsconfig.json @@ -1,5 +1,12 @@ { "extends": "../../tsconfig.json", - "exclude": ["node_modules"], + "compilerOptions": { + "declarationDir": "dist/types", + "outDir": "dist/js" + }, + "exclude": [ + "node_modules", + "@dbeaver/**" + ], "include": ["src/**/*"] } diff --git a/webapp/packages/custom-connection-plugin/package.json b/webapp/packages/custom-connection-plugin/package.json index 26feb5bc6c..ae5cc7f814 100644 --- a/webapp/packages/custom-connection-plugin/package.json +++ b/webapp/packages/custom-connection-plugin/package.json @@ -13,16 +13,10 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "devDependencies": { - "@dbeaver/core": "^0.1.0" + "@dbeaver/core": "^0.1.0", + "@dbeaver/builder": "^0.1.0" }, "peerDependencies": { - "@dbeaver/core": "^0.1.0", - "mobx": "^5.15.4", - "mobx-react": "^6.2.2", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "reakit": "^1.0.0-beta.11", - "reshadow": "0.0.1-alpha.77", - "rxjs": "^6.5.5" + "@dbeaver/core": "^0.1.0" } } diff --git a/webapp/packages/custom-connection-plugin/tsconfig.build.json b/webapp/packages/custom-connection-plugin/tsconfig.build.json deleted file mode 100644 index dd700023ea..0000000000 --- a/webapp/packages/custom-connection-plugin/tsconfig.build.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "declarationDir": "dist/types", - "declaration": true, - "noEmit": false, - "outDir": "dist/js" - }, - "exclude": [ - "node_modules", - "@dbeaver/**" - ], - "include": ["src/**/*"] -} diff --git a/webapp/packages/custom-connection-plugin/tsconfig.json b/webapp/packages/custom-connection-plugin/tsconfig.json index cf0afdc7c0..206277ba09 100644 --- a/webapp/packages/custom-connection-plugin/tsconfig.json +++ b/webapp/packages/custom-connection-plugin/tsconfig.json @@ -1,5 +1,9 @@ { "extends": "../../tsconfig.json", + "compilerOptions": { + "declarationDir": "dist/types", + "outDir": "dist/js" + }, "include": [ "src/**/*" ], diff --git a/webapp/packages/data-export-plugin/package.json b/webapp/packages/data-export-plugin/package.json index 156b75e8b4..241987ab89 100644 --- a/webapp/packages/data-export-plugin/package.json +++ b/webapp/packages/data-export-plugin/package.json @@ -12,18 +12,12 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "devDependencies": { - "@dbeaver/data-viewer-plugin": "^0.1.0", - "@dbeaver/core": "^0.1.0" + "@dbeaver/builder": "^0.1.0", + "@dbeaver/core": "^0.1.0", + "@dbeaver/data-viewer-plugin": "^0.1.0" }, "peerDependencies": { - "@dbeaver/data-viewer-plugin": "^0.1.0", "@dbeaver/core": "^0.1.0", - "mobx": "^5.15.4", - "mobx-react": "^6.2.2", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "reakit": "^1.0.0-beta.11", - "reshadow": "0.0.1-alpha.77", - "rxjs": "^6.5.5" + "@dbeaver/data-viewer-plugin": "^0.1.0" } } diff --git a/webapp/packages/data-export-plugin/tsconfig.build.json b/webapp/packages/data-export-plugin/tsconfig.build.json deleted file mode 100644 index dd700023ea..0000000000 --- a/webapp/packages/data-export-plugin/tsconfig.build.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "declarationDir": "dist/types", - "declaration": true, - "noEmit": false, - "outDir": "dist/js" - }, - "exclude": [ - "node_modules", - "@dbeaver/**" - ], - "include": ["src/**/*"] -} diff --git a/webapp/packages/data-export-plugin/tsconfig.json b/webapp/packages/data-export-plugin/tsconfig.json index cf0afdc7c0..206277ba09 100644 --- a/webapp/packages/data-export-plugin/tsconfig.json +++ b/webapp/packages/data-export-plugin/tsconfig.json @@ -1,5 +1,9 @@ { "extends": "../../tsconfig.json", + "compilerOptions": { + "declarationDir": "dist/types", + "outDir": "dist/js" + }, "include": [ "src/**/*" ], diff --git a/webapp/packages/data-viewer-plugin/package.json b/webapp/packages/data-viewer-plugin/package.json index 71d033192f..d5a3f37fd3 100644 --- a/webapp/packages/data-viewer-plugin/package.json +++ b/webapp/packages/data-viewer-plugin/package.json @@ -12,6 +12,7 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "devDependencies": { + "@dbeaver/builder": "^0.1.0", "@dbeaver/ag-grid-plugin": "^0.1.0", "@dbeaver/object-viewer-plugin": "^0.1.0", "@dbeaver/core": "^0.1.0" @@ -19,13 +20,6 @@ "peerDependencies": { "@dbeaver/ag-grid-plugin": "^0.1.0", "@dbeaver/object-viewer-plugin": "^0.1.0", - "@dbeaver/core": "^0.1.0", - "mobx": "^5.15.4", - "mobx-react": "^6.2.2", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "reakit": "^1.0.0-beta.11", - "reshadow": "0.0.1-alpha.77", - "rxjs": "^6.5.5" + "@dbeaver/core": "^0.1.0" } } diff --git a/webapp/packages/data-viewer-plugin/tsconfig.build.json b/webapp/packages/data-viewer-plugin/tsconfig.build.json deleted file mode 100644 index dd700023ea..0000000000 --- a/webapp/packages/data-viewer-plugin/tsconfig.build.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "declarationDir": "dist/types", - "declaration": true, - "noEmit": false, - "outDir": "dist/js" - }, - "exclude": [ - "node_modules", - "@dbeaver/**" - ], - "include": ["src/**/*"] -} diff --git a/webapp/packages/data-viewer-plugin/tsconfig.json b/webapp/packages/data-viewer-plugin/tsconfig.json index cf0afdc7c0..206277ba09 100644 --- a/webapp/packages/data-viewer-plugin/tsconfig.json +++ b/webapp/packages/data-viewer-plugin/tsconfig.json @@ -1,5 +1,9 @@ { "extends": "../../tsconfig.json", + "compilerOptions": { + "declarationDir": "dist/types", + "outDir": "dist/js" + }, "include": [ "src/**/*" ], diff --git a/webapp/packages/ddl-viewer-plugin/package.json b/webapp/packages/ddl-viewer-plugin/package.json index 2cfac8e2d2..51f64fd378 100644 --- a/webapp/packages/ddl-viewer-plugin/package.json +++ b/webapp/packages/ddl-viewer-plugin/package.json @@ -12,6 +12,7 @@ "tsc": "tsc" }, "devDependencies": { + "@dbeaver/builder": "^0.1.0", "@dbeaver/core": "^0.1.0", "@dbeaver/object-viewer-plugin": "^0.1.0", "@dbeaver/sql-editor": "^0.1.0" @@ -19,13 +20,6 @@ "peerDependencies": { "@dbeaver/core": "^0.1.0", "@dbeaver/object-viewer-plugin": "^0.1.0", - "@dbeaver/sql-editor": "^0.1.0", - "mobx": "^5.15.4", - "mobx-react": "^6.2.2", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "reakit": "^1.0.0-beta.11", - "reshadow": "0.0.1-alpha.77", - "rxjs": "^6.5.5" + "@dbeaver/sql-editor": "^0.1.0" } } diff --git a/webapp/packages/ddl-viewer-plugin/tsconfig.build.json b/webapp/packages/ddl-viewer-plugin/tsconfig.build.json deleted file mode 100644 index dd700023ea..0000000000 --- a/webapp/packages/ddl-viewer-plugin/tsconfig.build.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "declarationDir": "dist/types", - "declaration": true, - "noEmit": false, - "outDir": "dist/js" - }, - "exclude": [ - "node_modules", - "@dbeaver/**" - ], - "include": ["src/**/*"] -} diff --git a/webapp/packages/ddl-viewer-plugin/tsconfig.json b/webapp/packages/ddl-viewer-plugin/tsconfig.json index 6b4c45f333..e1afdcc3c5 100644 --- a/webapp/packages/ddl-viewer-plugin/tsconfig.json +++ b/webapp/packages/ddl-viewer-plugin/tsconfig.json @@ -1,5 +1,9 @@ { "extends": "../../tsconfig.json", + "compilerOptions": { + "declarationDir": "dist/types", + "outDir": "dist/js" + }, "include": [ "src" ], diff --git a/webapp/packages/object-viewer-plugin/package.json b/webapp/packages/object-viewer-plugin/package.json index 22661caf01..04c40da6b9 100644 --- a/webapp/packages/object-viewer-plugin/package.json +++ b/webapp/packages/object-viewer-plugin/package.json @@ -12,16 +12,10 @@ "test": "echo \"Error: no test specified\" && exit 1" }, "devDependencies": { + "@dbeaver/builder": "^0.1.0", "@dbeaver/core": "^0.1.0" }, "peerDependencies": { - "@dbeaver/core": "^0.1.0", - "mobx": "^5.15.4", - "mobx-react": "^6.2.2", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "reakit": "^1.0.0-beta.11", - "reshadow": "0.0.1-alpha.77", - "rxjs": "^6.5.5" + "@dbeaver/core": "^0.1.0" } } diff --git a/webapp/packages/object-viewer-plugin/tsconfig.build.json b/webapp/packages/object-viewer-plugin/tsconfig.build.json deleted file mode 100644 index dd700023ea..0000000000 --- a/webapp/packages/object-viewer-plugin/tsconfig.build.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "declarationDir": "dist/types", - "declaration": true, - "noEmit": false, - "outDir": "dist/js" - }, - "exclude": [ - "node_modules", - "@dbeaver/**" - ], - "include": ["src/**/*"] -} diff --git a/webapp/packages/object-viewer-plugin/tsconfig.json b/webapp/packages/object-viewer-plugin/tsconfig.json index 6b4c45f333..e1afdcc3c5 100644 --- a/webapp/packages/object-viewer-plugin/tsconfig.json +++ b/webapp/packages/object-viewer-plugin/tsconfig.json @@ -1,5 +1,9 @@ { "extends": "../../tsconfig.json", + "compilerOptions": { + "declarationDir": "dist/types", + "outDir": "dist/js" + }, "include": [ "src" ], diff --git a/webapp/packages/sql-editor/package.json b/webapp/packages/sql-editor/package.json index b121c87637..e0e849c6e9 100644 --- a/webapp/packages/sql-editor/package.json +++ b/webapp/packages/sql-editor/package.json @@ -16,19 +16,13 @@ "react-codemirror2": "^7.1.0" }, "devDependencies": { + "@dbeaver/builder": "^0.1.0", "@dbeaver/core": "^0.1.0", "@dbeaver/data-viewer-plugin": "^0.1.0", "@types/codemirror": "^0.0.91" }, "peerDependencies": { "@dbeaver/core": "^0.1.0", - "@dbeaver/data-viewer-plugin": "^0.1.0", - "mobx": "^5.15.4", - "mobx-react": "^6.2.2", - "react": "^16.13.1", - "react-dom": "^16.13.1", - "reakit": "^1.0.0-beta.11", - "reshadow": "0.0.1-alpha.77", - "rxjs": "^6.5.5" + "@dbeaver/data-viewer-plugin": "^0.1.0" } } diff --git a/webapp/packages/sql-editor/tsconfig.build.json b/webapp/packages/sql-editor/tsconfig.build.json deleted file mode 100644 index dd700023ea..0000000000 --- a/webapp/packages/sql-editor/tsconfig.build.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { - "declarationDir": "dist/types", - "declaration": true, - "noEmit": false, - "outDir": "dist/js" - }, - "exclude": [ - "node_modules", - "@dbeaver/**" - ], - "include": ["src/**/*"] -} diff --git a/webapp/packages/sql-editor/tsconfig.json b/webapp/packages/sql-editor/tsconfig.json index 6b4c45f333..e1afdcc3c5 100644 --- a/webapp/packages/sql-editor/tsconfig.json +++ b/webapp/packages/sql-editor/tsconfig.json @@ -1,5 +1,9 @@ { "extends": "../../tsconfig.json", + "compilerOptions": { + "declarationDir": "dist/types", + "outDir": "dist/js" + }, "include": [ "src" ], diff --git a/webapp/tsconfig.base.json b/webapp/tsconfig.base.json deleted file mode 100644 index c8a747fb46..0000000000 --- a/webapp/tsconfig.base.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "files": ["typings.d.ts"], - "compilerOptions": { - "moduleResolution": "node", - "target": "es2017", - "lib": ["dom", "dom.iterable", "esnext"], - "allowJs": false, - "skipLibCheck": true, - "strict": true, - "forceConsistentCasingInFileNames": true, - "downlevelIteration": true, - "noEmit": true, - "esModuleInterop": true, - "module": "esnext", - "sourceMap": true, - "resolveJsonModule": true, - "jsx": "preserve", - "isolatedModules": true, - "types": ["reflect-metadata", "node"], - "experimentalDecorators": true, - "emitDecoratorMetadata": true, - "baseUrl": "." - } -} diff --git a/webapp/tsconfig.json b/webapp/tsconfig.json index 1882fdb842..a515195b72 100644 --- a/webapp/tsconfig.json +++ b/webapp/tsconfig.json @@ -1,26 +1,25 @@ { - "extends": "./tsconfig.base.json", + "files": ["typings.d.ts"], "compilerOptions": { - "paths": { - "@dbeaver/*": ["packages/*/src"], - - "@dbeaver/core/assets": ["packages/core/assets"], - - "@dbeaver/core/app": ["packages/core/src/app"], - "@dbeaver/core/blocks": ["packages/core/src/blocks"], - "@dbeaver/core/di": ["packages/core/src/di"], - "@dbeaver/core/dialogs": ["packages/core/src/dialogs"], - "@dbeaver/core/eventsLog": ["packages/core/src/eventsLog"], - "@dbeaver/core/localization": ["packages/core/src/localization"], - "@dbeaver/core/root": ["packages/core/src/root"], - "@dbeaver/core/sdk": ["packages/core/src/sdk"], - "@dbeaver/core/settings": ["packages/core/src/settings"], - "@dbeaver/core/theming": ["packages/core/src/theming"], - "@dbeaver/core/utils": ["packages/core/src/utils"], - "@dbeaver/core/extensions": ["packages/core/src/extensions"], - "@dbeaver/core/plugin": ["packages/core/src/plugin"], - "@dbeaver/core/product": ["packages/core/src/product"], - "@dbeaver/core/placeholder": ["packages/core/src/placeholder"] - } + "declaration": true, + "noEmit": false, + "moduleResolution": "node", + "target": "es2017", + "lib": ["dom", "dom.iterable", "esnext"], + "allowJs": false, + "skipLibCheck": true, + "strict": true, + "forceConsistentCasingInFileNames": true, + "downlevelIteration": true, + "esModuleInterop": true, + "module": "esnext", + "sourceMap": true, + "resolveJsonModule": true, + "jsx": "preserve", + "isolatedModules": true, + "types": ["reflect-metadata", "node"], + "experimentalDecorators": true, + "emitDecoratorMetadata": true, + "baseUrl": "." } } diff --git a/webapp/yarn.lock b/webapp/yarn.lock index beb844f416..9b3e4c0a7f 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -2,41 +2,41 @@ # yarn lockfile v1 -"@ag-grid-community/all-modules@^23.0.2": - version "23.0.2" - resolved "https://registry.yarnpkg.com/@ag-grid-community/all-modules/-/all-modules-23.0.2.tgz#3b224149c83a5495f8cf21f7f383d3e1b7098e86" - integrity sha512-JkzYoJ1+1oog0anO2FgrTHSYlpRceI2zRupXVCNKKWm7KFUyjM4bQAAKnq3iM8YYZEFrBSJYL+byT+k0CEUZcw== +"@ag-grid-community/all-modules@^23.1.1": + version "23.1.1" + resolved "https://registry.yarnpkg.com/@ag-grid-community/all-modules/-/all-modules-23.1.1.tgz#9a55c4ce592c5fb8b4f3ddec9e3196d61a876959" + integrity sha512-TjYTF6h7VDJXNW0w3hj5adDHdTJgNYaWOYCjnPBkQKx2dRgQMVqXGwtTWSPO3PForj/qmbrSCNIqYG84boHqKA== dependencies: - "@ag-grid-community/client-side-row-model" "~23.0.0" - "@ag-grid-community/core" "~23.0.0" - "@ag-grid-community/csv-export" "~23.0.0" - "@ag-grid-community/infinite-row-model" "~23.0.0" + "@ag-grid-community/client-side-row-model" "~23.1.0" + "@ag-grid-community/core" "~23.1.0" + "@ag-grid-community/csv-export" "~23.1.0" + "@ag-grid-community/infinite-row-model" "~23.1.0" -"@ag-grid-community/client-side-row-model@~23.0.0": - version "23.0.2" - resolved "https://registry.yarnpkg.com/@ag-grid-community/client-side-row-model/-/client-side-row-model-23.0.2.tgz#52eee1e4d50fa9cd7a0c3ab8787ef34ad27f13f2" - integrity sha512-1JLd3QTW3DsWn3oHdVJF1dDx7e8yI+KuEU8ii4zTHx33gDSaHGHlUqEY8E9oj4YzGcCFU/sscwxD3ZMQOVLFWA== +"@ag-grid-community/client-side-row-model@~23.1.0": + version "23.1.1" + resolved "https://registry.yarnpkg.com/@ag-grid-community/client-side-row-model/-/client-side-row-model-23.1.1.tgz#091b6a4190f2c5db203503b7c80f8b2aa8e269d1" + integrity sha512-oBkr2Y4EuaLB60PDM2AQAX74fez2fPsQzn+oWwzEKdO8bQdYCaJ6WjoZQXy417L+D9+zB9TIRTgm4zg74CaNJg== dependencies: - "@ag-grid-community/core" "~23.0.0" + "@ag-grid-community/core" "~23.1.0" -"@ag-grid-community/core@^23.0.2", "@ag-grid-community/core@~23.0.0": - version "23.0.2" - resolved "https://registry.yarnpkg.com/@ag-grid-community/core/-/core-23.0.2.tgz#b751a344222e75ea37f2545af21efd9b6579b53d" - integrity sha512-jCzthokscek+g3LGuARdZ4f7k3/wRgQX3mmzHBz8hCt96FULVErWEHe09jJIm9CT2iFPXucm5p0QP8iNYbO3vQ== +"@ag-grid-community/core@^23.1.1", "@ag-grid-community/core@~23.1.0": + version "23.1.1" + resolved "https://registry.yarnpkg.com/@ag-grid-community/core/-/core-23.1.1.tgz#f64db5dcd5f30c8959249f859efeeb64a8ce81c9" + integrity sha512-vTw4l2K5g/zre2QYmT1gfCDQ1TljT0kDaqyx6LkVLN2WSbPi1HfkD4qvYAGFBlVHa4cuOgp1chC2lPaabVLdzA== -"@ag-grid-community/csv-export@~23.0.0": - version "23.0.2" - resolved "https://registry.yarnpkg.com/@ag-grid-community/csv-export/-/csv-export-23.0.2.tgz#6d83be4406adae83d00a349b323eaea99b4d5ae5" - integrity sha512-pZoRhc5i/6+lt9BYNUc9x0hiJnCptgr1MZNkyYQfIswNbUBwJZT1eZyZyOIJFLyOlCPMvmHl2hUF6jsI6o722Q== +"@ag-grid-community/csv-export@~23.1.0": + version "23.1.1" + resolved "https://registry.yarnpkg.com/@ag-grid-community/csv-export/-/csv-export-23.1.1.tgz#62eca745d9612c16c607dcfe5d8192e0020930be" + integrity sha512-9TpYKngOuL3+5nIA56ilcUbXk0YYq4ooUPr8GqodrCHqP6FhocB8HhRpvYV8+KgOgWyPZa5jBe38ebCGxxNjPg== dependencies: - "@ag-grid-community/core" "~23.0.0" + "@ag-grid-community/core" "~23.1.0" -"@ag-grid-community/infinite-row-model@~23.0.0": - version "23.0.2" - resolved "https://registry.yarnpkg.com/@ag-grid-community/infinite-row-model/-/infinite-row-model-23.0.2.tgz#a7e6fd743122f145c3a27af43945a46a810eecec" - integrity sha512-yFBjE4RQYsjwBy1PVqrBZu3ojKUueEXyfSQ5UZZ38COIgPAOZE2ZFVS96dMU8CXVjJumHts62OIwUgExyyollw== +"@ag-grid-community/infinite-row-model@~23.1.0": + version "23.1.1" + resolved "https://registry.yarnpkg.com/@ag-grid-community/infinite-row-model/-/infinite-row-model-23.1.1.tgz#af4352e8aebbaf96cbf3270e7d4bdfd89505edf8" + integrity sha512-79sitY8wWMevnYd245YxyS0Em6Y985A6dsmTeBOmQJhrz7u/PxQp/ouNlopBwZtPj0cVWtXNir48VylvYCsWTQ== dependencies: - "@ag-grid-community/core" "~23.0.0" + "@ag-grid-community/core" "~23.1.0" "@babel/cli@^7.7.4": version "7.7.5" @@ -140,18 +140,6 @@ "@babel/traverse" "^7.7.4" "@babel/types" "^7.7.4" -"@babel/helper-create-class-features-plugin@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.7.4.tgz#fce60939fd50618610942320a8d951b3b639da2d" - integrity sha512-l+OnKACG4uiDHQ/aJT8dwpR+LhCJALxL0mJ6nzjB25e5IPwqV1VOsY7ah6UB1DG+VOXAIMtuC54rFJGiHkxjgA== - dependencies: - "@babel/helper-function-name" "^7.7.4" - "@babel/helper-member-expression-to-functions" "^7.7.4" - "@babel/helper-optimise-call-expression" "^7.7.4" - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/helper-replace-supers" "^7.7.4" - "@babel/helper-split-export-declaration" "^7.7.4" - "@babel/helper-create-class-features-plugin@^7.8.3": version "7.9.6" resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.6.tgz#965c8b0a9f051801fd9d3b372ca0ccf200a90897" @@ -421,15 +409,6 @@ "@babel/helper-create-class-features-plugin" "^7.8.3" "@babel/helper-plugin-utils" "^7.8.3" -"@babel/plugin-proposal-decorators@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.7.4.tgz#58c1e21d21ea12f9f5f0a757e46e687b94a7ab2b" - integrity sha512-GftcVDcLCwVdzKmwOBDjATd548+IE+mBo7ttgatqNDR7VG7GqIuZPtRWlMLHbhTXhcnFZiGER8iIYl1n/imtsg== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.7.4" - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-decorators" "^7.7.4" - "@babel/plugin-proposal-dynamic-import@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.4.tgz#dde64a7f127691758cbfed6cf70de0fa5879d52d" @@ -485,13 +464,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-syntax-decorators@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.7.4.tgz#3c91cfee2a111663ff3ac21b851140f5a52a4e0b" - integrity sha512-0oNLWNH4k5ZbBVfAwiTU53rKFWIeTh6ZlaWOXWJc4ywxs0tjz5fc3uZ6jKAnZSxN98eXVgg7bJIuzjX+3SXY+A== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-dynamic-import@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.7.4.tgz#29ca3b4415abfe4a5ec381e903862ad1a54c3aec" @@ -548,13 +520,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-syntax-typescript@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.7.4.tgz#5d037ffa10f3b25a16f32570ebbe7a8c2efa304b" - integrity sha512-77blgY18Hud4NM1ggTA8xVT/dBENQf17OpiToSa2jSmEY3fWXD2jwrdVlO4kq5yzUTeF15WSQ6b4fByNvJcjpQ== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-transform-arrow-functions@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.7.4.tgz#76309bd578addd8aee3b379d809c802305a98a12" @@ -833,15 +798,6 @@ dependencies: "@babel/helper-plugin-utils" "^7.0.0" -"@babel/plugin-transform-typescript@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.7.4.tgz#2974fd05f4e85c695acaf497f432342de9fc0636" - integrity sha512-X8e3tcPEKnwwPVG+vP/vSqEShkwODOEeyQGod82qrIuidwIrfnsGn11qPM1jBLF4MqguTXXYzm58d0dY+/wdpg== - dependencies: - "@babel/helper-create-class-features-plugin" "^7.7.4" - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-syntax-typescript" "^7.7.4" - "@babel/plugin-transform-unicode-regex@^7.7.4": version "7.7.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.4.tgz#a3c0f65b117c4c81c5b6484f2a5e7b95346b83ae" @@ -918,14 +874,6 @@ "@babel/plugin-transform-react-jsx-self" "^7.7.4" "@babel/plugin-transform-react-jsx-source" "^7.7.4" -"@babel/preset-typescript@^7.7.4": - version "7.7.4" - resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.7.4.tgz#780059a78e6fa7f7a4c87f027292a86b31ce080a" - integrity sha512-rqrjxfdiHPsnuPur0jKrIIGQCIgoTWMTjlbWE69G4QJ6TIOVnnRnIJhUxNTL/VwDmEAVX08Tq3B1nirer5341w== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@babel/plugin-transform-typescript" "^7.7.4" - "@babel/runtime-corejs3@^7.7.4": version "7.7.6" resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.7.6.tgz#5b1044ea11b659d288f77190e19c62da959ed9a3" @@ -1127,15 +1075,6 @@ unique-filename "^1.1.1" which "^1.3.1" -"@jest/types@^24.9.0": - version "24.9.0" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59" - integrity sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw== - dependencies: - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^1.1.1" - "@types/yargs" "^13.0.0" - "@lerna/add@3.19.0": version "3.19.0" resolved "https://registry.yarnpkg.com/@lerna/add/-/add-3.19.0.tgz#33b6251c669895f842c14f05961432d464166249" @@ -2121,6 +2060,49 @@ mkdirp "^0.5.1" webpack-virtual-modules "0.1.10" +"@rollup/plugin-babel@^5.0.2": + version "5.0.2" + resolved "https://registry.yarnpkg.com/@rollup/plugin-babel/-/plugin-babel-5.0.2.tgz#d9351b9545b0c586a193fc99830d4b1a25317ed5" + integrity sha512-GiL7jL+FGppzQ1Sn4y2ER4UYXlgXFFEt+sHm4WJEzQwI76Yf9oy2QDqIvcon6xApZWlik3L8fezRGC6Mj2vRXg== + dependencies: + "@babel/helper-module-imports" "^7.7.4" + "@rollup/pluginutils" "^3.0.8" + +"@rollup/plugin-commonjs@^12.0.0": + version "12.0.0" + resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-12.0.0.tgz#e2f308ae6057499e0f413f878fff7c3a0fdc02a1" + integrity sha512-8+mDQt1QUmN+4Y9D3yCG8AJNewuTSLYPJVzKKUZ+lGeQrI+bV12Tc5HCyt2WdlnG6ihIL/DPbKRJlB40DX40mw== + dependencies: + "@rollup/pluginutils" "^3.0.8" + commondir "^1.0.1" + estree-walker "^1.0.1" + glob "^7.1.2" + is-reference "^1.1.2" + magic-string "^0.25.2" + resolve "^1.11.0" + +"@rollup/plugin-node-resolve@^8.0.0": + version "8.0.0" + resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-8.0.0.tgz#47cc0775e31b6a531c88a40270377fe899a271cb" + integrity sha512-5poJCChrkVggXXND/sQ7yNqwjUNT4fP31gpRWCnSNnlXuUXTCMHT33xZrTGxgjm5Rl18MHj7iEzlCT8rYWwQSA== + dependencies: + "@rollup/pluginutils" "^3.0.8" + "@types/resolve" "0.0.8" + builtin-modules "^3.1.0" + deep-freeze "^0.0.1" + deepmerge "^4.2.2" + is-module "^1.0.0" + resolve "^1.14.2" + +"@rollup/pluginutils@^3.0.8": + version "3.0.10" + resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.0.10.tgz#a659b9025920378494cd8f8c59fbf9b3a50d5f12" + integrity sha512-d44M7t+PjmMrASHbhgpSbVgtL6EFyX7J4mYxwQ/c5eoaE6N2VgCgEcWVzNnwycIloti+/MpwFr8qfw+nRw00sw== + dependencies: + "@types/estree" "0.0.39" + estree-walker "^1.0.1" + picomatch "^2.2.2" + "@types/codemirror@^0.0.91": version "0.0.91" resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-0.0.91.tgz#4cb9832388726e57e747f0e3a8ab69105ad02a66" @@ -2169,33 +2151,6 @@ dependencies: graphql "*" -"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0": - version "2.0.1" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff" - integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg== - -"@types/istanbul-lib-report@*": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#e5471e7fa33c61358dd38426189c037a58433b8c" - integrity sha512-3BUTyMzbZa2DtDI2BkERNC6jJw2Mr2Y0oGI7mRxYNBPxppbtEK1F66u3bKwU2g+wxwWI7PAoRpJnOY1grJqzHg== - dependencies: - "@types/istanbul-lib-coverage" "*" - -"@types/istanbul-reports@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz#7a8cbf6a406f36c8add871625b278eaf0b0d255a" - integrity sha512-UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA== - dependencies: - "@types/istanbul-lib-coverage" "*" - "@types/istanbul-lib-report" "*" - -"@types/jest@^24.0.23": - version "24.0.23" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.0.23.tgz#046f8e2ade026fe831623e361a36b6fb9a4463e4" - integrity sha512-L7MBvwfNpe7yVPTXLn32df/EK+AMBFAFvZrRuArGs7npEWnlziUXK+5GMIUTI4NIuwok3XibsjXCs5HxviYXjg== - dependencies: - jest-diff "^24.3.0" - "@types/json-schema@^7.0.3": version "7.0.3" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz#bdfd69d61e464dcc81b25159c270d75a73c1a636" @@ -2268,18 +2223,6 @@ resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-7.0.2.tgz#d680a9c596ef84abf5c4c07a32ffd66d582526f8" integrity sha512-8Ly3zIPTnT0/8RCU6Kg/G3uTICf9sRwYOpUzSIM3503tLIKcnJPRuinHhXngJUy2MntrEf6dlpOHXJju90Qh5w== -"@types/yargs-parser@*": - version "13.1.0" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-13.1.0.tgz#c563aa192f39350a1d18da36c5a8da382bbd8228" - integrity sha512-gCubfBUZ6KxzoibJ+SCUc/57Ms1jz5NjHe4+dI2krNmU5zCPAphyLJYyTOg06ueIyfj+SaCUqmzun7ImlxDcKg== - -"@types/yargs@^13.0.0": - version "13.0.3" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.3.tgz#76482af3981d4412d65371a318f992d33464a380" - integrity sha512-K8/LfZq2duW33XW/tFwEAfnZlqIfVsoyRB3kfXdPXYhl0nfM8mmh7GS0jg7WrX2Dgq/0Ha/pR1PaR+BvmWwjiQ== - dependencies: - "@types/yargs-parser" "*" - "@typescript-eslint/eslint-plugin@^2.5.0": version "2.11.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.11.0.tgz#4477c33491ccf0a9a3f4a30ef84978fa0ea0cad2" @@ -2291,15 +2234,6 @@ regexpp "^3.0.0" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@1.13.0", "@typescript-eslint/experimental-utils@^1.13.0": - version "1.13.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-1.13.0.tgz#b08c60d780c0067de2fb44b04b432f540138301e" - integrity sha512-zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg== - dependencies: - "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "1.13.0" - eslint-scope "^4.0.0" - "@typescript-eslint/experimental-utils@2.11.0": version "2.11.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.11.0.tgz#cef18e6b122706c65248a5d8984a9779ed1e52ac" @@ -2309,15 +2243,14 @@ "@typescript-eslint/typescript-estree" "2.11.0" eslint-scope "^5.0.0" -"@typescript-eslint/parser@^1.10.2": +"@typescript-eslint/experimental-utils@^1.13.0": version "1.13.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-1.13.0.tgz#61ac7811ea52791c47dc9fd4dd4a184fae9ac355" - integrity sha512-ITMBs52PCPgLb2nGPoeT4iU3HdQZHcPaZVw+7CsFagRJHUhyeTgorEwHXhFf3e7Evzi8oujKNpHc8TONth8AdQ== + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-1.13.0.tgz#b08c60d780c0067de2fb44b04b432f540138301e" + integrity sha512-zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg== dependencies: - "@types/eslint-visitor-keys" "^1.0.0" - "@typescript-eslint/experimental-utils" "1.13.0" + "@types/json-schema" "^7.0.3" "@typescript-eslint/typescript-estree" "1.13.0" - eslint-visitor-keys "^1.0.0" + eslint-scope "^4.0.0" "@typescript-eslint/parser@^2.8.0": version "2.11.0" @@ -2553,29 +2486,12 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7: mime-types "~2.1.24" negotiator "0.6.2" -acorn-jsx@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b" - integrity sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s= - dependencies: - acorn "^3.0.4" - -acorn-jsx@^5.0.0, acorn-jsx@^5.1.0: +acorn-jsx@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384" integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw== -acorn@^3.0.4: - version "3.3.0" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a" - integrity sha1-ReN/s56No/JbruP/U2niu18iAXo= - -acorn@^5.5.0: - version "5.7.3" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279" - integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw== - -acorn@^6.0.7, acorn@^6.2.1: +acorn@^6.2.1: version "6.4.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784" integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw== @@ -2585,15 +2501,15 @@ acorn@^7.1.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c" integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ== -ag-grid-community@^23.0.2: - version "23.0.2" - resolved "https://registry.yarnpkg.com/ag-grid-community/-/ag-grid-community-23.0.2.tgz#81fc92ce9e47c75e854337a1e2d8ef950c3a1d51" - integrity sha512-UaD4lEVKKVCA2rrgMJJV328sCp5rdR9hgOh6oMUpZRXCke/3m/r2odjGjzvfT7yeLClj6ZdZuCkM4NmEuCZ8KA== +ag-grid-community@^23.1.1: + version "23.1.1" + resolved "https://registry.yarnpkg.com/ag-grid-community/-/ag-grid-community-23.1.1.tgz#049ebbd2b521df4b1ad54ae68d98144cf9963e07" + integrity sha512-bWpilWkD7b19BNoycVfifAmXVZGI+s1m/G6ixx7tOcXTQEU+tA6dWiHn2kxt1iiLsixvEwi/6JQu1j9Iykrb7Q== -ag-grid-react@^23.0.3: - version "23.0.3" - resolved "https://registry.yarnpkg.com/ag-grid-react/-/ag-grid-react-23.0.3.tgz#2f632b877bd934b9d59c1590273a4487c71cd49f" - integrity sha512-zKhbD9vabBH1wRf/i7dwz1hCT2v0fE26Ss4dEXL3sZ492Abx18NjSXu/piOzLVWxLzmGErB1FmIPF2YYhY1SvA== +ag-grid-react@^23.1.1: + version "23.1.1" + resolved "https://registry.yarnpkg.com/ag-grid-react/-/ag-grid-react-23.1.1.tgz#0aa78c8d088a7535f7ae1612be88e70ed5f908be" + integrity sha512-zjQHgn7YjJsPO+vnEUPzM8d6IEX/8CvG8eL6F2w3+AE599hDEBwK1E8dggdkNOqQLlmNubI1q+yfvRT2gCsaBg== dependencies: prop-types "^15.6.2" @@ -2628,7 +2544,7 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1: resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da" integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ== -ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5, ajv@^6.9.1: +ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5: version "6.10.2" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52" integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw== @@ -2680,7 +2596,7 @@ ansi-regex@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= -ansi-regex@^4.0.0, ansi-regex@^4.1.0: +ansi-regex@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg== @@ -3003,13 +2919,6 @@ babel-plugin-react-require@^3.1.1: resolved "https://registry.yarnpkg.com/babel-plugin-react-require/-/babel-plugin-react-require-3.1.1.tgz#5c3d2564fa16b1e45212ed52519db147b1596106" integrity sha512-XFz+B0dWx41fnGnugzCWn5rOgrDHb150N5gFhUfO3BgYDCT25o4sofRtd9uUfqUHoRu+t4/r5Cr2RMPIKuCt2g== -babel-plugin-transform-typescript-metadata@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-typescript-metadata/-/babel-plugin-transform-typescript-metadata-0.2.2.tgz#fc44611187409ed9d5cb372ca2f85939a359cada" - integrity sha512-wWRw1p3IDNZN8l3UOLgeScq9Nhh4lvxT7ZOvUzYi5sMw8lUWW+KdRlnBeQKehHAsgDs5TR6PvMJmsQ6e6NmKCg== - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" @@ -3403,7 +3312,7 @@ camelcase@^4.1.0: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= -camelcase@^5.0.0, camelcase@^5.3.1: +camelcase@^5.0.0: version "5.3.1" resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== @@ -3428,7 +3337,7 @@ caseless@~0.12.0: resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= -chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2: +chalk@2.4.2, chalk@^2.0.0, chalk@^2.1.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -3713,7 +3622,7 @@ commander@~2.19.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg== -common-tags@1.8.0, common-tags@^1.4.0: +common-tags@1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937" integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw== @@ -3986,11 +3895,6 @@ core-js-pure@^3.0.0: resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.5.0.tgz#f63c7f2b245e7d678e73f87ad28505480554d70e" integrity sha512-wB0QtKAofWigiISuT1Tej3hKgq932fB//Lf1VoPbiLpTYlHY0nIDhgF+q1na0DAKFHH5wGCirkAknOmDN8ijXA== -core-js@^3.1.4: - version "3.5.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.5.0.tgz#66df8e49be4bd775e6f952a9d083b756ad41c1ed" - integrity sha512-Ifh3kj78gzQ7NAoJXeTu+XwzDld0QRIwjBLRqAMhuLhP3d2Av5wmgE9ycfnvK6NAEjTkQ1sDPeoEZAWO3Hx1Uw== - core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" @@ -4118,24 +4022,6 @@ css-loader@^0.9.1: loader-utils "~0.2.2" source-map "~0.1.38" -css-loader@^3.2.1: - version "3.3.2" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.3.2.tgz#41b2086528aa4fbf8c0692e874bc14f081129b21" - integrity sha512-4XSiURS+YEK2fQhmSaM1onnUm0VKWNf6WWBYjkp9YbSDGCBTVZ5XOM6Gkxo8tLgQlzkZOBJvk9trHlDk4gjEYg== - dependencies: - camelcase "^5.3.1" - cssesc "^3.0.0" - icss-utils "^4.1.1" - loader-utils "^1.2.3" - normalize-path "^3.0.0" - postcss "^7.0.23" - postcss-modules-extract-imports "^2.0.0" - postcss-modules-local-by-default "^3.0.2" - postcss-modules-scope "^2.1.1" - postcss-modules-values "^3.0.0" - postcss-value-parser "^4.0.2" - schema-utils "^2.6.0" - css-modules-loader-core@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/css-modules-loader-core/-/css-modules-loader-core-1.1.0.tgz#5908668294a1becd261ae0a4ce21b0b551f21d16" @@ -4426,11 +4312,21 @@ deep-extend@^0.6.0: resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== +deep-freeze@^0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/deep-freeze/-/deep-freeze-0.0.1.tgz#3a0b0005de18672819dfd38cd31f91179c893e84" + integrity sha1-OgsABd4YZygZ39OM0x+RF5yJPoQ= + deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= +deepmerge@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" + integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== + default-gateway@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b" @@ -4549,11 +4445,6 @@ dezalgo@^1.0.0: asap "^2.0.0" wrappy "1" -diff-sequences@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-24.9.0.tgz#5715d6244e2aa65f48bba0bc972db0b0b11e95b5" - integrity sha512-Dj6Wk3tWyTE+Fo1rW8v0Xhwk80um6yFYKbuAxc9c3EZxIHFDYwbi34Uk42u1CdnIiVorvt4RmlSDjIPyzGC2ew== - diffie-hellman@^5.0.0: version "5.0.3" resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" @@ -4585,11 +4476,6 @@ dir-glob@^2.0.0, dir-glob@^2.2.2: dependencies: path-type "^3.0.0" -dlv@^1.1.0: - version "1.1.3" - resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79" - integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA== - dns-equal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" @@ -5018,14 +4904,6 @@ eslint-plugin-react@^7.16.0: prop-types "^15.7.2" resolve "^1.13.1" -eslint-scope@^3.7.1: - version "3.7.3" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-3.7.3.tgz#bb507200d3d17f60247636160b4826284b108535" - integrity sha512-W+B0SvF4gamyCTmUc+uITPY0989iXVfKvhwtmJocTaYoc/3khEHmEmvfY/Gn9HA9VV75jrQECsHizkNw1b68FA== - dependencies: - esrecurse "^4.1.0" - estraverse "^4.1.1" - eslint-scope@^4.0.0, eslint-scope@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848" @@ -5042,60 +4920,18 @@ eslint-scope@^5.0.0: esrecurse "^4.1.0" estraverse "^4.1.1" -eslint-utils@^1.3.1, eslint-utils@^1.4.3: +eslint-utils@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f" integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q== dependencies: eslint-visitor-keys "^1.1.0" -eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0: +eslint-visitor-keys@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== -eslint@^5.0.0: - version "5.16.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea" - integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg== - dependencies: - "@babel/code-frame" "^7.0.0" - ajv "^6.9.1" - chalk "^2.1.0" - cross-spawn "^6.0.5" - debug "^4.0.1" - doctrine "^3.0.0" - eslint-scope "^4.0.3" - eslint-utils "^1.3.1" - eslint-visitor-keys "^1.0.0" - espree "^5.0.1" - esquery "^1.0.1" - esutils "^2.0.2" - file-entry-cache "^5.0.1" - functional-red-black-tree "^1.0.1" - glob "^7.1.2" - globals "^11.7.0" - ignore "^4.0.6" - import-fresh "^3.0.0" - imurmurhash "^0.1.4" - inquirer "^6.2.2" - js-yaml "^3.13.0" - json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.3.0" - lodash "^4.17.11" - minimatch "^3.0.4" - mkdirp "^0.5.1" - natural-compare "^1.4.0" - optionator "^0.8.2" - path-is-inside "^1.0.2" - progress "^2.0.0" - regexpp "^2.0.1" - semver "^5.5.1" - strip-ansi "^4.0.0" - strip-json-comments "^2.0.1" - table "^5.2.3" - text-table "^0.2.0" - eslint@^6.6.0: version "6.7.2" resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.7.2.tgz#c17707ca4ad7b2d8af986a33feba71e18a9fecd1" @@ -5139,23 +4975,6 @@ eslint@^6.6.0: text-table "^0.2.0" v8-compile-cache "^2.0.3" -espree@^3.5.2: - version "3.5.4" - resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7" - integrity sha512-yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A== - dependencies: - acorn "^5.5.0" - acorn-jsx "^3.0.0" - -espree@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a" - integrity sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A== - dependencies: - acorn "^6.0.7" - acorn-jsx "^5.0.0" - eslint-visitor-keys "^1.0.0" - espree@^6.1.2: version "6.1.2" resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz#6c272650932b4f91c3714e5e7b5f5e2ecf47262d" @@ -5170,7 +4989,7 @@ esprima@^4.0.0: resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -esquery@^1.0.0, esquery@^1.0.1: +esquery@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708" integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA== @@ -5194,6 +5013,11 @@ estree-walker@^0.6.1: resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362" integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w== +estree-walker@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700" + integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg== + esutils@^2.0.0, esutils@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" @@ -5446,14 +5270,6 @@ file-loader@^0.8.1: dependencies: loader-utils "~0.2.5" -file-loader@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-5.0.2.tgz#7f3d8b4ac85a5e8df61338cfec95d7405f971caa" - integrity sha512-QMiQ+WBkGLejKe81HU8SZ9PovsU/5uaLo0JdTCEXOYv7i7jfAjHZi1tcwp9tSASJPOmmHZtbdCervFmXMH/Dcg== - dependencies: - loader-utils "^1.2.3" - schema-utils "^2.5.0" - fill-range@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" @@ -5915,7 +5731,7 @@ global@^4.3.0: min-document "^2.19.0" process "^0.11.10" -globals@^11.1.0, globals@^11.7.0: +globals@^11.1.0: version "11.12.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== @@ -6484,11 +6300,6 @@ indent-string@^3.0.0: resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289" integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok= -indent-string@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" - integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== - indexes-of@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" @@ -6541,7 +6352,7 @@ init-package-json@^1.10.3: validate-npm-package-license "^3.0.1" validate-npm-package-name "^3.0.0" -inquirer@^6.2.0, inquirer@^6.2.2: +inquirer@^6.2.0: version "6.5.2" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca" integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ== @@ -6987,21 +6798,6 @@ iterall@^1.2.2: resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.2.2.tgz#92d70deb8028e0c39ff3164fdbf4d8b088130cd7" integrity sha512-yynBb1g+RFUPY64fTrFv7nsjRrENBQJaX2UL+2Szc9REFrSNm1rpSXHGzhmAy7a9uv3vlvgBlXnf9RqmPH1/DA== -jest-diff@^24.3.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da" - integrity sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ== - dependencies: - chalk "^2.0.1" - diff-sequences "^24.9.0" - jest-get-type "^24.9.0" - pretty-format "^24.9.0" - -jest-get-type@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e" - integrity sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q== - js-base64@^2.1.8: version "2.5.1" resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.1.tgz#1efa39ef2c5f7980bb1784ade4a8af2de3291121" @@ -7017,7 +6813,7 @@ js-levenshtein@^1.1.3: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@^3.13.0, js-yaml@^3.13.1: +js-yaml@^3.13.1: version "3.13.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== @@ -7345,11 +7141,6 @@ lodash.memoize@^4.1.2: resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= -lodash.merge@^4.6.0: - version "4.6.2" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" - integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== - lodash.mergewith@^4.6.2: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz#617121f89ac55f59047c7aec1ccd6654c6590f55" @@ -7390,20 +7181,12 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.1, lodash@~4.17.10: +lodash@^4.0.0, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.3, lodash@^4.2.1, lodash@~4.17.10: version "4.17.15" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== -loglevel-colored-level-prefix@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/loglevel-colored-level-prefix/-/loglevel-colored-level-prefix-1.0.0.tgz#6a40218fdc7ae15fc76c3d0f3e676c465388603e" - integrity sha1-akAhj9x64V/HbD0PPmdsRlOIYD4= - dependencies: - chalk "^1.1.3" - loglevel "^1.4.1" - -loglevel@^1.4.1, loglevel@^1.6.4: +loglevel@^1.6.4: version "1.6.6" resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.6.tgz#0ee6300cc058db6b3551fa1c4bf73b83bb771312" integrity sha512-Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ== @@ -8395,7 +8178,7 @@ optimist@^0.6.1: minimist "~0.0.1" wordwrap "~0.0.2" -optionator@^0.8.2, optionator@^0.8.3: +optionator@^0.8.3: version "0.8.3" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== @@ -8768,6 +8551,11 @@ picomatch@^2.0.4: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.1.1.tgz#ecdfbea7704adb5fe6fb47f9866c4c0e15e905c5" integrity sha512-OYMyqkKzK7blWO/+XZYP6w8hH0LDvkBvdvKukti+7kqYFCiEAk+gI3DWnryapc0Dau05ugGTy0foQ6mqn4AHYA== +picomatch@^2.2.2: + version "2.2.2" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" + integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== + pify@^2.0.0, pify@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" @@ -9001,15 +8789,6 @@ postcss-env-function@^2.0.2: postcss "^7.0.2" postcss-values-parser "^2.0.0" -postcss-extend-rule@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-extend-rule/-/postcss-extend-rule-3.0.0.tgz#d6ee2fb24ab2b3d9b50acce1d055c1c137ab5f44" - integrity sha512-gMlRmW52Y86Lct+KTr+gMjxk0aUSuTyjtvelIH3a7UdaXONaKH6qSmj8KAXCW4+nhTlAsOw5JdkRjCdZ/Kjb3Q== - dependencies: - postcss "^7.0.17" - postcss-nesting "^7.0.1" - postcss-tape "^5.0.2" - postcss-focus-visible@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/postcss-focus-visible/-/postcss-focus-visible-4.0.0.tgz#477d107113ade6024b14128317ade2bd1e17046e" @@ -9091,7 +8870,7 @@ postcss-lab-function@^2.0.1: postcss "^7.0.2" postcss-values-parser "^2.0.0" -postcss-load-config@^2.0.0, postcss-load-config@^2.1.0: +postcss-load-config@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.0.tgz#c84d692b7bb7b41ddced94ee62e8ab31b417b003" integrity sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q== @@ -9099,16 +8878,6 @@ postcss-load-config@^2.0.0, postcss-load-config@^2.1.0: cosmiconfig "^5.0.0" import-cwd "^2.0.0" -postcss-loader@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d" - integrity sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA== - dependencies: - loader-utils "^1.1.0" - postcss "^7.0.0" - postcss-load-config "^2.0.0" - schema-utils "^1.0.0" - postcss-logical@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-3.0.0.tgz#2495d0f8b82e9f262725f75f9401b34e7b45d5b5" @@ -9236,7 +9005,7 @@ postcss-modules-scope@1.1.0: css-selector-tokenizer "^0.7.0" postcss "^6.0.1" -postcss-modules-scope@^2.0.1, postcss-modules-scope@^2.1.1: +postcss-modules-scope@^2.0.1: version "2.1.1" resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.1.tgz#33d4fc946602eb5e9355c4165d68a10727689dba" integrity sha512-OXRUPecnHCg8b9xWvldG/jUpRIGPNRka0r4D4j0ESUU2/5IOnpsjfPPmDprM3Ih8CgZ8FXjWqaniK5v4rWt3oQ== @@ -9271,7 +9040,7 @@ postcss-modules@^2.0.0: postcss "^7.0.1" string-hash "^1.1.1" -postcss-nesting@^7.0.0, postcss-nesting@^7.0.1: +postcss-nesting@^7.0.0: version "7.0.1" resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-7.0.1.tgz#b50ad7b7f0173e5b5e3880c3501344703e04c052" integrity sha512-FrorPb0H3nuVq0Sff7W2rnc3SmIcruVC6YwpcS+k687VxyxO33iE1amna7wHuRVzM8vfiYofXSBHNAZ3QhLvYg== @@ -9468,13 +9237,6 @@ postcss-replace-overflow-wrap@^3.0.0: dependencies: postcss "^7.0.2" -postcss-scss@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-2.0.0.tgz#248b0a28af77ea7b32b1011aba0f738bda27dea1" - integrity sha512-um9zdGKaDZirMm+kZFKKVsnKPF7zF7qBAtIfTSnZXD1jZ0JNZIxdB6TxQOjCnlSzLRInVl2v3YdBh/M881C4ug== - dependencies: - postcss "^7.0.0" - postcss-selector-matches@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/postcss-selector-matches/-/postcss-selector-matches-4.0.0.tgz#71c8248f917ba2cc93037c9637ee09c64436fcff" @@ -9535,11 +9297,6 @@ postcss-svgo@^4.0.2: postcss-value-parser "^3.0.0" svgo "^1.0.0" -postcss-tape@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/postcss-tape/-/postcss-tape-5.0.2.tgz#7ae011050954fdc10b17d1f1551c9d9bf14e4bdf" - integrity sha512-e4770WnsUzczQp/pAIsz0s0MDLAQ7luyh1/hs8QBcdfXOMrz0siEqYNHAKJIoCvGtLoi2QUjWASvTbPfyTfIWg== - postcss-unique-selectors@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz#9446911f3289bfd64c6d680f073c03b1f9ee4bac" @@ -9614,17 +9371,12 @@ postcss@^7.0.27: supports-color "^6.1.0" preact-render-to-string@^5.1.6: - version "5.1.6" - resolved "https://registry.yarnpkg.com/preact-render-to-string/-/preact-render-to-string-5.1.6.tgz#6e8f6c7d657743d8bb27c8ea3d5ac218354c87a4" - integrity sha512-/8mDzzfMrxx5tzJazKGdyYADrmjzBR3QJsvdZs03aV9VjeXpDrzDHs6dhzlMA1EsdCBq4cqioKjVKUs58uNckg== + version "5.1.8" + resolved "https://registry.yarnpkg.com/preact-render-to-string/-/preact-render-to-string-5.1.8.tgz#5540f4c1b1fcf1e7c7dfb154d38053e717ca1fe4" + integrity sha512-9c2OFfOJ2Zi7ppMbHYC5lx1ebDFXpDGBMns9/YaKMgZGElUY90xTGmsKeNMqrNoDo7ImYPh715Ke6Ah/pdjW0g== dependencies: pretty-format "^3.8.0" -preact-ssr-prepass@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/preact-ssr-prepass/-/preact-ssr-prepass-1.0.1.tgz#15ce9306edacc1095fcefe3e6a4e461f3af805cc" - integrity sha512-pUCh/X/KJd45GVCfQAqmIdL6eLSj/EIrCPBU81s95wEYNM9f1omsZWrxusIwJP3oVKQyt29//9dLBjY2P6iyYg== - preact@^10.4.1: version "10.4.1" resolved "https://registry.yarnpkg.com/preact/-/preact-10.4.1.tgz#9b3ba020547673a231c6cf16f0fbaef0e8863431" @@ -9640,35 +9392,11 @@ prepend-http@^1.0.0: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= -prettier-eslint@^9.0.0: - version "9.0.1" - resolved "https://registry.yarnpkg.com/prettier-eslint/-/prettier-eslint-9.0.1.tgz#fbf507cde7329141cd368c6aeb54a70715d02cf4" - integrity sha512-KZT65QTosSAqBBqmrC+RpXbsMRe7Os2YSR9cAfFbDlyPAopzA/S5bioiZ3rpziNQNSJaOxmtXSx07EQ+o2Dlug== - dependencies: - "@typescript-eslint/parser" "^1.10.2" - common-tags "^1.4.0" - core-js "^3.1.4" - dlv "^1.1.0" - eslint "^5.0.0" - indent-string "^4.0.0" - lodash.merge "^4.6.0" - loglevel-colored-level-prefix "^1.0.0" - prettier "^1.7.0" - pretty-format "^23.0.1" - require-relative "^0.8.7" - typescript "^3.2.1" - vue-eslint-parser "^2.0.2" - prettier@1.18.2: version "1.18.2" resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea" integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw== -prettier@^1.7.0: - version "1.19.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" - integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== - pretty-error@^2.0.2: version "2.1.1" resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3" @@ -9677,24 +9405,6 @@ pretty-error@^2.0.2: renderkid "^2.0.1" utila "~0.4" -pretty-format@^23.0.1: - version "23.6.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.6.0.tgz#5eaac8eeb6b33b987b7fe6097ea6a8a146ab5760" - integrity sha512-zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw== - dependencies: - ansi-regex "^3.0.0" - ansi-styles "^3.2.0" - -pretty-format@^24.9.0: - version "24.9.0" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9" - integrity sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA== - dependencies: - "@jest/types" "^24.9.0" - ansi-regex "^4.0.0" - ansi-styles "^3.2.0" - react-is "^16.8.4" - pretty-format@^3.8.0: version "3.8.0" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-3.8.0.tgz#bfbed56d5e9a776645f4b1ff7aa1a3ac4fa3c385" @@ -9919,14 +9629,6 @@ raw-body@2.4.0: iconv-lite "0.4.24" unpipe "1.0.0" -raw-loader@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-3.1.0.tgz#5e9d399a5a222cc0de18f42c3bc5e49677532b3f" - integrity sha512-lzUVMuJ06HF4rYveaz9Tv0WRlUMxJ0Y1hgSkkgg+50iEdaI0TthyEDe08KIHb0XsF6rn8WYTqPCaGTZg3sX+qA== - dependencies: - loader-utils "^1.1.0" - schema-utils "^2.0.1" - rc@^1.2.7: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" @@ -9966,7 +9668,7 @@ react-hot-loader@^4.12.18: shallowequal "^1.1.0" source-map "^0.7.3" -react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4: +react-is@^16.7.0, react-is@^16.8.1: version "16.12.0" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c" integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q== @@ -10345,11 +10047,6 @@ require-main-filename@^2.0.0: resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg== -require-relative@^0.8.7: - version "0.8.7" - resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de" - integrity sha1-eZlTn8ngR6N5KPoZb44VY9q9Nt4= - requires-port@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" @@ -10406,7 +10103,7 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@1.15.1, resolve@^1.11.0: +resolve@1.15.1: version "1.15.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8" integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w== @@ -10420,7 +10117,7 @@ resolve@^1.1.7, resolve@^1.10.0, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13 dependencies: path-parse "^1.0.6" -resolve@^1.16.1, resolve@^1.17.0: +resolve@^1.11.0, resolve@^1.14.2, resolve@^1.16.1, resolve@^1.17.0: version "1.17.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444" integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w== @@ -10502,41 +10199,11 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" -rollup-plugin-babel@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-4.4.0.tgz#d15bd259466a9d1accbdb2fe2fff17c52d030acb" - integrity sha512-Lek/TYp1+7g7I+uMfJnnSJ7YWoD58ajo6Oarhlex7lvUce+RCKRuGRSgztDO3/MF/PuGKmUL5iTHKf208UNszw== - dependencies: - "@babel/helper-module-imports" "^7.0.0" - rollup-pluginutils "^2.8.1" - -rollup-plugin-commonjs@^10.1.0: - version "10.1.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.1.0.tgz#417af3b54503878e084d127adf4d1caf8beb86fb" - integrity sha512-jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q== - dependencies: - estree-walker "^0.6.1" - is-reference "^1.1.2" - magic-string "^0.25.2" - resolve "^1.11.0" - rollup-pluginutils "^2.8.1" - rollup-plugin-includepaths@^0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/rollup-plugin-includepaths/-/rollup-plugin-includepaths-0.2.3.tgz#244d21b9669a0debe476d825e4a02ed08c06b258" integrity sha512-4QbSIZPDT+FL4SViEVCRi4cGCA64zQJu7u5qmCkO3ecHy+l9EQBsue15KfCpddfb6Br0q47V/v2+E2YUiqts9g== -rollup-plugin-node-resolve@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz#730f93d10ed202473b1fb54a5997a7db8c6d8523" - integrity sha512-jUlyaDXts7TW2CqQ4GaO5VJ4PwwaV8VUGA7+km3n6k6xtOEacf61u0VXwN80phY/evMcaS+9eIeJ9MOyDxt5Zw== - dependencies: - "@types/resolve" "0.0.8" - builtin-modules "^3.1.0" - is-module "^1.0.0" - resolve "^1.11.1" - rollup-pluginutils "^2.8.1" - rollup-plugin-peer-deps-external@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/rollup-plugin-peer-deps-external/-/rollup-plugin-peer-deps-external-2.2.2.tgz#506cef67fb68f41cca3ec08ca6ff7936b190f568" @@ -10573,7 +10240,7 @@ rollup-plugin-typescript2@^0.26.0: rollup-pluginutils "2.8.2" tslib "1.10.0" -rollup-pluginutils@2.8.2, rollup-pluginutils@^2.8.1, rollup-pluginutils@^2.8.2: +rollup-pluginutils@2.8.2, rollup-pluginutils@^2.8.2: version "2.8.2" resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e" integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ== @@ -10668,17 +10335,6 @@ sass-graph@^2.2.4: scss-tokenizer "^0.2.3" yargs "^7.0.0" -sass-loader@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-8.0.0.tgz#e7b07a3e357f965e6b03dd45b016b0a9746af797" - integrity sha512-+qeMu563PN7rPdit2+n5uuYVR0SSVwm0JsOUsaJXzgYcClWSlmX0iHDnmeOobPkf5kUglVot3QS6SyLyaQoJ4w== - dependencies: - clone-deep "^4.0.1" - loader-utils "^1.2.3" - neo-async "^2.6.1" - schema-utils "^2.1.0" - semver "^6.3.0" - sass@^1.16.1: version "1.23.7" resolved "https://registry.yarnpkg.com/sass/-/sass-1.23.7.tgz#090254e006af1219d442f1bff31e139d5e085dff" @@ -10708,14 +10364,6 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -schema-utils@^2.0.1, schema-utils@^2.1.0, schema-utils@^2.5.0, schema-utils@^2.6.0: - version "2.6.1" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.1.tgz#eb78f0b945c7bcfa2082b3565e8db3548011dc4f" - integrity sha512-0WXHDs1VDJyo+Zqs9TKLKyD/h7yDpHUhEFsM2CzkICFdoX1av+GBq/J2xRTFfsQO5kBfhZzANf2VcIm84jqDbg== - dependencies: - ajv "^6.10.2" - ajv-keywords "^3.4.1" - schema-utils@^2.6.1: version "2.6.4" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.4.tgz#a27efbf6e4e78689d91872ee3ccfa57d7bdd0f53" @@ -11368,16 +11016,16 @@ strip-indent@^2.0.0: resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68" integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g= -strip-json-comments@^2.0.1, strip-json-comments@~2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= - strip-json-comments@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7" integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw== +strip-json-comments@~2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + strong-log-transformer@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz#0f5ed78d325e0421ac6f90f7f10e691d6ae3ae10" @@ -11399,14 +11047,6 @@ style-loader@^0.8.3: dependencies: loader-utils "^0.2.5" -style-loader@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-1.0.1.tgz#aec6d4c61d0ed8d0a442faed741d4dfc6573888a" - integrity sha512-CnpEkSR1C+REjudiTWCv4+ssP7SCiuaQZJTZDWBRwTJoS90mdqkB8uOGMHKgVeUzpaU7IfLWoyQbvvs5Joj3Xw== - dependencies: - loader-utils "^1.2.3" - schema-utils "^2.0.1" - stylehacks@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5" @@ -11807,15 +11447,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@^3.2.1: - version "3.7.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.3.tgz#b36840668a16458a7025b9eabfad11b66ab85c69" - integrity sha512-Mcr/Qk7hXqFBXMN7p7Lusj1ktCBydylfQM/FZCk5glCNQJrCUKPkMHdo9R0MTFWsC/4kPFvDS0fDPvukfCkFsw== - -typescript@^3.8.3: - version "3.8.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061" - integrity sha512-MYlEfn5VrLNsgudQTVJeNaQFUAI7DkhnOjdpAp4T+ku1TfQClewlbSuTVHiA+8skNBgaf02TL/kLOvig4y3G8w== +typescript@^3.9.3: + version "3.9.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.3.tgz#d3ac8883a97c26139e42df5e93eeece33d610b8a" + integrity sha512-D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ== uglify-js@3.4.x: version "3.4.10" @@ -11952,15 +11587,6 @@ urix@^0.1.0: resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= -url-loader@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-3.0.0.tgz#9f1f11b371acf6e51ed15a50db635e02eec18368" - integrity sha512-a84JJbIA5xTFTWyjjcPdnsu+41o/SNE8SpXMdUvXs6Q+LuhCD9E2+0VCiuDWqgo3GGXVlFHzArDmBpj9PgWn4A== - dependencies: - loader-utils "^1.2.3" - mime "^2.4.4" - schema-utils "^2.5.0" - url-parse@^1.4.3: version "1.4.7" resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278" @@ -12085,18 +11711,6 @@ vm-browserify@^1.0.1: resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== -vue-eslint-parser@^2.0.2: - version "2.0.3" - resolved "https://registry.yarnpkg.com/vue-eslint-parser/-/vue-eslint-parser-2.0.3.tgz#c268c96c6d94cfe3d938a5f7593959b0ca3360d1" - integrity sha512-ZezcU71Owm84xVF6gfurBQUGg8WQ+WZGxgDEQu1IHFBZNx7BFZg3L1yHxrCBNNwbwFtE1GuvfJKMtb6Xuwc/Bw== - dependencies: - debug "^3.1.0" - eslint-scope "^3.7.1" - eslint-visitor-keys "^1.0.0" - espree "^3.5.2" - esquery "^1.0.0" - lodash "^4.17.4" - watchpack@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"