weapp-tailwindcss 5.0.0-next.3 → 5.0.0-next.31

package/dist/presets/index.d.ts

@@ -1,3 +1,4 @@
+export * from './hbuilderx';
 export * from './shared';
 export * from './uni-app';
 export * from './uni-app-x';

package/dist/presets/uni-app-x.d.ts

@@ -6,6 +6,7 @@ export interface UniAppXOptions {
     rem2rpx?: UserDefinedOptions['rem2rpx'];
     generator?: UserDefinedOptions['generator'];
     unitsToPx?: UserDefinedOptions['unitsToPx'];
+    unitConversion?: UserDefinedOptions['unitConversion'];
     rawOptions?: UserDefinedOptions;
     resolve?: PackageResolvingOptions;
     customAttributes?: UserDefinedOptions['customAttributes'];

package/dist/presets.js

@@ -1,7 +1,11 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_chunk = require("./chunk-8l464Juk.js");
-const require_utils = require("./utils-DmC9_In3.js");
-const require_logger = require("./logger-BZ45DZJT.js");
+const require_chunk = require("./chunk-C5U5_Hdc.js");
+const require_v3_engine = require("./v3-engine-CHItlVq5.js");
+const require_utils = require("./utils-D7Ygohep.js");
+const require_tailwindcss = require("./tailwindcss-B-e2RiXr.js");
+require("./logger-TlKT3xmR.js");
+let node_path = require("node:path");
+node_path = require_chunk.__toESM(node_path);
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
 let local_pkg = require("local-pkg");
@@ -15,15 +19,15 @@ function normalizeCssEntries(entries) {
 }
 function createBasePreset(options = {}) {
 	const { base, cssEntries, resolve, rawOptions, ...userOptions } = options;
-	const baseDir = require_logger.resolveTailwindcssBasedir(base);
+	const baseDir = require_tailwindcss.resolveTailwindcssBasedir(base);
 	const normalizedCssEntries = normalizeCssEntries(cssEntries);
 	const tailwindConfig = {
 		v2: { cwd: baseDir },
 		v3: { cwd: baseDir },
-		v4: {
+		v4: require_v3_engine.omitUndefined({
 			base: baseDir,
 			cssEntries: normalizedCssEntries
-		}
+		})
 	};
 	if (normalizedCssEntries && normalizedCssEntries.length > 0) tailwindConfig.version = 4;
 	const preset = {
@@ -40,9 +44,14 @@ function createBasePreset(options = {}) {
 	return (0, _weapp_tailwindcss_shared.defuOverrideArray)((0, _weapp_tailwindcss_shared.defuOverrideArray)(userOptions, rawOptions ?? {}), preset);
 }
 //#endregion
+//#region src/presets/hbuilderx.ts
+function hbuilderx(options = {}) {
+	return createBasePreset({ ...options });
+}
+//#endregion
 //#region src/presets/uni-app.ts
 function uniApp(options = {}) {
-	const uniPlatform = node_process.default.env.UNI_PLATFORM;
+	const uniPlatform = node_process.default.env["UNI_PLATFORM"];
 	return createBasePreset({
 		disabled: uniPlatform === "h5" || uniPlatform === "app" || uniPlatform === "app-plus" ? true : void 0,
 		...options
@@ -59,7 +68,11 @@ function resolveTailwindResolveOptions(base, resolve) {
 	const currentPaths = Array.isArray(resolve?.paths) ? resolve.paths : [];
 	return {
 		...resolve ?? {},
-		paths: [...new Set([base, ...currentPaths])]
+		paths: [...new Set([
+			node_path.default.join(base, "node_modules"),
+			base,
+			...currentPaths
+		])]
 	};
 }
 function resolveInstalledTailwindDefaults(resolve) {
@@ -79,15 +92,15 @@ function resolveInstalledTailwindDefaults(resolve) {
 	};
 }
 function uniAppX(options) {
-	_weapp_tailwindcss_logger.logger.info(`UNI_PLATFORM: ${node_process.default.env.UNI_PLATFORM}`);
+	_weapp_tailwindcss_logger.logger.info(`UNI_PLATFORM: ${node_process.default.env["UNI_PLATFORM"]}`);
 	const utsPlatform = require_utils.resolveUniUtsPlatform();
-	const uniPlatform = require_utils.resolveUniUtsPlatform(node_process.default.env.UNI_PLATFORM);
+	const uniPlatform = require_utils.resolveUniUtsPlatform(node_process.default.env["UNI_PLATFORM"]);
 	_weapp_tailwindcss_logger.logger.info(`UNI_UTS_PLATFORM: ${utsPlatform.raw ?? "undefined"}`);
 	const isApp = utsPlatform.isApp || uniPlatform.isApp;
 	const cssEntries = normalizeCssEntries(options.cssEntries);
 	const resolvedResolve = resolveTailwindResolveOptions(options.base, options.resolve);
 	const installedTailwindDefaults = resolveInstalledTailwindDefaults(resolvedResolve);
-	const resolvedUniAppX = require_logger.resolveUniAppXOptions({
+	const resolvedUniAppX = require_tailwindcss.resolveUniAppXOptions({
 		enabled: isApp,
 		componentLocalStyles: options.componentLocalStyles ?? true,
 		uvueUnsupported: options.uvueUnsupported,
@@ -99,6 +112,8 @@ function uniAppX(options) {
 		...options.generator !== void 0 ? { generator: options.generator } : {},
 		rem2rpx: options.rem2rpx,
 		unitsToPx: options.unitsToPx,
+		unitConversion: options.unitConversion,
+		appType: "uni-app-x",
 		tailwindcssBasedir: options.base,
 		tailwindcssPatcherOptions: {
 			projectRoot: options.base,
@@ -107,10 +122,10 @@ function uniAppX(options) {
 				cwd: options.base,
 				resolve: resolvedResolve,
 				v3: { cwd: options.base },
-				v4: {
+				v4: require_v3_engine.omitUndefined({
 					base: options.base,
 					cssEntries
-				}
+				})
 			}
 		},
 		tailwindcss: {
@@ -124,6 +139,7 @@ function uniAppX(options) {
 }
 //#endregion
 exports.createBasePreset = createBasePreset;
+exports.hbuilderx = hbuilderx;
 exports.normalizeCssEntries = normalizeCssEntries;
 exports.uniApp = uniApp;
 exports.uniAppX = uniAppX;

package/dist/presets.mjs

@@ -1,5 +1,8 @@
-import { n as defuOverrideArray, o as resolveUniUtsPlatform } from "./utils-7DUGTFED.mjs";
-import { a as resolveUniAppXOptions, r as resolveTailwindcssBasedir, t as logger } from "./logger-BoVx1Dbt.mjs";
+import { q as omitUndefined } from "./v3-engine-DcvCCHfs.mjs";
+import { n as defuOverrideArray, o as resolveUniUtsPlatform } from "./utils-DsaS975I.mjs";
+import { i as resolveUniAppXOptions, n as resolveTailwindcssBasedir } from "./tailwindcss-C7dJHZ0G.mjs";
+import { t as logger } from "./logger-BNzxZbZj.mjs";
+import path from "node:path";
 import process from "node:process";
 import { getPackageInfoSync } from "local-pkg";
 //#region src/presets/shared.ts
@@ -15,10 +18,10 @@ function createBasePreset(options = {}) {
 	const tailwindConfig = {
 		v2: { cwd: baseDir },
 		v3: { cwd: baseDir },
-		v4: {
+		v4: omitUndefined({
 			base: baseDir,
 			cssEntries: normalizedCssEntries
-		}
+		})
 	};
 	if (normalizedCssEntries && normalizedCssEntries.length > 0) tailwindConfig.version = 4;
 	const preset = {
@@ -35,9 +38,14 @@ function createBasePreset(options = {}) {
 	return defuOverrideArray(defuOverrideArray(userOptions, rawOptions ?? {}), preset);
 }
 //#endregion
+//#region src/presets/hbuilderx.ts
+function hbuilderx(options = {}) {
+	return createBasePreset({ ...options });
+}
+//#endregion
 //#region src/presets/uni-app.ts
 function uniApp(options = {}) {
-	const uniPlatform = process.env.UNI_PLATFORM;
+	const uniPlatform = process.env["UNI_PLATFORM"];
 	return createBasePreset({
 		disabled: uniPlatform === "h5" || uniPlatform === "app" || uniPlatform === "app-plus" ? true : void 0,
 		...options
@@ -54,7 +62,11 @@ function resolveTailwindResolveOptions(base, resolve) {
 	const currentPaths = Array.isArray(resolve?.paths) ? resolve.paths : [];
 	return {
 		...resolve ?? {},
-		paths: [...new Set([base, ...currentPaths])]
+		paths: [...new Set([
+			path.join(base, "node_modules"),
+			base,
+			...currentPaths
+		])]
 	};
 }
 function resolveInstalledTailwindDefaults(resolve) {
@@ -74,9 +86,9 @@ function resolveInstalledTailwindDefaults(resolve) {
 	};
 }
 function uniAppX(options) {
-	logger.info(`UNI_PLATFORM: ${process.env.UNI_PLATFORM}`);
+	logger.info(`UNI_PLATFORM: ${process.env["UNI_PLATFORM"]}`);
 	const utsPlatform = resolveUniUtsPlatform();
-	const uniPlatform = resolveUniUtsPlatform(process.env.UNI_PLATFORM);
+	const uniPlatform = resolveUniUtsPlatform(process.env["UNI_PLATFORM"]);
 	logger.info(`UNI_UTS_PLATFORM: ${utsPlatform.raw ?? "undefined"}`);
 	const isApp = utsPlatform.isApp || uniPlatform.isApp;
 	const cssEntries = normalizeCssEntries(options.cssEntries);
@@ -94,6 +106,8 @@ function uniAppX(options) {
 		...options.generator !== void 0 ? { generator: options.generator } : {},
 		rem2rpx: options.rem2rpx,
 		unitsToPx: options.unitsToPx,
+		unitConversion: options.unitConversion,
+		appType: "uni-app-x",
 		tailwindcssBasedir: options.base,
 		tailwindcssPatcherOptions: {
 			projectRoot: options.base,
@@ -102,10 +116,10 @@ function uniAppX(options) {
 				cwd: options.base,
 				resolve: resolvedResolve,
 				v3: { cwd: options.base },
-				v4: {
+				v4: omitUndefined({
 					base: options.base,
 					cssEntries
-				}
+				})
 			}
 		},
 		tailwindcss: {
@@ -118,4 +132,4 @@ function uniAppX(options) {
 	});
 }
 //#endregion
-export { createBasePreset, normalizeCssEntries, uniApp, uniAppX };
+export { createBasePreset, hbuilderx, normalizeCssEntries, uniApp, uniAppX };

package/dist/reset.d.ts

@@ -1 +1,2 @@
+export { default } from './reset/index'
 export * from './reset/index'

package/dist/reset.js

@@ -2,7 +2,7 @@ Object.defineProperties(exports, {
 	__esModule: { value: true },
 	[Symbol.toStringTag]: { value: "Module" }
 });
-const require_chunk = require("./chunk-8l464Juk.js");
+const require_chunk = require("./chunk-C5U5_Hdc.js");
 let _weapp_tailwindcss_reset = require("@weapp-tailwindcss/reset");
 _weapp_tailwindcss_reset = require_chunk.__toESM(_weapp_tailwindcss_reset);
 Object.defineProperty(exports, "default", {