2.3.1 (#61)

* move css imports back into css file

* minor version bump & fresh npm install

* dependency updates

package.json

@@ -1,6 +1,6 @@
 {
   "name": "starbase",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "author": "Brian Staruk <[email protected]>",
   "contributors": [
     {
@@ -30,40 +30,40 @@
   "keywords": [],
   "license": "MIT",
   "devDependencies": {
-    "@babel/core": "^7.7.2",
-    "@babel/preset-env": "^7.7.1",
+    "@babel/core": "^7.8.3",
+    "@babel/preset-env": "^7.8.3",
     "babel-eslint": "^10.0.3",
     "babel-loader": "^8.0.6",
     "clean-webpack-plugin": "^3.0.0",
-    "css-loader": "^3.2.0",
+    "css-loader": "^3.4.2",
     "css-mqpacker": "^7.0.0",
     "cssnano": "^4.1.10",
-    "eslint": "^6.6.0",
+    "eslint": "^6.8.0",
     "eslint-config-airbnb-base": "^14.0.0",
-    "eslint-import-resolver-webpack": "^0.11.1",
-    "eslint-loader": "^3.0.2",
-    "eslint-plugin-import": "^2.18.2",
-    "file-loader": "^4.2.0",
+    "eslint-import-resolver-webpack": "^0.12.1",
+    "eslint-loader": "^3.0.3",
+    "eslint-plugin-import": "^2.20.0",
+    "file-loader": "^5.0.2",
     "html-loader": "^0.5.5",
     "html-webpack-plugin": "^3.2.0",
-    "mini-css-extract-plugin": "^0.8.0",
+    "mini-css-extract-plugin": "^0.9.0",
     "offline-plugin": "^5.0.7",
     "path": "^0.12.7",
-    "postcss": "^7.0.21",
+    "postcss": "^7.0.26",
     "postcss-extend": "^1.0.5",
     "postcss-import": "^12.0.1",
     "postcss-loader": "^3.0.0",
     "postcss-nested": "^4.2.1",
     "postcss-preset-env": "^6.7.0",
     "postcss-remove-root": "0.0.2",
     "postcss-reporter": "^6.0.1",
-    "style-loader": "^1.0.0",
-    "stylelint": "^11.1.1",
+    "style-loader": "^1.1.2",
+    "stylelint": "^13.0.0",
     "stylelint-config-standard": "^19.0.0",
-    "url-loader": "^2.2.0",
-    "webpack": "^4.41.2",
+    "url-loader": "^3.0.0",
+    "webpack": "^4.41.5",
     "webpack-cli": "^3.3.10",
-    "webpack-dev-server": "^3.9.0",
+    "webpack-dev-server": "^3.10.1",
     "webpack-merge": "^4.2.2"
   },
   "dependencies": {

src/app.css

@@ -0,0 +1,8 @@
+/* ordered css @imports */
+@import 'lib/fonts/fonts';
+@import 'css/root';
+
+/* all other (alphabetical) css imports */
+@import 'css/footer';
+@import 'css/header';
+@import 'css/rich-text';

src/app.js

@@ -2,7 +2,7 @@
 import '@lib/offline-plugin';
 
 // styles
-import '@src/app.styles';
+import '@src/app.css';
 
 // fetch & promise polyfills (comment-out if not needed)
 // require('es6-promise').polyfill();

src/lib/fonts/fonts.css

@@ -1,17 +1,17 @@
 @font-face {
   font-family: 'PT Sans';
   src:
-    url('./PTSans-Regular.woff2') format('woff2'),
-    url('./PTSans-Regular.woff') format('woff');
+    url('lib/fonts/PTSans-Regular.woff2') format('woff2'),
+    url('lib/fonts/PTSans-Regular.woff') format('woff');
   font-weight: normal;
   font-style: normal;
 }
 
 @font-face {
   font-family: 'PT Serif';
   src:
-    url('./PTSerif-Regular.woff2') format('woff2'),
-    url('./PTSerif-Regular.woff') format('woff');
+    url('lib/fonts/PTSerif-Regular.woff2') format('woff2'),
+    url('lib/fonts/PTSerif-Regular.woff') format('woff');
   font-weight: normal;
   font-style: normal;
 }

webpack/webpack.config.base.js

@@ -39,7 +39,8 @@ module.exports = {
           loader: 'url-loader',
           options: {
             limit: 8192,
-            name: 'images/[name].[md5:hash:hex:8].[ext]'
+            name: 'images/[name].[md5:hash:hex:8].[ext]',
+            esModule: false
           }
         }]
       },