Skip to content

Commit

Permalink
Perform yarn upgrade
Browse files Browse the repository at this point in the history
The commit performs a `yarn upgrade` of the framework to better
represent what downstream applications pull with our version ranges, and
to resolve known security vulnerabilities which were pulled by our
lockfile. The changes also make sure that our declared ranges for
dependencies are correct and fixes any compilation errors.

Contributed on behalf of STMicroelectronics
  • Loading branch information
jfaltermeier committed Jun 4, 2024
1 parent 0941a8f commit 72b68f1
Show file tree
Hide file tree
Showing 6 changed files with 1,694 additions and 1,395 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
fail-fast: false
matrix:
os: [windows-2019, ubuntu-latest, macos-11]
node: [16.x, 18.x, 20.x]
node: [18.x, 20.x, 22.x]

runs-on: ${{ matrix.os }}
timeout-minutes: 60
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
"node": ">=16"
},
"resolutions": {
"**/@types/node": "18"
"**/@types/node": "18",
"**/nan": "2.18.0",
"**/cpu-features": "0.0.9"
},
"devDependencies": {
"@types/chai": "4.3.0",
Expand Down
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
Loading

0 comments on commit 72b68f1

Please sign in to comment.