diff --git a/.github/actions/build-rust/action.yml b/.github/actions/build-rust/action.yml index 4cede74aad..bff2b9e7bd 100644 --- a/.github/actions/build-rust/action.yml +++ b/.github/actions/build-rust/action.yml @@ -55,3 +55,4 @@ runs: options: --user 0:0 -v ${{ github.workspace }}/.cargo-cache/git/db:/usr/local/cargo/git/db -v ${{ github.workspace }}/.cargo/registry/cache:/usr/local/cargo/registry/cache -v ${{ github.workspace }}/.cargo/registry/index:/usr/local/cargo/registry/index -v ${{ github.workspace }}:/build -w /build -e NX_CLOUD_ACCESS_TOKEN=${{ inputs.nx_token }} run: >- yarn nx build @affine/native --target ${{ inputs.target }} + chmod -R 777 node_modules/.cache diff --git a/.github/deployment/Caddyfile b/.github/deployment/Caddyfile deleted file mode 100644 index 32b8e4e401..0000000000 --- a/.github/deployment/Caddyfile +++ /dev/null @@ -1,40 +0,0 @@ -:80 { - root /* ./dist - - file_server { - # precompressed br - } - - encode { - zstd - gzip 9 - } - - header { - # 7 days - Cache-Control "public, max-age=86400, must-revalidate" - } - - handle /api/* { - reverse_proxy {$API_SERVER} { - health_uri /api/healthz - @error status 500 502 503 503 - handle_response @error { - root * /dist - rewrite * /50x.html - file_server - } - } - } - - @notStatic { - not path /_next/static/* - } - - handle @notStatic { - header { - Cache-Control "no-cache, no-store, must-revalidate" - } - try_files {path} /index.html - } -} diff --git a/.github/deployment/Dockerfile b/.github/deployment/Dockerfile deleted file mode 100644 index 7b7a868b90..0000000000 --- a/.github/deployment/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM node:16-alpine as relocate -WORKDIR /app -COPY ./apps/web/out ./dist -COPY ./.github/deployment/Caddyfile ./Caddyfile - -FROM caddy:2.6.2-alpine -ARG API_SERVER -WORKDIR /app -COPY --from=relocate /app . - -EXPOSE 80 -ENV API_SERVER=$API_SERVER -CMD ["caddy", "run"] diff --git a/.github/deployment/front/Dockerfile b/.github/deployment/front/Dockerfile new file mode 100644 index 0000000000..aa4c6f1775 --- /dev/null +++ b/.github/deployment/front/Dockerfile @@ -0,0 +1,11 @@ +FROM openresty/openresty:1.21.4.1-0-buster +WORKDIR /app +COPY ./apps/web/out ./dist +COPY ./.github/deployment/front/nginx.conf /usr/local/openresty/nginx/conf/nginx.conf +COPY ./.github/deployment/front/affine.nginx.conf /etc/nginx/conf.d/affine.nginx.conf + +RUN mkdir -p /var/log/nginx && \ + rm /etc/nginx/conf.d/default.conf + +EXPOSE 8080 +CMD ["/usr/local/openresty/bin/openresty", "-g", "daemon off;"] diff --git a/.github/deployment/front/affine.nginx.conf b/.github/deployment/front/affine.nginx.conf new file mode 100644 index 0000000000..3a5f6e6217 --- /dev/null +++ b/.github/deployment/front/affine.nginx.conf @@ -0,0 +1,13 @@ +server { + listen 8080; + root /app/dist; + + location / { + try_files $uri $uri/index.html $uri.html =404;; + } + + error_page 404 /404.html; + location = /404.html { + internal; + } +} diff --git a/.github/deployment/front/nginx.conf b/.github/deployment/front/nginx.conf new file mode 100644 index 0000000000..d4c362d3f4 --- /dev/null +++ b/.github/deployment/front/nginx.conf @@ -0,0 +1,14 @@ +worker_processes 4; +error_log /var/log/nginx/error.log warn; +pcre_jit on; +events { + worker_connections 1024; +} +http { + include mime.types; + log_format main '$remote_addr [$time_local] "$request" ' + '$status $body_bytes_sent "$http_referer" ' + '"$http_user_agent" "$http_x_forwarded_for"'; + access_log /var/log/nginx/access.log main; + include /etc/nginx/conf.d/*.conf; +} diff --git a/.github/deployment/node/Dockerfile b/.github/deployment/node/Dockerfile new file mode 100644 index 0000000000..77dc048c57 --- /dev/null +++ b/.github/deployment/node/Dockerfile @@ -0,0 +1,10 @@ +FROM node:18-bookworm-slim + +COPY ./apps/server /app +WORKDIR /app + +RUN apt-get update && \ + apt-get install -y --no-install-recommends openssl && \ + rm -rf /var/lib/apt/lists/* + +CMD ["node", "--es-module-specifier-resolution=node", "./dist/index.js"] diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ac223aa7e..ad53f7579e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -400,3 +400,60 @@ jobs: flags: unittest name: affine fail_ci_if_error: true + + build-docker: + if: github.ref == 'refs/heads/master' + name: Build Docker + needs: + - build-web-desktop + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Download next static + uses: actions/download-artifact@v3 + with: + name: next-js-static + path: ./apps/web/out + - name: Setup Git short hash + run: | + echo "GIT_SHORT_HASH=$(git rev-parse --short HEAD)" >> "$GITHUB_ENV" + - name: Login to GitHub Container Registry + uses: docker/login-action@v2 + with: + registry: ghcr.io + logout: false + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - name: Build front Dockerfile + uses: docker/build-push-action@v4 + with: + context: . + push: true + pull: true + platforms: linux/amd64,linux/arm64 + provenance: true + file: .github/deployment/front/Dockerfile + tags: ghcr.io/toeverything/affine-front:${{ env.GIT_SHORT_HASH }},ghcr.io/toeverything/affine-front:latest + + - name: Setup Node.js + uses: ./.github/actions/setup-node + with: + package-install: false + + - name: Install Node.js dependencies + run: yarn workspaces focus @affine/server --production + + - name: Build graphql Dockerfile + uses: docker/build-push-action@v4 + with: + context: . + push: true + pull: true + platforms: linux/amd64,linux/arm64 + provenance: true + file: .github/deployment/node/Dockerfile + tags: ghcr.io/toeverything/affine-graphql:${{ env.GIT_SHORT_HASH }},ghcr.io/toeverything/affine-graphql:latest diff --git a/.prettierignore b/.prettierignore index fdd8efc41e..be1e4f755b 100644 --- a/.prettierignore +++ b/.prettierignore @@ -2,3 +2,4 @@ pnpm-lock.yaml target lib test-results +packages/graphql/src/graphql/index.ts diff --git a/apps/server/package.json b/apps/server/package.json index e3bf8b5cd9..8a7b081250 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -34,7 +34,7 @@ "lodash-es": "^4.17.21", "next-auth": "^4.22.1", "parse-duration": "^1.1.0", - "prisma": "^4.16.0", + "prisma": "^4.16.1", "reflect-metadata": "^0.1.13", "rxjs": "^7.8.1" }, @@ -42,7 +42,6 @@ "@napi-rs/image": "^1.6.1", "@nestjs/testing": "^10.0.3", "@types/express": "^4.17.17", - "@types/jsonwebtoken": "^9.0.2", "@types/lodash-es": "^4.17.7", "@types/node": "^18.16.18", "@types/supertest": "^2.0.12", @@ -87,5 +86,8 @@ "**/*.spec.ts" ] }, - "stableVersion": "0.5.3" + "stableVersion": "0.5.3", + "installConfig": { + "hoistingLimits": "workspaces" + } } diff --git a/apps/server/tsconfig.json b/apps/server/tsconfig.json index 615256a97d..f33d93847a 100644 --- a/apps/server/tsconfig.json +++ b/apps/server/tsconfig.json @@ -12,7 +12,8 @@ "types": ["node"], "outDir": "dist", "noEmit": false, - "verbatimModuleSyntax": false + "verbatimModuleSyntax": false, + "rootDir": "./src" }, "include": ["src", "package.json"], "exclude": ["dist", "node_modules"], diff --git a/packages/graphql/export-gql-plugin.cjs b/packages/graphql/export-gql-plugin.cjs index 68d4997d61..8c12f92827 100644 --- a/packages/graphql/export-gql-plugin.cjs +++ b/packages/graphql/export-gql-plugin.cjs @@ -151,7 +151,7 @@ module.exports = { containsFile: ${containsFile}, query: \` ${print(doc)}${importing || ''}\`, -} +}; `); if (definition.operation === 'query') { queries.push(exportedName); @@ -171,11 +171,11 @@ ${print(doc)}${importing || ''}\``); [ '/* do not manipulate this file manually. */', `export interface GraphQLQuery { - id: string - operationName: string - definitionName: string - query: string - containsFile?: boolean + id: string; + operationName: string; + definitionName: string; + query: string; + containsFile?: boolean; } `, ...defs, diff --git a/yarn.lock b/yarn.lock index 28c3ec1508..611f3eda04 100644 --- a/yarn.lock +++ b/yarn.lock @@ -391,7 +391,6 @@ __metadata: "@node-rs/jsonwebtoken": ^0.2.0 "@prisma/client": ^4.16.1 "@types/express": ^4.17.17 - "@types/jsonwebtoken": ^9.0.2 "@types/lodash-es": ^4.17.7 "@types/node": ^18.16.18 "@types/supertest": ^2.0.12 @@ -405,7 +404,7 @@ __metadata: next-auth: ^4.22.1 nodemon: ^2.0.22 parse-duration: ^1.1.0 - prisma: ^4.16.0 + prisma: ^4.16.1 reflect-metadata: ^0.1.13 rxjs: ^7.8.1 supertest: ^6.3.3 @@ -1782,7 +1781,7 @@ __metadata: languageName: node linkType: hard -"@aws-sdk/types@npm:3.357.0": +"@aws-sdk/types@npm:3.357.0, @aws-sdk/types@npm:^3.222.0": version: 3.357.0 resolution: "@aws-sdk/types@npm:3.357.0" dependencies: @@ -1791,15 +1790,6 @@ __metadata: languageName: node linkType: hard -"@aws-sdk/types@npm:^3.222.0": - version: 3.347.0 - resolution: "@aws-sdk/types@npm:3.347.0" - dependencies: - tslib: ^2.5.0 - checksum: 799b053d3651f1754e2925b671fe890047d0ff1af69d22b6826d8e74edefcd558c7c7a911d48eaf5930032bcf291dbdbb6dd2d2f0c596bbe52100941aa349221 - languageName: node - linkType: hard - "@aws-sdk/url-parser@npm:3.357.0": version: 3.357.0 resolution: "@aws-sdk/url-parser@npm:3.357.0" @@ -2047,7 +2037,7 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.10, @babel/core@npm:^7.12.3, @babel/core@npm:^7.13.16, @babel/core@npm:^7.14.0, @babel/core@npm:^7.20.12, @babel/core@npm:^7.20.2, @babel/core@npm:^7.20.7, @babel/core@npm:^7.21.4, @babel/core@npm:^7.22.5, @babel/core@npm:^7.7.5": +"@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.10, @babel/core@npm:^7.12.3, @babel/core@npm:^7.13.16, @babel/core@npm:^7.14.0, @babel/core@npm:^7.20.12, @babel/core@npm:^7.20.2, @babel/core@npm:^7.20.7, @babel/core@npm:^7.22.5, @babel/core@npm:^7.7.5": version: 7.22.5 resolution: "@babel/core@npm:7.22.5" dependencies: @@ -3360,7 +3350,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-react-jsx-self@npm:^7.18.6, @babel/plugin-transform-react-jsx-self@npm:^7.21.0, @babel/plugin-transform-react-jsx-self@npm:^7.22.5": +"@babel/plugin-transform-react-jsx-self@npm:^7.18.6, @babel/plugin-transform-react-jsx-self@npm:^7.22.5": version: 7.22.5 resolution: "@babel/plugin-transform-react-jsx-self@npm:7.22.5" dependencies: @@ -7397,22 +7387,7 @@ __metadata: languageName: node linkType: hard -"@mui/utils@npm:^5.13.1": - version: 5.13.1 - resolution: "@mui/utils@npm:5.13.1" - dependencies: - "@babel/runtime": ^7.21.0 - "@types/prop-types": ^15.7.5 - "@types/react-is": ^18.2.0 - prop-types: ^15.8.1 - react-is: ^18.2.0 - peerDependencies: - react: ^17.0.0 || ^18.0.0 - checksum: 79cfc91e5a61311ac88680df3ea09f1218d0a5a766b6dadf0c5c9c72a3c36cbd903895ebb0f16497dcffb2e3601cb3b46742ae3c5e2c1f62d5ebf02babfd910f - languageName: node - linkType: hard - -"@mui/utils@npm:^5.13.6": +"@mui/utils@npm:^5.13.1, @mui/utils@npm:^5.13.6": version: 5.13.6 resolution: "@mui/utils@npm:5.13.6" dependencies: @@ -8603,10 +8578,10 @@ __metadata: languageName: node linkType: hard -"@prisma/engines@npm:4.16.0": - version: 4.16.0 - resolution: "@prisma/engines@npm:4.16.0" - checksum: 60ef1c3720720cf5a9d23f52c668669736716afd1862c4ac61e8ebcd3ca896e3453f80dfab77f3b68b001c5d499a895f28e54cc5025eae61878b40c1ec5d99c3 +"@prisma/engines@npm:4.16.1": + version: 4.16.1 + resolution: "@prisma/engines@npm:4.16.1" + checksum: 7b8c1a9e20434edaa919fb24585ebff573c4ace787ea5a135dfefde3571ae31d3f0b0347397774c38be6d2e3fc0087d4e21a2720fe9f7a66ffd870e34377040f languageName: node linkType: hard @@ -10426,7 +10401,7 @@ __metadata: languageName: node linkType: hard -"@storybook/components@npm:7.0.23": +"@storybook/components@npm:7.0.23, @storybook/components@npm:^7.0.0": version: 7.0.23 resolution: "@storybook/components@npm:7.0.23" dependencies: @@ -10445,25 +10420,6 @@ __metadata: languageName: node linkType: hard -"@storybook/components@npm:^7.0.0": - version: 7.0.21 - resolution: "@storybook/components@npm:7.0.21" - dependencies: - "@storybook/client-logger": 7.0.21 - "@storybook/csf": ^0.1.0 - "@storybook/global": ^5.0.0 - "@storybook/theming": 7.0.21 - "@storybook/types": 7.0.21 - memoizerific: ^1.11.3 - use-resize-observer: ^9.1.0 - util-deprecate: ^1.0.2 - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: dda5f345702734d8ef2971182b67e05c34935bf42cdef19b86da1d297b2a5db7d1935207f976a6f1e9c4e8b4eaa79b2740c894cf40001b635a5fce9b831051c7 - languageName: node - linkType: hard - "@storybook/core-client@npm:7.0.23": version: 7.0.23 resolution: "@storybook/core-client@npm:7.0.23" @@ -10474,7 +10430,7 @@ __metadata: languageName: node linkType: hard -"@storybook/core-common@npm:7.0.21, @storybook/core-common@npm:^7.0.0-beta.0 || ^7.0.0-rc.0 || ^7.0.0": +"@storybook/core-common@npm:7.0.21": version: 7.0.21 resolution: "@storybook/core-common@npm:7.0.21" dependencies: @@ -10501,7 +10457,7 @@ __metadata: languageName: node linkType: hard -"@storybook/core-common@npm:7.0.23": +"@storybook/core-common@npm:7.0.23, @storybook/core-common@npm:^7.0.0-beta.0 || ^7.0.0-rc.0 || ^7.0.0": version: 7.0.23 resolution: "@storybook/core-common@npm:7.0.23" dependencies: @@ -10530,14 +10486,14 @@ __metadata: languageName: node linkType: hard -"@storybook/core-events@npm:7.0.21, @storybook/core-events@npm:^7.0.0": +"@storybook/core-events@npm:7.0.21": version: 7.0.21 resolution: "@storybook/core-events@npm:7.0.21" checksum: 87b5f6ae69604faf99d7340c1d20b557318669e45497da08e39d1ea8a4e726a1bf361929dba51c25206bbade19ccd5f1aa8bac1ff2d7794bc3a02314f8da2dba languageName: node linkType: hard -"@storybook/core-events@npm:7.0.23": +"@storybook/core-events@npm:7.0.23, @storybook/core-events@npm:^7.0.0": version: 7.0.23 resolution: "@storybook/core-events@npm:7.0.23" checksum: 0a7e6bee982b32145942740136ec8c492082dfb2362e52531d9deaefadd8878da477328409709fc5e48c0066ea3941f73ff59bac32c7eb2c75cef0f9509a5052 @@ -10604,7 +10560,7 @@ __metadata: languageName: node linkType: hard -"@storybook/csf-tools@npm:7.0.21, @storybook/csf-tools@npm:^7.0.0-beta.0 || ^7.0.0-rc.0 || ^7.0.0": +"@storybook/csf-tools@npm:7.0.21": version: 7.0.21 resolution: "@storybook/csf-tools@npm:7.0.21" dependencies: @@ -10621,7 +10577,7 @@ __metadata: languageName: node linkType: hard -"@storybook/csf-tools@npm:7.0.23": +"@storybook/csf-tools@npm:7.0.23, @storybook/csf-tools@npm:^7.0.0-beta.0 || ^7.0.0-rc.0 || ^7.0.0": version: 7.0.23 resolution: "@storybook/csf-tools@npm:7.0.23" dependencies: @@ -10685,7 +10641,7 @@ __metadata: languageName: node linkType: hard -"@storybook/instrumenter@npm:7.0.23": +"@storybook/instrumenter@npm:7.0.23, @storybook/instrumenter@npm:^7.0.0-beta.0 || ^7.0.0-rc.0 || ^7.0.0": version: 7.0.23 resolution: "@storybook/instrumenter@npm:7.0.23" dependencies: @@ -10698,19 +10654,6 @@ __metadata: languageName: node linkType: hard -"@storybook/instrumenter@npm:^7.0.0-beta.0 || ^7.0.0-rc.0 || ^7.0.0": - version: 7.0.21 - resolution: "@storybook/instrumenter@npm:7.0.21" - dependencies: - "@storybook/channels": 7.0.21 - "@storybook/client-logger": 7.0.21 - "@storybook/core-events": 7.0.21 - "@storybook/global": ^5.0.0 - "@storybook/preview-api": 7.0.21 - checksum: a129525b22ca5d6e6e120bb9c8be55a7d838f034425f294f14fb79a41394b7fad4d7c9ddf0b82fa5cc36ead899bd4b32b5366a896a8969bfc06efbd076e7bada - languageName: node - linkType: hard - "@storybook/jest@npm:^0.1.0": version: 0.1.0 resolution: "@storybook/jest@npm:0.1.0" @@ -10820,7 +10763,7 @@ __metadata: languageName: node linkType: hard -"@storybook/preview-api@npm:7.0.21, @storybook/preview-api@npm:^7.0.0-beta.0 || ^7.0.0-rc.0 || ^7.0.0": +"@storybook/preview-api@npm:7.0.21": version: 7.0.21 resolution: "@storybook/preview-api@npm:7.0.21" dependencies: @@ -10843,7 +10786,7 @@ __metadata: languageName: node linkType: hard -"@storybook/preview-api@npm:7.0.23": +"@storybook/preview-api@npm:7.0.23, @storybook/preview-api@npm:^7.0.0-beta.0 || ^7.0.0-rc.0 || ^7.0.0": version: 7.0.23 resolution: "@storybook/preview-api@npm:7.0.23" dependencies: @@ -11047,7 +10990,7 @@ __metadata: languageName: node linkType: hard -"@storybook/theming@npm:7.0.21, @storybook/theming@npm:^7.0.0": +"@storybook/theming@npm:7.0.21": version: 7.0.21 resolution: "@storybook/theming@npm:7.0.21" dependencies: @@ -11062,7 +11005,7 @@ __metadata: languageName: node linkType: hard -"@storybook/theming@npm:7.0.23": +"@storybook/theming@npm:7.0.23, @storybook/theming@npm:^7.0.0": version: 7.0.23 resolution: "@storybook/theming@npm:7.0.23" dependencies: @@ -11959,15 +11902,6 @@ __metadata: languageName: node linkType: hard -"@types/jsonwebtoken@npm:^9.0.2": - version: 9.0.2 - resolution: "@types/jsonwebtoken@npm:9.0.2" - dependencies: - "@types/node": "*" - checksum: 3bb8d40e78d7eb53e427db6e9f0f22e0890cfee80965dcf741d08341814913afb211306de6e9847c6d241cc8e36f8a59090cbfdcc510ab7c81af9d650c5afe0e - languageName: node - linkType: hard - "@types/keyv@npm:^3.1.4": version: 3.1.4 resolution: "@types/keyv@npm:3.1.4" @@ -12185,16 +12119,7 @@ __metadata: languageName: node linkType: hard -"@types/react-dom@npm:^18.0.0": - version: 18.2.5 - resolution: "@types/react-dom@npm:18.2.5" - dependencies: - "@types/react": "*" - checksum: c48209f8c60cb9054f3deee5365bc9fd6dadd8f901b67f1612a334057b2671518fc5145f14aca63ff276a926ccb5358308a6cf58ec700178f382bb3ebde96d91 - languageName: node - linkType: hard - -"@types/react-dom@npm:^18.2.6": +"@types/react-dom@npm:^18.0.0, @types/react-dom@npm:^18.2.6": version: 18.2.6 resolution: "@types/react-dom@npm:18.2.6" dependencies: @@ -12221,18 +12146,7 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:*, @types/react@npm:>=16": - version: 18.2.12 - resolution: "@types/react@npm:18.2.12" - dependencies: - "@types/prop-types": "*" - "@types/scheduler": "*" - csstype: ^3.0.2 - checksum: ad85a7eadaf1b35cfeee9f715b39311420ff46d46e0650377d918b3f888c2e47416037da4a765e1dccd3d1916abd54c105a3bee803c971ba56c955a7768ce976 - languageName: node - linkType: hard - -"@types/react@npm:^18.2.14": +"@types/react@npm:*, @types/react@npm:>=16, @types/react@npm:^18.2.14": version: 18.2.14 resolution: "@types/react@npm:18.2.14" dependencies: @@ -12448,24 +12362,7 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:^5.42.0": - version: 5.59.11 - resolution: "@typescript-eslint/parser@npm:5.59.11" - dependencies: - "@typescript-eslint/scope-manager": 5.59.11 - "@typescript-eslint/types": 5.59.11 - "@typescript-eslint/typescript-estree": 5.59.11 - debug: ^4.3.4 - peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - peerDependenciesMeta: - typescript: - optional: true - checksum: 75eb6e60577690e3c9dd66fde83c9b4e9e5fd818fe9673e532052d5ba8fa21a5f7a69aad19be99e6ef5825e9f52036262b25e918e51f96e1dc26e862448d2d3a - languageName: node - linkType: hard - -"@typescript-eslint/parser@npm:^5.60.1": +"@typescript-eslint/parser@npm:^5.42.0, @typescript-eslint/parser@npm:^5.60.1": version: 5.60.1 resolution: "@typescript-eslint/parser@npm:5.60.1" dependencies: @@ -12482,16 +12379,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.59.11": - version: 5.59.11 - resolution: "@typescript-eslint/scope-manager@npm:5.59.11" - dependencies: - "@typescript-eslint/types": 5.59.11 - "@typescript-eslint/visitor-keys": 5.59.11 - checksum: f5c4e6d26da0a983b8f0c016f3ae63b3462442fe9c04d7510ca397461e13f6c48332b09b584258a7f336399fa7cd866f3ab55eaad89c5096a411c0d05d296475 - languageName: node - linkType: hard - "@typescript-eslint/scope-manager@npm:5.60.1": version: 5.60.1 resolution: "@typescript-eslint/scope-manager@npm:5.60.1" @@ -12526,13 +12413,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:5.59.11": - version: 5.59.11 - resolution: "@typescript-eslint/types@npm:5.59.11" - checksum: 4bb667571a7254f8c2b0dc3e37100e7290f9be14978722cc31c7204dfababd8a346bed4125e70dcafd15d07be386fb55bb9738bd86662ac10b98a6c964716396 - languageName: node - linkType: hard - "@typescript-eslint/types@npm:5.60.1": version: 5.60.1 resolution: "@typescript-eslint/types@npm:5.60.1" @@ -12540,25 +12420,7 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.59.11, @typescript-eslint/typescript-estree@npm:^5.55.0": - version: 5.59.11 - resolution: "@typescript-eslint/typescript-estree@npm:5.59.11" - dependencies: - "@typescript-eslint/types": 5.59.11 - "@typescript-eslint/visitor-keys": 5.59.11 - debug: ^4.3.4 - globby: ^11.1.0 - is-glob: ^4.0.3 - semver: ^7.3.7 - tsutils: ^3.21.0 - peerDependenciesMeta: - typescript: - optional: true - checksum: 516a828884e6939000aac17a27208088055670b0fd9bd22d137a7b2d359a8db9ce9cd09eedffed6f498f968be90ce3c2695a91d46abbd4049f87fd3b7bb986b5 - languageName: node - linkType: hard - -"@typescript-eslint/typescript-estree@npm:5.60.1": +"@typescript-eslint/typescript-estree@npm:5.60.1, @typescript-eslint/typescript-estree@npm:^5.55.0": version: 5.60.1 resolution: "@typescript-eslint/typescript-estree@npm:5.60.1" dependencies: @@ -12622,16 +12484,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.59.11": - version: 5.59.11 - resolution: "@typescript-eslint/visitor-keys@npm:5.59.11" - dependencies: - "@typescript-eslint/types": 5.59.11 - eslint-visitor-keys: ^3.3.0 - checksum: 4894ec4b2b8da773b1f44398c836fcacb7f5a0c81f9404ecd193920e88d618091a7328659e0aa24697edda10479534db30bec7c8b0ba9fa0fce43f78222d5619 - languageName: node - linkType: hard - "@typescript-eslint/visitor-keys@npm:5.60.1": version: 5.60.1 resolution: "@typescript-eslint/visitor-keys@npm:5.60.1" @@ -12762,21 +12614,7 @@ __metadata: languageName: node linkType: hard -"@vitejs/plugin-react@npm:^4.0.0": - version: 4.0.0 - resolution: "@vitejs/plugin-react@npm:4.0.0" - dependencies: - "@babel/core": ^7.21.4 - "@babel/plugin-transform-react-jsx-self": ^7.21.0 - "@babel/plugin-transform-react-jsx-source": ^7.19.6 - react-refresh: ^0.14.0 - peerDependencies: - vite: ^4.2.0 - checksum: 575298f66517c51348892d49b302490c48e15c9ddb0b2c5f710931804e559dceafca1be1e62cb72d0902cba5f3c98e4b1272970d328e3a62d59ecdf976e68d3d - languageName: node - linkType: hard - -"@vitejs/plugin-react@npm:^4.0.1": +"@vitejs/plugin-react@npm:^4.0.0, @vitejs/plugin-react@npm:^4.0.1": version: 4.0.1 resolution: "@vitejs/plugin-react@npm:4.0.1" dependencies: @@ -14779,14 +14617,7 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.30001406, caniuse-lite@npm:^1.0.30001503": - version: 1.0.30001503 - resolution: "caniuse-lite@npm:1.0.30001503" - checksum: cd5f0af37655ff71ec4ab3c49124d75e0b8b68de625d07ea80e9a82329e616b5203d5dad6865192653be9da50081c06878f081ab069dac0be35adf29aa1599cd - languageName: node - linkType: hard - -"caniuse-lite@npm:^1.0.30001464": +"caniuse-lite@npm:^1.0.30001406, caniuse-lite@npm:^1.0.30001464, caniuse-lite@npm:^1.0.30001503": version: 1.0.30001507 resolution: "caniuse-lite@npm:1.0.30001507" checksum: 7044172bdf65140c927cdaaff50368a97676f06a9fd8b515c046613bdf52cb769e9efb832ee491b8f8cc21f82c15f154a896efbab690f431bb064c95f3a2b7a8 @@ -16811,14 +16642,7 @@ __metadata: languageName: node linkType: hard -"dotenv@npm:^16.0.0": - version: 16.3.0 - resolution: "dotenv@npm:16.3.0" - checksum: 43a90ec87868c8b962a028b69cbe86e71621c76837249a9d65fb131b03ee69817b019d34a5456174cb04095052a496b4e1b5da72e4af2393df6083513ab62d4b - languageName: node - linkType: hard - -"dotenv@npm:^16.3.1": +"dotenv@npm:^16.0.0, dotenv@npm:^16.3.1": version: 16.3.1 resolution: "dotenv@npm:16.3.1" checksum: 15d75e7279018f4bafd0ee9706593dd14455ddb71b3bcba9c52574460b7ccaf67d5cf8b2c08a5af1a9da6db36c956a04a1192b101ee102a3e0cf8817bbcf3dfd @@ -19844,14 +19668,7 @@ __metadata: languageName: node linkType: hard -"graphql@npm:^15.0.0 || ^16.0.0, graphql@npm:^16.0.0": - version: 16.6.0 - resolution: "graphql@npm:16.6.0" - checksum: bf1d9e3c1938ce3c1a81e909bd3ead1ae4707c577f91cff1ca2eca474bfbc7873d5d7b942e1e9777ff5a8304421dba57a4b76d7a29eb19de8711cb70e3c2415e - languageName: node - linkType: hard - -"graphql@npm:^16.7.1": +"graphql@npm:^15.0.0 || ^16.0.0, graphql@npm:^16.0.0, graphql@npm:^16.7.1": version: 16.7.1 resolution: "graphql@npm:16.7.1" checksum: c924d8428daf0e96a5ea43e9bc3cd1b6802899907d284478ac8f705c8fd233a0a51eef915f7569fb5de8acb2e85b802ccc6c85c2b157ad805c1e9adba5a299bd @@ -25695,20 +25512,13 @@ __metadata: languageName: node linkType: hard -"pirates@npm:^4.0.1": +"pirates@npm:^4.0.1, pirates@npm:^4.0.4, pirates@npm:^4.0.5": version: 4.0.6 resolution: "pirates@npm:4.0.6" checksum: 46a65fefaf19c6f57460388a5af9ab81e3d7fd0e7bc44ca59d753cb5c4d0df97c6c6e583674869762101836d68675f027d60f841c105d72734df9dfca97cbcc6 languageName: node linkType: hard -"pirates@npm:^4.0.4, pirates@npm:^4.0.5": - version: 4.0.5 - resolution: "pirates@npm:4.0.5" - checksum: c9994e61b85260bec6c4fc0307016340d9b0c4f4b6550a957afaaff0c9b1ad58fbbea5cfcf083860a25cb27a375442e2b0edf52e2e1e40e69934e08dcc52d227 - languageName: node - linkType: hard - "pkg-dir@npm:^3.0.0": version: 3.0.0 resolution: "pkg-dir@npm:3.0.0" @@ -26143,15 +25953,15 @@ __metadata: languageName: node linkType: hard -"prisma@npm:^4.16.0": - version: 4.16.0 - resolution: "prisma@npm:4.16.0" +"prisma@npm:^4.16.1": + version: 4.16.1 + resolution: "prisma@npm:4.16.1" dependencies: - "@prisma/engines": 4.16.0 + "@prisma/engines": 4.16.1 bin: prisma: build/index.js prisma2: build/index.js - checksum: 831a4d14a48474fa144ae0648ed5e3766756b991f1997ecca813a044ef9bd7f2a5794c603adc9d23d867d8f4a0f51cedadaebfd8a841e6923ef9b804ed8bcbbb + checksum: eb0f43970464fbaa6ba190a714f23d00acd39dcc14fd8a7183dffc51a548cc32040cc5360415787578749862af7501a7bedcf9f2a0e64a3f82e3af402e9439d7 languageName: node linkType: hard