Skip to content

Commit

Permalink
chore: remove rosetta patch (#15001)
Browse files Browse the repository at this point in the history
Our `yarn-upgrade` workflow is failing with:

```console
@lerna/[email protected] ✔

**ERROR** Failed to apply patch for package jsii-rosetta at path
  
    node_modules/jsii-rosetta

  This error was caused because jsii-rosetta has changed since you
  made the patch file for it. This introduced conflicts with your patch,
  just like a merge conflict in Git when separate incompatible changes are
  made to the same piece of code.
```

Basically, its not able to apply the [rosetta patch](https://github.com/aws/aws-cdk/blob/master/patches/jsii-rosetta%2B1.28.0.patch) anymore since a new version of `jsii-rosetta` has been released which creates conflicts. 

The new version of rosetta [addresses](aws/jsii#2816) the problem the patch was trying to solve, so it is no longer needed (yey). 

----

*By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
  • Loading branch information
iliapolo authored Jun 6, 2021
1 parent 213ef38 commit fdab3f4
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 15 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"jsii-diff": "^1.29.0",
"jsii-pacmak": "^1.29.0",
"jsii-reflect": "^1.29.0",
"jsii-rosetta": "^1.29.0",
"jsii-rosetta": "^1.30.0",
"lerna": "^4.0.0",
"patch-package": "^6.4.7",
"standard-version": "^9.3.0",
Expand Down
14 changes: 0 additions & 14 deletions patches/jsii-rosetta+1.28.0.patch

This file was deleted.

24 changes: 24 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,13 @@
dependencies:
jsonschema "^1.4.0"

"@jsii/spec@^1.30.0":
version "1.30.0"
resolved "https://registry.yarnpkg.com/@jsii/spec/-/spec-1.30.0.tgz#e5b2381b2be0b9c0839190f9f45d0a038654c73d"
integrity sha512-oXIwvZyHHc/TrwA/3pzQ3gkqBe916EWBvaexNI3rnKZujlHZT4vVVHMCjQ/kUJhcR0GEaahvwlNhiPTu6roC2g==
dependencies:
jsonschema "^1.4.0"

"@lerna/[email protected]":
version "4.0.0"
resolved "https://registry.yarnpkg.com/@lerna/add/-/add-4.0.0.tgz#c36f57d132502a57b9e7058d1548b7a565ef183f"
Expand Down Expand Up @@ -6098,6 +6105,18 @@ jsii-rosetta@^1.29.0:
xmldom "^0.5.0"
yargs "^16.2.0"

jsii-rosetta@^1.30.0:
version "1.30.0"
resolved "https://registry.yarnpkg.com/jsii-rosetta/-/jsii-rosetta-1.30.0.tgz#5c974eefef9a8e5e1b8364e53e6856f07c7eaf68"
integrity sha512-ChFg5qhvxCaM2bspCqizs48yMtsm5YLHjBoNZLCkbXyc3yMM5l8pnn787B5ww5TI3+tKxKYWkbiKf356kQ1OgQ==
dependencies:
"@jsii/spec" "^1.30.0"
commonmark "^0.29.3"
fs-extra "^9.1.0"
typescript "~3.9.9"
xmldom "^0.6.0"
yargs "^16.2.0"

jsii@^1.29.0:
version "1.29.0"
resolved "https://registry.yarnpkg.com/jsii/-/jsii-1.29.0.tgz#1f34c29db9299ace0f361e6d72627d4478994396"
Expand Down Expand Up @@ -10271,6 +10290,11 @@ xmldom@^0.5.0:
resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz#193cb96b84aa3486127ea6272c4596354cb4962e"
integrity sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA==

xmldom@^0.6.0:
version "0.6.0"
resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.6.0.tgz#43a96ecb8beece991cef382c08397d82d4d0c46f"
integrity sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg==

[email protected]:
version "2.0.0"
resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"
Expand Down

0 comments on commit fdab3f4

Please sign in to comment.