From f6c97f327ba6b5b79888415052daff05f287c8b7 Mon Sep 17 00:00:00 2001 From: Peter Dulacka Date: Tue, 15 Aug 2023 14:19:38 +0200 Subject: [PATCH] Specify explicit packageManager definition into package.json files This is to Yarn v3 to stop complaining about outdated lockfile. remp/remp#1294 (cherry picked from commit 154c79352ce8cecc6a5c05e7a1974cda722f0d4d) --- Beam/extensions/beam-module/package.json | 4 +++- Beam/package.json | 1 + Beam/yarn.lock | 4 ++-- Campaign/package.json | 1 + Mailer/extensions/mailer-module/package.json | 5 ++++- Mailer/package.json | 1 + Mailer/yarn.lock | 4 ++-- Package/remp/package.json | 5 ++++- Sso/package.json | 1 + changelogs/CHANGELOG-v3.1.md | 3 +++ 10 files changed, 22 insertions(+), 7 deletions(-) diff --git a/Beam/extensions/beam-module/package.json b/Beam/extensions/beam-module/package.json index ee97247b2..ce4127262 100644 --- a/Beam/extensions/beam-module/package.json +++ b/Beam/extensions/beam-module/package.json @@ -34,8 +34,10 @@ }, "engines": { "node": ">=18", - "npm": ">=9" + "npm": ">=9", + "yarn": ">=2" }, + "packageManager": "yarn@2.4.3", "dependencies": { "@babel/core": "^7.0", "@remp/js-commons": "^1.3", diff --git a/Beam/package.json b/Beam/package.json index 36f78049c..e7d613ba0 100644 --- a/Beam/package.json +++ b/Beam/package.json @@ -34,6 +34,7 @@ "npm": ">=9", "yarn": ">2" }, + "packageManager": "yarn@2.4.3", "dependencies": { "remp-beam": "file:extensions/beam-module" }, diff --git a/Beam/yarn.lock b/Beam/yarn.lock index 2840897cb..9f3d2c606 100644 --- a/Beam/yarn.lock +++ b/Beam/yarn.lock @@ -8365,7 +8365,7 @@ fsevents@~2.3.2: "remp-beam@file:extensions/beam-module::locator=root-workspace-0b6124%40workspace%3A.": version: 1.0.0 - resolution: "remp-beam@file:extensions/beam-module#extensions/beam-module::hash=a0be56&locator=root-workspace-0b6124%40workspace%3A." + resolution: "remp-beam@file:extensions/beam-module#extensions/beam-module::hash=97dae9&locator=root-workspace-0b6124%40workspace%3A." dependencies: "@babel/core": ^7.0 "@remp/js-commons": ^1.3 @@ -8405,7 +8405,7 @@ fsevents@~2.3.2: vue2-filters: ^0.6.0 vuex: ^3.1.0 vuex-persistedstate: ^2.5.4 - checksum: 21e38ceb2970a59ddf24f543d7358797d8ef50d8d19b1002644302b066be6761fc39b1b5ab436b2c5134610edd13f0d0162c7597974f5d044f52f4373eae2dfe + checksum: 4d9c03da1fb5c01bd308ad04739f3cbf96ef63bedf8349b7b05be42f81255552f0115a64491c6b8c155b78d23b0a9450b70c987a7b14cc7f3169f4feba17b780 languageName: node linkType: hard diff --git a/Campaign/package.json b/Campaign/package.json index b59b0267c..310dfee76 100644 --- a/Campaign/package.json +++ b/Campaign/package.json @@ -23,6 +23,7 @@ "npm": ">=9", "yarn": ">=2" }, + "packageManager": "yarn@2.4.3", "dependencies": { "@babel/core": "^7.0", "@remp/js-commons": "^1.3", diff --git a/Mailer/extensions/mailer-module/package.json b/Mailer/extensions/mailer-module/package.json index e3242f1e9..f33811938 100644 --- a/Mailer/extensions/mailer-module/package.json +++ b/Mailer/extensions/mailer-module/package.json @@ -9,8 +9,11 @@ ], "private": true, "engines": { - "node": ">=18" + "node": ">=18", + "npm": ">=9", + "yarn": ">=2" }, + "packageManager": "yarn@2.4.3", "dependencies": { "@remp/js-commons": "^2.2.0", "animate.css": "^3.7.0", diff --git a/Mailer/package.json b/Mailer/package.json index 9feb4b1fe..cfda89268 100644 --- a/Mailer/package.json +++ b/Mailer/package.json @@ -18,6 +18,7 @@ "npm": ">=9", "yarn": ">=2" }, + "packageManager": "yarn@2.4.3", "dependencies": { "mailer-module": "file:extensions/mailer-module" }, diff --git a/Mailer/yarn.lock b/Mailer/yarn.lock index e1737c9ae..329a2d7aa 100644 --- a/Mailer/yarn.lock +++ b/Mailer/yarn.lock @@ -5489,7 +5489,7 @@ fsevents@~2.3.2: "mailer-module@file:extensions/mailer-module::locator=root-workspace-0b6124%40workspace%3A.": version: 2.0.0 - resolution: "mailer-module@file:extensions/mailer-module#extensions/mailer-module::hash=626296&locator=root-workspace-0b6124%40workspace%3A." + resolution: "mailer-module@file:extensions/mailer-module#extensions/mailer-module::hash=32b996&locator=root-workspace-0b6124%40workspace%3A." dependencies: "@remp/js-commons": ^2.2.0 animate.css: ^3.7.0 @@ -5522,7 +5522,7 @@ fsevents@~2.3.2: salvattore: ^1.0.9 trumbowyg: ^2.25.1 vue: ^2.6.14 - checksum: 1029c3d033e83b1434f9883c38053a54a9d3c7588d2cff025b494d0bde65d3604381bb705f48a9629d719b3847bf23d50f16931b47e2b1ee939ae2b91809e290 + checksum: 1586f3f3f59dabbe272a2d6f6ae3bbceecb90eda6fe44d8d29dc09f888919a96d4f44e5c87fd18a8b7b414b7892a59311008ce6fa39e999dde2ca2086f49004a languageName: node linkType: hard diff --git a/Package/remp/package.json b/Package/remp/package.json index 94dd598fb..5199cb88d 100644 --- a/Package/remp/package.json +++ b/Package/remp/package.json @@ -4,8 +4,11 @@ "author": "REMP", "license": "MIT", "engines": { - "node": ">=18" + "node": ">=18", + "npm": ">=9", + "yarn": ">=2" }, + "packageManager": "yarn@2.4.3", "repository": { "type": "git", "url": "git+https://github.com/remp2020/js-commons.git" diff --git a/Sso/package.json b/Sso/package.json index cf4c92ebc..078dd9343 100644 --- a/Sso/package.json +++ b/Sso/package.json @@ -14,6 +14,7 @@ "npm": ">=9", "yarn": ">=2" }, + "packageManager": "yarn@2.4.3", "dependencies": { "@remp/js-commons": "^1.3", "animate.css": "^3.7.2", diff --git a/changelogs/CHANGELOG-v3.1.md b/changelogs/CHANGELOG-v3.1.md index e1a7af85d..c579b57d7 100644 --- a/changelogs/CHANGELOG-v3.1.md +++ b/changelogs/CHANGELOG-v3.1.md @@ -4,6 +4,8 @@ - [3.1.2] [Beam]: Fixed schedules not being registered for Skeleton application. remp/remp#1292 - [3.1.2] [Beam]: Fixed commands not being available to execute for synchronous web event handlers. remp/remp#1292 - [3.1.2] [Beam]: Refactored system settings configuration so they're available within Beam module and for Skeleton apps. remp/remp#1292 +- [3.1.3]: Fixed issue with `yarn link` not being able to link JS packages due to version conflict. remp/remp#1293 +- [3.1.3]: Added explicit `packageManager` definition into `package.json` files so Yarn v3 doesn't complain about outdated lockfile. remp/remp#1294 ### [Beam] @@ -32,6 +34,7 @@ [3.1.1]: https://github.com/remp2020/remp/compare/3.1.0...3.1.1 [3.1.2]: https://github.com/remp2020/remp/compare/3.1.1...3.1.2 +[3.1.3]: https://github.com/remp2020/remp/compare/3.1.2...3.1.3 [Beam]: https://github.com/remp2020/remp/tree/master/Beam [Campaign]: https://github.com/remp2020/remp/tree/master/Campaign