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

package/dist/index.cjs

@@ -1,19 +1,25 @@
 'use strict';
 
 const commander = require('commander');
-const loadPostcssConfig = require('postcss-load-config');
 const path = require('node:path');
 const fs = require('fs-extra');
 const gulp$1 = require('gulp');
+const loadPostcssConfig = require('postcss-load-config');
 const gulp = require('weapp-tailwindcss/gulp');
+const postcssrc = require('gulp-postcss');
+const plumber = require('gulp-plumber');
+const gulpif = require('gulp-if');
 const cosmiconfig = require('cosmiconfig');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
-const loadPostcssConfig__default = /*#__PURE__*/_interopDefaultCompat(loadPostcssConfig);
 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 postcssrc__default = /*#__PURE__*/_interopDefaultCompat(postcssrc);
+const plumber__default = /*#__PURE__*/_interopDefaultCompat(plumber);
+const gulpif__default = /*#__PURE__*/_interopDefaultCompat(gulpif);
 
 function isPlainObject$2(value) {
   if (value === null || typeof value !== "object") {
@@ -80,7 +86,7 @@ var AssetType = /* @__PURE__ */ ((AssetType2) => {
 })(AssetType || {});
 
 function getTasks(options) {
-  const { root: cwd, weappTailwindcssOptions, outDir, src: srcBase, extensions, exclude, include } = options;
+  const { root: cwd, weappTailwindcssOptions, outDir, src: srcBase, extensions, exclude, include, postcssOptions } = options;
   const globsSet = /* @__PURE__ */ new Set();
   const base = srcBase ? srcBase + "/" : "";
   function globsSetAdd(...value) {
@@ -116,7 +122,7 @@ function getTasks(options) {
       const src = `${base}**/*.${x}`;
       globsSetAdd(src);
       return function JsTask() {
-        return gulp__default.src([src, ...globs], { cwd, since: gulp__default.lastRun(JsTask) }).pipe(
+        return gulp__default.src([src, ...globs], { cwd, since: gulp__default.lastRun(JsTask) }).pipe(plumber__default()).pipe(
           transformJs({
             babelParserOptions: x === "ts" ? {
               plugins: ["typescript"]
@@ -138,7 +144,7 @@ function getTasks(options) {
       const src = `${base}**/*.${x}`;
       globsSetAdd(src);
       return function JsonTask() {
-        return gulp__default.src([src, ...globs], { cwd, since: gulp__default.lastRun(JsonTask) }).pipe(
+        return gulp__default.src([src, ...globs], { cwd, since: gulp__default.lastRun(JsonTask) }).pipe(plumber__default()).pipe(
           gulp__default.dest(outDir, {
             cwd
           })
@@ -154,7 +160,7 @@ function getTasks(options) {
       const src = `${base}**/*.${x}`;
       globsSetAdd(src);
       return function CssTask() {
-        return gulp__default.src([src, ...globs], { cwd, since: gulp__default.lastRun(CssTask) }).pipe(transformWxss()).pipe(
+        return gulp__default.src([src, ...globs], { cwd, since: gulp__default.lastRun(CssTask) }).pipe(plumber__default()).pipe(gulpif__default(Boolean(postcssOptions), postcssrc__default(postcssOptions?.plugins, postcssOptions?.options))).pipe(transformWxss()).pipe(
           gulp__default.dest(outDir, {
             cwd
           })
@@ -170,7 +176,7 @@ function getTasks(options) {
       const src = `${base}**/*.${x}`;
       globsSetAdd(src);
       return function HtmlTask() {
-        return gulp__default.src([src, ...globs], { cwd, since: gulp__default.lastRun(HtmlTask) }).pipe(transformWxml()).pipe(
+        return gulp__default.src([src, ...globs], { cwd, since: gulp__default.lastRun(HtmlTask) }).pipe(plumber__default()).pipe(transformWxml()).pipe(
           gulp__default.dest(outDir, {
             cwd
           })
@@ -184,7 +190,7 @@ function getTasks(options) {
         return `${base}${x}`;
       });
       globsSetAdd(globs);
-      return gulp__default.src(globs, { cwd, since: gulp__default.lastRun(copyOthers) }).pipe(
+      return gulp__default.src(globs, { cwd, since: gulp__default.lastRun(copyOthers) }).pipe(plumber__default()).pipe(
         gulp__default.dest(outDir, {
           cwd
         })
@@ -224,7 +230,8 @@ function createBuilder(options) {
     extensions,
     exclude,
     include,
-    watchOptions
+    watchOptions,
+    postcssOptions
   } = defu(options, {
     outDir: "dist",
     weappTailwindcssOptions: {},
@@ -250,7 +257,8 @@ function createBuilder(options) {
     extensions,
     exclude,
     include,
-    watchOptions
+    watchOptions,
+    postcssOptions
   });
   const tasks = [...getJsTasks(), ...getJsonTasks(), ...getCssTasks(), ...getHtmlTasks(), copyOthers];
   async function runTasks() {
@@ -301,13 +309,23 @@ function createBuilder(options) {
     globsSet
   };
 }
-function build(options) {
-  const builder = createBuilder(options);
-  return builder.build();
+async function build(options) {
+  let postcssOptions;
+  try {
+    postcssOptions = await loadPostcssConfig__default({ cwd: options?.root });
+  } catch {
+  }
+  const builder = createBuilder(defu(options, { postcssOptions }));
+  return await builder.build();
 }
-function watch(options) {
-  const builder = createBuilder(options);
-  return builder.watch();
+async function watch(options) {
+  let postcssOptions;
+  try {
+    postcssOptions = await loadPostcssConfig__default({ cwd: options?.root });
+  } catch {
+  }
+  const builder = createBuilder(defu(options, { postcssOptions }));
+  return await builder.watch();
 }
 
 function getDefaultExportFromCjs (x) {
@@ -773,28 +791,16 @@ 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
-        }
+        root: cwd
       })
     );
   });
   program.command("build").action(async () => {
-    const postcssOptions = await loadPostcssConfig__default({
-      cwd
-    });
     await build(
       defu(userDefinedConfig?.config, {
-        root: cwd,
-        weappTailwindcssOptions: {
-          postcssOptions
-        }
+        root: cwd
       })
     );
   });

package/dist/index.d.cts

@@ -2,6 +2,7 @@ import { Command } from 'commander';
 import { FSWatcher } from 'fs-extra';
 import { UserDefinedOptions } from 'weapp-tailwindcss';
 import { WatchOptions } from 'gulp';
+import { Result } from 'postcss-load-config';
 import * as cosmiconfig from 'cosmiconfig';
 
 declare function createCli(): Command;
@@ -27,6 +28,7 @@ interface BuildOptions {
         css: string[];
         json: string[];
     };
+    postcssOptions?: Partial<Omit<Result, 'file'>>;
     watchOptions: WatchOptions;
 }
 
@@ -42,12 +44,12 @@ declare function build(options?: Partial<BuildOptions>): Promise<{
     watch(): any;
     globsSet: Set<string>;
 }>;
-declare function watch(options?: Partial<BuildOptions>): {
+declare function watch(options?: Partial<BuildOptions>): Promise<{
     watcher: FSWatcher | undefined;
     build(): Promise<any>;
     watch(): any;
     globsSet: Set<string>;
-};
+}>;
 
 type WeappTwCosmiconfigResult = {
     config: UserConfig;

package/dist/index.d.mts

@@ -2,6 +2,7 @@ import { Command } from 'commander';
 import { FSWatcher } from 'fs-extra';
 import { UserDefinedOptions } from 'weapp-tailwindcss';
 import { WatchOptions } from 'gulp';
+import { Result } from 'postcss-load-config';
 import * as cosmiconfig from 'cosmiconfig';
 
 declare function createCli(): Command;
@@ -27,6 +28,7 @@ interface BuildOptions {
         css: string[];
         json: string[];
     };
+    postcssOptions?: Partial<Omit<Result, 'file'>>;
     watchOptions: WatchOptions;
 }
 
@@ -42,12 +44,12 @@ declare function build(options?: Partial<BuildOptions>): Promise<{
     watch(): any;
     globsSet: Set<string>;
 }>;
-declare function watch(options?: Partial<BuildOptions>): {
+declare function watch(options?: Partial<BuildOptions>): Promise<{
     watcher: FSWatcher | undefined;
     build(): Promise<any>;
     watch(): any;
     globsSet: Set<string>;
-};
+}>;
 
 type WeappTwCosmiconfigResult = {
     config: UserConfig;

package/dist/index.d.ts

@@ -2,6 +2,7 @@ import { Command } from 'commander';
 import { FSWatcher } from 'fs-extra';
 import { UserDefinedOptions } from 'weapp-tailwindcss';
 import { WatchOptions } from 'gulp';
+import { Result } from 'postcss-load-config';
 import * as cosmiconfig from 'cosmiconfig';
 
 declare function createCli(): Command;
@@ -27,6 +28,7 @@ interface BuildOptions {
         css: string[];
         json: string[];
     };
+    postcssOptions?: Partial<Omit<Result, 'file'>>;
     watchOptions: WatchOptions;
 }
 
@@ -42,12 +44,12 @@ declare function build(options?: Partial<BuildOptions>): Promise<{
     watch(): any;
     globsSet: Set<string>;
 }>;
-declare function watch(options?: Partial<BuildOptions>): {
+declare function watch(options?: Partial<BuildOptions>): Promise<{
     watcher: FSWatcher | undefined;
     build(): Promise<any>;
     watch(): any;
     globsSet: Set<string>;
-};
+}>;
 
 type WeappTwCosmiconfigResult = {
     config: UserConfig;

package/dist/index.mjs

@@ -1,9 +1,12 @@
 import { Command } from 'commander';
-import loadPostcssConfig from 'postcss-load-config';
 import path from 'node:path';
 import fs, { ensureDirSync } from 'fs-extra';
 import gulp from 'gulp';
+import loadPostcssConfig from 'postcss-load-config';
 import { createPlugins } from 'weapp-tailwindcss/gulp';
+import postcssrc from 'gulp-postcss';
+import plumber from 'gulp-plumber';
+import gulpif from 'gulp-if';
 import { cosmiconfigSync } from 'cosmiconfig';
 
 function isPlainObject$2(value) {
@@ -71,7 +74,7 @@ var AssetType = /* @__PURE__ */ ((AssetType2) => {
 })(AssetType || {});
 
 function getTasks(options) {
-  const { root: cwd, weappTailwindcssOptions, outDir, src: srcBase, extensions, exclude, include } = options;
+  const { root: cwd, weappTailwindcssOptions, outDir, src: srcBase, extensions, exclude, include, postcssOptions } = options;
   const globsSet = /* @__PURE__ */ new Set();
   const base = srcBase ? srcBase + "/" : "";
   function globsSetAdd(...value) {
@@ -107,7 +110,7 @@ function getTasks(options) {
       const src = `${base}**/*.${x}`;
       globsSetAdd(src);
       return function JsTask() {
-        return gulp.src([src, ...globs], { cwd, since: gulp.lastRun(JsTask) }).pipe(
+        return gulp.src([src, ...globs], { cwd, since: gulp.lastRun(JsTask) }).pipe(plumber()).pipe(
           transformJs({
             babelParserOptions: x === "ts" ? {
               plugins: ["typescript"]
@@ -129,7 +132,7 @@ function getTasks(options) {
       const src = `${base}**/*.${x}`;
       globsSetAdd(src);
       return function JsonTask() {
-        return gulp.src([src, ...globs], { cwd, since: gulp.lastRun(JsonTask) }).pipe(
+        return gulp.src([src, ...globs], { cwd, since: gulp.lastRun(JsonTask) }).pipe(plumber()).pipe(
           gulp.dest(outDir, {
             cwd
           })
@@ -145,7 +148,7 @@ function getTasks(options) {
       const src = `${base}**/*.${x}`;
       globsSetAdd(src);
       return function CssTask() {
-        return gulp.src([src, ...globs], { cwd, since: gulp.lastRun(CssTask) }).pipe(transformWxss()).pipe(
+        return gulp.src([src, ...globs], { cwd, since: gulp.lastRun(CssTask) }).pipe(plumber()).pipe(gulpif(Boolean(postcssOptions), postcssrc(postcssOptions?.plugins, postcssOptions?.options))).pipe(transformWxss()).pipe(
           gulp.dest(outDir, {
             cwd
           })
@@ -161,7 +164,7 @@ function getTasks(options) {
       const src = `${base}**/*.${x}`;
       globsSetAdd(src);
       return function HtmlTask() {
-        return gulp.src([src, ...globs], { cwd, since: gulp.lastRun(HtmlTask) }).pipe(transformWxml()).pipe(
+        return gulp.src([src, ...globs], { cwd, since: gulp.lastRun(HtmlTask) }).pipe(plumber()).pipe(transformWxml()).pipe(
           gulp.dest(outDir, {
             cwd
           })
@@ -175,7 +178,7 @@ function getTasks(options) {
         return `${base}${x}`;
       });
       globsSetAdd(globs);
-      return gulp.src(globs, { cwd, since: gulp.lastRun(copyOthers) }).pipe(
+      return gulp.src(globs, { cwd, since: gulp.lastRun(copyOthers) }).pipe(plumber()).pipe(
         gulp.dest(outDir, {
           cwd
         })
@@ -215,7 +218,8 @@ function createBuilder(options) {
     extensions,
     exclude,
     include,
-    watchOptions
+    watchOptions,
+    postcssOptions
   } = defu(options, {
     outDir: "dist",
     weappTailwindcssOptions: {},
@@ -241,7 +245,8 @@ function createBuilder(options) {
     extensions,
     exclude,
     include,
-    watchOptions
+    watchOptions,
+    postcssOptions
   });
   const tasks = [...getJsTasks(), ...getJsonTasks(), ...getCssTasks(), ...getHtmlTasks(), copyOthers];
   async function runTasks() {
@@ -292,13 +297,23 @@ function createBuilder(options) {
     globsSet
   };
 }
-function build(options) {
-  const builder = createBuilder(options);
-  return builder.build();
+async function build(options) {
+  let postcssOptions;
+  try {
+    postcssOptions = await loadPostcssConfig({ cwd: options?.root });
+  } catch {
+  }
+  const builder = createBuilder(defu(options, { postcssOptions }));
+  return await builder.build();
 }
-function watch(options) {
-  const builder = createBuilder(options);
-  return builder.watch();
+async function watch(options) {
+  let postcssOptions;
+  try {
+    postcssOptions = await loadPostcssConfig({ cwd: options?.root });
+  } catch {
+  }
+  const builder = createBuilder(defu(options, { postcssOptions }));
+  return await builder.watch();
 }
 
 function getDefaultExportFromCjs (x) {
@@ -764,28 +779,16 @@ 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
-        }
+        root: cwd
       })
     );
   });
   program.command("build").action(async () => {
-    const postcssOptions = await loadPostcssConfig({
-      cwd
-    });
     await build(
       defu(userDefinedConfig?.config, {
-        root: cwd,
-        weappTailwindcssOptions: {
-          postcssOptions
-        }
+        root: cwd
       })
     );
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weapp-tailwindcss/cli",
-  "version": "0.0.0-alpha.4",
+  "version": "0.0.0-alpha.5",
   "description": "The cli of weapp-tailwindcss",
   "keywords": [],
   "author": "",
@@ -27,15 +27,22 @@
     "fs-extra": "^11.2.0",
     "gulp": "^5.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",
+    "postcss": "^8.4.38",
     "postcss-load-config": "^5.0.3",
-    "weapp-tailwindcss": "3.2.0-alpha.3"
+    "weapp-tailwindcss": "3.2.0-alpha.4"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
     "@types/get-value": "^3.0.5",
     "@types/gulp": "^4.0.17",
+    "@types/gulp-if": "^3.0.4",
     "@types/gulp-less": "^0.0.36",
+    "@types/gulp-plumber": "^0.0.37",
+    "@types/gulp-postcss": "^8.0.6",
     "@types/gulp-sass": "^5.0.4",
     "@types/set-value": "^4.0.3",
     "@types/vinyl-fs": "^3.0.5",