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

package/README.md

@@ -15,7 +15,6 @@
 
 ![star](https://badgen.net/github/stars/sonofmagic/weapp-tailwindcss)
 ![dm0](https://badgen.net/npm/dm/weapp-tailwindcss)
-![dm1](https://badgen.net/npm/dm/weapp-tailwindcss-webpack-plugin)
 ![license](https://badgen.net/npm/license/weapp-tailwindcss)
 [![test](https://github.com/sonofmagic/weapp-tailwindcss/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/sonofmagic/weapp-tailwindcss/actions/workflows/test.yml)
 [![codecov](https://codecov.io/gh/sonofmagic/weapp-tailwindcss/branch/main/graph/badge.svg?token=zn05qXYznt)](https://codecov.io/gh/sonofmagic/weapp-tailwindcss)
@@ -55,12 +54,12 @@
 
 ## 版本对应
 
-目前，`weapp-tailwindcss` 的 `4.x` 版本
+目前，`weapp-tailwindcss` 的 `5.x` 版本
 
-- 支持最新版本的 `tailwindcss v4` 和 `v3` 还有 `v2 jit` 版本。
-- 支持 `webpack5`，`webpack4`, `vite` 和 `gulp` 这些打包工具，也支持纯 `Nodejs` API 的方式，集成到你自己的构建工具中。
+- 支持最新版本的 `tailwindcss v4` 和 `v3`。
+- 支持 `webpack5`、`vite`、`rspack`、`rollup`、`rolldown` 和 `gulp` 这些打包工具，也支持纯 `Nodejs` API 的方式，集成到你自己的构建工具中。
 
-> 如果你还在使用 `tailwindcss@2` 版本，那你应该使用从 `weapp-tailwindcss/webpack4` 导出的本插件的 `postcss7` `webpack4` 版本。另外请确保你的 `nodejs` 版本 `>=16.6.0`。目前低于 `16` 的长期维护版本(`偶数版本`) 都已经结束了生命周期，建议安装 `nodejs` 的 `LTS` 版本，详见 [nodejs/release](https://github.com/nodejs/release)
+> `weapp-tailwindcss@5` 面向 Tailwind CSS v3/v4 和现代构建链路，不再内置 Webpack4、PostCSS7、Tailwind CSS v2 兼容入口。`weapp-tailwindcss@5` 需要 `nodejs` 版本 `^20.19.0 || >=22.12.0`，建议安装 `nodejs` 的 `LTS` 版本，详见 [nodejs/release](https://github.com/nodejs/release)
 
 ## [安装与使用方式](https://tw.icebreaker.top/docs/quick-start/install)
 

package/bin/weapp-tailwindcss.js

@@ -1,28 +1,8 @@
 #!/usr/bin/env node
 const fs = require('node:fs')
 const path = require('node:path')
-const process = require('node:process')
-
-function isInstallLifecycle() {
-  return process.env.npm_lifecycle_event === 'postinstall' || process.env.npm_lifecycle_event === 'prepare'
-}
-
-function isMissingRuntimeModuleError(error) {
-  return error && error.code === 'MODULE_NOT_FOUND'
-}
 
 const cliPath = path.resolve(__dirname, '../dist/cli.js')
 if (fs.existsSync(cliPath)) {
-  try {
-    require(cliPath)
-  }
-  catch (error) {
-    if (isInstallLifecycle() && isMissingRuntimeModuleError(error)) {
-      console.error('[weapp-tailwindcss] install lifecycle patch skipped because a runtime module is missing.')
-      console.error('Run `pnpm --filter weapp-tailwindcss build` before strict CLI validation.')
-    }
-    else {
-      throw error
-    }
-  }
+  require(cliPath)
 }

package/dist/bundlers/shared/generator-css.d.ts

@@ -1,4 +1,5 @@
 import type { IStyleHandlerOptions } from '@weapp-tailwindcss/postcss/types';
+import type { NormalizedWeappTailwindcssGeneratorOptions } from '../../generator';
 import type { InternalUserDefinedOptions } from '../../types';
 export interface GenerateCssByGeneratorOptions {
     opts: InternalUserDefinedOptions;
@@ -17,7 +18,8 @@ export interface GenerateCssByGeneratorOptions {
 export interface GenerateCssByGeneratorResult {
     css: string;
     target: string;
-    source: 'generator' | 'generator-forced';
+    source: 'generator';
+    dependencies: string[];
 }
 export declare function createCssAppend(base: string, extra: string): string;
 export declare function splitTailwindV4GeneratedCss(rawSource: string, rawTailwindCss: string): string | undefined;
@@ -38,6 +40,7 @@ export declare function resolveCssEntrySource(rawSource: string, base: string, o
     configRequest: string | undefined;
     base: string;
 } | undefined;
-export declare function resolveGeneratorSource(majorVersion: number | undefined, runtimeState: GenerateCssByGeneratorOptions['runtimeState'], rawSource: string, file: string, cssHandlerOptions: IStyleHandlerOptions): Promise<import("@/generator").TailwindV3ResolvedSource | import("tailwindcss-patch").TailwindV4ResolvedSource>;
+export declare function resolveGeneratorSource(majorVersion: number | undefined, runtimeState: GenerateCssByGeneratorOptions['runtimeState'], rawSource: string, file: string, cssHandlerOptions: IStyleHandlerOptions, generatorOptions?: NormalizedWeappTailwindcssGeneratorOptions): Promise<import("@/generator").TailwindV3ResolvedSource | import("tailwindcss-patch").TailwindV4ResolvedSource>;
 export declare function isPureLocalCssImportWrapper(css: string): boolean;
+export declare function removeTailwindApplyRules(rawSource: string): string;
 export declare function generateCssByGenerator(options: GenerateCssByGeneratorOptions): Promise<GenerateCssByGeneratorResult | undefined>;

package/dist/bundlers/vite/generate-bundle.d.ts

@@ -23,6 +23,7 @@ interface GenerateBundleContext {
     recordGeneratorCandidates?: (candidates: Set<string>) => void;
 }
 interface GenerateBundleThis {
+    addWatchFile?: (id: string) => void;
     emitFile?: (emittedFile: {
         type: 'asset';
         fileName: string;

package/dist/bundlers/vite/index.d.ts

@@ -1,3 +1,3 @@
 import type { Plugin } from 'vite';
 import type { UserDefinedOptions } from '../../types';
-export declare function UnifiedViteWeappTailwindcssPlugin(options?: UserDefinedOptions): Plugin[] | undefined;
+export declare function WeappTailwindcss(options?: UserDefinedOptions): Plugin[] | undefined;

package/dist/bundlers/vite/rewrite-css-imports.d.ts

@@ -3,6 +3,7 @@ import type { AppType } from '../../types';
 interface RewriteCssImportsOptions {
     appType?: AppType;
     getAppType?: () => AppType | undefined;
+    shouldOwnTailwindGeneration?: boolean;
     shouldRewrite: boolean;
     rootImport?: string;
     weappTailwindcssDirPosix: string;

package/dist/bundlers/webpack/BaseUnifiedPlugin/v5-loaders.d.ts

@@ -7,7 +7,6 @@ interface SetupWebpackV5LoadersOptions {
     weappTailwindcssPackageDir: string;
     shouldRewriteCssImports: boolean;
     runtimeLoaderPath?: string;
-    runtimeCssImportRewriteLoaderPath?: string;
     getClassSetInLoader: () => Promise<void>;
     getRuntimeWatchDependencies: () => {
         files: ReadonlySet<string>;

package/dist/bundlers/webpack/loaders/weapp-tw-css-import-rewrite-loader.d.ts

@@ -2,7 +2,7 @@ import type webpack from 'webpack';
 import type { AppType } from '../../../types';
 import { Buffer } from 'node:buffer';
 interface CssImportRewriteLoaderOptions {
-    rewriteCssImports?: {
+    tailwindcssImportRewrite?: {
         pkgDir: string;
         appType?: AppType;
     };

package/dist/cli/context.d.ts

@@ -1,7 +1,4 @@
-import type { CompatTailwindCssPatchOptions } from '../tailwindcss/patcher-options';
 import type { UserDefinedOptions } from '../types';
-export declare function resolveEntry(entry: string, cwd: string | undefined): string;
-export declare function buildTailwindcssPatcherOptions(overrides: Partial<CompatTailwindCssPatchOptions> | undefined): CompatTailwindCssPatchOptions | undefined;
 export declare function createCliContext(overrides: Partial<UserDefinedOptions> | undefined, resolvedCwd: string | undefined): Required<Omit<UserDefinedOptions, "supportCustomLengthUnitsPatch" | "customReplaceDictionary" | "cache"> & {
     supportCustomLengthUnitsPatch: import("tailwindcss-patch").ILengthUnitsPatchOptions | boolean;
     templateHandler: (rawSource: string, options?: import("@/types").ITemplateHandlerOptions) => Promise<string>;

package/dist/cli/mount-options.d.ts

@@ -1,2 +1,4 @@
 import type { TailwindcssPatchCliMountOptions } from 'tailwindcss-patch';
+export declare const PATCH_COMMAND_GENERATOR_MODE_NOTICE = "\u63D0\u793A\uFF1Aweapp-tailwindcss@5 \u751F\u6210\u6A21\u5F0F\u4E0D\u518D\u9700\u8981\u6267\u884C weapp-tw patch\uFF0C\u4E5F\u4E0D\u9700\u8981\u5728 package.json \u4E2D\u914D\u7F6E postinstall \u8FD9\u4E2A npm hook\uFF1B\u65E7 CSS \u540E\u5904\u7406\u94FE\u8DEF\u6216\u6392\u969C\u65F6\u518D\u624B\u52A8\u4F7F\u7528\u3002";
+export declare function logPatchCommandGeneratorModeNotice(): void;
 export declare const mountOptions: TailwindcssPatchCliMountOptions;

package/dist/cli.js

@@ -156,7 +156,7 @@ function getRecordFileCandidates(baseDir) {
 }
 //#endregion
 //#region package.json
-var version = "5.0.0-next.3";
+var version = "5.0.0-next.5";
 //#endregion
 //#region src/constants.ts
 const WEAPP_TW_REQUIRED_NODE_VERSION_RANGE = "^20.19.0 || >=22.12.0";
@@ -2382,6 +2382,10 @@ async function patchWorkspace(options) {
 }
 //#endregion
 //#region src/cli/mount-options.ts
+const PATCH_COMMAND_GENERATOR_MODE_NOTICE = "提示：weapp-tailwindcss@5 生成模式不再需要执行 weapp-tw patch，也不需要在 package.json 中配置 postinstall 这个 npm hook；旧 CSS 后处理链路或排障时再手动使用。";
+function logPatchCommandGeneratorModeNotice() {
+	_weapp_tailwindcss_logger.logger.warn(PATCH_COMMAND_GENERATOR_MODE_NOTICE);
+}
 function handleCliError(error) {
 	if (error instanceof Error) {
 		_weapp_tailwindcss_logger.logger.error(error.message);
@@ -2447,7 +2451,9 @@ const mountOptions = {
 		install: withCommandErrorHandling(async (ctx) => {
 			const shouldClearCache = toBoolean(ctx.args.clearCache, false);
 			const shouldRecordTarget = toBoolean(ctx.args.recordTarget, true);
-			if (toBoolean(ctx.args.workspace, false)) {
+			const runWorkspace = toBoolean(ctx.args.workspace, false);
+			logPatchCommandGeneratorModeNotice();
+			if (runWorkspace) {
 				await patchWorkspace({
 					cwd: ctx.cwd,
 					clearCache: shouldClearCache,

package/dist/cli.mjs

@@ -127,7 +127,7 @@ function getRecordFileCandidates(baseDir) {
 }
 //#endregion
 //#region package.json
-var version = "5.0.0-next.3";
+var version = "5.0.0-next.5";
 //#endregion
 //#region src/constants.ts
 const WEAPP_TW_REQUIRED_NODE_VERSION_RANGE = "^20.19.0 || >=22.12.0";
@@ -2353,6 +2353,10 @@ async function patchWorkspace(options) {
 }
 //#endregion
 //#region src/cli/mount-options.ts
+const PATCH_COMMAND_GENERATOR_MODE_NOTICE = "提示：weapp-tailwindcss@5 生成模式不再需要执行 weapp-tw patch，也不需要在 package.json 中配置 postinstall 这个 npm hook；旧 CSS 后处理链路或排障时再手动使用。";
+function logPatchCommandGeneratorModeNotice() {
+	logger$1.warn(PATCH_COMMAND_GENERATOR_MODE_NOTICE);
+}
 function handleCliError(error) {
 	if (error instanceof Error) {
 		logger$1.error(error.message);
@@ -2418,7 +2422,9 @@ const mountOptions = {
 		install: withCommandErrorHandling(async (ctx) => {
 			const shouldClearCache = toBoolean(ctx.args.clearCache, false);
 			const shouldRecordTarget = toBoolean(ctx.args.recordTarget, true);
-			if (toBoolean(ctx.args.workspace, false)) {
+			const runWorkspace = toBoolean(ctx.args.workspace, false);
+			logPatchCommandGeneratorModeNotice();
+			if (runWorkspace) {
 				await patchWorkspace({
 					cwd: ctx.cwd,
 					clearCache: shouldClearCache,

package/dist/constants.d.ts

@@ -1,7 +1,7 @@
 export declare const runtimeAopLoader = "weapp-tw-runtime-aop-loader";
 export declare const ManglePluginHooks = "ManglePluginHooks";
 export declare const WeappTailwindcssWebpackPluginOptimizeChunkAssetsHooks = "WeappTailwindcssWebpackPluginOptimizeChunkAssetsHooks";
-export declare const pluginName = "weapp-tailwindcss-webpack-plugin";
+export declare const pluginName = "weapp-tailwindcss";
 export declare const vitePluginName = "weapp-tailwindcss:adaptor";
 export declare const WEAPP_TW_REQUIRED_NODE_VERSION = "20.19.0";
 export declare const WEAPP_TW_REQUIRED_NODE_VERSION_RANGE = "^20.19.0 || >=22.12.0";

package/dist/core.js

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_recorder = require("./recorder-GdTJ3QqX.js");
+const require_recorder = require("./recorder-D4BKt75Q.js");
 let node_process = require("node:process");
 node_process = require_chunk.__toESM(node_process);
 let _weapp_tailwindcss_shared = require("@weapp-tailwindcss/shared");

package/dist/core.mjs

@@ -1,4 +1,4 @@
-import { g as ensureRuntimeClassSet, n as shouldSkipJsTransform, r as getCompilerContext, t as setupPatchRecorder } from "./recorder-XdFvVASS.mjs";
+import { g as ensureRuntimeClassSet, n as shouldSkipJsTransform, r as getCompilerContext, t as setupPatchRecorder } from "./recorder-BIW3Kuke.mjs";
 import process from "node:process";
 import { defuOverrideArray } from "@weapp-tailwindcss/shared";
 //#region src/core.ts

package/dist/css-macro.d.ts

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

package/dist/defaults.js

@@ -85,11 +85,13 @@ function getDefaultOptions() {
 		customAttributes: {},
 		customReplaceDictionary: _weapp_core_escape.MappingChars2String,
 		appType: void 0,
-		arbitraryValues: { allowDoubleQuotes: false },
+		arbitraryValues: {
+			allowDoubleQuotes: false,
+			bareArbitraryValues: false
+		},
 		cssChildCombinatorReplaceValue: ["view", "text"],
 		inlineWxs: false,
 		injectAdditionalCssVarScope: false,
-		rewriteCssImports: true,
 		jsPreserveClass: (keyword) => {
 			/**
 			* 默认保留 keyword
@@ -97,7 +99,6 @@ function getDefaultOptions() {
 			if (keyword === "*") return true;
 			return false;
 		},
-		staleClassNameFallback: void 0,
 		disabledDefaultTemplateHandler: false,
 		cssSelectorReplacement: {
 			root: [
@@ -118,10 +119,7 @@ function getDefaultOptions() {
 		ignoreCallExpressionIdentifiers: [],
 		ignoreTaggedTemplateExpressionIdentifiers: ["weappTwIgnore"],
 		replaceRuntimePackages: false,
-		generator: {
-			mode: "auto",
-			target: "weapp"
-		},
+		generator: { target: "weapp" },
 		tailwindcssPatcherOptions: { filter(className) {
 			return !(0, _weapp_core_escape.isAllowedClassName)(className);
 		} },

package/dist/defaults.mjs

@@ -82,11 +82,13 @@ function getDefaultOptions() {
 		customAttributes: {},
 		customReplaceDictionary: MappingChars2String,
 		appType: void 0,
-		arbitraryValues: { allowDoubleQuotes: false },
+		arbitraryValues: {
+			allowDoubleQuotes: false,
+			bareArbitraryValues: false
+		},
 		cssChildCombinatorReplaceValue: ["view", "text"],
 		inlineWxs: false,
 		injectAdditionalCssVarScope: false,
-		rewriteCssImports: true,
 		jsPreserveClass: (keyword) => {
 			/**
 			* 默认保留 keyword
@@ -94,7 +96,6 @@ function getDefaultOptions() {
 			if (keyword === "*") return true;
 			return false;
 		},
-		staleClassNameFallback: void 0,
 		disabledDefaultTemplateHandler: false,
 		cssSelectorReplacement: {
 			root: [
@@ -115,10 +116,7 @@ function getDefaultOptions() {
 		ignoreCallExpressionIdentifiers: [],
 		ignoreTaggedTemplateExpressionIdentifiers: ["weappTwIgnore"],
 		replaceRuntimePackages: false,
-		generator: {
-			mode: "auto",
-			target: "weapp"
-		},
+		generator: { target: "weapp" },
 		tailwindcssPatcherOptions: { filter(className) {
 			return !isAllowedClassName(className);
 		} },

package/dist/generator/index.d.ts

@@ -7,5 +7,5 @@ export declare function resolveTailwindSourceFromPatcher(patcher: TailwindcssPat
 export declare function createWeappTailwindcssGeneratorFromPatcher(patcher: TailwindcssPatcherLike): Promise<WeappTailwindcssGenerator>;
 export { normalizeWeappTailwindcssGeneratorOptions, } from './options';
 export { resolveTailwindV3Source, resolveTailwindV3SourceFromPatcher, resolveTailwindV3SourceOptionsFromPatcher, resolveTailwindV4Source, resolveTailwindV4SourceFromPatcher, resolveTailwindV4SourceFromPatchOptions, resolveTailwindV4SourceOptionsFromPatcher, transformTailwindV3CssByTarget, transformTailwindV3CssToWeapp, transformTailwindV4CssByTarget, transformTailwindV4CssToWeapp, };
-export type { NormalizedWeappTailwindcssGeneratorOptions, WeappTailwindcssGeneratorMode, WeappTailwindcssGeneratorOptions, WeappTailwindcssGeneratorUserOptions, } from './options';
+export type { NormalizedWeappTailwindcssGeneratorOptions, WeappTailwindcssGeneratorOptions, WeappTailwindcssGeneratorUserOptions, } from './options';
 export type { TailwindCandidateSource, TailwindGeneratorVersion, TailwindResolvedSource, TailwindV3CandidateSource, TailwindV3Engine, TailwindV3GenerateOptions, TailwindV3GenerateResult, TailwindV3GenerateTarget, TailwindV3ResolvedSource, TailwindV3SourceOptions, TailwindV4CandidateSource, TailwindV4DesignSystem, TailwindV4Engine, TailwindV4GenerateOptions, TailwindV4GenerateResult, TailwindV4GenerateTarget, TailwindV4ResolvedSource, TailwindV4SourceOptions, WeappTailwindcssGenerateOptions, WeappTailwindcssGenerateResult, WeappTailwindcssGenerator, WeappTailwindcssGeneratorTarget, } from './types';

package/dist/generator/options.d.ts

@@ -1,16 +1,15 @@
 import type { IStyleHandlerOptions } from '@weapp-tailwindcss/postcss/types';
 import type { WeappTailwindcssGeneratorTarget } from './types';
-export type WeappTailwindcssGeneratorMode = 'auto' | 'force' | 'off';
 export interface WeappTailwindcssGeneratorOptions {
-    mode?: WeappTailwindcssGeneratorMode;
     target?: WeappTailwindcssGeneratorTarget;
+    config?: string;
     styleOptions?: Partial<IStyleHandlerOptions>;
     tailwindcssV3Compatibility?: boolean;
 }
-export type WeappTailwindcssGeneratorUserOptions = boolean | WeappTailwindcssGeneratorOptions;
+export type WeappTailwindcssGeneratorUserOptions = WeappTailwindcssGeneratorOptions;
 export interface NormalizedWeappTailwindcssGeneratorOptions {
-    mode: WeappTailwindcssGeneratorMode;
     target: WeappTailwindcssGeneratorTarget;
+    config?: string;
     styleOptions?: Partial<IStyleHandlerOptions>;
     tailwindcssV3Compatibility: boolean;
 }