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: v6.7.0
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: v6.7.1
Choose a head ref
  • 3 commits
  • 14 files changed
  • 3 contributors

Commits on Jun 13, 2023

  1. perf: parallelise all async calls (#679)

    * fix: typeof import default in dts
    
    * chore: using nuxt convention for indexing type
    
    * chore: initial
    
    * chore: progress
    
    * chore: some cleanup
    
    * chore: splitting utils
    
    * chore: move out viewer
    
    * chore: dev block
    
    * chore: progress
    
    * chore: unnesting await
    
    * chore: rename file
    
    * Update src/viewer.ts
    
    ---------
    
    Co-authored-by: Sébastien Chopin <seb@nuxtlabs.com>
    ineshbose and atinux authored Jun 13, 2023
    Copy the full SHA
    5502765 View commit details
  2. chore: upgrade deps

    atinux committed Jun 13, 2023
    Copy the full SHA
    de99ac0 View commit details
  3. chore(release): v6.7.1

    atinux committed Jun 13, 2023
    Copy the full SHA
    a65172e View commit details
Showing with 1,610 additions and 978 deletions.
  1. +18 −0 CHANGELOG.md
  2. +4 −0 docs/content/2.tailwind/1.config.md
  3. +19 −14 package.json
  4. +2 −2 playground/theme/{tailwind.config.ts → tailwind.config.cjs}
  5. +1,209 −615 pnpm-lock.yaml
  6. +101 −215 src/module.ts
  7. +115 −0 src/resolvers.ts
  8. +75 −0 src/templates.ts
  9. +18 −0 src/types.ts
  10. +5 −114 src/utils.ts
  11. +26 −0 src/viewer.ts
  12. +2 −2 src/{hmr.ts → vite-hmr.ts}
  13. +8 −8 test/basic.test.ts
  14. +8 −8 test/configs.test.ts
18 changes: 18 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -2,6 +2,24 @@

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.

## v6.7.1

[compare changes](https://undefined/undefined/compare/v6.7.0...v6.7.1)


### 🔥 Performance

- Parallelise all async calls (#679)

### 🏡 Chore

- Upgrade deps (de99ac0)

### ❤️ Contributors

- Sébastien Chopin ([@Atinux](http://github.com/Atinux))
- Inesh Bose

## v6.7.0

[compare changes](https://undefined/undefined/compare/v6.6.8...v6.7.0)
4 changes: 4 additions & 0 deletions docs/content/2.tailwind/1.config.md
Original file line number Diff line number Diff line change
@@ -125,6 +125,10 @@ This config has less priority over the [tailwind.config.js](#tailwindconfigjs) f
This is an advanced usage section and intended primarily for Nuxt modules authors.
::

#### `tailwindcss:loadConfig`

Passes any Tailwind configuration read by the module for each (extended) [layer](https://nuxt.com/docs/getting-started/layers)/[path](/getting-started/options#configpath) before merging all of them.

#### `tailwindcss:config`

Passes the resolved vanilla configuration read from all layers and paths with merging using [defu](https://github.com/unjs/defu).
33 changes: 19 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
{
"name": "@nuxtjs/tailwindcss",
"version": "6.7.0",
"version": "6.7.1",
"description": "TailwindCSS module for Nuxt",
"repository": "nuxt-modules/tailwindcss",
"license": "MIT",
"configKey": "tailwindcss",
"compatibility": {
"nuxt": "^2.9.0 || ^3.0.0-rc.1",
"bridge": true
},
"exports": {
".": {
"require": "./dist/module.cjs",
@@ -25,42 +30,42 @@
"test": "vitest run"
},
"dependencies": {
"@nuxt/kit": "^3.4.3",
"@nuxt/kit": "^3.5.3",
"@nuxt/postcss8": "^1.1.3",
"autoprefixer": "^10.4.14",
"chokidar": "^3.5.3",
"clear-module": "^4.1.2",
"colorette": "^2.0.20",
"cookie-es": "^1.0.0",
"defu": "^6.1.2",
"destr": "^1.2.2",
"destr": "^2.0.0",
"h3": "^1.6.6",
"iron-webcrypto": "^0.7.0",
"micromatch": "^4.0.5",
"pathe": "^1.1.0",
"postcss": "^8.4.23",
"postcss-custom-properties": "^13.1.5",
"pathe": "^1.1.1",
"postcss": "^8.4.24",
"postcss-custom-properties": "^13.2.0",
"postcss-nesting": "^11.2.2",
"radix3": "^1.0.1",
"tailwind-config-viewer": "^1.7.2",
"tailwindcss": "~3.3.2",
"ufo": "^1.1.2",
"uncrypto": "^0.1.2"
"uncrypto": "^0.1.3"
},
"devDependencies": {
"@fontsource/inter": "^4.5.15",
"@fontsource/inter": "^5.0.3",
"@nuxt/content": "^2.6.0",
"@nuxt/devtools": "^0.4.6",
"@nuxt/devtools": "^0.5.5",
"@nuxt/eslint-config": "latest",
"@nuxt/module-builder": "^0.3.1",
"@nuxt/test-utils": "^3.4.3",
"@nuxt/module-builder": "^0.4.0",
"@nuxt/test-utils": "^3.5.3",
"@tailwindcss/typography": "^0.5.9",
"@types/micromatch": "^4.0.2",
"changelogen": "^0.5.3",
"codecov": "latest",
"eslint": "latest",
"jsdom": "^22.0.0",
"nuxt": "^3.4.3",
"vitest": "^0.31.0"
"jsdom": "^22.1.0",
"nuxt": "^3.5.3",
"vitest": "^0.32.0"
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import colors from 'tailwindcss/colors'
const colors = require('tailwindcss/colors')

export default {
module.exports = {
theme: {
extend: {
colors: {
Loading