@weapp-tailwindcss/cli 1.0.3 → 1.0.5

package/dist/index.cjs

@@ -11,11 +11,10 @@ const localPkg = require('local-pkg');
 const createDebug = require('debug');
 const gulp = require('weapp-tailwindcss/gulp');
 const postcssrc = require('gulp-postcss');
-const gulpif = require('gulp-if');
 const createSass = require('gulp-sass');
 const rename = require('gulp-rename');
 const less = require('gulp-less');
-const typescript = require('gulp-typescript');
+const postcssScssParser = require('postcss-scss');
 const cosmiconfig = require('cosmiconfig');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
@@ -28,11 +27,10 @@ const loadPostcssConfig__default = /*#__PURE__*/_interopDefaultCompat(loadPostcs
 const pc__default = /*#__PURE__*/_interopDefaultCompat(pc);
 const createDebug__default = /*#__PURE__*/_interopDefaultCompat(createDebug);
 const postcssrc__default = /*#__PURE__*/_interopDefaultCompat(postcssrc);
-const gulpif__default = /*#__PURE__*/_interopDefaultCompat(gulpif);
 const createSass__default = /*#__PURE__*/_interopDefaultCompat(createSass);
 const rename__default = /*#__PURE__*/_interopDefaultCompat(rename);
 const less__default = /*#__PURE__*/_interopDefaultCompat(less);
-const typescript__default = /*#__PURE__*/_interopDefaultCompat(typescript);
+const postcssScssParser__default = /*#__PURE__*/_interopDefaultCompat(postcssScssParser);
 
 function isPlainObject$2(value) {
   if (value === null || typeof value !== "object") {
@@ -90,7 +88,7 @@ function createDefu(merger) {
 }
 const defu = createDefu();
 
-const version = "1.0.3";
+const version = "1.0.5";
 
 const debug = createDebug__default("weapp-tw-cli");
 
@@ -570,6 +568,13 @@ function normalizePlugin(plugin) {
     return fn.apply(fn, args);
   }
 }
+function resolveTask({ pipes, globs, since, cwd }) {
+  let chain = gulp__default.src(globs, { cwd, since: gulp__default.lastRun(since) });
+  for (const p of pipes) {
+    chain = chain.pipe(p);
+  }
+  return promisify(chain);
+}
 async function getTasks(options) {
   let { typescriptOptions } = options;
   const {
@@ -608,6 +613,10 @@ async function getTasks(options) {
     const sassLib = await import('sass');
     sass = createSass__default(sassLib);
   }
+  let ts;
+  if (enableTs) {
+    ts = (await import('gulp-typescript')).default;
+  }
   const { transformJs, transformWxml, transformWxss } = gulp.createPlugins(weappTailwindcssOptions);
   const outDirGlobs = [`!${outDir}/**/*`, `!./${outDir}/**/*`];
   function getGlobs(type) {
@@ -634,13 +643,12 @@ async function getTasks(options) {
       const loadTs = enableTs && isTs;
       let gulpTs;
       if (enableTs && typeof typescriptOptions !== "boolean") {
-        gulpTs = typescript__default.createProject(
+        gulpTs = ts.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) });
         const pipes = [];
         if (loadTs) {
           pipes.push(gulpTs());
@@ -650,19 +658,20 @@ async function getTasks(options) {
             plugins: ["typescript"]
           } : void 0
         }));
-        pipes.push(gulpif__default(
-          loadTs,
-          rename__default({
+        if (loadTs) {
+          pipes.push(rename__default({
             extname: ".js"
-          })
-        ));
+          }));
+        }
         pipes.push(gulp__default.dest(outDir, {
           cwd
         }));
-        for (const p of resolvePipes(pipes, assetType)) {
-          chain = chain.pipe(p);
-        }
-        return promisify(chain);
+        return resolveTask({
+          pipes: resolvePipes(pipes, assetType),
+          cwd,
+          globs: [src, ...globs],
+          since: JsTask
+        });
       };
     });
   }
@@ -677,11 +686,12 @@ async function getTasks(options) {
         const pipes = [gulp__default.dest(outDir, {
           cwd
         })];
-        let chain = gulp__default.src([src, ...globs], { cwd, since: gulp__default.lastRun(JsonTask) });
-        for (const p of resolvePipes(pipes, assetType)) {
-          chain = chain.pipe(p);
-        }
-        return promisify(chain);
+        return resolveTask({
+          cwd,
+          globs: [src, ...globs],
+          pipes: resolvePipes(pipes, assetType),
+          since: JsonTask
+        });
       };
     });
   }
