From 214cafb614dc318ec0794eaf7557824ee217bae5 Mon Sep 17 00:00:00 2001 From: ice breaker <1324318532@qq.com> Date: Tue, 13 Feb 2024 14:58:13 +0800 Subject: [PATCH 1/9] chore: gulp use cache --- src/bundlers/gulp/index.ts | 95 ++++++++++++++++++++++++++++++++------ 1 file changed, 82 insertions(+), 13 deletions(-) diff --git a/src/bundlers/gulp/index.ts b/src/bundlers/gulp/index.ts index 3b95138f9..c2b717e31 100644 --- a/src/bundlers/gulp/index.ts +++ b/src/bundlers/gulp/index.ts @@ -3,7 +3,9 @@ import type File from 'vinyl' import { getOptions } from '@/options' import { UserDefinedOptions } from '@/types' import { createTailwindcssPatcher } from '@/tailwindcss/patcher' +import { createDebug } from '@/debug' +const debug = createDebug('') const Transform = stream.Transform // export interface IBaseTransformOptions { @@ -16,7 +18,7 @@ const Transform = stream.Transform */ export function createPlugins(options: UserDefinedOptions = {}) { const opts = getOptions(options) - const { templateHandler, styleHandler, patch, jsHandler, setMangleRuntimeSet, tailwindcssBasedir } = opts + const { templateHandler, styleHandler, patch, jsHandler, setMangleRuntimeSet, tailwindcssBasedir, cache } = opts let runtimeSet = new Set() patch?.() @@ -34,10 +36,32 @@ export function createPlugins(options: UserDefinedOptions = {}) { const error = null if (file.contents) { - const code = await styleHandler(file.contents.toString(), { - isMainChunk: true - }) - file.contents = Buffer.from(code) + const rawSource = file.contents.toString() + const hash = cache.computeHash(rawSource) + cache.calcHashValueChanged(file.path, hash) + await cache.process( + file.path, + () => { + const source = cache.get(file.path) + if (source) { + file.contents = Buffer.from(source) + debug('css cache hit: %s', file.path) + } else { + return false + } + }, + async () => { + const code = await styleHandler(rawSource, { + isMainChunk: true + }) + file.contents = Buffer.from(code) + debug('css handle: %s', file.path) + return { + key: file.path, + source: code + } + } + ) } callback(error, file) @@ -49,11 +73,33 @@ export function createPlugins(options: UserDefinedOptions = {}) { function transformJs() { const transformStream = new Transform({ objectMode: true }) - transformStream._transform = function (file: File, encoding, callback) { + transformStream._transform = async function (file: File, encoding, callback) { const error = null if (file.contents) { - const { code } = jsHandler(file.contents.toString(), runtimeSet) - file.contents = Buffer.from(code) + const rawSource = file.contents.toString() + const hash = cache.computeHash(rawSource) + cache.calcHashValueChanged(file.path, hash) + await cache.process( + file.path, + () => { + const source = cache.get(file.path) + if (source) { + file.contents = Buffer.from(source) + debug('js cache hit: %s', file.path) + } else { + return false + } + }, + () => { + const { code } = jsHandler(rawSource, runtimeSet) + file.contents = Buffer.from(code) + debug('js handle: %s', file.path) + return { + key: file.path, + source: code + } + } + ) } callback(error, file) } @@ -64,14 +110,37 @@ export function createPlugins(options: UserDefinedOptions = {}) { function transformWxml() { const transformStream = new Transform({ objectMode: true }) - transformStream._transform = function (file: File, encoding, callback) { + transformStream._transform = async function (file: File, encoding, callback) { const error = null // file.path if (file.contents) { - const code = templateHandler(file.contents.toString(), { - runtimeSet - }) - file.contents = Buffer.from(code) + const rawSource = file.contents.toString() + const hash = cache.computeHash(rawSource) + cache.calcHashValueChanged(file.path, hash) + + await cache.process( + file.path, + () => { + const source = cache.get(file.path) + if (source) { + file.contents = Buffer.from(source) + debug('html handle: %s', file.path) + } else { + return false + } + }, + () => { + const code = templateHandler(rawSource, { + runtimeSet + }) + file.contents = Buffer.from(code) + debug('html handle: %s', file.path) + return { + key: file.path, + source: code + } + } + ) } callback(error, file) From e0fbd5e62205efc0bef522c7815636dea80fcaf9 Mon Sep 17 00:00:00 2001 From: ice breaker <1324318532@qq.com> Date: Tue, 13 Feb 2024 14:59:12 +0800 Subject: [PATCH 2/9] v3.0.11-beta.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f7e875e03..7b8c5fbaf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "weapp-tailwindcss-webpack-plugin", - "version": "3.0.10", + "version": "3.0.11-beta.0", "description": "把tailwindcss jit引擎，带给小程序开发者们! bring tailwindcss jit engine to miniprogram developers!", "main": "dist/index.js", "module": "dist/index.mjs", From cd5c850f6e06948b018991707156557dcdc16b1b Mon Sep 17 00:00:00 2001 From: ice breaker <1324318532@qq.com> Date: Tue, 13 Feb 2024 15:18:00 +0800 Subject: [PATCH 3/9] v3.0.11-beta.1 --- demo/gulp-app/package.json | 4 ++-- demo/gulp-app/yarn.lock | 8 ++++---- demo/mpx-app/package.json | 2 +- demo/mpx-app/yarn.lock | 8 ++++---- demo/native-mina/package.json | 2 +- demo/native-mina/yarn.lock | 8 ++++---- demo/rax-app/package.json | 2 +- demo/rax-app/yarn.lock | 8 ++++---- demo/taro-app/package.json | 2 +- demo/taro-app/yarn.lock | 8 ++++---- demo/taro-vue2-app/package.json | 2 +- demo/taro-vue2-app/yarn.lock | 8 ++++---- demo/taro-vue3-app/package.json | 2 +- demo/taro-vue3-app/yarn.lock | 8 ++++---- demo/uni-app-vue3-vite/package.json | 2 +- demo/uni-app-vue3-vite/yarn.lock | 8 ++++---- demo/uni-app-webpack5/package.json | 2 +- demo/uni-app-webpack5/yarn.lock | 8 ++++---- demo/uni-app/package.json | 2 +- demo/uni-app/yarn.lock | 8 ++++---- demo/web/package.json | 2 +- demo/web/yarn.lock | 8 ++++---- package.json | 2 +- src/bundlers/gulp/index.ts | 4 ++-- 24 files changed, 59 insertions(+), 59 deletions(-) diff --git a/demo/gulp-app/package.json b/demo/gulp-app/package.json index a446f49db..c62f4f681 100644 --- a/demo/gulp-app/package.json +++ b/demo/gulp-app/package.json @@ -4,7 +4,7 @@ "description": "A workflow for better weapp developing.", "main": "index.js", "scripts": { - "dev": "cross-env WATCH=1 gulp", + "dev": "cross-env WATCH=1 DEBUG=weapp-tw gulp", "dev:tt": "cross-env WATCH=1 PLATFORM=tt gulp", "dev:local": "cross-env WATCH=1 LOCAL=1 gulp", "build:local": "cross-env LOCAL=1 gulp", @@ -70,7 +70,7 @@ "typescript": "^5.3.3", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.10" + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.0" }, "dependencies": { "@vant/weapp": "^1.11.2" diff --git a/demo/gulp-app/yarn.lock b/demo/gulp-app/yarn.lock index 0d94701ac..dba504f92 100644 --- a/demo/gulp-app/yarn.lock +++ b/demo/gulp-app/yarn.lock @@ -6480,10 +6480,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.10: - version "3.0.10" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.10.tgz#439b1e1fb044e7202495d969290da31b0a20ca0c" - integrity sha512-E8tM7NNxwjMnZr6Se6L+QqVsr0SvWsOQmSTJPLrhgqCPmfjaX2YlH8uaHi5GXdBZwhlQ3XxYFRhWBq7lXy3Cxg== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.0: + version "3.0.11-beta.0" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.0.tgz#897a2b3c660ee2e7348c4bb822510d48b841a3f6" + integrity sha512-5L6mwHvRNrmTKZHhsJMr+jkcxQ363rbtdmaQ6c6gV3XPAwnvqIygbP4iPna2L3yca/VbrspnxJkxHD8PlWp33g== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/mpx-app/package.json b/demo/mpx-app/package.json index 8502f8f98..b5a0dac95 100644 --- a/demo/mpx-app/package.json +++ b/demo/mpx-app/package.json @@ -69,7 +69,7 @@ "vue-template-compiler": "^2.7.16", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.10", + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.0", "webpack": "^5.90.0" }, "browserslist": [ diff --git a/demo/mpx-app/yarn.lock b/demo/mpx-app/yarn.lock index 4044dc312..26306e10e 100644 --- a/demo/mpx-app/yarn.lock +++ b/demo/mpx-app/yarn.lock @@ -11861,10 +11861,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.10: - version "3.0.10" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.10.tgz#439b1e1fb044e7202495d969290da31b0a20ca0c" - integrity sha512-E8tM7NNxwjMnZr6Se6L+QqVsr0SvWsOQmSTJPLrhgqCPmfjaX2YlH8uaHi5GXdBZwhlQ3XxYFRhWBq7lXy3Cxg== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.0: + version "3.0.11-beta.0" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.0.tgz#897a2b3c660ee2e7348c4bb822510d48b841a3f6" + integrity sha512-5L6mwHvRNrmTKZHhsJMr+jkcxQ363rbtdmaQ6c6gV3XPAwnvqIygbP4iPna2L3yca/VbrspnxJkxHD8PlWp33g== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/native-mina/package.json b/demo/native-mina/package.json index 32a9cbf02..6f90fdede 100644 --- a/demo/native-mina/package.json +++ b/demo/native-mina/package.json @@ -67,7 +67,7 @@ "typescript": "^5.3.2", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.10", + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.0", "webpack": "^5.89.0", "webpack-cli": "^5.1.4", "webpack-sources": "^3.2.3" diff --git a/demo/native-mina/yarn.lock b/demo/native-mina/yarn.lock index 642a3445d..c8d80a221 100644 --- a/demo/native-mina/yarn.lock +++ b/demo/native-mina/yarn.lock @@ -6125,10 +6125,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.10: - version "3.0.10" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.10.tgz#439b1e1fb044e7202495d969290da31b0a20ca0c" - integrity sha512-E8tM7NNxwjMnZr6Se6L+QqVsr0SvWsOQmSTJPLrhgqCPmfjaX2YlH8uaHi5GXdBZwhlQ3XxYFRhWBq7lXy3Cxg== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.0: + version "3.0.11-beta.0" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.0.tgz#897a2b3c660ee2e7348c4bb822510d48b841a3f6" + integrity sha512-5L6mwHvRNrmTKZHhsJMr+jkcxQ363rbtdmaQ6c6gV3XPAwnvqIygbP4iPna2L3yca/VbrspnxJkxHD8PlWp33g== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/rax-app/package.json b/demo/rax-app/package.json index 0026ad9ac..fe59fa045 100644 --- a/demo/rax-app/package.json +++ b/demo/rax-app/package.json @@ -42,7 +42,7 @@ "tailwindcss-rem2px-preset": "^1.0.3", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.10" + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.0" }, "private": true, "originTemplate": "@rax-materials/scaffolds-app-ts" diff --git a/demo/rax-app/yarn.lock b/demo/rax-app/yarn.lock index 6bdfed6d7..3b04ec64a 100644 --- a/demo/rax-app/yarn.lock +++ b/demo/rax-app/yarn.lock @@ -11857,10 +11857,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.10: - version "3.0.10" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.10.tgz#439b1e1fb044e7202495d969290da31b0a20ca0c" - integrity sha512-E8tM7NNxwjMnZr6Se6L+QqVsr0SvWsOQmSTJPLrhgqCPmfjaX2YlH8uaHi5GXdBZwhlQ3XxYFRhWBq7lXy3Cxg== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.0: + version "3.0.11-beta.0" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.0.tgz#897a2b3c660ee2e7348c4bb822510d48b841a3f6" + integrity sha512-5L6mwHvRNrmTKZHhsJMr+jkcxQ363rbtdmaQ6c6gV3XPAwnvqIygbP4iPna2L3yca/VbrspnxJkxHD8PlWp33g== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/taro-app/package.json b/demo/taro-app/package.json index 6b4f9195e..f5624151e 100644 --- a/demo/taro-app/package.json +++ b/demo/taro-app/package.json @@ -85,7 +85,7 @@ "typescript": "~5.3.3", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.10", + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.0", "webpack": "^5.90.1", "webpack-chain": "^6.5.1" }, diff --git a/demo/taro-app/yarn.lock b/demo/taro-app/yarn.lock index f21084e11..02ffd396c 100644 --- a/demo/taro-app/yarn.lock +++ b/demo/taro-app/yarn.lock @@ -14866,10 +14866,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.10: - version "3.0.10" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.10.tgz#439b1e1fb044e7202495d969290da31b0a20ca0c" - integrity sha512-E8tM7NNxwjMnZr6Se6L+QqVsr0SvWsOQmSTJPLrhgqCPmfjaX2YlH8uaHi5GXdBZwhlQ3XxYFRhWBq7lXy3Cxg== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.0: + version "3.0.11-beta.0" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.0.tgz#897a2b3c660ee2e7348c4bb822510d48b841a3f6" + integrity sha512-5L6mwHvRNrmTKZHhsJMr+jkcxQ363rbtdmaQ6c6gV3XPAwnvqIygbP4iPna2L3yca/VbrspnxJkxHD8PlWp33g== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/taro-vue2-app/package.json b/demo/taro-vue2-app/package.json index 26360cd9e..4f533d434 100644 --- a/demo/taro-vue2-app/package.json +++ b/demo/taro-vue2-app/package.json @@ -90,7 +90,7 @@ "vue-loader": "^15.11.1", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.10", + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.0", "webpack": "^5.89.0" } } diff --git a/demo/taro-vue2-app/yarn.lock b/demo/taro-vue2-app/yarn.lock index 8a53906b3..8ba77be82 100644 --- a/demo/taro-vue2-app/yarn.lock +++ b/demo/taro-vue2-app/yarn.lock @@ -14515,10 +14515,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.10: - version "3.0.10" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.10.tgz#439b1e1fb044e7202495d969290da31b0a20ca0c" - integrity sha512-E8tM7NNxwjMnZr6Se6L+QqVsr0SvWsOQmSTJPLrhgqCPmfjaX2YlH8uaHi5GXdBZwhlQ3XxYFRhWBq7lXy3Cxg== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.0: + version "3.0.11-beta.0" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.0.tgz#897a2b3c660ee2e7348c4bb822510d48b841a3f6" + integrity sha512-5L6mwHvRNrmTKZHhsJMr+jkcxQ363rbtdmaQ6c6gV3XPAwnvqIygbP4iPna2L3yca/VbrspnxJkxHD8PlWp33g== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/taro-vue3-app/package.json b/demo/taro-vue3-app/package.json index dc94bf829..e5cab743b 100644 --- a/demo/taro-vue3-app/package.json +++ b/demo/taro-vue3-app/package.json @@ -83,7 +83,7 @@ "vue-loader": "^17.2.2", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.10", + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.0", "webpack": "^5.89.0" } } diff --git a/demo/taro-vue3-app/yarn.lock b/demo/taro-vue3-app/yarn.lock index 3cd022fbc..0350df3b1 100644 --- a/demo/taro-vue3-app/yarn.lock +++ b/demo/taro-vue3-app/yarn.lock @@ -13827,10 +13827,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.10: - version "3.0.10" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.10.tgz#439b1e1fb044e7202495d969290da31b0a20ca0c" - integrity sha512-E8tM7NNxwjMnZr6Se6L+QqVsr0SvWsOQmSTJPLrhgqCPmfjaX2YlH8uaHi5GXdBZwhlQ3XxYFRhWBq7lXy3Cxg== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.0: + version "3.0.11-beta.0" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.0.tgz#897a2b3c660ee2e7348c4bb822510d48b841a3f6" + integrity sha512-5L6mwHvRNrmTKZHhsJMr+jkcxQ363rbtdmaQ6c6gV3XPAwnvqIygbP4iPna2L3yca/VbrspnxJkxHD8PlWp33g== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/uni-app-vue3-vite/package.json b/demo/uni-app-vue3-vite/package.json index c27432b3a..3f83c3fd8 100644 --- a/demo/uni-app-vue3-vite/package.json +++ b/demo/uni-app-vue3-vite/package.json @@ -93,6 +93,6 @@ "vite": "4.0.3", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.10" + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.0" } } diff --git a/demo/uni-app-vue3-vite/yarn.lock b/demo/uni-app-vue3-vite/yarn.lock index 82ad1b03f..940295103 100644 --- a/demo/uni-app-vue3-vite/yarn.lock +++ b/demo/uni-app-vue3-vite/yarn.lock @@ -5136,10 +5136,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.10: - version "3.0.10" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.10.tgz#439b1e1fb044e7202495d969290da31b0a20ca0c" - integrity sha512-E8tM7NNxwjMnZr6Se6L+QqVsr0SvWsOQmSTJPLrhgqCPmfjaX2YlH8uaHi5GXdBZwhlQ3XxYFRhWBq7lXy3Cxg== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.0: + version "3.0.11-beta.0" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.0.tgz#897a2b3c660ee2e7348c4bb822510d48b841a3f6" + integrity sha512-5L6mwHvRNrmTKZHhsJMr+jkcxQ363rbtdmaQ6c6gV3XPAwnvqIygbP4iPna2L3yca/VbrspnxJkxHD8PlWp33g== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/uni-app-webpack5/package.json b/demo/uni-app-webpack5/package.json index c8c3673a1..271dd4af0 100644 --- a/demo/uni-app-webpack5/package.json +++ b/demo/uni-app-webpack5/package.json @@ -118,7 +118,7 @@ "vue-template-compiler": ">= 2.6.14 < 2.7", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.10" + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.0" }, "browserslist": [ "Android >= 4.4", diff --git a/demo/uni-app-webpack5/yarn.lock b/demo/uni-app-webpack5/yarn.lock index 9c104c38c..7674d04a0 100644 --- a/demo/uni-app-webpack5/yarn.lock +++ b/demo/uni-app-webpack5/yarn.lock @@ -11312,10 +11312,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.10: - version "3.0.10" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.10.tgz#439b1e1fb044e7202495d969290da31b0a20ca0c" - integrity sha512-E8tM7NNxwjMnZr6Se6L+QqVsr0SvWsOQmSTJPLrhgqCPmfjaX2YlH8uaHi5GXdBZwhlQ3XxYFRhWBq7lXy3Cxg== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.0: + version "3.0.11-beta.0" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.0.tgz#897a2b3c660ee2e7348c4bb822510d48b841a3f6" + integrity sha512-5L6mwHvRNrmTKZHhsJMr+jkcxQ363rbtdmaQ6c6gV3XPAwnvqIygbP4iPna2L3yca/VbrspnxJkxHD8PlWp33g== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/uni-app/package.json b/demo/uni-app/package.json index 80ffc7e6f..81d577120 100644 --- a/demo/uni-app/package.json +++ b/demo/uni-app/package.json @@ -120,7 +120,7 @@ "vue-template-compiler": "^2.6.11", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.10" + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.0" }, "browserslist": [ "Android >= 4.4", diff --git a/demo/uni-app/yarn.lock b/demo/uni-app/yarn.lock index 8c20dc843..a9a542a01 100644 --- a/demo/uni-app/yarn.lock +++ b/demo/uni-app/yarn.lock @@ -11505,10 +11505,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.10: - version "3.0.10" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.10.tgz#439b1e1fb044e7202495d969290da31b0a20ca0c" - integrity sha512-E8tM7NNxwjMnZr6Se6L+QqVsr0SvWsOQmSTJPLrhgqCPmfjaX2YlH8uaHi5GXdBZwhlQ3XxYFRhWBq7lXy3Cxg== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.0: + version "3.0.11-beta.0" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.0.tgz#897a2b3c660ee2e7348c4bb822510d48b841a3f6" + integrity sha512-5L6mwHvRNrmTKZHhsJMr+jkcxQ363rbtdmaQ6c6gV3XPAwnvqIygbP4iPna2L3yca/VbrspnxJkxHD8PlWp33g== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/web/package.json b/demo/web/package.json index 152b9086a..701072820 100644 --- a/demo/web/package.json +++ b/demo/web/package.json @@ -20,6 +20,6 @@ "tailwindcss-rem2px-preset": "^1.0.3", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.10" + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.0" } } diff --git a/demo/web/yarn.lock b/demo/web/yarn.lock index 205993e77..fb5cf7660 100644 --- a/demo/web/yarn.lock +++ b/demo/web/yarn.lock @@ -1309,10 +1309,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.10: - version "3.0.10" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.10.tgz#439b1e1fb044e7202495d969290da31b0a20ca0c" - integrity sha512-E8tM7NNxwjMnZr6Se6L+QqVsr0SvWsOQmSTJPLrhgqCPmfjaX2YlH8uaHi5GXdBZwhlQ3XxYFRhWBq7lXy3Cxg== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.0: + version "3.0.11-beta.0" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.0.tgz#897a2b3c660ee2e7348c4bb822510d48b841a3f6" + integrity sha512-5L6mwHvRNrmTKZHhsJMr+jkcxQ363rbtdmaQ6c6gV3XPAwnvqIygbP4iPna2L3yca/VbrspnxJkxHD8PlWp33g== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/package.json b/package.json index 7b8c5fbaf..52aef46ba 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "weapp-tailwindcss-webpack-plugin", - "version": "3.0.11-beta.0", + "version": "3.0.11-beta.1", "description": "把tailwindcss jit引擎，带给小程序开发者们! bring tailwindcss jit engine to miniprogram developers!", "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/src/bundlers/gulp/index.ts b/src/bundlers/gulp/index.ts index c2b717e31..cd9f041c3 100644 --- a/src/bundlers/gulp/index.ts +++ b/src/bundlers/gulp/index.ts @@ -5,7 +5,6 @@ import { UserDefinedOptions } from '@/types' import { createTailwindcssPatcher } from '@/tailwindcss/patcher' import { createDebug } from '@/debug' -const debug = createDebug('') const Transform = stream.Transform // export interface IBaseTransformOptions { @@ -18,6 +17,7 @@ const Transform = stream.Transform */ export function createPlugins(options: UserDefinedOptions = {}) { const opts = getOptions(options) + const debug = createDebug('') const { templateHandler, styleHandler, patch, jsHandler, setMangleRuntimeSet, tailwindcssBasedir, cache } = opts let runtimeSet = new Set() @@ -124,7 +124,7 @@ export function createPlugins(options: UserDefinedOptions = {}) { const source = cache.get(file.path) if (source) { file.contents = Buffer.from(source) - debug('html handle: %s', file.path) + debug('html cache hit: %s', file.path) } else { return false } From 87d79d667508054b0869705d0ae063275bca16f7 Mon Sep 17 00:00:00 2001 From: ice breaker <1324318532@qq.com> Date: Tue, 13 Feb 2024 19:26:55 +0800 Subject: [PATCH 4/9] v3.0.11-beta.2 --- demo/gulp-app/package.json | 2 +- demo/gulp-app/yarn.lock | 8 +- demo/mpx-app/package.json | 4 +- demo/mpx-app/yarn.lock | 8 +- demo/native-mina/package.json | 2 +- demo/native-mina/yarn.lock | 8 +- demo/rax-app/package.json | 2 +- demo/rax-app/yarn.lock | 8 +- demo/taro-app/package.json | 2 +- demo/taro-app/yarn.lock | 8 +- demo/taro-vue2-app/package.json | 2 +- demo/taro-vue2-app/yarn.lock | 8 +- demo/taro-vue3-app/package.json | 2 +- demo/taro-vue3-app/yarn.lock | 8 +- demo/uni-app-vue3-vite/package.json | 2 +- demo/uni-app-vue3-vite/yarn.lock | 8 +- demo/uni-app-webpack5/package.json | 2 +- demo/uni-app-webpack5/yarn.lock | 8 +- demo/uni-app/package.json | 2 +- demo/uni-app/yarn.lock | 8 +- demo/web/package.json | 2 +- demo/web/yarn.lock | 8 +- package.json | 2 +- src/bundlers/gulp/index.ts | 231 ++++++++++--------- src/bundlers/vite/index.ts | 2 +- src/bundlers/webpack/BaseUnifiedPlugin/v4.ts | 2 +- src/bundlers/webpack/BaseUnifiedPlugin/v5.ts | 2 +- src/debug/index.ts | 4 +- 28 files changed, 184 insertions(+), 171 deletions(-) diff --git a/demo/gulp-app/package.json b/demo/gulp-app/package.json index c62f4f681..76d8e6421 100644 --- a/demo/gulp-app/package.json +++ b/demo/gulp-app/package.json @@ -70,7 +70,7 @@ "typescript": "^5.3.3", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.0" + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.1" }, "dependencies": { "@vant/weapp": "^1.11.2" diff --git a/demo/gulp-app/yarn.lock b/demo/gulp-app/yarn.lock index dba504f92..6a1895db9 100644 --- a/demo/gulp-app/yarn.lock +++ b/demo/gulp-app/yarn.lock @@ -6480,10 +6480,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.0: - version "3.0.11-beta.0" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.0.tgz#897a2b3c660ee2e7348c4bb822510d48b841a3f6" - integrity sha512-5L6mwHvRNrmTKZHhsJMr+jkcxQ363rbtdmaQ6c6gV3XPAwnvqIygbP4iPna2L3yca/VbrspnxJkxHD8PlWp33g== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.1: + version "3.0.11-beta.1" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.1.tgz#18399e841edc741db5f105fb33cdefb14a20ef11" + integrity sha512-/XBhlRzjPAPL13iko0U9YM8qDFUGXH+6H+LBmei3rRS/5ajopUIOk3fqrjBGi+n//UX6HIpdtfu1Yj2/TfLSMw== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/mpx-app/package.json b/demo/mpx-app/package.json index b5a0dac95..fc13f3263 100644 --- a/demo/mpx-app/package.json +++ b/demo/mpx-app/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "private": true, "scripts": { - "dev": "mpx-cli-service serve", + "dev": "cross-env DEBUG=weapp-tw mpx-cli-service serve", "serve": "mpx-cli-service serve", "build": "mpx-cli-service build", "test:e2e": "npx e2e-runner j---config=./jest-e2e.config.js", @@ -69,7 +69,7 @@ "vue-template-compiler": "^2.7.16", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.0", + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.1", "webpack": "^5.90.0" }, "browserslist": [ diff --git a/demo/mpx-app/yarn.lock b/demo/mpx-app/yarn.lock index 26306e10e..6c3d5d71e 100644 --- a/demo/mpx-app/yarn.lock +++ b/demo/mpx-app/yarn.lock @@ -11861,10 +11861,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.0: - version "3.0.11-beta.0" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.0.tgz#897a2b3c660ee2e7348c4bb822510d48b841a3f6" - integrity sha512-5L6mwHvRNrmTKZHhsJMr+jkcxQ363rbtdmaQ6c6gV3XPAwnvqIygbP4iPna2L3yca/VbrspnxJkxHD8PlWp33g== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.1: + version "3.0.11-beta.1" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.1.tgz#18399e841edc741db5f105fb33cdefb14a20ef11" + integrity sha512-/XBhlRzjPAPL13iko0U9YM8qDFUGXH+6H+LBmei3rRS/5ajopUIOk3fqrjBGi+n//UX6HIpdtfu1Yj2/TfLSMw== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/native-mina/package.json b/demo/native-mina/package.json index 6f90fdede..cf50642b1 100644 --- a/demo/native-mina/package.json +++ b/demo/native-mina/package.json @@ -67,7 +67,7 @@ "typescript": "^5.3.2", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.0", + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.1", "webpack": "^5.89.0", "webpack-cli": "^5.1.4", "webpack-sources": "^3.2.3" diff --git a/demo/native-mina/yarn.lock b/demo/native-mina/yarn.lock index c8d80a221..877384c72 100644 --- a/demo/native-mina/yarn.lock +++ b/demo/native-mina/yarn.lock @@ -6125,10 +6125,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.0: - version "3.0.11-beta.0" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.0.tgz#897a2b3c660ee2e7348c4bb822510d48b841a3f6" - integrity sha512-5L6mwHvRNrmTKZHhsJMr+jkcxQ363rbtdmaQ6c6gV3XPAwnvqIygbP4iPna2L3yca/VbrspnxJkxHD8PlWp33g== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.1: + version "3.0.11-beta.1" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.1.tgz#18399e841edc741db5f105fb33cdefb14a20ef11" + integrity sha512-/XBhlRzjPAPL13iko0U9YM8qDFUGXH+6H+LBmei3rRS/5ajopUIOk3fqrjBGi+n//UX6HIpdtfu1Yj2/TfLSMw== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/rax-app/package.json b/demo/rax-app/package.json index fe59fa045..ceeda6226 100644 --- a/demo/rax-app/package.json +++ b/demo/rax-app/package.json @@ -42,7 +42,7 @@ "tailwindcss-rem2px-preset": "^1.0.3", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.0" + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.1" }, "private": true, "originTemplate": "@rax-materials/scaffolds-app-ts" diff --git a/demo/rax-app/yarn.lock b/demo/rax-app/yarn.lock index 3b04ec64a..12114d179 100644 --- a/demo/rax-app/yarn.lock +++ b/demo/rax-app/yarn.lock @@ -11857,10 +11857,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.0: - version "3.0.11-beta.0" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.0.tgz#897a2b3c660ee2e7348c4bb822510d48b841a3f6" - integrity sha512-5L6mwHvRNrmTKZHhsJMr+jkcxQ363rbtdmaQ6c6gV3XPAwnvqIygbP4iPna2L3yca/VbrspnxJkxHD8PlWp33g== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.1: + version "3.0.11-beta.1" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.1.tgz#18399e841edc741db5f105fb33cdefb14a20ef11" + integrity sha512-/XBhlRzjPAPL13iko0U9YM8qDFUGXH+6H+LBmei3rRS/5ajopUIOk3fqrjBGi+n//UX6HIpdtfu1Yj2/TfLSMw== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/taro-app/package.json b/demo/taro-app/package.json index f5624151e..2f1f4c263 100644 --- a/demo/taro-app/package.json +++ b/demo/taro-app/package.json @@ -85,7 +85,7 @@ "typescript": "~5.3.3", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.0", + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.1", "webpack": "^5.90.1", "webpack-chain": "^6.5.1" }, diff --git a/demo/taro-app/yarn.lock b/demo/taro-app/yarn.lock index 02ffd396c..cda0caa39 100644 --- a/demo/taro-app/yarn.lock +++ b/demo/taro-app/yarn.lock @@ -14866,10 +14866,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.0: - version "3.0.11-beta.0" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.0.tgz#897a2b3c660ee2e7348c4bb822510d48b841a3f6" - integrity sha512-5L6mwHvRNrmTKZHhsJMr+jkcxQ363rbtdmaQ6c6gV3XPAwnvqIygbP4iPna2L3yca/VbrspnxJkxHD8PlWp33g== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.1: + version "3.0.11-beta.1" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.1.tgz#18399e841edc741db5f105fb33cdefb14a20ef11" + integrity sha512-/XBhlRzjPAPL13iko0U9YM8qDFUGXH+6H+LBmei3rRS/5ajopUIOk3fqrjBGi+n//UX6HIpdtfu1Yj2/TfLSMw== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/taro-vue2-app/package.json b/demo/taro-vue2-app/package.json index 4f533d434..6162af92e 100644 --- a/demo/taro-vue2-app/package.json +++ b/demo/taro-vue2-app/package.json @@ -90,7 +90,7 @@ "vue-loader": "^15.11.1", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.0", + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.1", "webpack": "^5.89.0" } } diff --git a/demo/taro-vue2-app/yarn.lock b/demo/taro-vue2-app/yarn.lock index 8ba77be82..104eb15d0 100644 --- a/demo/taro-vue2-app/yarn.lock +++ b/demo/taro-vue2-app/yarn.lock @@ -14515,10 +14515,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.0: - version "3.0.11-beta.0" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.0.tgz#897a2b3c660ee2e7348c4bb822510d48b841a3f6" - integrity sha512-5L6mwHvRNrmTKZHhsJMr+jkcxQ363rbtdmaQ6c6gV3XPAwnvqIygbP4iPna2L3yca/VbrspnxJkxHD8PlWp33g== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.1: + version "3.0.11-beta.1" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.1.tgz#18399e841edc741db5f105fb33cdefb14a20ef11" + integrity sha512-/XBhlRzjPAPL13iko0U9YM8qDFUGXH+6H+LBmei3rRS/5ajopUIOk3fqrjBGi+n//UX6HIpdtfu1Yj2/TfLSMw== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/taro-vue3-app/package.json b/demo/taro-vue3-app/package.json index e5cab743b..f0c49ffd7 100644 --- a/demo/taro-vue3-app/package.json +++ b/demo/taro-vue3-app/package.json @@ -83,7 +83,7 @@ "vue-loader": "^17.2.2", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.0", + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.1", "webpack": "^5.89.0" } } diff --git a/demo/taro-vue3-app/yarn.lock b/demo/taro-vue3-app/yarn.lock index 0350df3b1..1715d6981 100644 --- a/demo/taro-vue3-app/yarn.lock +++ b/demo/taro-vue3-app/yarn.lock @@ -13827,10 +13827,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.0: - version "3.0.11-beta.0" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.0.tgz#897a2b3c660ee2e7348c4bb822510d48b841a3f6" - integrity sha512-5L6mwHvRNrmTKZHhsJMr+jkcxQ363rbtdmaQ6c6gV3XPAwnvqIygbP4iPna2L3yca/VbrspnxJkxHD8PlWp33g== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.1: + version "3.0.11-beta.1" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.1.tgz#18399e841edc741db5f105fb33cdefb14a20ef11" + integrity sha512-/XBhlRzjPAPL13iko0U9YM8qDFUGXH+6H+LBmei3rRS/5ajopUIOk3fqrjBGi+n//UX6HIpdtfu1Yj2/TfLSMw== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/uni-app-vue3-vite/package.json b/demo/uni-app-vue3-vite/package.json index 3f83c3fd8..74fc3698d 100644 --- a/demo/uni-app-vue3-vite/package.json +++ b/demo/uni-app-vue3-vite/package.json @@ -93,6 +93,6 @@ "vite": "4.0.3", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.0" + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.1" } } diff --git a/demo/uni-app-vue3-vite/yarn.lock b/demo/uni-app-vue3-vite/yarn.lock index 940295103..e51682687 100644 --- a/demo/uni-app-vue3-vite/yarn.lock +++ b/demo/uni-app-vue3-vite/yarn.lock @@ -5136,10 +5136,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.0: - version "3.0.11-beta.0" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.0.tgz#897a2b3c660ee2e7348c4bb822510d48b841a3f6" - integrity sha512-5L6mwHvRNrmTKZHhsJMr+jkcxQ363rbtdmaQ6c6gV3XPAwnvqIygbP4iPna2L3yca/VbrspnxJkxHD8PlWp33g== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.1: + version "3.0.11-beta.1" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.1.tgz#18399e841edc741db5f105fb33cdefb14a20ef11" + integrity sha512-/XBhlRzjPAPL13iko0U9YM8qDFUGXH+6H+LBmei3rRS/5ajopUIOk3fqrjBGi+n//UX6HIpdtfu1Yj2/TfLSMw== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/uni-app-webpack5/package.json b/demo/uni-app-webpack5/package.json index 271dd4af0..869357e81 100644 --- a/demo/uni-app-webpack5/package.json +++ b/demo/uni-app-webpack5/package.json @@ -118,7 +118,7 @@ "vue-template-compiler": ">= 2.6.14 < 2.7", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.0" + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.1" }, "browserslist": [ "Android >= 4.4", diff --git a/demo/uni-app-webpack5/yarn.lock b/demo/uni-app-webpack5/yarn.lock index 7674d04a0..cf073d7f1 100644 --- a/demo/uni-app-webpack5/yarn.lock +++ b/demo/uni-app-webpack5/yarn.lock @@ -11312,10 +11312,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.0: - version "3.0.11-beta.0" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.0.tgz#897a2b3c660ee2e7348c4bb822510d48b841a3f6" - integrity sha512-5L6mwHvRNrmTKZHhsJMr+jkcxQ363rbtdmaQ6c6gV3XPAwnvqIygbP4iPna2L3yca/VbrspnxJkxHD8PlWp33g== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.1: + version "3.0.11-beta.1" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.1.tgz#18399e841edc741db5f105fb33cdefb14a20ef11" + integrity sha512-/XBhlRzjPAPL13iko0U9YM8qDFUGXH+6H+LBmei3rRS/5ajopUIOk3fqrjBGi+n//UX6HIpdtfu1Yj2/TfLSMw== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/uni-app/package.json b/demo/uni-app/package.json index 81d577120..c8686c858 100644 --- a/demo/uni-app/package.json +++ b/demo/uni-app/package.json @@ -120,7 +120,7 @@ "vue-template-compiler": "^2.6.11", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.0" + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.1" }, "browserslist": [ "Android >= 4.4", diff --git a/demo/uni-app/yarn.lock b/demo/uni-app/yarn.lock index a9a542a01..f2ceca2cf 100644 --- a/demo/uni-app/yarn.lock +++ b/demo/uni-app/yarn.lock @@ -11505,10 +11505,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.0: - version "3.0.11-beta.0" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.0.tgz#897a2b3c660ee2e7348c4bb822510d48b841a3f6" - integrity sha512-5L6mwHvRNrmTKZHhsJMr+jkcxQ363rbtdmaQ6c6gV3XPAwnvqIygbP4iPna2L3yca/VbrspnxJkxHD8PlWp33g== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.1: + version "3.0.11-beta.1" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.1.tgz#18399e841edc741db5f105fb33cdefb14a20ef11" + integrity sha512-/XBhlRzjPAPL13iko0U9YM8qDFUGXH+6H+LBmei3rRS/5ajopUIOk3fqrjBGi+n//UX6HIpdtfu1Yj2/TfLSMw== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/web/package.json b/demo/web/package.json index 701072820..528f9e83d 100644 --- a/demo/web/package.json +++ b/demo/web/package.json @@ -20,6 +20,6 @@ "tailwindcss-rem2px-preset": "^1.0.3", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.0" + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.1" } } diff --git a/demo/web/yarn.lock b/demo/web/yarn.lock index fb5cf7660..cb28528d5 100644 --- a/demo/web/yarn.lock +++ b/demo/web/yarn.lock @@ -1309,10 +1309,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.0: - version "3.0.11-beta.0" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.0.tgz#897a2b3c660ee2e7348c4bb822510d48b841a3f6" - integrity sha512-5L6mwHvRNrmTKZHhsJMr+jkcxQ363rbtdmaQ6c6gV3XPAwnvqIygbP4iPna2L3yca/VbrspnxJkxHD8PlWp33g== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.1: + version "3.0.11-beta.1" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.1.tgz#18399e841edc741db5f105fb33cdefb14a20ef11" + integrity sha512-/XBhlRzjPAPL13iko0U9YM8qDFUGXH+6H+LBmei3rRS/5ajopUIOk3fqrjBGi+n//UX6HIpdtfu1Yj2/TfLSMw== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/package.json b/package.json index 52aef46ba..31d8b352b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "weapp-tailwindcss-webpack-plugin", - "version": "3.0.11-beta.1", + "version": "3.0.11-beta.2", "description": "把tailwindcss jit引擎，带给小程序开发者们! bring tailwindcss jit engine to miniprogram developers!", "main": "dist/index.js", "module": "dist/index.mjs", diff --git a/src/bundlers/gulp/index.ts b/src/bundlers/gulp/index.ts index cd9f041c3..fcce9417c 100644 --- a/src/bundlers/gulp/index.ts +++ b/src/bundlers/gulp/index.ts @@ -5,6 +5,8 @@ import { UserDefinedOptions } from '@/types' import { createTailwindcssPatcher } from '@/tailwindcss/patcher' import { createDebug } from '@/debug' +const debug = createDebug() + const Transform = stream.Transform // export interface IBaseTransformOptions { @@ -17,7 +19,7 @@ const Transform = stream.Transform */ export function createPlugins(options: UserDefinedOptions = {}) { const opts = getOptions(options) - const debug = createDebug('') + const { templateHandler, styleHandler, patch, jsHandler, setMangleRuntimeSet, tailwindcssBasedir, cache } = opts let runtimeSet = new Set() @@ -26,127 +28,136 @@ export function createPlugins(options: UserDefinedOptions = {}) { const twPatcher = createTailwindcssPatcher() function transformWxss() { - const transformStream = new Transform({ objectMode: true }) - - transformStream._transform = async function (file: File, encoding, callback) { - runtimeSet = twPatcher.getClassSet({ - basedir: tailwindcssBasedir - }) - setMangleRuntimeSet(runtimeSet) - const error = null - - if (file.contents) { - const rawSource = file.contents.toString() - const hash = cache.computeHash(rawSource) - cache.calcHashValueChanged(file.path, hash) - await cache.process( - file.path, - () => { - const source = cache.get(file.path) - if (source) { - file.contents = Buffer.from(source) - debug('css cache hit: %s', file.path) - } else { - return false - } - }, - async () => { - const code = await styleHandler(rawSource, { - isMainChunk: true - }) - file.contents = Buffer.from(code) - debug('css handle: %s', file.path) - return { - key: file.path, - source: code + return new Transform({ + objectMode: true, + transform: async function (file: File, encoding, callback) { + runtimeSet = twPatcher.getClassSet({ + basedir: tailwindcssBasedir + }) + setMangleRuntimeSet(runtimeSet) + const error = null + + if (file.contents) { + const rawSource = file.contents.toString() + const hash = cache.computeHash(rawSource) + cache.calcHashValueChanged(file.path, hash) + await cache.process( + file.path, + () => { + const source = cache.get(file.path) + if (source) { + file.contents = Buffer.from(source) + debug('css cache hit: %s', file.path) + } else { + return false + } + }, + async () => { + const code = await styleHandler(rawSource, { + isMainChunk: true + }) + file.contents = Buffer.from(code) + debug('css handle: %s', file.path) + return { + key: file.path, + source: code + } } - } - ) - } - - callback(error, file) - } + ) + } - return transformStream + callback(error, file) + } + // construct(callback) { + // debug('transformWxss start') + // callback() + // } + }) } function transformJs() { - const transformStream = new Transform({ objectMode: true }) - - transformStream._transform = async function (file: File, encoding, callback) { - const error = null - if (file.contents) { - const rawSource = file.contents.toString() - const hash = cache.computeHash(rawSource) - cache.calcHashValueChanged(file.path, hash) - await cache.process( - file.path, - () => { - const source = cache.get(file.path) - if (source) { - file.contents = Buffer.from(source) - debug('js cache hit: %s', file.path) - } else { - return false + return new Transform({ + objectMode: true, + transform: async function (file: File, encoding, callback) { + const error = null + if (file.contents) { + const rawSource = file.contents.toString() + const hash = cache.computeHash(rawSource) + cache.calcHashValueChanged(file.path, hash) + await cache.process( + file.path, + () => { + const source = cache.get(file.path) + if (source) { + file.contents = Buffer.from(source) + debug('js cache hit: %s', file.path) + } else { + return false + } + }, + () => { + const { code } = jsHandler(rawSource, runtimeSet) + file.contents = Buffer.from(code) + debug('js handle: %s', file.path) + return { + key: file.path, + source: code + } } - }, - () => { - const { code } = jsHandler(rawSource, runtimeSet) - file.contents = Buffer.from(code) - debug('js handle: %s', file.path) - return { - key: file.path, - source: code - } - } - ) + ) + } + callback(error, file) } - callback(error, file) - } - - return transformStream + // construct(callback) { + // debug('transformJs start') + // callback() + // } + }) } function transformWxml() { - const transformStream = new Transform({ objectMode: true }) - - transformStream._transform = async function (file: File, encoding, callback) { - const error = null - // file.path - if (file.contents) { - const rawSource = file.contents.toString() - const hash = cache.computeHash(rawSource) - cache.calcHashValueChanged(file.path, hash) - - await cache.process( - file.path, - () => { - const source = cache.get(file.path) - if (source) { - file.contents = Buffer.from(source) - debug('html cache hit: %s', file.path) - } else { - return false + return new Transform({ + objectMode: true, + transform: async function (file: File, encoding, callback) { + const error = null + // file.path + if (file.contents) { + const rawSource = file.contents.toString() + const hash = cache.computeHash(rawSource) + cache.calcHashValueChanged(file.path, hash) + + await cache.process( + file.path, + () => { + const source = cache.get(file.path) + if (source) { + file.contents = Buffer.from(source) + debug('html cache hit: %s', file.path) + } else { + return false + } + }, + () => { + const code = templateHandler(rawSource, { + runtimeSet + }) + file.contents = Buffer.from(code) + debug('html handle: %s', file.path) + return { + key: file.path, + source: code + } } - }, - () => { - const code = templateHandler(rawSource, { - runtimeSet - }) - file.contents = Buffer.from(code) - debug('html handle: %s', file.path) - return { - key: file.path, - source: code - } - } - ) - } + ) + } - callback(error, file) - } - - return transformStream + callback(error, file) + } + // construct(callback) { + // debug('transformWxml start') + // callback() + // } + }) } return { diff --git a/src/bundlers/vite/index.ts b/src/bundlers/vite/index.ts index 8d344e875..a4702bd87 100644 --- a/src/bundlers/vite/index.ts +++ b/src/bundlers/vite/index.ts @@ -7,7 +7,7 @@ import { getGroupedEntries } from '@/utils' import { createTailwindcssPatcher } from '@/tailwindcss/patcher' import { createDebug } from '@/debug' -const debug = createDebug('generateBundle: ') +const debug = createDebug() /** * @name UnifiedViteWeappTailwindcssPlugin diff --git a/src/bundlers/webpack/BaseUnifiedPlugin/v4.ts b/src/bundlers/webpack/BaseUnifiedPlugin/v4.ts index e4b73b837..488349cc2 100644 --- a/src/bundlers/webpack/BaseUnifiedPlugin/v4.ts +++ b/src/bundlers/webpack/BaseUnifiedPlugin/v4.ts @@ -11,7 +11,7 @@ import { createTailwindcssPatcher } from '@/tailwindcss/patcher' import { getGroupedEntries, removeExt } from '@/utils' import { createDebug } from '@/debug' -const debug = createDebug('processAssets: ') +const debug = createDebug() /** * @name UnifiedWebpackPluginV4 diff --git a/src/bundlers/webpack/BaseUnifiedPlugin/v5.ts b/src/bundlers/webpack/BaseUnifiedPlugin/v5.ts index 5f6cb8ddb..b4ad2c5e3 100644 --- a/src/bundlers/webpack/BaseUnifiedPlugin/v5.ts +++ b/src/bundlers/webpack/BaseUnifiedPlugin/v5.ts @@ -9,7 +9,7 @@ import { createTailwindcssPatcher } from '@/tailwindcss/patcher' import { getGroupedEntries, removeExt } from '@/utils' import { createDebug } from '@/debug' -const debug = createDebug('processAssets: ') +const debug = createDebug() /** * @name UnifiedWebpackPluginV5 diff --git a/src/debug/index.ts b/src/debug/index.ts index 3ada1484b..9702ea2b1 100644 --- a/src/debug/index.ts +++ b/src/debug/index.ts @@ -3,9 +3,11 @@ import _createDebug from 'debug' const _debug = _createDebug('weapp-tw') function createDebug(prefix?: string) { - return function debug(formatter: any, ...args: any[]) { + function debug(formatter: any, ...args: any[]) { return _debug((prefix ?? '') + formatter, ...args) } + + return debug } export { createDebug } From 9c559c7e05ea1404eaba8a8864bbac228f9367ec Mon Sep 17 00:00:00 2001 From: ice breaker <1324318532@qq.com> Date: Tue, 13 Feb 2024 19:43:59 +0800 Subject: [PATCH 5/9] chore(demo): upgrade deps --- demo/gulp-app/package.json | 2 +- demo/gulp-app/yarn.lock | 8 ++++---- demo/mpx-app/package.json | 2 +- demo/mpx-app/yarn.lock | 8 ++++---- demo/native-mina/package.json | 2 +- demo/native-mina/yarn.lock | 8 ++++---- demo/rax-app/package.json | 2 +- demo/rax-app/yarn.lock | 8 ++++---- demo/taro-app/package.json | 2 +- demo/taro-app/yarn.lock | 8 ++++---- demo/taro-vue2-app/package.json | 2 +- demo/taro-vue2-app/yarn.lock | 8 ++++---- demo/taro-vue3-app/package.json | 2 +- demo/taro-vue3-app/yarn.lock | 8 ++++---- demo/uni-app-vue3-vite/package.json | 2 +- demo/uni-app-vue3-vite/yarn.lock | 8 ++++---- demo/uni-app-webpack5/package.json | 2 +- demo/uni-app-webpack5/yarn.lock | 8 ++++---- demo/uni-app/package.json | 2 +- demo/uni-app/yarn.lock | 8 ++++---- demo/web/package.json | 2 +- demo/web/yarn.lock | 8 ++++---- 22 files changed, 55 insertions(+), 55 deletions(-) diff --git a/demo/gulp-app/package.json b/demo/gulp-app/package.json index 76d8e6421..79f2796db 100644 --- a/demo/gulp-app/package.json +++ b/demo/gulp-app/package.json @@ -70,7 +70,7 @@ "typescript": "^5.3.3", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.1" + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.2" }, "dependencies": { "@vant/weapp": "^1.11.2" diff --git a/demo/gulp-app/yarn.lock b/demo/gulp-app/yarn.lock index 6a1895db9..d1e75499c 100644 --- a/demo/gulp-app/yarn.lock +++ b/demo/gulp-app/yarn.lock @@ -6480,10 +6480,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.1: - version "3.0.11-beta.1" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.1.tgz#18399e841edc741db5f105fb33cdefb14a20ef11" - integrity sha512-/XBhlRzjPAPL13iko0U9YM8qDFUGXH+6H+LBmei3rRS/5ajopUIOk3fqrjBGi+n//UX6HIpdtfu1Yj2/TfLSMw== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.2: + version "3.0.11-beta.2" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.2.tgz#76919d8eb74a8eecbf9a67ad0acced13316efa77" + integrity sha512-cOiTllUqoh1YdnhJ6F0birSr3ineanNDTUZ+nRwLrkI2ZiyPjxBppaYE49mbXbfoop4cSZjTsH4oLZHrkjX9/Q== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/mpx-app/package.json b/demo/mpx-app/package.json index fc13f3263..a732a75b3 100644 --- a/demo/mpx-app/package.json +++ b/demo/mpx-app/package.json @@ -69,7 +69,7 @@ "vue-template-compiler": "^2.7.16", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.1", + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.2", "webpack": "^5.90.0" }, "browserslist": [ diff --git a/demo/mpx-app/yarn.lock b/demo/mpx-app/yarn.lock index 6c3d5d71e..2abfc5aea 100644 --- a/demo/mpx-app/yarn.lock +++ b/demo/mpx-app/yarn.lock @@ -11861,10 +11861,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.1: - version "3.0.11-beta.1" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.1.tgz#18399e841edc741db5f105fb33cdefb14a20ef11" - integrity sha512-/XBhlRzjPAPL13iko0U9YM8qDFUGXH+6H+LBmei3rRS/5ajopUIOk3fqrjBGi+n//UX6HIpdtfu1Yj2/TfLSMw== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.2: + version "3.0.11-beta.2" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.2.tgz#76919d8eb74a8eecbf9a67ad0acced13316efa77" + integrity sha512-cOiTllUqoh1YdnhJ6F0birSr3ineanNDTUZ+nRwLrkI2ZiyPjxBppaYE49mbXbfoop4cSZjTsH4oLZHrkjX9/Q== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/native-mina/package.json b/demo/native-mina/package.json index cf50642b1..79bad0c36 100644 --- a/demo/native-mina/package.json +++ b/demo/native-mina/package.json @@ -67,7 +67,7 @@ "typescript": "^5.3.2", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.1", + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.2", "webpack": "^5.89.0", "webpack-cli": "^5.1.4", "webpack-sources": "^3.2.3" diff --git a/demo/native-mina/yarn.lock b/demo/native-mina/yarn.lock index 877384c72..f5755d36d 100644 --- a/demo/native-mina/yarn.lock +++ b/demo/native-mina/yarn.lock @@ -6125,10 +6125,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.1: - version "3.0.11-beta.1" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.1.tgz#18399e841edc741db5f105fb33cdefb14a20ef11" - integrity sha512-/XBhlRzjPAPL13iko0U9YM8qDFUGXH+6H+LBmei3rRS/5ajopUIOk3fqrjBGi+n//UX6HIpdtfu1Yj2/TfLSMw== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.2: + version "3.0.11-beta.2" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.2.tgz#76919d8eb74a8eecbf9a67ad0acced13316efa77" + integrity sha512-cOiTllUqoh1YdnhJ6F0birSr3ineanNDTUZ+nRwLrkI2ZiyPjxBppaYE49mbXbfoop4cSZjTsH4oLZHrkjX9/Q== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/rax-app/package.json b/demo/rax-app/package.json index ceeda6226..2162cb4e1 100644 --- a/demo/rax-app/package.json +++ b/demo/rax-app/package.json @@ -42,7 +42,7 @@ "tailwindcss-rem2px-preset": "^1.0.3", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.1" + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.2" }, "private": true, "originTemplate": "@rax-materials/scaffolds-app-ts" diff --git a/demo/rax-app/yarn.lock b/demo/rax-app/yarn.lock index 12114d179..9bb3ac97d 100644 --- a/demo/rax-app/yarn.lock +++ b/demo/rax-app/yarn.lock @@ -11857,10 +11857,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.1: - version "3.0.11-beta.1" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.1.tgz#18399e841edc741db5f105fb33cdefb14a20ef11" - integrity sha512-/XBhlRzjPAPL13iko0U9YM8qDFUGXH+6H+LBmei3rRS/5ajopUIOk3fqrjBGi+n//UX6HIpdtfu1Yj2/TfLSMw== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.2: + version "3.0.11-beta.2" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.2.tgz#76919d8eb74a8eecbf9a67ad0acced13316efa77" + integrity sha512-cOiTllUqoh1YdnhJ6F0birSr3ineanNDTUZ+nRwLrkI2ZiyPjxBppaYE49mbXbfoop4cSZjTsH4oLZHrkjX9/Q== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/taro-app/package.json b/demo/taro-app/package.json index 2f1f4c263..8c8d10647 100644 --- a/demo/taro-app/package.json +++ b/demo/taro-app/package.json @@ -85,7 +85,7 @@ "typescript": "~5.3.3", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.1", + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.2", "webpack": "^5.90.1", "webpack-chain": "^6.5.1" }, diff --git a/demo/taro-app/yarn.lock b/demo/taro-app/yarn.lock index cda0caa39..4cc4fd22c 100644 --- a/demo/taro-app/yarn.lock +++ b/demo/taro-app/yarn.lock @@ -14866,10 +14866,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.1: - version "3.0.11-beta.1" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.1.tgz#18399e841edc741db5f105fb33cdefb14a20ef11" - integrity sha512-/XBhlRzjPAPL13iko0U9YM8qDFUGXH+6H+LBmei3rRS/5ajopUIOk3fqrjBGi+n//UX6HIpdtfu1Yj2/TfLSMw== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.2: + version "3.0.11-beta.2" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.2.tgz#76919d8eb74a8eecbf9a67ad0acced13316efa77" + integrity sha512-cOiTllUqoh1YdnhJ6F0birSr3ineanNDTUZ+nRwLrkI2ZiyPjxBppaYE49mbXbfoop4cSZjTsH4oLZHrkjX9/Q== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/taro-vue2-app/package.json b/demo/taro-vue2-app/package.json index 6162af92e..ecdcedcca 100644 --- a/demo/taro-vue2-app/package.json +++ b/demo/taro-vue2-app/package.json @@ -90,7 +90,7 @@ "vue-loader": "^15.11.1", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.1", + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.2", "webpack": "^5.89.0" } } diff --git a/demo/taro-vue2-app/yarn.lock b/demo/taro-vue2-app/yarn.lock index 104eb15d0..de042b455 100644 --- a/demo/taro-vue2-app/yarn.lock +++ b/demo/taro-vue2-app/yarn.lock @@ -14515,10 +14515,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.1: - version "3.0.11-beta.1" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.1.tgz#18399e841edc741db5f105fb33cdefb14a20ef11" - integrity sha512-/XBhlRzjPAPL13iko0U9YM8qDFUGXH+6H+LBmei3rRS/5ajopUIOk3fqrjBGi+n//UX6HIpdtfu1Yj2/TfLSMw== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.2: + version "3.0.11-beta.2" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.2.tgz#76919d8eb74a8eecbf9a67ad0acced13316efa77" + integrity sha512-cOiTllUqoh1YdnhJ6F0birSr3ineanNDTUZ+nRwLrkI2ZiyPjxBppaYE49mbXbfoop4cSZjTsH4oLZHrkjX9/Q== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/taro-vue3-app/package.json b/demo/taro-vue3-app/package.json index f0c49ffd7..eec5200cc 100644 --- a/demo/taro-vue3-app/package.json +++ b/demo/taro-vue3-app/package.json @@ -83,7 +83,7 @@ "vue-loader": "^17.2.2", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.1", + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.2", "webpack": "^5.89.0" } } diff --git a/demo/taro-vue3-app/yarn.lock b/demo/taro-vue3-app/yarn.lock index 1715d6981..a707916f9 100644 --- a/demo/taro-vue3-app/yarn.lock +++ b/demo/taro-vue3-app/yarn.lock @@ -13827,10 +13827,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.1: - version "3.0.11-beta.1" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.1.tgz#18399e841edc741db5f105fb33cdefb14a20ef11" - integrity sha512-/XBhlRzjPAPL13iko0U9YM8qDFUGXH+6H+LBmei3rRS/5ajopUIOk3fqrjBGi+n//UX6HIpdtfu1Yj2/TfLSMw== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.2: + version "3.0.11-beta.2" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.2.tgz#76919d8eb74a8eecbf9a67ad0acced13316efa77" + integrity sha512-cOiTllUqoh1YdnhJ6F0birSr3ineanNDTUZ+nRwLrkI2ZiyPjxBppaYE49mbXbfoop4cSZjTsH4oLZHrkjX9/Q== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/uni-app-vue3-vite/package.json b/demo/uni-app-vue3-vite/package.json index 74fc3698d..420d96fcc 100644 --- a/demo/uni-app-vue3-vite/package.json +++ b/demo/uni-app-vue3-vite/package.json @@ -93,6 +93,6 @@ "vite": "4.0.3", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.1" + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.2" } } diff --git a/demo/uni-app-vue3-vite/yarn.lock b/demo/uni-app-vue3-vite/yarn.lock index e51682687..69b4ca4bb 100644 --- a/demo/uni-app-vue3-vite/yarn.lock +++ b/demo/uni-app-vue3-vite/yarn.lock @@ -5136,10 +5136,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.1: - version "3.0.11-beta.1" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.1.tgz#18399e841edc741db5f105fb33cdefb14a20ef11" - integrity sha512-/XBhlRzjPAPL13iko0U9YM8qDFUGXH+6H+LBmei3rRS/5ajopUIOk3fqrjBGi+n//UX6HIpdtfu1Yj2/TfLSMw== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.2: + version "3.0.11-beta.2" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.2.tgz#76919d8eb74a8eecbf9a67ad0acced13316efa77" + integrity sha512-cOiTllUqoh1YdnhJ6F0birSr3ineanNDTUZ+nRwLrkI2ZiyPjxBppaYE49mbXbfoop4cSZjTsH4oLZHrkjX9/Q== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/uni-app-webpack5/package.json b/demo/uni-app-webpack5/package.json index 869357e81..a4942f910 100644 --- a/demo/uni-app-webpack5/package.json +++ b/demo/uni-app-webpack5/package.json @@ -118,7 +118,7 @@ "vue-template-compiler": ">= 2.6.14 < 2.7", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.1" + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.2" }, "browserslist": [ "Android >= 4.4", diff --git a/demo/uni-app-webpack5/yarn.lock b/demo/uni-app-webpack5/yarn.lock index cf073d7f1..fc22211c3 100644 --- a/demo/uni-app-webpack5/yarn.lock +++ b/demo/uni-app-webpack5/yarn.lock @@ -11312,10 +11312,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.1: - version "3.0.11-beta.1" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.1.tgz#18399e841edc741db5f105fb33cdefb14a20ef11" - integrity sha512-/XBhlRzjPAPL13iko0U9YM8qDFUGXH+6H+LBmei3rRS/5ajopUIOk3fqrjBGi+n//UX6HIpdtfu1Yj2/TfLSMw== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.2: + version "3.0.11-beta.2" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.2.tgz#76919d8eb74a8eecbf9a67ad0acced13316efa77" + integrity sha512-cOiTllUqoh1YdnhJ6F0birSr3ineanNDTUZ+nRwLrkI2ZiyPjxBppaYE49mbXbfoop4cSZjTsH4oLZHrkjX9/Q== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/uni-app/package.json b/demo/uni-app/package.json index c8686c858..9ea6f7314 100644 --- a/demo/uni-app/package.json +++ b/demo/uni-app/package.json @@ -120,7 +120,7 @@ "vue-template-compiler": "^2.6.11", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.1" + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.2" }, "browserslist": [ "Android >= 4.4", diff --git a/demo/uni-app/yarn.lock b/demo/uni-app/yarn.lock index f2ceca2cf..9ff61f7c9 100644 --- a/demo/uni-app/yarn.lock +++ b/demo/uni-app/yarn.lock @@ -11505,10 +11505,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.1: - version "3.0.11-beta.1" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.1.tgz#18399e841edc741db5f105fb33cdefb14a20ef11" - integrity sha512-/XBhlRzjPAPL13iko0U9YM8qDFUGXH+6H+LBmei3rRS/5ajopUIOk3fqrjBGi+n//UX6HIpdtfu1Yj2/TfLSMw== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.2: + version "3.0.11-beta.2" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.2.tgz#76919d8eb74a8eecbf9a67ad0acced13316efa77" + integrity sha512-cOiTllUqoh1YdnhJ6F0birSr3ineanNDTUZ+nRwLrkI2ZiyPjxBppaYE49mbXbfoop4cSZjTsH4oLZHrkjX9/Q== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/web/package.json b/demo/web/package.json index 528f9e83d..4ac79140e 100644 --- a/demo/web/package.json +++ b/demo/web/package.json @@ -20,6 +20,6 @@ "tailwindcss-rem2px-preset": "^1.0.3", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.1" + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.2" } } diff --git a/demo/web/yarn.lock b/demo/web/yarn.lock index cb28528d5..51adce5a0 100644 --- a/demo/web/yarn.lock +++ b/demo/web/yarn.lock @@ -1309,10 +1309,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.1: - version "3.0.11-beta.1" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.1.tgz#18399e841edc741db5f105fb33cdefb14a20ef11" - integrity sha512-/XBhlRzjPAPL13iko0U9YM8qDFUGXH+6H+LBmei3rRS/5ajopUIOk3fqrjBGi+n//UX6HIpdtfu1Yj2/TfLSMw== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.2: + version "3.0.11-beta.2" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.2.tgz#76919d8eb74a8eecbf9a67ad0acced13316efa77" + integrity sha512-cOiTllUqoh1YdnhJ6F0birSr3ineanNDTUZ+nRwLrkI2ZiyPjxBppaYE49mbXbfoop4cSZjTsH4oLZHrkjX9/Q== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" From 16871f668b16733ffe53f8fffc5de9f1738a6f48 Mon Sep 17 00:00:00 2001 From: ice breaker <1324318532@qq.com> Date: Wed, 14 Feb 2024 12:26:40 +0800 Subject: [PATCH 6/9] chore(deps): upgrade --- package.json | 12 +++--- pnpm-lock.yaml | 115 ++++++++++++++++++++++++++----------------------- 2 files changed, 66 insertions(+), 61 deletions(-) diff --git a/package.json b/package.json index 31d8b352b..8dc99936e 100644 --- a/package.json +++ b/package.json @@ -187,7 +187,7 @@ "@types/md5": "^2.3.5", "@types/micromatch": "^4.0.6", "@types/node": "^20.11.17", - "@types/semver": "^7.5.6", + "@types/semver": "^7.5.7", "@types/vinyl": "^2.0.11", "@types/webpack": "^5.28.5", "@types/webpack-sources": "^3.2.3", @@ -199,12 +199,12 @@ "bumpp": "^9.3.0", "colorette": "^2.0.20", "cross-env": "^7.0.3", - "css-loader": "^6.9.1", + "css-loader": "^6.10.0", "css-to-tailwindcss-plugin": "^0.3.0", "dedent": "^1.5.1", "defu": "6.1.4", "del": "^7.1.0", - "diff": "^5.1.0", + "diff": "^5.2.0", "domhandler": "^5.0.3", "eslint": "8.56.0", "eslint-config-icebreaker": "^1.2.3", @@ -214,8 +214,8 @@ "fast-glob": "^3.3.2", "fs-extra": "^11.2.0", "gulp": "^4.0.2", - "gulp-postcss": "^9.1.0", - "html-loader": "^4.2.0", + "gulp-postcss": "^10.0.0", + "html-loader": "^5.0.0", "js-beautify": "^1.14.11", "klaw": "^4.1.0", "lodash": "^4.17.21", @@ -223,7 +223,7 @@ "miniprogram-automator": "^0.12.1", "pkg-types": "^1.0.3", "postcss-load-config": "^5.0.3", - "postcss-loader": "^7.3.4", + "postcss-loader": "^8.1.0", "prettier": "^3.2.5", "promisify-loader-runner": "^1.0.1", "rollup": "^4.10.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 8a69a9aa3..832078a57 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -143,8 +143,8 @@ devDependencies: specifier: ^20.11.17 version: 20.11.17 '@types/semver': - specifier: ^7.5.6 - version: 7.5.6 + specifier: ^7.5.7 + version: 7.5.7 '@types/vinyl': specifier: ^2.0.11 version: 2.0.11 @@ -179,8 +179,8 @@ devDependencies: specifier: ^7.0.3 version: 7.0.3 css-loader: - specifier: ^6.9.1 - version: 6.9.1(webpack@5.90.1) + specifier: ^6.10.0 + version: 6.10.0(webpack@5.90.1) css-to-tailwindcss-plugin: specifier: ^0.3.0 version: 0.3.0 @@ -194,8 +194,8 @@ devDependencies: specifier: ^7.1.0 version: 7.1.0 diff: - specifier: ^5.1.0 - version: 5.1.0 + specifier: ^5.2.0 + version: 5.2.0 domhandler: specifier: ^5.0.3 version: 5.0.3 @@ -224,11 +224,11 @@ devDependencies: specifier: ^4.0.2 version: 4.0.2 gulp-postcss: - specifier: ^9.1.0 - version: 9.1.0(postcss@8.4.33) + specifier: ^10.0.0 + version: 10.0.0(postcss@8.4.33) html-loader: - specifier: ^4.2.0 - version: 4.2.0(webpack@5.90.1) + specifier: ^5.0.0 + version: 5.0.0(webpack@5.90.1) js-beautify: specifier: ^1.14.11 version: 1.14.11 @@ -251,8 +251,8 @@ devDependencies: specifier: ^5.0.3 version: 5.0.3(postcss@8.4.33) postcss-loader: - specifier: ^7.3.4 - version: 7.3.4(postcss@8.4.33)(typescript@5.3.3)(webpack@5.90.1) + specifier: ^8.1.0 + version: 8.1.0(postcss@8.4.33)(typescript@5.3.3)(webpack@5.90.1) prettier: specifier: ^3.2.5 version: 3.2.5 @@ -1178,19 +1178,12 @@ packages: resolution: {integrity: sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==} dependencies: '@jridgewell/gen-mapping': 0.3.3 - '@jridgewell/trace-mapping': 0.3.19 + '@jridgewell/trace-mapping': 0.3.22 dev: true /@jridgewell/sourcemap-codec@1.4.15: resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==} - /@jridgewell/trace-mapping@0.3.19: - resolution: {integrity: sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==} - dependencies: - '@jridgewell/resolve-uri': 3.1.1 - '@jridgewell/sourcemap-codec': 1.4.15 - dev: true - /@jridgewell/trace-mapping@0.3.20: resolution: {integrity: sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==} dependencies: @@ -1706,8 +1699,8 @@ packages: resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==} dev: true - /@types/semver@7.5.6: - resolution: {integrity: sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==} + /@types/semver@7.5.7: + resolution: {integrity: sha512-/wdoPq1QqkSj9/QOeKkFquEuPzQbHTWAMPH/PaUMB+JuR31lXhlWXRZ52IpfDYVlDOUBvX09uBrPwxGT1hjNBg==} dev: true /@types/source-list-map@0.1.5: @@ -1901,7 +1894,7 @@ packages: dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.56.0) '@types/json-schema': 7.0.15 - '@types/semver': 7.5.6 + '@types/semver': 7.5.7 '@typescript-eslint/scope-manager': 6.14.0 '@typescript-eslint/types': 6.14.0 '@typescript-eslint/typescript-estree': 6.14.0(typescript@5.3.3) @@ -2901,8 +2894,8 @@ packages: static-extend: 0.1.2 dev: true - /clean-css@5.2.0: - resolution: {integrity: sha512-2639sWGa43EMmG7fn8mdVuBSs6HuWaSor+ZPoFWzenBc6oN+td8YhTfghWXZ25G1NiiSvz8bOFBS7PdSbTiqEA==} + /clean-css@5.3.3: + resolution: {integrity: sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==} engines: {node: '>= 10.0'} dependencies: source-map: 0.6.1 @@ -3022,11 +3015,6 @@ packages: resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==} engines: {node: '>= 6'} - /commander@9.5.0: - resolution: {integrity: sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==} - engines: {node: ^12.20.0 || >=14} - dev: true - /common-path-prefix@3.0.0: resolution: {integrity: sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==} dev: true @@ -3098,8 +3086,8 @@ packages: resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} dev: true - /cosmiconfig@8.3.6(typescript@5.3.3): - resolution: {integrity: sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==} + /cosmiconfig@9.0.0(typescript@5.3.3): + resolution: {integrity: sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==} engines: {node: '>=14'} peerDependencies: typescript: '>=4.9.5' @@ -3107,10 +3095,10 @@ packages: typescript: optional: true dependencies: + env-paths: 2.2.1 import-fresh: 3.3.0 js-yaml: 4.1.0 parse-json: 5.2.0 - path-type: 4.0.0 typescript: 5.3.3 dev: true @@ -3143,11 +3131,17 @@ packages: /crypt@0.0.2: resolution: {integrity: sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==} - /css-loader@6.9.1(webpack@5.90.1): - resolution: {integrity: sha512-OzABOh0+26JKFdMzlK6PY1u5Zx8+Ck7CVRlcGNZoY9qwJjdfu2VWFuprTIpPW+Av5TZTVViYWcFQaEEQURLknQ==} + /css-loader@6.10.0(webpack@5.90.1): + resolution: {integrity: sha512-LTSA/jWbwdMlk+rhmElbDR2vbtQoTBPr7fkJE+mxrHj+7ru0hUmHafDRzWIjIHTwpitWVaqY2/UWGRca3yUgRw==} engines: {node: '>= 12.13.0'} peerDependencies: + '@rspack/core': 0.x || 1.x webpack: ^5.0.0 + peerDependenciesMeta: + '@rspack/core': + optional: true + webpack: + optional: true dependencies: icss-utils: 5.1.0(postcss@8.4.33) postcss: 8.4.33 @@ -3362,8 +3356,8 @@ packages: resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==} engines: {node: '>=0.3.1'} - /diff@5.1.0: - resolution: {integrity: sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==} + /diff@5.2.0: + resolution: {integrity: sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==} engines: {node: '>=0.3.1'} dev: true @@ -3497,6 +3491,11 @@ packages: resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==} engines: {node: '>=0.12'} + /env-paths@2.2.1: + resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==} + engines: {node: '>=6'} + dev: true + /error-ex@1.3.2: resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==} dependencies: @@ -4768,8 +4767,8 @@ packages: - supports-color dev: true - /gulp-postcss@9.1.0(postcss@8.4.33): - resolution: {integrity: sha512-a843mcKPApfeI987uqQbc8l50xXeWIXBsiVvYxtCI5XtVAMzTi/HnU2qzQpGwkB/PAOfsLV8OsqDv2iJZ9qvdw==} + /gulp-postcss@10.0.0(postcss@8.4.33): + resolution: {integrity: sha512-z1RF2RJEX/BvFsKN11PXai8lRmihZTiHnlJf7Zu8uHaA/Q7Om4IeN8z1NtMAW5OiLwUY02H0DIFl9tHl0CNSgA==} engines: {node: '>=18'} peerDependencies: postcss: ^8.0.0 @@ -4921,29 +4920,29 @@ packages: resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==} dev: true - /html-loader@4.2.0(webpack@5.90.1): - resolution: {integrity: sha512-OxCHD3yt+qwqng2vvcaPApCEvbx+nXWu+v69TYHx1FO8bffHn/JjHtE3TTQZmHjwvnJe4xxzuecetDVBrQR1Zg==} - engines: {node: '>= 14.15.0'} + /html-loader@5.0.0(webpack@5.90.1): + resolution: {integrity: sha512-puaGKdjdVVIFRtgIC2n5dt5bt0N5j6heXlAQZ4Do1MLjHmOT1gCE1Ogg7XZNeJlnOVHHsrZKGs5dfh+XwZ3XPw==} + engines: {node: '>= 18.12.0'} peerDependencies: webpack: ^5.0.0 dependencies: - html-minifier-terser: 7.0.0 - parse5: 7.1.1 + html-minifier-terser: 7.2.0 + parse5: 7.1.2 webpack: 5.90.1 dev: true - /html-minifier-terser@7.0.0: - resolution: {integrity: sha512-Adqk0b/pWKIQiGvEAuzPKpBKNHiwblr3QSGS7TTr6v+xXKV9AI2k4vWW+6Oytt6Z5SeBnfvYypKOnz8r75pz3Q==} + /html-minifier-terser@7.2.0: + resolution: {integrity: sha512-tXgn3QfqPIpGl9o+K5tpcj3/MN4SfLtsx2GWwBC3SSd0tXQGyF3gsSqad8loJgKZGM3ZxbYDd5yhiBIdWpmvLA==} engines: {node: ^14.13.1 || >=16.0.0} hasBin: true dependencies: camel-case: 4.1.2 - clean-css: 5.2.0 - commander: 9.5.0 + clean-css: 5.3.3 + commander: 10.0.1 entities: 4.5.0 param-case: 3.0.4 relateurl: 0.2.7 - terser: 5.21.0 + terser: 5.27.0 dev: true /htmlparser2@9.1.0: @@ -6587,8 +6586,8 @@ packages: engines: {node: '>=0.10.0'} dev: true - /parse5@7.1.1: - resolution: {integrity: sha512-kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg==} + /parse5@7.1.2: + resolution: {integrity: sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==} dependencies: entities: 4.5.0 dev: true @@ -6835,14 +6834,20 @@ packages: yaml: 2.3.4 dev: true - /postcss-loader@7.3.4(postcss@8.4.33)(typescript@5.3.3)(webpack@5.90.1): - resolution: {integrity: sha512-iW5WTTBSC5BfsBJ9daFMPVrLT36MrNiC6fqOZTTaHjBNX6Pfd5p+hSBqe/fEeNd7pc13QiAyGt7VdGMw4eRC4A==} - engines: {node: '>= 14.15.0'} + /postcss-loader@8.1.0(postcss@8.4.33)(typescript@5.3.3)(webpack@5.90.1): + resolution: {integrity: sha512-AbperNcX3rlob7Ay7A/HQcrofug1caABBkopoFeOQMspZBqcqj6giYn1Bwey/0uiOPAcR+NQD0I2HC7rXzk91w==} + engines: {node: '>= 18.12.0'} peerDependencies: + '@rspack/core': 0.x || 1.x postcss: ^7.0.0 || ^8.0.1 webpack: ^5.0.0 + peerDependenciesMeta: + '@rspack/core': + optional: true + webpack: + optional: true dependencies: - cosmiconfig: 8.3.6(typescript@5.3.3) + cosmiconfig: 9.0.0(typescript@5.3.3) jiti: 1.21.0 postcss: 8.4.33 semver: 7.6.0 From 484d1a30651d8cf3328c2b37b4a868ed00fdeb3b Mon Sep 17 00:00:00 2001 From: ice breaker <1324318532@qq.com> Date: Wed, 14 Feb 2024 13:09:45 +0800 Subject: [PATCH 7/9] feat: add cache option --- src/cache/index.ts | 37 ++++++++++++++++++++++++------------- src/options.ts | 6 +++--- src/types.ts | 8 +++++++- 3 files changed, 34 insertions(+), 17 deletions(-) diff --git a/src/cache/index.ts b/src/cache/index.ts index 0f6a03dad..2293697a9 100644 --- a/src/cache/index.ts +++ b/src/cache/index.ts @@ -35,7 +35,10 @@ export interface ICreateCacheReturnType { ) => void | Promise } -function createCache(): ICreateCacheReturnType { +export type ICreateCacheOptions = boolean + +function createCache(options?: ICreateCacheOptions): ICreateCacheReturnType { + const disabled = options === false const hashMap = new Map() const instance = new LRUCache({ // 可能会添加和删除一些页面和组件, 先设定 1024 吧 @@ -89,19 +92,27 @@ function createCache(): ICreateCacheReturnType { return instance.has(key) }, async process(key, callback, fallback) { - const hit = this.getHashValue(key) - // 文件没有改变 - if (hit && !hit.changed) { - // 命中缓存 - const returnFlag = await callback() - if (returnFlag !== false) { - return + if (disabled) { + // 默认处理 + const res = await fallback() + if (res) { + this.set(res.key, res.source) + } + } else { + const hit = this.getHashValue(key) + // 文件没有改变 + if (hit && !hit.changed) { + // 命中缓存 + const returnFlag = await callback() + if (returnFlag !== false) { + return + } + } + // 默认处理 + const res = await fallback() + if (res) { + this.set(res.key, res.source) } - } - // 默认处理 - const res = await fallback() - if (res) { - this.set(res.key, res.source) } } } diff --git a/src/options.ts b/src/options.ts index 0bc786450..399a01285 100644 --- a/src/options.ts +++ b/src/options.ts @@ -35,7 +35,8 @@ export function getOptions(options: UserDefinedOptions = {}): InternalUserDefine jsPreserveClass, disabledDefaultTemplateHandler, cssSelectorReplacement, - rem2rpx + rem2rpx, + cache } = result result.escapeMap = customReplaceDictionary @@ -83,8 +84,7 @@ export function getOptions(options: UserDefinedOptions = {}): InternalUserDefine result.patch = createPatch(supportCustomLengthUnitsPatch) // result.initMangle = initMangle result.setMangleRuntimeSet = setMangleRuntimeSet - - result.cache = createCache() + result.cache = cache === undefined || typeof cache === 'boolean' ? createCache(cache) : cache return result } diff --git a/src/types.ts b/src/types.ts index 8ce55cb85..2a0546e28 100644 --- a/src/types.ts +++ b/src/types.ts @@ -404,6 +404,12 @@ const customAttributes = { * @description rem 转 rpx 配置，默认为 `undefined` 不开启，可传入 `true` 启用默认配置项，也可传入自定义配置项，配置项列表见 [postcss-rem-to-responsive-pixel](https://www.npmjs.com/package/postcss-rem-to-responsive-pixel) */ rem2rpx?: boolean | rem2rpxOptions + + /** + * @version `^3.0.11` + * @description 缓存策略 + */ + cache?: boolean | ICreateCacheReturnType } export type JsHandler = (rawSource: string, set: Set, options?: CreateJsHandlerOptions) => JsHandlerResult @@ -439,7 +445,7 @@ export interface ITemplateHandlerOptions extends ICommonReplaceOptions { } export type InternalUserDefinedOptions = Required< - Omit & { + Omit & { supportCustomLengthUnitsPatch: ILengthUnitsPatchOptions | false templateHandler: (rawSource: string, options?: ITemplateHandlerOptions) => string styleHandler: (rawSource: string, options: IStyleHandlerOptions) => Promise From 6bfd22655e9886d3cc7ae3c27b93ac7dec8bf6e4 Mon Sep 17 00:00:00 2001 From: ice breaker <1324318532@qq.com> Date: Wed, 14 Feb 2024 13:10:45 +0800 Subject: [PATCH 8/9] v3.0.11-beta.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8dc99936e..1a9f16b35 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "weapp-tailwindcss-webpack-plugin", - "version": "3.0.11-beta.2", + "version": "3.0.11-beta.3", "description": "把tailwindcss jit引擎，带给小程序开发者们! bring tailwindcss jit engine to miniprogram developers!", "main": "dist/index.js", "module": "dist/index.mjs", From 813d9f7175cf34108c07587dbe0752d655db2563 Mon Sep 17 00:00:00 2001 From: ice breaker <1324318532@qq.com> Date: Wed, 14 Feb 2024 13:30:13 +0800 Subject: [PATCH 9/9] chore(deps): upgrade --- demo/gulp-app/package.json | 2 +- demo/gulp-app/yarn.lock | 8 ++++---- demo/mpx-app/package.json | 2 +- demo/mpx-app/yarn.lock | 8 ++++---- demo/native-mina/package.json | 2 +- demo/native-mina/yarn.lock | 8 ++++---- demo/rax-app/package.json | 2 +- demo/rax-app/yarn.lock | 8 ++++---- demo/taro-app/package.json | 2 +- demo/taro-app/yarn.lock | 8 ++++---- demo/taro-vue2-app/package.json | 2 +- demo/taro-vue2-app/yarn.lock | 8 ++++---- demo/taro-vue3-app/package.json | 2 +- demo/taro-vue3-app/yarn.lock | 8 ++++---- demo/uni-app-vue3-vite/package.json | 2 +- demo/uni-app-vue3-vite/yarn.lock | 8 ++++---- demo/uni-app-webpack5/package.json | 2 +- demo/uni-app-webpack5/yarn.lock | 8 ++++---- demo/uni-app/package.json | 4 ++-- demo/uni-app/yarn.lock | 8 ++++---- demo/web/package.json | 2 +- demo/web/yarn.lock | 8 ++++---- 22 files changed, 56 insertions(+), 56 deletions(-) diff --git a/demo/gulp-app/package.json b/demo/gulp-app/package.json index 79f2796db..58f615a77 100644 --- a/demo/gulp-app/package.json +++ b/demo/gulp-app/package.json @@ -70,7 +70,7 @@ "typescript": "^5.3.3", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.2" + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.3" }, "dependencies": { "@vant/weapp": "^1.11.2" diff --git a/demo/gulp-app/yarn.lock b/demo/gulp-app/yarn.lock index d1e75499c..f54c7a11d 100644 --- a/demo/gulp-app/yarn.lock +++ b/demo/gulp-app/yarn.lock @@ -6480,10 +6480,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.2: - version "3.0.11-beta.2" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.2.tgz#76919d8eb74a8eecbf9a67ad0acced13316efa77" - integrity sha512-cOiTllUqoh1YdnhJ6F0birSr3ineanNDTUZ+nRwLrkI2ZiyPjxBppaYE49mbXbfoop4cSZjTsH4oLZHrkjX9/Q== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.3: + version "3.0.11-beta.3" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.3.tgz#0c5aa16d7b3bea0e1b8d160b587f85a94721e7ea" + integrity sha512-UrU2vxvTFXSZT1m1u3rC0i59nWZ+oUufxsZtnj9yCppxlLK+Gn/IW2mjUHfWsS5giAZRAw6AGNNRACNlTuCYlA== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/mpx-app/package.json b/demo/mpx-app/package.json index a732a75b3..1a7359b8f 100644 --- a/demo/mpx-app/package.json +++ b/demo/mpx-app/package.json @@ -69,7 +69,7 @@ "vue-template-compiler": "^2.7.16", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.2", + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.3", "webpack": "^5.90.0" }, "browserslist": [ diff --git a/demo/mpx-app/yarn.lock b/demo/mpx-app/yarn.lock index 2abfc5aea..4d5fd3bc1 100644 --- a/demo/mpx-app/yarn.lock +++ b/demo/mpx-app/yarn.lock @@ -11861,10 +11861,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.2: - version "3.0.11-beta.2" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.2.tgz#76919d8eb74a8eecbf9a67ad0acced13316efa77" - integrity sha512-cOiTllUqoh1YdnhJ6F0birSr3ineanNDTUZ+nRwLrkI2ZiyPjxBppaYE49mbXbfoop4cSZjTsH4oLZHrkjX9/Q== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.3: + version "3.0.11-beta.3" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.3.tgz#0c5aa16d7b3bea0e1b8d160b587f85a94721e7ea" + integrity sha512-UrU2vxvTFXSZT1m1u3rC0i59nWZ+oUufxsZtnj9yCppxlLK+Gn/IW2mjUHfWsS5giAZRAw6AGNNRACNlTuCYlA== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/native-mina/package.json b/demo/native-mina/package.json index 79bad0c36..38d1f5396 100644 --- a/demo/native-mina/package.json +++ b/demo/native-mina/package.json @@ -67,7 +67,7 @@ "typescript": "^5.3.2", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.2", + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.3", "webpack": "^5.89.0", "webpack-cli": "^5.1.4", "webpack-sources": "^3.2.3" diff --git a/demo/native-mina/yarn.lock b/demo/native-mina/yarn.lock index f5755d36d..8fbc6f226 100644 --- a/demo/native-mina/yarn.lock +++ b/demo/native-mina/yarn.lock @@ -6125,10 +6125,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.2: - version "3.0.11-beta.2" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.2.tgz#76919d8eb74a8eecbf9a67ad0acced13316efa77" - integrity sha512-cOiTllUqoh1YdnhJ6F0birSr3ineanNDTUZ+nRwLrkI2ZiyPjxBppaYE49mbXbfoop4cSZjTsH4oLZHrkjX9/Q== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.3: + version "3.0.11-beta.3" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.3.tgz#0c5aa16d7b3bea0e1b8d160b587f85a94721e7ea" + integrity sha512-UrU2vxvTFXSZT1m1u3rC0i59nWZ+oUufxsZtnj9yCppxlLK+Gn/IW2mjUHfWsS5giAZRAw6AGNNRACNlTuCYlA== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/rax-app/package.json b/demo/rax-app/package.json index 2162cb4e1..33ebee477 100644 --- a/demo/rax-app/package.json +++ b/demo/rax-app/package.json @@ -42,7 +42,7 @@ "tailwindcss-rem2px-preset": "^1.0.3", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.2" + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.3" }, "private": true, "originTemplate": "@rax-materials/scaffolds-app-ts" diff --git a/demo/rax-app/yarn.lock b/demo/rax-app/yarn.lock index 9bb3ac97d..8285856df 100644 --- a/demo/rax-app/yarn.lock +++ b/demo/rax-app/yarn.lock @@ -11857,10 +11857,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.2: - version "3.0.11-beta.2" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.2.tgz#76919d8eb74a8eecbf9a67ad0acced13316efa77" - integrity sha512-cOiTllUqoh1YdnhJ6F0birSr3ineanNDTUZ+nRwLrkI2ZiyPjxBppaYE49mbXbfoop4cSZjTsH4oLZHrkjX9/Q== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.3: + version "3.0.11-beta.3" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.3.tgz#0c5aa16d7b3bea0e1b8d160b587f85a94721e7ea" + integrity sha512-UrU2vxvTFXSZT1m1u3rC0i59nWZ+oUufxsZtnj9yCppxlLK+Gn/IW2mjUHfWsS5giAZRAw6AGNNRACNlTuCYlA== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/taro-app/package.json b/demo/taro-app/package.json index 8c8d10647..d3820797f 100644 --- a/demo/taro-app/package.json +++ b/demo/taro-app/package.json @@ -85,7 +85,7 @@ "typescript": "~5.3.3", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.2", + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.3", "webpack": "^5.90.1", "webpack-chain": "^6.5.1" }, diff --git a/demo/taro-app/yarn.lock b/demo/taro-app/yarn.lock index 4cc4fd22c..8d1099c73 100644 --- a/demo/taro-app/yarn.lock +++ b/demo/taro-app/yarn.lock @@ -14866,10 +14866,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.2: - version "3.0.11-beta.2" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.2.tgz#76919d8eb74a8eecbf9a67ad0acced13316efa77" - integrity sha512-cOiTllUqoh1YdnhJ6F0birSr3ineanNDTUZ+nRwLrkI2ZiyPjxBppaYE49mbXbfoop4cSZjTsH4oLZHrkjX9/Q== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.3: + version "3.0.11-beta.3" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.3.tgz#0c5aa16d7b3bea0e1b8d160b587f85a94721e7ea" + integrity sha512-UrU2vxvTFXSZT1m1u3rC0i59nWZ+oUufxsZtnj9yCppxlLK+Gn/IW2mjUHfWsS5giAZRAw6AGNNRACNlTuCYlA== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/taro-vue2-app/package.json b/demo/taro-vue2-app/package.json index ecdcedcca..928a74365 100644 --- a/demo/taro-vue2-app/package.json +++ b/demo/taro-vue2-app/package.json @@ -90,7 +90,7 @@ "vue-loader": "^15.11.1", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.2", + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.3", "webpack": "^5.89.0" } } diff --git a/demo/taro-vue2-app/yarn.lock b/demo/taro-vue2-app/yarn.lock index de042b455..fd6b75e3e 100644 --- a/demo/taro-vue2-app/yarn.lock +++ b/demo/taro-vue2-app/yarn.lock @@ -14515,10 +14515,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.2: - version "3.0.11-beta.2" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.2.tgz#76919d8eb74a8eecbf9a67ad0acced13316efa77" - integrity sha512-cOiTllUqoh1YdnhJ6F0birSr3ineanNDTUZ+nRwLrkI2ZiyPjxBppaYE49mbXbfoop4cSZjTsH4oLZHrkjX9/Q== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.3: + version "3.0.11-beta.3" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.3.tgz#0c5aa16d7b3bea0e1b8d160b587f85a94721e7ea" + integrity sha512-UrU2vxvTFXSZT1m1u3rC0i59nWZ+oUufxsZtnj9yCppxlLK+Gn/IW2mjUHfWsS5giAZRAw6AGNNRACNlTuCYlA== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/taro-vue3-app/package.json b/demo/taro-vue3-app/package.json index eec5200cc..8a7655422 100644 --- a/demo/taro-vue3-app/package.json +++ b/demo/taro-vue3-app/package.json @@ -83,7 +83,7 @@ "vue-loader": "^17.2.2", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.2", + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.3", "webpack": "^5.89.0" } } diff --git a/demo/taro-vue3-app/yarn.lock b/demo/taro-vue3-app/yarn.lock index a707916f9..0a6f312c9 100644 --- a/demo/taro-vue3-app/yarn.lock +++ b/demo/taro-vue3-app/yarn.lock @@ -13827,10 +13827,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.2: - version "3.0.11-beta.2" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.2.tgz#76919d8eb74a8eecbf9a67ad0acced13316efa77" - integrity sha512-cOiTllUqoh1YdnhJ6F0birSr3ineanNDTUZ+nRwLrkI2ZiyPjxBppaYE49mbXbfoop4cSZjTsH4oLZHrkjX9/Q== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.3: + version "3.0.11-beta.3" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.3.tgz#0c5aa16d7b3bea0e1b8d160b587f85a94721e7ea" + integrity sha512-UrU2vxvTFXSZT1m1u3rC0i59nWZ+oUufxsZtnj9yCppxlLK+Gn/IW2mjUHfWsS5giAZRAw6AGNNRACNlTuCYlA== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/uni-app-vue3-vite/package.json b/demo/uni-app-vue3-vite/package.json index 420d96fcc..9c90792cf 100644 --- a/demo/uni-app-vue3-vite/package.json +++ b/demo/uni-app-vue3-vite/package.json @@ -93,6 +93,6 @@ "vite": "4.0.3", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.2" + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.3" } } diff --git a/demo/uni-app-vue3-vite/yarn.lock b/demo/uni-app-vue3-vite/yarn.lock index 69b4ca4bb..3c12f2db7 100644 --- a/demo/uni-app-vue3-vite/yarn.lock +++ b/demo/uni-app-vue3-vite/yarn.lock @@ -5136,10 +5136,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.2: - version "3.0.11-beta.2" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.2.tgz#76919d8eb74a8eecbf9a67ad0acced13316efa77" - integrity sha512-cOiTllUqoh1YdnhJ6F0birSr3ineanNDTUZ+nRwLrkI2ZiyPjxBppaYE49mbXbfoop4cSZjTsH4oLZHrkjX9/Q== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.3: + version "3.0.11-beta.3" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.3.tgz#0c5aa16d7b3bea0e1b8d160b587f85a94721e7ea" + integrity sha512-UrU2vxvTFXSZT1m1u3rC0i59nWZ+oUufxsZtnj9yCppxlLK+Gn/IW2mjUHfWsS5giAZRAw6AGNNRACNlTuCYlA== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/uni-app-webpack5/package.json b/demo/uni-app-webpack5/package.json index a4942f910..acc513309 100644 --- a/demo/uni-app-webpack5/package.json +++ b/demo/uni-app-webpack5/package.json @@ -118,7 +118,7 @@ "vue-template-compiler": ">= 2.6.14 < 2.7", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.2" + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.3" }, "browserslist": [ "Android >= 4.4", diff --git a/demo/uni-app-webpack5/yarn.lock b/demo/uni-app-webpack5/yarn.lock index fc22211c3..2182b07ae 100644 --- a/demo/uni-app-webpack5/yarn.lock +++ b/demo/uni-app-webpack5/yarn.lock @@ -11312,10 +11312,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.2: - version "3.0.11-beta.2" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.2.tgz#76919d8eb74a8eecbf9a67ad0acced13316efa77" - integrity sha512-cOiTllUqoh1YdnhJ6F0birSr3ineanNDTUZ+nRwLrkI2ZiyPjxBppaYE49mbXbfoop4cSZjTsH4oLZHrkjX9/Q== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.3: + version "3.0.11-beta.3" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.3.tgz#0c5aa16d7b3bea0e1b8d160b587f85a94721e7ea" + integrity sha512-UrU2vxvTFXSZT1m1u3rC0i59nWZ+oUufxsZtnj9yCppxlLK+Gn/IW2mjUHfWsS5giAZRAw6AGNNRACNlTuCYlA== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/uni-app/package.json b/demo/uni-app/package.json index 9ea6f7314..135b31ac9 100644 --- a/demo/uni-app/package.json +++ b/demo/uni-app/package.json @@ -34,7 +34,7 @@ "dev:mp-lark": "cross-env NODE_ENV=development UNI_PLATFORM=mp-lark vue-cli-service uni-build --watch", "dev:mp-qq": "cross-env NODE_ENV=development UNI_PLATFORM=mp-qq vue-cli-service uni-build --watch", "dev:mp-toutiao": "cross-env NODE_ENV=development UNI_PLATFORM=mp-toutiao vue-cli-service uni-build --watch", - "dev:mp-weixin": "cross-env NODE_ENV=development UNI_PLATFORM=mp-weixin vue-cli-service uni-build --watch", + "dev:mp-weixin": "cross-env NODE_ENV=development UNI_PLATFORM=mp-weixin DEBUG=weapp-tw vue-cli-service uni-build --watch", "dev:quickapp-native": "cross-env NODE_ENV=development UNI_PLATFORM=quickapp-native vue-cli-service uni-build --watch", "dev:quickapp-webview": "cross-env NODE_ENV=development UNI_PLATFORM=quickapp-webview vue-cli-service uni-build --watch", "dev:quickapp-webview-huawei": "cross-env NODE_ENV=development UNI_PLATFORM=quickapp-webview-huawei vue-cli-service uni-build --watch", @@ -120,7 +120,7 @@ "vue-template-compiler": "^2.6.11", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.2" + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.3" }, "browserslist": [ "Android >= 4.4", diff --git a/demo/uni-app/yarn.lock b/demo/uni-app/yarn.lock index 9ff61f7c9..ce534cabf 100644 --- a/demo/uni-app/yarn.lock +++ b/demo/uni-app/yarn.lock @@ -11505,10 +11505,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.2: - version "3.0.11-beta.2" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.2.tgz#76919d8eb74a8eecbf9a67ad0acced13316efa77" - integrity sha512-cOiTllUqoh1YdnhJ6F0birSr3ineanNDTUZ+nRwLrkI2ZiyPjxBppaYE49mbXbfoop4cSZjTsH4oLZHrkjX9/Q== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.3: + version "3.0.11-beta.3" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.3.tgz#0c5aa16d7b3bea0e1b8d160b587f85a94721e7ea" + integrity sha512-UrU2vxvTFXSZT1m1u3rC0i59nWZ+oUufxsZtnj9yCppxlLK+Gn/IW2mjUHfWsS5giAZRAw6AGNNRACNlTuCYlA== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6" diff --git a/demo/web/package.json b/demo/web/package.json index 4ac79140e..f9fcfd754 100644 --- a/demo/web/package.json +++ b/demo/web/package.json @@ -20,6 +20,6 @@ "tailwindcss-rem2px-preset": "^1.0.3", "weapp-ide-cli": "^1.0.1", "weapp-tailwindcss-children": "^0.1.0", - "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.2" + "weapp-tailwindcss-webpack-plugin": "^3.0.11-beta.3" } } diff --git a/demo/web/yarn.lock b/demo/web/yarn.lock index 51adce5a0..93b0375a3 100644 --- a/demo/web/yarn.lock +++ b/demo/web/yarn.lock @@ -1309,10 +1309,10 @@ weapp-tailwindcss-children@^0.1.0: resolved "https://registry.npmmirror.com/weapp-tailwindcss-children/-/weapp-tailwindcss-children-0.1.0.tgz#0de102f04a89d77447ca3b984669bbe5ffa41aa1" integrity sha512-HuDT78u6RbXpJIHbJzw4zW98JByWCz4elhTAT9QR/JWJuQpiRNbnqa5tL+ZTVCcT4bHt9Ppf/E2MNTohPgBE3g== -weapp-tailwindcss-webpack-plugin@^3.0.11-beta.2: - version "3.0.11-beta.2" - resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.2.tgz#76919d8eb74a8eecbf9a67ad0acced13316efa77" - integrity sha512-cOiTllUqoh1YdnhJ6F0birSr3ineanNDTUZ+nRwLrkI2ZiyPjxBppaYE49mbXbfoop4cSZjTsH4oLZHrkjX9/Q== +weapp-tailwindcss-webpack-plugin@^3.0.11-beta.3: + version "3.0.11-beta.3" + resolved "https://registry.npmmirror.com/weapp-tailwindcss-webpack-plugin/-/weapp-tailwindcss-webpack-plugin-3.0.11-beta.3.tgz#0c5aa16d7b3bea0e1b8d160b587f85a94721e7ea" + integrity sha512-UrU2vxvTFXSZT1m1u3rC0i59nWZ+oUufxsZtnj9yCppxlLK+Gn/IW2mjUHfWsS5giAZRAw6AGNNRACNlTuCYlA== dependencies: "@ast-core/escape" "^1.0.1" "@babel/generator" "7.23.6"