From 81266f9fcba91f375eb8feb261966904863f59af Mon Sep 17 00:00:00 2001 From: Wroud Date: Thu, 18 Nov 2021 21:22:39 +0300 Subject: [PATCH] build: CB-1204 remove unused dependencies --- .../configs/webpack.product.config.js | 4 +--- .../packages/plugin-codemirror/package.json | 8 ++----- .../plugin-codemirror/src/formatValue.ts | 14 ++--------- .../plugin-codemirror/src/useAutoFormat.ts | 10 +------- webapp/yarn.lock | 24 ------------------- 5 files changed, 6 insertions(+), 54 deletions(-) diff --git a/webapp/packages/core-cli/configs/webpack.product.config.js b/webapp/packages/core-cli/configs/webpack.product.config.js index 7c2decab5c..8b40e7d8ed 100644 --- a/webapp/packages/core-cli/configs/webpack.product.config.js +++ b/webapp/packages/core-cli/configs/webpack.product.config.js @@ -33,9 +33,7 @@ const excludedFromVendor = [ 'svg-tag-names', 'html-tags', 'codemirror', - 'react-codemirror2', - 'prettier', - 'sql-formatter' + 'react-codemirror2' ] const timestampVersion = withTimestamp(package.version) diff --git a/webapp/packages/plugin-codemirror/package.json b/webapp/packages/plugin-codemirror/package.json index 6136e7ec61..8c6e7b9d21 100644 --- a/webapp/packages/plugin-codemirror/package.json +++ b/webapp/packages/plugin-codemirror/package.json @@ -16,14 +16,10 @@ }, "dependencies": { "codemirror": "^5.63.3", - "react-codemirror2": "^7.2.1", - "prettier": "^2.4.1", - "sql-formatter": "^4.0.2" + "react-codemirror2": "^7.2.1" }, "devDependencies": { - "@types/codemirror": "^5.60.5", - "@types/prettier": "^2.4.1", - "@types/sql-formatter": "^4.0.1" + "@types/codemirror": "^5.60.5" }, "peerDependencies": { "@cloudbeaver/core-administration": "^0.1.0", diff --git a/webapp/packages/plugin-codemirror/src/formatValue.ts b/webapp/packages/plugin-codemirror/src/formatValue.ts index eb30425829..a33d051722 100644 --- a/webapp/packages/plugin-codemirror/src/formatValue.ts +++ b/webapp/packages/plugin-codemirror/src/formatValue.ts @@ -12,19 +12,9 @@ export async function formatValue(value: string, mode: string | undefined): Prom case 'application/json': return JSON.stringify(JSON.parse(value), null, 2); case 'text/html': - case 'text/xml': { - const prettier = await import('prettier'); - const parserHTML = await import('prettier/parser-html'); - - return prettier.format(value, { - plugins: [parserHTML], - }); - } + case 'text/xml': + return value; default: - if (!mode || mode.includes('sql')) { - const { format } = await import('sql-formatter'); - return format(value); - } return value; } } catch { diff --git a/webapp/packages/plugin-codemirror/src/useAutoFormat.ts b/webapp/packages/plugin-codemirror/src/useAutoFormat.ts index 1ff435bac5..bc50c633ff 100644 --- a/webapp/packages/plugin-codemirror/src/useAutoFormat.ts +++ b/webapp/packages/plugin-codemirror/src/useAutoFormat.ts @@ -7,9 +7,6 @@ */ import type { ModeSpec } from 'codemirror'; -import prettier from 'prettier'; -import parserHTML from 'prettier/parser-html'; -import { format as formatSQL } from 'sql-formatter'; import { useObjectRef } from '@cloudbeaver/core-blocks'; @@ -30,13 +27,8 @@ export function useAutoFormat(mode: string | ModeSpec | undefined) { return JSON.stringify(JSON.parse(value), null, 2); case 'text/xml': case 'text/html': - return prettier.format(value, { - plugins: [parserHTML], - }); + return value; default: - if (this.mode.includes('sql')) { - return formatSQL(value); - } return value; } } catch { diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 2260e1c6d9..20fdf48e2f 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -3308,11 +3308,6 @@ resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== -"@types/prettier@^2.4.1": - version "2.4.1" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.4.1.tgz#e1303048d5389563e130f5bdd89d37a99acb75eb" - integrity sha512-Fo79ojj3vdEZOHg3wR9ksAMRz4P3S5fDB5e/YWZiFnyFQI1WY2Vftu9XoXVVtJfxB7Bpce/QTqWSSntkz2Znrw== - "@types/prop-types@*": version "15.7.3" resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7" @@ -3366,13 +3361,6 @@ resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== -"@types/sql-formatter@^4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@types/sql-formatter/-/sql-formatter-4.0.1.tgz#3c15dc3e50335e7909d6c01f1a4fd66da05e82a3" - integrity sha512-WLSHjarjiUz4GtQivyaDbagqJNHcFA1XOAvrgXmWLl1OeTCP0RuiFB1PtUIH4ArOqZX1Hk6ANzABWe6nw9nKpg== - dependencies: - sql-formatter "*" - "@types/tern@*": version "0.23.4" resolved "https://registry.yarnpkg.com/@types/tern/-/tern-0.23.4.tgz#03926eb13dbeaf3ae0d390caf706b2643a0127fb" @@ -11064,11 +11052,6 @@ prettier@1.18.2: resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.18.2.tgz#6823e7c5900017b4bd3acf46fe9ac4b4d7bda9ea" integrity sha512-OeHeMc0JhFE9idD4ZdtNibzY0+TPHSpSSb9h8FqtP+YnoZZ1sl8Vc9b1sasjfymH3SonAF4QcA2+mzHPhMvIiw== -prettier@^2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.4.1.tgz#671e11c89c14a4cfc876ce564106c4a6726c9f5c" - integrity sha512-9fbDAXSBcc6Bs1mZrDYb3XKzDLm4EXXL9sC1LqKP5rZkT6KRr/rf9amVUcODVXgguK/isJz0d0hP72WeaKWsvA== - pretty-error@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-4.0.0.tgz#90a703f46dd7234adb46d0f84823e9d1cb8f10d6" @@ -12514,13 +12497,6 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= -sql-formatter@*, sql-formatter@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/sql-formatter/-/sql-formatter-4.0.2.tgz#2b359e5a4c611498d327b9659da7329d71724607" - integrity sha512-R6u9GJRiXZLr/lDo8p56L+OyyN2QFJPCDnsyEOsbdIpsnDKL8gubYFo7lNR7Zx7hfdWT80SfkoVS0CMaF/DE2w== - dependencies: - argparse "^2.0.1" - sshpk@^1.7.0: version "1.16.1" resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877"