Skip to content

Commit

Permalink
Merge branch 'dev' into gh-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
smolinari committed Jul 6, 2023
2 parents 75d69d8 + c6442fc commit 6cf946e
Show file tree
Hide file tree
Showing 52 changed files with 4,350 additions and 4,150 deletions.
4 changes: 2 additions & 2 deletions .m8a/infra/zeus/templates/m8a-dev.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "~> 0.7.0"
version = "~> 0.9.0"
}
kubernetes = {
source = "hashicorp/kubernetes"
version = "~> 2.20.0"
version = "~> 2.21.0"
}
}
}
Expand Down
28 changes: 14 additions & 14 deletions apps/zeus-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,35 +48,35 @@
"@fastify/cookie": "8.3.0",
"@m8a/core": "workspace:*",
"@m8a/logger": "workspace:*",
"@nestjs/common": "9.4.0",
"@nestjs/core": "9.4.0",
"@nestjs/platform-fastify": "9.4.0",
"@ogma/nestjs-module": "4.2.3",
"@nestjs/common": "10.0.5",
"@nestjs/core": "10.0.5",
"@nestjs/platform-fastify": "10.0.5",
"@ogma/nestjs-module": "5.1.0",
"class-transformer": "0.5.1",
"class-validator": "0.14.0"
},
"devDependencies": {
"@m8a/eslint-config": "workspace:*",
"@nestjs/cli": "~9.4.0",
"@nestjs/testing": "9.4.0",
"@rushstack/eslint-config": "3.2.0",
"@types/jest": "29.5.1",
"@types/node": "18.16.7",
"@nestjs/cli": "~9.5.0",
"@nestjs/testing": "10.0.5",
"@rushstack/eslint-config": "3.3.2",
"@types/jest": "29.5.2",
"@types/node": "18.16.19",
"@types/supertest": "2.0.12",
"eslint": "8.40.0",
"jest": "29.5.0",
"eslint": "8.44.0",
"jest": "29.6.0",
"prettier": "~2.8.7",
"reflect-metadata": "0.1.13",
"rimraf": "~5.0.0",
"rxjs": "7.8.1",
"source-map-support": "0.5.21",
"supertest": "6.3.3",
"ts-jest": "29.1.0",
"ts-jest": "29.1.1",
"ts-json-schema-generator": "1.2.0",
"ts-loader": "9.4.2",
"ts-loader": "9.4.4",
"tsconfig-paths": "4.2.0",
"typescript": "4.9.5",
"webpack": "5.82.1"
"webpack": "5.88.1"
},
"peerDependenciesMeta": {
"@m8a/core": {
Expand Down
3 changes: 2 additions & 1 deletion apps/zeus-api/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ async function bootstrap () {
abortOnError: true
})

await app.register(fastifyCookie, {
await app.register(fastifyCookie as any, {
// TODO: needs to be fixed at some point
secret: 'my-secret' // TODO: update for better cookie signature
})

Expand Down
30 changes: 15 additions & 15 deletions apps/zeus-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,34 +22,34 @@
"*.vue": "eslint --fix"
},
"dependencies": {
"@apollo/client": "3.7.14",
"@quasar/extras": "1.16.3",
"@apollo/client": "3.7.16",
"@quasar/extras": "1.16.4",
"@quasar/quasar-app-extension-apollo": "2.0.0-beta.5",
"@vue/apollo-composable": "4.0.0-beta.4",
"@vue/apollo-composable": "4.0.0-beta.8",
"apollo-link-rest": "0.9.0",
"apollo-link-token-refresh": "0.4.0",
"graphql": "16.6.0",
"apollo-link-token-refresh": "0.6.0",
"graphql": "16.7.1",
"graphql-anywhere": "4.2.8",
"graphql-tag": "2.12.6",
"jwt-decode": "3.1.2",
"qs": "6.11.1",
"quasar": "2.12.0",
"vue": "3.2.47",
"vue-router": "4.1.6"
"qs": "6.11.2",
"quasar": "2.12.2",
"vue": "3.3.4",
"vue-router": "4.2.3"
},
"devDependencies": {
"@quasar/app-vite": "^1.0.0",
"@types/node": "18.16.7",
"@typescript-eslint/eslint-plugin": "5.59.5",
"@typescript-eslint/parser": "5.59.5",
"@types/node": "18.16.19",
"@typescript-eslint/eslint-plugin": "5.61.0",
"@typescript-eslint/parser": "5.61.0",
"autoprefixer": "^10.4.2",
"eslint": "8.40.0",
"eslint": "8.44.0",
"eslint-config-standard": "^17.0.0",
"eslint-plugin-import": "^2.19.1",
"eslint-plugin-n": "^15.0.0",
"eslint-plugin-n": "^16.0.0",
"eslint-plugin-promise": "^6.0.0",
"eslint-plugin-vue": "^9.0.0",
"postcss": "8.4.23",
"postcss": "8.4.24",
"typescript": "4.9.5"
},
"engines": {
Expand Down
1 change: 1 addition & 0 deletions common/config/rush/.npmrc
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@
#
registry=https://registry.npmjs.org/
always-auth=false
update-notifier=false
8 changes: 8 additions & 0 deletions common/config/rush/browser-approved-packages.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@
"name": "@m8a/nestjs-typegoose",
"allowedCategories": [ "libraries" ]
},
{
"name": "@nestjs/cache-manager",
"allowedCategories": [ "libraries" ]
},
{
"name": "@nestjs/cli",
"allowedCategories": [ "apps" ]
Expand Down Expand Up @@ -226,6 +230,10 @@
"name": "cache-manager-redis-store",
"allowedCategories": [ "libraries" ]
},
{
"name": "cache-manager-redis-yet",
"allowedCategories": [ "libraries" ]
},
{
"name": "camel-case",
"allowedCategories": [ "libraries" ]
Expand Down
12 changes: 6 additions & 6 deletions common/config/rush/pnpm-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,13 @@
"globalPeerDependencyRules": {
// "ignoreMissing": ["class-validator"]
"allowedVersions": {
"class-validator": "0.14.0",
"@typegoose/typegoose": "^10.0.0",
"@m8a/nestjs-typegoose": "^10.0.0",
"graphql": "16.6.0",
"eslint-plugin-n": "16.0.0",
"@nestjs/common": "^10.0.0",
// "@nestjs/core": "^10.0.0",
"@types/inquirer": "9.0.3",
"ts-morph": "18.0.0",
"@nestjs/graphql": "11.0.5"
// "@nestjs/graphql": "^12.0.0",
"graphql": "^16.0.0",
"ts-morph": "19.0.0"
}
// "allowAny": ["@babel/*"]
},
Expand Down
Loading

0 comments on commit 6cf946e

Please sign in to comment.