@weapp-tailwindcss/cli 0.0.0-alpha.1 → 0.0.0-alpha.3

package/dist/index.cjs

@@ -4,8 +4,8 @@ const commander = require('commander');
 const loadPostcssConfig = require('postcss-load-config');
 const path = require('node:path');
 const fs = require('fs-extra');
-const gulp = require('weapp-tailwindcss/gulp');
 const gulp$1 = require('gulp');
+const gulp = require('weapp-tailwindcss/gulp');
 const cosmiconfig = require('cosmiconfig');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
@@ -215,7 +215,8 @@ function createBuilder(options) {
     clean,
     extensions,
     exclude,
-    include
+    include,
+    watchOptions
   } = defu(options, {
     outDir: "dist",
     weappTailwindcssOptions: {},
@@ -237,27 +238,50 @@ function createBuilder(options) {
     clean,
     extensions,
     exclude,
-    include
+    include,
+    watchOptions
   });
   const tasks = [...getJsTasks(), ...getJsonTasks(), ...getCssTasks(), ...getHtmlTasks(), copyOthers];
+  async function runTasks() {
+    for (const task of tasks) {
+      const s = task();
+      if (s) {
+        await new Promise((resolve, reject) => s.on("finish", resolve).on("error", reject));
+      }
+    }
+  }
   return {
+    watcher: void 0,
     async build() {
       if (clean) {
         const { deleteAsync } = await import('del');
         const patterns = [outDir + "/**"];
         await deleteAsync(patterns, { cwd, ignore: defaultNodeModulesDirs });
       }
-      await fs.ensureDir(path__default.resolve(cwd, outDir));
-      for (const task of tasks) {
-        const s = task();
-        if (s) {
-          await new Promise((resolve, reject) => s.on("finish", resolve).on("error", reject));
-        }
-      }
+      fs.ensureDirSync(path__default.resolve(cwd, outDir));
+      await runTasks();
       return this;
     },
-    async watch() {
-      await fs.ensureDir(path__default.resolve(cwd, outDir));
+    watch() {
+      fs.ensureDirSync(path__default.resolve(cwd, outDir));
+      const watcher = gulp__default.watch([...globsSet], watchOptions, async (cb) => {
+        try {
+          await runTasks();
+          cb();
+        } catch (error) {
+          cb(error);
+        }
+      });
+      watcher.on("change", function(path2) {
+        console.log(`File ${path2} was changed`);
+      });
+      watcher.on("add", function(path2) {
+        console.log(`File ${path2} was added`);
+      });
+      watcher.on("unlink", function(path2) {
+        console.log(`File ${path2} was removed`);
+      });
+      this.watcher = watcher;
       return this;
     },
     globsSet
@@ -267,6 +291,10 @@ function build(options) {
   const builder = createBuilder(options);
   return builder.build();
 }
+function watch(options) {
+  const builder = createBuilder(options);
+  return builder.watch();
+}
 
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
@@ -731,6 +759,17 @@ function createCli() {
   const configLoader = createConfigLoader(cwd);
   const userDefinedConfig = configLoader.search(cwd);
   program.command("dev").alias("serve").action(async () => {
+    const postcssOptions = await loadPostcssConfig__default({
+      cwd
+    });
+    await watch(
+      defu(userDefinedConfig?.config, {
+        root: cwd,
+        weappTailwindcssOptions: {
+          postcssOptions
+        }
+      })
+    );
   });
   program.command("build").action(async () => {
     const postcssOptions = await loadPostcssConfig__default({
@@ -758,3 +797,4 @@ exports.createBuilder = createBuilder;
 exports.createCli = createCli;
 exports.createConfigLoader = createConfigLoader;
 exports.defineConfig = defineConfig;
+exports.watch = watch;

package/dist/index.d.cts

@@ -1,5 +1,7 @@
 import { Command } from 'commander';
+import { FSWatcher } from 'fs-extra';
 import { UserDefinedOptions } from 'weapp-tailwindcss';
+import { WatchOptions } from 'gulp';
 import * as cosmiconfig from 'cosmiconfig';
 
 declare function createCli(): Command;
@@ -25,18 +27,27 @@ interface BuildOptions {
         css: string[];
         json: string[];
     };
+    watchOptions: WatchOptions;
 }
 
 declare function createBuilder(options?: Partial<BuildOptions>): {
+    watcher: FSWatcher | undefined;
     build(): Promise<any>;
-    watch(): Promise<any>;
+    watch(): any;
     globsSet: Set<string>;
 };
 declare function build(options?: Partial<BuildOptions>): Promise<{
+    watcher: FSWatcher | undefined;
     build(): Promise<any>;
-    watch(): Promise<any>;
+    watch(): any;
     globsSet: Set<string>;
 }>;
+declare function watch(options?: Partial<BuildOptions>): {
+    watcher: FSWatcher | undefined;
+    build(): Promise<any>;
+    watch(): any;
+    globsSet: Set<string>;
+};
 
 type WeappTwCosmiconfigResult = {
     config: UserConfig;
@@ -56,4 +67,4 @@ type UserConfig = {
 };
 declare function defineConfig(options: UserConfig): UserConfig;
 
-export { type UserConfig, build, createBuilder, createCli, createConfigLoader, defineConfig };
+export { type UserConfig, build, createBuilder, createCli, createConfigLoader, defineConfig, watch };

package/dist/index.d.mts

@@ -1,5 +1,7 @@
 import { Command } from 'commander';
+import { FSWatcher } from 'fs-extra';
 import { UserDefinedOptions } from 'weapp-tailwindcss';
+import { WatchOptions } from 'gulp';
 import * as cosmiconfig from 'cosmiconfig';
 
 declare function createCli(): Command;
@@ -25,18 +27,27 @@ interface BuildOptions {
         css: string[];
         json: string[];
     };
+    watchOptions: WatchOptions;
 }
 
 declare function createBuilder(options?: Partial<BuildOptions>): {
+    watcher: FSWatcher | undefined;
     build(): Promise<any>;
-    watch(): Promise<any>;
+    watch(): any;
     globsSet: Set<string>;
 };
 declare function build(options?: Partial<BuildOptions>): Promise<{
+    watcher: FSWatcher | undefined;
     build(): Promise<any>;
-    watch(): Promise<any>;
+    watch(): any;
     globsSet: Set<string>;
 }>;
+declare function watch(options?: Partial<BuildOptions>): {
+    watcher: FSWatcher | undefined;
+    build(): Promise<any>;
+    watch(): any;
+    globsSet: Set<string>;
+};
 
 type WeappTwCosmiconfigResult = {
     config: UserConfig;
@@ -56,4 +67,4 @@ type UserConfig = {
 };
 declare function defineConfig(options: UserConfig): UserConfig;
 
-export { type UserConfig, build, createBuilder, createCli, createConfigLoader, defineConfig };
+export { type UserConfig, build, createBuilder, createCli, createConfigLoader, defineConfig, watch };

package/dist/index.d.ts

@@ -1,5 +1,7 @@
 import { Command } from 'commander';
+import { FSWatcher } from 'fs-extra';
 import { UserDefinedOptions } from 'weapp-tailwindcss';
+import { WatchOptions } from 'gulp';
 import * as cosmiconfig from 'cosmiconfig';
 
 declare function createCli(): Command;
@@ -25,18 +27,27 @@ interface BuildOptions {
         css: string[];
         json: string[];
     };
+    watchOptions: WatchOptions;
 }
 
 declare function createBuilder(options?: Partial<BuildOptions>): {
+    watcher: FSWatcher | undefined;
     build(): Promise<any>;
-    watch(): Promise<any>;
+    watch(): any;
     globsSet: Set<string>;
 };
 declare function build(options?: Partial<BuildOptions>): Promise<{
+    watcher: FSWatcher | undefined;
     build(): Promise<any>;
-    watch(): Promise<any>;
+    watch(): any;
     globsSet: Set<string>;
 }>;
+declare function watch(options?: Partial<BuildOptions>): {
+    watcher: FSWatcher | undefined;
+    build(): Promise<any>;
+    watch(): any;
+    globsSet: Set<string>;
+};
 
 type WeappTwCosmiconfigResult = {
     config: UserConfig;
@@ -56,4 +67,4 @@ type UserConfig = {
 };
 declare function defineConfig(options: UserConfig): UserConfig;
 
-export { type UserConfig, build, createBuilder, createCli, createConfigLoader, defineConfig };
+export { type UserConfig, build, createBuilder, createCli, createConfigLoader, defineConfig, watch };

package/dist/index.mjs

@@ -1,9 +1,9 @@
 import { Command } from 'commander';
 import loadPostcssConfig from 'postcss-load-config';
 import path from 'node:path';
-import fs, { ensureDir } from 'fs-extra';
-import { createPlugins } from 'weapp-tailwindcss/gulp';
+import fs, { ensureDirSync } from 'fs-extra';
 import gulp from 'gulp';
+import { createPlugins } from 'weapp-tailwindcss/gulp';
 import { cosmiconfigSync } from 'cosmiconfig';
 
 function isPlainObject$2(value) {
@@ -206,7 +206,8 @@ function createBuilder(options) {
     clean,
     extensions,
     exclude,
-    include
+    include,
+    watchOptions
   } = defu(options, {
     outDir: "dist",
     weappTailwindcssOptions: {},
@@ -228,27 +229,50 @@ function createBuilder(options) {
     clean,
     extensions,
     exclude,
-    include
+    include,
+    watchOptions
   });
   const tasks = [...getJsTasks(), ...getJsonTasks(), ...getCssTasks(), ...getHtmlTasks(), copyOthers];
+  async function runTasks() {
+    for (const task of tasks) {
+      const s = task();
+      if (s) {
+        await new Promise((resolve, reject) => s.on("finish", resolve).on("error", reject));
+      }
+    }
+  }
   return {
+    watcher: void 0,
     async build() {
       if (clean) {
         const { deleteAsync } = await import('del');
         const patterns = [outDir + "/**"];
         await deleteAsync(patterns, { cwd, ignore: defaultNodeModulesDirs });
       }
-      await ensureDir(path.resolve(cwd, outDir));
-      for (const task of tasks) {
-        const s = task();
-        if (s) {
-          await new Promise((resolve, reject) => s.on("finish", resolve).on("error", reject));
-        }
-      }
+      ensureDirSync(path.resolve(cwd, outDir));
+      await runTasks();
       return this;
     },
-    async watch() {
-      await ensureDir(path.resolve(cwd, outDir));
+    watch() {
+      ensureDirSync(path.resolve(cwd, outDir));
+      const watcher = gulp.watch([...globsSet], watchOptions, async (cb) => {
+        try {
+          await runTasks();
+          cb();
+        } catch (error) {
+          cb(error);
+        }
+      });
+      watcher.on("change", function(path2) {
+        console.log(`File ${path2} was changed`);
+      });
+      watcher.on("add", function(path2) {
+        console.log(`File ${path2} was added`);
+      });
+      watcher.on("unlink", function(path2) {
+        console.log(`File ${path2} was removed`);
+      });
+      this.watcher = watcher;
       return this;
     },
     globsSet
@@ -258,6 +282,10 @@ function build(options) {
   const builder = createBuilder(options);
   return builder.build();
 }
+function watch(options) {
+  const builder = createBuilder(options);
+  return builder.watch();
+}
 
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
@@ -722,6 +750,17 @@ function createCli() {
   const configLoader = createConfigLoader(cwd);
   const userDefinedConfig = configLoader.search(cwd);
   program.command("dev").alias("serve").action(async () => {
+    const postcssOptions = await loadPostcssConfig({
+      cwd
+    });
+    await watch(
+      defu(userDefinedConfig?.config, {
+        root: cwd,
+        weappTailwindcssOptions: {
+          postcssOptions
+        }
+      })
+    );
   });
   program.command("build").action(async () => {
     const postcssOptions = await loadPostcssConfig({
@@ -744,4 +783,4 @@ function createCli() {
   return program;
 }
 
-export { build, createBuilder, createCli, createConfigLoader, defineConfig };
+export { build, createBuilder, createCli, createConfigLoader, defineConfig, watch };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weapp-tailwindcss/cli",
-  "version": "0.0.0-alpha.1",
+  "version": "0.0.0-alpha.3",
   "description": "The cli of weapp-tailwindcss",
   "keywords": [],
   "author": "",
@@ -29,7 +29,7 @@
     "gulp-less": "^5.0.0",
     "gulp-sass": "^5.1.0",
     "postcss-load-config": "^5.0.3",
-    "weapp-tailwindcss": "3.2.0-alpha.1"
+    "weapp-tailwindcss": "3.2.0-alpha.3"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",