Skip to content

Commit

Permalink
Merge branch 'dev' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
smolinari committed Jul 11, 2023
2 parents 3b2a9a5 + c6f70d3 commit e0e1f87
Show file tree
Hide file tree
Showing 29 changed files with 579 additions and 546 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ common/deploy/
common/temp/
common/autoinstallers/*/.npmrc
**/.rush/temp/
common/config/rush/.npmrc-publish

# Heft temporary files
.heft
2 changes: 1 addition & 1 deletion .m8a/infra/zeus/templates/m8a-dev.tf
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ terraform {
required_providers {
coder = {
source = "coder/coder"
version = "~> 0.9.0"
version = "~> 0.11.0"
}
kubernetes = {
source = "hashicorp/kubernetes"
Expand Down
4 changes: 2 additions & 2 deletions apps/zeus-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"@nestjs/common": "10.0.5",
"@nestjs/core": "10.0.5",
"@nestjs/platform-fastify": "10.0.5",
"@ogma/nestjs-module": "5.1.0",
"@ogma/nestjs-module": "5.1.1",
"class-transformer": "0.5.1",
"class-validator": "0.14.0"
},
Expand All @@ -64,7 +64,7 @@
"@types/node": "18.16.19",
"@types/supertest": "2.0.12",
"eslint": "8.44.0",
"jest": "29.6.0",
"jest": "29.6.1",
"prettier": "~2.8.7",
"reflect-metadata": "0.1.13",
"rimraf": "~5.0.0",
Expand Down
6 changes: 3 additions & 3 deletions apps/zeus-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"*.vue": "eslint --fix"
},
"dependencies": {
"@apollo/client": "3.7.16",
"@apollo/client": "3.7.17",
"@quasar/extras": "1.16.4",
"@quasar/quasar-app-extension-apollo": "2.0.0-beta.5",
"@vue/apollo-composable": "4.0.0-beta.8",
Expand All @@ -35,7 +35,7 @@
"qs": "6.11.2",
"quasar": "2.12.2",
"vue": "3.3.4",
"vue-router": "4.2.3"
"vue-router": "4.2.4"
},
"devDependencies": {
"@quasar/app-vite": "^1.0.0",
Expand All @@ -49,7 +49,7 @@
"eslint-plugin-n": "^16.0.0",
"eslint-plugin-promise": "^6.0.0",
"eslint-plugin-vue": "^9.0.0",
"postcss": "8.4.24",
"postcss": "8.4.25",
"typescript": "4.9.5"
},
"engines": {
Expand Down
10 changes: 10 additions & 0 deletions common/changes/@m8a/logger/dev_2023-07-11-07-58.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@m8a/logger",
"comment": "",
"type": "none"
}
],
"packageName": "@m8a/logger"
}
2 changes: 1 addition & 1 deletion common/config/rush/.npmrc-publish
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@
# for example if the machine loses power. A safer practice is to pass the token via an
# environment variable, which can be referenced from .npmrc using ${} expansion. For example:
#
# //registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN}
registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN}
#
Loading

0 comments on commit e0e1f87

Please sign in to comment.