@weapp-tailwindcss/cli 0.0.0-alpha.5 → 0.0.0-alpha.6

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 ice breaker
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/index.cjs

@@ -5,6 +5,8 @@ const path = require('node:path');
 const fs = require('fs-extra');
 const gulp$1 = require('gulp');
 const loadPostcssConfig = require('postcss-load-config');
+const pc = require('picocolors');
+const createDebug = require('debug');
 const gulp = require('weapp-tailwindcss/gulp');
 const postcssrc = require('gulp-postcss');
 const plumber = require('gulp-plumber');
@@ -17,6 +19,8 @@ const path__default = /*#__PURE__*/_interopDefaultCompat(path);
 const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 const gulp__default = /*#__PURE__*/_interopDefaultCompat(gulp$1);
 const loadPostcssConfig__default = /*#__PURE__*/_interopDefaultCompat(loadPostcssConfig);
+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);
@@ -77,6 +81,8 @@ function createDefu(merger) {
 }
 const defu = createDefu();
 
+const debug = createDebug__default("weapp-tw-cli");
+
 var AssetType = /* @__PURE__ */ ((AssetType2) => {
   AssetType2["JavaScript"] = "javascript";
   AssetType2["Json"] = "json";
@@ -260,22 +266,36 @@ function createBuilder(options) {
     watchOptions,
     postcssOptions
   });
-  const tasks = [...getJsTasks(), ...getJsonTasks(), ...getCssTasks(), ...getHtmlTasks(), copyOthers];
+  const tasks = {
+    css: getCssTasks(),
+    html: getHtmlTasks(),
+    json: getJsonTasks(),
+    js: getJsTasks(),
+    extra: [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));
+    debug("run tasks start");
+    for (const [key, value] of Object.entries(tasks)) {
+      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));
+        }
       }
+      debug(`run task ${pc__default.bold(pc__default.green(key))} end`);
     }
+    debug("run tasks 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");
       }
       fs.ensureDirSync(path__default.resolve(cwd, outDir));
       await runTasks();
@@ -292,16 +312,16 @@ function createBuilder(options) {
         }
       });
       watcher.on("change", function(path2) {
-        console.log(`File ${path2} was changed`);
+        console.log(`${pc__default.green("changed")} ${path2}`);
       });
       watcher.on("add", function(path2) {
-        console.log(`File ${path2} was added`);
+        console.log(`${pc__default.green("add")} ${path2}`);
       });
       watcher.on("unlink", function(path2) {
-        console.log(`File ${path2} was removed`);
+        console.log(`${pc__default.green("remove")} ${path2}`);
       });
       watcher.on("ready", function() {
-        console.log(`Weapp-tailwindcss is Ready!`);
+        console.log(`${pc__default.green("weapp")}-${pc__default.blue("tailwindcss")} is ready!`);
       });
       this.watcher = watcher;
       return this;
