Skip to content

Commit

Permalink
chore(deps): bump dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
amille44420 committed Sep 29, 2022
1 parent 15c8078 commit 3883ea7
Show file tree
Hide file tree
Showing 24 changed files with 2,839 additions and 4,493 deletions.
43 changes: 17 additions & 26 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ partials:
executors:
node-standalone:
docker:
- image: cimg/node:18.7.0
- image: cimg/node:18.9.1
node-with-dependencies:
docker:
- image: cimg/node:18.7.0
- image: cimg/node:18.9.1
environment: *main-env
- image: mongo:5.0.10-focal
- image: mongo:6.0.1-focal
environment: *mongo-env
- image: minio/minio:RELEASE.2022-05-26T05-48-41Z
entrypoint: sh
Expand All @@ -47,13 +47,13 @@ executors:
name: mailhog
cypress-standalone:
docker:
- image: cypress/browsers:node16.14.2-slim-chrome100-ff99-edge
- image: cypress/browsers:node18.6.0-chrome105-ff104
environment: *main-env
cypress:
docker:
- image: cypress/browsers:node16.14.2-slim-chrome100-ff99-edge
- image: cypress/browsers:node18.6.0-chrome105-ff104
environment: *main-env
- image: mongo:5.0.10-focal
- image: mongo:6.0.1-focal
environment: *mongo-env
- image: minio/minio:RELEASE.2022-05-26T05-48-41Z
entrypoint: sh
Expand Down Expand Up @@ -139,9 +139,6 @@ jobs:
path: ~/project/junit/
- codecov/upload:
flags: unit
- store_artifacts:
path: ~/project/coverage/
destination: coverage

build:
executor: node-standalone
Expand All @@ -167,9 +164,6 @@ jobs:
root: ~/project
paths:
- build
- store_artifacts:
path: ~/project/build
destination: build
- store_artifacts:
path: ~/project/report.html
destination: report.html
Expand Down Expand Up @@ -201,8 +195,10 @@ jobs:
- attach_workspace:
at: ~/project
- run:
name: Ready node modules
command: yarn install --immutable
name: Install GPG
command: |
apt-get update
apt-get install -y gnupg
- run:
name: Install Cypress
command: yarn cypress install
Expand All @@ -229,9 +225,6 @@ jobs:
- store_artifacts:
path: ~/project/cypress/videos
destination: cypress/videos
- store_artifacts:
path: ~/project/coverage
destination: coverage

validate-functional-testing:
executor: cypress
Expand All @@ -242,8 +235,13 @@ jobs:
- attach_workspace:
at: ~/project
- run:
name: Ready node modules
command: yarn install --immutable
name: Install GPG
command: |
apt-get update
apt-get install -y gnupg
- run:
name: Install Cypress
command: yarn cypress install
- run:
name: Wait for db
command: |
Expand All @@ -252,9 +250,6 @@ jobs:
./devtools/wait-for-it.sh 127.0.0.1:9000 --timeout=60
./devtools/wait-for-it.sh mailhog:8025 --timeout=60
./devtools/wait-for-it.sh html2pdf:3000 --timeout=60
- run:
name: Install Cypress
command: yarn cypress install
- run:
name: Start server
command: node server.js serve
Expand All @@ -270,7 +265,6 @@ jobs:
command: ./devtools/wait-for-it.sh 127.0.0.1:3000 --timeout=60
- run:
name: Functional testing
# enable --split-by=timings after first runs
command: |
TEST_FILES="$(circleci tests glob "cypress/e2e/**/*.cy.ts" | circleci tests split)"
yarn cypress:run \
Expand All @@ -290,9 +284,6 @@ jobs:
- store_artifacts:
path: ~/project/cypress/videos
destination: cypress/videos
- store_artifacts:
path: ~/project/coverage
destination: coverage

release:
executor: node-standalone
Expand Down
7 changes: 7 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,10 @@
/src/schema/typeDefs.graphql
/build
/.cache
/coverage
/junit
/.yarn

/src/app/api/index.ts
/src/app/api/introspection.ts
/src/server/schema/resolvers/definitions.ts
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/build
/report.html
/.cache
/tsconfig.tsbuildinfo

# dependencies
/node_modules
Expand All @@ -16,6 +17,7 @@
# test reports & coverage reports
/coverage
/junit
/.nyc_output

# env settings
/.env*.local
Expand All @@ -34,3 +36,7 @@ yarn-error.log*
!.yarn/releases
!.yarn/sdks
!.yarn/versions

# cypress results
/cypress/videos
/cypress/screenshots
6 changes: 3 additions & 3 deletions charts/app/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ version: 0.1.0
dependencies:
- name: minio
repository: https://charts.bitnami.com/bitnami
version: 11.8.2
version: 11.10.3
condition: minio.enabled
- name: mongodb
repository: https://charts.bitnami.com/bitnami
version: 13.0.1
version: 13.1.5
condition: mongodb.enabled
- name: redis
repository: https://charts.bitnami.com/bitnami
version: 17.0.11
version: 17.2.0
condition: redis.enabled

