From bc6c5ab7a775cf8b49a08118c0685fe1f3fb698b Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Thu, 6 Apr 2023 10:02:49 +0200 Subject: [PATCH] Chore: Make utils package a fixed version again (too many problems otherwise) --- packages/app-cli/package.json | 2 +- packages/lib/package.json | 2 +- packages/plugin-repo-cli/package.json | 2 +- packages/tools/package.json | 2 +- yarn.lock | 54 +++------------------------ 5 files changed, 9 insertions(+), 53 deletions(-) diff --git a/packages/app-cli/package.json b/packages/app-cli/package.json index 3b9bcbbc9b..6b8fc1f863 100644 --- a/packages/app-cli/package.json +++ b/packages/app-cli/package.json @@ -43,7 +43,7 @@ "dependencies": { "@joplin/lib": "~2.11", "@joplin/renderer": "~2.11", - "@joplin/utils": "file:../utils", + "@joplin/utils": "~2.11", "aws-sdk": "2.1290.0", "chalk": "4.1.2", "compare-version": "0.1.2", diff --git a/packages/lib/package.json b/packages/lib/package.json index 51e6a1ff95..43b22d2d4e 100644 --- a/packages/lib/package.json +++ b/packages/lib/package.json @@ -38,7 +38,7 @@ "@joplin/renderer": "~2.11", "@joplin/turndown": "^4.0.65", "@joplin/turndown-plugin-gfm": "^1.0.47", - "@joplin/utils": "file:../utils", + "@joplin/utils": "~2.11", "@types/nanoid": "3.0.0", "async-mutex": "0.4.0", "base-64": "1.0.0", diff --git a/packages/plugin-repo-cli/package.json b/packages/plugin-repo-cli/package.json index ac1bd54bac..1ad8149093 100644 --- a/packages/plugin-repo-cli/package.json +++ b/packages/plugin-repo-cli/package.json @@ -20,7 +20,7 @@ "dependencies": { "@joplin/lib": "~2.11", "@joplin/tools": "~2.11", - "@joplin/utils": "file:../utils", + "@joplin/utils": "~2.11", "fs-extra": "11.1.1", "gh-release-assets": "2.0.1", "node-fetch": "2.6.7", diff --git a/packages/tools/package.json b/packages/tools/package.json index d29072afb8..f8a3ac61f0 100644 --- a/packages/tools/package.json +++ b/packages/tools/package.json @@ -22,7 +22,7 @@ "dependencies": { "@joplin/lib": "~2.11", "@joplin/renderer": "~2.11", - "@joplin/utils": "file:../utils", + "@joplin/utils": "~2.11", "dayjs": "1.11.7", "execa": "4.1.0", "fs-extra": "11.1.1", diff --git a/yarn.lock b/yarn.lock index e41e4f05aa..e21754cb81 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5090,7 +5090,7 @@ __metadata: "@joplin/renderer": ~2.11 "@joplin/turndown": ^4.0.65 "@joplin/turndown-plugin-gfm": ^1.0.47 - "@joplin/utils": "file:../utils" + "@joplin/utils": ~2.11 "@types/fs-extra": 9.0.13 "@types/jest": 29.2.6 "@types/js-yaml": 4.0.5 @@ -5196,7 +5196,7 @@ __metadata: dependencies: "@joplin/lib": ~2.11 "@joplin/tools": ~2.11 - "@joplin/utils": "file:../utils" + "@joplin/utils": ~2.11 "@types/fs-extra": 9.0.13 "@types/jest": 29.2.6 "@types/node": 18.11.18 @@ -5350,7 +5350,7 @@ __metadata: "@joplin/fork-htmlparser2": ^4.1.43 "@joplin/lib": ~2.11 "@joplin/renderer": ~2.11 - "@joplin/utils": "file:../utils" + "@joplin/utils": ~2.11 "@rmp135/sql-ts": 1.16.0 "@types/fs-extra": 9.0.13 "@types/jest": 29.2.6 @@ -5414,51 +5414,7 @@ __metadata: languageName: unknown linkType: soft -"@joplin/utils@file:../utils::locator=%40joplin%2Flib%40workspace%3Apackages%2Flib": - version: 2.11.0 - resolution: "@joplin/utils@file:../utils#../utils::hash=259fa9&locator=%40joplin%2Flib%40workspace%3Apackages%2Flib" - dependencies: - execa: 5.1.1 - fs-extra: 11.1.1 - node-fetch: 2.6.7 - checksum: ca7728eac50663c3b7160b06f8d887f0f0b4902fdb03ee809616419c947b32f2935a0ddeddbf31fd54b4b9a6d4542e5d52c51f7732a116e8e3c97242782151eb - languageName: node - linkType: hard - -"@joplin/utils@file:../utils::locator=%40joplin%2Fplugin-repo-cli%40workspace%3Apackages%2Fplugin-repo-cli": - version: 2.11.0 - resolution: "@joplin/utils@file:../utils#../utils::hash=259fa9&locator=%40joplin%2Fplugin-repo-cli%40workspace%3Apackages%2Fplugin-repo-cli" - dependencies: - execa: 5.1.1 - fs-extra: 11.1.1 - node-fetch: 2.6.7 - checksum: ca7728eac50663c3b7160b06f8d887f0f0b4902fdb03ee809616419c947b32f2935a0ddeddbf31fd54b4b9a6d4542e5d52c51f7732a116e8e3c97242782151eb - languageName: node - linkType: hard - -"@joplin/utils@file:../utils::locator=%40joplin%2Ftools%40workspace%3Apackages%2Ftools": - version: 2.11.0 - resolution: "@joplin/utils@file:../utils#../utils::hash=259fa9&locator=%40joplin%2Ftools%40workspace%3Apackages%2Ftools" - dependencies: - execa: 5.1.1 - fs-extra: 11.1.1 - node-fetch: 2.6.7 - checksum: ca7728eac50663c3b7160b06f8d887f0f0b4902fdb03ee809616419c947b32f2935a0ddeddbf31fd54b4b9a6d4542e5d52c51f7732a116e8e3c97242782151eb - languageName: node - linkType: hard - -"@joplin/utils@file:../utils::locator=joplin%40workspace%3Apackages%2Fapp-cli": - version: 2.11.0 - resolution: "@joplin/utils@file:../utils#../utils::hash=259fa9&locator=joplin%40workspace%3Apackages%2Fapp-cli" - dependencies: - execa: 5.1.1 - fs-extra: 11.1.1 - node-fetch: 2.6.7 - checksum: ca7728eac50663c3b7160b06f8d887f0f0b4902fdb03ee809616419c947b32f2935a0ddeddbf31fd54b4b9a6d4542e5d52c51f7732a116e8e3c97242782151eb - languageName: node - linkType: hard - -"@joplin/utils@workspace:packages/utils": +"@joplin/utils@workspace:packages/utils, @joplin/utils@~2.11": version: 0.0.0-use.local resolution: "@joplin/utils@workspace:packages/utils" dependencies: @@ -21215,7 +21171,7 @@ __metadata: "@joplin/lib": ~2.11 "@joplin/renderer": ~2.11 "@joplin/tools": ~2.11 - "@joplin/utils": "file:../utils" + "@joplin/utils": ~2.11 "@types/fs-extra": 9.0.13 "@types/jest": 29.2.6 "@types/node": 18.11.18