Skip to content

Commit

Permalink
Merge branch 'main' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
acoffman committed Aug 3, 2023
2 parents 26da775 + f6a6201 commit a1fcca0
Show file tree
Hide file tree
Showing 220 changed files with 2,594 additions and 12,192 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: 14
node-version: 16

- run: npm install -g yarn
working-directory: ./client
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: 14
node-version: 18

- run: npm install -g yarn
working-directory: ./client
Expand Down
37 changes: 0 additions & 37 deletions client/e2e/protractor.conf.js

This file was deleted.

25 changes: 0 additions & 25 deletions client/e2e/src/app.e2e-spec.ts

This file was deleted.

11 changes: 0 additions & 11 deletions client/e2e/src/app.po.ts

This file was deleted.

10 changes: 0 additions & 10 deletions client/e2e/tsconfig.json

This file was deleted.

67 changes: 22 additions & 45 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,6 @@
"build:watch": "ng build --watch --configuration production",
"build:generate-stats": "ng build --configuration production --stats-json && webpack-bundle-analyzer ../server/public/stats.json",
"build:analyze-stats": "yarn run build:generate-stats && webpack-bundle-analyzer ../server/public/stats.json",
"test": "ng test",
"lint": "ng lint",
"e2e": "ng e2e",
"optimize-icon-svg": "svgo --config .svgo.config.js -f ./src/assets/icons/ -r -o ./src/assets/icons/.tmp",
"generate-icon-ts": "svg-to-ts-constants",
"generate-icons": "yarn run optimize-icon-svg && yarn run generate-icon-ts",
Expand All @@ -23,40 +20,34 @@
"error-stack-parser": "2.0.6"
},
"dependencies": {
"@angular/animations": "^15.1.0",
"@angular/common": "^15.1.0",
"@angular/compiler": "^15.1.0",
"@angular/core": "^15.1.0",
"@angular/forms": "^15.1.0",
"@angular/platform-browser": "^15.1.0",
"@angular/platform-browser-dynamic": "^15.1.0",
"@angular/router": "^15.1.0",
"@apollo/client": "^3.7.4",
"@angular-devkit/schematics": "16.1.4",
"@angular/animations": "^16.1.5",
"@angular/common": "^16.1.5",
"@angular/compiler": "^16.1.5",
"@angular/core": "^16.1.5",
"@angular/forms": "^16.1.5",
"@angular/platform-browser": "^16.1.5",
"@angular/platform-browser-dynamic": "^16.1.5",
"@angular/router": "^16.1.5",
"@apollo/client": "^3.7.17",
"@ngneat/until-destroy": "^9.1.2",
"@ngrx/component": "^15.1.0",
"@ngx-formly/core": "^6.0.4",
"@ngx-formly/ng-zorro-antd": "^6.1.0",
"@tinkoff/ng-polymorpheus": "^4.0.10",
"apollo-angular": "^4.2.0",
"ng-zorro-antd": "^15.0.1",
"ngx-cookie-service": "^15.0.0",
"ngx-logger": "^5.0.7",
"rxjs": "^7.8.0",
"@ngrx/component": "^16.1.0",
"@ngx-formly/core": "^6.1.8",
"@ngx-formly/ng-zorro-antd": "^6.1.8",
"apollo-angular": "^5.0.0",
"ng-zorro-antd": "^16.1.0",
"ngx-cookie-service": "^16.0.0",
"rxjs": "^7.8.1",
"rxjs-etc": "^10.6.2",
"rxjs-spy": "^8.0.2",
"ts-enum-util": "^4.0.2",
"ts-mixin-extended": "^1.1.1",
"zone.js": "~0.11.4"
"zone.js": "~0.13.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "^15.1.1",
"@angular-eslint/builder": "15.2.0",
"@angular-eslint/eslint-plugin": "15.2.0",
"@angular-eslint/eslint-plugin-template": "15.2.0",
"@angular-eslint/schematics": "15.2.0",
"@angular-eslint/template-parser": "15.2.0",
"@angular/cli": "^15.1.1",
"@angular/compiler-cli": "15.1.0",
"@angular-devkit/build-angular": "^16.1.4",
"@angular/cli": "^16.1.4",
"@angular/compiler-cli": "16.1.5",
"@graphql-codegen/add": "^3.2.3",
"@graphql-codegen/cli": "^2.16.4",
"@graphql-codegen/fragment-matcher": "^3.3.3",
Expand All @@ -65,24 +56,10 @@
"@graphql-codegen/typescript-apollo-angular": "^3.5.6",
"@graphql-codegen/typescript-apollo-client-helpers": "^2.2.6",
"@graphql-codegen/typescript-operations": "^2.5.12",
"@types/jasmine": "~3.6.0",
"@types/node": "^12.11.1",
"@typescript-eslint/eslint-plugin": "5.48.1",
"@typescript-eslint/parser": "5.48.1",
"casual": "^1.6.2",
"cosmiconfig-toml-loader": "^1.0.0",
"eslint": "^8.31.0",
"graphql": "^16.6.0",
"jasmine-core": "^4.5.0",
"jasmine-spec-reporter": "^7.0.0",
"karma": "^6.4.1",
"karma-chrome-launcher": "^3.1.1",
"karma-coverage": "^2.2.0",
"karma-jasmine": "^5.1.0",
"karma-jasmine-html-reporter": "^2.0.0",
"graphql": "^16.7.1",
"ngx-json-viewer": "^3.0.2",
"prettier": "^2.5.1",
"protractor": "^7.0.0",
"svg-to-ts": "^9.0.0",
"svgo": "^3.0.2",
"ts-node": "~10.9.1",
Expand Down
Loading

0 comments on commit a1fcca0

Please sign in to comment.