fix: Move pfe-sass to a devDep on all elements (#983)

castastrophe · web-flow · commit 0ffd92a621d1 · 2020-07-20T14:51:42.000-04:00
* fix Move pfe-sass to a devDep on all elements

* fix Update changelog

* fix: Update to prerelease 52 pfe-sass

* fix: Update package-locks

* Update elements/pfe-icon/package.json

Remove self-dependency! :P

* fix: Update package template to put pfe-sass as devDep

* fix: Remove patternfly as global dependency
diff --git a/CHANGELOG-prerelease.md b/CHANGELOG-prerelease.md
@@ -1,3 +1,7 @@
+## Prerelease 53 ( TBD )
+
+- [](https://github.com/patternfly/patternfly-elements/commit/) fix: Move pfe-sass to a dev dependency
+
 ## Prerelease 52 ( 2020-07-17 )
 
 - [e5c6f4b](https://github.com/patternfly/patternfly-elements/commit/e5c6f4bc0f5ef3283c115ecbcc7c31456ea39872) fix: fire pfe-autcomplete:option-selected event on click and enter key
diff --git a/elements/pfe-accordion/package.json b/elements/pfe-accordion/package.json
@@ -50,9 +50,11 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@patternfly/pfe-sass": "^1.0.0-prerelease.52",
     "@patternfly/pfelement": "^1.0.0-prerelease.51"
   },
+  "devDependencies": {
+    "@patternfly/pfe-sass": "^1.0.0-prerelease.52"
+  },
   "generator-pfelement-version": "0.5.5",
   "bugs": {
     "url": "https://github.com/patternfly/patternfly-elements/issues"
diff --git a/elements/pfe-autocomplete/package.json b/elements/pfe-autocomplete/package.json
@@ -37,9 +37,11 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@patternfly/pfe-sass": "^1.0.0-prerelease.52",
     "@patternfly/pfelement": "^1.0.0-prerelease.51"
   },
+  "devDependencies": {
+    "@patternfly/pfe-sass": "^1.0.0-prerelease.52"
+  },
   "generator-pfelement-version": "0.5.5",
   "bugs": {
     "url": "https://github.com/patternfly/patternfly-elements/issues"
diff --git a/elements/pfe-avatar/package.json b/elements/pfe-avatar/package.json
@@ -37,9 +37,11 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@patternfly/pfe-sass": "^1.0.0-prerelease.52",
     "@patternfly/pfelement": "^1.0.0-prerelease.51"
   },
+  "devDependencies": {
+    "@patternfly/pfe-sass": "^1.0.0-prerelease.52"
+  },
   "generator-pfelement-version": "0.6.8",
   "bugs": {
     "url": "https://github.com/patternfly/patternfly-elements/issues"
diff --git a/elements/pfe-badge/package.json b/elements/pfe-badge/package.json
@@ -47,8 +47,10 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@patternfly/pfe-sass": "1.0.0-prerelease.28",
-    "@patternfly/pfelement": "1.0.0-prerelease.28"
+    "@patternfly/pfelement": "^1.0.0-prerelease.50"
+  },
+  "devDependencies": {
+    "@patternfly/pfe-sass": "^1.0.0-prerelease.52"
   },
   "generator-pfelement-version": "1.3.0"
 }
diff --git a/elements/pfe-band/package.json b/elements/pfe-band/package.json
@@ -43,9 +43,11 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@patternfly/pfe-sass": "^1.0.0-prerelease.52",
     "@patternfly/pfelement": "^1.0.0-prerelease.51"
   },
+  "devDependencies": {
+    "@patternfly/pfe-sass": "^1.0.0-prerelease.52"
+  },
   "generator-rhelement-version": "0.6.8",
   "bugs": {
     "url": "https://github.com/patternfly/patternfly-elements/issues"
diff --git a/elements/pfe-card/package.json b/elements/pfe-card/package.json
@@ -46,9 +46,11 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@patternfly/pfe-sass": "^1.0.0-prerelease.52",
     "@patternfly/pfelement": "^1.0.0-prerelease.51"
   },
+  "devDependencies": {
+    "@patternfly/pfe-sass": "^1.0.0-prerelease.52"
+  },
   "generator-pfelement-version": "0.5.0",
   "bugs": {
     "url": "https://github.com/patternfly/patternfly-elements/issues"
diff --git a/elements/pfe-collapse/package.json b/elements/pfe-collapse/package.json
@@ -39,7 +39,6 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@patternfly/pfe-sass": "^1.0.0-prerelease.52",
     "@patternfly/pfelement": "^1.0.0-prerelease.51"
   },
   "generator-pfelement-version": "1.1.0",
diff --git a/elements/pfe-collapse/src/pfe-collapse.scss b/elements/pfe-collapse/src/pfe-collapse.scss
@@ -1,4 +1,3 @@
-@import "../../pfe-sass/pfe-sass";
 :host {
   display: block;
 }
diff --git a/elements/pfe-cta/package.json b/elements/pfe-cta/package.json
@@ -39,9 +39,11 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@patternfly/pfe-sass": "^1.0.0-prerelease.52",
     "@patternfly/pfelement": "^1.0.0-prerelease.51"
   },
