Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit 86c7a68

Browse files
author
colin-grant-work
authored
Repo: Uplift to Theia 1.27.0 (#150)
1 parent d537453 commit 86c7a68

File tree

16 files changed

+3701
-3878
lines changed

16 files changed

+3701
-3878
lines changed

configs/base.eslintrc.json

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
}
99
},
1010
"plugins": [
11-
"@theia",
1211
"@typescript-eslint",
1312
"@typescript-eslint/tslint",
1413
"import",

configs/errors.eslintrc.json

-1
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,6 @@
130130
}
131131
}
132132
],
133-
"@theia/shared-dependencies": "error",
134133
"import/no-extraneous-dependencies": "error"
135134
},
136135
"overrides": [

dev-packages/eslint-plugin/index.js

-21
This file was deleted.

dev-packages/eslint-plugin/package.json

-9
This file was deleted.

dev-packages/eslint-plugin/rules/shared-dependencies.js

-171
This file was deleted.

examples/browser/package.json

+17-17
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@
1414
}
1515
},
1616
"dependencies": {
17-
"@theia/core": "1.19.0",
18-
"@theia/cpp-debug": "1.19.0",
19-
"@theia/editor": "1.19.0",
20-
"@theia/file-search": "1.19.0",
21-
"@theia/filesystem": "1.19.0",
22-
"@theia/markers": "1.19.0",
23-
"@theia/messages": "1.19.0",
24-
"@theia/monaco": "1.19.0",
25-
"@theia/navigator": "1.19.0",
26-
"@theia/plugin-ext-vscode": "1.19.0",
27-
"@theia/preferences": "1.19.0",
28-
"@theia/process": "1.19.0",
29-
"@theia/task": "1.19.0",
30-
"@theia/terminal": "1.19.0",
31-
"@theia/typehierarchy": "1.19.0",
32-
"@theia/workspace": "1.19.0"
17+
"@theia/core": "1.27.0",
18+
"@theia/cpp-debug": "1.27.0",
19+
"@theia/editor": "1.27.0",
20+
"@theia/file-search": "1.27.0",
21+
"@theia/filesystem": "1.27.0",
22+
"@theia/markers": "1.27.0",
23+
"@theia/messages": "1.27.0",
24+
"@theia/monaco": "1.27.0",
25+
"@theia/navigator": "1.27.0",
26+
"@theia/plugin-ext-vscode": "1.27.0",
27+
"@theia/preferences": "1.27.0",
28+
"@theia/process": "1.27.0",
29+
"@theia/task": "1.27.0",
30+
"@theia/terminal": "1.27.0",
31+
"@theia/typehierarchy": "1.27.0",
32+
"@theia/workspace": "1.27.0"
3333
},
3434
"scripts": {
3535
"prepare": "yarn run clean && yarn build",
@@ -45,6 +45,6 @@
4545
"coverage:clean": "rimraf .nyc_output && rimraf coverage"
4646
},
4747
"devDependencies": {
48-
"@theia/cli": "1.19.0"
48+
"@theia/cli": "1.27.0"
4949
}
5050
}

examples/electron/package.json

