diff --git a/patches/redis-mock+0.56.3.patch b/.yarn/patches/redis-mock-npm-0.56.3-967bd7c6ea.patch similarity index 68% rename from patches/redis-mock+0.56.3.patch rename to .yarn/patches/redis-mock-npm-0.56.3-967bd7c6ea.patch index 052f24f11..b022ec7a1 100644 --- a/patches/redis-mock+0.56.3.patch +++ b/.yarn/patches/redis-mock-npm-0.56.3-967bd7c6ea.patch @@ -1,7 +1,7 @@ -diff --git a/node_modules/redis-mock/lib/server/redis-db.js b/node_modules/redis-mock/lib/server/redis-db.js -index 35583cc..2eea5df 100644 ---- a/node_modules/redis-mock/lib/server/redis-db.js -+++ b/node_modules/redis-mock/lib/server/redis-db.js +diff --git a/lib/server/redis-db.js b/lib/server/redis-db.js +index 35583cc92b5d0b26ac9e8373a2808b133c188552..2eea5dfa3b11ca76891dc11cd8e936533fa1d28b 100644 +--- a/lib/server/redis-db.js ++++ b/lib/server/redis-db.js @@ -28,7 +28,8 @@ class RedisDb { * * The server contains a log of logic. It only feels natural to split it into multiple files diff --git a/package.json b/package.json index 465e7d2bc..a5b98ebae 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "lint": "yarn lint:eslint && yarn lint:prettier", "lint:eslint": "eslint --ext .ts,.js,.vue,.graphql --ignore-path .gitignore --report-unused-disable-directives .", "lint:prettier": "prettier --check --ignore-path .gitignore .", - "postinstall": "patch-package && nuxi prepare && yarn generate", + "postinstall": "nuxi prepare && yarn generate", "test": "vitest --no-threads", "test:integration": "vitest integration.test.ts --no-threads", "test:unit": "vitest spec.ts", @@ -140,7 +140,6 @@ "nuxt-icon": "^0.4.2", "nuxt-seo-kit": "^1.3.9", "nuxt-vitest": "^0.9.0", - "patch-package": "^7.0.0", "postinstall-postinstall": "^2.1.0", "prettier": "^3.0.3", "prettier-plugin-organize-imports": "^3.2.3", @@ -171,7 +170,8 @@ "@wry/trie": "^0.4.3", "@vue/apollo-util": "patch:@vue/apollo-util@npm%3A4.0.0-beta.6#./.yarn/patches/@vue-apollo-util-npm-4.0.0-beta.6-7e26e14eb7.patch", "@nuxt/content": "patch:@nuxt/content@npm%3A2.7.0#./.yarn/patches/@nuxt-content-npm-2.7.0-425d472cf3.patch", - "nitropack": "patch:nitropack@npm%3A2.5.2#./.yarn/patches/nitropack-npm-2.5.2-65c39b23d1.patch" + "nitropack": "patch:nitropack@npm%3A2.5.2#./.yarn/patches/nitropack-npm-2.5.2-65c39b23d1.patch", + "redis-mock@^0.56.3": "patch:redis-mock@npm%3A0.56.3#./.yarn/patches/redis-mock-npm-0.56.3-967bd7c6ea.patch" }, "resolutionsComments": { "@types/react": "Otherwise these types interfere with the types from vite: https://github.com/johnsoncodehk/volar/discussions/592#discussioncomment-1580518", diff --git a/yarn.lock b/yarn.lock index 61318fc13..e05542f14 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7712,13 +7712,6 @@ __metadata: languageName: node linkType: hard -"@yarnpkg/lockfile@npm:^1.1.0": - version: 1.1.0 - resolution: "@yarnpkg/lockfile@npm:1.1.0" - checksum: 05b881b4866a3546861fee756e6d3812776ea47fa6eb7098f983d6d0eefa02e12b66c3fff931574120f196286a7ad4879ce02743c8bb2be36c6a576c7852083a - languageName: node - linkType: hard - "abbrev@npm:1, abbrev@npm:^1.0.0": version: 1.1.1 resolution: "abbrev@npm:1.1.1" @@ -9284,7 +9277,7 @@ __metadata: languageName: node linkType: hard -"ci-info@npm:^3.4.0, ci-info@npm:^3.7.0, ci-info@npm:^3.8.0": +"ci-info@npm:^3.4.0, ci-info@npm:^3.8.0": version: 3.8.0 resolution: "ci-info@npm:3.8.0" checksum: d0a4d3160497cae54294974a7246202244fff031b0a6ea20dd57b10ec510aa17399c41a1b0982142c105f3255aff2173e5c0dd7302ee1b2f28ba3debda375098 @@ -12366,15 +12359,6 @@ __metadata: languageName: node linkType: hard -"find-yarn-workspace-root@npm:^2.0.0": - version: 2.0.0 - resolution: "find-yarn-workspace-root@npm:2.0.0" - dependencies: - micromatch: ^4.0.2 - checksum: fa5ca8f9d08fe7a54ce7c0a5931ff9b7e36f9ee7b9475fb13752bcea80ec6b5f180fa5102d60b376d5526ce924ea3fc6b19301262efa0a5d248dd710f3644242 - languageName: node - linkType: hard - "flat-cache@npm:^3.0.4": version: 3.0.4 resolution: "flat-cache@npm:3.0.4" @@ -12530,7 +12514,7 @@ __metadata: languageName: node linkType: hard -"fs-extra@npm:^9.0.0, fs-extra@npm:^9.0.1": +"fs-extra@npm:^9.0.1": version: 9.1.0 resolution: "fs-extra@npm:9.1.0" dependencies: @@ -14788,7 +14772,6 @@ __metadata: nuxt-seo-kit: ^1.3.9 nuxt-vitest: ^0.9.0 passport: ^0.6.0 - patch-package: ^7.0.0 pinia: ^2.1.4 postinstall-postinstall: ^2.1.0 prettier: ^3.0.3 @@ -15232,15 +15215,6 @@ __metadata: languageName: node linkType: hard -"klaw-sync@npm:^6.0.0": - version: 6.0.0 - resolution: "klaw-sync@npm:6.0.0" - dependencies: - graceful-fs: ^4.1.11 - checksum: 0da397f8961313c3ef8f79fb63af9002cde5a8fb2aeb1a37351feff0dd6006129c790400c3f5c3b4e757bedcabb13d21ec0a5eaef5a593d59515d4f2c291e475 - languageName: node - linkType: hard - "kleur@npm:^3.0.3": version: 3.0.3 resolution: "kleur@npm:3.0.3" @@ -17996,7 +17970,7 @@ __metadata: languageName: node linkType: hard -"open@npm:^7.0.3, open@npm:^7.0.4, open@npm:^7.4.2": +"open@npm:^7.0.3, open@npm:^7.0.4": version: 7.4.2 resolution: "open@npm:7.4.2" dependencies: @@ -18398,30 +18372,6 @@ __metadata: languageName: node linkType: hard -"patch-package@npm:^7.0.0": - version: 7.0.0 - resolution: "patch-package@npm:7.0.0" - dependencies: - "@yarnpkg/lockfile": ^1.1.0 - chalk: ^4.1.2 - ci-info: ^3.7.0 - cross-spawn: ^7.0.3 - find-yarn-workspace-root: ^2.0.0 - fs-extra: ^9.0.0 - klaw-sync: ^6.0.0 - minimist: ^1.2.6 - open: ^7.4.2 - rimraf: ^2.6.3 - semver: ^5.6.0 - slash: ^2.0.0 - tmp: ^0.0.33 - yaml: ^2.2.2 - bin: - patch-package: index.js - checksum: 63f6589320f8953ac06b5c0c1549c82ef051aea81db91173157ab270a8f4910deb895e0b4d49ee1626a4a0a02d74f134bdbeb76052b639a2239e2df83c4a7ce6 - languageName: node - linkType: hard - "path-case@npm:^3.0.4": version: 3.0.4 resolution: "path-case@npm:3.0.4" @@ -19998,13 +19948,20 @@ __metadata: languageName: node linkType: hard -"redis-mock@npm:^0.56.3": +"redis-mock@npm:0.56.3": version: 0.56.3 resolution: "redis-mock@npm:0.56.3" checksum: 8c1293a59610c89a13849191de62aec9e68cb0a116e898b8fd5235235100f987caaeb5dacf56a076263474a2f556bd7fc2e7d2c52364a940f392dacb178b9ff4 languageName: node linkType: hard +"redis-mock@patch:redis-mock@npm%3A0.56.3#./.yarn/patches/redis-mock-npm-0.56.3-967bd7c6ea.patch::locator=jabref-online%40workspace%3A.": + version: 0.56.3 + resolution: "redis-mock@patch:redis-mock@npm%3A0.56.3#./.yarn/patches/redis-mock-npm-0.56.3-967bd7c6ea.patch::version=0.56.3&hash=b687db&locator=jabref-online%40workspace%3A." + checksum: 7556fce00760a44f4969d62e1b622005c76c48f08667c81bf6000975b630cc59c7220437d0e4655a6eb61dea9277621389dfe2b668b8c004908158be1f652701 + languageName: node + linkType: hard + "redis-parser@npm:^3.0.0": version: 3.0.0 resolution: "redis-parser@npm:3.0.0" @@ -20481,7 +20438,7 @@ __metadata: languageName: node linkType: hard -"rimraf@npm:^2.6.1, rimraf@npm:^2.6.2, rimraf@npm:^2.6.3": +"rimraf@npm:^2.6.1, rimraf@npm:^2.6.2": version: 2.7.1 resolution: "rimraf@npm:2.7.1" dependencies: @@ -21080,13 +21037,6 @@ __metadata: languageName: node linkType: hard -"slash@npm:^2.0.0": - version: 2.0.0 - resolution: "slash@npm:2.0.0" - checksum: 512d4350735375bd11647233cb0e2f93beca6f53441015eea241fe784d8068281c3987fbaa93e7ef1c38df68d9c60013045c92837423c69115297d6169aa85e6 - languageName: node - linkType: hard - "slash@npm:^3.0.0": version: 3.0.0 resolution: "slash@npm:3.0.0"