@weapp-tailwindcss/cli 0.0.0-alpha.7 → 0.0.0-alpha.9

package/README.md

@@ -1,16 +1,3 @@
 # @weapp-tailwindcss/cli
 
-```json
-{
-  "setting": {
-    "packNpmManually": true,
-    "packNpmRelationList": [
-      {
-        "packageJsonPath": "./package.json",
-        "miniprogramNpmDistDir": "./dist"
-      }
-    ]
-  },
-  "miniprogramRoot": "dist/"
-}
-```
+<https://weapp-tw.icebreaker.top/docs/quick-start/native/install>

package/dist/index.cjs

@@ -6,10 +6,10 @@ const fs = require('fs-extra');
 const gulp$1 = require('gulp');
 const loadPostcssConfig = require('postcss-load-config');
 const pc = require('picocolors');
+const localPkg = require('local-pkg');
 const createDebug = require('debug');
 const gulp = require('weapp-tailwindcss/gulp');
 const postcssrc = require('gulp-postcss');
-const plumber = require('gulp-plumber');
 const gulpif = require('gulp-if');
 const createSass = require('gulp-sass');
 const rename = require('gulp-rename');
@@ -26,7 +26,6 @@ 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 plumber__default = /*#__PURE__*/_interopDefaultCompat(plumber);
 const gulpif__default = /*#__PURE__*/_interopDefaultCompat(gulpif);
 const createSass__default = /*#__PURE__*/_interopDefaultCompat(createSass);
 const rename__default = /*#__PURE__*/_interopDefaultCompat(rename);
@@ -89,8 +88,48 @@ function createDefu(merger) {
 }
 const defu = createDefu();
 
+const version = "0.0.0-alpha.9";
+
 const debug = createDebug__default("weapp-tw-cli");
 