@@ -695,7 +705,6 @@ async function getTasks(options) {
       const loadSass = enableSass && isSassLang(x);
       const loadLess = enableLess && isLessLang(x);
       return function CssTask() {
-        let chain = gulp__default.src([src, ...globs], { cwd, since: gulp__default.lastRun(CssTask) });
         const pipes = [];
         if (loadSass) {
           pipes.push(sass.sync(
@@ -703,25 +712,37 @@ async function getTasks(options) {
             typeof preprocessorOptions?.sass === "boolean" ? void 0 : preprocessorOptions?.sass
           ).on("error", sass.logError));
         }
-        pipes.push(gulpif__default(
-          loadLess,
-          less__default(typeof preprocessorOptions?.less === "boolean" ? void 0 : preprocessorOptions?.less)
-        ));
-        pipes.push(gulpif__default(Boolean(postcssOptions), postcssrc__default(postcssOptions?.plugins, postcssOptions?.options)));
-        pipes.push(transformWxss());
-        pipes.push(gulpif__default(
-          loadSass || loadLess,
-          rename__default({
+        if (loadLess) {
+          pipes.push(less__default(typeof preprocessorOptions?.less === "boolean" ? void 0 : preprocessorOptions?.less));
+        }
+        if (postcssOptions) {
+          pipes.push(postcssrc__default(postcssOptions?.plugins, postcssOptions?.options));
+        }
+        if (x === "scss") {
+          pipes.push(transformWxss({
+            postcssOptions: {
+              options: {
+                parser: postcssScssParser__default
+              }
+            }
+          }));
+        } else {
+          pipes.push(transformWxss());
+        }
+        if (loadSass || loadLess) {
+          pipes.push(rename__default({
             extname: ".wxss"
-          })
-        ));
+          }));
+        }
         pipes.push(gulp__default.dest(outDir, {
           cwd
         }));
-        for (const p of resolvePipes(pipes, assetType)) {
-          chain = chain.pipe(p);
-        }
-        return promisify(chain);
+        return resolveTask({
+          cwd,
+          globs: [src, ...globs],
+          pipes: resolvePipes(pipes, assetType),
+          since: CssTask
+        });
       };
     });
   }
@@ -733,16 +754,15 @@ async function getTasks(options) {
       const src = `${base}**/*.${x}`;
       globsSet.add(src);
       return function HtmlTask() {
-        let chain = gulp__default.src([src, ...globs], { cwd, since: gulp__default.lastRun(HtmlTask) });
         const pipes = [transformWxml(), gulp__default.dest(outDir, {
           cwd
         })];
-        for (const p of resolvePipes(pipes, assetType)) {
-          chain = chain.pipe(p);
-        }
-        return promisify(
-          chain
-        );
+        return resolveTask({
+          cwd,
+          globs: [src, ...globs],
+          pipes: resolvePipes(pipes, assetType),
+          since: HtmlTask
+        });
       };
     });
   }
@@ -752,14 +772,15 @@ async function getTasks(options) {
         return `${base}${x}`;
       });
       globsSet.add(globs);
-      let chain = gulp__default.src([...globs, ...outDirGlobs], { cwd, since: gulp__default.lastRun(copyOthers) });
       const pipes = [gulp__default.dest(outDir, {
         cwd
       })];
