Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: nuxt-modules/tailwindcss
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.1.2
Choose a base ref
...
head repository: nuxt-modules/tailwindcss
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.2.0
Choose a head ref
  • 6 commits
  • 6 files changed
  • 4 contributors

Commits on Aug 8, 2019

  1. Copy the full SHA
    66cd4ff View commit details

Commits on Aug 20, 2019

  1. Copy the full SHA
    2169e59 View commit details

Commits on Sep 23, 2019

  1. Copy the full SHA
    004fc2d View commit details

Commits on Nov 5, 2019

  1. Copy the full SHA
    6c3f550 View commit details
  2. Copy the full SHA
    37646a6 View commit details
  3. chore(release): 1.2.0

    atinux committed Nov 5, 2019
    Copy the full SHA
    b407a2c View commit details
Showing with 223 additions and 167 deletions.
  1. +17 −0 .github/stale.yml
  2. +7 −0 CHANGELOG.md
  3. +6 −3 README.md
  4. +11 −3 lib/module.js
  5. +2 −2 package.json
  6. +180 −159 yarn.lock
17 changes: 17 additions & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 60
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 7
# Issues with these labels will never be considered stale
exemptLabels:
- pinned
- security
# Label to use when marking an issue as stale
staleLabel: wontfix
# Comment to post when marking an issue as stale. Set to `false` to disable
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be closed if no further activity occurs. Thank you
for your contributions.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: false
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,6 +2,13 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [1.2.0](https://github.com/nuxt-community/nuxt-tailwindcss/compare/v1.1.2...v1.2.0) (2019-11-05)


### Features

* add support for deprecated build.postcss.plugins array syntax ([#36](https://github.com/nuxt-community/nuxt-tailwindcss/issues/36)) ([6c3f550](https://github.com/nuxt-community/nuxt-tailwindcss/commit/6c3f550))

### [1.1.2](https://github.com/nuxt-community/nuxt-tailwindcss/compare/v1.1.1...v1.1.2) (2019-08-08)


9 changes: 6 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -22,10 +22,13 @@
npm install --save-dev @nuxtjs/tailwindcss # or yarn add --dev @nuxtjs/tailwindcss
```

2. Add `@nuxtjs/tailwindcss` to the `devModules` section of `nuxt.config.js`
2. Add `@nuxtjs/tailwindcss` to the `buildModules` section of `nuxt.config.js`

:warning: If you are using Nuxt `< 2.9.0`, use `modules` instead.

```js
{
devModules: [
buildModules: [
'@nuxtjs/tailwindcss'
]
}
@@ -46,7 +49,7 @@ If you want to set a different path for the configuration file or css file, you
```js
// nuxt.config.js
{
devModules: [
buildModules: [
'@nuxtjs/tailwindcss'
],
tailwindcss: {
14 changes: 11 additions & 3 deletions lib/module.js
Original file line number Diff line number Diff line change
@@ -30,9 +30,17 @@ module.exports = async function (moduleOptions) {
/*
** Set PostCSS config (before nuxt-purgecss)
*/
this.options.build.postcss.preset.stage = 1 // see https://tailwindcss.com/docs/using-with-preprocessors#future-css-features
this.options.build.postcss.plugins = this.options.build.postcss.plugins || {}
this.options.build.postcss.plugins.tailwindcss = this.options.build.postcss.plugins.tailwindcss || configPath
const { postcss } = this.options.build

postcss.preset.stage = 1 // see https://tailwindcss.com/docs/using-with-preprocessors#future-css-features
postcss.plugins = postcss.plugins || {}

if (Array.isArray(postcss.plugins)) {
postcss.plugins.push(require('tailwindcss')(configPath))
} else if (typeof postcss.plugins === 'object') {
postcss.plugins.tailwindcss = postcss.plugins.tailwindcss || configPath
}

/*
** Add nuxt-purgecss module and set config
** only for `nuxt build` command
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nuxtjs/tailwindcss",
"version": "1.1.2",
"version": "1.2.0",
"description": "TailwindCSS module for Nuxt.js",
"license": "MIT",
"contributors": [
@@ -26,7 +26,7 @@
"consola": "^2.10.1",
"fs-extra": "^8.1.0",
"nuxt-purgecss": "^0.2.1",
"tailwindcss": "^1.1.0"
"tailwindcss": "^1.1.3"
},
"devDependencies": {
"@babel/core": "latest",
339 changes: 180 additions & 159 deletions yarn.lock

Large diffs are not rendered by default.