+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) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+class GlobsSet {
+  constructor() {
+    __publicField(this, "includeSet");
+    __publicField(this, "excludeSet");
+    this.includeSet = /* @__PURE__ */ new Set();
+    this.excludeSet = /* @__PURE__ */ new Set();
+  }
+  isExcludeGlob(value) {
+    return value[0] === "!";
+  }
+  addSingle(value) {
+    return this.isExcludeGlob(value) ? this.excludeSet.add(value) : this.includeSet.add(value);
+  }
+  add(...value) {
+    for (const v of value) {
+      if (Array.isArray(v)) {
+        for (const vv of v) {
+          this.addSingle(vv);
+        }
+      } else {
+        this.addSingle(v);
+      }
+    }
+  }
+  dump() {
+    return [...this.includeSet, ...this.excludeSet];
+  }
+  dumpIgnored() {
+    return [...this.excludeSet].map((x) => x.slice(1));
+  }
+}
+
 var AssetType = /* @__PURE__ */ ((AssetType2) => {
   AssetType2["JavaScript"] = "javascript";
   AssetType2["Json"] = "json";
@@ -450,6 +489,23 @@ const get = /*@__PURE__*/getDefaultExportFromCjs(getValue);
 function isObject(x) {
   return typeof x === "object" && x !== null;
 }
+function promisify(task) {
+  return new Promise((resolve, reject) => {
+    if (Array.isArray(task)) {
+      return Promise.all(task.map((x) => promisify(x))).then(resolve).catch(reject);
+    } else {
+      if (task.destroyed) {
+        resolve(void 0);
+        return;
+      }
+      task.on("finish", () => {
+        resolve(void 0);
+      }).on("error", (err) => {
+        reject(err);
+      });
+    }
+  });
+}
 
 function isSassLang(lang) {
   return lang === "scss" || lang === "sass";
@@ -463,7 +519,7 @@ function isTsLang(lang) {
 async function getTasks(options) {
   let { typescriptOptions } = options;
   const { root: cwd, weappTailwindcssOptions, outDir, src: srcBase, extensions, exclude, include, postcssOptions, preprocessorOptions } = options;
-  const globsSet = /* @__PURE__ */ new Set();
+  const globsSet = new GlobsSet();
   const base = srcBase ? srcBase + "/" : "";
   const enableSass = Boolean(preprocessorOptions?.sass);
   const enableLess = Boolean(preprocessorOptions?.less);
@@ -481,17 +537,6 @@ async function getTasks(options) {
     sass = createSass__default(sassLib);
   }
   const { transformJs, transformWxml, transformWxss } = gulp.createPlugins(weappTailwindcssOptions);
-  function globsSetAdd(...value) {
-    for (const v of value) {
-      if (Array.isArray(v)) {
-        for (const vv of v) {
-          globsSet.add(vv);
-        }
-      } else {
-        globsSet.add(v);
-      }
-    }
-  }
   function getGlobs(type) {
     const globs = [];
     if (typeof include === "function") {
@@ -503,15 +548,16 @@ async function getTasks(options) {
       globs.push(...exclude.map((x) => "!" + x));
     }
     globs.push(`!${outDir}/**/*`);
+    globs.push(`!./${outDir}/**/*`);
     return globs;
   }
   function getJsTasks() {
     const assetType = AssetType.JavaScript;
     const globs = getGlobs(assetType);
-    globsSetAdd(globs);
+    globsSet.add(globs);
     return extensions[assetType]?.map((x) => {
       const src = `${base}**/*.${x}`;
-      globsSetAdd(src);
+      globsSet.add(src);
       const isTs = isTsLang(x);
       const loadTs = enableTs && isTs;
       let gulpTs;
@@ -519,27 +565,29 @@ async function getTasks(options) {
         gulpTs = typescript__default.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) }).pipe(plumber__default());
+        let chain = gulp__default.src([src, ...globs], { cwd, since: gulp__default.lastRun(JsTask) });
         if (loadTs) {
           chain = chain.pipe(gulpTs());
         }
-        return chain.pipe(
-          transformJs({
-            babelParserOptions: !enableTs && isTs ? {
-              plugins: ["typescript"]
-            } : void 0
-          })
-        ).pipe(
-          gulpif__default(
-            loadTs,
-            rename__default({
-              extname: ".js"
+        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
             })
           )
-        ).pipe(
-          gulp__default.dest(outDir, {
-            cwd
-          })
         );
       };
     });
@@ -547,15 +595,17 @@ async function getTasks(options) {
   function getJsonTasks() {
     const assetType = AssetType.Json;
     const globs = getGlobs(assetType);
-    globsSetAdd(globs);
+    globsSet.add(globs);
     return extensions[assetType]?.map((x) => {
       const src = `${base}**/*.${x}`;
-      globsSetAdd(src);
+      globsSet.add(src);
       return function JsonTask() {
-        return gulp__default.src([src, ...globs], { cwd, since: gulp__default.lastRun(JsonTask) }).pipe(plumber__default()).pipe(
-          gulp__default.dest(outDir, {
-            cwd
-          })
+        return promisify(
+          gulp__default.src([src, ...globs], { cwd, since: gulp__default.lastRun(JsonTask) }).pipe(
+            gulp__default.dest(outDir, {
+              cwd
+            })
+          )
         );
       };
     });
@@ -563,14 +613,14 @@ async function getTasks(options) {
   function getCssTasks() {
     const assetType = AssetType.Css;
     const globs = getGlobs(assetType);
-    globsSetAdd(globs);
+    globsSet.add(globs);
     return extensions[assetType]?.map((x) => {
       const src = `${base}**/*.${x}`;
-      globsSetAdd(src);
+      globsSet.add(src);
       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) }).pipe(plumber__default());
+        let chain = gulp__default.src([src, ...globs], { cwd, since: gulp__default.lastRun(CssTask) });
         if (loadSass) {
           chain = chain.pipe(
             sass.sync(
@@ -579,17 +629,19 @@ async function getTasks(options) {
             ).on("error", sass.logError)
           );
         }
-        return 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"
+        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
             })
           )
-        ).pipe(
-          gulp__default.dest(outDir, {
-            cwd
-          })
         );
       };
     });
@@ -597,15 +649,17 @@ async function getTasks(options) {
   function getHtmlTasks() {
     const assetType = AssetType.Html;
     const globs = getGlobs(assetType);
-    globsSetAdd(globs);
+    globsSet.add(globs);
     return extensions[assetType]?.map((x) => {
       const src = `${base}**/*.${x}`;
-      globsSetAdd(src);
+      globsSet.add(src);
       return function HtmlTask() {
-        return gulp__default.src([src, ...globs], { cwd, since: gulp__default.lastRun(HtmlTask) }).pipe(plumber__default()).pipe(transformWxml()).pipe(
-          gulp__default.dest(outDir, {
-            cwd
-          })
+        return promisify(
+          gulp__default.src([src, ...globs], { cwd, since: gulp__default.lastRun(HtmlTask) }).pipe(transformWxml()).pipe(
+            gulp__default.dest(outDir, {
+              cwd
+            })
+          )
         );
       };
     });
@@ -615,11 +669,13 @@ async function getTasks(options) {
       const globs = include.map((x) => {
         return `${base}${x}`;
       });
-      globsSetAdd(globs);
-      return gulp__default.src(globs, { cwd, since: gulp__default.lastRun(copyOthers) }).pipe(plumber__default()).pipe(
-        gulp__default.dest(outDir, {
-          cwd
-        })
+      globsSet.add(globs);
+      return promisify(
+        gulp__default.src(globs, { cwd, since: gulp__default.lastRun(copyOthers) }).pipe(
+          gulp__default.dest(outDir, {
+            cwd
+          })
+        )
       );
     }
   }
@@ -644,7 +700,8 @@ const defaultNodeModulesDirs = [
   "**/project.private.config.json/**",
   "**/package.json/**",
   "postcss.config.js",
-  "tailwind.config.js"
+  "tailwind.config.js",
+  "weapp-tw.config.js"
 ];
 async function createBuilder(options) {
   let postcssOptionsFromConfig;
@@ -665,6 +722,7 @@ async function createBuilder(options) {
       json: ["json"]
     },
     watchOptions: {
+      cwd: options?.root,
       events: ["add", "change", "unlink", "ready"]
     },
     postcssOptions: postcssOptionsFromConfig
@@ -683,10 +741,7 @@ async function createBuilder(options) {
       if (value) {
         debug(`run task ${pc__default.bold(pc__default.green(key))} start`);
         for (const task of value) {
-          const s = task();
-          if (s) {
-            await new Promise((resolve, reject) => s.on("finish", resolve).on("error", reject));
-          }
+          await task();
         }
         debug(`run task ${pc__default.bold(pc__default.green(key))} end`);
       }
@@ -710,7 +765,10 @@ async function createBuilder(options) {
     },
     watch() {
       fs.ensureDirSync(path__default.resolve(cwd, outDir));
-      const watcher = gulp__default.watch([...globsSet], watchOptions, async (cb) => {
+      const dumps = globsSet.dump();
+      const arr = (Array.isArray(watchOptions.ignored) ? watchOptions.ignored : [watchOptions.ignored]).filter(Boolean);
+      watchOptions.ignored = [...globsSet.dumpIgnored(), ...arr];
+      const watcher = gulp__default.watch(dumps, watchOptions, async (cb) => {
         try {
           await runTasks();
           cb();
@@ -727,8 +785,13 @@ async function createBuilder(options) {
       watcher.on("unlink", function(path2) {
         console.log(`${pc__default.green("remove")} ${path2}`);
       });
-      watcher.on("ready", function() {
-        console.log(`${pc__default.green("weapp")}-${pc__default.blue("tailwindcss")} is ready!`);
+      watcher.on("ready", async function() {
+        const meta = await localPkg.getPackageInfo("weapp-tailwindcss");
+        let weappTwVersionStr = "";
+        if (meta) {
+          weappTwVersionStr = `(${pc__default.blue(pc__default.underline(meta.version))})`;
+        }
+        console.log(`${pc__default.bold(`${pc__default.green("weapp")}-${pc__default.blue("tailwindcss")}`)}${weappTwVersionStr} ${pc__default.cyan("cli")}(${pc__default.blue(pc__default.underline(version))}) is ready!`);
       });
       this.watcher = watcher;
       return this;
@@ -818,6 +881,7 @@ function updatePackageJson(options) {
       const packageJson = fs__default.readJSONSync(packageJsonPath);
       set(packageJson, "scripts.dev", "weapp-tw dev");
       set(packageJson, "scripts.build", "weapp-tw build");
+      set(packageJson, "scripts.postinstall", "weapp-tw patch");
       fs__default.outputJSONSync(dest ?? packageJsonPath, packageJson, {
         spaces: 2
       });
@@ -848,7 +912,9 @@ export default defineConfig(${configOptionsStr})
     fs__default.writeFileSync(
       configPath,
       `/** @type {import('@weapp-tailwindcss/cli').UserConfig} */
-module.exports = ${configOptionsStr}
+const config = ${configOptionsStr}
+
+module.exports = config
 `,
       "utf8"
     );

package/dist/index.d.cts

@@ -9,6 +9,17 @@ import * as cosmiconfig from 'cosmiconfig';
 
 declare function createCli(): Command;
 
+declare class GlobsSet {
+    includeSet: Set<string>;
+    excludeSet: Set<string>;
+    constructor();
+    isExcludeGlob(value: string): boolean;
+    addSingle(value: string): Set<string>;
+    add(...value: string[] | string[][]): void;
+    dump(): string[];
+    dumpIgnored(): string[];
+}
+
 declare enum AssetType {
     JavaScript = "javascript",
     Json = "json",
@@ -29,25 +40,79 @@ interface GulpSassOptions extends Options<'sync'> {
     sync?: boolean | undefined;
 }
 interface BuildOptions {
+    /**
+     * @group 0.重要配置
+     * @description 传递给 `weapp-tailwindcss` 的选项, [参考配置](/docs/api/interfaces/UserDefinedOptions)
+     */
     weappTailwindcssOptions: UserDefinedOptions;
+    /**
+     * @group 1.打包配置
+     * @default `dist`
+     * @description 输出目录
+     */
     outDir: string;
+    /**
+     * @group 1.打包配置
+     * @default `process.cwd()`
+     * @description 根目录
+     */
     root: string;
+    /**
+     * @group 3.一般配置
+     * @default `true`
+     * @description build 的时候是否清除
+     */
     clean: boolean;
+    /**
+     * @group 1.打包配置
+     * @default `.`
+     * @description src 目录，相对路径，通常用于原生 typescript 项目
+     */
     src: string;
+    /**
+     * @group 1.打包配置
+     * @description 排除的文件目录
+     */
     exclude: string[] | ((type: AssetType) => string[]);
+    /**
+     * @group 1.打包配置
+     * @description 包括的文件目录
+     */
     include: string[] | ((type: AssetType) => string[]);
+    /**
+     * @group 1.打包配置
+     * @description 包括的文件后缀分类
+     */
     extensions: {
         javascript?: string[];
         html?: string[];
         css?: string[];
         json?: string[];
     };
+    /**
+     * @group 1.打包配置
+     * @description postcss 配置，默认会去请求 `root` 下的 `postcss.config.js`
+     */
     postcssOptions?: Partial<Omit<Result, 'file'>>;
+    /**
+     * @group 2.编译支持
+     * @description 预处理配置，支持 sass 和 less，需要传入来开启编译
+     * @description 启用 sass 需要安装 sass, less 同样
+     */
     preprocessorOptions?: {
         sass?: boolean | GulpSassOptions;
         less?: boolean | GulpLessOptions;
     };
+    /**
+     * @group 1.打包配置
+     * @description weapp-tw dev 的 watch 配置
+     */
     watchOptions: WatchOptions;
+    /**
+     * @group 2.编译支持
+     * @description typescript 的编译配置，默认不传伟不编译 ts
+     * @description 需要安装 typescript
+     */
     typescriptOptions: boolean | {
         settings?: Settings;
         tsConfigFileName?: string;
@@ -59,19 +124,19 @@ declare function createBuilder(options?: Partial<BuildOptions>): Promise<{
     watcher: FSWatcher | undefined;
     build(): Promise<any>;
     watch(): any;
-    globsSet: Set<string>;
+    globsSet: GlobsSet;
 }>;
 declare function build(options?: Partial<BuildOptions>): Promise<{
     watcher: FSWatcher | undefined;
     build(): Promise<any>;
     watch(): any;
-    globsSet: Set<string>;
+    globsSet: GlobsSet;
 }>;
 declare function watch(options?: Partial<BuildOptions>): Promise<{
     watcher: FSWatcher | undefined;
     build(): Promise<any>;
     watch(): any;
-    globsSet: Set<string>;
+    globsSet: GlobsSet;
 }>;
 
 type WeappTwCosmiconfigResult = {

package/dist/index.d.mts

@@ -9,6 +9,17 @@ import * as cosmiconfig from 'cosmiconfig';
 
 declare function createCli(): Command;
 
+declare class GlobsSet {
+    includeSet: Set<string>;
+    excludeSet: Set<string>;
+    constructor();
+    isExcludeGlob(value: string): boolean;
+    addSingle(value: string): Set<string>;
+    add(...value: string[] | string[][]): void;
+    dump(): string[];
+    dumpIgnored(): string[];
+}
+
 declare enum AssetType {
     JavaScript = "javascript",
     Json = "json",
@@ -29,25 +40,79 @@ interface GulpSassOptions extends Options<'sync'> {
     sync?: boolean | undefined;
 }
 interface BuildOptions {
+    /**
+     * @group 0.重要配置
+     * @description 传递给 `weapp-tailwindcss` 的选项, [参考配置](/docs/api/interfaces/UserDefinedOptions)
+     */
     weappTailwindcssOptions: UserDefinedOptions;
+    /**
+     * @group 1.打包配置
+     * @default `dist`
+     * @description 输出目录
+     */
     outDir: string;
+    /**
+     * @group 1.打包配置
+     * @default `process.cwd()`
+     * @description 根目录
+     */
     root: string;
+    /**
+     * @group 3.一般配置
+     * @default `true`
+     * @description build 的时候是否清除
+     */
     clean: boolean;
+    /**
+     * @group 1.打包配置
+     * @default `.`
+     * @description src 目录，相对路径，通常用于原生 typescript 项目
+     */
     src: string;
+    /**
+     * @group 1.打包配置
+     * @description 排除的文件目录
+     */
     exclude: string[] | ((type: AssetType) => string[]);
+    /**
+     * @group 1.打包配置
+     * @description 包括的文件目录
+     */
     include: string[] | ((type: AssetType) => string[]);
+    /**
+     * @group 1.打包配置
+     * @description 包括的文件后缀分类
+     */
     extensions: {
         javascript?: string[];
         html?: string[];
         css?: string[];
         json?: string[];
     };
+    /**
+     * @group 1.打包配置
+     * @description postcss 配置，默认会去请求 `root` 下的 `postcss.config.js`
+     */
     postcssOptions?: Partial<Omit<Result, 'file'>>;
+    /**
+     * @group 2.编译支持
+     * @description 预处理配置，支持 sass 和 less，需要传入来开启编译
+     * @description 启用 sass 需要安装 sass, less 同样
+     */
     preprocessorOptions?: {
         sass?: boolean | GulpSassOptions;
         less?: boolean | GulpLessOptions;
     };
+    /**
+     * @group 1.打包配置
+     * @description weapp-tw dev 的 watch 配置
+     */
     watchOptions: WatchOptions;
+    /**
+     * @group 2.编译支持
+     * @description typescript 的编译配置，默认不传伟不编译 ts
+     * @description 需要安装 typescript
+     */
     typescriptOptions: boolean | {
         settings?: Settings;
         tsConfigFileName?: string;
@@ -59,19 +124,19 @@ declare function createBuilder(options?: Partial<BuildOptions>): Promise<{
     watcher: FSWatcher | undefined;
     build(): Promise<any>;
     watch(): any;
-    globsSet: Set<string>;
+    globsSet: GlobsSet;
 }>;
 declare function build(options?: Partial<BuildOptions>): Promise<{
     watcher: FSWatcher | undefined;
     build(): Promise<any>;
     watch(): any;
-    globsSet: Set<string>;
+    globsSet: GlobsSet;
 }>;
 declare function watch(options?: Partial<BuildOptions>): Promise<{
     watcher: FSWatcher | undefined;
     build(): Promise<any>;
     watch(): any;
-    globsSet: Set<string>;
+    globsSet: GlobsSet;
 }>;
 
 type WeappTwCosmiconfigResult = {

package/dist/index.d.ts

@@ -9,6 +9,17 @@ import * as cosmiconfig from 'cosmiconfig';
 
 declare function createCli(): Command;
 
+declare class GlobsSet {
+    includeSet: Set<string>;
+    excludeSet: Set<string>;
+    constructor();
+    isExcludeGlob(value: string): boolean;
+    addSingle(value: string): Set<string>;
+    add(...value: string[] | string[][]): void;
+    dump(): string[];
+    dumpIgnored(): string[];
+}
+
 declare enum AssetType {
     JavaScript = "javascript",
     Json = "json",
@@ -29,25 +40,79 @@ interface GulpSassOptions extends Options<'sync'> {
     sync?: boolean | undefined;
 }
 interface BuildOptions {
+    /**
+     * @group 0.重要配置
+     * @description 传递给 `weapp-tailwindcss` 的选项, [参考配置](/docs/api/interfaces/UserDefinedOptions)
+     */
     weappTailwindcssOptions: UserDefinedOptions;
+    /**
+     * @group 1.打包配置
+     * @default `dist`
+     * @description 输出目录
+     */
     outDir: string;
+    /**
+     * @group 1.打包配置
+     * @default `process.cwd()`
+     * @description 根目录
+     */
     root: string;
+    /**
+     * @group 3.一般配置
+     * @default `true`
+     * @description build 的时候是否清除
+     */
     clean: boolean;
+    /**
+     * @group 1.打包配置
+     * @default `.`
+     * @description src 目录，相对路径，通常用于原生 typescript 项目
+     */
     src: string;
+    /**
+     * @group 1.打包配置
+     * @description 排除的文件目录
+     */
     exclude: string[] | ((type: AssetType) => string[]);
+    /**
+     * @group 1.打包配置
+     * @description 包括的文件目录
+     */
     include: string[] | ((type: AssetType) => string[]);
+    /**
+     * @group 1.打包配置
+     * @description 包括的文件后缀分类
+     */
     extensions: {
         javascript?: string[];
         html?: string[];
         css?: string[];
         json?: string[];
     };
+    /**
+     * @group 1.打包配置
+     * @description postcss 配置，默认会去请求 `root` 下的 `postcss.config.js`
+     */
     postcssOptions?: Partial<Omit<Result, 'file'>>;
+    /**
+     * @group 2.编译支持
+     * @description 预处理配置，支持 sass 和 less，需要传入来开启编译
+     * @description 启用 sass 需要安装 sass, less 同样
+     */
     preprocessorOptions?: {
         sass?: boolean | GulpSassOptions;
         less?: boolean | GulpLessOptions;
     };
+    /**
+     * @group 1.打包配置
+     * @description weapp-tw dev 的 watch 配置
+     */
     watchOptions: WatchOptions;
+    /**
+     * @group 2.编译支持
+     * @description typescript 的编译配置，默认不传伟不编译 ts
+     * @description 需要安装 typescript
+     */
     typescriptOptions: boolean | {
         settings?: Settings;
         tsConfigFileName?: string;
@@ -59,19 +124,19 @@ declare function createBuilder(options?: Partial<BuildOptions>): Promise<{
     watcher: FSWatcher | undefined;
     build(): Promise<any>;
     watch(): any;
-    globsSet: Set<string>;
+    globsSet: GlobsSet;
 }>;
 declare function build(options?: Partial<BuildOptions>): Promise<{
     watcher: FSWatcher | undefined;
     build(): Promise<any>;
     watch(): any;
-    globsSet: Set<string>;
+    globsSet: GlobsSet;
 }>;
 declare function watch(options?: Partial<BuildOptions>): Promise<{
     watcher: FSWatcher | undefined;
     build(): Promise<any>;
     watch(): any;
-    globsSet: Set<string>;
+    globsSet: GlobsSet;
 }>;
 
 type WeappTwCosmiconfigResult = {

package/dist/index.mjs

@@ -4,10 +4,10 @@ import fs, { ensureDirSync } from 'fs-extra';
 import gulp from 'gulp';
 import loadPostcssConfig from 'postcss-load-config';
 import pc from 'picocolors';
+import { getPackageInfo } from 'local-pkg';
 import createDebug from 'debug';
 import { createPlugins } from 'weapp-tailwindcss/gulp';
 import postcssrc from 'gulp-postcss';
-import plumber from 'gulp-plumber';
 import gulpif from 'gulp-if';
 import createSass from 'gulp-sass';
 import rename from 'gulp-rename';
@@ -71,8 +71,48 @@ function createDefu(merger) {
 }
 const defu = createDefu();
 
+const version = "0.0.0-alpha.9";
+
 const debug = createDebug("weapp-tw-cli");
 
+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) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+class GlobsSet {
+  constructor() {
+    __publicField(this, "includeSet");
+    __publicField(this, "excludeSet");
+    this.includeSet = /* @__PURE__ */ new Set();
+    this.excludeSet = /* @__PURE__ */ new Set();
+  }
+  isExcludeGlob(value) {
+    return value[0] === "!";
+  }
+  addSingle(value) {
+    return this.isExcludeGlob(value) ? this.excludeSet.add(value) : this.includeSet.add(value);
+  }
+  add(...value) {
+    for (const v of value) {
+      if (Array.isArray(v)) {
+        for (const vv of v) {
+          this.addSingle(vv);
+        }
+      } else {
+        this.addSingle(v);
+      }
+    }
+  }
+  dump() {
+    return [...this.includeSet, ...this.excludeSet];
+  }
+  dumpIgnored() {
+    return [...this.excludeSet].map((x) => x.slice(1));
+  }
+}
+
 var AssetType = /* @__PURE__ */ ((AssetType2) => {
   AssetType2["JavaScript"] = "javascript";
   AssetType2["Json"] = "json";
@@ -432,6 +472,23 @@ const get = /*@__PURE__*/getDefaultExportFromCjs(getValue);
 function isObject(x) {
   return typeof x === "object" && x !== null;
 }
+function promisify(task) {
+  return new Promise((resolve, reject) => {
+    if (Array.isArray(task)) {
+      return Promise.all(task.map((x) => promisify(x))).then(resolve).catch(reject);
+    } else {
+      if (task.destroyed) {
+        resolve(void 0);
+        return;
+      }
+      task.on("finish", () => {
+        resolve(void 0);
+      }).on("error", (err) => {
+        reject(err);
+      });
+    }
+  });
+}
 
 function isSassLang(lang) {
   return lang === "scss" || lang === "sass";
@@ -445,7 +502,7 @@ function isTsLang(lang) {
 async function getTasks(options) {
   let { typescriptOptions } = options;
   const { root: cwd, weappTailwindcssOptions, outDir, src: srcBase, extensions, exclude, include, postcssOptions, preprocessorOptions } = options;
-  const globsSet = /* @__PURE__ */ new Set();
+  const globsSet = new GlobsSet();
   const base = srcBase ? srcBase + "/" : "";
   const enableSass = Boolean(preprocessorOptions?.sass);
   const enableLess = Boolean(preprocessorOptions?.less);
@@ -463,17 +520,6 @@ async function getTasks(options) {
     sass = createSass(sassLib);
   }
   const { transformJs, transformWxml, transformWxss } = createPlugins(weappTailwindcssOptions);
-  function globsSetAdd(...value) {
-    for (const v of value) {
-      if (Array.isArray(v)) {
-        for (const vv of v) {
-          globsSet.add(vv);
-        }
-      } else {
-        globsSet.add(v);
-      }
-    }
-  }
   function getGlobs(type) {
     const globs = [];
     if (typeof include === "function") {
@@ -485,15 +531,16 @@ async function getTasks(options) {
       globs.push(...exclude.map((x) => "!" + x));
     }
     globs.push(`!${outDir}/**/*`);
+    globs.push(`!./${outDir}/**/*`);
     return globs;
   }
   function getJsTasks() {
     const assetType = AssetType.JavaScript;
     const globs = getGlobs(assetType);
-    globsSetAdd(globs);
+    globsSet.add(globs);
     return extensions[assetType]?.map((x) => {
       const src = `${base}**/*.${x}`;
-      globsSetAdd(src);
+      globsSet.add(src);
       const isTs = isTsLang(x);
       const loadTs = enableTs && isTs;
       let gulpTs;
@@ -501,27 +548,29 @@ async function getTasks(options) {
         gulpTs = typescript.createProject(typescriptOptions.tsConfigFileName ?? "tsconfig.json", typeof typescriptOptions === "boolean" ? {} : typescriptOptions);
       }
       return function JsTask() {
-        let chain = gulp.src([src, ...globs], { cwd, since: gulp.lastRun(JsTask) }).pipe(plumber());
+        let chain = gulp.src([src, ...globs], { cwd, since: gulp.lastRun(JsTask) });
         if (loadTs) {
           chain = chain.pipe(gulpTs());
         }
-        return chain.pipe(
-          transformJs({
-            babelParserOptions: !enableTs && isTs ? {
-              plugins: ["typescript"]
-            } : void 0
-          })
-        ).pipe(
-          gulpif(
-            loadTs,
-            rename({
-              extname: ".js"
+        return promisify(
+          chain.pipe(
+            transformJs({
+              babelParserOptions: !enableTs && isTs ? {
+                plugins: ["typescript"]
+              } : void 0
+            })
+          ).pipe(
+            gulpif(
+              loadTs,
+              rename({
+                extname: ".js"
+              })
+            )
+          ).pipe(
+            gulp.dest(outDir, {
+              cwd
             })
           )
-        ).pipe(
-          gulp.dest(outDir, {
-            cwd
-          })
         );
       };
     });
@@ -529,15 +578,17 @@ async function getTasks(options) {
   function getJsonTasks() {
     const assetType = AssetType.Json;
     const globs = getGlobs(assetType);
-    globsSetAdd(globs);
+    globsSet.add(globs);
     return extensions[assetType]?.map((x) => {
       const src = `${base}**/*.${x}`;
-      globsSetAdd(src);
+      globsSet.add(src);
       return function JsonTask() {
-        return gulp.src([src, ...globs], { cwd, since: gulp.lastRun(JsonTask) }).pipe(plumber()).pipe(
-          gulp.dest(outDir, {
-            cwd
-          })
+        return promisify(
+          gulp.src([src, ...globs], { cwd, since: gulp.lastRun(JsonTask) }).pipe(
+            gulp.dest(outDir, {
+              cwd
+            })
+          )
         );
       };
     });
@@ -545,14 +596,14 @@ async function getTasks(options) {
   function getCssTasks() {
     const assetType = AssetType.Css;
     const globs = getGlobs(assetType);
-    globsSetAdd(globs);
+    globsSet.add(globs);
     return extensions[assetType]?.map((x) => {
       const src = `${base}**/*.${x}`;
-      globsSetAdd(src);
+      globsSet.add(src);
       const loadSass = enableSass && isSassLang(x);
       const loadLess = enableLess && isLessLang(x);
       return function CssTask() {
-        let chain = gulp.src([src, ...globs], { cwd, since: gulp.lastRun(CssTask) }).pipe(plumber());
+        let chain = gulp.src([src, ...globs], { cwd, since: gulp.lastRun(CssTask) });
         if (loadSass) {
           chain = chain.pipe(
             sass.sync(
@@ -561,17 +612,19 @@ async function getTasks(options) {
             ).on("error", sass.logError)
           );
         }
-        return 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"
+        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
             })
           )
-        ).pipe(
-          gulp.dest(outDir, {
-            cwd
-          })
         );
       };
     });
@@ -579,15 +632,17 @@ async function getTasks(options) {
   function getHtmlTasks() {
     const assetType = AssetType.Html;
     const globs = getGlobs(assetType);
-    globsSetAdd(globs);
+    globsSet.add(globs);
     return extensions[assetType]?.map((x) => {
       const src = `${base}**/*.${x}`;
-      globsSetAdd(src);
+      globsSet.add(src);
       return function HtmlTask() {
-        return gulp.src([src, ...globs], { cwd, since: gulp.lastRun(HtmlTask) }).pipe(plumber()).pipe(transformWxml()).pipe(
-          gulp.dest(outDir, {
-            cwd
-          })
+        return promisify(
+          gulp.src([src, ...globs], { cwd, since: gulp.lastRun(HtmlTask) }).pipe(transformWxml()).pipe(
+            gulp.dest(outDir, {
+              cwd
+            })
+          )
         );
       };
     });
@@ -597,11 +652,13 @@ async function getTasks(options) {
       const globs = include.map((x) => {
         return `${base}${x}`;
       });
-      globsSetAdd(globs);
-      return gulp.src(globs, { cwd, since: gulp.lastRun(copyOthers) }).pipe(plumber()).pipe(
-        gulp.dest(outDir, {
-          cwd
-        })
+      globsSet.add(globs);
+      return promisify(
+        gulp.src(globs, { cwd, since: gulp.lastRun(copyOthers) }).pipe(
+          gulp.dest(outDir, {
+            cwd
+          })
+        )
       );
     }
   }
@@ -626,7 +683,8 @@ const defaultNodeModulesDirs = [
   "**/project.private.config.json/**",
   "**/package.json/**",
   "postcss.config.js",
-  "tailwind.config.js"
+  "tailwind.config.js",
+  "weapp-tw.config.js"
 ];
 async function createBuilder(options) {
   let postcssOptionsFromConfig;
@@ -647,6 +705,7 @@ async function createBuilder(options) {
       json: ["json"]
     },
     watchOptions: {
+      cwd: options?.root,
       events: ["add", "change", "unlink", "ready"]
     },
     postcssOptions: postcssOptionsFromConfig
@@ -665,10 +724,7 @@ async function createBuilder(options) {
       if (value) {
         debug(`run task ${pc.bold(pc.green(key))} start`);
         for (const task of value) {
-          const s = task();
-          if (s) {
-            await new Promise((resolve, reject) => s.on("finish", resolve).on("error", reject));
-          }
+          await task();
         }
         debug(`run task ${pc.bold(pc.green(key))} end`);
       }
@@ -692,7 +748,10 @@ async function createBuilder(options) {
     },
     watch() {
       ensureDirSync(path.resolve(cwd, outDir));
-      const watcher = gulp.watch([...globsSet], watchOptions, async (cb) => {
+      const dumps = globsSet.dump();
+      const arr = (Array.isArray(watchOptions.ignored) ? watchOptions.ignored : [watchOptions.ignored]).filter(Boolean);
+      watchOptions.ignored = [...globsSet.dumpIgnored(), ...arr];
+      const watcher = gulp.watch(dumps, watchOptions, async (cb) => {
         try {
           await runTasks();
           cb();
@@ -709,8 +768,13 @@ async function createBuilder(options) {
       watcher.on("unlink", function(path2) {
         console.log(`${pc.green("remove")} ${path2}`);
       });
-      watcher.on("ready", function() {
-        console.log(`${pc.green("weapp")}-${pc.blue("tailwindcss")} is ready!`);
+      watcher.on("ready", async function() {
+        const meta = await getPackageInfo("weapp-tailwindcss");
+        let weappTwVersionStr = "";
+        if (meta) {
+          weappTwVersionStr = `(${pc.blue(pc.underline(meta.version))})`;
+        }
+        console.log(`${pc.bold(`${pc.green("weapp")}-${pc.blue("tailwindcss")}`)}${weappTwVersionStr} ${pc.cyan("cli")}(${pc.blue(pc.underline(version))}) is ready!`);
       });
       this.watcher = watcher;
       return this;
@@ -800,6 +864,7 @@ function updatePackageJson(options) {
       const packageJson = fs.readJSONSync(packageJsonPath);
       set(packageJson, "scripts.dev", "weapp-tw dev");
       set(packageJson, "scripts.build", "weapp-tw build");
+      set(packageJson, "scripts.postinstall", "weapp-tw patch");
       fs.outputJSONSync(dest ?? packageJsonPath, packageJson, {
         spaces: 2
       });
@@ -830,7 +895,9 @@ export default defineConfig(${configOptionsStr})
     fs.writeFileSync(
       configPath,
       `/** @type {import('@weapp-tailwindcss/cli').UserConfig} */
-module.exports = ${configOptionsStr}
+const config = ${configOptionsStr}
+
+module.exports = config
 `,
       "utf8"
     );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weapp-tailwindcss/cli",
-  "version": "0.0.0-alpha.7",
+  "version": "0.0.0-alpha.9",
   "description": "The cli of weapp-tailwindcss",
   "keywords": [
     "weapp",
@@ -11,9 +11,9 @@
   "author": "SonOfMagic <qq1324318532@gmail.com>",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/sonofmagic/weapp-tailwindcss-webpack-plugin/issues"
+    "url": "https://github.com/sonofmagic/weapp-tailwindcss/issues"
   },
-  "homepage": "https://weapp-tw.icebreaker.top",
+  "homepage": "https://weapp-tw.icebreaker.top/docs/quick-start/native/install",
   "sideEffects": false,
   "type": "commonjs",
   "exports": {
@@ -35,7 +35,8 @@
     "debug": "4.3.4",
     "del": "^7.1.0",
     "fs-extra": "^11.2.0",
-    "gulp": "^5.0.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",
@@ -43,6 +44,7 @@
     "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.0.3"
@@ -51,7 +53,7 @@
     "less": "*",
     "sass": "*",
     "typescript": "*",
-    "weapp-tailwindcss": "3.2.0-alpha.7"
+    "weapp-tailwindcss": "3.2.0-alpha.10"
   },
   "peerDependenciesMeta": {
     "less": {