Merge pull request #65 from alirezamirian/2024-12

2024 12
alirezamirian · Dec 13, 2024 · 594d1fe · 594d1fe
2 parents 6de51ab + b3123b7
commit 594d1fe
Show file tree

Hide file tree

Showing 60 changed files with 2,365 additions and 1,242 deletions.
diff --git a/package.json b/package.json
@@ -20,7 +20,7 @@
   "devDependencies": {
     "@babel/eslint-parser": "^7.18.9",
     "@microsoft/api-extractor": "^7.25.0",
-    "@parcel/packager-ts": "^2.8.3",
+    "@parcel/packager-ts": "2.8.3",
     "@parcel/transformer-typescript-types": "2.8.3",
     "@typescript-eslint/eslint-plugin": "^5.30.7",
     "@typescript-eslint/parser": "^5.30.7",
@@ -34,7 +34,7 @@
     "eslint-plugin-no-only-tests": "^3.1.0",
     "eslint-plugin-react": "^7.30.1",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "parcel": "^2.8.3",
+    "parcel": "2.8.3",
     "prettier": "^2.8.1",
     "typescript": "4.7.4"
   },

diff --git a/packages/example-app/package.json b/packages/example-app/package.json
@@ -11,8 +11,11 @@
     "build": "../../node_modules/.bin/parcel build"
   },
   "source": "src/index.html",
+  "//alias": "Nested imports from @intellij-platform/core/* are not a part of public API and are listed individually here, until it's clearer if they should be a part of the public API",
   "alias": {
     "caf": "caf/dist/esm/index.mjs",
+    "@intellij-platform/core/utils/usePrevious": "@intellij-platform/core/src/utils/usePrevious",
+    "@intellij-platform/core/Menu/StyledMenu": "@intellij-platform/core/src/Menu/StyledMenu",
     "@intellij-platform/core/utils/tree-utils": "@intellij-platform/core/src/utils/tree-utils",
     "@intellij-platform/core/utils/array-utils": "@intellij-platform/core/src/utils/array-utils",
     "@intellij-platform/core/utils/useEventCallback": "@intellij-platform/core/src/utils/useEventCallback",
@@ -23,7 +26,7 @@
   "dependencies": {
     "@intellij-platform/core": "workspace:^",
     "@isomorphic-git/lightning-fs": "^4.6.0",
-    "@monaco-editor/react": "^4.2.2",
+    "@monaco-editor/react": "^4.6.0",
     "@recoiljs/refine": "^0.1.1",
     "browserfs": "^2.0.0",
     "caf": "^15.0.0-preB",
@@ -32,7 +35,7 @@
     "fast-xml-parser": "^4.2.7",
     "intl-messageformat": "^9.11.2",
     "isomorphic-git": "^1.24.3",
-    "monaco-editor": "^0.28.1",
+    "monaco-editor": "^0.52.0",
     "pify": "^5.0.0",
     "ramda": "^0.27.1",
     "react": "17",

diff --git a/packages/example-app/src/Editor/Editor.tsx b/packages/example-app/src/Editor/Editor.tsx
@@ -30,25 +30,29 @@ export const Editor = (props: Omit<EditorProps, "theme">) => {
   return (
     <StyledEditor
       {...props}
-      options={{
-        minimap: { enabled: false },
-        lineHeight: 22,
-        showFoldingControls: "always",
-        renderIndentGuides: true,
-        overviewRulerBorder: false,
-        fontFamily: "JetBrains Mono",
-        fontSize,
-        scrollbar: {
-          verticalScrollbarSize: 14,
-          horizontalScrollbarSize: 8,
-          verticalSliderSize: 8,
-          horizontalSliderSize: 8,
-          horizontal: "auto",
-          vertical: "visible",
-          alwaysConsumeMouseWheel: false, // to let example-app be rendered as a part of a page.
-        },
-        ...props.options,
-      }}
+      options={
+        {
+          minimap: { enabled: false },
+          lineHeight: 22,
+          showFoldingControls: "always",
+          guides: {
+            indentation: true,
+          },
+          overviewRulerBorder: false,
+          fontFamily: "JetBrains Mono",
+          fontSize,
+          scrollbar: {
+            verticalScrollbarSize: 14,
+            horizontalScrollbarSize: 8,
+            verticalSliderSize: 8,
+            horizontalSliderSize: 8,
+            horizontal: "auto",
+            vertical: "visible",
+            alwaysConsumeMouseWheel: false, // to let example-app be rendered as a part of a page.
+          },
+          ...props.options,
+        } as EditorProps["options"]
+      }
       theme={editorTheme as any} // FIXME
     />
   );