Skip to content

Commit a3a7b36

Browse files
authored
Merge branch 'main' into develop
2 parents 234b8a3 + 3227352 commit a3a7b36

File tree

2 files changed

+78
-6
lines changed

2 files changed

+78
-6
lines changed

libs/angular-jss/CHANGELOG.md

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,75 @@
1+
## [1.1.2](https://github.com/design4pro/angular-jss/compare/angular-jss/v1.1.1...angular-jss/v1.1.2) (2022-03-06)
2+
3+
### Bug Fixes
4+
5+
- **angular-jss:** ci gh-pages fix ([60834f9](https://github.com/design4pro/angular-jss/commit/60834f9b2923523db837692f788dc92cb9d6ca90))
6+
7+
### Miscellaneous
8+
9+
- Merge pull request #34 from design4pro/develop ([3336257](https://github.com/design4pro/angular-jss/commit/3336257f4e065459c38b96c247551e3969e2ec6f)), closes [#34](https://github.com/design4pro/angular-jss/issues/34)
10+
11+
## [1.1.1](https://github.com/design4pro/angular-jss/compare/angular-jss/v1.1.0...angular-jss/v1.1.1) (2022-03-06)
12+
13+
### Bug Fixes
14+
15+
- **angular-jss:** clean dependencies ([fc71482](https://github.com/design4pro/angular-jss/commit/fc714820717eac497e056f7bdadcf80cc09e0173))
16+
17+
### Miscellaneous
18+
19+
- Merge pull request #33 from design4pro/develop ([a218e8c](https://github.com/design4pro/angular-jss/commit/a218e8cd829ba553a5ffb06c4578528702fa7b65)), closes [#33](https://github.com/design4pro/angular-jss/issues/33)
20+
- Merge pull request #32 from design4pro/develop ([de0746d](https://github.com/design4pro/angular-jss/commit/de0746d9fd19c821f96e9bcfcf0bb19654339bbe)), closes [#32](https://github.com/design4pro/angular-jss/issues/32)
21+
- Merge pull request #31 from design4pro/develop ([5eb8bfe](https://github.com/design4pro/angular-jss/commit/5eb8bfea81d6bb109dba3518050cbc2545f8157b)), closes [#31](https://github.com/design4pro/angular-jss/issues/31)
22+
23+
# [1.1.0](https://github.com/design4pro/angular-jss/compare/angular-jss/v1.0.3...angular-jss/v1.1.0) (2022-03-06)
24+
25+
### Features
26+
27+
- **angular-jss:** theme options ([f8c4e94](https://github.com/design4pro/angular-jss/commit/f8c4e949504b4ca56f75d90b3b7cc1ce2dfb8f31))
28+
29+
### Miscellaneous
30+
31+
- Merge pull request #30 from design4pro/develop ([a954bc4](https://github.com/design4pro/angular-jss/commit/a954bc4cc78dadd109a937903b1578180ab8f98a)), closes [#30](https://github.com/design4pro/angular-jss/issues/30)
32+
33+
## [1.0.3](https://github.com/design4pro/angular-jss/compare/angular-jss/v1.0.2...angular-jss/v1.0.3) (2022-03-05)
34+
35+
### Bug Fixes
36+
37+
- **angular-jss:** dependencies ([f3b177e](https://github.com/design4pro/angular-jss/commit/f3b177e335c019048df4e5a25a207855f2b939e3))
38+
- **angular-jss:** rxjs import fix ([7cab251](https://github.com/design4pro/angular-jss/commit/7cab2510940f33f43ab13cbe9727edd0266f0c87))
39+
40+
### Miscellaneous
41+
42+
- Merge pull request #29 from design4pro/develop ([d96c2dc](https://github.com/design4pro/angular-jss/commit/d96c2dc28cb616e5bff147f1a55adf231ecbc3d8)), closes [#29](https://github.com/design4pro/angular-jss/issues/29)
43+
- Merge pull request #24 from design4pro/dependabot/npm_and_yarn/nrwl/workspace-13.8.4 ([3df6b8a](https://github.com/design4pro/angular-jss/commit/3df6b8a072ec4e6ab541e4ee1777c75449bafca4)), closes [#24](https://github.com/design4pro/angular-jss/issues/24)
44+
- Merge pull request #28 from design4pro/dependabot/npm_and_yarn/rxjs-7.5.4 ([43cb9ff](https://github.com/design4pro/angular-jss/commit/43cb9ff4df2b3b6a76cebb3c8f978c1b26cdef73)), closes [#28](https://github.com/design4pro/angular-jss/issues/28)
45+
- Merge pull request #27 from design4pro/dependabot/npm_and_yarn/nrwl/tao-13.8.4 ([282bffc](https://github.com/design4pro/angular-jss/commit/282bffcebba5f1fbfbc6a92ac8463b227729f95d)), closes [#27](https://github.com/design4pro/angular-jss/issues/27)
46+
47+
## [1.0.2](https://github.com/design4pro/angular-jss/compare/angular-jss/v1.0.1...angular-jss/v1.0.2) (2022-03-04)
48+
49+
### Bug Fixes
50+
51+
- **angular-jss:** allowedNonPeerDependencies ([4f1718d](https://github.com/design4pro/angular-jss/commit/4f1718d8b1f783bbc1e02a11e16d72e6f25c25f9))
52+
- **angular-jss:** dependencies ([f43a226](https://github.com/design4pro/angular-jss/commit/f43a226e25b88652183eba115497e3f4d2681494))
53+
- **angular-jss:** dependencies ([9e39e84](https://github.com/design4pro/angular-jss/commit/9e39e847f50a74c36adb29d83084171d0c8e27bc))
54+
55+
### Miscellaneous
56+
57+
- Merge pull request #25 from design4pro/dependabot/npm_and_yarn/nrwl/cli-13.8.4 ([f477cc7](https://github.com/design4pro/angular-jss/commit/f477cc70d6bfeab4028320ef08672b41b56b6cbf)), closes [#25](https://github.com/design4pro/angular-jss/issues/25)
58+
- Merge pull request #26 from design4pro/dependabot/npm_and_yarn/nrwl/jest-13.8.4 ([8ad41fb](https://github.com/design4pro/angular-jss/commit/8ad41fb8969dc86d290034d98a8fd3769fdf5831)), closes [#26](https://github.com/design4pro/angular-jss/issues/26)
59+
- Merge pull request #19 from design4pro/develop ([ad27cbc](https://github.com/design4pro/angular-jss/commit/ad27cbc8bad0902b9c43fd0fc344441d6338d27e)), closes [#19](https://github.com/design4pro/angular-jss/issues/19)
60+
- Merge branch 'main' into dependabot/npm_and_yarn/nrwl/cli-13.8.4 ([908a74b](https://github.com/design4pro/angular-jss/commit/908a74b13b325f3e073ab3f4456de65e5b029130))
61+
- Merge pull request #15 from design4pro/dependabot/npm_and_yarn/jest-27.5.1 ([7c94040](https://github.com/design4pro/angular-jss/commit/7c94040aa1574867bc8f6d98712aa6b78fe237a8)), closes [#15](https://github.com/design4pro/angular-jss/issues/15)
62+
- Merge remote-tracking branch 'origin/main' into develop ([5da9b14](https://github.com/design4pro/angular-jss/commit/5da9b148b1477b5ed8692966e8600d5add283927))
63+
- Merge pull request #20 from design4pro/dependabot/npm_and_yarn/nrwl/cypress-13.8.4 ([3f28994](https://github.com/design4pro/angular-jss/commit/3f28994870be50cf54dde37c808ee322bf708b8f)), closes [#20](https://github.com/design4pro/angular-jss/issues/20)
64+
- Merge pull request #21 from design4pro/dependabot/npm_and_yarn/nrwl/angular-13.8.4 ([59de0a3](https://github.com/design4pro/angular-jss/commit/59de0a3af5a5667b3b102422c05f80e84ca16ba2)), closes [#21](https://github.com/design4pro/angular-jss/issues/21)
65+
- Merge branch 'main' into dependabot/npm_and_yarn/nrwl/cypress-13.8.4 ([948a67a](https://github.com/design4pro/angular-jss/commit/948a67a35c752e7d08483150e1852c808fbddbf9))
66+
- Merge branch 'main' into dependabot/npm_and_yarn/nrwl/angular-13.8.4 ([5fb8c61](https://github.com/design4pro/angular-jss/commit/5fb8c612b86eb2f146df08c794b3d374b2c3295c))
67+
- Merge pull request #14 from design4pro/dependabot/npm_and_yarn/typescript-eslint/eslint-plugin-5.13.0 ([dab8f1d](https://github.com/design4pro/angular-jss/commit/dab8f1dc7a5af222175cb88a731754aa787a4dff)), closes [#14](https://github.com/design4pro/angular-jss/issues/14)
68+
- Merge pull request #13 from design4pro/dependabot/npm_and_yarn/types/jest-27.4.1 ([0e26cc0](https://github.com/design4pro/angular-jss/commit/0e26cc0c06ce727d45cf34e5ccd170f74befe55c)), closes [#13](https://github.com/design4pro/angular-jss/issues/13)
69+
- Merge pull request #16 from design4pro/dependabot/npm_and_yarn/angular-eslint/template-parser-13.1.0 ([b316aa0](https://github.com/design4pro/angular-jss/commit/b316aa035c738d6dfe244b2b90d6ce0acda0a728)), closes [#16](https://github.com/design4pro/angular-jss/issues/16)
70+
- Merge branch 'main' into dependabot/npm_and_yarn/angular-eslint/template-parser-13.1.0 ([d194c75](https://github.com/design4pro/angular-jss/commit/d194c759b7c7b6be0379b352cefa4527838dc881))
71+
- Merge pull request #17 from design4pro/dependabot/npm_and_yarn/angular-eslint/eslint-plugin-template-13.1.0 ([4e643dd](https://github.com/design4pro/angular-jss/commit/4e643dd5bf89ca958c78eb0dd93e17bd63d416ab)), closes [#17](https://github.com/design4pro/angular-jss/issues/17)
72+
173
## [1.0.1](https://github.com/design4pro/angular-jss/compare/angular-jss/v1.0.0...angular-jss/v1.0.1) (2022-03-04)
274

375
### Bug Fixes

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"jss-plugin-rule-value-function": "^10.9.0",
5151
"jss-preset-default": "^10.9.0",
5252
"ngx-highlightjs": "^6.1.1",
53-
"rxjs": "~7.4.0",
53+
"rxjs": "~7.5.4",
5454
"tslib": "^2.0.0",
5555
"zone.js": "~0.11.4"
5656
},
@@ -66,14 +66,14 @@
6666
"@commitlint/config-angular": "^16.2.1",
6767
"@commitlint/config-conventional": "^16.2.1",
6868
"@commitlint/prompt-cli": "^16.2.1",
69-
"@nrwl/cli": "13.8.3",
69+
"@nrwl/cli": "13.8.4",
7070
"@nrwl/cypress": "13.8.4",
7171
"@nrwl/eslint-plugin-nx": "13.8.3",
72-
"@nrwl/jest": "13.8.3",
72+
"@nrwl/jest": "13.8.4",
7373
"@nrwl/linter": "13.8.3",
7474
"@nrwl/nx-cloud": "latest",
75-
"@nrwl/tao": "13.8.3",
76-
"@nrwl/workspace": "13.8.3",
75+
"@nrwl/tao": "13.8.4",
76+
"@nrwl/workspace": "13.8.4",
7777
"@semantic-release/changelog": "^6.0.1",
7878
"@semantic-release/exec": "^6.0.3",
7979
"@semantic-release/git": "^10.0.1",
@@ -86,7 +86,7 @@
8686
"eslint-config-prettier": "8.4.0",
8787
"eslint-plugin-cypress": "^2.10.3",
8888
"hasky": "^3.0.2",
89-
"jest": "27.2.3",
89+
"jest": "27.5.1",
9090
"jest-preset-angular": "11.1.1",
9191
"lint-staged": "^12.3.4",
9292
"ng-packagr": "^13.0.0",

0 commit comments

Comments
 (0)