Merge pull request #34 from CodeRibbon/switching-to-lumino

phosphor to lumino

Author: robobenklein

.pre-commit-config.yaml

@@ -0,0 +1,12 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.5.0
+    hooks:
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+      - id: check-json
+      - id: check-merge-conflict
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v3.1.0
+    hooks:
+      - id: prettier

.prettierrc.cjs

@@ -0,0 +1,10 @@
+module.exports = {
+  semi: true,
+  singleQuote: false,
+  tabWidth: 2,
+  useTabs: false,
+  trailingComma: "all",
+  objectWrap: "preserve",
+  requirePragma: true,
+  endOfLine: "lf",
+};

BUILDING.md

@@ -1,6 +1,5 @@
+Build process is not finalized yet, currently only Appimage is built for linux systems.
 
-Build process is not finalized yet, but you can run the full app with extension support enabled.
+It is recommended to build from source for now, see `DEVELOPING.md` first for basic environment setup.
 
-See `DEVELOPING.md` first for basic environment setup.
-
-The sources for the two kinds of builds are in `applications/`, with Electron builds being packaged by electron-builder.
+The sources for the two kinds of builds are `browser-app` and `electron-app`, with Electron builds being packaged by electron-builder.

DEVELOPING.md

@@ -26,7 +26,7 @@ Start watching either type of build you're working with:
     # or
     yarn watch:electron
 
-> right now there seems to be a problem with the 'watch' automatic recompilation, for now just use `build:*` instead.
+> right now there seems to be a problem with the 'watch' automatic recompilation, for now just use `build:*` or `start:*` instead.
 
 To build without watching, use `build:browser` or `build:electron` instead.
 

browser-app/package.json

@@ -3,25 +3,25 @@
   "name": "browser-app",
   "version": "0.0.0",
   "dependencies": {
-    "@theia/core": "1.58.1",
-    "@theia/editor": "1.58.1",
-    "@theia/filesystem": "1.58.1",
-    "@theia/markers": "1.58.1",
-    "@theia/messages": "1.58.1",
-    "@theia/monaco": "1.58.1",
-    "@theia/navigator": "1.58.1",
-    "@theia/plugin-dev": "^1.58.1",
-    "@theia/plugin-ext": "^1.58.1",
-    "@theia/plugin-ext-vscode": "^1.58.1",
-    "@theia/preferences": "1.58.1",
-    "@theia/process": "1.58.1",
-    "@theia/terminal": "1.58.1",
-    "@theia/vsx-registry": "^1.58.1",
-    "@theia/workspace": "1.58.1",
+    "@theia/core": "1.65.0",
+    "@theia/editor": "1.65.0",
+    "@theia/filesystem": "1.65.0",
+    "@theia/markers": "1.65.0",
+    "@theia/messages": "1.65.0",
+    "@theia/monaco": "1.65.0",
+    "@theia/navigator": "1.65.0",
+    "@theia/plugin-dev": "1.65.0",
+    "@theia/plugin-ext": "1.65.0",
+    "@theia/plugin-ext-vscode": "1.65.0",
+    "@theia/preferences": "1.65.0",
+    "@theia/process": "1.65.0",
+    "@theia/terminal": "1.65.0",
+    "@theia/vsx-registry": "1.65.0",
+    "@theia/workspace": "1.65.0",
     "coderibbon-theia": "^0.0.0"
   },
   "devDependencies": {
-    "@theia/cli": "1.58.1"
+    "@theia/cli": "1.65.0"
   },
   "scripts": {
     "bundle": "yarn rebuild && theia build --mode development",
@@ -32,4 +32,4 @@
   "theia": {
     "target": "browser"
   }
-}
+}

coderibbon-theia/package.json

@@ -9,7 +9,7 @@
     "src"
   ],
   "dependencies": {
-    "@theia/core": "1.58.1"
+    "@theia/core": "1.65.0"
   },
   "devDependencies": {
     "less": "^4.1.3",
@@ -28,4 +28,4 @@
       "frontend": "lib/browser/coderibbon-theia-frontend-module"
     }
   ]
-}
+}

coderibbon-theia/src/browser/coderibbon-theia-commands.ts

@@ -1,3 +1,5 @@
+/** @format */
+
 import { injectable, inject } from "@theia/core/shared/inversify";
 
 import {

coderibbon-theia/src/browser/coderibbon-theia-frontend-module.ts

@@ -1,3 +1,5 @@
+/** @format */
+
 import { ContainerModule } from "@theia/core/shared/inversify";
 
 import {
@@ -13,7 +15,7 @@ import {
   // bindViewContribution, WidgetFactory,
   KeybindingContribution,
 } from "@theia/core/lib/browser";
-import { PreferenceContribution } from "@theia/core/lib/browser/preferences";
+import { PreferenceContribution } from "@theia/core/lib/common/preferences";
 import { ApplicationShell } from "@theia/core/lib/browser/shell/application-shell";
 
 // import { CodeRibbonTheiaRibbonViewContribution } from './coderibbon-theia-ribbon';

coderibbon-theia/src/browser/coderibbon-theia-keybinds.ts

@@ -1,3 +1,5 @@
+/** @format */
+
 import { injectable, inject } from "@theia/core/shared/inversify";
 
 // import {

coderibbon-theia/src/browser/coderibbon-theia-manager.ts

@@ -1,6 +1,8 @@
+/** @format */
+
 import { injectable, inject } from "@theia/core/shared/inversify";
 
-import { Widget } from "@phosphor/widgets";
+import { Widget } from "@lumino/widgets";
 import { MessageService } from "@theia/core/lib/common";
 import {
   AbstractViewContribution,
@@ -10,7 +12,7 @@ import {
 import { FrontendApplication } from "@theia/core/lib/browser/frontend-application";
 import { FrontendApplicationStateService } from "@theia/core/lib/browser/frontend-application-state";
 import { ApplicationShell } from "@theia/core/lib/browser/shell/application-shell";
-import { CorePreferences } from "@theia/core/lib/browser/core-preferences";
+import { CorePreferences } from "@theia/core/lib/common/core-preferences";
 
 // import { CodeRibbonApplicationShell } from './cr-application-shell';