+  "devDependencies": {
+    "@patternfly/pfe-sass": "^1.0.0-prerelease.52"
+  },
   "generator-pfelement-version": "0.5.0",
   "bugs": {
     "url": "https://github.com/patternfly/patternfly-elements/issues"
diff --git a/elements/pfe-dropdown/package.json b/elements/pfe-dropdown/package.json
@@ -31,8 +31,10 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@patternfly/pfe-sass": "1.0.0-prerelease.33",
-    "@patternfly/pfelement": "1.0.0-prerelease.31"
+    "@patternfly/pfelement": "^1.0.0-prerelease.50"
+  },
+  "devDependencies": {
+    "@patternfly/pfe-sass": "^1.0.0-prerelease.52"
   },
   "generator-pfelement-version": "1.3.0"
 }
diff --git a/elements/pfe-health-index/package.json b/elements/pfe-health-index/package.json
@@ -39,9 +39,11 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@patternfly/pfe-sass": "^1.0.0-prerelease.52",
     "@patternfly/pfelement": "^1.0.0-prerelease.51"
   },
+  "devDependencies": {
+    "@patternfly/pfe-sass": "^1.0.0-prerelease.52"
+  },
   "generator-pfelement-version": "0.6.3",
   "bugs": {
     "url": "https://github.com/patternfly/patternfly-elements/issues"
diff --git a/elements/pfe-icon-panel/package.json b/elements/pfe-icon-panel/package.json
@@ -39,9 +39,11 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@patternfly/pfe-sass": "^1.0.0-prerelease.52",
     "@patternfly/pfelement": "^1.0.0-prerelease.51"
   },
+  "devDependencies": {
+    "@patternfly/pfe-sass": "^1.0.0-prerelease.52"
+  },
   "generator-pfelement-version": "0.5.0",
   "bugs": {
     "url": "https://github.com/patternfly/patternfly-elements/issues"
diff --git a/elements/pfe-icon/package.json b/elements/pfe-icon/package.json
@@ -35,9 +35,11 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@patternfly/pfe-sass": "^1.0.0-prerelease.52",
     "@patternfly/pfelement": "^1.0.0-prerelease.51"
   },
+  "devDependencies": {
+    "@patternfly/pfe-sass": "^1.0.0-prerelease.52"
+  },
   "generator-pfelement-version": "1.1.0",
   "bugs": {
     "url": "https://github.com/patternfly/patternfly-elements/issues"
diff --git a/elements/pfe-jump-links/WHY.md b/elements/pfe-jump-links/WHY.md
diff --git a/elements/pfe-jump-links/package.json b/elements/pfe-jump-links/package.json
@@ -43,9 +43,10 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@patternfly/pfe-accordion": "1.0.0-prerelease.49",
-    "@patternfly/pfe-sass": "1.0.0-prerelease.40",
-    "@patternfly/pfelement": "1.0.0-prerelease.39",
-    "gh-pages": "^2.2.0"
+    "@patternfly/pfe-accordion": "^1.0.0-prerelease.51",
+    "@patternfly/pfelement": "^1.0.0-prerelease.51"
+  },
+  "devDependencies": {
+    "@patternfly/pfe-sass": "^1.0.0-prerelease.52"
   }
 }
diff --git a/elements/pfe-markdown/package.json b/elements/pfe-markdown/package.json
@@ -39,10 +39,12 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@patternfly/pfe-sass": "^1.0.0-prerelease.52",
     "@patternfly/pfelement": "^1.0.0-prerelease.51",
     "marked": "^0.6.1"
   },
+  "devDependencies": {
+    "@patternfly/pfe-sass": "^1.0.0-prerelease.52"
+  },
   "generator-pfelement-version": "1.1.0",
   "bugs": {
     "url": "https://github.com/patternfly/patternfly-elements/issues"
diff --git a/elements/pfe-modal/package.json b/elements/pfe-modal/package.json
@@ -41,9 +41,11 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@patternfly/pfe-sass": "^1.0.0-prerelease.52",
     "@patternfly/pfelement": "^1.0.0-prerelease.51"
   },
+  "devDependencies": {
+    "@patternfly/pfe-sass": "^1.0.0-prerelease.52"
+  },
   "generator-pfelement-version": "1.1.0",
   "bugs": {
     "url": "https://github.com/patternfly/patternfly-elements/issues"
diff --git a/elements/pfe-navigation/package.json b/elements/pfe-navigation/package.json
@@ -51,8 +51,10 @@
   "license": "MIT",
   "dependencies": {
     "@patternfly/pfe-icon": "^1.0.0-prerelease.52",
-    "@patternfly/pfe-sass": "^1.0.0-prerelease.52",
     "@patternfly/pfelement": "^1.0.0-prerelease.51"
   },
+  "devDependencies": {
+    "@patternfly/pfe-sass": "^1.0.0-prerelease.52"
+  },
   "generator-pfelement-version": "1.1.0"
 }
