Updated to next (0.13.0-next.83c59134) Theia.

Signed-off-by: Akos Kitta <kittaakos@typefox.io>
This commit is contained in:
Akos Kitta 2019-11-05 17:29:45 +01:00
parent f6444b2570
commit 2dc73eb3b5
6 changed files with 1327 additions and 1318 deletions

View File

@ -58,7 +58,7 @@
"rimraf": "^2.6.1", "rimraf": "^2.6.1",
"shelljs": "^0.8.3", "shelljs": "^0.8.3",
"tslint": "^5.5.0", "tslint": "^5.5.0",
"typescript": "2.9.1", "typescript": "3.5.3",
"uuid": "^3.2.1", "uuid": "^3.2.1",
"yargs": "^11.1.0" "yargs": "^11.1.0"
}, },

View File

@ -158,7 +158,7 @@ export default new ContainerModule((bind: interfaces.Bind, unbind: interfaces.Un
}).inSingletonScope(); }).inSingletonScope();
// The workspace service extension // The workspace service extension
bind(WorkspaceServiceExt).to(WorkspaceServiceExtImpl).inSingletonScope().onActivation(({ container }, workspaceServiceExt) => { bind(WorkspaceServiceExt).to(WorkspaceServiceExtImpl).inSingletonScope().onActivation(({ container }, workspaceServiceExt: WorkspaceServiceExt) => {
WebSocketConnectionProvider.createProxy(container, WorkspaceServiceExtPath, workspaceServiceExt); WebSocketConnectionProvider.createProxy(container, WorkspaceServiceExtPath, workspaceServiceExt);
// Eagerly active the core, library, and boards services. // Eagerly active the core, library, and boards services.
container.get(CoreService); container.get(CoreService);

View File

@ -22,8 +22,7 @@
"arduino-ide-extension": "0.0.2" "arduino-ide-extension": "0.0.2"
}, },
"devDependencies": { "devDependencies": {
"@theia/cli": "next", "@theia/cli": "next"
"electron": "^4.2.0"
}, },
"scripts": { "scripts": {
"prepare": "theia build --mode development", "prepare": "theia build --mode development",

View File

@ -27,14 +27,12 @@
"url": "git+https://github.com/arduino/arduino-pro-ide.git" "url": "git+https://github.com/arduino/arduino-pro-ide.git"
}, },
"// Notes:": [ "// Notes:": [
"The `electronVersion` version was pinned for `@grpc/grpc-js` -> Node.js version constraints.",
"`google-protobuf` was declared as it is not picked up by the `electron-builder` as a runtime dependency.", "`google-protobuf` was declared as it is not picked up by the `electron-builder` as a runtime dependency.",
"The resolution for `fs-extra` was required due to this: https://spectrum.chat/theia/general/our-theia-electron-builder-app-no-longer-starts~f5cf09a0-6d88-448b-8818-24ad0ec2ee7c" "The resolution for `fs-extra` was required due to this: https://spectrum.chat/theia/general/our-theia-electron-builder-app-no-longer-starts~f5cf09a0-6d88-448b-8818-24ad0ec2ee7c"
], ],
"build": { "build": {
"productName": "Arduino Pro IDE", "productName": "Arduino Pro IDE",
"appId": "arduino.Pro.IDE", "appId": "arduino.Pro.IDE",
"electronVersion": "4.2.0",
"asar": false, "asar": false,
"directories": { "directories": {
"buildResources": "resources" "buildResources": "resources"
@ -46,7 +44,6 @@
"!node_modules/**/*.spec.js", "!node_modules/**/*.spec.js",
"!node_modules/@theia/**/test/*", "!node_modules/@theia/**/test/*",
"!node_modules/@theia/**/src/*.ts", "!node_modules/@theia/**/src/*.ts",
"!node_modules/@theia/java/download",
"!node_modules/@theia/**/lib/*browser/*", "!node_modules/@theia/**/lib/*browser/*",
"!node_modules/@typefox/monaco-editor-core/*", "!node_modules/@typefox/monaco-editor-core/*",
"!node_modules/oniguruma/*", "!node_modules/oniguruma/*",

View File

@ -1,25 +1,25 @@
{ {
"name": "arduino-editor", "name": "arduino-editor",
"version": "0.0.1", "version": "0.0.1",
"description": "Arduino IDE built using Eclipse Theia", "description": "Arduino Pro IDE",
"main": "index.js", "main": "index.js",
"repository": "https://github.com/bcmi-labs/arduino-editor.git", "repository": "https://github.com/bcmi-labs/arduino-editor.git",
"author": "Christian Weichel <christian.weichel@typefox.io>", "author": "Arduino SA",
"license": "MIT", "license": "MIT",
"private": true, "private": true,
"devDependencies": { "devDependencies": {
"lerna": "^3.13.3" "lerna": "^3.13.3"
}, },
"scripts": { "scripts": {
"prepare": "lerna run prepare", "prepare": "lerna run prepare",
"rebuild:browser": "theia rebuild:browser", "rebuild:browser": "theia rebuild:browser",
"rebuild:electron": "theia rebuild:electron", "rebuild:electron": "theia rebuild:electron",
"start": "yarn --cwd ./browser-app start", "start": "yarn --cwd ./browser-app start",
"watch": "lerna run watch --parallel" "watch": "lerna run watch --parallel"
}, },
"workspaces": [ "workspaces": [
"arduino-ide-extension", "arduino-ide-extension",
"electron-app", "electron-app",
"browser-app" "browser-app"
] ]
} }

2617
yarn.lock

File diff suppressed because it is too large Load Diff