diff --git a/webapp/package.json b/webapp/package.json index 93bff1eace..f1d2558599 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -2,36 +2,21 @@ "name": "cloudbeaver-ce", "version": "1.0.0", "private": true, - "workspaces": [ - "packages/*" - ], + "workspaces": { + "packages": [ + "packages/*" + ], + "nohoist": ["**/core-cli", "**/core-cli/**"] + }, "scripts": { "prebuild": "npm run clean-dist", "clean-dist": "rimraf lib/*" }, "devDependencies": { - "@babel/cli": "^7.12.10", - "@babel/core": "^7.12.10", - "@babel/plugin-proposal-class-properties": "^7.12.1", - "@babel/plugin-proposal-decorators": "^7.12.12", - "@babel/plugin-proposal-object-rest-spread": "^7.12.1", - "@babel/plugin-transform-runtime": "^7.12.10", - "@babel/preset-env": "^7.12.11", - "@babel/preset-react": "^7.12.10", - "@babel/preset-typescript": "^7.12.7", - "@csstools/postcss-sass": "^4.0.0", - "@types/md5": "^2.2.1", "@types/react": "^16.9.49", "@types/react-dom": "^16.9.8", "@typescript-eslint/eslint-plugin": "^4.13.0", "@typescript-eslint/parser": "^4.13.0", - "babel-loader": "^8.2.2", - "babel-plugin-module-resolver": "^4.1.0", - "babel-plugin-transform-typescript-metadata": "^0.3.1", - "cache-loader": "^4.1.0", - "copy-webpack-plugin": "^7.0.0", - "css-loader": "^5.0.1", - "declaration-bundler-webpack-plugin": "^1.0.3", "eslint": "^7.18.0", "eslint-config-airbnb-base": "^14.2.1", "eslint-config-airbnb-typescript": "^12.0.0", @@ -47,20 +32,10 @@ "eslint-plugin-react-hooks": "^4.2.0", "eslint-plugin-standard": "^5.0.0", "eslint-webpack-plugin": "^2.4.1", - "fork-ts-checker-webpack-plugin": "^5.1.0", - "html-loader": "^1.3.2", - "html-webpack-plugin": "^5.0.0-beta.5", - "json5-loader": "^4.0.1", "lerna": "^3.22.1", - "md5": "^2.3.0", - "mini-css-extract-plugin": "^1.3.4", "mobx": "^6.0.4", "mobx-react-lite": "^3.1.6", "node-sass": "^5.0.0", - "peer-deps-externals-webpack-plugin": "^1.0.4", - "postcss-discard-comments": "^4.0.2", - "postcss-loader": "^4.1.0", - "postcss-preset-env": "^6.7.0", "preact": "^10.5.10", "preact-render-to-string": "^5.1.12", "preact-ssr-prepass": "^1.1.3", @@ -69,17 +44,8 @@ "react-dom": "^16.13.1", "reakit": "^1.3.4", "reflect-metadata": "^0.1.13", - "sass-loader": "^10.1.1", - "source-map-loader": "^2.0.0", - "style-loader": "^2.0.0", - "ts-loader": "^8.0.14", - "typescript": "^4.1.3", - "uglifyjs-webpack-plugin": "^2.2.0", - "webpack": "^5.15.0", - "webpack-bundle-analyzer": "^4.3.0", - "webpack-cli": "^4.3.1", - "webpack-dev-server": "^3.11.2", - "webpack-merge": "^5.7.3" + "reshadow": "^0.0.1-alpha.78", + "typescript": "^4.1.3" }, "dependencies": {} } \ No newline at end of file diff --git a/webapp/packages/core-administration/package.json b/webapp/packages/core-administration/package.json index 4f8f1c187e..8edb4d4491 100644 --- a/webapp/packages/core-administration/package.json +++ b/webapp/packages/core-administration/package.json @@ -25,7 +25,7 @@ "@cloudbeaver/core-executor": "^0.1.0", "react": "^16.x.x", "mobx": "^5.x.x", - "mobx-react": "^6.x.x", - "reshadow": "^0.0.1-alpha.78" + "mobx-react-lite": "^3.x.x", + "reshadow": "^0.x.x" } } \ No newline at end of file diff --git a/webapp/packages/core-app/package.json b/webapp/packages/core-app/package.json index de01d5a16a..97be7f6399 100644 --- a/webapp/packages/core-app/package.json +++ b/webapp/packages/core-app/package.json @@ -35,6 +35,6 @@ "reakit": "^1.x.x", "rxjs": "^6.x.x", "mobx": "^5.x.x", - "mobx-react": "^6.x.x" + "mobx-react-lite": "^3.x.x" } } \ No newline at end of file diff --git a/webapp/packages/core-authentication/src/AuthProviderService.ts b/webapp/packages/core-authentication/src/AuthProviderService.ts index 78695d6b12..303213a296 100644 --- a/webapp/packages/core-authentication/src/AuthProviderService.ts +++ b/webapp/packages/core-authentication/src/AuthProviderService.ts @@ -6,9 +6,8 @@ * you may not use this file except in compliance with the License. */ -import md5 from 'md5'; - import { injectable } from '@cloudbeaver/core-di'; +import { md5 } from '@cloudbeaver/core-utils'; import { AuthProvidersResource } from './AuthProvidersResource'; diff --git a/webapp/packages/core-blocks/package.json b/webapp/packages/core-blocks/package.json index 4e5fc3def1..7ab2888983 100644 --- a/webapp/packages/core-blocks/package.json +++ b/webapp/packages/core-blocks/package.json @@ -27,10 +27,10 @@ "@cloudbeaver/core-theming": "^0.1.0", "@cloudbeaver/core-dialogs": "^0.1.0", "@cloudbeaver/core-utils": "^0.1.0", - "reshadow": "^0.0.1-alpha.78", + "reshadow": "^0.x.x", "reakit": "^1.x.x", "react": "^16.x.x", "mobx": "^5.x.x", - "mobx-react": "^6.x.x" + "mobx-react-lite": "^3.x.x" } } \ No newline at end of file diff --git a/webapp/packages/core-blocks/src/Split/SplitControls.tsx b/webapp/packages/core-blocks/src/Split/SplitControls.tsx index 8ae450952e..8207ba1b29 100644 --- a/webapp/packages/core-blocks/src/Split/SplitControls.tsx +++ b/webapp/packages/core-blocks/src/Split/SplitControls.tsx @@ -40,6 +40,7 @@ export function SplitControls() { }, [isResizing]); const handleCollapse = useCallback((event: React.SyntheticEvent) => { + console.log('collapse', mode, state); event.stopPropagation(); if (mode === 'maximize') { setMode('resize'); @@ -48,9 +49,10 @@ export function SplitControls() { setMode('minimize'); setState(getMainSize()); } - }, [mode, setMode]); + }, [mode, state, setMode]); const handleExpand = useCallback((event: React.SyntheticEvent) => { + console.log('expand', mode, state); event.stopPropagation(); if (mode === 'minimize') { setMode('resize'); @@ -59,7 +61,7 @@ export function SplitControls() { setMode('maximize'); setState(getMainSize()); } - }, [mode, setMode]); + }, [mode, state, setMode]); return styled(styles)( diff --git a/webapp/packages/core-bootstrap/package.json b/webapp/packages/core-bootstrap/package.json index ea8e8175ac..f7729d812c 100644 --- a/webapp/packages/core-bootstrap/package.json +++ b/webapp/packages/core-bootstrap/package.json @@ -40,8 +40,8 @@ "reakit": "^1.x.x", "rxjs": "^6.x.x", "mobx": "^5.x.x", - "mobx-react": "^6.x.x", - "reshadow": "^0.0.1-alpha.78", + "mobx-react-lite": "^3.x.x", + "reshadow": "^0.x.x", "preact": "^10.x.x", "preact-render-to-string": "^5.x.x", "preact-ssr-prepass": "^1.x.x" diff --git a/webapp/packages/core-cli/.gitignore b/webapp/packages/core-cli/.gitignore new file mode 100644 index 0000000000..99902db863 --- /dev/null +++ b/webapp/packages/core-cli/.gitignore @@ -0,0 +1,21 @@ +# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. + +# dependencies +/node_modules +/.pnp +.pnp.js + +# testing +/coverage + +# production +/lib + +# misc +.DS_Store +.env* + +# debug +npm-debug.log* +yarn-debug.log* +yarn-error.log* diff --git a/webapp/packages/core-cli/bin/analyzer.js b/webapp/packages/core-cli/bin/analyzer.js new file mode 100644 index 0000000000..9a4fcaf6d7 --- /dev/null +++ b/webapp/packages/core-cli/bin/analyzer.js @@ -0,0 +1,7 @@ +#!/usr/bin/env node + +'use strict'; + +require('webpack-bundle-analyzer/lib/bin/analyzer'); + +process.title = 'core-build'; \ No newline at end of file diff --git a/webapp/packages/core-cli/bin/build.js b/webapp/packages/core-cli/bin/build.js new file mode 100644 index 0000000000..f1e1c1b9e7 --- /dev/null +++ b/webapp/packages/core-cli/bin/build.js @@ -0,0 +1,7 @@ +#!/usr/bin/env node + +'use strict'; + +require('webpack/bin/webpack'); + +process.title = 'core-build'; \ No newline at end of file diff --git a/webapp/configs/babel.config.js b/webapp/packages/core-cli/configs/babel.config.js similarity index 100% rename from webapp/configs/babel.config.js rename to webapp/packages/core-cli/configs/babel.config.js diff --git a/webapp/configs/webpack.config.js b/webapp/packages/core-cli/configs/webpack.config.js similarity index 77% rename from webapp/configs/webpack.config.js rename to webapp/packages/core-cli/configs/webpack.config.js index 4e9f01f115..324fb94f25 100644 --- a/webapp/configs/webpack.config.js +++ b/webapp/packages/core-cli/configs/webpack.config.js @@ -1,11 +1,9 @@ -const { requireOriginal } = require('./webpack.product.utils'); const { resolve, join } = require('path'); -const ModuleDependencyWarning = requireOriginal("webpack/lib/ModuleDependencyWarning"); -const MiniCssExtractPlugin = requireOriginal('mini-css-extract-plugin'); -const ForkTsCheckerWebpackPlugin = requireOriginal('fork-ts-checker-webpack-plugin'); -const ESLintPlugin = requireOriginal('eslint-webpack-plugin'); +const ModuleDependencyWarning = require("webpack/lib/ModuleDependencyWarning"); +const MiniCssExtractPlugin = require('mini-css-extract-plugin'); +const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin'); +// const ESLintPlugin = require('eslint-webpack-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 '.*'( \(imported as '.*'\))? was not found in/ @@ -25,21 +23,32 @@ class IgnoreNotFoundExportPlugin { } } +const nodeModules = [ + resolve('node_modules'), // product + resolve('../../node_modules'), // workspace + resolve('../../node_modules/@cloudbeaver/core-cli/node_modules') // core-cli +] + module.exports = (env, argv) => { process.env.NODE_ENV = argv.mode; const devMode = argv.mode !== 'production'; - function getBaseStyleLoader() { - // if(devMode) { - // return 'style-loader' - // } - return MiniCssExtractPlugin.loader; + function getBaseStyleLoaders() { + const loaders = []; + + if(devMode) { + loaders.push('style-loader') + }else{ + loaders.push(MiniCssExtractPlugin.loader); + } + + return loaders; } function generateStyleLoaders(options = { hasModule: false }) { const moduleScope = options.hasModule ? 'local' : 'global'; const modules = { mode: moduleScope, - localIdentName: '[local]___[fullhash:base64:5]', + localIdentName: '[local]___[hash:base64:5]', }; const postCssPlugins = [ @@ -49,12 +58,10 @@ module.exports = (env, argv) => { ]; return [ - getBaseStyleLoader(), - 'cache-loader', + ...getBaseStyleLoaders(), { loader: 'css-loader', options: { - importLoaders: 1, modules: modules, sourceMap: true, } @@ -74,7 +81,7 @@ module.exports = (env, argv) => { sourceMap: true, sassOptions: { implementation: require('node-sass'), - includePaths: [resolve('node_modules'), resolve('../../node_modules')] + includePaths: nodeModules }, } } @@ -93,7 +100,7 @@ module.exports = (env, argv) => { cache: true, resolve: { extensions: ['.ts', '.tsx', '.js'], - modules: [resolve('node_modules'), resolve('../../node_modules')], + modules: nodeModules, alias: { react: 'preact/compat', react$: 'preact/compat', @@ -101,6 +108,9 @@ module.exports = (env, argv) => { 'react-dom$': 'preact/compat', }, }, + resolveLoader: { + modules: nodeModules + }, module: { rules: [ { @@ -112,8 +122,6 @@ module.exports = (env, argv) => { test: /\.(ts|js)x?$/, exclude: /node_modules/, use: [ - 'cache-loader', - // 'reshadow/webpack/loader', babelLoader ] }, @@ -127,7 +135,7 @@ module.exports = (env, argv) => { { include: /node_modules/, use: [ - getBaseStyleLoader(), + ...getBaseStyleLoaders(), 'css-loader', 'sass-loader' ] diff --git a/webapp/configs/webpack.plugin.config.js b/webapp/packages/core-cli/configs/webpack.plugin.config.js similarity index 76% rename from webapp/configs/webpack.plugin.config.js rename to webapp/packages/core-cli/configs/webpack.plugin.config.js index 65040858ec..164467c7fd 100644 --- a/webapp/configs/webpack.plugin.config.js +++ b/webapp/packages/core-cli/configs/webpack.plugin.config.js @@ -1,7 +1,6 @@ -const { requireOriginal } = require('./webpack.product.utils'); -const { merge } = requireOriginal('webpack-merge'); +const { merge } = require('webpack-merge'); const { resolve } = require('path'); -var PeerDepsExternalsPlugin = requireOriginal('peer-deps-externals-webpack-plugin'); +var PeerDepsExternalsPlugin = require('peer-deps-externals-webpack-plugin'); const commonConfig = require('./webpack.config.js'); var main = resolve('src/index.ts'); diff --git a/webapp/configs/webpack.product.config.js b/webapp/packages/core-cli/configs/webpack.product.config.js similarity index 79% rename from webapp/configs/webpack.product.config.js rename to webapp/packages/core-cli/configs/webpack.product.config.js index 3ae1343980..1932be88e6 100644 --- a/webapp/configs/webpack.product.config.js +++ b/webapp/packages/core-cli/configs/webpack.product.config.js @@ -1,10 +1,10 @@ -const { getAssets, withTimestamp, requireOriginal } = require('./webpack.product.utils'); -const { merge } = requireOriginal('webpack-merge'); -const webpack = requireOriginal('webpack'); +const { getAssets, withTimestamp } = require('./webpack.product.utils'); +const { merge } = require('webpack-merge'); +const webpack = require('webpack'); const { resolve } = require('path'); -const HtmlWebpackPlugin = requireOriginal('html-webpack-plugin'); -const CopyWebpackPlugin = requireOriginal('copy-webpack-plugin'); -const TerserPlugin = requireOriginal("terser-webpack-plugin"); +const HtmlWebpackPlugin = require('html-webpack-plugin'); +const CopyWebpackPlugin = require('copy-webpack-plugin'); +const TerserPlugin = require("terser-webpack-plugin"); const commonConfig = require('./webpack.config.js'); diff --git a/webapp/configs/webpack.product.dev.config.js b/webapp/packages/core-cli/configs/webpack.product.dev.config.js similarity index 85% rename from webapp/configs/webpack.product.dev.config.js rename to webapp/packages/core-cli/configs/webpack.product.dev.config.js index 954c714c79..a5906523e1 100644 --- a/webapp/configs/webpack.product.dev.config.js +++ b/webapp/packages/core-cli/configs/webpack.product.dev.config.js @@ -1,7 +1,7 @@ -const { getAssets, requireOriginal } = require('./webpack.product.utils'); -const { merge } = requireOriginal('webpack-merge'); +const { getAssets } = require('./webpack.product.utils'); +const { merge } = require('webpack-merge'); const { resolve } = require('path'); -const webpack = requireOriginal('webpack'); +const webpack = require('webpack'); const commonConfig = require('./webpack.config.js') diff --git a/webapp/configs/webpack.product.utils.js b/webapp/packages/core-cli/configs/webpack.product.utils.js similarity index 93% rename from webapp/configs/webpack.product.utils.js rename to webapp/packages/core-cli/configs/webpack.product.utils.js index 759f730696..9db308332a 100644 --- a/webapp/configs/webpack.product.utils.js +++ b/webapp/packages/core-cli/configs/webpack.product.utils.js @@ -44,6 +44,5 @@ function getAssets(package, to) { module.exports = { withTimestamp, - getAssets, - requireOriginal: module => require(require.resolve(module, { paths})) + getAssets } diff --git a/webapp/packages/core-cli/package.json b/webapp/packages/core-cli/package.json new file mode 100644 index 0000000000..41fa766808 --- /dev/null +++ b/webapp/packages/core-cli/package.json @@ -0,0 +1,52 @@ +{ + "name": "@cloudbeaver/core-cli", + "sideEffects": false, + "version": "0.1.0", + "description": "CLI for CloudBeaver build system", + "license": "Apache-2.0", + "main": "lib/index.js", + "module": "lib/index.js", + "types": "src/index.ts", + "bin": { + "core-cli-build": "./bin/build.js", + "core-cli-analyzer": "./bin/analyzer.js" + }, + "engines": { + "node": ">=10.13.0" + }, + "dependencies": { + "@babel/cli": "^7.12.10", + "@babel/core": "^7.12.10", + "@babel/plugin-proposal-class-properties": "^7.12.1", + "@babel/plugin-proposal-decorators": "^7.12.12", + "@babel/plugin-proposal-object-rest-spread": "^7.12.1", + "@babel/plugin-transform-runtime": "^7.12.10", + "@babel/preset-env": "^7.12.11", + "@babel/preset-react": "^7.12.10", + "@babel/preset-typescript": "^7.12.7", + "babel-loader": "^8.2.2", + "babel-plugin-module-resolver": "^4.1.0", + "babel-plugin-transform-typescript-metadata": "^0.3.1", + "copy-webpack-plugin": "^7.0.0", + "css-loader": "^5.0.1", + "declaration-bundler-webpack-plugin": "^1.0.3", + "fork-ts-checker-webpack-plugin": "^5.1.0", + "html-loader": "^1.3.2", + "html-webpack-plugin": "^5.0.0-beta.5", + "json5-loader": "^4.0.1", + "mini-css-extract-plugin": "^1.3.4", + "peer-deps-externals-webpack-plugin": "^1.0.4", + "postcss-discard-comments": "^4.0.2", + "postcss-loader": "^4.1.0", + "postcss-preset-env": "^6.7.0", + "sass-loader": "^10.1.1", + "source-map-loader": "^2.0.0", + "style-loader": "^2.0.0", + "ts-loader": "^8.0.14", + "webpack": "^5.15.0", + "webpack-bundle-analyzer": "^4.3.0", + "webpack-cli": "^4.3.1", + "webpack-dev-server": "^3.11.2", + "webpack-merge": "^5.7.3" + } +} \ No newline at end of file diff --git a/webapp/packages/core-cli/tsconfig.json b/webapp/packages/core-cli/tsconfig.json new file mode 100644 index 0000000000..8cd6b539e3 --- /dev/null +++ b/webapp/packages/core-cli/tsconfig.json @@ -0,0 +1,8 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { + "outDir": "lib" + }, + "include": ["src"], + "exclude": ["**/node_modules", "**/.*/"], +} diff --git a/webapp/packages/core-connections/package.json b/webapp/packages/core-connections/package.json index 88554c1ce1..0b5a4964ee 100644 --- a/webapp/packages/core-connections/package.json +++ b/webapp/packages/core-connections/package.json @@ -34,6 +34,6 @@ "reakit": "^1.x.x", "rxjs": "^6.x.x", "mobx": "^5.x.x", - "mobx-react": "^6.x.x" + "mobx-react-lite": "^3.x.x" } } \ No newline at end of file diff --git a/webapp/packages/core-dialogs/package.json b/webapp/packages/core-dialogs/package.json index 343320130c..1e4e0f03a4 100644 --- a/webapp/packages/core-dialogs/package.json +++ b/webapp/packages/core-dialogs/package.json @@ -26,7 +26,7 @@ "reakit": "^1.x.x", "react": "^16.x.x", "mobx": "^5.x.x", - "reshadow": "^0.0.1-alpha.78", - "mobx-react": "^6.x.x" + "reshadow": "^0.x.x", + "mobx-react-lite": "^3.x.x" } } \ No newline at end of file diff --git a/webapp/packages/core-localization/package.json b/webapp/packages/core-localization/package.json index 884ab2c40c..5e72814a9a 100644 --- a/webapp/packages/core-localization/package.json +++ b/webapp/packages/core-localization/package.json @@ -22,6 +22,6 @@ "@cloudbeaver/core-settings": "^0.1.0", "react": "^16.x.x", "mobx": "^5.x.x", - "mobx-react": "^6.x.x" + "mobx-react-lite": "^3.x.x" } } \ No newline at end of file diff --git a/webapp/packages/core-notifications/package.json b/webapp/packages/core-notifications/package.json index 9010b5a268..32c7b66e03 100644 --- a/webapp/packages/core-notifications/package.json +++ b/webapp/packages/core-notifications/package.json @@ -22,12 +22,12 @@ "@cloudbeaver/core-events": "^0.1.0", "@cloudbeaver/core-theming": "^0.1.0", "@cloudbeaver/core-dialogs": "^0.1.0", - "reshadow": "^0.0.1-alpha.78", + "reshadow": "^0.x.x", "react": "^16.x.x", "react-dom": "^16.x.x", "reakit": "^1.x.x", "rxjs": "^6.x.x", "mobx": "^5.x.x", - "mobx-react": "^6.x.x" + "mobx-react-lite": "^3.x.x" } } \ No newline at end of file diff --git a/webapp/packages/core-routing/package.json b/webapp/packages/core-routing/package.json index 90bea7ce24..0447598119 100644 --- a/webapp/packages/core-routing/package.json +++ b/webapp/packages/core-routing/package.json @@ -21,6 +21,6 @@ "peerDependencies": { "@cloudbeaver/core-di": "^0.1.0", "mobx": "^5.x.x", - "mobx-react": "^6.x.x" + "mobx-react-lite": "^3.x.x" } } \ No newline at end of file diff --git a/webapp/packages/core-theming/package.json b/webapp/packages/core-theming/package.json index 90dbdcd502..39d3743437 100644 --- a/webapp/packages/core-theming/package.json +++ b/webapp/packages/core-theming/package.json @@ -31,8 +31,8 @@ "@cloudbeaver/core-settings": "^0.1.0", "@cloudbeaver/core-utils": "^0.1.0", "mobx": "^5.x.x", - "mobx-react": "^6.x.x", + "mobx-react-lite": "^3.x.x", "react": "^16.x.x", - "reshadow": "^0.0.1-alpha.78" + "reshadow": "^0.x.x" } } diff --git a/webapp/packages/core-utils/package.json b/webapp/packages/core-utils/package.json index f7487d5b12..5d93c1375e 100644 --- a/webapp/packages/core-utils/package.json +++ b/webapp/packages/core-utils/package.json @@ -15,6 +15,8 @@ "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix" }, "dependencies": { + "@types/md5": "^2.2.1", + "md5": "^2.3.0", "uuid": "^7.0.3" }, "peerDependencies": { diff --git a/webapp/packages/core-utils/src/index.ts b/webapp/packages/core-utils/src/index.ts index 366c81f4e6..fe04c58c09 100644 --- a/webapp/packages/core-utils/src/index.ts +++ b/webapp/packages/core-utils/src/index.ts @@ -4,6 +4,7 @@ export * from './OrderedMap'; export * from './parseJSONFlat'; export * from './uuid_'; export * from './generateFileName'; +export * from './md5'; export * from './TextTools'; export * from './Promises/CancellablePromise'; diff --git a/webapp/packages/core-utils/src/md5.ts b/webapp/packages/core-utils/src/md5.ts new file mode 100644 index 0000000000..983fdbb99f --- /dev/null +++ b/webapp/packages/core-utils/src/md5.ts @@ -0,0 +1,11 @@ +/* + * cloudbeaver - Cloud Database Manager + * Copyright (C) 2020 DBeaver Corp and others + * + * Licensed under the Apache License, Version 2.0. + * you may not use this file except in compliance with the License. + */ + +import md5 from 'md5'; + +export { md5 }; diff --git a/webapp/packages/plugin-administration/package.json b/webapp/packages/plugin-administration/package.json index af5922cd92..ee93bc4cbe 100644 --- a/webapp/packages/plugin-administration/package.json +++ b/webapp/packages/plugin-administration/package.json @@ -35,7 +35,7 @@ "react": "^16.x.x", "rxjs": "^6.x.x", "mobx": "^5.x.x", - "mobx-react": "^6.x.x", - "reshadow": "^0.0.1-alpha.78" + "mobx-react-lite": "^3.x.x", + "reshadow": "^0.x.x" } } diff --git a/webapp/packages/plugin-authentication/package.json b/webapp/packages/plugin-authentication/package.json index b9b4a2c6ae..848559426b 100644 --- a/webapp/packages/plugin-authentication/package.json +++ b/webapp/packages/plugin-authentication/package.json @@ -35,7 +35,7 @@ "react": "^16.x.x", "rxjs": "^6.x.x", "mobx": "^5.x.x", - "mobx-react": "^6.x.x", - "reshadow": "^0.0.1-alpha.78" + "mobx-react-lite": "^3.x.x", + "reshadow": "^0.x.x" } } diff --git a/webapp/packages/plugin-connection-custom/package.json b/webapp/packages/plugin-connection-custom/package.json index 5b363c1978..9c292a43aa 100644 --- a/webapp/packages/plugin-connection-custom/package.json +++ b/webapp/packages/plugin-connection-custom/package.json @@ -33,7 +33,7 @@ "react": "^16.x.x", "rxjs": "^6.x.x", "mobx": "^5.x.x", - "mobx-react": "^6.x.x", - "reshadow": "^0.0.1-alpha.78" + "mobx-react-lite": "^3.x.x", + "reshadow": "^0.x.x" } } \ No newline at end of file diff --git a/webapp/packages/plugin-connection-template/package.json b/webapp/packages/plugin-connection-template/package.json index 681bcf1b48..33a7c9d4d3 100644 --- a/webapp/packages/plugin-connection-template/package.json +++ b/webapp/packages/plugin-connection-template/package.json @@ -33,7 +33,7 @@ "react": "^16.x.x", "rxjs": "^6.x.x", "mobx": "^5.x.x", - "mobx-react": "^6.x.x", - "reshadow": "^0.0.1-alpha.78" + "mobx-react-lite": "^3.x.x", + "reshadow": "^0.x.x" } } diff --git a/webapp/packages/plugin-data-export/package.json b/webapp/packages/plugin-data-export/package.json index 461faf76e3..56058b7a8e 100644 --- a/webapp/packages/plugin-data-export/package.json +++ b/webapp/packages/plugin-data-export/package.json @@ -33,7 +33,7 @@ "react": "^16.x.x", "rxjs": "^6.x.x", "mobx": "^5.x.x", - "mobx-react": "^6.x.x", - "reshadow": "^0.0.1-alpha.78" + "mobx-react-lite": "^3.x.x", + "reshadow": "^0.x.x" } } diff --git a/webapp/packages/plugin-data-spreadsheet-new/package.json b/webapp/packages/plugin-data-spreadsheet-new/package.json index f7d1bf0132..300f45bbc3 100644 --- a/webapp/packages/plugin-data-spreadsheet-new/package.json +++ b/webapp/packages/plugin-data-spreadsheet-new/package.json @@ -36,7 +36,7 @@ "react": "^16.x.x", "rxjs": "^6.x.x", "mobx": "^5.x.x", - "mobx-react": "^6.x.x", - "reshadow": "^0.0.1-alpha.78" + "mobx-react-lite": "^3.x.x", + "reshadow": "^0.x.x" } } \ No newline at end of file diff --git a/webapp/packages/plugin-data-spreadsheet/package.json b/webapp/packages/plugin-data-spreadsheet/package.json index 2e88343484..e2a8024950 100644 --- a/webapp/packages/plugin-data-spreadsheet/package.json +++ b/webapp/packages/plugin-data-spreadsheet/package.json @@ -38,7 +38,7 @@ "react": "^16.x.x", "rxjs": "^6.x.x", "mobx": "^5.x.x", - "mobx-react": "^6.x.x", - "reshadow": "^0.0.1-alpha.78" + "mobx-react-lite": "^3.x.x", + "reshadow": "^0.x.x" } } diff --git a/webapp/packages/plugin-data-viewer/package.json b/webapp/packages/plugin-data-viewer/package.json index 037e9b89df..feafe6b62f 100644 --- a/webapp/packages/plugin-data-viewer/package.json +++ b/webapp/packages/plugin-data-viewer/package.json @@ -35,7 +35,7 @@ "react": "^16.x.x", "rxjs": "^6.x.x", "mobx": "^5.x.x", - "mobx-react": "^6.x.x", - "reshadow": "^0.0.1-alpha.78" + "mobx-react-lite": "^3.x.x", + "reshadow": "^0.x.x" } } \ No newline at end of file diff --git a/webapp/packages/plugin-ddl-viewer/package.json b/webapp/packages/plugin-ddl-viewer/package.json index 953b579e56..fd8e5b9c6e 100644 --- a/webapp/packages/plugin-ddl-viewer/package.json +++ b/webapp/packages/plugin-ddl-viewer/package.json @@ -34,7 +34,7 @@ "react": "^16.x.x", "rxjs": "^6.x.x", "mobx": "^5.x.x", - "mobx-react": "^6.x.x", - "reshadow": "^0.0.1-alpha.78" + "mobx-react-lite": "^3.x.x", + "reshadow": "^0.x.x" } } diff --git a/webapp/packages/plugin-object-viewer/package.json b/webapp/packages/plugin-object-viewer/package.json index 071c7f1dcc..6733551852 100644 --- a/webapp/packages/plugin-object-viewer/package.json +++ b/webapp/packages/plugin-object-viewer/package.json @@ -32,7 +32,7 @@ "react": "^16.x.x", "rxjs": "^6.x.x", "mobx": "^5.x.x", - "mobx-react": "^6.x.x", - "reshadow": "^0.0.1-alpha.78" + "mobx-react-lite": "^3.x.x", + "reshadow": "^0.x.x" } } diff --git a/webapp/packages/plugin-sql-editor/package.json b/webapp/packages/plugin-sql-editor/package.json index 8e1c642ca8..ae0d6e47af 100644 --- a/webapp/packages/plugin-sql-editor/package.json +++ b/webapp/packages/plugin-sql-editor/package.json @@ -41,7 +41,7 @@ "react": "^16.x.x", "rxjs": "^6.x.x", "mobx": "^5.x.x", - "mobx-react": "^6.x.x", - "reshadow": "^0.0.1-alpha.78" + "mobx-react-lite": "^3.x.x", + "reshadow": "^0.x.x" } } diff --git a/webapp/packages/product-default/package.json b/webapp/packages/product-default/package.json index 29283340b8..073b5c4a91 100644 --- a/webapp/packages/product-default/package.json +++ b/webapp/packages/product-default/package.json @@ -9,10 +9,10 @@ "types": "src/index.ts", "scripts": { "prebuild": "rimraf lib/*", - "build": "webpack --mode=production --config ../../configs/webpack.product.config.js", - "dev": "webpack serve --mode=development --progress --config=../../configs/webpack.product.dev.config.js --port=3100", - "analyse": "webpack --config ../../configs/webpack.product.config.js --profile --json > ./lib/stats.json", - "postanalyse": "webpack-bundle-analyzer ./lib/stats.json", + "build": "core-cli-build --mode=production --config ../core-cli/configs/webpack.product.config.js", + "dev": "core-cli-build serve --mode=development --progress --config=../core-cli/configs/webpack.product.dev.config.js --port=3100", + "analyse": "core-cli-build --config ../core-cli/configs/webpack.product.config.js --profile --json > ./lib/stats.json", + "postanalyse": "core-cli-analyzer ./lib/stats.json", "lint": "eslint ./src/ --ext .ts,.tsx", "lint-fix": "eslint ./src/ --ext .ts,.tsx --fix", "version:new": "yarn version --no-git-tag-version" diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 961b2dae88..f5cf8e1939 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -991,21 +991,6 @@ resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7" integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw== -"@csstools/postcss-sass@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@csstools/postcss-sass/-/postcss-sass-4.0.0.tgz#6617c5096a6b71751ee0b87d2326418b9d97effb" - integrity sha512-yvm2aaODNJ8PBn43HjYiRvVJcYLEpz5BEKXxQ/7HryqcL+TnAceXZO+khadTEkjw90r8afR5wykTzvVpFeo4vw== - dependencies: - "@csstools/sass-import-resolve" "^1.0.0" - postcss "^7.0.14" - sass "^1.16.1" - source-map "~0.7.3" - -"@csstools/sass-import-resolve@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@csstools/sass-import-resolve/-/sass-import-resolve-1.0.0.tgz#32c3cdb2f7af3cd8f0dca357b592e7271f3831b5" - integrity sha512-pH4KCsbtBLLe7eqUrw8brcuFO8IZlN36JjdKlOublibVdAIPHCzEnpBWOVUXK5sCf+DpBi8ZtuWtjF0srybdeA== - "@discoveryjs/json-ext@^0.5.0": version "0.5.2" resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz#8f03a22a04de437254e8ce8cc84ba39689288752" @@ -3945,11 +3930,6 @@ buffer-indexof@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c" integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g== -buffer-json@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/buffer-json/-/buffer-json-2.0.0.tgz#f73e13b1e42f196fe2fd67d001c7d7107edd7c23" - integrity sha512-+jjPFVqyfF1esi9fvfUs3NqM0pH1ziZ36VP4hmA/y/Ssfo/5w5xHKfTw9BwQjoJ1w/oVtpLomqwUHKdefGyuHw== - buffer@^5.7.0: version "5.7.1" resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" @@ -3990,7 +3970,7 @@ bytes@3.1.0: resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== -cacache@^12.0.0, cacache@^12.0.2, cacache@^12.0.3: +cacache@^12.0.0, cacache@^12.0.3: version "12.0.4" resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" integrity sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ== @@ -4026,18 +4006,6 @@ cache-base@^1.0.1: union-value "^1.0.0" unset-value "^1.0.0" -cache-loader@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/cache-loader/-/cache-loader-4.1.0.tgz#9948cae353aec0a1fcb1eafda2300816ec85387e" - integrity sha512-ftOayxve0PwKzBF/GLsZNC9fJBXl8lkZE3TOsjkboHfVHVkL39iUEs1FO07A33mizmci5Dudt38UZrrYXDtbhw== - dependencies: - buffer-json "^2.0.0" - find-cache-dir "^3.0.0" - loader-utils "^1.2.3" - mkdirp "^0.5.1" - neo-async "^2.6.1" - schema-utils "^2.0.0" - cacheable-request@^6.0.0: version "6.1.0" resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912" @@ -4213,21 +4181,6 @@ charenc@0.0.2: resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667" integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc= -"chokidar@>=2.0.0 <4.0.0", chokidar@^3.4.0, chokidar@^3.4.3: - version "3.5.1" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" - integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw== - dependencies: - anymatch "~3.1.1" - braces "~3.0.2" - glob-parent "~5.1.0" - is-binary-path "~2.1.0" - is-glob "~4.0.1" - normalize-path "~3.0.0" - readdirp "~3.5.0" - optionalDependencies: - fsevents "~2.3.1" - chokidar@^2.1.8: version "2.1.8" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917" @@ -4247,6 +4200,21 @@ chokidar@^2.1.8: optionalDependencies: fsevents "^1.2.7" +chokidar@^3.4.0, chokidar@^3.4.3: + version "3.5.1" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" + integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw== + dependencies: + anymatch "~3.1.1" + braces "~3.0.2" + glob-parent "~5.1.0" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.5.0" + optionalDependencies: + fsevents "~2.3.1" + chownr@^1.1.1, chownr@^1.1.2: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" @@ -5622,7 +5590,7 @@ err-code@^1.0.0: resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960" integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA= -errno@^0.1.3, errno@~0.1.7: +errno@^0.1.3: version "0.1.8" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A== @@ -6358,15 +6326,6 @@ find-babel-config@^1.2.0: json5 "^0.5.1" path-exists "^3.0.0" -find-cache-dir@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7" - integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ== - dependencies: - commondir "^1.0.1" - make-dir "^2.0.0" - pkg-dir "^3.0.0" - find-cache-dir@^3.0.0, find-cache-dir@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880" @@ -8669,7 +8628,7 @@ make-dir@^1.0.0: dependencies: pify "^3.0.0" -make-dir@^2.0.0, make-dir@^2.1.0: +make-dir@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA== @@ -9040,23 +8999,11 @@ mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.5, mkdirp@~0.5.1: dependencies: minimist "^1.2.5" -mobx-react-lite@^2.2.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/mobx-react-lite/-/mobx-react-lite-2.2.2.tgz#87c217dc72b4e47b22493daf155daf3759f868a6" - integrity sha512-2SlXALHIkyUPDsV4VTKVR9DW7K3Ksh1aaIv3NrNJygTbhXe2A9GrcKHZ2ovIiOp/BXilOcTYemfHHZubP431dg== - -mobx-react-lite@^3.1.6: +mobx-react-lite@^3.1.6, mobx-react-lite@^3.x.x: version "3.1.6" resolved "https://registry.yarnpkg.com/mobx-react-lite/-/mobx-react-lite-3.1.6.tgz#e7f4809ab66edd1acca5adb00c6b88c600ae1952" integrity sha512-MM3x9BLt5nC7iE/ILA5n2+hfrplEKYbFjqROEuGkzBdZP/KD+Z44+2gseczRrTG0xFuiPWfEzgT68+6/zqOiEw== -mobx-react@^6.x.x: - version "6.3.1" - resolved "https://registry.yarnpkg.com/mobx-react/-/mobx-react-6.3.1.tgz#204f9756e42e19d91cb6598837063b7e7de87c52" - integrity sha512-IOxdJGnRSNSJrL2uGpWO5w9JH5q5HoxEqwOF4gye1gmZYdjoYkkMzSGMDnRCUpN/BNzZcFoMdHXrjvkwO7KgaQ== - dependencies: - mobx-react-lite "^2.2.0" - mobx@^5.x.x: version "5.15.7" resolved "https://registry.yarnpkg.com/mobx/-/mobx-5.15.7.tgz#b9a5f2b6251f5d96980d13c78e9b5d8d4ce22665" @@ -9183,7 +9130,7 @@ negotiator@0.6.2: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== -neo-async@^2.6.0, neo-async@^2.6.1, neo-async@^2.6.2: +neo-async@^2.6.0, neo-async@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== @@ -11659,6 +11606,11 @@ reshadow@^0.0.1-alpha.78: "@reshadow/vue" "^0.0.1-alpha.74" "@reshadow/webpack" "^0.0.1-alpha.78" +reshadow@^0.x.x: + version "0.0.0" + resolved "https://registry.yarnpkg.com/reshadow/-/reshadow-0.0.0.tgz#d54b61576cca559179fb1355131ca5b14b3a7b14" + integrity sha512-rnmZVGFJPm5yrFkGOKlu4yy77oMAMo7vKQMtqfT2NeCLCbRA21DntOWPW9HlWEYrSI2UAbTvFhi60zgs6sSXUg== + resolve-cwd@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a" @@ -11873,13 +11825,6 @@ sass-loader@^10.1.1: schema-utils "^3.0.0" semver "^7.3.2" -sass@^1.16.1: - version "1.32.4" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.4.tgz#308bf29dd7f53d44ae4f06580e9a910ad9aa411e" - integrity sha512-N0BT0PI/t3+gD8jKa83zJJUb7ssfQnRRfqN+GIErokW6U4guBpfYl8qYB+OFLEho+QvnV5ZH1R9qhUC/Z2Ch9w== - dependencies: - chokidar ">=2.0.0 <4.0.0" - sax@~1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" @@ -11911,7 +11856,7 @@ schema-utils@^1.0.0: ajv-errors "^1.0.0" ajv-keywords "^3.1.0" -schema-utils@^2.0.0, schema-utils@^2.6.5: +schema-utils@^2.6.5: version "2.7.1" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg== @@ -12000,11 +11945,6 @@ send@0.17.1: range-parser "~1.2.1" statuses "~1.5.0" -serialize-javascript@^1.7.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.1.tgz#cfc200aef77b600c47da9bb8149c943e798c2fdb" - integrity sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A== - serialize-javascript@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4" @@ -12304,7 +12244,7 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g== -source-map@~0.7.2, source-map@~0.7.3: +source-map@~0.7.2: version "0.7.3" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== @@ -13136,26 +13076,11 @@ ua-parser-js@^0.7.18: resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.23.tgz#704d67f951e13195fbcd3d78818577f5bc1d547b" integrity sha512-m4hvMLxgGHXG3O3fQVAyyAQpZzDOvwnhOTjYz5Xmr7r/+LpkNy3vJXdVRWgd1TkAb7NGROZuSy96CrlNVjA7KA== -uglify-js@^3.1.4, uglify-js@^3.6.0: +uglify-js@^3.1.4: version "3.12.4" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.12.4.tgz#93de48bb76bb3ec0fc36563f871ba46e2ee5c7ee" integrity sha512-L5i5jg/SHkEqzN18gQMTWsZk3KelRsfD1wUVNqtq0kzqWQqcJjyL8yc1o8hJgRrWqrAl2mUFbhfznEIoi7zi2A== -uglifyjs-webpack-plugin@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-2.2.0.tgz#e75bc80e7f1937f725954c9b4c5a1e967ea9d0d7" - integrity sha512-mHSkufBmBuJ+KHQhv5H0MXijtsoA1lynJt1lXOaotja8/I0pR4L9oGaPIZw+bQBOFittXZg9OC1sXSGO9D9ZYg== - dependencies: - cacache "^12.0.2" - find-cache-dir "^2.1.0" - is-wsl "^1.1.0" - schema-utils "^1.0.0" - serialize-javascript "^1.7.0" - source-map "^0.6.1" - uglify-js "^3.6.0" - webpack-sources "^1.4.0" - worker-farm "^1.7.0" - uid-number@0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81" @@ -13559,7 +13484,7 @@ webpack-merge@^5.7.3: clone-deep "^4.0.1" wildcard "^2.0.0" -webpack-sources@^1.1.0, webpack-sources@^1.4.0: +webpack-sources@^1.1.0: version "1.4.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== @@ -13693,13 +13618,6 @@ wordwrap@^1.0.0: resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= -worker-farm@^1.7.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8" - integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw== - dependencies: - errno "~0.1.7" - wrap-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba"