File tree Expand file tree Collapse file tree 10 files changed +379
-482
lines changed
plugin-ext/src/main/electron-browser/webview Expand file tree Collapse file tree 10 files changed +379
-482
lines changed Original file line number Diff line number Diff line change @@ -484,7 +484,7 @@ You can fix it by modifying your `tsconfig.json`:
484484### Profile IPC servers
485485
486486 - Pass ` --${server-name}-inspect ` arg to the backend server.
487- - For example ` --nfsw -watcher-inspect=0 ` to inspect nfsw watcher processes with dynamic port allocation.
487+ - For example ` --nsfw -watcher-inspect=0 ` to inspect nsfw watcher processes with dynamic port allocation.
488488 - All variations of ` --inspect ` flag are supported: https://nodejs.org/en/docs/inspector/#command-line-options .
489489
490490### Profile the plugin host
Original file line number Diff line number Diff line change @@ -751,7 +751,7 @@ SPAN {
751751 const editor = await openEditor ( serverUri ) ;
752752 const currentChar = ( ) => editor . getControl ( ) . getModel ( ) . getLineContent ( lineNumber ) . charAt ( column - 1 ) ;
753753
754- // container.load(modul )
754+ // container.load(module )
755755 editor . getControl ( ) . getModel ( ) . applyEdits ( [ {
756756 range : {
757757 startLineNumber : lineNumber ,
Original file line number Diff line number Diff line change 11{
2+ "npm/npmjs/-/doctrine/2.1.0" : " Approved: https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/1987" ,
23 "npm/npmjs/-/eslint-plugin-deprecation/1.2.1" : " Approved as 'works-with': https://dev.eclipse.org/ipzilla/show_bug.cgi?id=22573" ,
34 "npm/npmjs/-/jschardet/2.3.0" : " Approved for Eclipse Theia: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=22481" ,
45 "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" ,
5- "npm/npmjs/-/lzma-native/8.0.6" : " Approved as 'works-with': https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/1850"
6+ "npm/npmjs/-/lzma-native/8.0.6" : " Approved as 'works-with': https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/1850" ,
7+ "npm/npmjs/@babel/core/7.17.2" : " Approved: https://gitlab.eclipse.org/eclipsefdn/emo-team/iplab/-/issues/1936"
68}
Original file line number Diff line number Diff line change @@ -69,8 +69,8 @@ export class SomeClass {
6969## Re-Exports
7070
7171- ` @theia/core/electron-shared/... `
72- - ` @electron/remote ` (from [ ` @electron/remote@^2.0.1 ` ] ( https://www.npmjs.com/package/@electron/remote ) )
73- - ` @electron/remote/main ` (from [ ` @electron/remote@^2.0.1 ` ] ( https://www.npmjs.com/package/@electron/remote ) )
72+ - ` @electron/remote ` (from [ ` @electron/remote@^2.0.1 <2.0.4 || >2.0.4 ` ] ( https://www.npmjs.com/package/@electron/remote ) )
73+ - ` @electron/remote/main ` (from [ ` @electron/remote@^2.0.1 <2.0.4 || >2.0.4 ` ] ( https://www.npmjs.com/package/@electron/remote ) )
7474 - ` native-keymap ` (from [ ` native-keymap@^2.2.1 ` ] ( https://www.npmjs.com/package/native-keymap ) )
7575 - ` electron ` (from [ ` electron@^15.3.5 ` ] ( https://www.npmjs.com/package/electron ) )
7676 - ` electron-store ` (from [ ` electron-store@^8.0.0 ` ] ( https://www.npmjs.com/package/electron-store ) )
Original file line number Diff line number Diff line change 286286 background : url ('breakpoint-log.svg' ) center center no-repeat;
287287}
288288.theia-debug-logpoint-disabled ,
289- .monaco-editor .theia-debug-breakpoint-column .theia-debug-logpoint-disabled-columne {
289+ .monaco-editor .theia-debug-breakpoint-column .theia-debug-logpoint-disabled-column {
290290 background : url ('breakpoint-log-disabled.svg' ) center center no-repeat;
291291}
292292.theia-debug-logpoint-unverified ,
Original file line number Diff line number Diff line change @@ -17,8 +17,8 @@ The `@theia/electron` extension bundles all Electron-specific dependencies and c
1717## Re-Exports
1818
1919- ` @theia/electron/shared/... `
20- - ` @electron/remote ` (from [ ` @electron/remote@^2.0.1 ` ] ( https://www.npmjs.com/package/@electron/remote ) )
21- - ` @electron/remote/main ` (from [ ` @electron/remote@^2.0.1 ` ] ( https://www.npmjs.com/package/@electron/remote ) )
20+ - ` @electron/remote ` (from [ ` @electron/remote@^2.0.1 <2.0.4 || >2.0.4 ` ] ( https://www.npmjs.com/package/@electron/remote ) )
21+ - ` @electron/remote/main ` (from [ ` @electron/remote@^2.0.1 <2.0.4 || >2.0.4 ` ] ( https://www.npmjs.com/package/@electron/remote ) )
2222 - ` native-keymap ` (from [ ` native-keymap@^2.2.1 ` ] ( https://www.npmjs.com/package/native-keymap ) )
2323 - ` electron ` (from [ ` electron@^15.3.5 ` ] ( https://www.npmjs.com/package/electron ) )
2424 - ` electron-store ` (from [ ` electron-store@^8.0.0 ` ] ( https://www.npmjs.com/package/electron-store ) )
Original file line number Diff line number Diff line change 33 "version" : " 1.22.1" ,
44 "description" : " Theia - Electron utility package" ,
55 "dependencies" : {
6- "@electron/remote" : " ^2.0.1" ,
6+ "@electron/remote" : " ^2.0.1 <2.0.4 || >2.0.4 " ,
77 "electron-store" : " ^8.0.0" ,
88 "fix-path" : " ^3.0.0" ,
99 "native-keymap" : " ^2.2.1"
Original file line number Diff line number Diff line change @@ -35,7 +35,7 @@ export class ElectronWebviewWidgetFactory extends WebviewWidgetFactory {
3535 * @param endpoint cookie's target url
3636 */
3737 protected async attachElectronSecurityCookie ( endpoint : string ) : Promise < void > {
38- await electronRemote . session . defaultSession ! . cookies . set ( {
38+ await electronRemote . session . defaultSession . cookies . set ( {
3939 url : endpoint ,
4040 name : ElectronSecurityToken ,
4141 value : JSON . stringify ( this . container . get ( ElectronSecurityToken ) ) ,
@@ -59,7 +59,7 @@ export class ElectronCustomEditorWidgetFactory extends CustomEditorWidgetFactory
5959 * @param endpoint cookie's target url
6060 */
6161 protected async attachElectronSecurityCookie ( endpoint : string ) : Promise < void > {
62- await electronRemote . session . defaultSession ! . cookies . set ( {
62+ await electronRemote . session . defaultSession . cookies . set ( {
6363 url : endpoint ,
6464 name : ElectronSecurityToken ,
6565 value : JSON . stringify ( this . container . get ( ElectronSecurityToken ) ) ,
Original file line number Diff line number Diff line change 44 echo " \nERR: The git repository state changed after the build, this should not happen.\n"
55 git --no-pager diff
66 echo " \nHINT: Did you update and commit your 'yarn.lock' ?"
7- echo " \n You can also check your '.gitgnore '."
7+ echo " \n You can also check your '.gitignore '."
88 exit 1
99fi
You can’t perform that action at this time.
0 commit comments