From 605139faa06e1261252d04115cdfae202325a061 Mon Sep 17 00:00:00 2001 From: Maxwell Barvian Date: Sat, 20 Jul 2024 08:24:18 -0700 Subject: [PATCH] Update tailwindcss-priv to 3.4.6 --- packages/fluid-tailwind/package.json | 2 +- packages/fluid-tailwind/src/extractor.ts | 3 ++ pnpm-lock.yaml | 43 ++++++++++++++++++++---- 3 files changed, 41 insertions(+), 7 deletions(-) diff --git a/packages/fluid-tailwind/package.json b/packages/fluid-tailwind/package.json index 5451b06..8b2b7d9 100644 --- a/packages/fluid-tailwind/package.json +++ b/packages/fluid-tailwind/package.json @@ -52,7 +52,7 @@ "rollup-plugin-delete": "^2.0.0", "rollup-plugin-node-externals": "^7.1.2", "tailwindcss": "^3.2.0", - "tailwindcss-priv": "npm:tailwindcss@3.4.3", + "tailwindcss-priv": "npm:tailwindcss@3.4.6", "tslib": "^2.6.2", "typescript": ">=5.4.0" }, diff --git a/packages/fluid-tailwind/src/extractor.ts b/packages/fluid-tailwind/src/extractor.ts index d6736ec..172961b 100644 --- a/packages/fluid-tailwind/src/extractor.ts +++ b/packages/fluid-tailwind/src/extractor.ts @@ -1,3 +1,6 @@ +// TODO: incorporate +// https://github.com/tailwindlabs/tailwindcss/compare/v3.4.3...v3.4.6 + import type { ExtractorFn } from "tailwindcss/types/config" // @ts-expect-error untyped source file import * as regex from 'tailwindcss-priv/src/lib/regex' diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a97f993..416b5ad 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -85,8 +85,8 @@ importers: specifier: ^3.2.0 version: 3.4.3 tailwindcss-priv: - specifier: npm:tailwindcss@3.4.3 - version: tailwindcss@3.4.3 + specifier: npm:tailwindcss@3.4.6 + version: tailwindcss@3.4.6 tslib: specifier: ^2.6.2 version: 2.6.2 @@ -95,10 +95,6 @@ importers: version: 5.4.5 packages/tailwind-merge: - dependencies: - tailwind-merge: - specifier: ~2.4.0 - version: 2.4.0 devDependencies: '@types/bun': specifier: ^1.1.3 @@ -106,6 +102,9 @@ importers: bun: specifier: ^1.1.17 version: 1.1.17 + tailwind-merge: + specifier: ~2.4.0 + version: 2.4.0 tsup: specifier: ^8.1.0 version: 8.1.0(postcss@8.4.35)(typescript@5.5.2) @@ -3138,6 +3137,11 @@ packages: engines: {node: '>=14.0.0'} hasBin: true + tailwindcss@3.4.6: + resolution: {integrity: sha512-1uRHzPB+Vzu57ocybfZ4jh5Q3SdlH7XW23J5sQoM9LhE9eIOlzxer/3XPSsycvih3rboRsvt0QCmzSrqyOYUIA==} + engines: {node: '>=14.0.0'} + hasBin: true + tar-fs@2.1.1: resolution: {integrity: sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==} @@ -7008,6 +7012,33 @@ snapshots: transitivePeerDependencies: - ts-node + tailwindcss@3.4.6: + dependencies: + '@alloc/quick-lru': 5.2.0 + arg: 5.0.2 + chokidar: 3.6.0 + didyoumean: 1.2.2 + dlv: 1.1.3 + fast-glob: 3.3.2 + glob-parent: 6.0.2 + is-glob: 4.0.3 + jiti: 1.21.0 + lilconfig: 2.1.0 + micromatch: 4.0.5 + normalize-path: 3.0.0 + object-hash: 3.0.0 + picocolors: 1.0.1 + postcss: 8.4.35 + postcss-import: 15.1.0(postcss@8.4.35) + postcss-js: 4.0.1(postcss@8.4.35) + postcss-load-config: 4.0.2(postcss@8.4.35) + postcss-nested: 6.0.1(postcss@8.4.35) + postcss-selector-parser: 6.0.15 + resolve: 1.22.8 + sucrase: 3.35.0 + transitivePeerDependencies: + - ts-node + tar-fs@2.1.1: dependencies: chownr: 1.1.4