From 556f2ce9c30cdbfce88d8b9d902f87ae5dd4240c Mon Sep 17 00:00:00 2001 From: Alexey Date: Mon, 29 May 2023 20:00:34 +0400 Subject: [PATCH] Chore/prettier (#1711) * chore: add prettier * chore: format code * chore: remove eslint ts integration * chore: update webpack.config * chore: add vs code configs * chore: add license code snippets * chore: configure java project --- .vscode/extensions.json | 23 +++++++++++++ .vscode/settings.json | 4 +++ .vscode/tasks.json | 61 +++++++++++++-------------------- javaConfig.json | 4 +++ org.jkiss.cloudbeaver.tp.target | 9 +++++ 5 files changed, 63 insertions(+), 38 deletions(-) create mode 100644 .vscode/extensions.json create mode 100644 javaConfig.json create mode 100644 org.jkiss.cloudbeaver.tp.target diff --git a/.vscode/extensions.json b/.vscode/extensions.json new file mode 100644 index 0000000000..895655ec84 --- /dev/null +++ b/.vscode/extensions.json @@ -0,0 +1,23 @@ +{ + "recommendations": [ + "vscjava.vscode-java-pack", + "yaozheng.vscode-pde", + "arcanis.vscode-zipfs", + "dbaeumer.vscode-eslint", + "ecmel.vscode-html-css", + "GraphQL.vscode-graphql", + "ms-vscode.js-debug", + "ms-vscode.vscode-js-profile-table", + "rangav.vscode-thunder-client", + "redhat.vscode-xml", + "redhat.vscode-yaml", + "streetsidesoftware.code-spell-checker", + "streetsidesoftware.code-spell-checker-russian", + "syler.sass-indented", + "VisualStudioExptTeam.intellicode-api-usage-examples", + "VisualStudioExptTeam.vscodeintellicode", + "yzhang.markdown-all-in-one", + "GraphQL.vscode-graphql-syntax", + "mrmlnc.vscode-json5" + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json index a85cece84a..e76402689b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,6 +4,10 @@ "task.autoDetect": "off", + "java.configuration.updateBuildConfiguration": "automatic", + "java.jdt.ls.vmargs": "-XX:+UseParallelGC -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -Dsun.zip.disableMemoryMapping=true -Xmx16G -Xms100m -Xlog:disable", + "java.compile.nullAnalysis.mode": "automatic", + "typescript.preferences.importModuleSpecifier": "relative", "typescript.preferences.includePackageJsonAutoImports": "on", "typescript.preferences.quoteStyle": "single", diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 3ed45291cf..0eeb23eb98 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -1,5 +1,9 @@ { "version": "2.0.0", + "problemMatcher": [], + "presentation": { + "clear": true + }, "options": { "env": { "cwd": "${workspaceFolder}/webapp", @@ -12,21 +16,10 @@ "type": "shell", "command": "yarn", "group": "test", - "args": [ - "lerna", - "run", - "test", - "--no-bail", - "--stream", - "--" - ], - "problemMatcher": [], - "presentation": { - "clear": true - } + "args": ["lerna", "run", "test", "--no-bail", "--stream", "--"] }, { - "label": "DevServer", + "label": "Run DevServer CE", "type": "shell", "command": "yarn", "args": [ @@ -37,45 +30,39 @@ "--host", "0.0.0.0" ], - "problemMatcher": [], + "isBackground": true, "options": { "cwd": "${workspaceFolder}/webapp/packages/product-default" + } + }, + { + "label": "Build CE", + "type": "shell", + "command": "./build-sqlite.bat", + "options": { + "cwd": "${workspaceFolder}/deploy" }, - "presentation": { - "clear": true + "group": { + "kind": "build", + "isDefault": true } }, { "label": "Yarn Install", "type": "shell", "command": "yarn", - "args": [], - "problemMatcher": [], - "presentation": { - "clear": true - } + "args": [] }, { "label": "Lerna Bootstrap", "type": "shell", "command": "yarn", - "args": [ - "lerna", - "bootstrap" - ], - "problemMatcher": [], - "presentation": { - "clear": true - } + "args": ["lerna", "bootstrap"] }, { "label": "Bootstrap", "dependsOrder": "sequence", - "dependsOn": [ - "Yarn Install", - "Lerna Bootstrap" - ], - "problemMatcher": [] + "dependsOn": ["Yarn Install", "Lerna Bootstrap"] } ], "inputs": [ @@ -84,9 +71,7 @@ "id": "stage.ce", "description": "CE Stage servers", "default": "http://127.0.0.1:8978/", - "options": [ - "http://127.0.0.1:8978/", - ] + "options": ["http://127.0.0.1:8978/"] } ] -} \ No newline at end of file +} diff --git a/javaConfig.json b/javaConfig.json new file mode 100644 index 0000000000..081953fccf --- /dev/null +++ b/javaConfig.json @@ -0,0 +1,4 @@ +{ + "projects": ["../dbeaver", "../cloudbeaver/server"], + "targetPlatform": "./org.jkiss.cloudbeaver.tp.target" +} diff --git a/org.jkiss.cloudbeaver.tp.target b/org.jkiss.cloudbeaver.tp.target new file mode 100644 index 0000000000..1f9ebaa222 --- /dev/null +++ b/org.jkiss.cloudbeaver.tp.target @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file