Remove codemirror

brimdata · Jul 29, 2023 · 28f7ff0 · 28f7ff0
1 parent 6930d60
commit 28f7ff0
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 505 deletions.
diff --git a/apps/zui/package.json b/apps/zui/package.json
@@ -39,17 +39,6 @@
     "@babel/core": "^7.17.9",
     "@brimdata/zed-js": "workspace:*",
     "@brimdata/zed-node": "workspace:*",
-    "@codemirror/autocomplete": "^0.19.15",
-    "@codemirror/closebrackets": "^0.19.1",
-    "@codemirror/commands": "^0.19.8",
-    "@codemirror/comment": "^0.19.1",
-    "@codemirror/fold": "^0.19.3",
-    "@codemirror/gutter": "^0.19.9",
-    "@codemirror/highlight": "^0.19.7",
-    "@codemirror/history": "^0.19.2",
-    "@codemirror/rectangular-selection": "^0.19.1",
-    "@codemirror/search": "^0.19.9",
-    "@codemirror/state": "^0.19.9",
     "@js-joda/core": "^3.2.0",
     "@reduxjs/toolkit": "^1.9.3",
     "@swc/cli": "^0.1.55",

diff --git a/apps/zui/project.json b/apps/zui/project.json
@@ -4,7 +4,7 @@
   "sourceRoot": "apps/zui",
   "projectType": "app",
   "targets": {
-    "lint:types": {
+    "tsc": {
       "executor": "@nrwl/js:tsc",
       "outputs": ["{options.outputPath}"],
       "options": {
@@ -17,6 +17,7 @@
     "lint": {
       "executor": "@nrwl/linter:eslint",
       "outputs": ["{options.outputFile}"],
+      "dependsOn": ["tsc"],
       "options": {
         "lintFilePatterns": ["apps/zui/**/*.ts", "apps/zui/**/*.tsx"]
       }

diff --git a/apps/zui/src/app/query-home/search-area/Input.tsx b/apps/zui/src/app/query-home/search-area/Input.tsx
diff --git a/apps/zui/src/app/query-home/search-area/editor/query-editor.tsx b/apps/zui/src/app/query-home/search-area/editor/query-editor.tsx
diff --git a/apps/zui/src/app/query-home/search-area/editor/theme.ts b/apps/zui/src/app/query-home/search-area/editor/theme.ts
diff --git a/apps/zui/src/app/query-home/search-area/editor/use-editor-view.ts b/apps/zui/src/app/query-home/search-area/editor/use-editor-view.ts
diff --git a/apps/zui/src/app/query-home/search-area/editor/use-extensions.ts b/apps/zui/src/app/query-home/search-area/editor/use-extensions.ts
diff --git a/apps/zui/src/js/initializers/init-monaco.ts b/apps/zui/src/js/initializers/init-monaco.ts
@@ -130,7 +130,7 @@ const builtinAggFuncs = [
 
 const operators = ["+", "-", "*", "/", ">", ">=", "<", "<=", "=", ":="]
 
-const symbols = /[+\-*\/><=:]+/
+const symbols = /[+\-*/><=:]+/
 
 const identifier = /[a-zA-Z][\w$]*/
 
@@ -163,7 +163,7 @@ const integerRule = [/\d+/, "number"]
 const floatRule = [/\d*\.\d+/, "number.float"]
 const stringRule = [/("[^"]*")|('[^']*')/, "string"]
 const commentRule = [/\/\/.*/, "comment"]
-const bracketRule = [/[{}()\[\]]/, "@brackets"]
+const bracketRule = [/[{}()[]]/, "@brackets"]
 
 export async function initializeMonaco() {
   const monaco = await loader.init()