Skip to content

Commit

Permalink
Merge pull request #7 from claui/fix-vsce
Browse files Browse the repository at this point in the history
Fix regression in vsce patch
  • Loading branch information
claui authored Oct 15, 2023
2 parents 87b0f7e + d367d9e commit 5dbc739
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 5 deletions.
File renamed without changes.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -225,13 +225,13 @@ To start editing a dependency, run `yarn patch <dependency>`.
For example, to start editing the `vsce` executable, run:

```shell
yarn patch @vscode/vsce@npm:2.21.0
yarn patch @vscode/vsce@npm:2.21.1
```

Since this project is already patching this dependency, you may want to apply the existing patch to the temporary working directory:

```shell
patch < path/to/this/project/.yarn/patches/@vscode-vsce-npm-2.21.0.patch
patch < path/to/this/project/.yarn/patches/@vscode-vsce-npm-2.21.1.patch
```

### Finish editing
Expand All @@ -251,7 +251,7 @@ Note: `yarn repatch` is a custom script. It serves to work around two issues in
- It may also use an incorrect key in the resolution entry it writes to `package.json`.
The key should match the dependency’s semver expression, not the resolved version.
Using the latter as a key causes the resolution to never apply.
Example for a correct key: `"@vscode/vsce@^2.21.0"`
Example for a correct key: `"@vscode/vsce@^2.21.1"`

## Handling vulnerable dependencies

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"upgrade-yarn-itself": "printf >&2 '%s\\n\\t%s\\n' 'Run the following command line manually:' 'yarn set version stable && yarn install && yarn clean-install' && false"
},
"resolutions": {
"@vscode/vsce@^2.21.0": "patch:@vscode/vsce@npm:2.21.0#./.yarn/patches/@vscode-vsce-npm-2.21.0.patch"
"@vscode/vsce@^2.21.1": "patch:@vscode/vsce@npm:2.21.1#./.yarn/patches/@vscode-vsce-npm-2.21.1.patch"
},
"packageManager": "yarn@3.6.4",
"workspaces": [
Expand Down
36 changes: 35 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -656,7 +656,7 @@ __metadata:
languageName: node
linkType: hard

"@vscode/vsce@npm:^2.19.0, @vscode/vsce@npm:^2.21.1":
"@vscode/vsce@npm:2.21.1, @vscode/vsce@npm:^2.19.0":
version: 2.21.1
resolution: "@vscode/vsce@npm:2.21.1"
dependencies:
Expand Down Expand Up @@ -690,6 +690,40 @@ __metadata:
languageName: node
linkType: hard

"@vscode/vsce@patch:@vscode/vsce@npm:2.21.1#./.yarn/patches/@vscode-vsce-npm-2.21.1.patch::locator=vscode-libaacs-keydb%40workspace%3A.":
version: 2.21.1
resolution: "@vscode/vsce@patch:@vscode/vsce@npm%3A2.21.1#./.yarn/patches/@vscode-vsce-npm-2.21.1.patch::version=2.21.1&hash=76cb5f&locator=vscode-libaacs-keydb%40workspace%3A."
dependencies:
azure-devops-node-api: ^11.0.1
chalk: ^2.4.2
cheerio: ^1.0.0-rc.9
commander: ^6.2.1
glob: ^7.0.6
hosted-git-info: ^4.0.2
jsonc-parser: ^3.2.0
keytar: ^7.7.0
leven: ^3.1.0
markdown-it: ^12.3.2
mime: ^1.3.4
minimatch: ^3.0.3
parse-semver: ^1.1.1
read: ^1.0.7
semver: ^7.5.2
tmp: ^0.2.1
typed-rest-client: ^1.8.4
url-join: ^4.0.1
xml2js: ^0.5.0
yauzl: ^2.3.1
yazl: ^2.2.2
dependenciesMeta:
keytar:
optional: true
bin:
vsce: vsce
checksum: 40125dfee73519e3e0189a40b95df5db363402eb96893fb3718f7adf3e393076a2df359f6d952a6c3d9333576a3cbb2d10ac39698fd3755e4f8025cc9fd7d44e
languageName: node
linkType: hard

"@yarnpkg/core@npm:^3.5.1":
version: 3.5.4
resolution: "@yarnpkg/core@npm:3.5.4"
Expand Down

0 comments on commit 5dbc739

Please sign in to comment.