weapp-tailwindcss 4.12.0 → 5.0.0-next.2

package/dist/presets.js

@@ -1,177 +1,129 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }
-
-
-
-var _chunkZAA5ZG3Djs = require('./chunk-ZAA5ZG3D.js');
-
-
-
-var _chunkDYLQ6UOIjs = require('./chunk-DYLQ6UOI.js');
-require('./chunk-RKISS72P.js');
-
-// src/presets/shared.ts
+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");
+let node_process = require("node:process");
+node_process = require_chunk.__toESM(node_process);
+let local_pkg = require("local-pkg");
+let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");
+let _weapp_tailwindcss_logger = require("@weapp-tailwindcss/logger");
+//#region src/presets/shared.ts
 function normalizeCssEntries(entries) {
-  if (!entries) {
-    return void 0;
-  }
-  const normalized = Array.isArray(entries) ? entries : [entries];
-  return normalized.length > 0 ? normalized : void 0;
+	if (!entries) return;
+	const normalized = Array.isArray(entries) ? entries : [entries];
+	return normalized.length > 0 ? normalized : void 0;
 }
 function createBasePreset(options = {}) {
-  const {
-    base,
-    cssEntries,
-    resolve,
-    rawOptions,
-    ...userOptions
-  } = options;
-  const baseDir = _chunkZAA5ZG3Djs.resolveTailwindcssBasedir.call(void 0, base);
-  const normalizedCssEntries = normalizeCssEntries(cssEntries);
-  const tailwindConfig = {
-    v2: { cwd: baseDir },
-    v3: { cwd: baseDir },
-    v4: {
-      base: baseDir,
-      cssEntries: normalizedCssEntries
-    }
-  };
-  if (normalizedCssEntries && normalizedCssEntries.length > 0) {
-    tailwindConfig.version = 4;
-  }
-  const patchTailwindConfig = resolve ? {
-    ...tailwindConfig,
-    resolve
-  } : tailwindConfig;
-  const preset = {
-    tailwindcssBasedir: baseDir,
-    tailwindcss: tailwindConfig,
-    tailwindcssPatcherOptions: {
-      projectRoot: baseDir,
-      tailwindcss: patchTailwindConfig
-    }
-  };
-  const mergedUserOptions = _chunkDYLQ6UOIjs.defuOverrideArray.call(void 0, userOptions, _nullishCoalesce(rawOptions, () => ( {})));
-  return _chunkDYLQ6UOIjs.defuOverrideArray.call(void 0, 
-    mergedUserOptions,
-    preset
-  );
+	const { base, cssEntries, resolve, rawOptions, ...userOptions } = options;
+	const baseDir = require_logger.resolveTailwindcssBasedir(base);
+	const normalizedCssEntries = normalizeCssEntries(cssEntries);
+	const tailwindConfig = {
+		v2: { cwd: baseDir },
+		v3: { cwd: baseDir },
+		v4: {
+			base: baseDir,
+			cssEntries: normalizedCssEntries
+		}
+	};
+	if (normalizedCssEntries && normalizedCssEntries.length > 0) tailwindConfig.version = 4;
+	const preset = {
+		tailwindcssBasedir: baseDir,
+		tailwindcss: tailwindConfig,
+		tailwindcssPatcherOptions: {
+			projectRoot: baseDir,
+			tailwindcss: resolve ? {
+				...tailwindConfig,
+				resolve
+			} : tailwindConfig
+		}
+	};
+	return (0, _weapp_tailwindcss_shared.defuOverrideArray)((0, _weapp_tailwindcss_shared.defuOverrideArray)(userOptions, rawOptions ?? {}), preset);
 }
-
-// src/presets/uni-app.ts
-var _process = require('process'); var _process2 = _interopRequireDefault(_process);
+//#endregion
+//#region src/presets/uni-app.ts
 function uniApp(options = {}) {
-  const uniPlatform = _process2.default.env.UNI_PLATFORM;
-  const disableInH5OrApp = uniPlatform === "h5" || uniPlatform === "app" || uniPlatform === "app-plus";
-  return createBasePreset({
-    disabled: disableInH5OrApp ? true : void 0,
-    ...options
-  });
+	const uniPlatform = node_process.default.env.UNI_PLATFORM;
+	return createBasePreset({
+		disabled: uniPlatform === "h5" || uniPlatform === "app" || uniPlatform === "app-plus" ? true : void 0,
+		...options
+	});
 }
