Skip to content

Commit

Permalink
Merge branch 'main' into feat/2836-add-a-slot-for-card-control-descri…
Browse files Browse the repository at this point in the history
…ption
  • Loading branch information
oliverschuerch committed Mar 22, 2024
2 parents db921d0 + 94b5183 commit ca984cc
Show file tree
Hide file tree
Showing 8 changed files with 545 additions and 430 deletions.
16 changes: 4 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,21 +101,13 @@
}
},
"overrides": {
"[email protected] ≤ Version ≤ 1.3.5": "",
"merge@< 2.1.1": "2.1.1",
"glob-parent@< 5.1.2": "5.1.2",
"[email protected]": "",
"jsbn@≤ 1.1.0": "",
"[email protected]": "",
"semver@< 5.7.2||6.0.0 ≤ Version < 6.3.1||7.0.0 ≤ Version < 7.5.2": "5.7.2||6.3.1||7.5.2",
"@babel/traverse@< 7.23.2||8.0.0-alpha.0 ≤ Version < 8.0.0-alpha.4": "7.23.2||8.0.0-alpha.4",
"merge@<2.1.1": ">=2.1.1",
"glob-parent@<5.1.2": ">=5.1.2",
"socket.io-parser@>=4.0.4 <4.2.3": ">=4.2.3",
"semver@<5.7.2": ">=5.7.2",
"semver@>=7.0.0 <7.5.2": ">=7.5.2",
"postcss@<8.4.31": ">=8.4.31",
"@babel/traverse@<7.23.2": ">=7.23.2"
"merge@<2.1.1": ">=2.1.1",
"ip@=2.0.0": ">=2.0.1",
"es5-ext@>=0.10.0 <0.10.63": ">=0.10.63",
"follow-redirects@<=1.15.5": ">=1.15.6"
}
}
}
10 changes: 5 additions & 5 deletions packages/components-angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@
"@angular/platform-browser": "17.3.0",
"@angular/platform-browser-dynamic": "17.3.0",
"@angular/router": "17.3.0",
"@swisspost/design-system-styles": "workspace:6.6.4",
"@swisspost/design-system-components": "workspace:2.1.0",
"@swisspost/design-system-styles": "workspace:6.6.4",
"rxjs": "7.8.1",
"tslib": "2.6.2",
"zone.js": "0.14.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "17.3.0",
"@angular-eslint/builder": "17.2.1",
"@angular-eslint/eslint-plugin": "17.2.1",
"@angular-eslint/eslint-plugin-template": "17.2.1",
"@angular-eslint/template-parser": "17.2.1",
"@angular-eslint/builder": "17.3.0",
"@angular-eslint/eslint-plugin": "17.3.0",
"@angular-eslint/eslint-plugin-template": "17.3.0",
"@angular-eslint/template-parser": "17.3.0",
"@angular/cli": "17.3.0",
"@angular/compiler-cli": "17.3.0",
"@cypress/schematic": "2.5.1",
Expand Down
6 changes: 3 additions & 3 deletions packages/components-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
"@types/node": "18.19.14",
"@types/react": "18.2.66",
"@types/react-dom": "18.2.22",
"@typescript-eslint/eslint-plugin": "5.62.0",
"@typescript-eslint/parser": "5.62.0",
"@typescript-eslint/eslint-plugin": "6.4.0",
"@typescript-eslint/parser": "6.4.0",
"eslint": "8.57.0",
"eslint-config-standard-with-typescript": "43.0.1",
"eslint-config-love": "43.1.0",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-n": "16.6.2",
"eslint-plugin-promise": "6.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
"rollup-plugin-postcss": "4.0.2",
"sass": "1.72.0",
"ts-jest": "29.1.2",
"typescript": "4.9.5"
"typescript": "5.3.3"
},
"keywords": [
"components",
Expand Down
12 changes: 6 additions & 6 deletions packages/demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,19 @@
},
"devDependencies": {
"@angular-devkit/build-angular": "17.3.0",
"@angular-eslint/builder": "17.2.1",
"@angular-eslint/eslint-plugin": "17.2.1",
"@angular-eslint/eslint-plugin-template": "17.2.1",
"@angular-eslint/template-parser": "17.2.1",
"@angular-eslint/builder": "17.3.0",
"@angular-eslint/eslint-plugin": "17.3.0",
"@angular-eslint/eslint-plugin-template": "17.3.0",
"@angular-eslint/template-parser": "17.3.0",
"@angular/cli": "17.3.0",
"@angular/compiler-cli": "17.3.0",
"@angular/elements": "17.3.0",
"@angular/language-service": "17.3.0",
"@types/jasmine": "5.1.4",
"@types/jasminewd2": "2.0.13",
"@types/node": "18.17.19",
"@typescript-eslint/eslint-plugin": "6.21.0",
"@typescript-eslint/parser": "6.21.0",
"@typescript-eslint/eslint-plugin": "6.4.0",
"@typescript-eslint/parser": "6.4.0",
"eslint": "8.57.0",
"jasmine-core": "5.1.2",
"jasmine-marbles": "0.9.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/documentation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"rimraf": "5.0.5",
"sass": "1.72.0",
"storybook": "7.6.17",
"typescript": "5.1.6"
"typescript": "5.3.3"
},
"peerDependencies": {
"@swisspost/design-system-components-angular": "workspace:2.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/styles/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"stylelint-config-sass-guidelines": "11.1.0",
"stylelint-prettier": "5.0.0",
"stylelint-scss": "6.2.1",
"typescript": "4.9.5"
"typescript": "5.3.3"
},
"sass": {
"includePaths": [
Expand Down
Loading

0 comments on commit ca984cc

Please sign in to comment.