Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

feat: replace tailwind with @nuxtjs/tailwindcss #254

Merged
merged 5 commits into from
Jun 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion template/_package.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
},
"devDependencies": {
<%_ if (ui === 'tailwind') { _%>
"tailwindcss": "^1.0.0",
"@nuxtjs/tailwindcss": "^1.0.0",
<%_ } else if (ui === 'vuetify') { _%>
"stylus": "^0.54.5",
"stylus-loader": "^3.0.2",
Expand Down
3 changes: 0 additions & 3 deletions template/frameworks/tailwind/assets/css/tailwind.css

This file was deleted.

7 changes: 0 additions & 7 deletions template/frameworks/tailwind/tailwind.config.js

This file was deleted.

16 changes: 8 additions & 8 deletions template/nuxt/nuxt.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ module.exports = {
css: [
<%_ if (ui === 'element-ui') { _%>
'element-ui/lib/theme-chalk/index.css'
<%_ } else if (ui === 'tailwind') { _%>
'~/assets/css/tailwind.css'
<%_ } else if (ui === 'iview') { _%>
'iview/dist/styles/iview.css'
<%_ } else if (ui === 'ant-design-vue') { _%>
Expand Down Expand Up @@ -104,6 +102,14 @@ module.exports = {
'@nuxtjs/eslint-module',
<%_ } _%>
],
<%_ if (ui === 'tailwind') { _%>
/*
** Nuxt.js dev-modules
*/
devModules: [
'@nuxtjs/tailwindcss'
],
<%_ } _%>
<%_ if (axios) { _%>
/*
** Axios module configuration
Expand Down Expand Up @@ -143,12 +149,6 @@ module.exports = {
},
<%_ } else if (ui === 'element-ui') { _%>
transpile: [/^element-ui/],
<%_ } else if (ui === 'tailwind') { _%>
postcss: {
plugins: {
tailwindcss: './tailwind.config.js'
}
},
<%_ } _%>
/*
** You can extend webpack config here
Expand Down
16 changes: 7 additions & 9 deletions test/snapshots/index.test.js.md
Original file line number Diff line number Diff line change
Expand Up @@ -2666,7 +2666,6 @@ Generated by [AVA](https://ava.li).
'.gitignore',
'README.md',
'assets/README.md',
'assets/css/tailwind.css',
'components/Logo.vue',
'components/README.md',
'layouts/README.md',
Expand All @@ -2680,7 +2679,6 @@ Generated by [AVA](https://ava.li).
'static/README.md',
'static/favicon.ico',
'store/README.md',
'tailwind.config.js',
]

> package.json
Expand All @@ -2690,8 +2688,8 @@ Generated by [AVA](https://ava.li).
nuxt: '^2.0.0',
},
devDependencies: {
'@nuxtjs/tailwindcss': '^1.0.0',
nodemon: '^1.18.9',
tailwindcss: '^1.0.0',
},
private: true,
scripts: {
Expand Down Expand Up @@ -2729,7 +2727,6 @@ Generated by [AVA](https://ava.li).
** Global CSS␊
*/␊
css: [␊
'~/assets/css/tailwind.css'␊
],␊
/*␊
** Plugins to load before mounting the App␊
Expand All @@ -2742,14 +2739,15 @@ Generated by [AVA](https://ava.li).
modules: [␊
],␊
/*␊
** Nuxt.js dev-modules␊
*/␊
devModules: [␊
'@nuxtjs/tailwindcss'␊
],␊
/*␊
** Build configuration␊
*/␊
build: {␊
postcss: {␊
plugins: {␊
tailwindcss: './tailwind.config.js'␊
}␊
},␊
/*␊
** You can extend webpack config here␊
*/␊
Expand Down
Binary file modified test/snapshots/index.test.js.snap
Binary file not shown.