hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

chore: Fixup dependencies and ensure no duplication between kinds of dependencies

Browse Source 
- Also un-bump xterm-fit-addon as it is only compatible with xterm@^5

Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2023-05-16 16:20:29 -04:00
parent a9f48ee93a
commit 618a1c7004
10 changed files with 450 additions and 1280 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/linter.yml vendored
View File

@ -33,3 +33,6 @@ jobs:
- name: Verify Publish Configurations
run: ./scripts/lint-publish-configs.sh
- name: Verify No Duplicate Dependencies
run: ./scripts/lint-package-dependencies.sh

17
open-lens/package.json
View File

@ -204,8 +204,7 @@
"@ogre-tools/injectable-extension-for-auto-registration": "^15.8.1",
"@ogre-tools/injectable-extension-for-mobx": "^15.8.1",
"@ogre-tools/injectable-react": "^15.8.1",
"mobx": "^6.8.0",
"rimraf": "^4.4.1"
"mobx": "^6.9.0"
},
"devDependencies": {
"@electron/rebuild": "^3.2.10",
@ -232,16 +231,13 @@
"@types/url-parse": "^1.4.8",
"@types/uuid": "^8.3.4",
"@types/webpack": "^5.28.1",
"@types/webpack-dev-server": "^4.7.2",
"@types/webpack-env": "^1.18.0",
"@types/webpack-node-externals": "2.5.3",
"autoprefixer": "^10.4.13",
"circular-dependency-plugin": "^5.2.2",
"concurrently": "^7.6.0",
"copy-webpack-plugin": "^11.0.0",
"cross-env": "^7.0.3",
"css-loader": "^6.7.2",
"electron": "^22.3.7",
"electron-builder": "^23.6.0",
"electron-notarize": "^0.3.0",
"esbuild-loader": "^2.20.0",
@ -251,28 +247,21 @@
"jest-environment-jsdom": "^28.1.3",
"jsonfile": "^6.1.0",
"mini-css-extract-plugin": "^2.7.1",
"monaco-editor": "^0.38.0",
"monaco-editor-webpack-plugin": "^7.0.1",
"node-loader": "^2.0.0",
"nodemon": "^2.0.20",
"playwright": "^1.33.0",
"react-refresh": "^0.14.0",
"react-refresh-typescript": "^2.0.7",
"react-select": "^5.7.0",
"rimraf": "^4.4.1",
"run-script-os": "^1.1.6",
"style-loader": "^3.3.1",
"tailwindcss": "^3.3.2",
"ts-loader": "^9.4.2",
"ts-node": "^10.9.1",
"type-fest": "^2.14.0",
"typed-emitter": "^1.4.0",
"typescript": "^4.9.5",
"typescript-plugin-css-modules": "^4.1.1",
"typescript-plugin-css-modules": "^5.0.1",
"webpack": "^5.81.0",
"webpack-cli": "^4.9.2",
"webpack-dev-server": "^4.13.3",
"webpack-node-externals": "^3.0.0",
"xterm-addon-fit": "^0.7.0"
"webpack-node-externals": "^3.0.0"
}
}

1558
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

97
packages/core/package.json
View File

