Merge branch 'master' into bump-react-bootstrap

HospitalRun · Sep 15, 2020 · 3e822df · 3e822df
2 parents a6f60a8 + baff939
commit 3e822df
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+# [3.0.0](https://github.com/HospitalRun/components/compare/v2.0.1...v3.0.0) (2020-09-15)
+
+
+### Bug Fixes
+
+* **component:** ship components package with header injected styles ([afee9ff](https://github.com/HospitalRun/components/commit/afee9ffae8adb39efa89ec3040061150300d2e90)), closes [#254](https://github.com/HospitalRun/components/issues/254) [#569](https://github.com/HospitalRun/components/issues/569) [#254](https://github.com/HospitalRun/components/issues/254) [#569](https://github.com/HospitalRun/components/issues/569)
+
+
+### BREAKING CHANGES
+
+* **component:** we skip shipping & referencing of main.scss files. Now that there's no need for a
+.scss references in the front-end, the main.scss reference in the front-end must be removed.
+
 ## [2.0.1](https://github.com/HospitalRun/components/compare/v2.0.0...v2.0.1) (2020-09-08)
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hospitalrun/components",
-  "version": "2.0.1",
+  "version": "3.0.0",
   "license": "MIT",
   "funding": {
     "type": "opencollective",
@@ -11,7 +11,8 @@
   "typings": "dist/index.d.ts",
   "files": [
     "dist",
-    "scss"
+    "scss",
+    "!main.scss"
   ],
   "repository": {
     "type": "git",
@@ -64,8 +65,8 @@
   "devDependencies": {
     "@babel/core": "~7.11.0",
     "@commitlint/cli": "~9.1.2",
-    "@commitlint/config-conventional": "~9.1.1",
-    "@commitlint/prompt": "~9.1.1",
+    "@commitlint/config-conventional": "~11.0.0",
+    "@commitlint/prompt": "~11.0.0",
     "@semantic-release/changelog": "~5.0.0",
     "@semantic-release/commit-analyzer": "~8.0.1",
     "@semantic-release/git": "~9.0.0",
@@ -80,7 +81,7 @@
     "@types/enzyme": "~3.10.3",
     "@types/jest": "~26.0.0",
     "@types/lodash": "^4.14.149",
-    "@types/node": "~14.6.0",
+    "@types/node": "~14.10.1",
     "@types/react": "~16.9.35",
     "@types/react-dom": "~16.9.1",
     "@types/react-table": "~7.0.4",
@@ -100,7 +101,7 @@
     "cz-conventional-changelog": "~3.3.0",
     "enzyme": "~3.11.0",
     "enzyme-adapter-react-16": "~1.15.2",
-    "eslint": "~7.8.0",
+    "eslint": "~7.9.0",
     "eslint-config-airbnb": "~18.2.0",
     "eslint-config-prettier": "~6.11.0",
     "eslint-plugin-import": "~2.22.0",
@@ -148,7 +149,7 @@
     "date-fns": "~2.16.0",
     "formik": "~2.1.0",
     "lodash": "~4.17.19",
-    "moment": "~2.27.0",
+    "moment": "~2.28.0",
     "react-bootstrap-typeahead": "^4.2.3",
     "react-datepicker": "~3.1.3",
     "react-spinners": "~0.9.0",

diff --git a/scss/main.scss b/scss/main.scss
@@ -8,8 +8,5 @@
 
 /* Other CSS Imports */
 
-@import '~react-toastify/dist/ReactToastify.min.css';
 
-/* all scss files in src/components should be imported here */
-@import "../src/components/Toaster/toaster.scss";
-@import "../src/components/Callout/callout.scss";
+/* All component level SCSS files are imported @ component level */
diff --git a/src/components/Callout/Callout.tsx b/src/components/Callout/Callout.tsx
@@ -3,6 +3,8 @@ import React, { CSSProperties } from 'react'
 
 import { ColorVariant } from '../../interfaces'
 
+import './callout.scss'
+
 interface Props {
   /**
    * Defines the title of the callout.

diff --git a/src/components/Toaster/index.tsx b/src/components/Toaster/index.tsx
@@ -4,6 +4,9 @@ import { ToastContainer, toast, Slide } from 'react-toastify'
 import { titleWithMessage, titleWithoutMessage } from './components'
 import { ToastProps, ToasterProps } from './interfaces'
 
+import 'react-toastify/dist/ReactToastify.min.css'
+import './toaster.scss'
+
 export const Toast: any = (
   type: ToastProps['type'],
   title: ToastProps['title'],

diff --git a/tsdx.config.js b/tsdx.config.js
@@ -12,10 +12,12 @@ module.exports = {
             preset: 'default',
           }),
         ],
-        inject: false,
-        // only write out CSS for the first bundle (avoids pointless extra files):
-        extract: !!options.writeMeta,
-        modules: true,
+        // inject SCSS as <style> into <head>
+        // including bootstrap styles
+        // to skip shipping & references of .scss files  
+        inject: true,
+        // to reuse bs4 and other package css styles
+        modules: false,
       }),
     )
     return config