@weapp-tailwindcss/cli 1.0.2 → 1.0.4

package/README.md

@@ -1,3 +1,7 @@
 # @weapp-tailwindcss/cli
 
-<https://weapp-tw.icebreaker.top/docs/quick-start/native/install>
+`weapp-tailwindcss` 的 原生小程序 `CLI` 启动插件
+
+相关文档:
+
+👉 [https://weapp-tw.icebreaker.top/](https://weapp-tw.icebreaker.top/docs/quick-start/native/install)

package/dist/index.cjs

@@ -11,11 +11,9 @@ const localPkg = require('local-pkg');
 const createDebug = require('debug');
 const gulp = require('weapp-tailwindcss/gulp');
 const postcssrc = require('gulp-postcss');
-const gulpif = require('gulp-if');
 const createSass = require('gulp-sass');
 const rename = require('gulp-rename');
 const less = require('gulp-less');
-const typescript = require('gulp-typescript');
 const cosmiconfig = require('cosmiconfig');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
@@ -28,11 +26,9 @@ const loadPostcssConfig__default = /*#__PURE__*/_interopDefaultCompat(loadPostcs
 const pc__default = /*#__PURE__*/_interopDefaultCompat(pc);
 const createDebug__default = /*#__PURE__*/_interopDefaultCompat(createDebug);
 const postcssrc__default = /*#__PURE__*/_interopDefaultCompat(postcssrc);
-const gulpif__default = /*#__PURE__*/_interopDefaultCompat(gulpif);
 const createSass__default = /*#__PURE__*/_interopDefaultCompat(createSass);
 const rename__default = /*#__PURE__*/_interopDefaultCompat(rename);
 const less__default = /*#__PURE__*/_interopDefaultCompat(less);
-const typescript__default = /*#__PURE__*/_interopDefaultCompat(typescript);
 
 function isPlainObject$2(value) {
   if (value === null || typeof value !== "object") {
@@ -90,10 +86,48 @@ function createDefu(merger) {
 }
 const defu = createDefu();
 
-const version = "1.0.2";
+const version = "1.0.4";
 
 const debug = createDebug__default("weapp-tw-cli");
 
+const defaultJavascriptExtensions = ["js"];
+const defaultTypescriptExtensions = ["ts"];
+const defaultWxsExtensions = ["wxs"];
+const defaultNodeModulesDirs = [
+  "**/node_modules/**",
+  "**/miniprogram_npm/**",
+  "**/project.config.json/**",
+  "**/project.private.config.json/**",
+  "**/package.json/**",
+  "postcss.config.js",
+  "tailwind.config.js",
+  "weapp-tw.config.js"
+];
+function noop() {
+}
+function getDefaultOptions(options, postcssOptionsFromConfig) {
+  return {
+    outDir: "dist",
+    weappTailwindcssOptions: {},
+    clean: true,
+    src: "",
+    exclude: [...defaultNodeModulesDirs],
+    include: ["**/*.{png,jpg,jpeg,gif,svg,webp}"],
+    extensions: {
+      javascript: [...defaultJavascriptExtensions, ...defaultTypescriptExtensions, ...defaultWxsExtensions],
+      html: ["wxml"],
+      css: ["wxss", "less", "sass", "scss"],
+      json: ["json"]
+    },
+    watchOptions: {
+      cwd: options?.root,
+      events: ["add", "change", "unlink", "ready"]
+    },
+    postcssOptions: postcssOptionsFromConfig,
+    gulpChain: noop
+  };
+}
+
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => {
@@ -132,6 +166,10 @@ class GlobsSet {
   }
 }
 
+function isStream(stream, { checkOpen = true } = {}) {
+  return stream !== null && typeof stream === "object" && (stream.writable || stream.readable || !checkOpen || stream.writable === void 0 && stream.readable === void 0) && typeof stream.pipe === "function";
+}
+
 var AssetType = /* @__PURE__ */ ((AssetType2) => {
   AssetType2["JavaScript"] = "javascript";
   AssetType2["Json"] = "json";
@@ -508,7 +546,6 @@ function promisify(task) {
     }
   });
 }
-
 function isSassLang(lang) {
   return lang === "scss" || lang === "sass";
 }
@@ -518,6 +555,24 @@ function isLessLang(lang) {
 function isTsLang(lang) {
   return lang === "ts";
 }
+
+function normalizePlugin(plugin) {
+  if (isStream(plugin)) {
+    return plugin;
+  } else if (typeof plugin === "function") {
+    return plugin.apply(plugin);
+  } else if (Array.isArray(plugin)) {
+    const [fn, ...args] = plugin;
+    return fn.apply(fn, args);
+  }
+}
+function resolveTask({ pipes, globs, since, cwd }) {
+  let chain = gulp__default.src(globs, { cwd, since: gulp__default.lastRun(since) });
+  for (const p of pipes) {
+    chain = chain.pipe(p);
+  }
+  return promisify(chain);
+}
 async function getTasks(options) {
   let { typescriptOptions } = options;
   const {
@@ -529,12 +584,20 @@ async function getTasks(options) {
     exclude,
     include,
     postcssOptions,
-    preprocessorOptions
+    preprocessorOptions,
+    gulpChain
   } = options;
   const globsSet = new GlobsSet();
   const base = srcBase ? `${srcBase}/` : "";
   const enableSass = Boolean(preprocessorOptions?.sass);
   const enableLess = Boolean(preprocessorOptions?.less);
+  function resolvePipes(plugins, type) {
+    const newPlugins = gulpChain(plugins, type);
+    if (newPlugins === void 0) {
+      return plugins;
+    }
+    return newPlugins.map((x) => normalizePlugin(x)).filter((x) => x);
+  }
   if (typescriptOptions === true) {
     typescriptOptions = {
       tsConfigFileName: "tsconfig.json"
@@ -548,6 +611,10 @@ async function getTasks(options) {
     const sassLib = await import('sass');
     sass = createSass__default(sassLib);
   }
+  let ts;
+  if (enableTs) {
+    ts = (await import('gulp-typescript')).default;
+  }
   const { transformJs, transformWxml, transformWxss } = gulp.createPlugins(weappTailwindcssOptions);
   const outDirGlobs = [`!${outDir}/**/*`, `!./${outDir}/**/*`];
   function getGlobs(type) {
@@ -574,36 +641,35 @@ async function getTasks(options) {
       const loadTs = enableTs && isTs;
       let gulpTs;
       if (enableTs && typeof typescriptOptions !== "boolean") {
-        gulpTs = typescript__default.createProject(
+        gulpTs = ts.createProject(
           typescriptOptions.tsConfigFileName ?? "tsconfig.json",
           typeof typescriptOptions === "boolean" ? {} : typescriptOptions
         );
       }
       return function JsTask() {
-        let chain = gulp__default.src([src, ...globs], { cwd, since: gulp__default.lastRun(JsTask) });
+        const pipes = [];
         if (loadTs) {
-          chain = chain.pipe(gulpTs());
+          pipes.push(gulpTs());
         }
-        return promisify(
-          chain.pipe(
-            transformJs({
-              babelParserOptions: !enableTs && isTs ? {
-                plugins: ["typescript"]
-              } : void 0
-            })
-          ).pipe(
-            gulpif__default(
-              loadTs,
-              rename__default({
-                extname: ".js"
-              })
-            )
-          ).pipe(
-            gulp__default.dest(outDir, {
-              cwd
-            })
-          )
-        );
+        pipes.push(transformJs({
+          babelParserOptions: !enableTs && isTs ? {
+            plugins: ["typescript"]
+          } : void 0
+        }));
+        if (loadTs) {
+          pipes.push(rename__default({
+            extname: ".js"
+          }));
+        }
+        pipes.push(gulp__default.dest(outDir, {
+          cwd
+        }));
+        return resolveTask({
+          pipes: resolvePipes(pipes, assetType),
+          cwd,
+          globs: [src, ...globs],
+          since: JsTask
+        });
       };
     });
   }
@@ -615,13 +681,15 @@ async function getTasks(options) {
       const src = `${base}**/*.${x}`;
       globsSet.add(src);
       return function JsonTask() {
-        return promisify(
-          gulp__default.src([src, ...globs], { cwd, since: gulp__default.lastRun(JsonTask) }).pipe(
-            gulp__default.dest(outDir, {
-              cwd
-            })
-          )
-        );
+        const pipes = [gulp__default.dest(outDir, {
+          cwd
+        })];
+        return resolveTask({
+          cwd,
+          globs: [src, ...globs],
+          pipes: resolvePipes(pipes, assetType),
+          since: JsonTask
+        });
       };
     });
   }
@@ -635,34 +703,34 @@ async function getTasks(options) {
       const loadSass = enableSass && isSassLang(x);
       const loadLess = enableLess && isLessLang(x);
       return function CssTask() {
-        let chain = gulp__default.src([src, ...globs], { cwd, since: gulp__default.lastRun(CssTask) });
+        const pipes = [];
         if (loadSass) {
-          chain = chain.pipe(
-            sass.sync(
-              // @ts-ignore
-              typeof preprocessorOptions?.sass === "boolean" ? void 0 : preprocessorOptions?.sass
-            ).on("error", sass.logError)
-          );
+          pipes.push(sass.sync(
+            // @ts-ignore
+            typeof preprocessorOptions?.sass === "boolean" ? void 0 : preprocessorOptions?.sass
+          ).on("error", sass.logError));
         }
-        return promisify(
-          chain.pipe(
-            gulpif__default(
-              loadLess,
-              less__default(typeof preprocessorOptions?.less === "boolean" ? void 0 : preprocessorOptions?.less)
-            )
-          ).pipe(gulpif__default(Boolean(postcssOptions), postcssrc__default(postcssOptions?.plugins, postcssOptions?.options))).pipe(transformWxss()).pipe(
-            gulpif__default(
-              loadSass || loadLess,
-              rename__default({
-                extname: ".wxss"
-              })
-            )
-          ).pipe(
-            gulp__default.dest(outDir, {
-              cwd
-            })
-          )
-        );
+        if (loadLess) {
+          pipes.push(less__default(typeof preprocessorOptions?.less === "boolean" ? void 0 : preprocessorOptions?.less));
+        }
+        if (postcssOptions) {
+          pipes.push(postcssrc__default(postcssOptions?.plugins, postcssOptions?.options));
+        }
+        pipes.push(transformWxss());
+        if (loadSass || loadLess) {
+          pipes.push(rename__default({
+            extname: ".wxss"
+          }));
+        }
+        pipes.push(gulp__default.dest(outDir, {
+          cwd
+        }));
+        return resolveTask({
+          cwd,
+          globs: [src, ...globs],
+          pipes: resolvePipes(pipes, assetType),
+          since: CssTask
+        });
       };
     });
   }
@@ -674,13 +742,15 @@ async function getTasks(options) {
       const src = `${base}**/*.${x}`;
       globsSet.add(src);
       return function HtmlTask() {
-        return promisify(
-          gulp__default.src([src, ...globs], { cwd, since: gulp__default.lastRun(HtmlTask) }).pipe(transformWxml()).pipe(
-            gulp__default.dest(outDir, {
-              cwd
-            })
-          )
-        );
+        const pipes = [transformWxml(), gulp__default.dest(outDir, {
+          cwd
+        })];
+        return resolveTask({
+          cwd,
+          globs: [src, ...globs],
+          pipes: resolvePipes(pipes, assetType),
+          since: HtmlTask
+        });
       };
     });
   }
@@ -690,13 +760,15 @@ async function getTasks(options) {
         return `${base}${x}`;
       });
       globsSet.add(globs);
-      return promisify(
-        gulp__default.src([...globs, ...outDirGlobs], { cwd, since: gulp__default.lastRun(copyOthers) }).pipe(
-          gulp__default.dest(outDir, {
-            cwd
-          })
-        )
-      );
+      const pipes = [gulp__default.dest(outDir, {
+        cwd
+      })];
+      return resolveTask({
+        cwd,
+        globs: [...globs, ...outDirGlobs, ...defaultNodeModulesDirs.map((x) => `!${x}`)],
+        pipes,
+        since: copyOthers
+      });
     }
   }
   return {
@@ -710,44 +782,13 @@ async function getTasks(options) {
   };
 }
 