-
-// src/presets/uni-app-x.ts
-
-
-// src/tailwindcss/index.ts
-var _localpkg = require('local-pkg');
+//#endregion
+//#region src/tailwindcss/index.ts
 function getTailwindcssPackageInfo(options) {
-  return _localpkg.getPackageInfoSync.call(void 0, "tailwindcss", options);
+	return (0, local_pkg.getPackageInfoSync)("tailwindcss", options);
 }
-
-// src/presets/uni-app-x.ts
+//#endregion
+//#region src/presets/uni-app-x.ts
 function resolveTailwindResolveOptions(base, resolve) {
-  const currentPaths = Array.isArray(_optionalChain([resolve, 'optionalAccess', _ => _.paths])) ? resolve.paths : [];
-  return {
-    ..._nullishCoalesce(resolve, () => ( {})),
-    paths: [.../* @__PURE__ */ new Set([base, ...currentPaths])]
-  };
+	const currentPaths = Array.isArray(resolve?.paths) ? resolve.paths : [];
+	return {
+		...resolve ?? {},
+		paths: [...new Set([base, ...currentPaths])]
+	};
 }
 function resolveInstalledTailwindDefaults(resolve) {
-  const packageInfo = getTailwindcssPackageInfo(resolve);
-  const version = _optionalChain([packageInfo, 'optionalAccess', _2 => _2.version]);
-  if (!version) {
-    return void 0;
-  }
-  const major = Number.parseInt(_nullishCoalesce(version.split(".")[0], () => ( "")), 10);
-  if (!Number.isFinite(major)) {
-    return void 0;
-  }
-  if (major === 4) {
-    return {
-      version: 4,
-      packageName: "tailwindcss",
-      postcssPlugin: "@tailwindcss/postcss"
-    };
-  }
-  if (major === 3) {
-    return {
-      version: 3,
-      packageName: "tailwindcss",
-      postcssPlugin: "tailwindcss"
-    };
-  }
-  return void 0;
+	const version = getTailwindcssPackageInfo(resolve)?.version;
+	if (!version) return;
+	const major = Number.parseInt(version.split(".")[0] ?? "", 10);
+	if (!Number.isFinite(major)) return;
+	if (major === 4) return {
+		version: 4,
+		packageName: "tailwindcss",
+		postcssPlugin: "@tailwindcss/postcss"
+	};
+	if (major === 3) return {
+		version: 3,
+		packageName: "tailwindcss",
+		postcssPlugin: "tailwindcss"
+	};
 }
 function uniAppX(options) {
-  _chunkZAA5ZG3Djs.logger.info(`UNI_PLATFORM: ${_process2.default.env.UNI_PLATFORM}`);
-  const utsPlatform = _chunkDYLQ6UOIjs.resolveUniUtsPlatform.call(void 0, );
-  const uniPlatform = _chunkDYLQ6UOIjs.resolveUniUtsPlatform.call(void 0, _process2.default.env.UNI_PLATFORM);
-  _chunkZAA5ZG3Djs.logger.info(`UNI_UTS_PLATFORM: ${_nullishCoalesce(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 = _chunkZAA5ZG3Djs.resolveUniAppXOptions.call(void 0, {
-    enabled: isApp,
-    componentLocalStyles: _nullishCoalesce(options.componentLocalStyles, () => ( true)),
-    uvueUnsupported: options.uvueUnsupported,
-    ...typeof options.uniAppX === "object" ? options.uniAppX : {}
-  });
-  if (typeof options.uniAppX === "boolean") {
-    resolvedUniAppX.enabled = options.uniAppX;
-  }
-  return _chunkDYLQ6UOIjs.defuOverrideArray.call(void 0, 
-    _nullishCoalesce(options.rawOptions, () => ( {})),
-    {
-      uniAppX: resolvedUniAppX,
-      rem2rpx: options.rem2rpx,
-      unitsToPx: options.unitsToPx,
-      tailwindcssBasedir: options.base,
-      tailwindcssPatcherOptions: {
-        projectRoot: options.base,
-        tailwindcss: {
-          ..._nullishCoalesce(installedTailwindDefaults, () => ( {})),
-          cwd: options.base,
-          resolve: resolvedResolve,
-          v3: {
-            cwd: options.base
-          },
-          v4: {
-            base: options.base,
-            cssEntries
-          }
-        }
-      },
-      tailwindcss: {
-        ..._nullishCoalesce(installedTailwindDefaults, () => ( {})),
-        resolve: resolvedResolve
-      },
-      cssPreflight: {
-        "border-style": false
-      },
-      cssPresetEnv: {
-        features: {
-          "custom-properties": {
-            preserve: false
-          }
-        }
-      },
-      ...options.customAttributes ? { customAttributes: options.customAttributes } : {}
-    }
-  );
+	_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);
+	_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({
+		enabled: isApp,
+		componentLocalStyles: options.componentLocalStyles ?? true,
+		uvueUnsupported: options.uvueUnsupported,
+		...typeof options.uniAppX === "object" ? options.uniAppX : {}
+	});
+	if (typeof options.uniAppX === "boolean") resolvedUniAppX.enabled = options.uniAppX;
+	return (0, _weapp_tailwindcss_shared.defuOverrideArray)(options.rawOptions ?? {}, {
+		uniAppX: resolvedUniAppX,
+		...options.generator !== void 0 ? { generator: options.generator } : {},
+		rem2rpx: options.rem2rpx,
+		unitsToPx: options.unitsToPx,
+		tailwindcssBasedir: options.base,
+		tailwindcssPatcherOptions: {
+			projectRoot: options.base,
+			tailwindcss: {
+				...installedTailwindDefaults ?? {},
+				cwd: options.base,
+				resolve: resolvedResolve,
+				v3: { cwd: options.base },
+				v4: {
+					base: options.base,
+					cssEntries
+				}
+			}
+		},
+		tailwindcss: {
+			...installedTailwindDefaults ?? {},
+			resolve: resolvedResolve
+		},
+		cssPreflight: { "border-style": false },
+		cssPresetEnv: { features: { "custom-properties": { preserve: false } } },
+		...options.customAttributes ? { customAttributes: options.customAttributes } : {}
+	});
 }
-
-
-
-
-
-exports.createBasePreset = createBasePreset; exports.normalizeCssEntries = normalizeCssEntries; exports.uniApp = uniApp; exports.uniAppX = uniAppX;
+//#endregion
+exports.createBasePreset = createBasePreset;
+exports.normalizeCssEntries = normalizeCssEntries;
+exports.uniApp = uniApp;
+exports.uniAppX = uniAppX;

package/dist/presets.mjs

@@ -1,177 +1,121 @@
-import {
-  logger,
-  resolveTailwindcssBasedir,
-  resolveUniAppXOptions
-} from "./chunk-PCDYXXSK.mjs";
-import {
-  defuOverrideArray,
-  resolveUniUtsPlatform
-} from "./chunk-OOHJLO5M.mjs";
-import "./chunk-NNOQDMUP.mjs";
-
-// src/presets/shared.ts
+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 process from "node:process";
+import { getPackageInfoSync } from "local-pkg";
+//#region src/presets/shared.ts
 function normalizeCssEntries(entries) {
-  if (!entries) {
-    return void 0;
-  }
-  const normalized = Array.isArray(entries) ? entries : [entries];
-  return normalized.length > 0 ? normalized : void 0;
+	if (!entries) return;
+	const normalized = Array.isArray(entries) ? entries : [entries];
+	return normalized.length > 0 ? normalized : void 0;
 }
 function createBasePreset(options = {}) {
-  const {
-    base,
-    cssEntries,
-    resolve,
-    rawOptions,
-    ...userOptions
-  } = options;
-  const baseDir = resolveTailwindcssBasedir(base);
-  const normalizedCssEntries = normalizeCssEntries(cssEntries);
-  const tailwindConfig = {
-    v2: { cwd: baseDir },
-    v3: { cwd: baseDir },
-    v4: {
-      base: baseDir,
-      cssEntries: normalizedCssEntries
-    }
-  };
-  if (normalizedCssEntries && normalizedCssEntries.length > 0) {
-    tailwindConfig.version = 4;
-  }
-  const patchTailwindConfig = resolve ? {
-    ...tailwindConfig,
-    resolve
-  } : tailwindConfig;
-  const preset = {
-    tailwindcssBasedir: baseDir,
-    tailwindcss: tailwindConfig,
-    tailwindcssPatcherOptions: {
-      projectRoot: baseDir,
-      tailwindcss: patchTailwindConfig
-    }
-  };
-  const mergedUserOptions = defuOverrideArray(userOptions, rawOptions ?? {});
-  return defuOverrideArray(
-    mergedUserOptions,
-    preset
-  );
+	const { base, cssEntries, resolve, rawOptions, ...userOptions } = options;
+	const baseDir = resolveTailwindcssBasedir(base);
+	const normalizedCssEntries = normalizeCssEntries(cssEntries);
+	const tailwindConfig = {
+		v2: { cwd: baseDir },
+		v3: { cwd: baseDir },
+		v4: {
+			base: baseDir,
+			cssEntries: normalizedCssEntries
+		}
+	};
+	if (normalizedCssEntries && normalizedCssEntries.length > 0) tailwindConfig.version = 4;
+	const preset = {
+		tailwindcssBasedir: baseDir,
+		tailwindcss: tailwindConfig,
+		tailwindcssPatcherOptions: {
+			projectRoot: baseDir,
+			tailwindcss: resolve ? {
+				...tailwindConfig,
+				resolve
+			} : tailwindConfig
+		}
+	};
+	return defuOverrideArray(defuOverrideArray(userOptions, rawOptions ?? {}), preset);
 }
-
-// src/presets/uni-app.ts
-import process from "process";
+//#endregion
+//#region src/presets/uni-app.ts
 function uniApp(options = {}) {
-  const uniPlatform = process.env.UNI_PLATFORM;
-  const disableInH5OrApp = uniPlatform === "h5" || uniPlatform === "app" || uniPlatform === "app-plus";
-  return createBasePreset({
-    disabled: disableInH5OrApp ? true : void 0,
-    ...options
-  });
+	const uniPlatform = process.env.UNI_PLATFORM;
+	return createBasePreset({
+		disabled: uniPlatform === "h5" || uniPlatform === "app" || uniPlatform === "app-plus" ? true : void 0,
+		...options
+	});
 }
-
-// src/presets/uni-app-x.ts
-import process2 from "process";
-
-// src/tailwindcss/index.ts
-import { getPackageInfoSync } from "local-pkg";
+//#endregion
+//#region src/tailwindcss/index.ts
 function getTailwindcssPackageInfo(options) {
-  return getPackageInfoSync("tailwindcss", options);
+	return getPackageInfoSync("tailwindcss", options);
 }
-
-// src/presets/uni-app-x.ts
+//#endregion
+//#region src/presets/uni-app-x.ts
 function resolveTailwindResolveOptions(base, resolve) {
-  const currentPaths = Array.isArray(resolve?.paths) ? resolve.paths : [];
-  return {
-    ...resolve ?? {},
-    paths: [.../* @__PURE__ */ new Set([base, ...currentPaths])]
-  };
+	const currentPaths = Array.isArray(resolve?.paths) ? resolve.paths : [];
+	return {
+		...resolve ?? {},
+		paths: [...new Set([base, ...currentPaths])]
+	};
 }
 function resolveInstalledTailwindDefaults(resolve) {
-  const packageInfo = getTailwindcssPackageInfo(resolve);
-  const version = packageInfo?.version;
-  if (!version) {
-    return void 0;
-  }
-  const major = Number.parseInt(version.split(".")[0] ?? "", 10);
-  if (!Number.isFinite(major)) {
-    return void 0;
-  }
-  if (major === 4) {
-    return {
-      version: 4,
-      packageName: "tailwindcss",
-      postcssPlugin: "@tailwindcss/postcss"
-    };
-  }
-  if (major === 3) {
-    return {
-      version: 3,
-      packageName: "tailwindcss",
-      postcssPlugin: "tailwindcss"
-    };
-  }
-  return void 0;
+	const version = getTailwindcssPackageInfo(resolve)?.version;
+	if (!version) return;
+	const major = Number.parseInt(version.split(".")[0] ?? "", 10);
+	if (!Number.isFinite(major)) return;
+	if (major === 4) return {
+		version: 4,
+		packageName: "tailwindcss",
+		postcssPlugin: "@tailwindcss/postcss"
+	};
+	if (major === 3) return {
+		version: 3,
+		packageName: "tailwindcss",
+		postcssPlugin: "tailwindcss"
+	};
 }
 function uniAppX(options) {
-  logger.info(`UNI_PLATFORM: ${process2.env.UNI_PLATFORM}`);
-  const utsPlatform = resolveUniUtsPlatform();
-  const uniPlatform = resolveUniUtsPlatform(process2.env.UNI_PLATFORM);
-  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 = resolveUniAppXOptions({
-    enabled: isApp,
-    componentLocalStyles: options.componentLocalStyles ?? true,
-    uvueUnsupported: options.uvueUnsupported,
-    ...typeof options.uniAppX === "object" ? options.uniAppX : {}
-  });
-  if (typeof options.uniAppX === "boolean") {
-    resolvedUniAppX.enabled = options.uniAppX;
-  }
-  return defuOverrideArray(
-    options.rawOptions ?? {},
-    {
-      uniAppX: resolvedUniAppX,
-      rem2rpx: options.rem2rpx,
-      unitsToPx: options.unitsToPx,
-      tailwindcssBasedir: options.base,
-      tailwindcssPatcherOptions: {
-        projectRoot: options.base,
-        tailwindcss: {
-          ...installedTailwindDefaults ?? {},
-          cwd: options.base,
-          resolve: resolvedResolve,
-          v3: {
-            cwd: options.base
-          },
-          v4: {
-            base: options.base,
-            cssEntries
-          }
-        }
-      },
-      tailwindcss: {
-        ...installedTailwindDefaults ?? {},
-        resolve: resolvedResolve
-      },
-      cssPreflight: {
-        "border-style": false
-      },
-      cssPresetEnv: {
-        features: {
-          "custom-properties": {
-            preserve: false
-          }
-        }
-      },
-      ...options.customAttributes ? { customAttributes: options.customAttributes } : {}
-    }
-  );
+	logger.info(`UNI_PLATFORM: ${process.env.UNI_PLATFORM}`);
+	const utsPlatform = resolveUniUtsPlatform();
+	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);
+	const resolvedResolve = resolveTailwindResolveOptions(options.base, options.resolve);
+	const installedTailwindDefaults = resolveInstalledTailwindDefaults(resolvedResolve);
+	const resolvedUniAppX = resolveUniAppXOptions({
+		enabled: isApp,
+		componentLocalStyles: options.componentLocalStyles ?? true,
+		uvueUnsupported: options.uvueUnsupported,
+		...typeof options.uniAppX === "object" ? options.uniAppX : {}
+	});
+	if (typeof options.uniAppX === "boolean") resolvedUniAppX.enabled = options.uniAppX;
+	return defuOverrideArray(options.rawOptions ?? {}, {
+		uniAppX: resolvedUniAppX,
+		...options.generator !== void 0 ? { generator: options.generator } : {},
+		rem2rpx: options.rem2rpx,
+		unitsToPx: options.unitsToPx,
+		tailwindcssBasedir: options.base,
+		tailwindcssPatcherOptions: {
+			projectRoot: options.base,
+			tailwindcss: {
+				...installedTailwindDefaults ?? {},
+				cwd: options.base,
+				resolve: resolvedResolve,
+				v3: { cwd: options.base },
+				v4: {
+					base: options.base,
+					cssEntries
+				}
+			}
+		},
+		tailwindcss: {
+			...installedTailwindDefaults ?? {},
+			resolve: resolvedResolve
+		},
+		cssPreflight: { "border-style": false },
+		cssPresetEnv: { features: { "custom-properties": { preserve: false } } },
+		...options.customAttributes ? { customAttributes: options.customAttributes } : {}
+	});
 }
-export {
-  createBasePreset,
-  normalizeCssEntries,
-  uniApp,
-  uniAppX
-};
+//#endregion
+export { createBasePreset, normalizeCssEntries, uniApp, uniAppX };