Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Web console: Update and prune dependancies (#15487) 

* update the basics
* remove babel
This commit is contained in:
Vadim Ogievetsky 2023-12-05 14:25:07 -08:00 committed by GitHub
parent aa696b0310
commit 0b41b05aa0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 200 additions and 2974 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
licenses.yaml
View File

@ -4299,7 +4299,7 @@ license_category: binary
module: web-console
license_name: MIT License
copyright: The Babel Team
version: 7.22.10
version: 7.23.5
license_file_path: licenses/bin/@babel-code-frame.MIT
---
@ -4319,7 +4319,7 @@ license_category: binary
module: web-console
license_name: MIT License
copyright: The Babel Team
version: 7.22.5
version: 7.23.4
license_file_path: licenses/bin/@babel-helper-string-parser.MIT
---
@ -4329,7 +4329,7 @@ license_category: binary
module: web-console
license_name: MIT License
copyright: The Babel Team
version: 7.22.5
version: 7.22.20
license_file_path: licenses/bin/@babel-helper-validator-identifier.MIT
---
@ -4339,7 +4339,7 @@ license_category: binary
module: web-console
license_name: MIT License
copyright: The Babel Team
version: 7.22.10
version: 7.23.4
license_file_path: licenses/bin/@babel-highlight.MIT
---
@ -4359,7 +4359,7 @@ license_category: binary
module: web-console
license_name: MIT License
copyright: The Babel Team
version: 7.22.11
version: 7.23.5
license_file_path: licenses/bin/@babel-types.MIT
---
@ -4598,7 +4598,7 @@ license_category: binary
module: web-console
license_name: MIT License
copyright: Microsoft Corporation.
version: 15.7.3
version: 15.7.11
license_file_path: licenses/bin/@types-prop-types.MIT
---
@ -4608,7 +4608,7 @@ license_category: binary
module: web-console
license_name: MIT License
copyright: Microsoft Corporation.
version: 18.2.8
version: 18.2.42
license_file_path: licenses/bin/@types-react.MIT
---
@ -4618,7 +4618,7 @@ license_category: binary
module: web-console
license_name: MIT License
copyright: Microsoft Corporation.
version: 0.16.1
version: 0.16.8
license_file_path: licenses/bin/@types-scheduler.MIT
---
@ -5056,7 +5056,7 @@ license_category: binary
module: web-console
license_name: Apache License version 2.0
copyright: Apache Software Foundation
version: 5.4.2
version: 5.4.3
---
@ -5095,7 +5095,7 @@ license_category: binary
module: web-console
license_name: MIT License
copyright: Eli Grey
version: 2.0.2
version: 2.0.5
license_file_path: licenses/bin/file-saver.MIT
---
@ -5255,7 +5255,7 @@ license_category: binary
module: web-console
license_name: MIT License
copyright: Christian Zangl
version: 3.2.1
version: 3.2.2
license_file_path: licenses/bin/hjson.MIT
---
@ -6061,6 +6061,16 @@ license_file_path: licenses/bin/use-sync-external-store.MIT
---
name: "uuid"
license_category: binary
module: web-console
license_name: MIT License
copyright: Robert Kieffer and other contributors
version: 7.0.2
license_file_path: licenses/bin/uuid.MIT
---
name: "value-equal"
license_category: binary
module: web-console
@ -6096,7 +6106,7 @@ license_category: binary
module: web-console
license_name: BSD-3-Clause License
copyright: Baidu Inc.
version: 5.4.3
version: 5.4.4
license_file_path: licenses/bin/zrender.BSD3
---

42
licenses/bin/@types-prop-types.MIT
View File

@ -1,21 +1,21 @@
MIT License
Copyright (c) Microsoft Corporation. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE
MIT License
Copyright (c) Microsoft Corporation.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE

0
licenses/bin/@types-react.MIT Executable file → Normal file
View File

42
licenses/bin/@types-scheduler.MIT
View File

@ -1,21 +1,21 @@
MIT License
Copyright (c) Microsoft Corporation. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE
MIT License
Copyright (c) Microsoft Corporation.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE

21
licenses/bin/uuid.MIT Normal file
View File

@ -0,0 +1,21 @@
The MIT License (MIT)
Copyright (c) 2010-2016 Robert Kieffer and other contributors
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

2981
web-console/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

25
web-console/package.json
View File

@ -82,12 +82,11 @@
"d3-dsv": "^2.0.0",
"d3-scale": "^3.3.0",
"d3-selection": "^2.0.0",
"echarts": "^5.4.1",
"file-saver": "^2.0.2",
"echarts": "^5.4.3",
"file-saver": "^2.0.5",
"follow-redirects": "^1.14.7",
"fontsource-open-sans": "^3.0.9",
"has-own-prop": "^2.0.0",
"hjson": "^3.2.1",
"hjson": "^3.2.2",
"json-bigint-native": "^1.2.0",
"lodash.debounce": "^4.0.8",
"lodash.escape": "^4.0.1",
@ -104,14 +103,13 @@
"react-table": "~6.10.3",
"regenerator-runtime": "^0.13.7",
"tslib": "^2.3.1",
"uuid": "^7.0.2",
"zustand": "^4.3.2"
},
"devDependencies": {
"@awesome-code-style/eslint-config": "^4.1.0",
"@awesome-code-style/prettier-config": "^4.0.0",
"@awesome-code-style/stylelint-config": "^4.0.0",
"@babel/core": "^7.18.6",
"@babel/preset-env": "^7.14.4",
"@testing-library/react": "^14.0.0",
"@types/classnames": "^2.2.9",
"@types/d3-array": "^2.12.3",
@ -119,20 +117,20 @@
"@types/d3-dsv": "^2.0.0",
"@types/d3-scale": "^3.3.2",
"@types/d3-selection": "^2.0.1",
"@types/enzyme": "^3.10.3",
"@types/enzyme-adapter-react-16": "^1.0.5",
"@types/file-saver": "^2.0.1",
"@types/hjson": "^2.4.1",
"@types/enzyme": "^3.10.17",
"@types/enzyme-adapter-react-16": "^1.0.9",
"@types/file-saver": "^2.0.7",
"@types/hjson": "^2.4.6",
"@types/jest": "^27.4.0",
"@types/lodash.debounce": "^4.0.6",
"@types/lodash.escape": "^4.0.6",
"@types/memoize-one": "^4.1.1",
"@types/node": "^12.11.7",
"@types/numeral": "^0.0.26",
"@types/react": "^18.2.8",
"@types/react-dom": "^18.2.4",
"@types/react": "^18.2.42",
"@types/react-dom": "^18.2.17",
"@types/react-router-dom": "^5.3.3",
"@types/react-splitter-layout": "^3.0.2",
"@types/react-splitter-layout": "^3.0.5",
"@types/react-table": "6.8.5",
"@types/uuid": "^7.0.2",
"@typescript-eslint/eslint-plugin": "^5.51.0",
@ -172,7 +170,6 @@
"ts-loader": "^9.4.2",
"ts-node": "^10.9.1",
"typescript": "^4.9.5",
"uuid": "^7.0.2",
"webpack": "^5.76.0",
"webpack-bundle-analyzer": "^4.4.1",
"webpack-cli": "^4.6.0",

3
web-console/src/druid-models/stages/stages.ts
View File

@ -17,7 +17,6 @@
*/
import { max, sum } from 'd3-array';
import hasOwnProp from 'has-own-prop';
import { deleteKeys, filterMap, oneOf, zeroDivide } from '../../utils';
import type { InputFormat } from '../input-format/input-format';
@ -121,7 +120,7 @@ function sumByKey(objs: Record<string, number>[]): Record<string, number> {
const res: Record<string, number> = {};
for (const obj of objs) {
for (const k in obj) {
if (hasOwnProp(obj, k)) {
if (Object.hasOwn(obj, k)) {
res[k] = (res[k] || 0) + obj[k];
}
}

4
web-console/src/links.ts
View File

@ -16,8 +16,6 @@
* limitations under the License.
*/
import hasOwnProp from 'has-own-prop';
// This is set to the latest available version and should be updated to the next version before release
const DRUID_DOCS_VERSION = 'latest';
@ -50,7 +48,7 @@ const links = DEFAULT_LINKS;
export function setLinkOverrides(linkOverrides: Links) {
const keys = Object.keys(DEFAULT_LINKS) as (keyof Links)[];
for (const k of keys) {
if (hasOwnProp(linkOverrides, k)) {
if (Object.hasOwn(linkOverrides, k)) {
links[k] = fillVersion(String(linkOverrides[k]));
}
}

3
web-console/src/utils/general.tsx
View File

@ -20,7 +20,6 @@ import { Intent } from '@blueprintjs/core';
import type { IconName } from '@blueprintjs/icons';
import { IconNames } from '@blueprintjs/icons';
import copy from 'copy-to-clipboard';
import hasOwnProp from 'has-own-prop';
import * as JSONBig from 'json-bigint-native';
import numeral from 'numeral';
import type { JSX } from 'react';
@ -216,7 +215,7 @@ export function groupByAsMap<T, Q>(
export function uniq(array: readonly string[]): string[] {
const seen: Record<string, boolean> = {};
return array.filter(s => {
if (hasOwnProp(seen, s)) {
if (Object.hasOwn(seen, s)) {
return false;
} else {
seen[s] = true;

4
web-console/src/utils/local-storage-backed-visibility.tsx
View File

@ -16,8 +16,6 @@
* limitations under the License.
*/
import hasOwnProp from 'has-own-prop';
import type { LocalStorageKeys } from './local-storage-keys';
import { localStorageGetJson, localStorageSetJson } from './local-storage-keys';
@ -57,7 +55,7 @@ export class LocalStorageBackedVisibility {
const visibilityKeys = Object.keys(visibility);
return visibilityKeys
.filter(k => !visibility[k])
.concat(defaultHidden.filter(k => !hasOwnProp(visibility, k)));
.concat(defaultHidden.filter(k => !Object.hasOwn(visibility, k)));
}
public toggle(value: string): LocalStorageBackedVisibility {

15
web-console/webpack.config.js
View File

@ -39,8 +39,7 @@ module.exports = env => {
};
const mode = process.env.NODE_ENV === 'production' ? 'production' : 'development';
const useBabel = process.env.babel || mode === 'production';
console.log(`Webpack running in ${mode} mode. ${useBabel ? 'Will' : "Won't"} use babel.`);
console.log(`Webpack running in ${mode} mode.`);
const plugins = [
new webpack.DefinePlugin({
@ -50,12 +49,6 @@ module.exports = env => {
}),
];
function babelTest(s) {
// https://github.com/zloirock/core-js/issues/514
if (s.includes('/node_modules/core-js/')) return false;
return /\.m?js$/.test(s);
}
return {
mode: mode,
devtool: mode === 'production' ? undefined : 'eval-cheap-module-source-map',
@ -111,12 +104,6 @@ module.exports = env => {
},
],
},
{
test: useBabel ? babelTest : /^xxx_nothing_will_match_$/,
use: {
loader: 'babel-loader',
},
},
{
test: /\.s?css$/,
use: [