-const defaultJavascriptExtensions = ["js"];
-const defaultTypescriptExtensions = ["ts"];
-const defaultWxsExtensions = ["wxs"];
-const defaultNodeModulesDirs = [
-  "**/node_modules/**",
-  "**/miniprogram_npm/**",
-  "**/project.config.json/**",
-  "**/project.private.config.json/**",
-  "**/package.json/**",
-  "postcss.config.js",
-  "tailwind.config.js",
-  "weapp-tw.config.js"
-];
 async function createBuilder(options) {
   let postcssOptionsFromConfig;
   try {
     postcssOptionsFromConfig = await loadPostcssConfig__default({ cwd: options?.root });
   } catch {
   }
-  const opt = defu(options, {
-    outDir: "dist",
-    weappTailwindcssOptions: {},
-    clean: true,
-    src: "",
-    exclude: [...defaultNodeModulesDirs],
-    include: ["**/*.{png,jpg,jpeg,gif,svg,webp}"],
-    extensions: {
-      javascript: [...defaultJavascriptExtensions, ...defaultTypescriptExtensions, ...defaultWxsExtensions],
-      html: ["wxml"],
-      css: ["wxss", "less", "sass", "scss"],
-      json: ["json"]
-    },
-    watchOptions: {
-      cwd: options?.root,
-      events: ["add", "change", "unlink", "ready"]
-    },
-    postcssOptions: postcssOptionsFromConfig
-  });
+  const opt = defu(options, getDefaultOptions(options, postcssOptionsFromConfig));
   const { copyOthers, getCssTasks, getHtmlTasks, getJsTasks, getJsonTasks, globsSet } = await getTasks(opt);
   const tasks = {
     css: getCssTasks(),

package/dist/index.d.cts

@@ -110,13 +110,20 @@ interface BuildOptions {
     watchOptions: WatchOptions;
     /**
      * @group 2.编译支持
-     * @description typescript 的编译配置，默认不传伟不编译 ts
+     * @description typescript 的编译配置，默认不传为不编译 ts
      * @description 需要安装 typescript
      */
     typescriptOptions: boolean | {
         settings?: Settings;
         tsConfigFileName?: string;
     };
+    /**
+     * @group 2.编译支持
+     * @description 扩展 cli 里默认的 gulp 文件流处理方式
+     * 第一个参数为原型注册的内置插件, 第二个参数为处理的文件类型
+     * 返回一个新的插件数组为取代原先的处理流程，返回 undefined 为使用默认处理流程
+     */
+    gulpChain: (plugins: any[], type: AssetType) => any[] | undefined;
 }
 type UserConfig = Partial<BuildOptions>;
 

package/dist/index.d.mts

@@ -110,13 +110,20 @@ interface BuildOptions {
     watchOptions: WatchOptions;
     /**
      * @group 2.编译支持
-     * @description typescript 的编译配置，默认不传伟不编译 ts
+     * @description typescript 的编译配置，默认不传为不编译 ts
      * @description 需要安装 typescript
      */
     typescriptOptions: boolean | {
         settings?: Settings;
         tsConfigFileName?: string;
     };
+    /**
+     * @group 2.编译支持
+     * @description 扩展 cli 里默认的 gulp 文件流处理方式
+     * 第一个参数为原型注册的内置插件, 第二个参数为处理的文件类型
+     * 返回一个新的插件数组为取代原先的处理流程，返回 undefined 为使用默认处理流程
+     */
+    gulpChain: (plugins: any[], type: AssetType) => any[] | undefined;
 }
 type UserConfig = Partial<BuildOptions>;
 

package/dist/index.d.ts

@@ -110,13 +110,20 @@ interface BuildOptions {
     watchOptions: WatchOptions;
     /**
      * @group 2.编译支持
-     * @description typescript 的编译配置，默认不传伟不编译 ts
+     * @description typescript 的编译配置，默认不传为不编译 ts
      * @description 需要安装 typescript
      */
     typescriptOptions: boolean | {
         settings?: Settings;
         tsConfigFileName?: string;
     };
+    /**
+     * @group 2.编译支持
+     * @description 扩展 cli 里默认的 gulp 文件流处理方式
+     * 第一个参数为原型注册的内置插件, 第二个参数为处理的文件类型
+     * 返回一个新的插件数组为取代原先的处理流程，返回 undefined 为使用默认处理流程
+     */
+    gulpChain: (plugins: any[], type: AssetType) => any[] | undefined;
 }
 type UserConfig = Partial<BuildOptions>;
 

package/dist/index.mjs

@@ -9,11 +9,9 @@ import { getPackageInfo } from 'local-pkg';
 import createDebug from 'debug';
 import { createPlugins } from 'weapp-tailwindcss/gulp';
 import postcssrc from 'gulp-postcss';
-import gulpif from 'gulp-if';
 import createSass from 'gulp-sass';
 import rename from 'gulp-rename';
 import less from 'gulp-less';
-import typescript from 'gulp-typescript';
 import { cosmiconfigSync } from 'cosmiconfig';
 
 function isPlainObject$2(value) {
@@ -72,10 +70,48 @@ function createDefu(merger) {
 }
 const defu = createDefu();
 
-const version = "1.0.2";
+const version = "1.0.4";
 
 const debug = createDebug("weapp-tw-cli");
 
+const defaultJavascriptExtensions = ["js"];
+const defaultTypescriptExtensions = ["ts"];
+const defaultWxsExtensions = ["wxs"];
+const defaultNodeModulesDirs = [
+  "**/node_modules/**",
+  "**/miniprogram_npm/**",
+  "**/project.config.json/**",
+  "**/project.private.config.json/**",
+  "**/package.json/**",
+  "postcss.config.js",
+  "tailwind.config.js",
+  "weapp-tw.config.js"
+];
+function noop() {
+}
+function getDefaultOptions(options, postcssOptionsFromConfig) {
+  return {
+    outDir: "dist",
+    weappTailwindcssOptions: {},
+    clean: true,
+    src: "",
+    exclude: [...defaultNodeModulesDirs],
+    include: ["**/*.{png,jpg,jpeg,gif,svg,webp}"],
+    extensions: {
+      javascript: [...defaultJavascriptExtensions, ...defaultTypescriptExtensions, ...defaultWxsExtensions],
+      html: ["wxml"],
+      css: ["wxss", "less", "sass", "scss"],
+      json: ["json"]
+    },
+    watchOptions: {
+      cwd: options?.root,
+      events: ["add", "change", "unlink", "ready"]
+    },
+    postcssOptions: postcssOptionsFromConfig,
+    gulpChain: noop
+  };
+}
+
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => {
@@ -114,6 +150,10 @@ class GlobsSet {
   }
 }
 
+function isStream(stream, { checkOpen = true } = {}) {
+  return stream !== null && typeof stream === "object" && (stream.writable || stream.readable || !checkOpen || stream.writable === void 0 && stream.readable === void 0) && typeof stream.pipe === "function";
+}
+
 var AssetType = /* @__PURE__ */ ((AssetType2) => {
   AssetType2["JavaScript"] = "javascript";
   AssetType2["Json"] = "json";
@@ -490,7 +530,6 @@ function promisify(task) {
     }
   });
 }
-
 function isSassLang(lang) {
   return lang === "scss" || lang === "sass";
 }
@@ -500,6 +539,24 @@ function isLessLang(lang) {
 function isTsLang(lang) {
   return lang === "ts";
 }
+
+function normalizePlugin(plugin) {
+  if (isStream(plugin)) {
+    return plugin;
+  } else if (typeof plugin === "function") {
+    return plugin.apply(plugin);
+  } else if (Array.isArray(plugin)) {
+    const [fn, ...args] = plugin;
+    return fn.apply(fn, args);
+  }
+}
+function resolveTask({ pipes, globs, since, cwd }) {
+  let chain = gulp.src(globs, { cwd, since: gulp.lastRun(since) });
+  for (const p of pipes) {
+    chain = chain.pipe(p);
+  }
+  return promisify(chain);
+}
 async function getTasks(options) {
   let { typescriptOptions } = options;
   const {
@@ -511,12 +568,20 @@ async function getTasks(options) {
     exclude,
     include,
     postcssOptions,
-    preprocessorOptions
+    preprocessorOptions,
+    gulpChain
   } = options;
   const globsSet = new GlobsSet();
   const base = srcBase ? `${srcBase}/` : "";
   const enableSass = Boolean(preprocessorOptions?.sass);
   const enableLess = Boolean(preprocessorOptions?.less);
+  function resolvePipes(plugins, type) {
+    const newPlugins = gulpChain(plugins, type);
+    if (newPlugins === void 0) {
+      return plugins;
+    }
+    return newPlugins.map((x) => normalizePlugin(x)).filter((x) => x);
+  }
   if (typescriptOptions === true) {
     typescriptOptions = {
       tsConfigFileName: "tsconfig.json"
@@ -530,6 +595,10 @@ async function getTasks(options) {
     const sassLib = await import('sass');
     sass = createSass(sassLib);
   }
+  let ts;
+  if (enableTs) {
+    ts = (await import('gulp-typescript')).default;
+  }
   const { transformJs, transformWxml, transformWxss } = createPlugins(weappTailwindcssOptions);
   const outDirGlobs = [`!${outDir}/**/*`, `!./${outDir}/**/*`];
   function getGlobs(type) {
@@ -556,36 +625,35 @@ async function getTasks(options) {
       const loadTs = enableTs && isTs;
       let gulpTs;
       if (enableTs && typeof typescriptOptions !== "boolean") {
-        gulpTs = typescript.createProject(
+        gulpTs = ts.createProject(
           typescriptOptions.tsConfigFileName ?? "tsconfig.json",
           typeof typescriptOptions === "boolean" ? {} : typescriptOptions
         );
       }
       return function JsTask() {
-        let chain = gulp.src([src, ...globs], { cwd, since: gulp.lastRun(JsTask) });
+        const pipes = [];
         if (loadTs) {
-          chain = chain.pipe(gulpTs());
+          pipes.push(gulpTs());
         }
-        return promisify(
-          chain.pipe(
-            transformJs({
-              babelParserOptions: !enableTs && isTs ? {
-                plugins: ["typescript"]
-              } : void 0
-            })
-          ).pipe(
-            gulpif(
-              loadTs,
-              rename({
-                extname: ".js"
-              })
-            )
-          ).pipe(
-            gulp.dest(outDir, {
-              cwd
-            })
-          )
-        );
+        pipes.push(transformJs({
+          babelParserOptions: !enableTs && isTs ? {
+            plugins: ["typescript"]
+          } : void 0
+        }));
+        if (loadTs) {
+          pipes.push(rename({
+            extname: ".js"
+          }));
+        }
+        pipes.push(gulp.dest(outDir, {
+          cwd
+        }));
+        return resolveTask({
+          pipes: resolvePipes(pipes, assetType),
+          cwd,
+          globs: [src, ...globs],
+          since: JsTask
+        });
       };
     });
   }
@@ -597,13 +665,15 @@ async function getTasks(options) {
       const src = `${base}**/*.${x}`;
       globsSet.add(src);
       return function JsonTask() {
-        return promisify(
-          gulp.src([src, ...globs], { cwd, since: gulp.lastRun(JsonTask) }).pipe(
-            gulp.dest(outDir, {
-              cwd
-            })
-          )
-        );
+        const pipes = [gulp.dest(outDir, {
+          cwd
+        })];
+        return resolveTask({
+          cwd,
+          globs: [src, ...globs],
+          pipes: resolvePipes(pipes, assetType),
+          since: JsonTask
+        });
       };
     });
   }
@@ -617,34 +687,34 @@ async function getTasks(options) {
       const loadSass = enableSass && isSassLang(x);
       const loadLess = enableLess && isLessLang(x);
       return function CssTask() {
-        let chain = gulp.src([src, ...globs], { cwd, since: gulp.lastRun(CssTask) });
+        const pipes = [];
         if (loadSass) {
-          chain = chain.pipe(
-            sass.sync(
-              // @ts-ignore
-              typeof preprocessorOptions?.sass === "boolean" ? void 0 : preprocessorOptions?.sass
-            ).on("error", sass.logError)
-          );
+          pipes.push(sass.sync(
+            // @ts-ignore
+            typeof preprocessorOptions?.sass === "boolean" ? void 0 : preprocessorOptions?.sass
+          ).on("error", sass.logError));
         }
-        return promisify(
-          chain.pipe(
-            gulpif(
-              loadLess,
-              less(typeof preprocessorOptions?.less === "boolean" ? void 0 : preprocessorOptions?.less)
-            )
-          ).pipe(gulpif(Boolean(postcssOptions), postcssrc(postcssOptions?.plugins, postcssOptions?.options))).pipe(transformWxss()).pipe(
-            gulpif(
-              loadSass || loadLess,
-              rename({
-                extname: ".wxss"
-              })
-            )
-          ).pipe(
-            gulp.dest(outDir, {
-              cwd
-            })
-          )
-        );
+        if (loadLess) {
+          pipes.push(less(typeof preprocessorOptions?.less === "boolean" ? void 0 : preprocessorOptions?.less));
+        }
+        if (postcssOptions) {
+          pipes.push(postcssrc(postcssOptions?.plugins, postcssOptions?.options));
+        }
+        pipes.push(transformWxss());
+        if (loadSass || loadLess) {
+          pipes.push(rename({
+            extname: ".wxss"
+          }));
+        }
+        pipes.push(gulp.dest(outDir, {
+          cwd
+        }));
+        return resolveTask({
+          cwd,
+          globs: [src, ...globs],
+          pipes: resolvePipes(pipes, assetType),
+          since: CssTask
+        });
       };
     });
   }
@@ -656,13 +726,15 @@ async function getTasks(options) {
       const src = `${base}**/*.${x}`;
       globsSet.add(src);
       return function HtmlTask() {
-        return promisify(
-          gulp.src([src, ...globs], { cwd, since: gulp.lastRun(HtmlTask) }).pipe(transformWxml()).pipe(
-            gulp.dest(outDir, {
-              cwd
-            })
-          )
-        );
+        const pipes = [transformWxml(), gulp.dest(outDir, {
+          cwd
+        })];
+        return resolveTask({
+          cwd,
+          globs: [src, ...globs],
+          pipes: resolvePipes(pipes, assetType),
+          since: HtmlTask
+        });
       };
     });
   }
@@ -672,13 +744,15 @@ async function getTasks(options) {
         return `${base}${x}`;
       });
       globsSet.add(globs);