-      for (const p of pipes) {
-        chain = chain.pipe(p);
-      }
-      return promisify(chain);
+      return resolveTask({
+        cwd,
+        globs: [...globs, ...outDirGlobs, ...defaultNodeModulesDirs.map((x) => `!${x}`)],
+        pipes,
+        since: copyOthers
+      });
     }
   }
   return {

package/dist/index.mjs

@@ -9,11 +9,10 @@ import { getPackageInfo } from 'local-pkg';
 import createDebug from 'debug';
 import { createPlugins } from 'weapp-tailwindcss/gulp';
 import postcssrc from 'gulp-postcss';
-import gulpif from 'gulp-if';
 import createSass from 'gulp-sass';
 import rename from 'gulp-rename';
 import less from 'gulp-less';
-import typescript from 'gulp-typescript';
+import postcssScssParser from 'postcss-scss';
 import { cosmiconfigSync } from 'cosmiconfig';
 
 function isPlainObject$2(value) {
@@ -72,7 +71,7 @@ function createDefu(merger) {
 }
 const defu = createDefu();
 
-const version = "1.0.3";
+const version = "1.0.5";
 
 const debug = createDebug("weapp-tw-cli");
 
@@ -552,6 +551,13 @@ function normalizePlugin(plugin) {
     return fn.apply(fn, args);
   }
 }
+function resolveTask({ pipes, globs, since, cwd }) {
+  let chain = gulp.src(globs, { cwd, since: gulp.lastRun(since) });
+  for (const p of pipes) {
+    chain = chain.pipe(p);
+  }
+  return promisify(chain);
+}
 async function getTasks(options) {
   let { typescriptOptions } = options;
   const {
@@ -590,6 +596,10 @@ async function getTasks(options) {
     const sassLib = await import('sass');
     sass = createSass(sassLib);
   }
+  let ts;
+  if (enableTs) {
+    ts = (await import('gulp-typescript')).default;
+  }
   const { transformJs, transformWxml, transformWxss } = createPlugins(weappTailwindcssOptions);
   const outDirGlobs = [`!${outDir}/**/*`, `!./${outDir}/**/*`];
   function getGlobs(type) {
@@ -616,13 +626,12 @@ async function getTasks(options) {
       const loadTs = enableTs && isTs;
       let gulpTs;
       if (enableTs && typeof typescriptOptions !== "boolean") {
-        gulpTs = typescript.createProject(
+        gulpTs = ts.createProject(
           typescriptOptions.tsConfigFileName ?? "tsconfig.json",
           typeof typescriptOptions === "boolean" ? {} : typescriptOptions
         );
       }
       return function JsTask() {
-        let chain = gulp.src([src, ...globs], { cwd, since: gulp.lastRun(JsTask) });
         const pipes = [];
         if (loadTs) {
           pipes.push(gulpTs());
@@ -632,19 +641,20 @@ async function getTasks(options) {
             plugins: ["typescript"]
           } : void 0
         }));
-        pipes.push(gulpif(
-          loadTs,
-          rename({
+        if (loadTs) {
+          pipes.push(rename({
             extname: ".js"
-          })
-        ));
+          }));
+        }
         pipes.push(gulp.dest(outDir, {
           cwd
         }));
-        for (const p of resolvePipes(pipes, assetType)) {
-          chain = chain.pipe(p);
-        }
-        return promisify(chain);
+        return resolveTask({
+          pipes: resolvePipes(pipes, assetType),
+          cwd,
+          globs: [src, ...globs],
+          since: JsTask
+        });
       };
     });
   }
@@ -659,11 +669,12 @@ async function getTasks(options) {
         const pipes = [gulp.dest(outDir, {
           cwd
         })];
-        let chain = gulp.src([src, ...globs], { cwd, since: gulp.lastRun(JsonTask) });
-        for (const p of resolvePipes(pipes, assetType)) {
-          chain = chain.pipe(p);
-        }
-        return promisify(chain);
+        return resolveTask({
+          cwd,
+          globs: [src, ...globs],
+          pipes: resolvePipes(pipes, assetType),
+          since: JsonTask
+        });
       };
     });
   }
