Skip to content

Commit

Permalink
Pull request #1540: Release/patch 12.0.3
Browse files Browse the repository at this point in the history
Merge in OUI/oblique from release/patch_12.0.3 to master

* commit '1a063fd37e497b0039f82d9b9631fbf16873b2d2':
  chore(toolchain): release version 12.0.3
  chore(toolchain): update dependencies and refactor accordingly
  fix(oblique/master-layout): check for high contrast mode limited to init
  fix(sandbox/master-layout): use immutable methods to alter array of links
  • Loading branch information
nina-egger committed Nov 22, 2024
2 parents d4d820c + 1a063fd commit 48b3bdf
Show file tree
Hide file tree
Showing 23 changed files with 181 additions and 161 deletions.
272 changes: 142 additions & 130 deletions package-lock.json

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"title": "Oblique",
"name": "oblique",
"version": "12.0.2",
"version": "12.0.3",
"license": "MIT",
"organization": {
"name": "Federal Office of Information Technology, Systems and Telecommunication FOITT",
Expand Down Expand Up @@ -49,7 +49,7 @@
"@angular/core": "^18.2.4",
"@angular/forms": "^18.2.12",
"@angular/material": "^18.2.4",
"@angular/material-moment-adapter": "^18.2.13",
"@angular/material-moment-adapter": "^18.2.14",
"@angular/platform-browser": "^18.2.4",
"@angular/platform-browser-dynamic": "^18.2.12",
"@angular/router": "^18.2.12",
Expand All @@ -70,7 +70,7 @@
"@angular-devkit/core": "^18.2.4",
"@angular-eslint/eslint-plugin": "^18.3.1",
"@angular-eslint/eslint-plugin-template": "^18.3.1",
"@angular-eslint/template-parser": "^18.4.0",
"@angular-eslint/template-parser": "^18.4.1",
"@angular/cli": "^18.2.12",
"@angular/compiler-cli": "^18.2.12",
"@types/jest": "^29.5.14",
Expand All @@ -81,15 +81,15 @@
"chalk": "^4.1.2",
"eslint": "^8.57.1",
"eslint-config-prettier": "^9.1.0",
"husky": "^9.1.6",
"husky": "^9.1.7",
"jest": "^29.7.0",
"jest-sonar": "^0.2.16",
"lint-staged": "^15.2.10",
"prettier": "^3.3.3",
"stylelint": "^16.10.0",
"stylelint-config-prettier-scss": "^1.0.0",
"stylelint-config-standard-scss": "^13.1.0",
"stylelint-scss": "^6.9.0",
"stylelint-scss": "^6.10.0",
"ts-node": "^10.9.2",
"typescript": "~5.5.4"
}
Expand Down
2 changes: 1 addition & 1 deletion projects/cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@oblique/cli",
"version": "12.0.2",
"version": "12.0.3",
"description": "Command Line Interface to manage Oblique projects",
"keywords": [
"ob",
Expand Down
2 changes: 1 addition & 1 deletion projects/cli/sonar-project.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
sonar.projectName=@oblique/cli
sonar.projectKey=oblique_cli
sonar.projectVersion=12.0.2
sonar.projectVersion=12.0.3
sonar.typescript.lcov.reportPaths=coverage/cli/lcov.info
sonar.testExecutionReportPaths=coverage/cli/sqr.xml
sonar.tests=projects/cli/src
Expand Down
2 changes: 1 addition & 1 deletion projects/design-system/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@oblique/design-system",
"version": "12.0.2",
"version": "12.0.3",
"scripts": {
"lint": "ts-node scripts/lint.ts",
"format": "ts-node scripts/lint.ts --fix",
Expand Down
2 changes: 1 addition & 1 deletion projects/design-system/sonar-project.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
sonar.projectName=@oblique/design-system
sonar.projectKey=oblique_design-system
sonar.projectVersion=12.0.2
sonar.projectVersion=12.0.3
sonar.typescript.lcov.reportPaths=coverage/design-system/lcov.info
sonar.testExecutionReportPaths=coverage/design-system/sqr.xml
sonar.tests=projects/design-system/src/lib
Expand Down
6 changes: 6 additions & 0 deletions projects/oblique/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# [12.0.3](https://github.com/oblique-bit/oblique/compare/12.0.2...12.0.3) (2024-11-22)

## Bug Fixes

- **master-layout:** check for high contrast mode limited to init ([53924d2c](https://github.com/oblique-bit/oblique/commit/53924d2c69c6fdb3acba468d54119a11a751d16c))

# [12.0.2](https://github.com/oblique-bit/oblique/compare/12.0.1...12.0.2) (2024-11-15)

## Bug Fixes
Expand Down
4 changes: 2 additions & 2 deletions projects/oblique/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@oblique/oblique",
"version": "12.0.2",
"version": "12.0.3",
"publishConfig": {
"registry": "https://registry.npmjs.com/"
},
Expand Down Expand Up @@ -39,7 +39,7 @@
"rxjs": "^7.0.0"
},
"dependencies": {
"@angular-eslint/schematics": "^18.4.0",
"@angular-eslint/schematics": "^18.4.1",
"@angular/cdk": "^18.0.0 || ^19.0.0",
"@schematics/angular": "^18.2.4",
"ansi-colors": "^4.1.3",
Expand Down
2 changes: 1 addition & 1 deletion projects/oblique/sonar-project.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
sonar.projectName=@oblique/oblique
sonar.projectKey=oblique_oblique
sonar.projectVersion=12.0.2
sonar.projectVersion=12.0.3
sonar.typescript.lcov.reportPaths=coverage/oblique/lcov.info
sonar.testExecutionReportPaths=coverage/oblique/sqr.xml
sonar.tests=projects/oblique/src/lib
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/* eslint-disable max-lines */
import {
AfterContentChecked,
AfterViewInit,
Component,
ContentChild,
Expand Down Expand Up @@ -47,7 +46,7 @@ import {HighContrastMode, HighContrastModeDetector} from '@angular/cdk/a11y';
encapsulation: ViewEncapsulation.None,
host: {class: 'ob-master-layout', 'ob-version': appVersion}
})
export class ObMasterLayoutComponent implements OnInit, DoCheck, AfterViewInit, AfterContentChecked, OnDestroy {
export class ObMasterLayoutComponent implements OnInit, DoCheck, AfterViewInit, OnDestroy {
home = this.config.homePageRoute;
route = {path: '', params: undefined};
hasHighContrast = false;
Expand Down Expand Up @@ -104,6 +103,7 @@ export class ObMasterLayoutComponent implements OnInit, DoCheck, AfterViewInit,
.pipe(filter(evt => evt.name === ObEMasterLayoutEventValues.LAYOUT_HAS_MAIN_NAVIGATION))
.subscribe(evt => this.updateSkipLinks(evt.value));
this.updateSkipLinks(!this.noNavigation);
this.hasHighContrast = this.isInHighContrastMode();
}

ngDoCheck(): void {
Expand All @@ -114,10 +114,6 @@ export class ObMasterLayoutComponent implements OnInit, DoCheck, AfterViewInit,
}
}

ngAfterContentChecked(): void {
this.hasHighContrast = this.isInHighContrastMode();
}

ngAfterViewInit(): void {
// to avoid a ExpressionHasBeenChangedAfterItHasBeenCheckedError
setTimeout(() => (this.scrollTarget = this.getScrollTarget()));
Expand Down
2 changes: 1 addition & 1 deletion projects/oblique/src/lib/version.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const appVersion = '12.0.2';
export const appVersion = '12.0.3';
2 changes: 1 addition & 1 deletion projects/sandbox-ssr/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sandbox-ssr",
"version": "12.0.2",
"version": "12.0.3",
"scripts": {
"start": "ng serve",
"start-ssr": "node ../../dist/sandbox-ssr/server/server.mjs",
Expand Down
2 changes: 1 addition & 1 deletion projects/sandbox-ssr/sonar-project.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
sonar.projectName=@oblique/sandbox-ssr
sonar.projectKey=oblique_sandbox-ssr
sonar.projectVersion=12.0.2
sonar.projectVersion=12.0.3
sonar.typescript.lcov.reportPaths=coverage/sandbox-ssr/lcov.info
sonar.testExecutionReportPaths=coverage/sandbox-ssr/sqr.xml
sonar.tests=projects/sandbox-ssr/src/app
Expand Down
6 changes: 6 additions & 0 deletions projects/sandbox/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# [12.0.3](https://github.com/oblique-bit/oblique/compare/12.0.2...12.0.3) (2024-11-22)

## Bug Fixes

- **master-layout:** use immutable methods to alter array of links ([7290c99e](https://github.com/oblique-bit/oblique/commit/7290c99ec9fc06ce85f4407fee50f135cbb53939))

# [12.0.2](https://github.com/oblique-bit/oblique/compare/12.0.1...12.0.2) (2024-11-15)

## Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion projects/sandbox/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sandbox",
"version": "12.0.2",
"version": "12.0.3",
"scripts": {
"start": "ng serve",
"start-pams": "ng serve --configuration pams",
Expand Down
2 changes: 1 addition & 1 deletion projects/sandbox/sonar-project.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
sonar.projectName=@oblique/sandbox
sonar.projectKey=oblique_sandbox
sonar.projectVersion=12.0.2
sonar.projectVersion=12.0.3
sonar.typescript.lcov.reportPaths=coverage/sandbox/lcov.info
sonar.testExecutionReportPaths=coverage/sandbox/sqr.xml
sonar.tests=projects/sandbox/src/app
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ export class DynamicNavigationService {
}

addLink(link: ObINavigationLink): void {
this.links.push(link);
this.links = this.links.concat(link);
this.navigationLinks.next(this.links);
}

removeLastLink(): void {
this.links.pop();
this.links = this.links.slice(0, -1);
this.navigationLinks.next(this.links);
}
}
2 changes: 1 addition & 1 deletion projects/sds/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "swiss-design-system",
"version": "12.0.2",
"version": "12.0.3",
"scripts": {
"start": "ng serve",
"lint": "ts-node scripts/lint.ts",
Expand Down
2 changes: 1 addition & 1 deletion projects/sds/sonar-project.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
sonar.projectName=@oblique/sds
sonar.projectKey=oblique_sds
sonar.projectVersion=12.0.2
sonar.projectVersion=12.0.3
sonar.typescript.lcov.reportPaths=coverage/sds/lcov.info
sonar.testExecutionReportPaths=coverage/sds/sqr.xml
sonar.tests=projects/sds/src/app
Expand Down
2 changes: 1 addition & 1 deletion projects/sds/src/obliqueVersion.ts
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const latest = '12.0.2';
export const latest = '12.0.3';
2 changes: 1 addition & 1 deletion projects/service-navigation-web-component/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@oblique/service-navigation-web-component",
"version": "12.0.2",
"version": "12.0.3",
"publishConfig": {
"registry": "https://registry.npmjs.com/"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
sonar.projectName=@oblique/service-navigation
sonar.projectKey=oblique_service-navigation
sonar.projectVersion=12.0.2
sonar.projectVersion=12.0.3
sonar.typescript.lcov.reportPaths=coverage/service-navigation-web-component/lcov.info
sonar.testExecutionReportPaths=coverage/service-navigation-web-component/sqr.xml
sonar.tests=projects/service-navigation-web-component/src/app
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export const appVersion = '12.0.2';
export const appVersion = '12.0.3';

0 comments on commit 48b3bdf

Please sign in to comment.