diff --git a/README.md b/README.md index 0f6279f..ade23fb 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,10 @@ ## Features +- [x] Component decorator `Styled` +- [x] Theming with `Theme` +- [x] Server Side Rendering with Angular Universal + ## Table of Contents - [Installation](#installation) diff --git a/libs/angular-jss/CHANGELOG.md b/libs/angular-jss/CHANGELOG.md index 2d16cca..97bc82b 100644 --- a/libs/angular-jss/CHANGELOG.md +++ b/libs/angular-jss/CHANGELOG.md @@ -1,3 +1,29 @@ +## [1.0.2](https://github.com/design4pro/angular-jss/compare/angular-jss/v1.0.1...angular-jss/v1.0.2) (2022-03-04) + +### Bug Fixes + +- **angular-jss:** allowedNonPeerDependencies ([4f1718d](https://github.com/design4pro/angular-jss/commit/4f1718d8b1f783bbc1e02a11e16d72e6f25c25f9)) +- **angular-jss:** dependencies ([f43a226](https://github.com/design4pro/angular-jss/commit/f43a226e25b88652183eba115497e3f4d2681494)) +- **angular-jss:** dependencies ([9e39e84](https://github.com/design4pro/angular-jss/commit/9e39e847f50a74c36adb29d83084171d0c8e27bc)) + +### Miscellaneous + +- 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) +- 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) +- 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) +- Merge branch 'main' into dependabot/npm_and_yarn/nrwl/cli-13.8.4 ([908a74b](https://github.com/design4pro/angular-jss/commit/908a74b13b325f3e073ab3f4456de65e5b029130)) +- 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) +- Merge remote-tracking branch 'origin/main' into develop ([5da9b14](https://github.com/design4pro/angular-jss/commit/5da9b148b1477b5ed8692966e8600d5add283927)) +- 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) +- 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) +- Merge branch 'main' into dependabot/npm_and_yarn/nrwl/cypress-13.8.4 ([948a67a](https://github.com/design4pro/angular-jss/commit/948a67a35c752e7d08483150e1852c808fbddbf9)) +- Merge branch 'main' into dependabot/npm_and_yarn/nrwl/angular-13.8.4 ([5fb8c61](https://github.com/design4pro/angular-jss/commit/5fb8c612b86eb2f146df08c794b3d374b2c3295c)) +- 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) +- 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) +- 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) +- Merge branch 'main' into dependabot/npm_and_yarn/angular-eslint/template-parser-13.1.0 ([d194c75](https://github.com/design4pro/angular-jss/commit/d194c759b7c7b6be0379b352cefa4527838dc881)) +- 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) + ## [1.0.1](https://github.com/design4pro/angular-jss/compare/angular-jss/v1.0.0...angular-jss/v1.0.1) (2022-03-04) ### Bug Fixes diff --git a/libs/angular-jss/ng-package.json b/libs/angular-jss/ng-package.json index d1e4a25..73d6add 100644 --- a/libs/angular-jss/ng-package.json +++ b/libs/angular-jss/ng-package.json @@ -3,5 +3,6 @@ "dest": "../../dist/libs/angular-jss", "lib": { "entryFile": "src/index.ts" - } + }, + "allowedNonPeerDependencies": ["."] } diff --git a/libs/angular-jss/package.json b/libs/angular-jss/package.json index ee6c9ad..14a80c9 100644 --- a/libs/angular-jss/package.json +++ b/libs/angular-jss/package.json @@ -1,7 +1,7 @@ { "name": "@design4pro/angular-jss", "version": "0.0.1", - "description": "Angular for JSS", + "description": "JSS integration with Angular", "license": "MIT", "keywords": [ "angular", @@ -24,13 +24,13 @@ "homepage": "https://github.com/design4pro/angular-jss#readme", "peerDependencies": { "@angular/common": "^13.2.0", - "@angular/core": "^13.2.0", + "@angular/core": "^13.2.0" + }, + "dependencies": { "jss": "^10.9.0", "jss-plugin-camel-case": "^10.9.0", "jss-plugin-global": "^10.9.0", - "jss-plugin-rule-value-function": "^10.9.0" - }, - "dependencies": { + "jss-plugin-rule-value-function": "^10.9.0", "tslib": "^2.3.0" }, "publishConfig": { diff --git a/libs/angular-jss/src/lib/jss/utils/sheets.ts b/libs/angular-jss/src/lib/jss/utils/sheets.ts index aabadf1..d9119e2 100644 --- a/libs/angular-jss/src/lib/jss/utils/sheets.ts +++ b/libs/angular-jss/src/lib/jss/utils/sheets.ts @@ -34,7 +34,7 @@ export const getStyles = (options: Options) => { return styles; } - if (styles.length !== 0) { + if (styles.length === 0) { console.warn( `[JSS] <${ options.name || 'Hook' diff --git a/package.json b/package.json index b47e3da..dc4418e 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "@angular/platform-browser": "~13.2.0", "@angular/platform-browser-dynamic": "~13.2.0", "@angular/router": "~13.2.0", - "@nrwl/angular": "13.8.3", + "@nrwl/angular": "13.8.4", "jss": "^10.9.0", "jss-plugin-camel-case": "^10.9.0", "jss-plugin-global": "^10.9.0", @@ -53,8 +53,8 @@ "devDependencies": { "@angular-devkit/build-angular": "~13.2.0", "@angular-eslint/eslint-plugin": "~13.1.0", - "@angular-eslint/eslint-plugin-template": "~13.0.1", - "@angular-eslint/template-parser": "~13.0.1", + "@angular-eslint/eslint-plugin-template": "~13.1.0", + "@angular-eslint/template-parser": "~13.1.0", "@angular/cli": "~13.2.0", "@angular/compiler-cli": "~13.2.0", "@angular/language-service": "~13.2.0", @@ -62,10 +62,10 @@ "@commitlint/config-angular": "^16.2.1", "@commitlint/config-conventional": "^16.2.1", "@commitlint/prompt-cli": "^16.2.1", - "@nrwl/cli": "13.8.3", - "@nrwl/cypress": "13.8.3", + "@nrwl/cli": "13.8.4", + "@nrwl/cypress": "13.8.4", "@nrwl/eslint-plugin-nx": "13.8.3", - "@nrwl/jest": "13.8.3", + "@nrwl/jest": "13.8.4", "@nrwl/linter": "13.8.3", "@nrwl/nx-cloud": "latest", "@nrwl/tao": "13.8.3", @@ -73,16 +73,16 @@ "@semantic-release/changelog": "^6.0.1", "@semantic-release/exec": "^6.0.3", "@semantic-release/git": "^10.0.1", - "@types/jest": "27.0.2", + "@types/jest": "27.4.1", "@types/node": "17.0.21", - "@typescript-eslint/eslint-plugin": "~5.10.0", + "@typescript-eslint/eslint-plugin": "~5.13.0", "@typescript-eslint/parser": "~5.10.0", "cypress": "^9.1.0", "eslint": "~8.10.0", "eslint-config-prettier": "8.4.0", "eslint-plugin-cypress": "^2.10.3", "hasky": "^3.0.2", - "jest": "27.2.3", + "jest": "27.5.1", "jest-preset-angular": "11.1.1", "lint-staged": "^12.3.4", "ng-packagr": "^13.0.0",