Merge pull request #19 from design4pro/develop

rafalwolak · web-flow · commit ad27cbc8bad0 · 2022-03-04T22:00:52.000+01:00
fix(angular-jss): dependencies
diff --git 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/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
@@ -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
@@ -34,7 +34,7 @@ export const getStyles = (options: Options<JssContext, ThemeContext>) => {
     return styles;
   }
 
-  if (styles.length !== 0) {
+  if (styles.length === 0) {
     console.warn(
       `[JSS] <${
         options.name || 'Hook'

Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,6 @@`
`3`	`3`	`"dest": "../../dist/libs/angular-jss",`
`4`	`4`	`"lib": {`
`5`	`5`	`"entryFile": "src/index.ts"`
`6`		`- }`
	`6`	`+ },`
	`7`	`+ "allowedNonPeerDependencies": ["."]`
`7`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ export const getStyles = (options: Options<JssContext, ThemeContext>) => {`
`34`	`34`	`return styles;`
`35`	`35`	`}`
`36`	`36`
`37`		`- if (styles.length !== 0) {`
	`37`	`+ if (styles.length === 0) {`
`38`	`38`	`console.warn(`
`39`	`39`	`[JSS] <${
`40`	`40`	`options.name \|\| 'Hook'`