weapp-tailwindcss 5.0.0-next.7 → 5.0.0-next.9

package/dist/{webpack-D-sUCY0u.js → webpack-BzN2ly34.js}

@@ -1,9 +1,10 @@
 const require_chunk = require("./chunk-8l464Juk.js");
-const require_cache = require("./cache-DPN5yKSX.js");
-const require_runtime_patch = require("./runtime-patch-qwuisukL.js");
-const require_precheck = require("./precheck-Dka94ArV.js");
-const require_utils = require("./utils-VZvGusYs.js");
-const require_generator_css = require("./generator-css-Dnpl-IY2.js");
+const require_cache = require("./cache-BVAiJV3J.js");
+const require_runtime_patch = require("./runtime-patch-D6mBo_KB.js");
+const require_generator_css = require("./generator-css-Bwp3nbrl.js");
+const require_precheck = require("./precheck-B32p-gLI.js");
+const require_utils = require("./utils-BiShvil9.js");
+const require_tailwindcss = require("./tailwindcss-Bu-RWIHx.js");
 const require_run_tasks = require("./run-tasks-B50A3pxt.js");
 let node_module = require("node:module");
 node_module = require_chunk.__toESM(node_module);
@@ -31,7 +32,7 @@ function installTailwindcssCssRedirect(pkgDir) {
 }
 //#endregion
 //#region src/shared/mpx.ts