@@ -697,7 +717,7 @@ function getDefaultConfig(root) {
   return {
     outDir: "dist",
     root,
-    srcDir: "."
+    src: "."
   };
 }
 function defineConfig(options) {
@@ -760,13 +780,18 @@ function initConfig(options) {
   const { lang, root } = defu(options, { lang: "js", root: process.cwd() });
   const configFilename = `weapp-tw.config.${lang ?? "js"}`;
   const configPath = path__default.resolve(root, configFilename);
+  const tsconfigPath = path__default.resolve(root, "tsconfig.json");
+  const isTsconfigExisted = fs__default.existsSync(tsconfigPath);
   fs__default.ensureDirSync(root);
+  const configOptionsStr = isTsconfigExisted ? `{
+  src: './miniprogram'
+}` : "{}";
   if (lang === "ts") {
     fs__default.writeFileSync(
       configPath,
       `import { defineConfig } from '@weapp-tailwindcss/cli'
 
-export default defineConfig({})
+export default defineConfig(${configOptionsStr})
 `,
       "utf8"
     );
@@ -774,7 +799,7 @@ export default defineConfig({})
     fs__default.writeFileSync(
       configPath,
       `/** @type {import('@weapp-tailwindcss/cli').UserConfig} */
-module.exports = {}
+module.exports = ${configOptionsStr}
 `,
       "utf8"
     );

package/dist/index.d.cts

@@ -23,14 +23,15 @@ interface BuildOptions {
     exclude: string[] | ((type: AssetType) => string[]);
     include: string[] | ((type: AssetType) => string[]);
     extensions: {
-        javascript: string[];
-        html: string[];
-        css: string[];
-        json: string[];
+        javascript?: string[];
+        html?: string[];
+        css?: string[];
+        json?: string[];
     };
     postcssOptions?: Partial<Omit<Result, 'file'>>;
     watchOptions: WatchOptions;
 }
+type UserConfig = Partial<BuildOptions>;
 
 declare function createBuilder(options?: Partial<BuildOptions>): {
     watcher: FSWatcher | undefined;
@@ -52,7 +53,7 @@ declare function watch(options?: Partial<BuildOptions>): Promise<{
 }>;
 
 type WeappTwCosmiconfigResult = {
-    config: UserConfig;
+    config: BuildOptions;
     filepath: string;
     isEmpty?: boolean;
 };
@@ -60,13 +61,6 @@ declare function createConfigLoader(root: string): {
     search: (searchFrom?: string) => WeappTwCosmiconfigResult | undefined;
     load: (filepath: string) => cosmiconfig.CosmiconfigResult;
 };
-type UserConfig = {
-    outDir?: string;
-    root?: string;
-    srcDir?: string;
-    weappTailwindcssOptions?: UserDefinedOptions;
-    clean?: boolean;
-};
-declare function defineConfig(options: UserConfig): UserConfig;
+declare function defineConfig(options: Partial<BuildOptions>): Partial<BuildOptions>;
 
 export { type UserConfig, build, createBuilder, createCli, createConfigLoader, defineConfig, watch };

package/dist/index.d.mts

@@ -23,14 +23,15 @@ interface BuildOptions {
     exclude: string[] | ((type: AssetType) => string[]);
     include: string[] | ((type: AssetType) => string[]);
     extensions: {
-        javascript: string[];
-        html: string[];
-        css: string[];
-        json: string[];
+        javascript?: string[];
+        html?: string[];
+        css?: string[];
+        json?: string[];
     };
     postcssOptions?: Partial<Omit<Result, 'file'>>;
     watchOptions: WatchOptions;
 }
+type UserConfig = Partial<BuildOptions>;
 
 declare function createBuilder(options?: Partial<BuildOptions>): {
     watcher: FSWatcher | undefined;
@@ -52,7 +53,7 @@ declare function watch(options?: Partial<BuildOptions>): Promise<{
 }>;
 
 type WeappTwCosmiconfigResult = {
-    config: UserConfig;
+    config: BuildOptions;
     filepath: string;
     isEmpty?: boolean;
 };
@@ -60,13 +61,6 @@ declare function createConfigLoader(root: string): {
     search: (searchFrom?: string) => WeappTwCosmiconfigResult | undefined;
     load: (filepath: string) => cosmiconfig.CosmiconfigResult;
 };
-type UserConfig = {
-    outDir?: string;
-    root?: string;
-    srcDir?: string;
-    weappTailwindcssOptions?: UserDefinedOptions;
-    clean?: boolean;
-};
-declare function defineConfig(options: UserConfig): UserConfig;
+declare function defineConfig(options: Partial<BuildOptions>): Partial<BuildOptions>;
 
 export { type UserConfig, build, createBuilder, createCli, createConfigLoader, defineConfig, watch };

package/dist/index.d.ts

@@ -23,14 +23,15 @@ interface BuildOptions {
     exclude: string[] | ((type: AssetType) => string[]);
     include: string[] | ((type: AssetType) => string[]);
     extensions: {
-        javascript: string[];
-        html: string[];
-        css: string[];
-        json: string[];
+        javascript?: string[];
+        html?: string[];
+        css?: string[];
+        json?: string[];
     };
     postcssOptions?: Partial<Omit<Result, 'file'>>;
     watchOptions: WatchOptions;
 }
+type UserConfig = Partial<BuildOptions>;
 
 declare function createBuilder(options?: Partial<BuildOptions>): {
     watcher: FSWatcher | undefined;
@@ -52,7 +53,7 @@ declare function watch(options?: Partial<BuildOptions>): Promise<{
 }>;
 
 type WeappTwCosmiconfigResult = {
-    config: UserConfig;
+    config: BuildOptions;
     filepath: string;
     isEmpty?: boolean;
 };
@@ -60,13 +61,6 @@ declare function createConfigLoader(root: string): {
     search: (searchFrom?: string) => WeappTwCosmiconfigResult | undefined;
     load: (filepath: string) => cosmiconfig.CosmiconfigResult;
 };
-type UserConfig = {
-    outDir?: string;
-    root?: string;
-    srcDir?: string;
-    weappTailwindcssOptions?: UserDefinedOptions;
-    clean?: boolean;
-};
-declare function defineConfig(options: UserConfig): UserConfig;
+declare function defineConfig(options: Partial<BuildOptions>): Partial<BuildOptions>;
 
 export { type UserConfig, build, createBuilder, createCli, createConfigLoader, defineConfig, watch };

package/dist/index.mjs

@@ -3,6 +3,8 @@ import path from 'node:path';
 import fs, { ensureDirSync } from 'fs-extra';
 import gulp from 'gulp';
 import loadPostcssConfig from 'postcss-load-config';
+import pc from 'picocolors';
+import createDebug from 'debug';
 import { createPlugins } from 'weapp-tailwindcss/gulp';
 import postcssrc from 'gulp-postcss';
 import plumber from 'gulp-plumber';
@@ -65,6 +67,8 @@ function createDefu(merger) {
 }
 const defu = createDefu();
 
+const debug = createDebug("weapp-tw-cli");
+
 var AssetType = /* @__PURE__ */ ((AssetType2) => {
   AssetType2["JavaScript"] = "javascript";
   AssetType2["Json"] = "json";
@@ -248,22 +252,36 @@ function createBuilder(options) {
     watchOptions,
     postcssOptions
   });
-  const tasks = [...getJsTasks(), ...getJsonTasks(), ...getCssTasks(), ...getHtmlTasks(), copyOthers];
+  const tasks = {
+    css: getCssTasks(),
+    html: getHtmlTasks(),
+    json: getJsonTasks(),
+    js: getJsTasks(),
+    extra: [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));
+    debug("run tasks start");
+    for (const [key, value] of Object.entries(tasks)) {
+      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));
+        }
       }
+      debug(`run task ${pc.bold(pc.green(key))} end`);
     }
+    debug("run tasks 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");
       }
       ensureDirSync(path.resolve(cwd, outDir));
       await runTasks();
@@ -280,16 +298,16 @@ function createBuilder(options) {
         }
       });
       watcher.on("change", function(path2) {
-        console.log(`File ${path2} was changed`);
+        console.log(`${pc.green("changed")} ${path2}`);
       });
       watcher.on("add", function(path2) {
-        console.log(`File ${path2} was added`);
+        console.log(`${pc.green("add")} ${path2}`);
       });
       watcher.on("unlink", function(path2) {
-        console.log(`File ${path2} was removed`);
+        console.log(`${pc.green("remove")} ${path2}`);
       });
       watcher.on("ready", function() {
-        console.log(`Weapp-tailwindcss is Ready!`);
+        console.log(`${pc.green("weapp")}-${pc.blue("tailwindcss")} is ready!`);
       });
       this.watcher = watcher;
       return this;
