diff --git a/.yarn/patches/@vue-apollo-composable-npm-4.0.0-beta.1-6fc2bfd7ec.patch b/.yarn/patches/@vue-apollo-composable-npm-4.0.0-beta.1-6fc2bfd7ec.patch deleted file mode 100644 index 1a4c1dedf..000000000 --- a/.yarn/patches/@vue-apollo-composable-npm-4.0.0-beta.1-6fc2bfd7ec.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/package.json b/package.json -index 2cb155979334911508c0647f14fe28fb7ac40295..f9310fdd18a18be20c3c67ebb723b2552de44d4f 100644 ---- a/package.json -+++ b/package.json -@@ -25,6 +25,10 @@ - "main": "dist/index.js", - "types": "dist/index.d.ts", - "module": "dist/index.esm.js", -+ "exports": { -+ "import": "./dist/index.esm.js", -+ "require": "./dist/index.js" -+ }, - "files": [ - "dist" - ], diff --git a/.yarn/patches/@vue-apollo-util-npm-4.0.0-beta.4-ab694c9566.patch b/.yarn/patches/@vue-apollo-util-npm-4.0.0-beta.6-7e26e14eb7.patch similarity index 100% rename from .yarn/patches/@vue-apollo-util-npm-4.0.0-beta.4-ab694c9566.patch rename to .yarn/patches/@vue-apollo-util-npm-4.0.0-beta.6-7e26e14eb7.patch diff --git a/package.json b/package.json index 64df28604..0d6eec886 100644 --- a/package.json +++ b/package.json @@ -158,26 +158,25 @@ }, "resolutions": { "@types/react": "https://registry.yarnpkg.com/@favware/skip-dependency/-/skip-dependency-1.2.0.tgz", - "express-session@^1.17.3": "patch:express-session@npm%3A1.17.3#./.yarn/patches/express-session-npm-1.17.3-0819dbe06c.patch", - "@apollo/client@^3.7.3": "patch:@apollo/client@npm%3A3.7.3#./.yarn/patches/@apollo-client-npm-3.7.3-99f37cd27e.patch", + "express-session": "patch:express-session@npm%3A1.17.3#./.yarn/patches/express-session-npm-1.17.3-0819dbe06c.patch", "tslib": "^2.4.0", - "mount-vue-component@^0.10.2": "patch:mount-vue-component@npm%3A0.10.2#./.yarn/patches/mount-vue-component-npm-0.10.2-4968f76fd9.patch", - "@vue/apollo-composable@4.0.0-beta.1": "patch:@vue/apollo-composable@npm%3A4.0.0-beta.1#./.yarn/patches/@vue-apollo-composable-npm-4.0.0-beta.1-6fc2bfd7ec.patch", + "mount-vue-component": "patch:mount-vue-component@npm%3A0.10.2#./.yarn/patches/mount-vue-component-npm-0.10.2-4968f76fd9.patch", "uuid@^8.3.0": "^9.0.0", "uuid@^8.3.2": "^9.0.0", "node-fetch-native": "^1.2.0", "destr": "^2.0.0", "@graphql-tools/schema": "^10.0.0", - "eslint-scope@^7.1.1": "patch:eslint-scope@npm%3A7.1.1#./.yarn/patches/eslint-scope-npm-7.1.1-23935eb377.patch", - "eslint-scope@^5.1.1": "patch:eslint-scope@npm%3A7.1.1#./.yarn/patches/eslint-scope-npm-7.1.1-23935eb377.patch", - "@vue/apollo-util@^4.0.0-beta.4": "patch:@vue/apollo-util@npm%3A4.0.0-beta.4#./.yarn/patches/@vue-apollo-util-npm-4.0.0-beta.4-ab694c9566.patch", - "@nuxt/content@^2.7.0": "patch:@nuxt/content@npm%3A2.7.0#./.yarn/patches/@nuxt-content-npm-2.7.0-425d472cf3.patch", - "nitropack@^2.5.2": "patch:nitropack@npm%3A2.5.2#./.yarn/patches/nitropack-npm-2.5.2-65c39b23d1.patch" + "vue-demi": "^0.14.5", + "@wry/trie": "^0.4.3", + "eslint-scope": "patch:eslint-scope@npm%3A7.1.1#./.yarn/patches/eslint-scope-npm-7.1.1-23935eb377.patch", + "@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" }, "resolutionsComments": { "@types/react": "Otherwise these types interfere with the types from vite: https://github.com/johnsoncodehk/volar/discussions/592#discussioncomment-1580518", "tslib": "some libraries still pull-in v1 of tslib, which is incompatible with the other libraries that use tslib v2 features", - "uuid/node-fetch-native/destr/schema": "nitro still has problems when multiple versions of packages are used" + "uuid/node-fetch-native/destr/schema/vue-demi/trie": "nitro still has problems when multiple versions of packages are used" }, "prisma": { "schema": "server/database/schema.prisma", diff --git a/server/e2e.test.ts b/server/e2e.test.ts index 640098fdf..190649c32 100644 --- a/server/e2e.test.ts +++ b/server/e2e.test.ts @@ -6,3 +6,16 @@ describe('index page', () => { expect(response.statusCode).toBe(200) }) }) + +describe('download', () => { + it('redirects to fosshub', async () => { + const response = (await root().get('/download')) as { + statusCode: number + headers: { location: string } + } + expect(response.statusCode).toBe(302) + expect(response.headers.location).toBe( + 'https://www.fosshub.com/JabRef.html', + ) + }) +}) diff --git a/yarn.lock b/yarn.lock index ca86a933a..360f9b6db 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7099,13 +7099,20 @@ __metadata: languageName: node linkType: hard -"@vue/apollo-util@npm:^4.0.0-beta.6": +"@vue/apollo-util@npm:4.0.0-beta.6": version: 4.0.0-beta.6 resolution: "@vue/apollo-util@npm:4.0.0-beta.6" checksum: f5849b8aefc3744a89d221dcf5e210249eaedce2a0699e002da781c4c342e2c00578a231b9cb93d45aba7596d345d1cd0bce05edd5e1f24f2b681bb50d534d97 languageName: node linkType: hard +"@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::locator=jabref-online%40workspace%3A.": + version: 4.0.0-beta.6 + resolution: "@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::version=4.0.0-beta.6&hash=ad66eb&locator=jabref-online%40workspace%3A." + checksum: db06d17d2678ddbe010699c81a28a91aef6c601a37d2ee2a8530c89e3f142776df7ef06abfab8ddd051d825cdd06dd3bbcdaee8aa11c3456b85308d7655624cd + languageName: node + linkType: hard + "@vue/babel-helper-vue-transform-on@npm:^1.0.2": version: 1.0.2 resolution: "@vue/babel-helper-vue-transform-on@npm:1.0.2" @@ -7439,16 +7446,7 @@ __metadata: languageName: node linkType: hard -"@wry/trie@npm:^0.3.0": - version: 0.3.2 - resolution: "@wry/trie@npm:0.3.2" - dependencies: - tslib: ^2.3.0 - checksum: 151d06b519e1ff1c3acf6ee6846161b1d7d50bbecd4c48e5cd1b05f9e37c30602aff02e88f20105f6e6c54ae4123f9c4eb7715044d7fd927d4ba4ec3e755cd36 - languageName: node - linkType: hard - -"@wry/trie@npm:^0.4.0": +"@wry/trie@npm:^0.4.3": version: 0.4.3 resolution: "@wry/trie@npm:0.4.3" dependencies: @@ -11443,16 +11441,6 @@ __metadata: languageName: node linkType: hard -"eslint-scope@npm:^7.2.0": - version: 7.2.0 - resolution: "eslint-scope@npm:7.2.0" - dependencies: - esrecurse: ^4.3.0 - estraverse: ^5.2.0 - checksum: 64591a2d8b244ade9c690b59ef238a11d5c721a98bcee9e9f445454f442d03d3e04eda88e95a4daec558220a99fa384309d9faae3d459bd40e7a81b4063980ae - languageName: node - linkType: hard - "eslint-scope@patch:eslint-scope@npm%3A7.1.1#./.yarn/patches/eslint-scope-npm-7.1.1-23935eb377.patch::locator=jabref-online%40workspace%3A.": version: 7.1.1 resolution: "eslint-scope@patch:eslint-scope@npm%3A7.1.1#./.yarn/patches/eslint-scope-npm-7.1.1-23935eb377.patch::version=7.1.1&hash=aca833&locator=jabref-online%40workspace%3A." @@ -18378,26 +18366,7 @@ __metadata: languageName: node linkType: hard -"pinia@npm:>=2.1.0": - version: 2.1.3 - resolution: "pinia@npm:2.1.3" - dependencies: - "@vue/devtools-api": ^6.5.0 - vue-demi: ">=0.14.5" - peerDependencies: - "@vue/composition-api": ^1.4.0 - typescript: ">=4.4.4" - vue: ^2.6.14 || ^3.3.0 - peerDependenciesMeta: - "@vue/composition-api": - optional: true - typescript: - optional: true - checksum: 2872000a2e75e210e1ae7bf6227fbc8a51ecdfd7a4db34da0029ed74f1040aa74ddc64efc30b883a14af972ed910a5021e84ed31ee9f62daf329df12c29f59bf - languageName: node - linkType: hard - -"pinia@npm:^2.1.4": +"pinia@npm:>=2.1.0, pinia@npm:^2.1.4": version: 2.1.4 resolution: "pinia@npm:2.1.4" dependencies: @@ -23433,7 +23402,7 @@ __metadata: languageName: node linkType: hard -"vue-demi@npm:>=0.14.5, vue-demi@npm:latest": +"vue-demi@npm:^0.14.5": version: 0.14.5 resolution: "vue-demi@npm:0.14.5" peerDependencies: @@ -23449,22 +23418,6 @@ __metadata: languageName: node linkType: hard -"vue-demi@npm:^0.13.1": - version: 0.13.11 - resolution: "vue-demi@npm:0.13.11" - peerDependencies: - "@vue/composition-api": ^1.0.0-rc.1 - vue: ^3.0.0-0 || ^2.6.0 - peerDependenciesMeta: - "@vue/composition-api": - optional: true - bin: - vue-demi-fix: bin/vue-demi-fix.js - vue-demi-switch: bin/vue-demi-switch.js - checksum: 0fbe9bf8ab7fe498ffa2bbd0cfc8f6f43a6bbaa5eda3e20ef1b70dca7c8b0ddb216a7ff2f632b694fe0735805638975abb441c621ec0bd2e6d4656353f316c15 - languageName: node - linkType: hard - "vue-devtools-stub@npm:^0.1.0": version: 0.1.0 resolution: "vue-devtools-stub@npm:0.1.0"