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: v5.1.1
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: v5.1.2
Choose a head ref
  • 3 commits
  • 5 files changed
  • 1 contributor

Commits on May 23, 2022

  1. chore: update setup method

    atinux committed May 23, 2022
    Copy the full SHA
    a80c69a View commit details
  2. Copy the full SHA
    cef3a9f View commit details
  3. chore(release): 5.1.2

    atinux committed May 23, 2022
    Copy the full SHA
    9749ca2 View commit details
Showing with 15 additions and 8 deletions.
  1. +7 −0 CHANGELOG.md
  2. +1 −1 README.md
  3. +2 −2 package.json
  4. +4 −4 src/module.ts
  5. +1 −1 src/tailwind.config.ts
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.

### [5.1.2](https://github.com/nuxt-community/tailwindcss-module/compare/v5.1.1...v5.1.2) (2022-05-23)


### Bug Fixes

* use correct defuArrayFn and fix srcDir error ([cef3a9f](https://github.com/nuxt-community/tailwindcss-module/commit/cef3a9f68310deb512f2c6592516a986801d439d))

### [5.1.1](https://github.com/nuxt-community/tailwindcss-module/compare/v5.1.0...v5.1.1) (2022-05-23)


2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ Or locally:

1. Clone this repository
2. Install dependencies using `yarn install`
3. Prepare for development using `yarn dev:setup`
3. Prepare for development using `yarn dev:prepare`
4. Start development server using `yarn dev`

## License
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": "5.1.1",
"version": "5.1.2",
"description": "TailwindCSS module for Nuxt",
"repository": "nuxt-community/tailwindcss-module",
"license": "MIT",
@@ -17,7 +17,7 @@
],
"scripts": {
"build": "nuxt-module-build",
"dev:setup": "nuxt-module-build --stub && nuxi prepare playground",
"dev:prepare": "nuxt-module-build --stub && nuxi prepare playground",
"dev": "nuxt dev playground",
"docs": "nuxt docs",
"lint": "eslint --ext .js,.ts,.vue",
8 changes: 4 additions & 4 deletions src/module.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { join, relative } from 'path'
import { existsSync } from 'fs'
import defu from 'defu'
import { defuArrayFn } from 'defu'
import chalk from 'chalk'
import { withTrailingSlash } from 'ufo'
import consola from 'consola'
import {
defineNuxtModule,
installModule,
addTemplate,
addServerMiddleware,
addDevServerHandler,
requireModule,
isNuxt2,
createResolver,
@@ -66,7 +66,7 @@ export default defineNuxtModule({
}

// Merge with our default purgecss default
tailwindConfig = defu.arrayFn(tailwindConfig, moduleOptions.config)
tailwindConfig = defuArrayFn(tailwindConfig, moduleOptions.config)

// Expose resolved tailwind config as an alias
// https://tailwindcss.com/docs/configuration/#referencing-in-javascript
@@ -125,7 +125,7 @@ export default defineNuxtModule({
}
_viewerDevMiddleware(req, res)
}
addServerMiddleware({ route, handler: viewerDevMiddleware })
addDevServerHandler({ route, handler: viewerDevMiddleware })
nuxt.hook('listen', (_, listener) => {
const fullPath = `${withoutTrailingSlash(listener.url)}${route}`
logger.info(`Tailwind Viewer: ${chalk.underline.yellow(fullPath)}`)
2 changes: 1 addition & 1 deletion src/tailwind.config.ts
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ export default ({ srcDir }) => ({
`${srcDir}/composables/**/*.{js,ts}`,
`${srcDir}/plugins/**/*.{js,ts}`,
`${srcDir}/App.{js,ts,vue}`,
`${srcDir}/app.{js,ts,vue}`
`${srcDir}/app.{js,ts,vue}`,
`${srcDir}/Error.{js,ts,vue}`,
`${srcDir}/error.{js,ts,vue}`
// TODO: This makes issues with import protection