Skip to content

Commit

Permalink
Merge pull request #2749 from jesperancinha/update-npm-dependencies
Browse files Browse the repository at this point in the history
Update npm dependencies
  • Loading branch information
jesperancinha committed Jun 18, 2024
2 parents b3619e9 + 769b225 commit 16bb2ce
Show file tree
Hide file tree
Showing 9 changed files with 58 additions and 26 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"dependencies": {
"caniuse-lite": "^1.0.30001587"
"caniuse-lite": "^1.0.30001634"
}
}
5 changes: 5 additions & 0 deletions stamps-and-coins-web/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,10 @@ update-force: update
npm audit fix --force
npm audit fix --force
build:
if [ -d node_modules ]; then rm -r node_modules; fi
yarn install && npm run build
checkup: build
npm run test-headless
npm start


6 changes: 4 additions & 2 deletions stamps-and-coins-web/angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"aot": true,
"aot": false,
"buildOptimizer": false,
"assets": [
"src/favicon.ico",
"src/assets"
Expand Down Expand Up @@ -81,7 +82,8 @@
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"polyfills": ["zone.js", "zone.js/testing", "src/polyfills.ts"],
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"assets": [
Expand Down
39 changes: 19 additions & 20 deletions stamps-and-coins-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,42 +13,41 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^17.3.4",
"@angular/cdk": "^18.0.0",
"@angular/common": "~17.3.4",
"@angular/compiler": "~17.3.4",
"@angular/core": "^17.2.1",
"@angular/forms": "^17.2.1",
"@angular/material": "^18.0.0",
"@angular/platform-browser": "^17.2.1",
"@angular/platform-browser-dynamic": "^17.2.1",
"@angular/router": "^18.0.0",
"ngx-pagination": "^6.0.3",
"@angular/animations": "^18.0.3",
"@angular/cdk": "^18.0.3",
"@angular/common": "~18.0.3",
"@angular/compiler": "~18.0.3",
"@angular/core": "^18.0.3",
"@angular/forms": "^18.0.3",
"@angular/material": "^18.0.3",
"@angular/platform-browser": "^18.0.3",
"@angular/platform-browser-dynamic": "^18.0.3",
"@angular/router": "^18.0.3",
"rxjs": "^7.8.1",
"tslib": "^2.6.2",
"tslib": "^2.6.3",
"typescript": "<5.5.0",
"zone.js": "~0.14.4"
"zone.js": "~0.14.7"
},
"devDependencies": {
"@angular-devkit/build-angular": "^17.3.4",
"@angular/cli": "^17.3.4",
"@angular/compiler-cli": "^17.2.3",
"@angular/language-service": "^18.0.0",
"@angular-devkit/build-angular": "^18.0.4",
"@angular/cli": "^18.0.4",
"@angular/compiler-cli": "^18.0.3",
"@angular/language-service": "^18.0.3",
"@types/jasmine": "~5.1.4",
"@types/jasminewd2": "~2.0.13",
"@types/node": "~20.14.2",
"codelyzer": "^6.0.2",
"cypress": "^13.7.3",
"cypress": "^13.11.0",
"jasmine-core": "~5.1.2",
"jasmine-spec-reporter": "~7.0.0",
"jest-preset-angular": "^14.0.3",
"karma": "~6.4.3",
"karma-chrome-launcher": "~3.2.0",
"karma-coverage-istanbul-reporter": "~3.0.3",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "^2.1.0",
"protractor": "^7.0.0",
"ts-node": "~10.9.2",
"tslint": "~6.1.3",
"typescript": ">=5.3.3"
"tslint": "~6.1.3"
}
}
2 changes: 0 additions & 2 deletions stamps-and-coins-web/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {MatListModule} from "@angular/material/list";
import {BrowserAnimationsModule} from "@angular/platform-browser/animations";
import {FormsModule} from "@angular/forms";
import {MatTableModule} from "@angular/material/table";
import {NgxPaginationModule} from "ngx-pagination";
import {LoginComponent} from "./components/login/login.component";
import {AppService} from "./services/app.service";
import {MatGridListModule} from "@angular/material/grid-list";
Expand Down Expand Up @@ -49,7 +48,6 @@ export class XhrInterceptor implements HttpInterceptor {
BrowserAnimationsModule,
MatTableModule,
FormsModule,
NgxPaginationModule,
MatGridListModule,
],
providers: [
Expand Down
23 changes: 23 additions & 0 deletions stamps-and-coins-web/src/test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import 'jest-preset-angular/setup-jest';

Object.defineProperty(window, 'CSS', {value: null});
Object.defineProperty(window, 'getComputedStyle', {
value: () => {
return {
display: 'none',
appearance: ['-webkit-appearance']
};
}
});

Object.defineProperty(document, 'doctype', {
value: '<!DOCTYPE html>'
});
Object.defineProperty(document.body.style, 'transform', {
value: () => {
return {
enumerable: true,
configurable: true
};
}
});
1 change: 1 addition & 0 deletions stamps-and-coins-web/tsconfig.app.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
"src/**/*.ts"
],
"exclude": [
"src/test.ts",
"src/**/*.spec.ts"
]
}
2 changes: 1 addition & 1 deletion stamps-and-coins-web/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"node_modules/@types"
],
"lib": [
"es2018",
"ES2022",
"dom"
]
}
Expand Down
4 changes: 4 additions & 0 deletions stamps-and-coins-web/tsconfig.spec.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,14 @@
]
},
"files": [
"src/test.ts",
"src/polyfills.ts"
],
"include": [
"src/**/*.spec.ts",
"src/**/*.d.ts"
],
"exclude": [
"src/test.ts"
]
}

0 comments on commit 16bb2ce

Please sign in to comment.