@weapp-tailwindcss/cli 1.0.0 → 1.0.2

package/dist/index.cjs

@@ -1,5 +1,6 @@
 'use strict';
 
+const process = require('node:process');
 const commander = require('commander');
 const path = require('node:path');
 const fs = require('fs-extra');
@@ -19,6 +20,7 @@ const cosmiconfig = require('cosmiconfig');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
+const process__default = /*#__PURE__*/_interopDefaultCompat(process);
 const path__default = /*#__PURE__*/_interopDefaultCompat(path);
 const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 const gulp__default = /*#__PURE__*/_interopDefaultCompat(gulp$1);
@@ -88,7 +90,7 @@ function createDefu(merger) {
 }
 const defu = createDefu();
 
-const version = "1.0.0";
+const version = "1.0.2";
 
 const debug = createDebug__default("weapp-tw-cli");
 
@@ -518,9 +520,19 @@ function isTsLang(lang) {
 }
 async function getTasks(options) {
   let { typescriptOptions } = options;
-  const { root: cwd, weappTailwindcssOptions, outDir, src: srcBase, extensions, exclude, include, postcssOptions, preprocessorOptions } = options;
+  const {
+    root: cwd,
+    weappTailwindcssOptions,
+    outDir,
+    src: srcBase,
+    extensions,
+    exclude,
+    include,
+    postcssOptions,
+    preprocessorOptions
+  } = options;
   const globsSet = new GlobsSet();
-  const base = srcBase ? srcBase + "/" : "";
+  const base = srcBase ? `${srcBase}/` : "";
   const enableSass = Boolean(preprocessorOptions?.sass);
   const enableLess = Boolean(preprocessorOptions?.less);
   if (typescriptOptions === true) {
@@ -537,18 +549,18 @@ async function getTasks(options) {
     sass = createSass__default(sassLib);
   }
   const { transformJs, transformWxml, transformWxss } = gulp.createPlugins(weappTailwindcssOptions);
+  const outDirGlobs = [`!${outDir}/**/*`, `!./${outDir}/**/*`];
   function getGlobs(type) {
     const globs = [];
     if (typeof include === "function") {
       globs.push(...include(type).map((x) => x));
     }
     if (typeof exclude === "function") {
-      globs.push(...exclude(type).map((x) => "!" + x));
+      globs.push(...exclude(type).map((x) => `!${x}`));
     } else if (Array.isArray(exclude)) {
-      globs.push(...exclude.map((x) => "!" + x));
+      globs.push(...exclude.map((x) => `!${x}`));
     }
-    globs.push(`!${outDir}/**/*`);
-    globs.push(`!./${outDir}/**/*`);
+    globs.push(...outDirGlobs);
     return globs;
   }
   function getJsTasks() {
@@ -562,7 +574,10 @@ async function getTasks(options) {
       const loadTs = enableTs && isTs;
       let gulpTs;
       if (enableTs && typeof typescriptOptions !== "boolean") {
-        gulpTs = typescript__default.createProject(typescriptOptions.tsConfigFileName ?? "tsconfig.json", typeof typescriptOptions === "boolean" ? {} : typescriptOptions);
+        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) });
@@ -630,7 +645,12 @@ async function getTasks(options) {
           );
         }
         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(
+          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({
@@ -671,7 +691,7 @@ async function getTasks(options) {
       });
       globsSet.add(globs);
       return promisify(
-        gulp__default.src(globs, { cwd, since: gulp__default.lastRun(copyOthers) }).pipe(
+        gulp__default.src([...globs, ...outDirGlobs], { cwd, since: gulp__default.lastRun(copyOthers) }).pipe(
           gulp__default.dest(outDir, {
             cwd
           })
@@ -715,6 +735,7 @@ async function createBuilder(options) {
     clean: true,
     src: "",
     exclude: [...defaultNodeModulesDirs],
+    include: ["**/*.{png,jpg,jpeg,gif,svg,webp}"],
     extensions: {
       javascript: [...defaultJavascriptExtensions, ...defaultTypescriptExtensions, ...defaultWxsExtensions],
       html: ["wxml"],
@@ -755,7 +776,7 @@ async function createBuilder(options) {
       if (clean) {
         debug("del start");
         const { deleteAsync } = await import('del');
-        const patterns = [outDir + "/**"];
+        const patterns = [`${outDir}/**`];
         await deleteAsync(patterns, { cwd, ignore: defaultNodeModulesDirs });
         debug("del end");
       }
@@ -766,7 +787,9 @@ async function createBuilder(options) {
     watch() {
       fs.ensureDirSync(path__default.resolve(cwd, outDir));
       const dumps = globsSet.dump();
-      const arr = (Array.isArray(watchOptions.ignored) ? watchOptions.ignored : [watchOptions.ignored]).filter(Boolean);
+      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 {
@@ -776,22 +799,24 @@ async function createBuilder(options) {
           cb(error);
         }
       });
-      watcher.on("change", function(path2) {
+      watcher.on("change", (path2) => {
         console.log(`${pc__default.green("changed")} ${path2}`);
       });
-      watcher.on("add", function(path2) {
+      watcher.on("add", (path2) => {
         console.log(`${pc__default.green("add")} ${path2}`);
       });
-      watcher.on("unlink", function(path2) {
+      watcher.on("unlink", (path2) => {
         console.log(`${pc__default.green("remove")} ${path2}`);
       });
-      watcher.on("ready", async function() {
+      watcher.on("ready", async () => {
         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!`);
+        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;
@@ -846,7 +871,9 @@ function updateProjectConfig(options) {
       set(projectConfig, "srcMiniprogramRoot", "dist/");
       set(projectConfig, "setting.packNpmManually", true);
       if (Array.isArray(get(projectConfig, "setting.packNpmRelationList"))) {
-        const x = projectConfig.setting.packNpmRelationList.find((x2) => x2.packageJsonPath === "./package.json" && x2.miniprogramNpmDistDir === "./dist");
+        const x = projectConfig.setting.packNpmRelationList.find(
+          (x2) => x2.packageJsonPath === "./package.json" && x2.miniprogramNpmDistDir === "./dist"
+        );
         if (!x) {
           projectConfig.setting.packNpmRelationList.push({
             packageJsonPath: "./package.json",
@@ -890,7 +917,10 @@ function updatePackageJson(options) {
   }
 }
 function initConfig(options) {
-  const { lang, root } = defu(options, { lang: "js", root: process.cwd() });
+  const { lang, root } = defu(options, {
+    lang: "js",
+    root: process__default.cwd()
+  });
   const configFilename = `weapp-tw.config.${lang ?? "js"}`;
   const configPath = path__default.resolve(root, configFilename);
   const tsconfigPath = path__default.resolve(root, "tsconfig.json");
@@ -926,7 +956,7 @@ module.exports = config
 }
 
 function createCli() {
-  const cwd = process.cwd();
+  const cwd = process__default.cwd();
   const program = new commander.Command();
   const configLoader = createConfigLoader(cwd);
   const userDefinedConfig = configLoader.search(cwd);

package/dist/index.d.cts

@@ -139,11 +139,11 @@ declare function watch(options?: Partial<BuildOptions>): Promise<{
     globsSet: GlobsSet;
 }>;
 
-type WeappTwCosmiconfigResult = {
+interface WeappTwCosmiconfigResult {
     config: BuildOptions;
     filepath: string;
     isEmpty?: boolean;
-};
+}
 declare function createConfigLoader(root: string): {
     search: (searchFrom?: string) => WeappTwCosmiconfigResult | undefined;
     load: (filepath: string) => cosmiconfig.CosmiconfigResult;

package/dist/index.d.mts

@@ -139,11 +139,11 @@ declare function watch(options?: Partial<BuildOptions>): Promise<{
     globsSet: GlobsSet;
 }>;
 
-type WeappTwCosmiconfigResult = {
+interface WeappTwCosmiconfigResult {
     config: BuildOptions;
     filepath: string;
     isEmpty?: boolean;
-};
+}
 declare function createConfigLoader(root: string): {
     search: (searchFrom?: string) => WeappTwCosmiconfigResult | undefined;
     load: (filepath: string) => cosmiconfig.CosmiconfigResult;

package/dist/index.d.ts

@@ -139,11 +139,11 @@ declare function watch(options?: Partial<BuildOptions>): Promise<{
     globsSet: GlobsSet;
 }>;
 
-type WeappTwCosmiconfigResult = {
+interface WeappTwCosmiconfigResult {
     config: BuildOptions;
     filepath: string;
     isEmpty?: boolean;
-};
+}
 declare function createConfigLoader(root: string): {
     search: (searchFrom?: string) => WeappTwCosmiconfigResult | undefined;
     load: (filepath: string) => cosmiconfig.CosmiconfigResult;

package/dist/index.mjs

@@ -1,3 +1,4 @@
+import process from 'node:process';
 import { Command } from 'commander';
 import path from 'node:path';
 import fs, { ensureDirSync } from 'fs-extra';
@@ -71,7 +72,7 @@ function createDefu(merger) {
 }
 const defu = createDefu();
 
-const version = "1.0.0";
+const version = "1.0.2";
 
 const debug = createDebug("weapp-tw-cli");
 
@@ -501,9 +502,19 @@ function isTsLang(lang) {
 }
 async function getTasks(options) {
   let { typescriptOptions } = options;
-  const { root: cwd, weappTailwindcssOptions, outDir, src: srcBase, extensions, exclude, include, postcssOptions, preprocessorOptions } = options;
+  const {
+    root: cwd,
+    weappTailwindcssOptions,
+    outDir,
+    src: srcBase,
+    extensions,
+    exclude,
+    include,
+    postcssOptions,
+    preprocessorOptions
+  } = options;
   const globsSet = new GlobsSet();
-  const base = srcBase ? srcBase + "/" : "";
+  const base = srcBase ? `${srcBase}/` : "";
   const enableSass = Boolean(preprocessorOptions?.sass);
   const enableLess = Boolean(preprocessorOptions?.less);
   if (typescriptOptions === true) {
@@ -520,18 +531,18 @@ async function getTasks(options) {
     sass = createSass(sassLib);
   }
   const { transformJs, transformWxml, transformWxss } = createPlugins(weappTailwindcssOptions);
+  const outDirGlobs = [`!${outDir}/**/*`, `!./${outDir}/**/*`];
   function getGlobs(type) {
     const globs = [];
     if (typeof include === "function") {
       globs.push(...include(type).map((x) => x));
     }
     if (typeof exclude === "function") {
-      globs.push(...exclude(type).map((x) => "!" + x));
+      globs.push(...exclude(type).map((x) => `!${x}`));
     } else if (Array.isArray(exclude)) {
-      globs.push(...exclude.map((x) => "!" + x));
+      globs.push(...exclude.map((x) => `!${x}`));
     }
-    globs.push(`!${outDir}/**/*`);
-    globs.push(`!./${outDir}/**/*`);
+    globs.push(...outDirGlobs);
     return globs;
   }
   function getJsTasks() {
@@ -545,7 +556,10 @@ async function getTasks(options) {
       const loadTs = enableTs && isTs;
       let gulpTs;
       if (enableTs && typeof typescriptOptions !== "boolean") {
-        gulpTs = typescript.createProject(typescriptOptions.tsConfigFileName ?? "tsconfig.json", typeof typescriptOptions === "boolean" ? {} : typescriptOptions);
+        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) });
@@ -613,7 +627,12 @@ async function getTasks(options) {
           );
         }
         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(
+          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({
@@ -654,7 +673,7 @@ async function getTasks(options) {
       });
       globsSet.add(globs);
       return promisify(
-        gulp.src(globs, { cwd, since: gulp.lastRun(copyOthers) }).pipe(
+        gulp.src([...globs, ...outDirGlobs], { cwd, since: gulp.lastRun(copyOthers) }).pipe(
           gulp.dest(outDir, {
             cwd
           })
@@ -698,6 +717,7 @@ async function createBuilder(options) {
     clean: true,
     src: "",
     exclude: [...defaultNodeModulesDirs],
+    include: ["**/*.{png,jpg,jpeg,gif,svg,webp}"],
     extensions: {
       javascript: [...defaultJavascriptExtensions, ...defaultTypescriptExtensions, ...defaultWxsExtensions],
       html: ["wxml"],
@@ -738,7 +758,7 @@ async function createBuilder(options) {
       if (clean) {
         debug("del start");
         const { deleteAsync } = await import('del');
-        const patterns = [outDir + "/**"];
+        const patterns = [`${outDir}/**`];
         await deleteAsync(patterns, { cwd, ignore: defaultNodeModulesDirs });
         debug("del end");
       }
@@ -749,7 +769,9 @@ async function createBuilder(options) {
     watch() {
       ensureDirSync(path.resolve(cwd, outDir));
       const dumps = globsSet.dump();
-      const arr = (Array.isArray(watchOptions.ignored) ? watchOptions.ignored : [watchOptions.ignored]).filter(Boolean);
+      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 {
@@ -759,22 +781,24 @@ async function createBuilder(options) {
           cb(error);
         }
       });
-      watcher.on("change", function(path2) {
+      watcher.on("change", (path2) => {
         console.log(`${pc.green("changed")} ${path2}`);
       });
-      watcher.on("add", function(path2) {
+      watcher.on("add", (path2) => {
         console.log(`${pc.green("add")} ${path2}`);
       });
-      watcher.on("unlink", function(path2) {
+      watcher.on("unlink", (path2) => {
         console.log(`${pc.green("remove")} ${path2}`);
       });
-      watcher.on("ready", async function() {
+      watcher.on("ready", async () => {
         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!`);
+        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;
@@ -829,7 +853,9 @@ function updateProjectConfig(options) {
       set(projectConfig, "srcMiniprogramRoot", "dist/");
       set(projectConfig, "setting.packNpmManually", true);
       if (Array.isArray(get(projectConfig, "setting.packNpmRelationList"))) {
-        const x = projectConfig.setting.packNpmRelationList.find((x2) => x2.packageJsonPath === "./package.json" && x2.miniprogramNpmDistDir === "./dist");
+        const x = projectConfig.setting.packNpmRelationList.find(
+          (x2) => x2.packageJsonPath === "./package.json" && x2.miniprogramNpmDistDir === "./dist"
+        );
         if (!x) {
           projectConfig.setting.packNpmRelationList.push({
             packageJsonPath: "./package.json",
@@ -873,7 +899,10 @@ function updatePackageJson(options) {
   }
 }
 function initConfig(options) {
-  const { lang, root } = defu(options, { lang: "js", root: process.cwd() });
+  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");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weapp-tailwindcss/cli",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "The cli of weapp-tailwindcss",
   "keywords": [
     "weapp",
@@ -47,13 +47,13 @@
     "local-pkg": "^0.5.0",
     "picocolors": "^1.0.0",
     "postcss": "^8.4.38",
-    "postcss-load-config": "^5.0.3"
+    "postcss-load-config": "^5.1.0"
   },
   "peerDependencies": {
     "less": "*",
     "sass": "*",
     "typescript": "*",
-    "weapp-tailwindcss": "3.2.0"
+    "weapp-tailwindcss": "3.2.1"
   },
   "peerDependenciesMeta": {
     "less": {