Skip to content

Commit 89bef7b

Browse files
fstasifstasi
committed
theia 1.14.0
1 parent 4ec0013 commit 89bef7b

File tree

11 files changed

+910
-3417
lines changed

11 files changed

+910
-3417
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ build/
77
Examples/
88
!electron/build/
99
src-gen/
10-
*webpack.config.js
10+
!webpack.config.js
11+
gen-webpack.config.js
1112
.DS_Store
1213
# switching from `electron` to `browser` in dev mode.
1314
.browser_modules

‎arduino-ide-extension/package.json

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@
1919
},
2020
"dependencies": {
2121
"@grpc/grpc-js": "^1.1.1",
22-
"@theia/application-package": "1.13.0",
23-
"@theia/core": "1.13.0",
24-
"@theia/editor": "1.13.0",
25-
"@theia/filesystem": "1.13.0",
26-
"@theia/git": "1.13.0",
27-
"@theia/keymaps": "1.13.0",
28-
"@theia/markers": "1.13.0",
29-
"@theia/monaco": "1.13.0",
30-
"@theia/navigator": "1.13.0",
31-
"@theia/outline-view": "1.13.0",
32-
"@theia/output": "1.13.0",
33-
"@theia/preferences": "1.13.0",
34-
"@theia/search-in-workspace": "1.13.0",
35-
"@theia/terminal": "1.13.0",
36-
"@theia/workspace": "1.13.0",
22+
"@theia/application-package": "1.14.0",
23+
"@theia/core": "1.14.0",
24+
"@theia/editor": "1.14.0",
25+
"@theia/filesystem": "1.14.0",
26+
"@theia/git": "1.14.0",
27+
"@theia/keymaps": "1.14.0",
28+
"@theia/markers": "1.14.0",
29+
"@theia/monaco": "1.14.0",
30+
"@theia/navigator": "1.14.0",
31+
"@theia/outline-view": "1.14.0",
32+
"@theia/output": "1.14.0",
33+
"@theia/preferences": "1.14.0",
34+
"@theia/search-in-workspace": "1.14.0",
35+
"@theia/terminal": "1.14.0",
36+
"@theia/workspace": "1.14.0",
3737
"@tippyjs/react": "^4.2.5",
3838
"@types/atob": "^2.1.2",
3939
"@types/auth0-js": "^9.14.0",
@@ -83,6 +83,7 @@
8383
"temp": "^0.9.1",
8484
"tree-kill": "^1.2.1",
8585
"upath": "^1.1.2",
86+
"url": "^0.11.0",
8687
"which": "^1.3.1"
8788
},
8889
"devDependencies": {

‎arduino-ide-extension/src/browser/theia/debug/debug-configuration-manager.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
FileOperationError,
1414
FileOperationResult,
1515
} from '@theia/filesystem/lib/common/files';
16+
import { FileService } from '@theia/filesystem/lib/browser/file-service';
1617