diff --git a/elements/pfe-page-status/package.json b/elements/pfe-page-status/package.json
@@ -39,9 +39,11 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@patternfly/pfe-sass": "^1.0.0-prerelease.52",
     "@patternfly/pfelement": "^1.0.0-prerelease.51"
   },
+  "devDependencies": {
+    "@patternfly/pfe-sass": "^1.0.0-prerelease.52"
+  },
   "generator-pfelement-version": "1.1.0",
   "bugs": {
     "url": "https://github.com/patternfly/patternfly-elements/issues"
diff --git a/elements/pfe-progress-indicator/package.json b/elements/pfe-progress-indicator/package.json
@@ -35,9 +35,11 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@patternfly/pfe-sass": "^1.0.0-prerelease.52",
     "@patternfly/pfelement": "^1.0.0-prerelease.51"
   },
+  "devDependencies": {
+    "@patternfly/pfe-sass": "^1.0.0-prerelease.52"
+  },
   "generator-pfelement-version": "1.1.0",
   "bugs": {
     "url": "https://github.com/patternfly/patternfly-elements/issues"
diff --git a/elements/pfe-sass/package-lock.json b/elements/pfe-sass/package-lock.json
diff --git a/elements/pfe-sass/package.json b/elements/pfe-sass/package.json
@@ -49,5 +49,8 @@
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/patternfly/patternfly-elements/issues"
+  },
+  "dependencies": {
+    "@patternfly/patternfly": "^4.23.3"
   }
 }
diff --git a/elements/pfe-select/package.json b/elements/pfe-select/package.json
@@ -25,8 +25,10 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@patternfly/pfe-sass": "^1.0.0-prerelease.52",
     "@patternfly/pfelement": "^1.0.0-prerelease.51"
   },
+  "devDependencies": {
+    "@patternfly/pfe-sass": "^1.0.0-prerelease.52"
+  },
   "generator-pfelement-version": "1.1.0"
 }
diff --git a/elements/pfe-styles/package.json b/elements/pfe-styles/package.json
@@ -43,7 +43,7 @@
     }
   ],
   "license": "MIT",
-  "dependencies": {
+  "devDependencies": {
     "@patternfly/pfe-sass": "^1.0.0-prerelease.52"
   },
   "bugs": {
diff --git a/elements/pfe-tabs/package.json b/elements/pfe-tabs/package.json
@@ -47,9 +47,11 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@patternfly/pfe-sass": "^1.0.0-prerelease.52",
     "@patternfly/pfelement": "^1.0.0-prerelease.51"
   },
+  "devDependencies": {
+    "@patternfly/pfe-sass": "^1.0.0-prerelease.52"
+  },
   "generator-pfelement-version": "0.5.4",
   "bugs": {
     "url": "https://github.com/patternfly/patternfly-elements/issues"
diff --git a/elements/pfe-toast/package.json b/elements/pfe-toast/package.json
@@ -35,8 +35,10 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@patternfly/pfe-sass": "^1.0.0-prerelease.52",
     "@patternfly/pfelement": "^1.0.0-prerelease.51"
   },
+  "devDependencies": {
+    "@patternfly/pfe-sass": "^1.0.0-prerelease.52"
+  },
   "generator-pfelement-version": "1.3.0"
 }
diff --git a/generators/element/templates/package.json b/generators/element/templates/package.json
@@ -48,12 +48,12 @@
   }<% } %>],
   "license": "MIT",
   "dependencies": {
-    <% if (sassLibraryPkg) { %>"<%= sassLibraryPkg %>": "<%= pfeSassVersion %>"<% if (isPfelement) { %>,<% } } %><% if (isPfelement) { %>
-    "@patternfly/pfelement": "<%= pfelementVersion %>"<% } %><% if (Object.entries( dependencies ).length > 0) { %>,<% } %><% for (const [package, version] of Object.entries( dependencies )) { %>
+    <% if (isPfelement) { %>"@patternfly/pfelement": "<%= pfelementVersion %>"<% } %><% if (Object.entries( dependencies ).length > 0) { %>,<% } %><% for (const [package, version] of Object.entries( dependencies )) { %>
     "<%= package %>": "<%= version %>"<% if ( _.findLastKey( dependencies ) !== package ) { %>,<% } } %>
   }<% if (!isPfelement) { %>,
   "devDependencies": {<% for (const [package, version] of Object.entries( devDependencies )) { %>
-    "<%= package %>": "<%= version %>"<% if ( _.findLastKey( devDependencies ) !== package ) { %>,<% } } %>
+    "<%= package %>": "<%= version %>"<% if ( _.findLastKey( devDependencies ) !== package ) { %>,<% } } %><% if (sassLibraryPkg) { if (devDependencies.length > 0) { %>,<% } %>
+    "<%= sassLibraryPkg %>": "<%= pfeSassVersion %>"<% } %>
   },
   "bugs": {
     "url" : "https://github.com/patternfly/patternfly-elements/issues?q=is%3Aissue+is%3Aopen+<%= elementName %>"
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-@import "../../pfe-sass/pfe-sass";`
`2`	`1`	`:host {`
`3`	`2`	`display: block;`
`4`	`3`	`}`