From fac991fb411bedfca697ae67139ef9bc9e8cb95c Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Tue, 11 Jun 2019 21:30:02 +0100
Subject: [PATCH] Add postcss-import, re-organise CSS files

---
 package.json                                  |  1 +
 postcss.config.js                             |  1 +
 src/App.vue                                   |  2 +-
 src/{ => assets}/css/components/footer.css    |  0
 src/{ => assets}/css/components/main.css      |  0
 src/{ => assets}/css/components/skip-link.css |  0
 src/assets/css/custom-components.css          |  3 ++
 src/assets/css/tailwind.css                   |  7 +++++
 src/css/app.css                               |  8 ------
 yarn.lock                                     | 28 +++++++++++++++++--
 10 files changed, 39 insertions(+), 11 deletions(-)
 rename src/{ => assets}/css/components/footer.css (100%)
 rename src/{ => assets}/css/components/main.css (100%)
 rename src/{ => assets}/css/components/skip-link.css (100%)
 create mode 100644 src/assets/css/custom-components.css
 create mode 100644 src/assets/css/tailwind.css
 delete mode 100644 src/css/app.css

diff --git a/package.json b/package.json
index 4378e23..d9ded7c 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
     "babel-eslint": "^10.0.1",
     "eslint": "^5.8.0",
     "eslint-plugin-vue": "^5.0.0",
+    "postcss-import": "^12.0.1",
     "vue-template-compiler": "^2.5.21"
   }
 }
diff --git a/postcss.config.js b/postcss.config.js
index fc3157c..d3a8d35 100644
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -1,5 +1,6 @@
 module.exports = {
   plugins: {
+    'postcss-import': {},
     tailwindcss: './tailwind.config.js',
     autoprefixer: {}
   }
diff --git a/src/App.vue b/src/App.vue
index 3f23a42..5e0080d 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -110,4 +110,4 @@ export default {
 }
 </script>
 
-<style src="./css/app.css"/>
+<style src="./assets/css/tailwind.css"/>
diff --git a/src/css/components/footer.css b/src/assets/css/components/footer.css
similarity index 100%
rename from src/css/components/footer.css
rename to src/assets/css/components/footer.css
diff --git a/src/css/components/main.css b/src/assets/css/components/main.css
similarity index 100%
rename from src/css/components/main.css
rename to src/assets/css/components/main.css
diff --git a/src/css/components/skip-link.css b/src/assets/css/components/skip-link.css
similarity index 100%
rename from src/css/components/skip-link.css
rename to src/assets/css/components/skip-link.css
diff --git a/src/assets/css/custom-components.css b/src/assets/css/custom-components.css
new file mode 100644
index 0000000..60348d3
--- /dev/null
+++ b/src/assets/css/custom-components.css
@@ -0,0 +1,3 @@
+@import 'components/footer.css';
+@import 'components/main.css';
+@import 'components/skip-link.css';
diff --git a/src/assets/css/tailwind.css b/src/assets/css/tailwind.css
new file mode 100644
index 0000000..92c9cfe
--- /dev/null
+++ b/src/assets/css/tailwind.css
@@ -0,0 +1,7 @@
+@import 'tailwindcss/base';
+
+@import 'tailwindcss/components';
+
+@import 'custom-components';
+
+@import 'tailwindcss/utilities';
diff --git a/src/css/app.css b/src/css/app.css
deleted file mode 100644
index 4edb0db..0000000
--- a/src/css/app.css
+++ /dev/null
@@ -1,8 +0,0 @@
-@tailwind base;
-@tailwind components;
-
-@import './components/footer.css';
-@import './components/main.css';
-@import './components/skip-link.css';
-
-@tailwind utilities;
diff --git a/yarn.lock b/yarn.lock
index bb184ea..55f2b9c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5872,7 +5872,7 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-pify@^2.0.0:
+pify@^2.0.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
@@ -6013,6 +6013,16 @@ postcss-functions@^3.0.0:
     postcss "^6.0.9"
     postcss-value-parser "^3.3.0"
 
+postcss-import@^12.0.1:
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.1.tgz#cf8c7ab0b5ccab5649024536e565f841928b7153"
+  integrity sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==
+  dependencies:
+    postcss "^7.0.1"
+    postcss-value-parser "^3.2.3"
+    read-cache "^1.0.0"
+    resolve "^1.1.7"
+
 postcss-js@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-2.0.1.tgz#4154e906ff410930afab63a24210be1b831e89a9"
@@ -6296,7 +6306,7 @@ postcss-unique-selectors@^4.0.1:
     postcss "^7.0.0"
     uniqs "^2.0.0"
 
-postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.0, postcss-value-parser@^3.3.1:
+postcss-value-parser@^3.0.0, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0, postcss-value-parser@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
@@ -6526,6 +6536,13 @@ rc@^1.2.7:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
+read-cache@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
+  integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=
+  dependencies:
+    pify "^2.3.0"
+
 read-pkg-up@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
@@ -6814,6 +6831,13 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
+resolve@^1.1.7:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e"
+  integrity sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==
+  dependencies:
+    path-parse "^1.0.6"
+
 resolve@^1.10.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.0.tgz#4014870ba296176b86343d50b60f3b50609ce232"