1718
@injectable()
1819
export class DebugConfigurationManager extends TheiaDebugConfigurationManager {
@@ -25,6 +26,9 @@ export class DebugConfigurationManager extends TheiaDebugConfigurationManager {
2526
@inject(FrontendApplicationStateService)
2627
protected readonly appStateService: FrontendApplicationStateService;
2728

29+
@inject(FileService)
30+
protected readonly fileService: FileService;
31+
2832
protected onTempContentDidChangeEmitter =
2933
new Emitter<TheiaDebugConfigurationModel.JsonContent>();
3034
get onTempContentDidChange(): Event<TheiaDebugConfigurationModel.JsonContent> {

‎arduino-ide-extension/src/browser/theia/search-in-workspace/search-in-workspace-result-tree-widget.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { injectable } from 'inversify';
22
import URI from '@theia/core/lib/common/uri';
3-
import { MEMORY_TEXT } from '@theia/search-in-workspace/lib/browser/in-memory-text-resource';
43
import {
54
SearchInWorkspaceFileNode,
65
SearchInWorkspaceResultTreeWidget as TheiaSearchInWorkspaceResultTreeWidget,
76
} from '@theia/search-in-workspace/lib/browser/search-in-workspace-result-tree-widget';
7+
import { MEMORY_TEXT } from '@theia/core/lib/common/resource';
88

99
/**
1010
* Workaround for https://github.com/eclipse-theia/theia/pull/9192/.

‎browser-app/package.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
"version": "2.0.0-beta.11",
55
"license": "AGPL-3.0-or-later",
66
"dependencies": {
7-
"@theia/core": "1.13.0",
8-
"@theia/debug": "1.13.0",
9-
"@theia/editor": "1.13.0",
10-
"@theia/file-search": "1.13.0",
11-
"@theia/filesystem": "1.13.0",
12-
"@theia/keymaps": "1.13.0",
13-
"@theia/messages": "1.13.0",
14-
"@theia/monaco": "1.13.0",
15-
"@theia/navigator": "1.13.0",
16-
"@theia/plugin-ext": "1.13.0",
17-
"@theia/plugin-ext-vscode": "1.13.0",
18-
"@theia/preferences": "1.13.0",
19-
"@theia/process": "1.13.0",
20-
"@theia/terminal": "1.13.0",
21-
"@theia/workspace": "1.13.0",
7+
"@theia/core": "1.14.0",
8+
"@theia/debug": "1.14.0",
9+
"@theia/editor": "1.14.0",
10+
"@theia/file-search": "1.14.0",
11+
"@theia/filesystem": "1.14.0",
12+
"@theia/keymaps": "1.14.0",
13+
"@theia/messages": "1.14.0",
14+
"@theia/monaco": "1.14.0",
15+
"@theia/navigator": "1.14.0",
16+
"@theia/plugin-ext": "1.14.0",
17+
"@theia/plugin-ext-vscode": "1.14.0",
18+
"@theia/preferences": "1.14.0",
19+
"@theia/process": "1.14.0",
20+
"@theia/terminal": "1.14.0",
21+
"@theia/workspace": "1.14.0",
2222
"arduino-ide-extension": "2.0.0-beta.11"
2323
},
2424
"devDependencies": {
25-
"@theia/cli": "1.13.0"
25+
"@theia/cli": "1.14.0"
2626
},
2727
"scripts": {
2828
"prepare": "theia build --mode development",

‎browser-app/webpack.config.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/**
2+
* This file can be edited to customize webpack configuration.
3+
* To reset delete this file and rerun theia build again.
4+
*/
5+
// @ts-check
6+
const config = require('./gen-webpack.config.js');
7+
8+
config.resolve.fallback['http'] = false;
9+
config.resolve.fallback['fs'] = false;
10+
11+
/**
12+
* Expose bundled modules on window.theia.moduleName namespace, e.g.
13+
* window['theia']['@theia/core/lib/common/uri'].
14+
* Such syntax can be used by external code, for instance, for testing.
15+
config.module.rules.push({
16+
test: /\.js$/,
17+
loader: require.resolve('@theia/application-manager/lib/expose-loader')
18+
}); */
19+
20+
module.exports = config;

‎electron-app/package.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,26 @@
55
"license": "AGPL-3.0-or-later",
66
"main": "src-gen/frontend/electron-main.js",
77
"dependencies": {
8-
"@theia/core": "1.13.0",
9-
"@theia/debug": "1.13.0",
10-
"@theia/editor": "1.13.0",
11-
"@theia/electron": "1.13.0",
12-
"@theia/file-search": "1.13.0",
13-
"@theia/filesystem": "1.13.0",
14-
"@theia/keymaps": "1.13.0",
15-
"@theia/messages": "1.13.0",
16-
"@theia/monaco": "1.13.0",
17-
"@theia/navigator": "1.13.0",
18-
"@theia/plugin-ext": "1.13.0",
19-
"@theia/plugin-ext-vscode": "1.13.0",
20-
"@theia/preferences": "1.13.0",
21-
"@theia/process": "1.13.0",
22-
"@theia/terminal": "1.13.0",
23-
"@theia/workspace": "1.13.0",
8+
"@theia/core": "1.14.0",
9+
"@theia/debug": "1.14.0",
10+
"@theia/editor": "1.14.0",
11+
"@theia/electron": "1.14.0",
12+
"@theia/file-search": "1.14.0",
13+
"@theia/filesystem": "1.14.0",
14+
"@theia/keymaps": "1.14.0",
15+
"@theia/messages": "1.14.0",
16+
"@theia/monaco": "1.14.0",
17+
"@theia/navigator": "1.14.0",
18+
"@theia/plugin-ext": "1.14.0",
19+
"@theia/plugin-ext-vscode": "1.14.0",
20+
"@theia/preferences": "1.14.0",
21+
"@theia/process": "1.14.0",
22+
"@theia/terminal": "1.14.0",
23+
"@theia/workspace": "1.14.0",
2424
"arduino-ide-extension": "2.0.0-beta.11"
2525
},
2626
"devDependencies": {
27-
"@theia/cli": "1.13.0"
27+
"@theia/cli": "1.14.0"
2828
},
2929
"scripts": {
3030
"prepare": "theia build --mode development",

‎electron-app/webpack.config.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/**
2+
* This file can be edited to customize webpack configuration.
3+
* To reset delete this file and rerun theia build again.
4+
*/
5+
// @ts-check
6+
const config = require('./gen-webpack.config.js');
7+
8+
config.resolve.fallback['http'] = false;
9+
config.resolve.fallback['fs'] = false;
10+
11+
/**
12+
* Expose bundled modules on window.theia.moduleName namespace, e.g.
13+
* window['theia']['@theia/core/lib/common/uri'].
14+
* Such syntax can be used by external code, for instance, for testing.
15+
config.module.rules.push({
16+
test: /\.js$/,
17+
loader: require.resolve('@theia/application-manager/lib/expose-loader')
18+
}); */
19+
20+
module.exports = config;

‎electron/build/template-package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"node-log-rotate": "^0.1.5"
1010
},
1111
"devDependencies": {
12-
"@theia/cli": "1.13.0",
12+
"@theia/cli": "1.14.0",
1313
"cross-env": "^7.0.2",
1414
"electron-builder": "22.7.0",
1515
"electron-notarize": "^0.3.0",

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"node": ">=12.14.1 <13"
1111
},
1212
"devDependencies": {
13-
"@theia/cli": "1.13.0",
13+
"@theia/cli": "1.14.0",
1414
"@typescript-eslint/eslint-plugin": "^4.27.0",
1515
"@typescript-eslint/parser": "^4.27.0",
1616
"cross-env": "^7.0.2",

0 commit comments

Comments
 (0)