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

update Yarn to v3 (berry) #8461

Closed
wants to merge 16 commits into from
Closed
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
10 changes: 8 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,14 @@ typings/
# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity
# Yarn (https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored)
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions

# dotenv environment variables file
.env
Expand Down
16 changes: 16 additions & 0 deletions .yarn/patches/@yarnpkg-core-npm-3.6.0-152a1d85ce.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/lib/miscUtils.js b/lib/miscUtils.js
index 15f03713c8d6786f27f13d5c33ba67a68172e463..79335e4619eed3d2424b80d4578868ddae29791c 100644
--- a/lib/miscUtils.js
+++ b/lib/miscUtils.js
@@ -259,7 +259,10 @@ exports.DefaultStream = DefaultStream;
// Webpack has this annoying tendency to replace dynamic requires by a stub
// code that simply throws when called. It's all fine and dandy in the context
// of a web application, but is quite annoying when working with Node projects!
-const realRequire = eval(`require`);
+// const realRequire = eval(`require`);
+// XXX compatibility with SES, which errors above:
+// "require is not defined in ES module scope, you can use import instead"
+const realRequire = require;
function dynamicRequireNode(path) {
return realRequire(fslib_1.npath.fromPortablePath(path));
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/node_modules/protobufjs/src/util/minimal.js b/node_modules/protobufjs/src/util/minimal.js
index 3c406de..083f71c 100644
--- a/node_modules/protobufjs/src/util/minimal.js
+++ b/node_modules/protobufjs/src/util/minimal.js
@@ -280,13 +280,38 @@ function newError(name) {
diff --git a/src/util/minimal.js b/src/util/minimal.js
index 3c406dee753b5c6fb29dda2e64d4482e754e7873..182aae76467453e3a57a54b4790f29e331ad26f0 100644
--- a/src/util/minimal.js
+++ b/src/util/minimal.js
@@ -280,14 +280,39 @@ function newError(name) {
merge(this, properties);
}

Expand All @@ -13,7 +13,8 @@ index 3c406de..083f71c 100644
- CustomError.prototype.toString = function toString() {
- return this.name + ": " + this.message;
- };
+ CustomError.prototype = Object.create(Error.prototype, {
-
+ CustomError.prototype = Object.create(Error.prototype, {
+ constructor: {
+ value: CustomError,
+ writable: true,
Expand Down Expand Up @@ -45,6 +46,7 @@ index 3c406de..083f71c 100644
+ configurable: true,
+ },
+ });

+
return CustomError;
}

28 changes: 28 additions & 0 deletions .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs

Large diffs are not rendered by default.

Loading
Loading