From afa6a7a3e1201963f78f5eae8622ce0b1f857a0c Mon Sep 17 00:00:00 2001 From: Sam Carlton Date: Sat, 19 Sep 2020 22:50:12 -0500 Subject: [PATCH] Switch to @nuxt/tailwind --- assets/css/tailwind.css | 4 +- nuxt.config.js | 4 +- package-lock.json | 88 +++++++++++++++++++++++++++++++ package.json | 9 ++-- postcss.config.js | 6 --- tailwind.js => tailwind.config.js | 0 6 files changed, 98 insertions(+), 13 deletions(-) delete mode 100644 postcss.config.js rename tailwind.js => tailwind.config.js (100%) diff --git a/assets/css/tailwind.css b/assets/css/tailwind.css index 6c5d240..f0d987a 100644 --- a/assets/css/tailwind.css +++ b/assets/css/tailwind.css @@ -3,11 +3,11 @@ * Normalize.css and some additional base styles. * * You can see the styles here: - * https://github.com/tailwindcss/tailwindcss/blob/master/css/preflight.css + * https://github.com/tailwindcss/tailwindcss/blob/master/css/base.css * * If using `postcss-import`, use this import instead: * - * @import "tailwindcss/preflight"; + * @import "tailwindcss/base"; */ @tailwind base; diff --git a/nuxt.config.js b/nuxt.config.js index e42d34b..ace6889 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -83,7 +83,9 @@ export default { /* ** Nuxt.js modules */ - modules: [], + buildModules: [ + '@nuxtjs/tailwindcss' + ], /* ** Build configuration diff --git a/package-lock.json b/package-lock.json index e05b68b..20c6382 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1438,6 +1438,55 @@ } } }, + "@nuxtjs/tailwindcss": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@nuxtjs/tailwindcss/-/tailwindcss-3.0.2.tgz", + "integrity": "sha512-jSudt1JaJQRE64r0Bx5PHVTYVIedlZtR00KtFYYUSpRLHD2BLkjHsvYOa/jtKcinSF3RWZy6dg+l0IMJqDoSLg==", + "dev": true, + "requires": { + "clear-module": "^4.1.1", + "consola": "^2.15.0", + "defu": "^3.1.0", + "fs-extra": "^9.0.1", + "tailwindcss": "^1.7.3" + }, + "dependencies": { + "defu": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/defu/-/defu-3.1.0.tgz", + "integrity": "sha512-pc7vS4wbYFtsRL+OaLHKD72VcpOz9eYgzZeoLz9pCs+R8htyPdZnD1CxKP9ttZuT90CLPYFTSaTyc3/7v4gG9A==", + "dev": true + }, + "fs-extra": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz", + "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==", + "dev": true, + "requires": { + "at-least-node": "^1.0.0", + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^1.0.0" + } + }, + "jsonfile": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz", + "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.6", + "universalify": "^1.0.0" + } + }, + "universalify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz", + "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==", + "dev": true + } + } + }, "@nuxtjs/youch": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/@nuxtjs/youch/-/youch-4.2.3.tgz", @@ -2098,6 +2147,12 @@ "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==" }, + "at-least-node": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz", + "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==", + "dev": true + }, "atob": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", @@ -3050,6 +3105,39 @@ "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==" }, + "clear-module": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/clear-module/-/clear-module-4.1.1.tgz", + "integrity": "sha512-ng0E7LeODcT3QkazOckzZqbca+JByQy/Q2Z6qO24YsTp+pLxCfohGz2gJYJqZS0CWTX3LEUiHOqe5KlYeUbEMw==", + "dev": true, + "requires": { + "parent-module": "^2.0.0", + "resolve-from": "^5.0.0" + }, + "dependencies": { + "callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true + }, + "parent-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-2.0.0.tgz", + "integrity": "sha512-uo0Z9JJeWzv8BG+tRcapBKNJ0dro9cLyczGzulS6EfeyAdeC9sbojtW6XwvYxJkEne9En+J2XEl4zyglVeIwFg==", + "dev": true, + "requires": { + "callsites": "^3.1.0" + } + }, + "resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true + } + } + }, "cli-boxes": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-2.2.1.tgz", diff --git a/package.json b/package.json index f956fe2..10612fd 100644 --- a/package.json +++ b/package.json @@ -21,15 +21,16 @@ "typeface-inter": "^3.15.0" }, "devDependencies": { - "nodemon": "^1.11.0", + "@nuxtjs/tailwindcss": "^3.0.2", + "autoprefixer": "^8.6.4", "babel-eslint": "^8.2.1", "eslint": "^5.0.1", - "eslint-loader": "^2.0.0", - "eslint-plugin-vue": "^4.0.0", "eslint-config-prettier": "^3.1.0", + "eslint-loader": "^2.0.0", "eslint-plugin-prettier": "2.6.2", + "eslint-plugin-vue": "^4.0.0", + "nodemon": "^1.11.0", "prettier": "1.14.3", - "autoprefixer": "^8.6.4", "tailwindcss": "^1.0.0" } } diff --git a/postcss.config.js b/postcss.config.js deleted file mode 100644 index bbe5f4e..0000000 --- a/postcss.config.js +++ /dev/null @@ -1,6 +0,0 @@ -const join = require('path').join -const tailwindJS = join(__dirname, 'tailwind.js') - -module.exports = { - plugins: [require('tailwindcss')(tailwindJS), require('autoprefixer')] -} diff --git a/tailwind.js b/tailwind.config.js similarity index 100% rename from tailwind.js rename to tailwind.config.js