diff --git a/.github/workflows/remix-sandbox.yml b/.github/workflows/remix-sandbox.yml index 888fa909a..1a600d3b2 100644 --- a/.github/workflows/remix-sandbox.yml +++ b/.github/workflows/remix-sandbox.yml @@ -32,7 +32,7 @@ jobs: uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} - cache: pnpm + # cache: pnpm cache-dependency-path: remix-sandbox/pnpm-lock.yaml - run: pnpm i - run: cp app/env.sample.ts app/env.ts diff --git a/next-runtime/.npmrc b/next-runtime/.npmrc new file mode 100644 index 000000000..fa4e09523 --- /dev/null +++ b/next-runtime/.npmrc @@ -0,0 +1 @@ +strict-peer-dependencies=false \ No newline at end of file diff --git a/next-runtime/package.json b/next-runtime/package.json index a884a9a2c..328d6b8c1 100644 --- a/next-runtime/package.json +++ b/next-runtime/package.json @@ -34,5 +34,5 @@ "prisma": { "seed": "node -r esbuild-register prisma/seed.ts" }, - "packageManager": "pnpm@6.32.13" + "packageManager": "pnpm@7.1.0" } diff --git a/remix-sandbox/.npmrc b/remix-sandbox/.npmrc index c483022c0..1cfbd6f01 100644 --- a/remix-sandbox/.npmrc +++ b/remix-sandbox/.npmrc @@ -1 +1,2 @@ -shamefully-hoist=true \ No newline at end of file +shamefully-hoist=true +strict-peer-dependencies=false \ No newline at end of file diff --git a/remix-sandbox/package.json b/remix-sandbox/package.json index 54625ae05..1718fcf13 100644 --- a/remix-sandbox/package.json +++ b/remix-sandbox/package.json @@ -13,7 +13,7 @@ "lint": "eslint . --ext .ts,.tsx --ignore-path .gitignore", "fmt": "prettier --write .", "fix:all": "pnpm run lint --fix && pnpm run fmt && prisma format && tsc --noEmit", - "check:all": "pnpm run lint && pnpm run fmt -- --check && tsc --noEmit" + "check:all": "pnpm run lint && pnpm run fmt --check && tsc --noEmit" }, "dependencies": { "@hookform/resolvers": "2.8.8", @@ -60,5 +60,5 @@ "prisma": { "seed": "node --require esbuild-register prisma/seed.ts" }, - "packageManager": "pnpm@6.32.13" + "packageManager": "pnpm@7.1.0" } diff --git a/remix-sandbox/pnpm-lock.yaml b/remix-sandbox/pnpm-lock.yaml index 610126462..38d0d2231 100644 --- a/remix-sandbox/pnpm-lock.yaml +++ b/remix-sandbox/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: 5.3 +lockfileVersion: 5.4 specifiers: '@hookform/resolvers': 2.8.8 @@ -39,9 +39,9 @@ specifiers: dependencies: '@hookform/resolvers': 2.8.8_react-hook-form@7.31.1 '@prisma/client': 3.14.0_prisma@3.14.0 - '@remix-run/node': 1.4.3_react-dom@18.1.0+react@18.1.0 - '@remix-run/react': 1.4.3_react-dom@18.1.0+react@18.1.0 - '@remix-run/serve': 1.4.3_react-dom@18.1.0+react@18.1.0 + '@remix-run/node': 1.4.3_ef5jwxihqo6n7gxfmzogljlgcm + '@remix-run/react': 1.4.3_ef5jwxihqo6n7gxfmzogljlgcm + '@remix-run/serve': 1.4.3_ef5jwxihqo6n7gxfmzogljlgcm bcryptjs: 2.4.3 classnames: 2.3.1 dayjs: 1.11.2 @@ -54,8 +54,8 @@ dependencies: zod: 3.16.0 devDependencies: - '@remix-run/dev': 1.4.3_react-dom@18.1.0+react@18.1.0 - '@remix-run/eslint-config': 1.4.3_9f050c02f60cdf2007f4227ed437fbd4 + '@remix-run/dev': 1.4.3_ef5jwxihqo6n7gxfmzogljlgcm + '@remix-run/eslint-config': 1.4.3_t4cqyaxwbtpsab7uej7nin732q '@types/bcryptjs': 2.4.2 '@types/react': 18.0.9 '@types/react-dom': 18.0.4 @@ -142,7 +142,7 @@ packages: - supports-color dev: true - /@babel/eslint-parser/7.17.0_035b3d23fd8620ffc8b252e0ab28a400: + /@babel/eslint-parser/7.17.0_annt2i75qyqp7sfsklqkwkfeaa: resolution: {integrity: sha512-PUEJ7ZBXbRkbq3qqM/jZ2nIuakUBqCYc7Qf52Lj7dlZ6zERnqisdHioL0l4wwQZnmskMeasqUNzLBFKs3nylXA==} engines: {node: ^10.13.0 || ^12.13.0 || >=14.0.0} peerDependencies: @@ -784,7 +784,7 @@ packages: requiresBuild: true dev: true - /@remix-run/dev/1.4.3_react-dom@18.1.0+react@18.1.0: + /@remix-run/dev/1.4.3_ef5jwxihqo6n7gxfmzogljlgcm: resolution: {integrity: sha512-uvN0UzN97KlGIyotQKB631N92eRAffsMmzC6meoqrejZ9aYQrIM0l/hX3nMjjmbCTKI1Dq29szpMIn6fs5T78g==} hasBin: true dependencies: @@ -793,7 +793,7 @@ packages: '@babel/preset-typescript': 7.16.7_@babel+core@7.17.8 '@esbuild-plugins/node-modules-polyfill': 0.1.4_esbuild@0.14.22 '@npmcli/package-json': 2.0.0 - '@remix-run/server-runtime': 1.4.3_react-dom@18.1.0+react@18.1.0 + '@remix-run/server-runtime': 1.4.3_ef5jwxihqo6n7gxfmzogljlgcm cacache: 15.3.0 chalk: 4.1.2 chokidar: 3.5.3 @@ -839,7 +839,7 @@ packages: - utf-8-validate dev: true - /@remix-run/eslint-config/1.4.3_9f050c02f60cdf2007f4227ed437fbd4: + /@remix-run/eslint-config/1.4.3_t4cqyaxwbtpsab7uej7nin732q: resolution: {integrity: sha512-eDWw9e0vId9ogC1lI75514wJeIFqE4bcSOl1u3JwC6H8rEXBuuPuAQQzjBdL61naEmAvS1yKfbUzmbP6ghEPog==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -852,22 +852,22 @@ packages: optional: true dependencies: '@babel/core': 7.17.10 - '@babel/eslint-parser': 7.17.0_035b3d23fd8620ffc8b252e0ab28a400 + '@babel/eslint-parser': 7.17.0_annt2i75qyqp7sfsklqkwkfeaa '@babel/preset-react': 7.16.7_@babel+core@7.17.10 '@rushstack/eslint-patch': 1.1.3 - '@typescript-eslint/eslint-plugin': 5.22.0_9817cbad956b8aa5d1e3d9ec99e4a1e4 - '@typescript-eslint/parser': 5.22.0_eslint@8.15.0+typescript@4.6.4 + '@typescript-eslint/eslint-plugin': 5.22.0_tal4xlmvnofklupd3hwjtzfb4q + '@typescript-eslint/parser': 5.22.0_hcfsmds2fshutdssjqluwm76uu eslint: 8.15.0 eslint-import-resolver-node: 0.3.6 - eslint-import-resolver-typescript: 2.7.1_3587bf9a15dd535ddd6f5fd34d80da85 - eslint-plugin-import: 2.26.0_ed7b04c666a57ee9b481db28c5d72f33 - eslint-plugin-jest: 26.1.5_46506874510547d01dbac41d978b50a1 + eslint-import-resolver-typescript: 2.7.1_gwd37gqv3vjv3xlpl7ju3ag2qu + eslint-plugin-import: 2.26.0_5v5qjrtguv7otneb3mumlvzpgm + eslint-plugin-jest: 26.1.5_izigq5cravd5ahn2yqozpc2que eslint-plugin-jest-dom: 4.0.1_eslint@8.15.0 eslint-plugin-jsx-a11y: 6.5.1_eslint@8.15.0 eslint-plugin-node: 11.1.0_eslint@8.15.0 eslint-plugin-react: 7.29.4_eslint@8.15.0 eslint-plugin-react-hooks: 4.5.0_eslint@8.15.0 - eslint-plugin-testing-library: 5.4.0_eslint@8.15.0+typescript@4.6.4 + eslint-plugin-testing-library: 5.4.0_hcfsmds2fshutdssjqluwm76uu react: 18.1.0 react-dom: 18.1.0_react@18.1.0 typescript: 4.6.4 @@ -877,12 +877,12 @@ packages: - supports-color dev: true - /@remix-run/express/1.4.3_a6175afc262ed1adf44b514b2c262a2b: + /@remix-run/express/1.4.3_uylvv7bgf3i235clkffsyjrkfm: resolution: {integrity: sha512-GK/+eZd4TylqK4ZpGMhcO9cOJbbAgg3oWD8XqSGuYrjDI3uuwXTeOoq8kr/+o0USJhAhs7uLCQbEGgaayl01lg==} peerDependencies: express: ^4.17.1 dependencies: - '@remix-run/node': 1.4.3_react-dom@18.1.0+react@18.1.0 + '@remix-run/node': 1.4.3_ef5jwxihqo6n7gxfmzogljlgcm express: 4.18.1 transitivePeerDependencies: - encoding @@ -890,10 +890,10 @@ packages: - react-dom dev: false - /@remix-run/node/1.4.3_react-dom@18.1.0+react@18.1.0: + /@remix-run/node/1.4.3_ef5jwxihqo6n7gxfmzogljlgcm: resolution: {integrity: sha512-2x3BQ2qrA1v4Viu+GYMNMxxflnT5QcyOsPNCNvLjLm4o1pODHxYmp+2TEcZRgDqSTXgA7PNYlsEgG0BN/T33QA==} dependencies: - '@remix-run/server-runtime': 1.4.3_react-dom@18.1.0+react@18.1.0 + '@remix-run/server-runtime': 1.4.3_ef5jwxihqo6n7gxfmzogljlgcm '@types/busboy': 0.3.2 '@types/node-fetch': 2.6.1 '@web-std/file': 3.0.2 @@ -910,7 +910,7 @@ packages: - react-dom dev: false - /@remix-run/react/1.4.3_react-dom@18.1.0+react@18.1.0: + /@remix-run/react/1.4.3_ef5jwxihqo6n7gxfmzogljlgcm: resolution: {integrity: sha512-E2lyoPiy2r4Ymuh2Jsf5MuaeZgzYQ/J6sBbGG4Sy23p5B6edvJUNR4wCjVP96cA9Kwon0PjxkGwgY4ye1zwJvQ==} peerDependencies: react: '>=16.8' @@ -919,14 +919,14 @@ packages: history: 5.3.0 react: 18.1.0 react-dom: 18.1.0_react@18.1.0 - react-router-dom: 6.3.0_react-dom@18.1.0+react@18.1.0 + react-router-dom: 6.3.0_ef5jwxihqo6n7gxfmzogljlgcm dev: false - /@remix-run/serve/1.4.3_react-dom@18.1.0+react@18.1.0: + /@remix-run/serve/1.4.3_ef5jwxihqo6n7gxfmzogljlgcm: resolution: {integrity: sha512-/Vtj3+4icXZQFBu/k1ru4xR3PgXPju3V71YAKjUZn5WshH44si4n8rwhFYN7gmmF7Dbx6YNwk1+QIKfpaJUyZw==} hasBin: true dependencies: - '@remix-run/express': 1.4.3_a6175afc262ed1adf44b514b2c262a2b + '@remix-run/express': 1.4.3_uylvv7bgf3i235clkffsyjrkfm compression: 1.7.4 express: 4.18.1 morgan: 1.10.0 @@ -937,7 +937,7 @@ packages: - supports-color dev: false - /@remix-run/server-runtime/1.4.3_react-dom@18.1.0+react@18.1.0: + /@remix-run/server-runtime/1.4.3_ef5jwxihqo6n7gxfmzogljlgcm: resolution: {integrity: sha512-NgzoEAlIuZWv53oZRgxGz+jqkEtAa+veAuxlp5/UcZ/VhygpYIcfKwdx4eCOqJOi1TqILNWrh3cedEVvV0jccQ==} peerDependencies: react: '>=16.8' @@ -948,7 +948,7 @@ packages: jsesc: 3.0.2 react: 18.1.0 react-dom: 18.1.0_react@18.1.0 - react-router-dom: 6.3.0_react-dom@18.1.0+react@18.1.0 + react-router-dom: 6.3.0_ef5jwxihqo6n7gxfmzogljlgcm set-cookie-parser: 2.4.8 source-map: 0.7.3 @@ -1148,7 +1148,7 @@ packages: resolution: {integrity: sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==} dev: true - /@typescript-eslint/eslint-plugin/5.22.0_9817cbad956b8aa5d1e3d9ec99e4a1e4: + /@typescript-eslint/eslint-plugin/5.22.0_tal4xlmvnofklupd3hwjtzfb4q: resolution: {integrity: sha512-YCiy5PUzpAeOPGQ7VSGDEY2NeYUV1B0swde2e0HzokRsHBYjSdF6DZ51OuRZxVPHx0032lXGLvOMls91D8FXlg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1159,10 +1159,10 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/parser': 5.22.0_eslint@8.15.0+typescript@4.6.4 + '@typescript-eslint/parser': 5.22.0_hcfsmds2fshutdssjqluwm76uu '@typescript-eslint/scope-manager': 5.22.0 - '@typescript-eslint/type-utils': 5.22.0_eslint@8.15.0+typescript@4.6.4 - '@typescript-eslint/utils': 5.22.0_eslint@8.15.0+typescript@4.6.4 + '@typescript-eslint/type-utils': 5.22.0_hcfsmds2fshutdssjqluwm76uu + '@typescript-eslint/utils': 5.22.0_hcfsmds2fshutdssjqluwm76uu debug: 4.3.4 eslint: 8.15.0 functional-red-black-tree: 1.0.1 @@ -1175,7 +1175,7 @@ packages: - supports-color dev: true - /@typescript-eslint/parser/5.22.0_eslint@8.15.0+typescript@4.6.4: + /@typescript-eslint/parser/5.22.0_hcfsmds2fshutdssjqluwm76uu: resolution: {integrity: sha512-piwC4krUpRDqPaPbFaycN70KCP87+PC5WZmrWs+DlVOxxmF+zI6b6hETv7Quy4s9wbkV16ikMeZgXsvzwI3icQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1203,7 +1203,7 @@ packages: '@typescript-eslint/visitor-keys': 5.22.0 dev: true - /@typescript-eslint/type-utils/5.22.0_eslint@8.15.0+typescript@4.6.4: + /@typescript-eslint/type-utils/5.22.0_hcfsmds2fshutdssjqluwm76uu: resolution: {integrity: sha512-iqfLZIsZhK2OEJ4cQ01xOq3NaCuG5FQRKyHicA3xhZxMgaxQazLUHbH/B2k9y5i7l3+o+B5ND9Mf1AWETeMISA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -1213,7 +1213,7 @@ packages: typescript: optional: true dependencies: - '@typescript-eslint/utils': 5.22.0_eslint@8.15.0+typescript@4.6.4 + '@typescript-eslint/utils': 5.22.0_hcfsmds2fshutdssjqluwm76uu debug: 4.3.4 eslint: 8.15.0 tsutils: 3.21.0_typescript@4.6.4 @@ -1248,7 +1248,7 @@ packages: - supports-color dev: true - /@typescript-eslint/utils/5.22.0_eslint@8.15.0+typescript@4.6.4: + /@typescript-eslint/utils/5.22.0_hcfsmds2fshutdssjqluwm76uu: resolution: {integrity: sha512-HodsGb037iobrWSUMS7QH6Hl1kppikjA1ELiJlNSTYf/UdMEwzgj0WIp+lBNb6WZ3zTwb0tEz51j0Wee3iJ3wQ==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2731,7 +2731,7 @@ packages: - supports-color dev: true - /eslint-import-resolver-typescript/2.7.1_3587bf9a15dd535ddd6f5fd34d80da85: + /eslint-import-resolver-typescript/2.7.1_gwd37gqv3vjv3xlpl7ju3ag2qu: resolution: {integrity: sha512-00UbgGwV8bSgUv34igBDbTOtKhqoRMy9bFjNehT40bXg6585PNIct8HhXZ0SybqB9rWtXj9crcku8ndDn/gIqQ==} engines: {node: '>=4'} peerDependencies: @@ -2740,7 +2740,7 @@ packages: dependencies: debug: 4.3.4 eslint: 8.15.0 - eslint-plugin-import: 2.26.0_ed7b04c666a57ee9b481db28c5d72f33 + eslint-plugin-import: 2.26.0_5v5qjrtguv7otneb3mumlvzpgm glob: 7.2.0 is-glob: 4.0.3 resolve: 1.22.0 @@ -2749,7 +2749,7 @@ packages: - supports-color dev: true - /eslint-module-utils/2.7.3_55713e2aa11b13ca130ad6024481bc1f: + /eslint-module-utils/2.7.3_kvyt4kvbdmj4ueyk2ybejan4d4: resolution: {integrity: sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==} engines: {node: '>=4'} peerDependencies: @@ -2767,10 +2767,10 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.22.0_eslint@8.15.0+typescript@4.6.4 + '@typescript-eslint/parser': 5.22.0_hcfsmds2fshutdssjqluwm76uu debug: 3.2.7 eslint-import-resolver-node: 0.3.6 - eslint-import-resolver-typescript: 2.7.1_3587bf9a15dd535ddd6f5fd34d80da85 + eslint-import-resolver-typescript: 2.7.1_gwd37gqv3vjv3xlpl7ju3ag2qu find-up: 2.1.0 transitivePeerDependencies: - supports-color @@ -2787,7 +2787,7 @@ packages: regexpp: 3.2.0 dev: true - /eslint-plugin-import/2.26.0_ed7b04c666a57ee9b481db28c5d72f33: + /eslint-plugin-import/2.26.0_5v5qjrtguv7otneb3mumlvzpgm: resolution: {integrity: sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA==} engines: {node: '>=4'} peerDependencies: @@ -2797,14 +2797,14 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.22.0_eslint@8.15.0+typescript@4.6.4 + '@typescript-eslint/parser': 5.22.0_hcfsmds2fshutdssjqluwm76uu array-includes: 3.1.5 array.prototype.flat: 1.3.0 debug: 2.6.9 doctrine: 2.1.0 eslint: 8.15.0 eslint-import-resolver-node: 0.3.6 - eslint-module-utils: 2.7.3_55713e2aa11b13ca130ad6024481bc1f + eslint-module-utils: 2.7.3_kvyt4kvbdmj4ueyk2ybejan4d4 has: 1.0.3 is-core-module: 2.9.0 is-glob: 4.0.3 @@ -2830,7 +2830,7 @@ packages: requireindex: 1.2.0 dev: true - /eslint-plugin-jest/26.1.5_46506874510547d01dbac41d978b50a1: + /eslint-plugin-jest/26.1.5_izigq5cravd5ahn2yqozpc2que: resolution: {integrity: sha512-su89aDuljL9bTjEufTXmKUMSFe2kZUL9bi7+woq+C2ukHZordhtfPm4Vg+tdioHBaKf8v3/FXW9uV0ksqhYGFw==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} peerDependencies: @@ -2843,8 +2843,8 @@ packages: jest: optional: true dependencies: - '@typescript-eslint/eslint-plugin': 5.22.0_9817cbad956b8aa5d1e3d9ec99e4a1e4 - '@typescript-eslint/utils': 5.22.0_eslint@8.15.0+typescript@4.6.4 + '@typescript-eslint/eslint-plugin': 5.22.0_tal4xlmvnofklupd3hwjtzfb4q + '@typescript-eslint/utils': 5.22.0_hcfsmds2fshutdssjqluwm76uu eslint: 8.15.0 transitivePeerDependencies: - supports-color @@ -2919,13 +2919,13 @@ packages: string.prototype.matchall: 4.0.7 dev: true - /eslint-plugin-testing-library/5.4.0_eslint@8.15.0+typescript@4.6.4: + /eslint-plugin-testing-library/5.4.0_hcfsmds2fshutdssjqluwm76uu: resolution: {integrity: sha512-XjxIf4g33KaZXxRNbR33+0WcRQ/zt8N0R58IY6/kkHnrY6zPsC1gs3u5cTZr5eUmCZN/sjoPak3uF5vHGKg2wg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0, npm: '>=6'} peerDependencies: eslint: ^7.5.0 || ^8.0.0 dependencies: - '@typescript-eslint/utils': 5.22.0_eslint@8.15.0+typescript@4.6.4 + '@typescript-eslint/utils': 5.22.0_hcfsmds2fshutdssjqluwm76uu eslint: 8.15.0 transitivePeerDependencies: - supports-color @@ -5874,7 +5874,7 @@ packages: resolution: {integrity: sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==} dev: true - /react-router-dom/6.3.0_react-dom@18.1.0+react@18.1.0: + /react-router-dom/6.3.0_ef5jwxihqo6n7gxfmzogljlgcm: resolution: {integrity: sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==} peerDependencies: react: '>=16.8'