@weapp-tailwindcss/cli 1.0.6 → 1.0.8

package/dist/index.cjs

@@ -88,7 +88,7 @@ function createDefu(merger) {
 }
 const defu = createDefu();
 
-const version = "1.0.6";
+const version = "1.0.8";
 
 const debug = createDebug__default("weapp-tw-cli");
 
@@ -657,7 +657,8 @@ async function getTasks(options) {
       return function JsTask() {
         const pipes = [];
         if (loadTs && gulpTs) {
-          pipes.push(gulpTs());
+          pipes.push(gulpTs().on("error", () => {
+          }));
         }
         pipes.push(transformJs({
           babelParserOptions: !enableTs && isTs ? {
@@ -724,7 +725,7 @@ async function getTasks(options) {
         if (postcssOptions) {
           pipes.push(postcssrc__default(postcssOptions?.plugins, postcssOptions?.options));
         }
-        if (x === "scss") {
+        if (x === "scss" && !enableSass) {
           pipes.push(transformWxss({
             postcssOptions: {
               options: {
@@ -828,23 +829,29 @@ async function createBuilder(options) {
     }
     debug("run tasks end");
   }
-  const { clean, outDir, root: cwd, watchOptions } = opt;
+  const { clean: clean2, outDir, root: cwd, watchOptions } = opt;
+  async function doClean() {
+    debug("del start");
+    const { deleteAsync } = await import('del');
+    const patterns = [`${outDir}/**`];
+    await deleteAsync(patterns, { cwd, ignore: defaultNodeModulesDirs });
+    debug("del end");
+  }
   return {
     watcher: void 0,
     async build() {
-      if (clean) {
-        debug("del start");
-        const { deleteAsync } = await import('del');
-        const patterns = [`${outDir}/**`];
-        await deleteAsync(patterns, { cwd, ignore: defaultNodeModulesDirs });
-        debug("del end");
+      if (clean2) {
+        await doClean();
       }
-      fs.ensureDirSync(path__default.resolve(cwd, outDir));
+      await fs.ensureDir(path__default.resolve(cwd, outDir));
       await runTasks();
       return this;
     },
-    watch() {
-      fs.ensureDirSync(path__default.resolve(cwd, outDir));
+    async watch() {
+      if (clean2) {
+        await doClean();
+      }
+      await fs.ensureDir(path__default.resolve(cwd, outDir));
       const dumps = globsSet.dump();
       const arr = (Array.isArray(watchOptions.ignored) ? watchOptions.ignored : [watchOptions.ignored]).filter(
         Boolean
@@ -880,7 +887,8 @@ async function createBuilder(options) {
       this.watcher = watcher;
       return this;
     },
-    globsSet
+    globsSet,
+    clean: doClean
   };
 }
 async function build(options) {
@@ -891,6 +899,10 @@ async function watch(options) {
   const builder = await createBuilder(options);
   return await builder.watch();
 }
+async function clean(options) {
+  const builder = await createBuilder(options);
+  return await builder.clean();
+}
 
 function createConfigLoader(root) {
   const explorer = cosmiconfig.cosmiconfigSync("weapp-tw");
@@ -1038,6 +1050,13 @@ function createCli() {
       root: cwd
     });
   });
+  program.command("clean").action(async () => {
+    await clean(
+      defu(userDefinedConfig?.config, {
+        root: cwd
+      })
+    );
+  });
   return program;
 }
 

package/dist/index.d.cts

@@ -130,20 +130,23 @@ type UserConfig = Partial<BuildOptions>;
 declare function createBuilder(options?: Partial<BuildOptions>): Promise<{
     watcher: FSWatcher | undefined;
     build(): Promise<any>;
-    watch(): any;
+    watch(): Promise<any>;
     globsSet: GlobsSet;
+    clean: () => Promise<void>;
 }>;
 declare function build(options?: Partial<BuildOptions>): Promise<{
     watcher: FSWatcher | undefined;
     build(): Promise<any>;
-    watch(): any;
+    watch(): Promise<any>;
     globsSet: GlobsSet;
+    clean: () => Promise<void>;
 }>;
 declare function watch(options?: Partial<BuildOptions>): Promise<{
     watcher: FSWatcher | undefined;
     build(): Promise<any>;
-    watch(): any;
+    watch(): Promise<any>;
     globsSet: GlobsSet;
+    clean: () => Promise<void>;
 }>;
 
 interface WeappTwCosmiconfigResult {

package/dist/index.d.mts

@@ -130,20 +130,23 @@ type UserConfig = Partial<BuildOptions>;
 declare function createBuilder(options?: Partial<BuildOptions>): Promise<{
     watcher: FSWatcher | undefined;
     build(): Promise<any>;
-    watch(): any;
+    watch(): Promise<any>;
     globsSet: GlobsSet;
+    clean: () => Promise<void>;
 }>;
 declare function build(options?: Partial<BuildOptions>): Promise<{
     watcher: FSWatcher | undefined;
     build(): Promise<any>;
-    watch(): any;
+    watch(): Promise<any>;
     globsSet: GlobsSet;
+    clean: () => Promise<void>;
 }>;
 declare function watch(options?: Partial<BuildOptions>): Promise<{
     watcher: FSWatcher | undefined;
     build(): Promise<any>;
-    watch(): any;
+    watch(): Promise<any>;
     globsSet: GlobsSet;
+    clean: () => Promise<void>;
 }>;
 
 interface WeappTwCosmiconfigResult {

package/dist/index.d.ts

@@ -130,20 +130,23 @@ type UserConfig = Partial<BuildOptions>;
 declare function createBuilder(options?: Partial<BuildOptions>): Promise<{
     watcher: FSWatcher | undefined;
     build(): Promise<any>;
-    watch(): any;
+    watch(): Promise<any>;
     globsSet: GlobsSet;
+    clean: () => Promise<void>;
 }>;
 declare function build(options?: Partial<BuildOptions>): Promise<{
     watcher: FSWatcher | undefined;
     build(): Promise<any>;
-    watch(): any;
+    watch(): Promise<any>;
     globsSet: GlobsSet;
+    clean: () => Promise<void>;
 }>;
 declare function watch(options?: Partial<BuildOptions>): Promise<{
     watcher: FSWatcher | undefined;
     build(): Promise<any>;
-    watch(): any;
+    watch(): Promise<any>;
     globsSet: GlobsSet;
+    clean: () => Promise<void>;
 }>;
 
 interface WeappTwCosmiconfigResult {

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import process from 'node:process';
 import { Command } from 'commander';
 import path from 'node:path';
-import fs, { ensureDirSync } from 'fs-extra';
+import fs, { ensureDir } from 'fs-extra';
 import gulp from 'gulp';
 import loadPostcssConfig from 'postcss-load-config';
 import pc from 'picocolors';
@@ -71,7 +71,7 @@ function createDefu(merger) {
 }
 const defu = createDefu();
 
-const version = "1.0.6";
+const version = "1.0.8";
 
 const debug = createDebug("weapp-tw-cli");
 
@@ -640,7 +640,8 @@ async function getTasks(options) {
       return function JsTask() {
         const pipes = [];
         if (loadTs && gulpTs) {
-          pipes.push(gulpTs());
+          pipes.push(gulpTs().on("error", () => {
+          }));
         }
         pipes.push(transformJs({
           babelParserOptions: !enableTs && isTs ? {
@@ -707,7 +708,7 @@ async function getTasks(options) {
         if (postcssOptions) {
           pipes.push(postcssrc(postcssOptions?.plugins, postcssOptions?.options));
         }
-        if (x === "scss") {
+        if (x === "scss" && !enableSass) {
           pipes.push(transformWxss({
             postcssOptions: {
               options: {
@@ -811,23 +812,29 @@ async function createBuilder(options) {
     }
     debug("run tasks end");
   }
-  const { clean, outDir, root: cwd, watchOptions } = opt;
+  const { clean: clean2, outDir, root: cwd, watchOptions } = opt;
+  async function doClean() {
+    debug("del start");
+    const { deleteAsync } = await import('del');
+    const patterns = [`${outDir}/**`];
+    await deleteAsync(patterns, { cwd, ignore: defaultNodeModulesDirs });
+    debug("del end");
+  }
   return {
     watcher: void 0,
     async build() {
-      if (clean) {
-        debug("del start");
-        const { deleteAsync } = await import('del');
-        const patterns = [`${outDir}/**`];
-        await deleteAsync(patterns, { cwd, ignore: defaultNodeModulesDirs });
-        debug("del end");
+      if (clean2) {
+        await doClean();
       }
-      ensureDirSync(path.resolve(cwd, outDir));
+      await ensureDir(path.resolve(cwd, outDir));
       await runTasks();
       return this;
     },
-    watch() {
-      ensureDirSync(path.resolve(cwd, outDir));
+    async watch() {
+      if (clean2) {
+        await doClean();
+      }
+      await ensureDir(path.resolve(cwd, outDir));
       const dumps = globsSet.dump();
       const arr = (Array.isArray(watchOptions.ignored) ? watchOptions.ignored : [watchOptions.ignored]).filter(
         Boolean
@@ -863,7 +870,8 @@ async function createBuilder(options) {
       this.watcher = watcher;
       return this;
     },
-    globsSet
+    globsSet,
+    clean: doClean
   };
 }
 async function build(options) {
@@ -874,6 +882,10 @@ async function watch(options) {
   const builder = await createBuilder(options);
   return await builder.watch();
 }
+async function clean(options) {
+  const builder = await createBuilder(options);
+  return await builder.clean();
+}
 
 function createConfigLoader(root) {
   const explorer = cosmiconfigSync("weapp-tw");
@@ -1021,6 +1033,13 @@ function createCli() {
       root: cwd
     });
   });
+  program.command("clean").action(async () => {
+    await clean(
+      defu(userDefinedConfig?.config, {
+        root: cwd
+      })
+    );
+  });
   return program;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weapp-tailwindcss/cli",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "description": "The cli of weapp-tailwindcss",
   "author": "SonOfMagic <qq1324318532@gmail.com>",
   "license": "MIT",