Binary file added charts/app/charts/minio-11.10.3.tgz
Binary file not shown.
Binary file removed charts/app/charts/minio-11.8.2.tgz
Binary file not shown.
Binary file removed charts/app/charts/mongodb-13.0.1.tgz
Binary file not shown.
Binary file added charts/app/charts/mongodb-13.1.5.tgz
Binary file not shown.
Binary file removed charts/app/charts/redis-17.0.11.tgz
Binary file not shown.
Binary file added charts/app/charts/redis-17.2.0.tgz
Binary file not shown.
107 changes: 52 additions & 55 deletions codegen.yml
Original file line number Diff line number Diff line change
@@ -1,61 +1,58 @@
schema: ./schema/**/*.graphql

generates:
src/server/schema/typeDefs.graphql:
plugins:
- schema-ast
config:
includeDirectives: true
src/server/schema/typeDefs.graphql:
plugins:
- schema-ast
config:
includeDirectives: true

src/server/schema/resolvers/definitions.ts:
plugins:
- add:
content: '/* eslint-disable max-len */'
- typescript
- typescript-resolvers
config:
contextType: ../context#Context
rootValueType: ../context#RootDocument
noSchemaStitching: true
skipTypename: true
preResolveTypes: true
typesPrefix: GraphQL
mappers:
User: ../../database#User
UserSession: ../../database#UserSession
SystemMessage: ../../utils/systemMessage#SystemMessage
AuthenticationResponse: ./typings#AuthenticationResponse
ExternalLink: ../../database#ExternalLink
ResetPasswordLink: ../../database#ResetPasswordLink
enumValues: ./enums
scalars:
DateTime: Date
ObjectID: mongodb#ObjectId
Upload: ../context#FileUploadPromise
src/server/schema/resolvers/definitions.ts:
plugins:
- add:
content: '/* eslint-disable */'
- typescript
- typescript-resolvers
config:
contextType: ../context#Context
rootValueType: ../context#RootDocument
noSchemaStitching: true
skipTypename: true
preResolveTypes: true
typesPrefix: GraphQL
mappers:
User: ../../database#User
UserSession: ../../database#UserSession
SystemMessage: ../../utils/systemMessage#SystemMessage
AuthenticationResponse: ./typings#AuthenticationResponse
ExternalLink: ../../database#ExternalLink
ResetPasswordLink: ../../database#ResetPasswordLink
enumValues: ./enums
scalars:
DateTime: Date
ObjectID: mongodb#ObjectId
Upload: ../context#FileUploadPromise

src/app/api/introspection.ts:
documents: ./src/app/api/**/*.graphql
plugins:
- fragment-matcher
src/app/api/introspection.ts:
documents: ./src/app/api/**/*.graphql
plugins:
- add:
content: '/* eslint-disable */'
- fragment-matcher

src/app/api/index.ts:
documents: ./src/app/api/**/*.graphql
plugins:
- add:
content: '/* eslint-disable max-len */'
- typescript
- typescript-operations
- typescript-react-apollo
config:
documentMode: documentNode
pureMagicComment: true
preResolveTypes: true
scalars:
ObjectID: string
DateTime: string | Date
Upload: File

hooks:
afterAllFileWrite:
- prettier --write
- eslint --fix
src/app/api/index.ts:
documents: ./src/app/api/**/*.graphql
plugins:
- add:
content: '/* eslint-disable */'
- typescript
- typescript-operations
- typescript-react-apollo
config:
documentMode: documentNode
pureMagicComment: true
preResolveTypes: true
scalars:
ObjectID: string
DateTime: string | Date
Upload: File
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ services:
mongo:
# can be replace by ghcr.io/appvantageasia/mongo-entreprise:X.X.X
# changes to be done in override file
image: mongo:5.0.10
image: mongo:6.0.1
environment:
MONGO_INITDB_ROOT_USERNAME: root
MONGO_INITDB_ROOT_PASSWORD: password
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Environment is already setup but may be changed at will (see the environment con
Once you bound your ports with the docker compose override file, you may now start up the service.

```bash
docker-compose up -docker
docker-compose up -d
# or with the v2 client
docker compose up -d

Expand Down
10 changes: 9 additions & 1 deletion docs/code-quality.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,20 @@ You may run the control with the following command line
yarn lint
```

You may execute the same command and request errors to be fixed as much as it could be :
You may execute the same command and request errors to be fixed as much as it could be:

```bash
yarn lint:fix
```

The same commands are available with caching which may give faster linting on second runs:

```bash
yarn lint:cache
# or with fix option
yarn lint:cache:fix
```

Typing is being verified with the help of [TypeScript][ts].

```bash
Expand Down
Loading

0 comments on commit 3883ea7

Please sign in to comment.