Skip to content

Commit

Permalink
Merge pull request #1130 from bcgov/feature/ALCS-1278
Browse files Browse the repository at this point in the history
Upgrade Backend Packages
  • Loading branch information
dhaselhan authored Nov 6, 2023
2 parents 74a291c + 9380e8f commit f413397
Show file tree
Hide file tree
Showing 320 changed files with 6,679 additions and 16,034 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/setup-node@master
with:
node-version: ${{ matrix.node }}
- run: npm ci --legacy-peer-deps
- run: npm ci
- run: npm run build
- run: npm run test:ci
test-portal-frontend:
Expand All @@ -29,8 +29,8 @@ jobs:
working-directory: portal-frontend
strategy:
matrix:
platform: [ ubuntu-latest ]
node: [ "18" ]
platform: [ubuntu-latest]
node: ["18"]
name: Portal Frontend Tests - ${{ matrix.node }}/${{ matrix.platform }}
runs-on: ${{ matrix.platform }}
steps:
Expand All @@ -48,7 +48,7 @@ jobs:
strategy:
matrix:
platform: [ubuntu-latest]
node: ["18"]
node: ["20"]
name: API Tests - ${{ matrix.node }}/${{ matrix.platform }}
runs-on: ${{ matrix.platform }}
steps:
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ jobs:
strategy:
matrix:
platform: [ubuntu-latest]
node: ["18"]
node: ["20"]
name: Coverage Report ALCS Frontend - ${{ matrix.node }}/${{ matrix.platform }}
runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@master
- uses: actions/setup-node@master
with:
node-version: ${{ matrix.node }}
- run: npm install --legacy-peer-deps
- run: npm install
- run: npm run build
- run: npm run test:cov
- if: matrix.node == '18'
- if: matrix.node == '20'
uses: actions/upload-artifact@v3
with:
name: coverage-alcs-frontend
Expand All @@ -35,8 +35,8 @@ jobs:
working-directory: portal-frontend
strategy:
matrix:
platform: [ ubuntu-latest ]
node: [ "18" ]
platform: [ubuntu-latest]
node: ["20"]
name: Coverage Report Portal Frontend - ${{ matrix.node }}/${{ matrix.platform }}
runs-on: ${{ matrix.platform }}
steps:
Expand All @@ -47,7 +47,7 @@ jobs:
- run: npm install
- run: npm run build
- run: npm run test:cov
- if: matrix.node == '18'
- if: matrix.node == '20'
uses: actions/upload-artifact@v3
with:
name: coverage-portal-frontend
Expand All @@ -61,7 +61,7 @@ jobs:
strategy:
matrix:
platform: [ubuntu-latest]
node: ["18"]
node: ["20"]
name: Coverage Report API - ${{ matrix.node }}/${{ matrix.platform }}
runs-on: ${{ matrix.platform }}
steps:
Expand All @@ -72,7 +72,7 @@ jobs:
- run: npm install
- run: npm run build
- run: npm run test:cov
- if: matrix.node == '18'
- if: matrix.node == '20'
uses: actions/upload-artifact@v3
with:
name: coverage-api
Expand Down
46 changes: 12 additions & 34 deletions alcs-frontend/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,10 @@
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"inlineStyleLanguage": "scss",
"assets": [
"src/favicon.ico",
"src/assets",
"src/maintenance.html"
],
"styles": [
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
"src/styles.scss"
],
"assets": ["src/favicon.ico", "src/assets", "src/maintenance.html"],
"styles": ["./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", "src/styles.scss"],
"stylePreprocessorOptions": {
"includePaths": [
"node_modules"
]
"includePaths": ["node_modules"]
},
"scripts": []
},
Expand Down Expand Up @@ -99,40 +90,27 @@
"test": {
"builder": "@angular-builders/jest:run",
"options": {
"polyfills": [
"src/polyfills.ts"
],
"polyfills": ["src/polyfills.ts"],
"tsConfig": "tsconfig.spec.json",
"inlineStyleLanguage": [
"scss"
],
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"./node_modules/@angular/material/prebuilt-themes/indigo-pink.css",
"src/styles.scss"
],
"scripts": []
"inlineStyleLanguage": ["scss"],
"assets": ["src/favicon.ico", "src/assets"],
"styles": ["./node_modules/@angular/material/prebuilt-themes/indigo-pink.css", "src/styles.scss"],
"scripts": [],
"detectOpenHandles": true,
"forceExit": true
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": [
"src/**/*.ts",
"src/**/*.html"
]
"lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
}
}
}
}
},
"cli": {
"analytics": "d29c8019-b84b-4fdc-9690-1ee8ea441897",
"schematicCollections": [
"@angular-eslint/schematics"
]
"schematicCollections": ["@angular-eslint/schematics"]
}
}
2 changes: 1 addition & 1 deletion alcs-frontend/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
preset: 'jest-preset-angular',
moduleDirectories: ['node_modules', 'src'],
globalSetup: 'jest-preset-angular/global-setup',
reporters: [['github-actions', { silent: false }], 'summary'],
coverageReporters: [
[
'lcov',
Expand Down
31 changes: 9 additions & 22 deletions portal-frontend/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,10 @@
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"inlineStyleLanguage": "scss",
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"src/styles.scss"
],
"assets": ["src/favicon.ico", "src/assets"],
"styles": ["src/styles.scss"],
"stylePreprocessorOptions": {
"includePaths": [
"node_modules"
]
"includePaths": ["node_modules"]
},
"scripts": []
},
Expand Down Expand Up @@ -99,23 +92,17 @@
"polyfills": ["src/polyfills.ts"],
"tsConfig": "tsconfig.spec.json",
"inlineStyleLanguage": ["scss"],
"assets": [
"src/favicon.ico",
"src/assets"
],
"styles": [
"src/styles.scss"
],
"scripts": []
"assets": ["src/favicon.ico", "src/assets"],
"styles": ["src/styles.scss"],
"scripts": [],
"detectOpenHandles": true,
"forceExit": true
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": [
"src/**/*.ts",
"src/**/*.html"
]
"lintFilePatterns": ["src/**/*.ts", "src/**/*.html"]
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions portal-frontend/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module.exports = {
preset: 'jest-preset-angular',
moduleDirectories: ['node_modules', 'src'],
modulePathIgnorePatterns:['/test'],
globalSetup: 'jest-preset-angular/global-setup',
reporters: [['github-actions', { silent: false }], 'summary'],
modulePathIgnorePatterns: ['/test'],
coverageReporters: [
[
'lcov',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { classes } from '@automapper/classes';
import { AutomapperModule } from '@automapper/nestjs';
import { classes } from 'automapper-classes';
import { AutomapperModule } from 'automapper-nestjs';
import { createMock, DeepMocked } from '@golevelup/nestjs-testing';
import { Test, TestingModule } from '@nestjs/testing';
import { getRepositoryToken } from '@nestjs/typeorm';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { classes } from '@automapper/classes';
import { AutomapperModule } from '@automapper/nestjs';
import { classes } from 'automapper-classes';
import { AutomapperModule } from 'automapper-nestjs';
import { createMock, DeepMocked } from '@golevelup/nestjs-testing';
import { Test, TestingModule } from '@nestjs/testing';
import { getRepositoryToken } from '@nestjs/typeorm';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { classes } from '@automapper/classes';
import { AutomapperModule } from '@automapper/nestjs';
import { classes } from 'automapper-classes';
import { AutomapperModule } from 'automapper-nestjs';
import { createMock, DeepMocked } from '@golevelup/nestjs-testing';
import { Test, TestingModule } from '@nestjs/testing';
import { getRepositoryToken } from '@nestjs/typeorm';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { classes } from '@automapper/classes';
import { AutomapperModule } from '@automapper/nestjs';
import { classes } from 'automapper-classes';
import { AutomapperModule } from 'automapper-nestjs';
import { createMock, DeepMocked } from '@golevelup/nestjs-testing';
import { Test, TestingModule } from '@nestjs/testing';
import { getRepositoryToken } from '@nestjs/typeorm';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { classes } from '@automapper/classes';
import { AutomapperModule } from '@automapper/nestjs';
import { classes } from 'automapper-classes';
import { AutomapperModule } from 'automapper-nestjs';
import { createMock, DeepMocked } from '@golevelup/nestjs-testing';
import { Test, TestingModule } from '@nestjs/testing';
import { getRepositoryToken } from '@nestjs/typeorm';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { classes } from '@automapper/classes';
import { AutomapperModule } from '@automapper/nestjs';
import { classes } from 'automapper-classes';
import { AutomapperModule } from 'automapper-nestjs';
import { createMock, DeepMocked } from '@golevelup/nestjs-testing';
import { Test, TestingModule } from '@nestjs/testing';
import { ApplicationService } from '../../application/application.service';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AutoMap } from '@automapper/classes';
import { AutoMap } from 'automapper-classes';
import { Column, Entity } from 'typeorm';
import { BaseCodeEntity } from '../../../common/entities/base.code.entity';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { classes } from '@automapper/classes';
import { AutomapperModule } from '@automapper/nestjs';
import { classes } from 'automapper-classes';
import { AutomapperModule } from 'automapper-nestjs';
import { createMock, DeepMocked } from '@golevelup/nestjs-testing';
import { Test, TestingModule } from '@nestjs/testing';
import { ClsService } from 'nestjs-cls';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Mapper } from '@automapper/core';
import { InjectMapper } from '@automapper/nestjs';
import { Mapper } from 'automapper-core';
import { InjectMapper } from 'automapper-nestjs';
import { Body, Controller, Param, Patch } from '@nestjs/common';
import { ANY_AUTH_ROLE } from '../../../common/authorization/roles';
import { UserRoles } from '../../../common/authorization/roles.decorator';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AutoMap } from '@automapper/classes';
import { AutoMap } from 'automapper-classes';
import { Type } from 'class-transformer';
import { Column, Entity, ManyToMany, ManyToOne } from 'typeorm';
import { Base } from '../../../common/entities/base.entity';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { classes } from '@automapper/classes';
import { AutomapperModule } from '@automapper/nestjs';
import { classes } from 'automapper-classes';
import { AutomapperModule } from 'automapper-nestjs';
import { createMock, DeepMocked } from '@golevelup/nestjs-testing';
import { Test, TestingModule } from '@nestjs/testing';
import { ClsService } from 'nestjs-cls';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Mapper } from '@automapper/core';
import { InjectMapper } from '@automapper/nestjs';
import { Mapper } from 'automapper-core';
import { InjectMapper } from 'automapper-nestjs';
import { Body, Controller, Get, Param, Patch } from '@nestjs/common';
import { ANY_AUTH_ROLE } from '../../../common/authorization/roles';
import { UserRoles } from '../../../common/authorization/roles.decorator';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AutoMap } from '@automapper/classes';
import { AutoMap } from 'automapper-classes';
import { Column, Entity, ManyToOne } from 'typeorm';
import { Base } from '../../../common/entities/base.entity';
import { ApplicationDecisionComponentLot } from '../application-component-lot/application-decision-component-lot.entity';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AutoMap } from '@automapper/classes';
import { AutoMap } from 'automapper-classes';
import {
BaseEntity,
Column,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { classes } from '@automapper/classes';
import { AutomapperModule } from '@automapper/nestjs';
import { classes } from 'automapper-classes';
import { AutomapperModule } from 'automapper-nestjs';
import { createMock, DeepMocked } from '@golevelup/nestjs-testing';
import { Test, TestingModule } from '@nestjs/testing';
import { ClsService } from 'nestjs-cls';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Mapper } from '@automapper/core';
import { InjectMapper } from '@automapper/nestjs';
import { Mapper } from 'automapper-core';
import { InjectMapper } from 'automapper-nestjs';
import { Body, Controller, Get, Param, Patch, UseGuards } from '@nestjs/common';
import { ApiOAuth2 } from '@nestjs/swagger';
import * as config from 'config';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AutoMap } from '@automapper/classes';
import { AutoMap } from 'automapper-classes';
import {
IsArray,
IsBoolean,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AutoMap } from '@automapper/classes';
import { AutoMap } from 'automapper-classes';
import {
Column,
Entity,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AutoMap } from '@automapper/classes';
import { AutoMap } from 'automapper-classes';
import {
Column,
Entity,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AutoMap } from '@automapper/classes';
import { AutoMap } from 'automapper-classes';
import { IsBoolean } from 'class-validator';
import { Entity } from 'typeorm';
import { BaseCodeDto } from '../../../common/dtos/base.dto';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { classes } from '@automapper/classes';
import { AutomapperModule } from '@automapper/nestjs';
import { classes } from 'automapper-classes';
import { AutomapperModule } from 'automapper-nestjs';
import { createMock, DeepMocked } from '@golevelup/nestjs-testing';
import { Test, TestingModule } from '@nestjs/testing';
import { ClsService } from 'nestjs-cls';
Expand Down
Loading

0 comments on commit f413397

Please sign in to comment.