-      return promisify(
-        gulp.src([...globs, ...outDirGlobs], { cwd, since: gulp.lastRun(copyOthers) }).pipe(
-          gulp.dest(outDir, {
-            cwd
-          })
-        )
-      );
+      const pipes = [gulp.dest(outDir, {
+        cwd
+      })];
+      return resolveTask({
+        cwd,
+        globs: [...globs, ...outDirGlobs, ...defaultNodeModulesDirs.map((x) => `!${x}`)],
+        pipes,
+        since: copyOthers
+      });
     }
   }
   return {
@@ -692,44 +766,13 @@ async function getTasks(options) {
   };
 }
 
-const defaultJavascriptExtensions = ["js"];
-const defaultTypescriptExtensions = ["ts"];
-const defaultWxsExtensions = ["wxs"];
-const defaultNodeModulesDirs = [
-  "**/node_modules/**",
-  "**/miniprogram_npm/**",
-  "**/project.config.json/**",
-  "**/project.private.config.json/**",
-  "**/package.json/**",
-  "postcss.config.js",
-  "tailwind.config.js",
-  "weapp-tw.config.js"
-];
 async function createBuilder(options) {
   let postcssOptionsFromConfig;
   try {
     postcssOptionsFromConfig = await loadPostcssConfig({ cwd: options?.root });
   } catch {
   }
-  const opt = defu(options, {
-    outDir: "dist",
-    weappTailwindcssOptions: {},
-    clean: true,
-    src: "",
-    exclude: [...defaultNodeModulesDirs],
-    include: ["**/*.{png,jpg,jpeg,gif,svg,webp}"],
-    extensions: {
-      javascript: [...defaultJavascriptExtensions, ...defaultTypescriptExtensions, ...defaultWxsExtensions],
-      html: ["wxml"],
-      css: ["wxss", "less", "sass", "scss"],
-      json: ["json"]
-    },
-    watchOptions: {
-      cwd: options?.root,
-      events: ["add", "change", "unlink", "ready"]
-    },
-    postcssOptions: postcssOptionsFromConfig
-  });
+  const opt = defu(options, getDefaultOptions(options, postcssOptionsFromConfig));
   const { copyOthers, getCssTasks, getHtmlTasks, getJsTasks, getJsonTasks, globsSet } = await getTasks(opt);
   const tasks = {
     css: getCssTasks(),

package/package.json

@@ -1,21 +1,26 @@
 {
   "name": "@weapp-tailwindcss/cli",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "The cli of weapp-tailwindcss",
-  "keywords": [
-    "weapp",
-    "tailwindcss",
-    "cli",
-    "plugin"
-  ],
   "author": "SonOfMagic <qq1324318532@gmail.com>",
   "license": "MIT",
+  "homepage": "https://weapp-tw.icebreaker.top/docs/quick-start/native/install",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/sonofmagic/weapp-tailwindcss.git"
+  },
   "bugs": {
     "url": "https://github.com/sonofmagic/weapp-tailwindcss/issues"
   },
-  "homepage": "https://weapp-tw.icebreaker.top/docs/quick-start/native/install",
+  "keywords": [
+    "weapp",
+    "tailwindcss",
+    "cli",
+    "plugin",
+    "gulp",
+    "native"
+  ],
   "sideEffects": false,
-  "type": "commonjs",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -29,31 +34,11 @@
   "files": [
     "dist"
   ],
-  "dependencies": {
-    "commander": "^12.0.0",
-    "cosmiconfig": "^9.0.0",
-    "debug": "4.3.4",
-    "del": "^7.1.0",
-    "fs-extra": "^11.2.0",
-    "gulp": "^4.0.2",
-    "gulp-debug": "^5.0.1",
-    "gulp-if": "^3.0.0",
-    "gulp-less": "^5.0.0",
-    "gulp-plumber": "^1.2.1",
-    "gulp-postcss": "^10.0.0",
-    "gulp-rename": "^2.0.0",
-    "gulp-sass": "^5.1.0",
-    "gulp-typescript": "6.0.0-alpha.1",
-    "local-pkg": "^0.5.0",
-    "picocolors": "^1.0.0",
-    "postcss": "^8.4.38",
-    "postcss-load-config": "^5.1.0"
-  },
   "peerDependencies": {
     "less": "*",
     "sass": "*",
     "typescript": "*",
-    "weapp-tailwindcss": "3.2.1"
+    "weapp-tailwindcss": "3.3.4"
   },
   "peerDependenciesMeta": {
     "less": {
@@ -66,10 +51,32 @@
       "optional": true
     }
   },
+  "dependencies": {
+    "commander": "^12.1.0",
+    "cosmiconfig": "^9.0.0",
+    "debug": "4.3.5",
+    "del": "^7.1.0",
+    "fs-extra": "^11.2.0",
+    "gulp": "^4.0.2",
+    "gulp-debug": "^5.0.1",
+    "gulp-less": "^5.0.0",
+    "gulp-plumber": "^1.2.1",
+    "gulp-postcss": "^10.0.0",
+    "gulp-rename": "^2.0.0",
+    "gulp-sass": "^5.1.0",
+    "gulp-typescript": "6.0.0-alpha.1",
+    "local-pkg": "^0.5.0",
+    "picocolors": "^1.0.1",
+    "postcss": "^8.4.39",
+    "postcss-load-config": "^6.0.1"
+  },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
   },
+  "devDependencies": {
+    "tailwindcss": "^3.4.4"
+  },
   "scripts": {
     "dev": "unbuild --sourcemap",
     "build": "unbuild",