@rebuildjs/tailwindcss 0.7.1 → 0.7.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rebuildjs/tailwindcss",
-  "version": "0.7.1",
+  "version": "0.7.4",
   "description": "Tailwindcss integration with rebuildjs",
   "keywords": [
     "tailwindcss",
@@ -37,7 +37,7 @@
   "dependencies": {
     "ctx-core": "^5.38.1",
     "esbuild": "^0.20.0",
-    "postcss": "^8.4.33",
+    "postcss": "^8.4.34",
     "rebuildjs": "^0.55.1",
     "tailwindcss": "^3.4.1"
   },
@@ -45,7 +45,7 @@
     "c8": "^9.1.0",
     "check-dts": "^0.7.2",
     "esmock": "^2.6.3",
-    "relementjs": "^0.64.1",
+    "relementjs": "^0.64.2",
     "tsx": "^4.7.0",
     "typescript": "next",
     "uvu": "^0.5.6"

package/rebuild_tailwind_plugin/index.js

@@ -157,7 +157,7 @@ export function rebuild_tailwind_plugin_(config) {
 								}
 								const annotated_cssBundle_path = join(cwd_(app_ctx), annotated_cssBundle)
 								const tailwind_instance = tailwind({
-									...config,
+									...config?.tailwindcss_config,
 									content: [
 										...output.cssBundle_content.map(content__relative_path=>
 											join(cwd_(app_ctx), content__relative_path)),

package/rebuild_tailwind_plugin/index.test.ts

@@ -68,7 +68,7 @@ test('rebuild_tailwind_plugin__ready', ()=>{
 	equal(rebuildjs_tailwind__ready$_(app_ctx)(), true)
 	equal(rebuildjs_tailwind__ready_(app_ctx), true)
 })
-test('rebuild_tailwind_plugin_', async ()=>{
+test('rebuild_tailwind_plugin_|default', async ()=>{
 	const test_dir = dirname(new URL(import.meta.url).pathname)
 	const cwd = join(test_dir, '../_fixtures')
 	cwd__set(app_ctx, cwd)
@@ -128,4 +128,68 @@ test('rebuild_tailwind_plugin_', async ()=>{
 		browser__build_context?.dispose?.()
 	}
 })
+test('rebuild_tailwind_plugin_|tailwindcss_config', async ()=>{
+	const test_dir = dirname(new URL(import.meta.url).pathname)
+	const cwd = join(test_dir, '../_fixtures')
+	cwd__set(app_ctx, cwd)
+	await rm(join(cwd, 'dist'), { recursive: true, force: true })
+	let server__build_context:BuildContext|undefined = undefined
+	let browser__build_context:BuildContext|undefined = undefined
+	try {
+		const rebuild_tailwind_plugin = rebuild_tailwind_plugin_({
+			tailwindcss_config: {
+				content: []
+			}
+		})
+		equal(rebuildjs__ready__add__ready__a1_(app_ctx), [rebuildjs_tailwind__ready_])
+		server__build_context = await rebuildjs_server__build({ plugins: [rebuild_tailwind_plugin] })
+		browser__build_context = await rebuildjs_browser__build({ plugins: [rebuild_tailwind_plugin] })
+		await rebuildjs__ready__wait()
+		const server__metafile = server__metafile_(app_ctx)!
+		const server__output__relative_path =
+			Object.keys(server__metafile.outputs)
+				.find(server__output__relative_path=>
+					server__metafile.outputs[server__output__relative_path].entryPoint)!
+		const server__entryPoint__output =
+			server__metafile.outputs[server__output__relative_path]
+		const browser__metafile = browser__metafile_(app_ctx)!
+		const browser__output__relative_path =
+			Object.keys(browser__metafile.outputs)
+				.find(browser__output__relative_path=>
+					browser__metafile.outputs[browser__output__relative_path].entryPoint)!
+		const browser__entryPoint__output =
+			browser__metafile.outputs[browser__output__relative_path]
+		equal(typeof server__entryPoint__output.cssBundle, 'string')
+		equal(typeof browser__entryPoint__output.cssBundle, 'string')
+		equal(typeof server__entryPoint__output.esbuild_cssBundle, 'string')
+		equal(typeof browser__entryPoint__output.esbuild_cssBundle, 'string')
+		equal(server__entryPoint__output.cssBundle !== server__entryPoint__output.esbuild_cssBundle, true)
+		equal(browser__entryPoint__output.cssBundle !== browser__entryPoint__output.esbuild_cssBundle, true)
+		await rmemo__wait(rebuildjs_tailwind__ready$_(app_ctx), $=>$, 2000)
+		const cssBundle_text =
+			await readFile(join(cwd_(app_ctx), server__entryPoint__output.cssBundle!))
+				.then(buf=>buf + '')
+		const esbuild_cssBundle_text =
+			await readFile(join(cwd_(app_ctx), server__entryPoint__output.esbuild_cssBundle!))
+				.then(buf=>buf + '')
+		equal(cssBundle_text.includes('@tailwind base;'), false)
+		equal(cssBundle_text.includes('@tailwind components;'), false)
+		equal(cssBundle_text.includes('@tailwind utilities;'), false)
+		equal(cssBundle_text.includes('.text-green-500'), true)
+		equal(cssBundle_text.includes('.font-bold'), true)
+		equal(cssBundle_text.includes('.text-red'), false)
+		equal(cssBundle_text.includes('.font-light'), false)
+		equal(esbuild_cssBundle_text.includes('@tailwind base;'), true)
+		equal(esbuild_cssBundle_text.includes('@tailwind components;'), true)
+		equal(esbuild_cssBundle_text.includes('@tailwind utilities;'), true)
+		equal(esbuild_cssBundle_text.includes('.text-green-500'), false)
+		equal(esbuild_cssBundle_text.includes('.font-bold'), false)
+		equal(esbuild_cssBundle_text.includes('.text-red'), false)
+		equal(esbuild_cssBundle_text.includes('.font-light'), false)
+	} finally {
+		await rebuildjs__ready__wait()
+		server__build_context?.dispose?.()
+		browser__build_context?.dispose?.()
+	}
+})
 test.run()