openlp/web-remote
1
0
Fork 0
mirror of https://gitlab.com/openlp/web-remote.git synced 2024-12-22 03:22:48 +00:00
Code Issues Projects Releases Wiki Activity

Update to Angular v17 and update other packages as well.

Browse Source
This commit is contained in:
Chris Witterholt 2024-02-14 03:42:35 +00:00 committed by Raoul Snyman
parent 96adf2c86f
commit 3d475fd5fc
11 changed files with 3065 additions and 3448 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
angular.json
View File

@ -62,14 +62,14 @@
"serve": { "serve": {
"builder": "@angular-devkit/build-angular:dev-server", "builder": "@angular-devkit/build-angular:dev-server",
"options": { "options": {
"browserTarget": "@openlp/web-remote:build" "buildTarget": "@openlp/web-remote:build"
}, },
"configurations": { "configurations": {
"production": { "production": {
"browserTarget": "@openlp/web-remote:build:production" "buildTarget": "@openlp/web-remote:build:production"
}, },
"development": { "development": {
"browserTarget": "@openlp/web-remote:build:development" "buildTarget": "@openlp/web-remote:build:development"
} }
}, },
"defaultConfiguration": "development" "defaultConfiguration": "development"
@ -77,7 +77,7 @@
"extract-i18n": { "extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n", "builder": "@angular-devkit/build-angular:extract-i18n",
"options": { "options": {
"browserTarget": "@openlp/web-remote:build" "buildTarget": "@openlp/web-remote:build"
} }
}, },
"test": { "test": {

4
e2e/tsconfig.e2e.json
View File

@ -2,8 +2,8 @@
"extends": "../tsconfig.json", "extends": "../tsconfig.json",
"compilerOptions": { "compilerOptions": {
"outDir": "../out-tsc/app", "outDir": "../out-tsc/app",
"module": "commonjs", "module": "CommonJS",
"target": "es5", "target": "ES2022",
"types": [ "types": [
"jasmine", "jasmine",
"jasminewd2", "jasminewd2",

77
package.json
View File

@ -23,51 +23,52 @@
"lint": "ng lint" "lint": "ng lint"
}, },
"dependencies": { "dependencies": {
"@angular/animations": "^16.2.12", "@angular/animations": "^17.1.3",
"@angular/cdk": "^16.2.12", "@angular/cdk": "^17.1.2",
"@angular/common": "^16.2.12", "@angular/common": "^17.1.3",
"@angular/compiler": "^16.2.12", "@angular/compiler": "^17.1.3",
"@angular/core": "^16.2.12", "@angular/core": "^17.1.3",
"@angular/forms": "^16.2.12", "@angular/forms": "^17.1.3",
"@angular/material": "^16.2.12", "@angular/material": "^17.1.2",
"@angular/platform-browser": "^16.2.12", "@angular/platform-browser": "^17.1.3",
"@angular/platform-browser-dynamic": "^16.2.12", "@angular/platform-browser-dynamic": "^17.1.3",
"@angular/router": "^16.2.12", "@angular/router": "^17.1.3",
"@fontsource/roboto": "^4.5.8", "@fontsource/roboto": "^5.0.8",
"core-js": "^3.26.1", "core-js": "^3.35.1",
"hammerjs": "^2.0.8", "hammerjs": "^2.0.8",
"material-icons": "^1.13.1", "material-icons": "^1.13.12",
"rxjs": "^7.6.0", "rxjs": "^7.8.1",
"zone.js": "^0.13.3" "zone.js": "^0.14.3"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "^16.2.12", "@angular-devkit/build-angular": "^17.1.3",
"@angular-eslint/builder": "^16.2.12", "@angular-eslint/builder": "^17.1.3",
"@angular-eslint/eslint-plugin": "^16.2.12", "@angular-eslint/eslint-plugin": "^17.1.3",
"@angular-eslint/eslint-plugin-template": "^16.2.12", "@angular-eslint/eslint-plugin-template": "^17.1.3",
"@angular-eslint/schematics": "^16.2.12", "@angular-eslint/schematics": "^17.1.3",
"@angular-eslint/template-parser": "^16.2.12", "@angular-eslint/template-parser": "^17.1.3",
"@angular/cli": "~16.2.12", "@angular/cli": "~17.1.3",
"@angular/compiler-cli": "^16.2.12", "@angular/compiler-cli": "^17.1.3",
"@angular/language-service": "^16.2.12", "@angular/language-service": "^17.1.3",
"@types/jasmine": "~4.3.1", "@chiragrupani/karma-chromium-edge-launcher": "^2.3.1",
"@types/jasminewd2": "~2.0.10", "@types/jasmine": "~5.1.4",
"@types/node": "~18.11.13", "@types/jasminewd2": "~2.0.13",
"@typescript-eslint/eslint-plugin": "5.44.0", "@types/node": "~20.11.17",
"@typescript-eslint/parser": "5.44.0", "@typescript-eslint/eslint-plugin": "6.21.0",
"eslint": "^8.28.0", "@typescript-eslint/parser": "6.21.0",
"eslint-plugin-import": "~2.26.0", "eslint": "^8.56.0",
"eslint-plugin-jsdoc": "~39.6.4", "eslint-plugin-import": "~2.29.1",
"eslint-plugin-jsdoc": "~48.0.6",
"eslint-plugin-prefer-arrow": "~1.2.3", "eslint-plugin-prefer-arrow": "~1.2.3",
"jasmine-core": "~4.5.0", "jasmine-core": "~5.1.2",
"jasmine-spec-reporter": "~7.0.0", "jasmine-spec-reporter": "~7.0.0",
"karma": "~6.4.1", "karma": "~6.4.2",
"karma-chrome-launcher": "~3.1.1", "karma-chrome-launcher": "~3.2.0",
"karma-coverage-istanbul-reporter": "~3.0.3", "karma-coverage-istanbul-reporter": "~3.0.3",
"karma-jasmine": "~5.1.0", "karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "^2.0.0", "karma-jasmine-html-reporter": "^2.1.0",
"ts-node": "~10.9.1", "ts-node": "~10.9.2",
"typescript": "~5.1.6" "typescript": "~5.3.3"
}, },
"private": true "private": true
} }

5
src/karma.conf.js
View File

@ -10,7 +10,8 @@ module.exports = function (config) {
require('karma-chrome-launcher'), require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'), require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'), require('karma-coverage-istanbul-reporter'),
require('@angular-devkit/build-angular/plugins/karma') require('@angular-devkit/build-angular/plugins/karma'),
require('@chiragrupani/karma-chromium-edge-launcher')
], ],
client: { client: {
clearContext: false // leave Jasmine Spec Runner output visible in browser clearContext: false // leave Jasmine Spec Runner output visible in browser
@ -25,7 +26,7 @@ module.exports = function (config) {
colors: true, colors: true,
logLevel: config.LOG_INFO, logLevel: config.LOG_INFO,
autoWatch: true, autoWatch: true,
browsers: ['Chromium'], browsers: ['Chromium','Edge'],
customLaunchers: { customLaunchers: {
ChromiumHeadlessCI: { ChromiumHeadlessCI: {
base: 'ChromiumHeadless', base: 'ChromiumHeadless',

2
src/polyfills.ts
View File

@ -71,7 +71,7 @@
/*************************************************************************************************** /***************************************************************************************************
* Zone JS is required by default for Angular itself. * Zone JS is required by default for Angular itself.
*/ */
import 'zone.js/dist/zone'; // Included with Angular CLI. import 'zone.js';

10
src/styles.scss
View File

@ -1,6 +1,5 @@
/* You can add global styles to this file, and also import other style files */ /* You can add global styles to this file, and also import other style files */
@use '@angular/material' as mat; @use '@angular/material' as mat;
@import '@angular/material/theming';
@include mat.core(); @include mat.core();
$olp-primary: mat.define-palette(mat.$indigo-palette, 500); $olp-primary: mat.define-palette(mat.$indigo-palette, 500);
@ -136,9 +135,8 @@ footer {
// This rule is to avoid the left menu scrolling with the page itself. // This rule is to avoid the left menu scrolling with the page itself.
.mat-drawer.mat-sidenav { .mat-drawer.mat-sidenav {
position: fixed; position: fixed;
padding-top: $mat-toolbar-height-desktop; padding-top: 64px;
@media screen and (max-width: 600px) {
@media ($mat-xsmall) { padding-top: 56px;
padding-top: $mat-toolbar-height-mobile;
} }
} }

2
src/test.ts
View File

@ -1,6 +1,6 @@
// This file is required by karma.conf.js and loads recursively all the .spec and framework files // This file is required by karma.conf.js and loads recursively all the .spec and framework files
import 'zone.js/dist/zone-testing'; import 'zone.js/testing';
import { getTestBed } from '@angular/core/testing'; import { getTestBed } from '@angular/core/testing';
import { import {
BrowserDynamicTestingModule, BrowserDynamicTestingModule,

2
src/tsconfig.app.json
View File

@ -3,7 +3,7 @@
"compilerOptions": { "compilerOptions": {
"resolveJsonModule": true, "resolveJsonModule": true,
"outDir": "../out-tsc/app", "outDir": "../out-tsc/app",
"module": "es2015", "module": "ES2015",
"types": [] "types": []
}, },
"exclude": [ "exclude": [

2
src/tsconfig.spec.json
View File

@ -2,7 +2,7 @@
"extends": "../tsconfig.json", "extends": "../tsconfig.json",
"compilerOptions": { "compilerOptions": {
"outDir": "../out-tsc/spec", "outDir": "../out-tsc/spec",
"module": "commonjs", "module": "CommonJS",
"types": [ "types": [
"jasmine", "jasmine",
"node" "node"

2
tsconfig.json
View File

@ -9,7 +9,7 @@
"emitDecoratorMetadata": true, "emitDecoratorMetadata": true,
"experimentalDecorators": true, "experimentalDecorators": true,
"resolveJsonModule": true, "resolveJsonModule": true,
"target": "es2022", "target": "ES2022",
"useDefineForClassFields": false, "useDefineForClassFields": false,
"typeRoots": [ "typeRoots": [
"node_modules/@types" "node_modules/@types"

6399
yarn.lock
View File

File diff suppressed because it is too large Load Diff