@ -106,22 +106,26 @@
"@astronautlabs/jsonpath": "^1.1.0",
"@hapi/call": "^9.0.1",
"@hapi/subtext": "^7.1.0",
"@k8slens/list-layout": "^1.0.0-alpha.4",
"@k8slens/metrics": "^6.5.0-alpha.7",
"@k8slens/node-fetch": "^6.5.0-alpha.3",
"@k8slens/react-application": "^1.0.0-alpha.5",
"@k8slens/resource-templates": "^1.0.0-alpha.1",
"@kubernetes/client-node": "^0.18.1",
"@material-ui/core": "^4.12.3",
"@material-ui/icons": "^4.11.2",
"@material-ui/lab": "^4.0.0-alpha.60",
"@material-ui/styles": "^4.11.5",
"@sentry/electron": "^3.0.8",
"@sentry/integrations": "^6.19.3",
"@side/jest-runtime": "^1.1.0",
"ansi_up": "^5.2.1",
"auto-bind": "^4.0.0",
"await-lock": "^2.2.2",
"byline": "^5.0.0",
"chalk": "^4.1.2",
"chart.js": "^2.9.4",
"chokidar": "^3.5.3",
"color": "^3.2.1",
"conf": "^10.2.0",
"crypto-js": "^4.1.1",
"dompurify": "^2.4.4",
"electron": "^22.3.7",
"electron-devtools-installer": "^3.2.0",
"electron-updater": "^4.6.5",
"electron-window-state": "^5.0.3",
@ -139,10 +143,6 @@
"lodash": "^4.17.15",
"marked": "^4.2.12",
"md5-file": "^5.0.0",
"mobx": "^6.8.0",
"mobx-observable-history": "^2.0.3",
"mobx-react": "^7.6.0",
"mobx-utils": "^6.0.4",
"moment": "^2.29.4",
"moment-timezone": "^0.5.40",
"node-pty": "0.10.1",
@ -150,11 +150,19 @@
"p-limit": "^3.1.0",
"path-to-regexp": "^6.2.0",
"proper-lockfile": "^4.1.2",
"query-string": "^7.1.3",
"randomcolor": "^0.6.2",
"react": "^17.0.2",
"react-beautiful-dnd": "^13.1.1",
"react-dom": "^17.0.2",
"react-material-ui-carousel": "^2.3.11",
"react-router": "^5.3.4",
"react-router-dom": "^5.3.4",
"react-select": "^5.7.0",
"react-select-event": "^5.5.1",
"react-table": "^7.8.0",
"react-virtualized-auto-sizer": "^1.0.7",
"react-window": "^1.8.8",
"readable-stream": "^3.6.0",
"rfc6902": "^5.0.1",
"selfsigned": "^2.1.1",
@ -163,6 +171,8 @@
"tar": "^6.1.13",
"tcp-port-used": "^1.0.2",
"tempy": "1.0.1",
"type-fest": "^2.14.0",
"typed-emitter": "^1.4.0",
"typed-regex": "^0.0.8",
"url-parse": "^1.5.10",
"uuid": "^8.3.2",
@ -170,15 +180,14 @@
"winston": "^3.8.2",
"winston-transport-browserconsole": "^1.0.5",
"ws": "^8.12.1",
"xterm": "^4.19.0",
"xterm-addon-fit": "^0.5.0",
"xterm-link-provider": "^1.3.1"
},
"devDependencies": {
"@async-fn/jest": "1.6.4",
"@k8slens/messaging-fake-bridge": "^1.0.0-alpha.6",
"@k8slens/react-testing-library-discovery": "^1.0.0-alpha.4",
"@material-ui/core": "^4.12.3",
"@material-ui/icons": "^4.11.2",
"@material-ui/lab": "^4.0.0-alpha.60",
"@ogre-tools/linkable": "^15.8.1",
"@sentry/types": "^6.19.7",
"@swc/cli": "^0.1.62",
@ -228,24 +237,14 @@
"@types/url-parse": "^1.4.8",
"@types/uuid": "^8.3.4",
"@types/webpack": "^5.28.1",
"@types/webpack-dev-server": "^4.7.2",
"@types/webpack-env": "^1.18.0",
"@types/webpack-node-externals": "^2.5.3",
"@typescript-eslint/eslint-plugin": "^5.59.1",
"@typescript-eslint/parser": "^5.59.1",
"adr": "^1.4.3",
"ansi_up": "^5.2.1",
"chalk": "^4.1.2",
"chart.js": "^2.9.4",
"circular-dependency-plugin": "^5.2.2",
"color": "^3.2.1",
"command-line-args": "^5.2.1",
"concurrently": "^7.6.0",
"cross-env": "^7.0.3",
"css-loader": "^6.7.3",
"deepdash": "^5.3.9",
"dompurify": "^2.4.4",
"electron": "^22.3.7",
"electron-builder": "^23.6.0",
"esbuild": "^0.17.8",
"esbuild-loader": "^2.21.0",
@ -257,54 +256,34 @@
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-unused-imports": "^2.0.0",
"fork-ts-checker-webpack-plugin": "^7.3.0",
"identity-obj-proxy": "^3.0.0",
"ignore-loader": "^0.1.2",
"include-media": "^1.4.9",
"include-media": "^1.4.10",
"jest": "^29.5.0",
"jest-canvas-mock": "^2.3.1",
"jest-environment-jsdom": "^28.1.3",
"jest-mock-extended": "^2.0.9",
"make-plural": "^6.2.2",
"memfs": "^3.5.1",
"memorystream": "^0.3.1",
"mini-css-extract-plugin": "^2.7.2",
"mock-http": "^1.1.0",
"monaco-editor": "^0.38.0",
"monaco-editor-webpack-plugin": "^7.0.1",
"node-gyp": "^8.3.0",
"node-loader": "^2.0.0",
"nodemon": "^2.0.20",
"postcss": "^8.4.23",
"postcss-loader": "^6.2.1",
"query-string": "^7.1.3",
"randomcolor": "^0.6.2",
"react-beautiful-dnd": "^13.1.1",
"react-refresh": "^0.14.0",
"react-refresh-typescript": "^2.0.7",
"react-router-dom": "^5.3.4",
"react-select": "^5.7.0",
"react-select-event": "^5.5.1",
"react-table": "^7.8.0",
"react-window": "^1.8.8",
"rimraf": "^4.4.1",
"sass": "^1.62.1",
"sass-loader": "^12.6.0",
"style-loader": "^3.3.1",
"tailwindcss": "^3.3.2",
"ts-loader": "^9.4.2",
"ts-node": "^10.9.1",
"type-fest": "^2.14.0",
"typed-emitter": "^1.4.0",
"typedoc": "^0.24.6",
"typedoc-plugin-markdown": "^3.15.1",
"typescript": "^4.9.5",
"typescript-plugin-css-modules": "^3.4.0",
"typescript-plugin-css-modules": "^5.0.1",
"webpack": "^5.81.0",
"webpack-cli": "^4.9.2",
"webpack-dev-server": "^4.13.3",
"webpack-node-externals": "^3.0.0",
"xterm": "4.19.0",
"xterm-addon-fit": "^0.7.0"
"webpack-node-externals": "^3.0.0"
},
"peerDependencies": {
"@k8slens/application": "^6.5.0-alpha.0",
@ -316,11 +295,16 @@
"@k8slens/kubectl-versions": "^1.0.0-alpha.0",
"@k8slens/legacy-extensions": "^1.0.0-alpha.0",
"@k8slens/legacy-global-di": "^1.0.0-alpha.0",
"@k8slens/list-layout": "^1.0.0-alpha.4",
"@k8slens/logger": "^1.0.0-alpha.5",
"@k8slens/messaging": "^1.0.0-alpha.1",
"@k8slens/messaging-for-main": "^1.0.0-alpha.1",
"@k8slens/messaging-for-renderer": "^1.0.0-alpha.1",
"@k8slens/metrics": "^6.5.0-alpha.7",
"@k8slens/node-fetch": "^6.5.0-alpha.3",
"@k8slens/react-application": "^1.0.0-alpha.5",
"@k8slens/resizing-anchor": "^1.0.0-alpha.5",
"@k8slens/resource-templates": "^1.0.0-alpha.1",
"@k8slens/routing": "^1.0.0-alpha.5",
"@k8slens/run-many": "^1.0.0-alpha.1",
"@k8slens/startable-stoppable": "^1.0.0-alpha.1",
@ -332,23 +316,10 @@
"@ogre-tools/injectable-extension-for-auto-registration": "^15.8.1",
"@ogre-tools/injectable-extension-for-mobx": "^15.8.1",
"@ogre-tools/injectable-react": "^15.8.1",
"@types/byline": "^4.2.33",
"@types/chart.js": "^2.9.36",
"@types/color": "^3.0.3",
"@types/crypto-js": "^3.1.47",
"@types/lodash": "^4.14.191",
"@types/proper-lockfile": "^4.1.2",
"@types/react-dom": "^17.0.16",
"@types/react-router-dom": "^5.3.3",
"@types/react-virtualized-auto-sizer": "^1.0.1",
"@types/react-window": "^1.8.5",
"@types/tar": "^6.1.4",
"@types/tcp-port-used": "^1.0.1",
"@types/url-parse": "^1.4.8",
"@types/uuid": "^8.3.4",
"monaco-editor": "^0.38.0",
"react-select": "^5.7.0",
"typed-emitter": "^1.4.0",
"xterm-addon-fit": "^0.7.0"
"mobx": "^6.9.0",
"mobx-observable-history": "^2.0.3",
"mobx-react": "^7.6.0",
"mobx-utils": "^6.0.4",
"monaco-editor": "^0.38.0"
}
}