-const require$1 = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href);
+const localRequire = (0, node_module.createRequire)(require("url").pathToFileURL(__filename).href);
 const MPX_STYLE_RESOURCE_QUERY_RE$1 = /(?:^|[?&])type=styles(?:&|$)/;
 function isMpxStyleResourceQuery(query) {
 	if (typeof query !== "string") return false;
@@ -43,6 +44,18 @@ function isMpx(appType) {
 function getTailwindcssCssEntry(pkgDir) {
 	return node_path.default.join(pkgDir, "index.css");
 }
+function resolveMpxWebpackPluginDir(compiler) {
+	const candidates = [
+		compiler?.context,
+		compiler?.options?.context,
+		node_process.default.cwd()
+	].filter((item) => typeof item === "string" && item.length > 0);
+	for (const candidate of candidates) try {
+		const projectRequire = (0, node_module.createRequire)(node_path.default.join(candidate, "package.json"));
+		return node_path.default.dirname(projectRequire.resolve("@mpxjs/webpack-plugin/package.json"));
+	} catch {}
+	return node_path.default.dirname(localRequire.resolve("@mpxjs/webpack-plugin/package.json"));
+}
 function isMpxWebpackPluginRequest(request) {
 	return request === "@mpxjs/webpack-plugin" || Boolean(request?.startsWith("@mpxjs/webpack-plugin/"));
 }
@@ -64,9 +77,9 @@ function ensureResolveLoaderAlias(compiler, mpxWebpackPluginDir) {
 }
 function ensureMpxTailwindcssAliases(compiler, pkgDir) {
 	const tailwindcssCssEntry = getTailwindcssCssEntry(pkgDir);
-	const mpxWebpackPluginDir = node_path.default.dirname(require$1.resolve("@mpxjs/webpack-plugin/package.json"));
 	compiler.options = compiler.options || {};
 	compiler.options.resolve = compiler.options.resolve || {};
+	const mpxWebpackPluginDir = resolveMpxWebpackPluginDir(compiler);
 	ensureResolveLoaderAlias(compiler, mpxWebpackPluginDir);
 	const alias = compiler.options.resolve.alias ?? {};
 	compiler.options.resolve.alias = alias;
@@ -424,7 +437,7 @@ function createLoaderAnchorFinders(appType) {
 //#endregion
 //#region src/bundlers/webpack/BaseUnifiedPlugin/v5-loaders.ts
 function setupWebpackV5Loaders(options) {
-	const { compiler, options: compilerOptions, appType, weappTailwindcssPackageDir, shouldRewriteCssImports, runtimeLoaderPath, getClassSetInLoader, getRuntimeWatchDependencies, debug } = options;
+	const { compiler, options: compilerOptions, appType, weappTailwindcssPackageDir, shouldRewriteCssImports, runtimeLoaderPath, registerAutoCssSource, getClassSetInLoader, getRuntimeWatchDependencies, debug } = options;
 	const isMpxApp = isMpx(appType);
 	if (shouldRewriteCssImports && isMpxApp) ensureMpxTailwindcssAliases(compiler, weappTailwindcssPackageDir);
 	const runtimeClassSetLoader = runtimeLoaderPath ?? node_path.default.resolve(__dirname, "./weapp-tw-runtime-classset-loader.js");
@@ -433,7 +446,8 @@ function setupWebpackV5Loaders(options) {
 	const runtimeCssImportRewriteLoaderExists = runtimeCssImportRewriteLoader ? node_fs.default.existsSync(runtimeCssImportRewriteLoader) : false;
 	const runtimeLoaderRewriteOptions = shouldRewriteCssImports ? {
 		pkgDir: weappTailwindcssPackageDir,
-		appType
+		appType,
+		registerCssSource: registerAutoCssSource
 	} : void 0;
 	const classSetLoaderOptions = {
 		getClassSet: getClassSetInLoader,
@@ -518,7 +532,12 @@ var UnifiedWebpackPluginV5 = class {
 	constructor(options = {}) {
 		require_precheck._defineProperty(this, "options", void 0);
 		require_precheck._defineProperty(this, "appType", void 0);
-		this.options = require_precheck.getCompilerContext(options);
+		require_precheck._defineProperty(this, "hasInitialTailwindCssRoots", void 0);
+		this.hasInitialTailwindCssRoots = require_tailwindcss.hasConfiguredTailwindV4CssRoots(options);
+		this.options = require_precheck.getCompilerContext({
+			...options,
+			__internalDeferMissingCssEntriesWarning: true
+		});
 		this.appType = this.options.appType;
 	}
 	apply(compiler) {
@@ -546,6 +565,10 @@ var UnifiedWebpackPluginV5 = class {
 			const tailwindOptions = require_cache.resolveTailwindcssOptions(runtimeState.twPatcher.options);
 			if (tailwindOptions?.config) runtimeWatchDependencyFiles.add(tailwindOptions.config);
 			for (const entry of tailwindOptions?.v4?.cssEntries ?? []) runtimeWatchDependencyFiles.add(entry);
+			for (const source of tailwindOptions?.v4?.cssSources ?? []) {
+				if (source.file) runtimeWatchDependencyFiles.add(source.file);
+				for (const dependency of source.dependencies ?? []) runtimeWatchDependencyFiles.add(dependency);
+			}
 			for (const source of tailwindOptions?.v4?.sources ?? []) if (source?.base) runtimeWatchDependencyContexts.add(source.base);
 			if (typeof runtimeState.twPatcher.collectContentTokens !== "function") return;
 			try {
@@ -569,6 +592,18 @@ var UnifiedWebpackPluginV5 = class {
 			runtimeMetadataPrepared = false;
 			syncRuntimeRefreshRequirement();
 		};
+		const registerAutoCssSource = async (source) => {
+			if (this.hasInitialTailwindCssRoots || (runtimeState.twPatcher.majorVersion ?? 0) < 4 || !source.file) return;
+			if (!require_tailwindcss.upsertTailwindV4CssSource(this.options, source)) return;
+			runtimeSetPrepared = false;
+			runtimeMetadataPrepared = false;
+			runtimeRefreshRequiredForCompilation = true;
+			await require_precheck.refreshTailwindRuntimeState(runtimeState, {
+				force: true,
+				clearCache: true
+			});
+			debug("detected tailwindcss v4 css source from webpack css module: %s", source.file);
+		};
 		compiler.hooks.invalid?.tap?.(require_precheck.pluginName, () => {
 			runtimeRefreshRequiredForCompilation = true;
 		});
@@ -599,6 +634,7 @@ var UnifiedWebpackPluginV5 = class {
 			weappTailwindcssPackageDir,
 			shouldRewriteCssImports,
 			runtimeLoaderPath,
+			registerAutoCssSource,
 			getClassSetInLoader,
 			getRuntimeWatchDependencies() {
 				return {

package/dist/{webpack-BNdGm9KL.mjs → webpack-DJazm5sT.mjs}

@@ -1,8 +1,9 @@
-import { c as resolveTailwindcssOptions, n as getRuntimeClassSetSignature } from "./cache-nq0_XJoS.mjs";
-import { n as createDebug } from "./runtime-patch-pGdCqAEu.mjs";
-import { _ as ensureRuntimeClassSet, f as pluginName, g as createTailwindRuntimeReadyPromise, n as getCompilerContext, s as _defineProperty, t as shouldSkipJsTransform } from "./precheck-DlrmwCc-.mjs";
-import { r as getGroupedEntries } from "./utils-BJjKRQgf.mjs";
-import { a as processCachedTask, t as generateCssByGenerator } from "./generator-css-B938WI9a.mjs";
+import { c as resolveTailwindcssOptions, n as getRuntimeClassSetSignature } from "./cache-CHs4DXui.mjs";
+import { n as createDebug } from "./runtime-patch-CwN5ya72.mjs";
+import { r as processCachedTask, t as generateCssByGenerator } from "./generator-css-DeLLmp2N.mjs";
+import { _ as ensureRuntimeClassSet, f as pluginName, g as createTailwindRuntimeReadyPromise, n as getCompilerContext, s as _defineProperty, t as shouldSkipJsTransform, v as refreshTailwindRuntimeState } from "./precheck-B4RH6ZNN.mjs";
+import { r as getGroupedEntries } from "./utils-Btw1iOVV.mjs";
+import { c as upsertTailwindV4CssSource, s as hasConfiguredTailwindV4CssRoots } from "./tailwindcss-C5IgPlQ0.mjs";
 import { a as resolveOutputSpecifier, n as resolvePackageDir, o as toAbsoluteOutputPath, r as resolvePluginDisabledState, t as pushConcurrentTaskFactories } from "./run-tasks-DdNi-hkk.mjs";
 import Module, { createRequire } from "node:module";
 import path from "node:path";
@@ -27,7 +28,7 @@ function installTailwindcssCssRedirect(pkgDir) {
 }
 //#endregion
 //#region src/shared/mpx.ts
-const require = createRequire(import.meta.url);
+const localRequire = createRequire(import.meta.url);
 const MPX_STYLE_RESOURCE_QUERY_RE$1 = /(?:^|[?&])type=styles(?:&|$)/;
 function isMpxStyleResourceQuery(query) {
 	if (typeof query !== "string") return false;
@@ -39,6 +40,18 @@ function isMpx(appType) {
 function getTailwindcssCssEntry(pkgDir) {
 	return path.join(pkgDir, "index.css");
 }
+function resolveMpxWebpackPluginDir(compiler) {
+	const candidates = [
+		compiler?.context,
+		compiler?.options?.context,
+		process.cwd()
+	].filter((item) => typeof item === "string" && item.length > 0);
+	for (const candidate of candidates) try {
+		const projectRequire = createRequire(path.join(candidate, "package.json"));
+		return path.dirname(projectRequire.resolve("@mpxjs/webpack-plugin/package.json"));
+	} catch {}
+	return path.dirname(localRequire.resolve("@mpxjs/webpack-plugin/package.json"));
+}
 function isMpxWebpackPluginRequest(request) {
 	return request === "@mpxjs/webpack-plugin" || Boolean(request?.startsWith("@mpxjs/webpack-plugin/"));
 }
@@ -60,9 +73,9 @@ function ensureResolveLoaderAlias(compiler, mpxWebpackPluginDir) {
 }
 function ensureMpxTailwindcssAliases(compiler, pkgDir) {
 	const tailwindcssCssEntry = getTailwindcssCssEntry(pkgDir);
-	const mpxWebpackPluginDir = path.dirname(require.resolve("@mpxjs/webpack-plugin/package.json"));
 	compiler.options = compiler.options || {};
 	compiler.options.resolve = compiler.options.resolve || {};
+	const mpxWebpackPluginDir = resolveMpxWebpackPluginDir(compiler);
 	ensureResolveLoaderAlias(compiler, mpxWebpackPluginDir);
 	const alias = compiler.options.resolve.alias ?? {};
 	compiler.options.resolve.alias = alias;
@@ -425,7 +438,7 @@ function createLoaderAnchorFinders(appType) {
 //#endregion
 //#region src/bundlers/webpack/BaseUnifiedPlugin/v5-loaders.ts
 function setupWebpackV5Loaders(options) {
-	const { compiler, options: compilerOptions, appType, weappTailwindcssPackageDir, shouldRewriteCssImports, runtimeLoaderPath, getClassSetInLoader, getRuntimeWatchDependencies, debug } = options;
+	const { compiler, options: compilerOptions, appType, weappTailwindcssPackageDir, shouldRewriteCssImports, runtimeLoaderPath, registerAutoCssSource, getClassSetInLoader, getRuntimeWatchDependencies, debug } = options;
 	const isMpxApp = isMpx(appType);
 	if (shouldRewriteCssImports && isMpxApp) ensureMpxTailwindcssAliases(compiler, weappTailwindcssPackageDir);
 	const runtimeClassSetLoader = runtimeLoaderPath ?? path.resolve(__dirname, "./weapp-tw-runtime-classset-loader.js");
@@ -434,7 +447,8 @@ function setupWebpackV5Loaders(options) {
 	const runtimeCssImportRewriteLoaderExists = runtimeCssImportRewriteLoader ? fs.existsSync(runtimeCssImportRewriteLoader) : false;
 	const runtimeLoaderRewriteOptions = shouldRewriteCssImports ? {
 		pkgDir: weappTailwindcssPackageDir,
-		appType
+		appType,
+		registerCssSource: registerAutoCssSource
 	} : void 0;
 	const classSetLoaderOptions = {
 		getClassSet: getClassSetInLoader,
@@ -519,7 +533,12 @@ var UnifiedWebpackPluginV5 = class {
 	constructor(options = {}) {
 		_defineProperty(this, "options", void 0);
 		_defineProperty(this, "appType", void 0);
-		this.options = getCompilerContext(options);
+		_defineProperty(this, "hasInitialTailwindCssRoots", void 0);
+		this.hasInitialTailwindCssRoots = hasConfiguredTailwindV4CssRoots(options);
+		this.options = getCompilerContext({
+			...options,
+			__internalDeferMissingCssEntriesWarning: true
+		});
 		this.appType = this.options.appType;
 	}
 	apply(compiler) {
@@ -547,6 +566,10 @@ var UnifiedWebpackPluginV5 = class {
 			const tailwindOptions = resolveTailwindcssOptions(runtimeState.twPatcher.options);
 			if (tailwindOptions?.config) runtimeWatchDependencyFiles.add(tailwindOptions.config);
 			for (const entry of tailwindOptions?.v4?.cssEntries ?? []) runtimeWatchDependencyFiles.add(entry);
+			for (const source of tailwindOptions?.v4?.cssSources ?? []) {
+				if (source.file) runtimeWatchDependencyFiles.add(source.file);
+				for (const dependency of source.dependencies ?? []) runtimeWatchDependencyFiles.add(dependency);
+			}
 			for (const source of tailwindOptions?.v4?.sources ?? []) if (source?.base) runtimeWatchDependencyContexts.add(source.base);
 			if (typeof runtimeState.twPatcher.collectContentTokens !== "function") return;
 			try {
@@ -570,6 +593,18 @@ var UnifiedWebpackPluginV5 = class {
 			runtimeMetadataPrepared = false;
 			syncRuntimeRefreshRequirement();
 		};
+		const registerAutoCssSource = async (source) => {
+			if (this.hasInitialTailwindCssRoots || (runtimeState.twPatcher.majorVersion ?? 0) < 4 || !source.file) return;
+			if (!upsertTailwindV4CssSource(this.options, source)) return;
+			runtimeSetPrepared = false;
+			runtimeMetadataPrepared = false;
+			runtimeRefreshRequiredForCompilation = true;
+			await refreshTailwindRuntimeState(runtimeState, {
+				force: true,
+				clearCache: true
+			});
+			debug("detected tailwindcss v4 css source from webpack css module: %s", source.file);
+		};
 		compiler.hooks.invalid?.tap?.(pluginName, () => {
 			runtimeRefreshRequiredForCompilation = true;
 		});
@@ -600,6 +635,7 @@ var UnifiedWebpackPluginV5 = class {
 			weappTailwindcssPackageDir,
 			shouldRewriteCssImports,
 			runtimeLoaderPath,
+			registerAutoCssSource,
 			getClassSetInLoader,
 			getRuntimeWatchDependencies() {
 				return {

package/dist/webpack.js

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_webpack = require("./webpack-D-sUCY0u.js");
+const require_webpack = require("./webpack-BzN2ly34.js");
 exports.UnifiedWebpackPluginV5 = require_webpack.UnifiedWebpackPluginV5;
 exports.WeappTailwindcss = require_webpack.UnifiedWebpackPluginV5;
 exports.weappTailwindcss = require_webpack.UnifiedWebpackPluginV5;

package/dist/webpack.mjs

@@ -1,2 +1,2 @@
-import { n as weappTailwindcssPackageDir, t as UnifiedWebpackPluginV5 } from "./webpack-BNdGm9KL.mjs";
+import { n as weappTailwindcssPackageDir, t as UnifiedWebpackPluginV5 } from "./webpack-DJazm5sT.mjs";
 export { UnifiedWebpackPluginV5, UnifiedWebpackPluginV5 as WeappTailwindcss, UnifiedWebpackPluginV5 as weappTailwindcss, weappTailwindcssPackageDir };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "weapp-tailwindcss",
-  "version": "5.0.0-next.7",
+  "version": "5.0.0-next.9",
   "description": "把 tailwindcss 原子化样式思想，带给小程序开发者们! bring tailwindcss to miniprogram developers!",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -186,13 +186,13 @@
     "magic-string": "0.30.21",
     "postcss-load-config": "^6.0.1",
     "semver": "~7.8.0",
-    "tailwindcss-patch": "9.3.2",
+    "tailwindcss-patch": "9.3.3",
     "yaml": "^2.9.0",
-    "@weapp-tailwindcss/postcss": "2.2.1-next.0",
     "@weapp-tailwindcss/logger": "1.1.0",
     "@weapp-tailwindcss/reset": "0.1.1-next.0",
     "@weapp-tailwindcss/shared": "1.1.3",
-    "tailwindcss-config": "1.1.6-next.0"
+    "@weapp-tailwindcss/postcss": "2.2.1-next.1",
+    "tailwindcss-config": "1.1.6-next.1"
   },
   "scripts": {
     "dev": "tsdown --watch --sourcemap",