Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Theia 1.45.1 #1047

Merged
merged 2 commits into from
Feb 29, 2024
Merged

Theia 1.45.1 #1047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad4ad78
update to latest Theia community release: v1.45.1
marcdumais-work Feb 7, 2024
bb87e0e
update following upstream Theia changes
marcdumais-work Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,3 @@ theia-extensions/viewer-prototype/lib/
trace-compass-server
trace-compass-server.tar.gz
license-check-summary.txt*
e
30 changes: 15 additions & 15 deletions examples/browser/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,24 @@
}
},
"dependencies": {
"@theia/core": "1.43.1",
"@theia/editor": "1.43.1",
"@theia/filesystem": "1.43.1",
"@theia/getting-started": "1.43.1",
"@theia/keymaps": "1.43.1",
"@theia/markers": "1.43.1",
"@theia/messages": "1.43.1",
"@theia/monaco": "1.43.1",
"@theia/navigator": "1.43.1",
"@theia/preferences": "1.43.1",
"@theia/process": "1.43.1",
"@theia/terminal": "1.43.1",
"@theia/vsx-registry": "1.43.1",
"@theia/workspace": "1.43.1",
"@theia/core": "1.45.1",
"@theia/editor": "1.45.1",
"@theia/filesystem": "1.45.1",
"@theia/getting-started": "1.45.1",
"@theia/keymaps": "1.45.1",
"@theia/markers": "1.45.1",
"@theia/messages": "1.45.1",
"@theia/monaco": "1.45.1",
"@theia/navigator": "1.45.1",
"@theia/preferences": "1.45.1",
"@theia/process": "1.45.1",
"@theia/terminal": "1.45.1",
"@theia/vsx-registry": "1.45.1",
"@theia/workspace": "1.45.1",
"theia-traceviewer": "0.1.0"
},
"devDependencies": {
"@theia/cli": "1.43.1"
"@theia/cli": "1.45.1"
},
"scripts": {
"prepare": "yarn build",
Expand Down
28 changes: 14 additions & 14 deletions examples/docker/example-package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,23 @@
"@emotion/react": "^11.10.5",
"@emotion/styled": "^11.10.5",
"@mui/material": "^5.10.14",
"@theia/core": "1.43.1",
"@theia/editor": "1.43.1",
"@theia/filesystem": "1.43.1",
"@theia/getting-started": "1.43.1",
"@theia/keymaps": "1.43.1",
"@theia/markers": "1.43.1",
"@theia/messages": "1.43.1",
"@theia/monaco": "1.43.1",
"@theia/navigator": "1.43.1",
"@theia/preferences": "1.43.1",
"@theia/process": "1.43.1",
"@theia/terminal": "1.43.1",
"@theia/workspace": "1.43.1",
"@theia/core": "1.45.1",
"@theia/editor": "1.45.1",
"@theia/filesystem": "1.45.1",
"@theia/getting-started": "1.45.1",
"@theia/keymaps": "1.45.1",
"@theia/markers": "1.45.1",
"@theia/messages": "1.45.1",
"@theia/monaco": "1.45.1",
"@theia/navigator": "1.45.1",
"@theia/preferences": "1.45.1",
"@theia/process": "1.45.1",
"@theia/terminal": "1.45.1",
"@theia/workspace": "1.45.1",
"theia-traceviewer": "0.2.0-next.20231206220005.ff0943f.0"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be updated after the a new version is available.

},
"devDependencies": {
"@theia/cli": "1.43.1"
"@theia/cli": "1.45.1"
},
"scripts": {
"prepare": "theia build",
Expand Down
32 changes: 16 additions & 16 deletions examples/electron/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,25 @@
}
},
"dependencies": {
"@theia/core": "1.43.1",
"@theia/editor": "1.43.1",
"@theia/electron": "1.43.1",
"@theia/filesystem": "1.43.1",
"@theia/getting-started": "1.43.1",
"@theia/keymaps": "1.43.1",
"@theia/markers": "1.43.1",
"@theia/messages": "1.43.1",
"@theia/monaco": "1.43.1",
"@theia/navigator": "1.43.1",
"@theia/preferences": "1.43.1",
"@theia/process": "1.43.1",
"@theia/terminal": "1.43.1",
"@theia/vsx-registry": "1.43.1",
"@theia/workspace": "1.43.1",
"@theia/core": "1.45.1",
"@theia/editor": "1.45.1",
"@theia/electron": "1.45.1",
"@theia/filesystem": "1.45.1",
"@theia/getting-started": "1.45.1",
"@theia/keymaps": "1.45.1",
"@theia/markers": "1.45.1",
"@theia/messages": "1.45.1",
"@theia/monaco": "1.45.1",
"@theia/navigator": "1.45.1",
"@theia/preferences": "1.45.1",
"@theia/process": "1.45.1",
"@theia/terminal": "1.45.1",
"@theia/vsx-registry": "1.45.1",
"@theia/workspace": "1.45.1",
"theia-traceviewer": "0.1.0"
},
"devDependencies": {
"@theia/cli": "1.43.1",
"@theia/cli": "1.45.1",
"electron": "^23.2.4",
"electron-builder": "~23.6.0"
},
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
},
"devDependencies": {
"@eclipse-dash/nodejs-wrapper": "^0.0.1",
"@theia/cli": "1.43.1",
"@theia/cli": "1.45.1",
"concurrently": "^8.2.1",
"jsonc-parser": "^3.0.0",
"lerna": "^7.0.0",
Expand Down
6 changes: 3 additions & 3 deletions theia-extensions/viewer-prototype/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
"style"
],
"dependencies": {
"@theia/core": "1.43.1",
"@theia/editor": "1.43.1",
"@theia/filesystem": "1.43.1",
"@theia/core": "1.45.1",
"@theia/editor": "1.45.1",
"@theia/filesystem": "1.45.1",
"traceviewer-base": "0.1.0",
"traceviewer-react-components": "0.1.0",
"tree-kill": "latest",
Expand Down
12 changes: 10 additions & 2 deletions theia-extensions/viewer-prototype/src/browser/preferences-frontend-contribution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { FrontendApplicationContribution } from '@theia/core/lib/browser';
import { inject, injectable } from 'inversify';
import { PortPreferenceProxy } from '../common/trace-server-url-provider';
import { PortPreferenceProxy, TRACE_VIEWER_DEFAULT_PORT } from '../common/trace-server-url-provider';
import { TracePreferences, TRACE_PORT } from './trace-server-preference';

@injectable()
Expand All @@ -12,7 +12,15 @@ export class PreferencesFrontendContribution implements FrontendApplicationContr

async initialize(): Promise<void> {
this.tracePreferences.ready.then(() => {
this.portPreferenceProxy.onPortPreferenceChanged(this.tracePreferences[TRACE_PORT]);
// assume the backend starts with the default server port - if the user configured
// a different port in the preferences, tell backend to change it
const tracePortPref = this.tracePreferences[TRACE_PORT];
if (tracePortPref === TRACE_VIEWER_DEFAULT_PORT) {
this.portPreferenceProxy.onPortPreferenceChanged(tracePortPref);
} else {
this.portPreferenceProxy.onPortPreferenceChanged(tracePortPref, TRACE_VIEWER_DEFAULT_PORT, true);
}

this.tracePreferences.onPreferenceChanged(async event => {
if (event.preferenceName === TRACE_PORT) {
const newValue = typeof event.newValue === 'string' ? parseInt(event.newValue) : event.newValue;
Expand Down
11 changes: 7 additions & 4 deletions theia-extensions/viewer-prototype/src/node/trace-server-url-provider-impl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { TraceServerConfigService } from '../common/trace-server-config';
import {
TraceServerUrlProvider,
TRACE_SERVER_DEFAULT_URL,
TRACE_VIEWER_DEFAULT_PORT,
PortPreferenceProxy
} from '../common/trace-server-url-provider';
import { Event, Emitter } from '@theia/core';
Expand Down Expand Up @@ -59,6 +60,7 @@ export class TraceServerUrlProviderImpl
// Get the URL template from the remote environment.
const variable = process.env['TRACE_SERVER_URL'];
this._traceServerUrlTemplate = variable ? this.normalizeUrl(variable) : TRACE_SERVER_DEFAULT_URL;
this._traceServerPort = TRACE_VIEWER_DEFAULT_PORT;
this.updateTraceServerUrl();
}

Expand All @@ -67,9 +69,9 @@ export class TraceServerUrlProviderImpl
oldValue?: number,
preferenceChanged = false
): Promise<void> {
this._traceServerPort = newPort;
this.updateTraceServerUrl();
if (preferenceChanged) {
if (preferenceChanged || this._traceServerPort !== newPort) {
this._traceServerPort = newPort;
this.updateTraceServerUrl();
try {
await this.traceServerConfigService.stopTraceServer();
if (oldValue) {
Expand All @@ -82,7 +84,8 @@ export class TraceServerUrlProviderImpl
}

async initialize(): Promise<void> {
// Don't start the application until the Trace Server URL is initialized.
// Don't conclude the initialization life-cycle phase of this contribution
// until the Trace Server URL is initialized.
await this._traceServerUrlPromise;
}

Expand Down
Loading
Loading