2
packages/extension-api/package.json
View File

@ -42,7 +42,7 @@
"typedoc": "^0.24.6",
"typedoc-plugin-markdown": "^3.15.1",
"typescript": "^4.9.5",
"typescript-plugin-css-modules": "^4.1.1",
"typescript-plugin-css-modules": "^5.0.1",
"webpack": "^5.81.0",
"webpack-cli": "^5.0.1"
}

3
packages/generate-tray-icons/package.json
View File

@ -22,8 +22,7 @@
"@swc/core": "^1.3.53",
"@types/jsdom": "^20.0.1",
"@types/node": "^16.18.25",
"@types/sharp": "^0.31.1",
"rimraf": "^4.4.1"
"@types/sharp": "^0.31.1"
},
"dependencies": {
"arg": "^5.0.2",

6
packages/infrastructure/typescript/package.json
View File

@ -19,7 +19,9 @@
"license": "MIT",
"homepage": "https://github.com/lensapp/lens",
"dependencies": {
"typescript": "^4.9.3",
"typescript-plugin-css-modules": "^3.4.0"
"typescript": "^4.9.3"
},
"devDependencies": {
"typescript-plugin-css-modules": "^5.0.1"
}
}

3
packages/utility-features/utilities/package.json
View File

@ -48,7 +48,6 @@
"@types/react-router": "^5.1.20",
"@types/readable-stream": "^2.3.15",
"@types/semver": "^7.3.13",
"@types/tar": "^6.1.4",
"type-fest": "^2.14.0"
"@types/tar": "^6.1.4"
}
}