@@ -685,7 +703,7 @@ function getDefaultConfig(root) {
   return {
     outDir: "dist",
     root,
-    srcDir: "."
+    src: "."
   };
 }
 function defineConfig(options) {
@@ -748,13 +766,18 @@ function initConfig(options) {
   const { lang, root } = defu(options, { lang: "js", root: process.cwd() });
   const configFilename = `weapp-tw.config.${lang ?? "js"}`;
   const configPath = path.resolve(root, configFilename);
+  const tsconfigPath = path.resolve(root, "tsconfig.json");
+  const isTsconfigExisted = fs.existsSync(tsconfigPath);
   fs.ensureDirSync(root);
+  const configOptionsStr = isTsconfigExisted ? `{
+  src: './miniprogram'
+}` : "{}";
   if (lang === "ts") {
     fs.writeFileSync(
       configPath,
       `import { defineConfig } from '@weapp-tailwindcss/cli'
 
-export default defineConfig({})
+export default defineConfig(${configOptionsStr})
 `,
       "utf8"
     );
@@ -762,7 +785,7 @@ export default defineConfig({})
     fs.writeFileSync(
       configPath,
       `/** @type {import('@weapp-tailwindcss/cli').UserConfig} */
-module.exports = {}
+module.exports = ${configOptionsStr}
 `,
       "utf8"
     );

package/package.json

@@ -1,10 +1,19 @@
 {
   "name": "@weapp-tailwindcss/cli",
-  "version": "0.0.0-alpha.5",
+  "version": "0.0.0-alpha.6",
   "description": "The cli of weapp-tailwindcss",
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
+  "keywords": [
+    "weapp",
+    "tailwindcss",
+    "cli",
+    "plugin"
+  ],
+  "author": "SonOfMagic <qq1324318532@gmail.com>",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/sonofmagic/weapp-tailwindcss-webpack-plugin/issues"
+  },
+  "homepage": "https://weapp-tw.icebreaker.top",
   "sideEffects": false,
   "type": "commonjs",
   "exports": {
@@ -23,19 +32,24 @@
   "dependencies": {
     "commander": "^12.0.0",
     "cosmiconfig": "^9.0.0",
+    "debug": "4.3.4",
     "del": "^7.1.0",
     "fs-extra": "^11.2.0",
     "gulp": "^5.0.0",
+    "gulp-if": "^3.0.0",
     "gulp-less": "^5.0.0",
     "gulp-plumber": "^1.2.1",
     "gulp-postcss": "^10.0.0",
     "gulp-sass": "^5.1.0",
-    "gulp-if": "^3.0.0",
+    "picocolors": "^1.0.0",
     "postcss": "^8.4.38",
-    "postcss-load-config": "^5.0.3",
-    "weapp-tailwindcss": "3.2.0-alpha.4"
+    "postcss-load-config": "^5.0.3"
+  },
+  "peerDependencies": {
+    "weapp-tailwindcss": "3.2.0-alpha.7"
   },
   "devDependencies": {
+    "@types/debug": "^4.1.12",
     "@types/fs-extra": "^11.0.4",
     "@types/get-value": "^3.0.5",
     "@types/gulp": "^4.0.17",