@@ -677,7 +688,6 @@ async function getTasks(options) {
       const loadSass = enableSass && isSassLang(x);
       const loadLess = enableLess && isLessLang(x);
       return function CssTask() {
-        let chain = gulp.src([src, ...globs], { cwd, since: gulp.lastRun(CssTask) });
         const pipes = [];
         if (loadSass) {
           pipes.push(sass.sync(
@@ -685,25 +695,37 @@ async function getTasks(options) {
             typeof preprocessorOptions?.sass === "boolean" ? void 0 : preprocessorOptions?.sass
           ).on("error", sass.logError));
         }
-        pipes.push(gulpif(
-          loadLess,
-          less(typeof preprocessorOptions?.less === "boolean" ? void 0 : preprocessorOptions?.less)
-        ));
-        pipes.push(gulpif(Boolean(postcssOptions), postcssrc(postcssOptions?.plugins, postcssOptions?.options)));
-        pipes.push(transformWxss());
-        pipes.push(gulpif(
-          loadSass || loadLess,
-          rename({
+        if (loadLess) {
+          pipes.push(less(typeof preprocessorOptions?.less === "boolean" ? void 0 : preprocessorOptions?.less));
+        }
+        if (postcssOptions) {
+          pipes.push(postcssrc(postcssOptions?.plugins, postcssOptions?.options));
+        }
+        if (x === "scss") {
+          pipes.push(transformWxss({
+            postcssOptions: {
+              options: {
+                parser: postcssScssParser
+              }
+            }
+          }));
+        } else {
+          pipes.push(transformWxss());
+        }
+        if (loadSass || loadLess) {
+          pipes.push(rename({
             extname: ".wxss"
-          })
-        ));
+          }));
+        }
         pipes.push(gulp.dest(outDir, {
           cwd
         }));
-        for (const p of resolvePipes(pipes, assetType)) {
-          chain = chain.pipe(p);
-        }
-        return promisify(chain);
+        return resolveTask({
+          cwd,
+          globs: [src, ...globs],
+          pipes: resolvePipes(pipes, assetType),
+          since: CssTask
+        });
       };
     });
   }
@@ -715,16 +737,15 @@ async function getTasks(options) {
       const src = `${base}**/*.${x}`;
       globsSet.add(src);
       return function HtmlTask() {
-        let chain = gulp.src([src, ...globs], { cwd, since: gulp.lastRun(HtmlTask) });
         const pipes = [transformWxml(), gulp.dest(outDir, {
           cwd
         })];
-        for (const p of resolvePipes(pipes, assetType)) {
-          chain = chain.pipe(p);
-        }
-        return promisify(
-          chain
-        );
+        return resolveTask({
+          cwd,
+          globs: [src, ...globs],
+          pipes: resolvePipes(pipes, assetType),
+          since: HtmlTask
+        });
       };
     });
   }
@@ -734,14 +755,15 @@ async function getTasks(options) {
         return `${base}${x}`;
       });
       globsSet.add(globs);
-      let chain = gulp.src([...globs, ...outDirGlobs], { cwd, since: gulp.lastRun(copyOthers) });
       const pipes = [gulp.dest(outDir, {
         cwd
       })];
-      for (const p of pipes) {
-        chain = chain.pipe(p);
-      }
-      return promisify(chain);
+      return resolveTask({
+        cwd,
+        globs: [...globs, ...outDirGlobs, ...defaultNodeModulesDirs.map((x) => `!${x}`)],
+        pipes,
+        since: copyOthers
+      });
     }
   }
   return {

package/package.json

@@ -1,10 +1,14 @@
 {
   "name": "@weapp-tailwindcss/cli",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "The cli of weapp-tailwindcss",
   "author": "SonOfMagic <qq1324318532@gmail.com>",
   "license": "MIT",
   "homepage": "https://weapp-tw.icebreaker.top/docs/quick-start/native/install",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/sonofmagic/weapp-tailwindcss.git"
+  },
   "bugs": {
     "url": "https://github.com/sonofmagic/weapp-tailwindcss/issues"
   },
@@ -34,7 +38,7 @@
     "less": "*",
     "sass": "*",
     "typescript": "*",
-    "weapp-tailwindcss": "3.2.1"
+    "weapp-tailwindcss": "3.3.4"
   },
   "peerDependenciesMeta": {
     "less": {
@@ -55,7 +59,6 @@
     "fs-extra": "^11.2.0",
     "gulp": "^4.0.2",
     "gulp-debug": "^5.0.1",
-    "gulp-if": "^3.0.0",
     "gulp-less": "^5.0.0",
     "gulp-plumber": "^1.2.1",
     "gulp-postcss": "^10.0.0",
@@ -64,15 +67,16 @@
     "gulp-typescript": "6.0.0-alpha.1",
     "local-pkg": "^0.5.0",
     "picocolors": "^1.0.1",
-    "postcss": "^8.4.38",
-    "postcss-load-config": "^5.1.0"
+    "postcss": "^8.4.39",
+    "postcss-load-config": "^6.0.1",
+    "postcss-scss": "^4.0.9"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
   },
   "devDependencies": {
-    "tailwindcss": "^3.4.3"
+    "tailwindcss": "^3.4.4"
   },
   "scripts": {
     "dev": "unbuild --sourcemap",