39
scripts/lint-package-dependencies.sh Executable file
View File

@ -0,0 +1,39 @@
#!/bin/bash
set -e
PACKAGE_JSON_PATHS=$(find open-lens/* packages/* -type f -name package.json -not -path "*/node_modules/*")
exitCode=0
while IFS= read -r PACKAGE_JSON_PATH; do
PACKAGE_NAME=$(<"${PACKAGE_JSON_PATH}" jq .name)
RAW_PACKAGE_DEPENDENCIES=$(<"${PACKAGE_JSON_PATH}" jq -r '.dependencies // {} | keys | .[]')
PACKAGE_DEPENDENCIES=$(echo "${RAW_PACKAGE_DEPENDENCIES}" | sort)
RAW_PACKAGE_DEV_DEPENDENCIES=$(<"${PACKAGE_JSON_PATH}" jq -r '.devDependencies // {} | keys | .[]')
PACKAGE_DEV_DEPENDENCIES=$(echo "${RAW_PACKAGE_DEV_DEPENDENCIES}" | sort)
RAW_PACKAGE_PEER_DEPENDENCIES=$(<"${PACKAGE_JSON_PATH}" jq -r '.peerDependencies // {} | keys | .[]')
PACKAGE_PEER_DEPENDENCIES=$(echo "${RAW_PACKAGE_PEER_DEPENDENCIES}" | sort)
DUPLICATES_BETWEEN_DEPS_AND_DEV_DEPS=$(comm -12 <(echo "${PACKAGE_DEPENDENCIES}") <(echo "${PACKAGE_DEV_DEPENDENCIES}"))
DUPLICATES_BETWEEN_DEPS_AND_PEER_DEPS=$(comm -12 <(echo "${PACKAGE_DEPENDENCIES}") <(echo "${PACKAGE_PEER_DEPENDENCIES}"))
DUPLICATES_BETWEEN_DEV_DEPS_AND_PEER_DEPS=$(comm -12 <(echo "${PACKAGE_DEV_DEPENDENCIES}") <(echo "${PACKAGE_PEER_DEPENDENCIES}"))
if [[ "${DUPLICATES_BETWEEN_DEPS_AND_DEV_DEPS}" != "" ]]; then
echo "ERROR: ${PACKAGE_NAME} has duplicate dependencies and devDependencies: ${DUPLICATES_BETWEEN_DEPS_AND_DEV_DEPS}"
exitCode=1
fi
if [[ "${DUPLICATES_BETWEEN_DEPS_AND_PEER_DEPS}" != "" ]]; then
echo "ERROR: ${PACKAGE_NAME} has duplicate dependencies and peerDependencies: ${DUPLICATES_BETWEEN_DEPS_AND_PEER_DEPS}"
exitCode=1
fi
if [[ "${DUPLICATES_BETWEEN_DEV_DEPS_AND_PEER_DEPS}" != "" ]]; then
echo "ERROR: ${PACKAGE_NAME} has duplicate devDependencies and peerDependencies: ${DUPLICATES_BETWEEN_DEV_DEPS_AND_PEER_DEPS}"
exitCode=1
fi
done <<< "${PACKAGE_JSON_PATHS}"
exit "${exitCode}"

2
scripts/lint-publish-configs.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
set -e
PACKAGE_JSON_PATHS=$(find packages/* -type f -name package.json -not -path "*/node_modules/*")
PACKAGE_JSON_PATHS=$(find open-lens/* packages/* -type f -name package.json -not -path "*/node_modules/*")
exitCode=0
while IFS= read -r PACKAGE_JSON_PATH; do