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

Perform yarn upgrade #13748

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
},
"resolutions": {
"**/@types/node": "18",
"**/nan": "2.20.0"
"**/nan": "2.20.0",
"@vscode/vsce": "2.25.0"
},
"devDependencies": {
"@types/chai": "4.3.0",
Expand Down Expand Up @@ -115,4 +116,4 @@
"vscode.microsoft-authentication",
"ms-vscode.references-view"
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ export class ImageFileContribution implements ContainerCreationContribution {
await new Promise<void>((res, rej) => api.pull(containerConfig.image, {}, (err, stream) => {
if (err) {
rej(err);
} else if (stream === undefined) {
rej('Stream is undefined');
} else {
api.modem.followProgress(stream, (error, output) => error ?
rej(error) :
Expand Down
5 changes: 4 additions & 1 deletion packages/scm/src/browser/scm-commit-widget.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,10 @@ export class ScmCommitWidget extends ReactWidget implements StatefulWidget {
onChange={this.setInputValue}
ref={this.inputRef}
rows={1}
maxRows={6} /* from VS Code */>
maxRows={6} /* from VS Code */
onPointerEnterCapture={undefined}
onPointerLeaveCapture={undefined}
>
</TextareaAutosize>;
return <div className={ScmCommitWidget.Styles.INPUT_MESSAGE_CONTAINER}>
{textArea}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,8 @@ export class SearchInWorkspaceTextArea extends React.Component<TextareaAttribute
ref={this.textarea}
rows={1}
spellCheck={false}
onPointerEnterCapture={undefined}
onPointerLeaveCapture={undefined}
>
</TextareaAutosize>
);
Expand Down
3 changes: 2 additions & 1 deletion sample-plugins/sample-namespace/plugin-a/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"version": "1.53.0",
"main": "extension.js",
"license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0",
"publisher": "sample-publisher",
"repository": {
"type": "git",
"url": "https://github.com/eclipse-theia/theia.git"
Expand All @@ -29,4 +30,4 @@
}
]
}
}
}
3 changes: 2 additions & 1 deletion sample-plugins/sample-namespace/plugin-b/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"version": "1.53.0",
"main": "extension.js",
"license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0",
"publisher": "sample-publisher",
"repository": {
"type": "git",
"url": "https://github.com/eclipse-theia/theia.git"
Expand All @@ -29,4 +30,4 @@
}
]
}
}
}
3,324 changes: 1,701 additions & 1,623 deletions yarn.lock

Large diffs are not rendered by default.

Loading