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.

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

yarn upgrade + dep fix #10725

Merged
merged 1 commit into from
Feb 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion doc/Developing.md
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ You can fix it by modifying your `tsconfig.json`:
### Profile IPC servers

- Pass `--${server-name}-inspect` arg to the backend server.
- For example `--nfsw-watcher-inspect=0` to inspect nfsw watcher processes with dynamic port allocation.
- For example `--nsfw-watcher-inspect=0` to inspect nsfw watcher processes with dynamic port allocation.
- All variations of `--inspect` flag are supported: https://nodejs.org/en/docs/inspector/#command-line-options.

### Profile the plugin host
Expand Down
2 changes: 1 addition & 1 deletion examples/api-tests/src/typescript.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@ SPAN {
const editor = await openEditor(serverUri);
const currentChar = () => editor.getControl().getModel().getLineContent(lineNumber).charAt(column - 1);

// container.load(modul)
// container.load(module)
editor.getControl().getModel().applyEdits([{
range: {
startLineNumber: lineNumber,
Expand Down
4 changes: 3 additions & 1 deletion license-check-baseline.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"npm/npmjs/-/doctrine/2.1.0": "Approved: https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/1987",
"npm/npmjs/-/eslint-plugin-deprecation/1.2.1": "Approved as 'works-with': https://dev.eclipse.org/ipzilla/show_bug.cgi?id=22573",
"npm/npmjs/-/jschardet/2.3.0": "Approved for Eclipse Theia: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=22481",
"npm/npmjs/-/jsdom/11.12.0": "Approved as 'works-with': https://dev.eclipse.org/ipzilla/show_bug.cgi?id=23640https://dev.eclipse.org/ipzilla/show_bug.cgi?id=23640",
"npm/npmjs/-/lzma-native/8.0.6": "Approved as 'works-with': https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/1850"
"npm/npmjs/-/lzma-native/8.0.6": "Approved as 'works-with': https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/1850",
"npm/npmjs/@babel/core/7.17.2": "Approved: https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/1936"
}
4 changes: 2 additions & 2 deletions packages/core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ export class SomeClass {
## Re-Exports

- `@theia/core/electron-shared/...`
- `@electron/remote` (from [`@electron/remote@^2.0.1`](https://www.npmjs.com/package/@electron/remote))
- `@electron/remote/main` (from [`@electron/remote@^2.0.1`](https://www.npmjs.com/package/@electron/remote))
- `@electron/remote` (from [`@electron/remote@^2.0.1 <2.0.4 || >2.0.4`](https://www.npmjs.com/package/@electron/remote))
- `@electron/remote/main` (from [`@electron/remote@^2.0.1 <2.0.4 || >2.0.4`](https://www.npmjs.com/package/@electron/remote))
- `native-keymap` (from [`native-keymap@^2.2.1`](https://www.npmjs.com/package/native-keymap))
- `electron` (from [`electron@^15.3.5`](https://www.npmjs.com/package/electron))
- `electron-store` (from [`electron-store@^8.0.0`](https://www.npmjs.com/package/electron-store))
Expand Down
2 changes: 1 addition & 1 deletion packages/debug/src/browser/style/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@
background: url('breakpoint-log.svg') center center no-repeat;
}
.theia-debug-logpoint-disabled,
.monaco-editor .theia-debug-breakpoint-column.theia-debug-logpoint-disabled-columne {
.monaco-editor .theia-debug-breakpoint-column.theia-debug-logpoint-disabled-column {
background: url('breakpoint-log-disabled.svg') center center no-repeat;
}
.theia-debug-logpoint-unverified,
Expand Down
4 changes: 2 additions & 2 deletions packages/electron/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ The `@theia/electron` extension bundles all Electron-specific dependencies and c
## Re-Exports

- `@theia/electron/shared/...`
- `@electron/remote` (from [`@electron/remote@^2.0.1`](https://www.npmjs.com/package/@electron/remote))
- `@electron/remote/main` (from [`@electron/remote@^2.0.1`](https://www.npmjs.com/package/@electron/remote))
- `@electron/remote` (from [`@electron/remote@^2.0.1 <2.0.4 || >2.0.4`](https://www.npmjs.com/package/@electron/remote))
- `@electron/remote/main` (from [`@electron/remote@^2.0.1 <2.0.4 || >2.0.4`](https://www.npmjs.com/package/@electron/remote))
- `native-keymap` (from [`native-keymap@^2.2.1`](https://www.npmjs.com/package/native-keymap))
- `electron` (from [`electron@^15.3.5`](https://www.npmjs.com/package/electron))
- `electron-store` (from [`electron-store@^8.0.0`](https://www.npmjs.com/package/electron-store))
Expand Down
2 changes: 1 addition & 1 deletion packages/electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "1.22.1",
"description": "Theia - Electron utility package",
"dependencies": {
"@electron/remote": "^2.0.1",
"@electron/remote": "^2.0.1 <2.0.4 || >2.0.4",
"electron-store": "^8.0.0",
"fix-path": "^3.0.0",
"native-keymap": "^2.2.1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export class ElectronWebviewWidgetFactory extends WebviewWidgetFactory {
* @param endpoint cookie's target url
*/
protected async attachElectronSecurityCookie(endpoint: string): Promise<void> {
await electronRemote.session.defaultSession!.cookies.set({
await electronRemote.session.defaultSession.cookies.set({
url: endpoint,
name: ElectronSecurityToken,
value: JSON.stringify(this.container.get(ElectronSecurityToken)),
Expand All @@ -59,7 +59,7 @@ export class ElectronCustomEditorWidgetFactory extends CustomEditorWidgetFactory
* @param endpoint cookie's target url
*/
protected async attachElectronSecurityCookie(endpoint: string): Promise<void> {
await electronRemote.session.defaultSession!.cookies.set({
await electronRemote.session.defaultSession.cookies.set({
url: endpoint,
name: ElectronSecurityToken,
value: JSON.stringify(this.container.get(ElectronSecurityToken)),
Expand Down
2 changes: 1 addition & 1 deletion scripts/check_git_status.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ then
echo "\nERR: The git repository state changed after the build, this should not happen.\n"
git --no-pager diff
echo "\nHINT: Did you update and commit your 'yarn.lock' ?"
echo "\n You can also check your '.gitgnore'."
echo "\n You can also check your '.gitignore'."
exit 1
fi
Loading