pretty up workspace, add react-specific styles (#109)

patternfly · Nov 8, 2019 · d9ebacb · d9ebacb
1 parent d9c1213
commit d9ebacb
Show file tree

Hide file tree

Showing 6 changed files with 360 additions and 26 deletions.
diff --git a/gatsby-theme-patternfly-org/gatsby-node.js b/gatsby-theme-patternfly-org/gatsby-node.js
@@ -286,7 +286,7 @@ exports.onCreateWebpackConfig = ({ actions, stage }) => {
     })
   }
   // Exclude CSS-in-JS styles included from React. They override
-  // the patternfly.css styles
+  // the patternfly.css styles which we would rather have.
   actions.setWebpackConfig({
     plugins: [
       new webpack.NormalModuleReplacementPlugin(/react-styles\/css\/.*\.css/, path.resolve(__dirname, './empty.css'))

diff --git a/gatsby-theme-patternfly-org/package.json b/gatsby-theme-patternfly-org/package.json
@@ -1,16 +1,16 @@
 {
   "name": "gatsby-theme-patternfly-org",
   "description": "A unified PatternFly-next and PatternFly-react Gatsby theme.",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "author": "Red Hat",
   "license": "MIT",
   "peerDependencies": {
-    "@patternfly/patternfly": "^2.33.5",
+    "@patternfly/patternfly": "*",
     "@patternfly/react-core": "^3.113.0",
     "@patternfly/react-icons": "^3.14.8",
     "@patternfly/react-table": "^2.22.28",
     "@patternfly/react-tokens": "^2.6.31",
-    "gatsby": "^2.6.0"
+    "gatsby": ">=2.6.0"
   },
   "dependencies": {
     "@mdx-js/mdx": "^1.1.5",

diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "gatsby-starter-theme-workspace",
+  "name": "gatsby-theme-patternfly-org-workspace",
   "private": true,
   "version": "0.0.1",
   "main": "index.js",
@@ -24,16 +24,13 @@
   },
   "workspaces": {
     "packages": [
-      "gatsby-theme-patternfly-org",
-      "patternfly-org-demo",
       "patternfly-org-demo/patternfly-next",
       "patternfly-org-demo/patternfly-react",
-      "patternfly-org-demo/patternfly-react/packages/**"
+      "patternfly-org-demo/patternfly-react/packages/**",
+      "patternfly-org-demo"
     ],
     "nohoist": [
-      "**/@patternfly/patternfly",
-      "**/gatsby-theme-patternfly-org",
-      "**/gatsby"
+      "**/@patternfly/patternfly"
     ]
   }
 }

diff --git a/patternfly-org-demo/gatsby-browser.js b/patternfly-org-demo/gatsby-browser.js
@@ -7,4 +7,13 @@ import '@patternfly/patternfly/components/Divider/divider.css';
 import '@patternfly/patternfly/components/Drawer/drawer.css';
 import '@patternfly/patternfly/components/OverflowMenu/overflow-menu.css';
 import '@patternfly/patternfly/components/Spinner/spinner.css';
+// React-specific CSS
+import '@patternfly/react-styles/src/css/components/Table/inline-edit.css';
+import '@patternfly/react-styles/src/css/components/Tooltip/tippy.css';
+import '@patternfly/react-styles/src/css/components/Tooltip/tippy-overrides.css';
+import '@patternfly/react-styles/src/css/components/Topology/topology-controlbar.css';
+import '@patternfly/react-styles/src/css/components/Topology/topology-side-bar.css';
+import '@patternfly/react-styles/src/css/components/Topology/topology-view.css';
+import '@patternfly/react-styles/src/css/layouts/Toolbar/toolbar.css';
+// Global theme CSS
 import 'gatsby-theme-patternfly-org/global.css';
diff --git a/patternfly-org-demo/package.json b/patternfly-org-demo/package.json
@@ -15,27 +15,27 @@
   },
   "dependencies": {
     "@patternfly/patternfly": "latest",
-    "@patternfly/react-catalog-view-extension": "*",
-    "@patternfly/react-charts": "*",
-    "@patternfly/react-core": "*",
-    "@patternfly/react-icons": "*",
-    "@patternfly/react-inline-edit-extension": "*",
-    "@patternfly/react-styled-system": "*",
-    "@patternfly/react-styles": "*",
-    "@patternfly/react-table": "*",
-    "@patternfly/react-tokens": "*",
-    "@patternfly/react-topology": "*",
-    "@patternfly/react-virtualized-extension": "*",
+    "@patternfly/react-catalog-view-extension": "latest",
+    "@patternfly/react-charts": "latest",
+    "@patternfly/react-core": "latest",
+    "@patternfly/react-icons": "latest",
+    "@patternfly/react-inline-edit-extension": "latest",
+    "@patternfly/react-styled-system": "latest",
+    "@patternfly/react-styles": "latest",
+    "@patternfly/react-table": "latest",
+    "@patternfly/react-tokens": "latest",
+    "@patternfly/react-topology": "latest",
+    "@patternfly/react-virtualized-extension": "latest",
     "eslint-config-react-app": "^5.0.2",
-    "gatsby": "^2.16.4",
+    "gatsby": "^2.17.10",
     "gatsby-plugin-google-analytics": "^2.1.24",
     "gatsby-plugin-manifest": "^2.2.26",
     "gatsby-plugin-remove-serviceworker": "^1.0.0",
     "gatsby-plugin-s3": "^0.3.2",
     "gatsby-plugin-sitemap": "^2.2.19",
     "gatsby-remark-copy-linked-files": "^2.1.28",
     "gatsby-source-filesystem": "^2.1.22",
-    "gatsby-theme-patternfly-org": "^0.0.16",
+    "gatsby-theme-patternfly-org": "^0.0.17",
     "gatsby-transformer-json": "^2.2.15",
     "react": "^16.8.0",
     "react-dom": "^16.8.0"