Skip to content

Commit

Permalink
Pull request #1371: Release/patch 11.1.2
Browse files Browse the repository at this point in the history
Merge in OUI/oblique from release/patch_11.1.2 to master

* commit 'a136260051abe42b4e445e2623ce5a9321e377ec': (33 commits)
  chore(toolchain): release version 11.1.2
  chore(toolchain): update dependencies and refactor accordingly
  fix(oblique/schematics): correctly handle new lines for windows when adding feature detection
  fix(service-navigation): ensure the banner is only added to service-navigation files
  fix(oblique/toolchain): ensure the banner is only added to oblique files
  fix(oblique/button): increase lateral padding
  refactor(oblique/button): remove unnecessary code
  refactor(oblique/button): avoid disabling `eslint-disable logical-assignment-operators`
  refactor(oblique/toolchain): remove unnecessary option in `writeFileSync` the in release script
  fix(oblique/toolchain): update the current year in LICENSE when releasing
  fix(service-navigation): fix oblique license link in the banner
  fix(oblique/toolchain): fix oblique license link in the banner
  fix(service-navigation): fix oblique documentation link in the banner
  fix(oblique/toolchain): fix oblique documentation link in the banner
  fix(toolchain): remove non-existent URL from LICENSE
  fix(oblique/material): make sure the header card's padding is consistent
  fix(oblique/material): make sure the card's top padding is consistent
  fix(oblique/schematics): prevent browser compatibility warning being shown in google search
  fix(oblique/autocomplete): reset options list when the formControl is reset
  feat(sandbox/autocomplete): add reset control button
  ...
  • Loading branch information
nina-egger committed May 17, 2024
2 parents 90530fb + a136260 commit 6d2653f
Show file tree
Hide file tree
Showing 41 changed files with 874 additions and 840 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,17 @@ jobs:

strategy:
matrix:
node-version: [16.x, 18.x]
node-version: [18.x, 20.x, 22.x]

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- run: npm ci
- run: npm run lint
- run: npm run test
- run: npm run build
- run: npm run dist
- run: npm run test -ws
- run: npm run build -ws
1 change: 1 addition & 0 deletions .stylelintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ rules:
# deactivate unwanted rules
scss/double-slash-comment-empty-line-before: null
shorthand-property-no-redundant-values: null
scss/no-global-function-names: null
# rules that need some refactoring to be enabled
# no-descending-specificity: null
# selector-class-pattern: ^([a-z][a-z0-9]*)([-_]{0,2}[a-z0-9]+)*$
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
# [11.1.2](https://github.com/oblique-bit/oblique/compare/11.1.1...11.1.2) (2024-05-17)

## Bug Fixes

- **autocomplete:** reset options list when the formControl is reset ([fd98c04c](https://github.com/oblique-bit/oblique/commit/fd98c04ca1b0ed068e21562b960997c5baac60f9))
- **button:** increase lateral padding ([145a29d9](https://github.com/oblique-bit/oblique/commit/145a29d9b8035507d006ea7727ddcd105ac874aa))
- **material:** make sure the header card's padding is consistent ([7f393468](https://github.com/oblique-bit/oblique/commit/7f393468ebb77340ea3535255e71edf70b57294e))
- **material:** make sure the card's top padding is consistent ([a929a92e](https://github.com/oblique-bit/oblique/commit/a929a92eadca05f2967ddd4e89d23884418ad4d5))
- **schematics:** correctly handle new lines for windows when adding feature detection ([c826de10](https://github.com/oblique-bit/oblique/commit/c826de101d081c55a9fa2b981d05f08131d8406e))
- **schematics:** prevent browser compatibility warning being shown in google search ([26a88fb2](https://github.com/oblique-bit/oblique/commit/26a88fb238e7be3b56921d551d1466959414baaf))

# [11.1.1](https://github.com/oblique-bit/oblique/compare/11.1.0...11.1.1) (2024-05-03)

## Bug Fixes
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ nodejsPipelineTemplate {
branches = [
'*': [
'lint': 'npm run lint',
'test': 'npm test -ws',
'test': 'npm run test-ci -ws',
'build': 'npm run build -ws',
sonar: true
],
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License

Copyright (c) 2020-2020 The Swiss Confederation, represented by the Federal Office of Information Technology, Systems and Telecommunication FOITT https://oblique.bit.admin.ch/license
Copyright (c) 2020-2024 The Swiss Confederation, represented by the Federal Office of Information Technology, Systems and Telecommunication FOITT

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
42 changes: 34 additions & 8 deletions angular.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,14 @@
"run-in-band": ["true"]
},
"configurations": {
"development": {
"default": {
"configPath": "jest.config.js"
},
"production": {
"configPath": "jest.config.prod.js"
"ci": {
"configPath": "jest.config.ci.js"
}
},
"defaultConfiguration": "production"
"defaultConfiguration": "default"
}
}
},
Expand Down Expand Up @@ -195,11 +195,19 @@
"test": {
"builder": "@angular-builders/jest:run",
"options": {
"configPath": "jest.config.js",
"tsConfig": "tsconfig.spec.json",
"no-cache": ["true"],
"run-in-band": ["true"]
}
},
"configurations": {
"default": {
"configPath": "jest.config.js"
},
"ci": {
"configPath": "jest.config.ci.js"
}
},
"defaultConfiguration": "default"
}
}
},
Expand Down Expand Up @@ -309,7 +317,16 @@
"tsConfig": "tsconfig.spec.json",
"no-cache": ["true"],
"run-in-band": ["true"]
}
},
"configurations": {
"default": {
"configPath": "jest.config.js"
},
"ci": {
"configPath": "jest.config.ci.js"
}
},
"defaultConfiguration": "default"
}
}
},
Expand Down Expand Up @@ -394,7 +411,16 @@
"tsConfig": "tsconfig.spec.json",
"no-cache": ["true"],
"run-in-band": ["true"]
}
},
"configurations": {
"default": {
"configPath": "jest.config.js"
},
"ci": {
"configPath": "jest.config.ci.js"
}
},
"defaultConfiguration": "default"
}
}
}
Expand Down
Loading

0 comments on commit 6d2653f

Please sign in to comment.