Sam Tolmay 0e3db0bbb4

Merge remote-tracking branch 'origin/upgrade-yarn' into remove-gql ...

# Conflicts:
#	.pnp.cjs
#	.yarn/cache/@azure-ms-rest-nodeauth-npm-3.1.0-be2e193e17-2acfcd362e.zip
#	.yarn/cache/@babel-helper-compilation-targets-npm-7.15.4-8aadf9f3ed-539e4d2093.zip
#	.yarn/cache/@babel-helper-plugin-utils-npm-7.14.5-e35eef11cb-76404ef3aa.zip
#	.yarn/cache/@babel-helper-validator-option-npm-7.14.5-fd38dcf0bc-aded46b377.zip
#	.yarn/cache/@babel-plugin-proposal-class-properties-npm-7.14.5-c4f378db3a-c2f7bdfaad.zip
#	.yarn/cache/@babel-plugin-proposal-class-static-block-npm-7.15.4-00e9df5778-36ac2676b2.zip
#	.yarn/cache/@babel-plugin-proposal-export-namespace-from-npm-7.14.5-1539317bc6-500e36b13e.zip
#	.yarn/cache/@babel-plugin-proposal-json-strings-npm-7.14.5-07f111ee28-679711cf99.zip
#	.yarn/cache/@babel-plugin-proposal-logical-assignment-operators-npm-7.14.5-fac491fe8d-4245773009.zip
#	.yarn/cache/@babel-plugin-proposal-nullish-coalescing-operator-npm-7.14.5-f47974419f-2f81d7a9ab.zip
#	.yarn/cache/@babel-plugin-proposal-numeric-separator-npm-7.14.5-5dbb482582-8ff9281e6b.zip
#	.yarn/cache/@babel-plugin-proposal-optional-catch-binding-npm-7.14.5-6e93b6f5f4-8f239b0552.zip
#	.yarn/cache/@babel-plugin-proposal-optional-chaining-npm-7.14.5-0a1af66b08-c5e74f83ed.zip
#	.yarn/cache/@babel-plugin-proposal-private-methods-npm-7.14.5-160df10ab9-e3e665d1c8.zip
#	.yarn/cache/@babel-plugin-proposal-unicode-property-regex-npm-7.14.5-d36f372112-50471fd3d4.zip
#	.yarn/cache/@babel-plugin-syntax-class-static-block-npm-7.14.5-7bdd0ff1b3-43bef611dd.zip
#	.yarn/cache/@babel-plugin-syntax-jsx-npm-7.14.5-14192e29dd-d6f998d4c8.zip
#	.yarn/cache/@babel-plugin-syntax-top-level-await-npm-7.14.5-60a0a2e83b-642baff7c2.zip
#	.yarn/cache/@babel-plugin-transform-arrow-functions-npm-7.14.5-e2aa975bf4-9f62f77105.zip
#	.yarn/cache/@babel-plugin-transform-async-to-generator-npm-7.14.5-e1f5d64141-955b62db7c.zip
#	.yarn/cache/@babel-plugin-transform-block-scoped-functions-npm-7.14.5-00185d1841-389a1286da.zip
#	.yarn/cache/@babel-plugin-transform-computed-properties-npm-7.14.5-8751978a79-080dcf2c59.zip
#	.yarn/cache/@babel-plugin-transform-dotall-regex-npm-7.14.5-c2010d2608-1e4564243a.zip
#	.yarn/cache/@babel-plugin-transform-duplicate-keys-npm-7.14.5-6f8a6586c0-592409a294.zip
#	.yarn/cache/@babel-plugin-transform-literals-npm-7.14.5-bec88dbb09-6ae919e2a4.zip
#	.yarn/cache/@babel-plugin-transform-member-expression-literals-npm-7.14.5-a447eb232a-293e2b1d62.zip
#	.yarn/cache/@babel-plugin-transform-modules-amd-npm-7.14.5-79fbb0e386-0d766c6424.zip
#	.yarn/cache/@babel-plugin-transform-modules-umd-npm-7.14.5-8a2b4e7c42-6f6713a515.zip
#	.yarn/cache/@babel-plugin-transform-named-capturing-groups-regex-npm-7.14.9-0b8ffbd323-348f3f3190.zip
#	.yarn/cache/@babel-plugin-transform-new-target-npm-7.14.5-33db65f40f-c5a66830cc.zip
#	.yarn/cache/@babel-plugin-transform-parameters-npm-7.15.4-b1ba16f5ea-a158bbb067.zip
#	.yarn/cache/@babel-plugin-transform-property-literals-npm-7.14.5-515b03362a-0bd00959b7.zip
#	.yarn/cache/@babel-plugin-transform-react-display-name-npm-7.15.1-c2e6a9c450-898dc3bf2b.zip
#	.yarn/cache/@babel-plugin-transform-reserved-words-npm-7.14.5-2e9c4ba505-34e3440985.zip
#	.yarn/cache/@babel-plugin-transform-shorthand-properties-npm-7.14.5-493cceea15-1d1b10668a.zip
#	.yarn/cache/@babel-plugin-transform-sticky-regex-npm-7.14.5-0185c22ec2-d67c2a7cfc.zip
#	.yarn/cache/@babel-plugin-transform-template-literals-npm-7.14.5-60338f8fa2-ef9eb36a9c.zip
#	.yarn/cache/@babel-plugin-transform-typeof-symbol-npm-7.14.5-eca10e5acb-8f636abee9.zip
#	.yarn/cache/@babel-plugin-transform-unicode-regex-npm-7.14.5-2581bdf2c9-3ea3fc8085.zip
#	.yarn/cache/@babel-preset-modules-npm-0.1.5-15ffcd64c2-5a9cdbfc77.zip
#	.yarn/cache/@babel-runtime-corejs3-npm-7.15.4-cd01b983fb-acd1ebce77.zip
#	.yarn/cache/@babel-runtime-npm-7.15.4-52ce5bf6ea-64b6c250fd.zip
#	.yarn/cache/@discoveryjs-json-ext-npm-0.5.5-595932ce4b-804f702e7a.zip
#	.yarn/cache/@eslint-eslintrc-npm-0.4.3-ee1bbcab87-fa916db689.zip
#	.yarn/cache/@npmcli-git-npm-2.1.0-b85bc3f444-3c718672d9.zip
#	.yarn/cache/@npmcli-run-script-npm-1.8.6-a97e08ffbc-10fcc72737.zip
#	.yarn/cache/@octokit-endpoint-npm-6.0.12-d467db27fd-ff92bc2608.zip
#	.yarn/cache/@sendgrid-client-npm-7.5.0-f063cd7d41-23e991a235.zip
#	.yarn/cache/@sendgrid-helpers-npm-7.5.0-3d1d65bdae-30caee4a24.zip
#	.yarn/cache/@types-semver-npm-7.3.9-eb0d8b7243-62edbef515.zip
#	.yarn/cache/@wojtekmaj-enzyme-adapter-utils-npm-0.1.1-3f976b0aa2-89de687d46.zip
#	.yarn/cache/acorn-jsx-npm-5.3.2-d7594599ea-41c748fd26.zip
#	.yarn/cache/adal-node-npm-0.2.3-933b8c5f36-d651f24071.zip
#	.yarn/cache/apollo-server-core-npm-2.25.2-17277a84d0-c40461e691.zip
#	.yarn/cache/are-we-there-yet-npm-1.1.7-db9f39924e-2f23011558.zip
#	.yarn/cache/before-after-hook-npm-2.2.2-b463f0552f-06dd8fc2a1.zip
#	.yarn/cache/cacache-npm-15.3.0-a7e5239c6a-3ababe9fa2.zip
#	.yarn/cache/cacheable-request-npm-7.0.2-e64cc641fc-176a1fceb9.zip
#	.yarn/cache/clean-css-npm-4.2.4-5d1d0f2f9b-0f368d7310.zip
#	.yarn/cache/cli-spinners-npm-2.6.1-33ce2bad0f-d2b54d139b.zip
#	.yarn/cache/config-chain-npm-1.1.13-82e06afbc4-047fb0971b.zip
#	.yarn/cache/conventional-changelog-angular-npm-5.0.13-50e4a302c4-c35fc766bb.zip
#	.yarn/cache/css-select-npm-4.1.3-97d7b817c1-0259932ad2.zip
#	.yarn/cache/date-fns-npm-2.25.0-fe211b387d-492907de08.zip
#	.yarn/cache/enhanced-resolve-npm-5.8.3-24a728966e-71d33904bd.zip
#	.yarn/cache/es-abstract-npm-1.19.1-885c72759a-17d95ed8c0.zip
#	.yarn/cache/flatted-npm-3.2.2-d61e116742-2a7a8fdeac.zip
#	.yarn/cache/function.prototype.name-npm-1.1.5-e776a642bb-b9a1d5c1f1.zip
#	.yarn/cache/gaxios-npm-4.3.2-b78acb4075-63ec367a68.zip
#	.yarn/cache/globby-npm-11.0.4-592ce71cca-9f365b35b8.zip
#	.yarn/cache/gtoken-npm-5.3.1-d316026d7b-08df9e69df.zip
#	.yarn/cache/highlight.js-npm-10.7.3-247e67d5c0-2b7bc9890d.zip
#	.yarn/cache/istanbul-lib-source-maps-npm-4.0.1-af0f859df7-85ae0abd1d.zip
#	.yarn/cache/jsdom-npm-16.7.0-216c5c4bf9-a8592d024a.zip
#	.yarn/cache/libnpmaccess-npm-4.0.3-712e974776-a2c675f93e.zip
#	.yarn/cache/libnpmpublish-npm-4.0.2-8118e7577a-a8f92410ac.zip
#	.yarn/cache/nan-npm-2.15.0-505c98ef4d-85bc21e90b.zip
#	.yarn/cache/node-abi-npm-2.30.1-36a2c4e28a-815e2db6ef.zip
#	.yarn/cache/node-gyp-npm-8.3.0-11e93b166f-b79f8b8b40.zip
#	.yarn/cache/nth-check-npm-2.0.1-69558042d2-aed717639f.zip
#	.yarn/cache/object-inspect-npm-1.11.0-c9d4bd1487-7890688465.zip
#	.yarn/cache/pacote-npm-11.3.5-a5f591fb50-c41d5d6358.zip
#	.yarn/cache/pg-pool-npm-3.4.1-14f060ebff-8cf946739d.zip
#	.yarn/cache/postcss-npm-8.3.11-ded5d923bd-fa1530f7e1.zip
#	.yarn/cache/prompts-npm-2.4.2-f5d25d5eea-ccd7f7f8df.zip
#	.yarn/cache/rc-menu-npm-9.0.14-3ce565de19-7b89652e03.zip
#	.yarn/cache/rc-tabs-npm-11.10.2-e1c662acad-671f0a7d1c.zip
#	.yarn/cache/rc-virtual-list-npm-3.4.2-e70e59865f-1d5d007823.zip
#	.yarn/cache/string-width-npm-4.2.3-2c27177bae-748c979889.zip
#	.yarn/cache/strip-ansi-npm-6.0.1-caddc7cb40-9d3061240b.zip
#	.yarn/cache/subscriptions-transport-ws-npm-0.9.19-5f31f99bef-d305b2d9db.zip
#	.yarn/cache/table-npm-6.7.2-af27a1ebed-64f33994f3.zip
#	.yarn/cache/tapable-npm-2.2.1-8cf5ff3039-41089367e2.zip
#	.yarn/cache/tedious-npm-11.8.0-9f381f1a26-ed7dce8638.zip
#	.yarn/cache/unified-npm-9.2.2-65676eec78-1f0d970be2.zip
#	.yarn/cache/webpack-sources-npm-2.3.1-fac7f75ad9-28b9bebf5e.zip
#	.yarn/cache/ws-npm-6.2.2-ca62a10fa0-00d406fb98.zip
#	.yarnrc.yml
#	yarn.lock

2021-10-23 16:14:56 +02:00

63 KiB

Raw History

View Raw