+19-18
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@
1414
}
1515
},
1616
"dependencies": {
17-
"@theia/core": "1.19.0",
18-
"@theia/cpp-debug": "1.19.0",
19-
"@theia/editor": "1.19.0",
20-
"@theia/electron": "1.19.0",
21-
"@theia/file-search": "1.19.0",
22-
"@theia/filesystem": "1.19.0",
23-
"@theia/markers": "1.19.0",
24-
"@theia/messages": "1.19.0",
25-
"@theia/monaco": "1.19.0",
26-
"@theia/navigator": "1.19.0",
27-
"@theia/plugin-ext-vscode": "1.19.0",
28-
"@theia/preferences": "1.19.0",
29-
"@theia/process": "1.19.0",
30-
"@theia/task": "1.19.0",
31-
"@theia/terminal": "1.19.0",
32-
"@theia/typehierarchy": "1.19.0",
33-
"@theia/workspace": "1.19.0"
17+
"@theia/core": "1.27.0",
18+
"@theia/cpp-debug": "1.27.0",
19+
"@theia/editor": "1.27.0",
20+
"@theia/electron": "1.27.0",
21+
"@theia/file-search": "1.27.0",
22+
"@theia/filesystem": "1.27.0",
23+
"@theia/markers": "1.27.0",
24+
"@theia/messages": "1.27.0",
25+
"@theia/monaco": "1.27.0",
26+
"@theia/navigator": "1.27.0",
27+
"@theia/plugin-ext-vscode": "1.27.0",
28+
"@theia/preferences": "1.27.0",
29+
"@theia/process": "1.27.0",
30+
"@theia/task": "1.27.0",
31+
"@theia/terminal": "1.27.0",
32+
"@theia/typehierarchy": "1.27.0",
33+
"@theia/workspace": "1.27.0"
3434
},
3535
"scripts": {
3636
"lint": "if-env SKIP_LINT=true && echo 'skip lint check' || eslint --cache=true --no-error-on-unmatched-pattern=true \"{src,test}/**/*.{ts,tsx}\"",
@@ -43,6 +43,7 @@
4343
"test": "electron-mocha --timeout 60000 \"./lib/test/**/*.espec.js\""
4444
},
4545
"devDependencies": {
46-
"@theia/cli": "1.19.0"
46+
"@theia/cli": "1.27.0",
47+
"electron": "^15.3.5"
4748
}
4849
}

examples/electron/test/basic-example.espec.ts renamed to examples/electron/test/basic-example.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
1515
********************************************************************************/
1616

17+
import { app, BrowserWindow } from '@theia/core/electron-shared/@electron/remote';
1718
import * as chai from 'chai';
1819
import * as path from 'path';
19-
import { app, BrowserWindow } from 'electron';
2020

2121
const expect = chai.expect;
2222

2323
describe.skip('basic-example-spec', () => {
2424

25-
const mainWindow: Electron.BrowserWindow = new BrowserWindow({ show: false });
25+
const mainWindow = new BrowserWindow({ show: false });
2626
mainWindow.on('ready-to-show', () => mainWindow.show());
2727

2828
describe('01 #start example app', () => {

lerna.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"lerna": "3.13.2",
33
"npmClient": "yarn",
44
"useWorkspaces": true,
5-
"version": "1.19.0",
5+
"version": "1.27.0",
66
"command": {
77
"run": {
88
"stream": true

package.json

+7-5
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
"version": "0.0.0",
55
"engines": {
66
"yarn": "1.0.x || >=1.2.1",
7-
"node": ">=12.14.1 <13"
7+
"node": ">=14"
88
},
99
"resolutions": {
1010
"**/@types/node": "12",
1111
"**/node-abi": "^2.18.0"
1212
},
1313
"devDependencies": {
14-
"@theia/cli": "1.18.0",
15-
"@theia/eslint-plugin": "1.19.0",
14+
"@theia/cli": "1.27.0",
1615
"@typescript-eslint/eslint-plugin": "^4.8.1",
1716
"@typescript-eslint/eslint-plugin-tslint": "^4.8.1",
1817
"@typescript-eslint/parser": "^4.8.1",
@@ -29,9 +28,12 @@
2928
"nyc": "^15.0.0",
3029
"rimraf": "3.0.2",
3130
"tslint": "^5.12.0",
32-
"typescript": "^3.9.2"
31+
"typescript": "~4.5.5"
32+
},
33+
"dependencies": {
34+
"@types/node": "12",
35+
"node-abi": "^2.18.0"
3336
},
34-
"dependencies": {},
3537
"scripts": {
3638
"preinstall": "node-gyp install",
3739
"postinstall": "node scripts/post-install.js",

packages/cpp-debug/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "@theia/cpp-debug",
3-
"version": "1.19.0",
3+
"version": "1.27.0",
44
"description": "Theia - C/C++ Debug Extension",
55
"dependencies": {
6-
"@theia/core": "1.19.0",
7-
"@theia/debug": "1.19.0",
6+
"@theia/core": "1.27.0",
7+
"@theia/debug": "1.27.0",
88
"long": "^4.0.0",
99
"vscode-debugprotocol": "^1.48.0"
1010
},

0 commit comments

Comments
 (0)