Skip to content

Commit

Permalink
repo: perform yarn upgrade following v1.20.0 release (eclipse-the…
Browse files Browse the repository at this point in the history
…ia#10464)

The commit perform a `yarn upgrade` following the `v1.20.0` release of
the framework. The upgrade is important to get a clearer representation of what
downstream applications may pull when building their own products based on our 
version ranges.

The changes include:
- `yarn upgrade` which updates the `yarn.lock` file based on our version ranges
- cleaning up the dash-licenses baseline
- miscellaneous typo fixes

Signed-off-by: vince-fugnitto <[email protected]>
  • Loading branch information
vince-fugnitto authored Dec 2, 2021
1 parent 19008d9 commit bb53ad3
Show file tree
Hide file tree
Showing 5 changed files with 2,140 additions and 2,103 deletions.
5 changes: 1 addition & 4 deletions license-check-baseline.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
{
"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/-/jsmin/1.0.1": "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/-/seek-bzip/1.0.6": "Approved by CQ: https://dev.eclipse.org/ipzilla/show_bug.cgi?id=17349#c7",
"npm/npmjs/-/typescript/4.4.3": "Approved manually: https://github.com/eclipse-theia/theia/pull/10247"
"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"
}
6 changes: 3 additions & 3 deletions packages/monaco/src/typings/monaco/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -904,7 +904,7 @@ declare module monaco.services {
removeDecorationType: monaco.editor.ICodeEditorService['removeDecorationType'];
resolveDecorationOptions: monaco.editor.ICodeEditorService['resolveDecorationOptions'];
/**
* It respects inline and emebedded editors in comparison to `getActiveCodeEditor`
* It respects inline and embedded editors in comparison to `getActiveCodeEditor`
* which only respect standalone and diff modified editors.
*/
getFocusedCodeEditor(): monaco.editor.ICodeEditor | undefined;
Expand Down Expand Up @@ -997,7 +997,7 @@ declare module monaco.services {
private readonly _instantiatedModes: { [modeId: string]: IMode; };
private readonly _onLanguagesMaybeChanged: Emitter<void>;
readonly onDidCreateMode: monaco.IEvent<IMode>;
createByFilepathOrFirstLine(rsource: monaco.Uri | null, firstLine?: string): ILanguageSelection;
createByFilepathOrFirstLine(resource: monaco.Uri | null, firstLine?: string): ILanguageSelection;
getLanguageIdentifier(modeId: string | LanguageId): LanguageIdentifier | null;
}

Expand Down Expand Up @@ -2351,7 +2351,7 @@ declare module monaco.list {
private user: string,
container: HTMLElement,
virtualDelegate: IListVirtualDelegate<T>,
renderers: IListRenderer<any /* TODO@joao */, any>[],
renderers: IListRenderer<any, any>[],
private _options: IListOptions<T> = DefaultOptions
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,23 +160,23 @@ export class PluginVscodeCommandsContribution implements CommandContribution {
const uri = new TheiaURI(resource);
const editorOptions = DocumentsMainImpl.toEditorOpenerOptions(this.shell, options);

let opener: OpenHandler | undefined;
let openHandler: OpenHandler | undefined;
if (typeof openerId === 'string') {
const lowerViewType = openerId.toLowerCase();
const openers = await this.openerService.getOpeners();
for (const opnr of openers) {
const idLowerCase = opnr.id.toLowerCase();
for (const opener of openers) {
const idLowerCase = opener.id.toLowerCase();
if (lowerViewType === idLowerCase) {
opener = opnr;
openHandler = opener;
break;
}
}
} else {
opener = await this.openerService.getOpener(uri, editorOptions);
openHandler = await this.openerService.getOpener(uri, editorOptions);
}

if (opener) {
await opener.open(uri, editorOptions);
if (openHandler) {
await openHandler.open(uri, editorOptions);
return true;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/plugin/src/theia-proposed.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ export module '@theia/plugin' {
* Handle when the underlying resource for a custom editor is renamed.
*
* This allows the webview for the editor be preserved throughout the rename. If this method is not implemented,
* Theia will destory the previous custom editor and create a replacement one.
* Theia will destroy the previous custom editor and create a replacement one.
*
* @param newDocument New text document to use for the custom editor.
* @param existingWebviewPanel Webview panel for the custom editor.
Expand Down
Loading

0 comments on commit bb53ad3

Please sign in to comment.