@weapp-tailwindcss/cli 1.0.5 → 1.0.7

package/dist/index.cjs

@@ -88,7 +88,7 @@ function createDefu(merger) {
 }
 const defu = createDefu();
 
-const version = "1.0.5";
+const version = "1.0.7";
 
 const debug = createDebug__default("weapp-tw-cli");
 
@@ -610,12 +610,25 @@ async function getTasks(options) {
   const enableTs = Boolean(typescriptOptions);
   let sass;
   if (enableSass) {
+    if (!localPkg.isPackageExists("sass")) {
+      throw new Error("\u8BF7\u5148\u6267\u884C npm / yarn / pnpm \u547D\u4EE4\u5B89\u88C5 `sass` \u540E\u91CD\u8BD5!");
+    }
     const sassLib = await import('sass');
     sass = createSass__default(sassLib);
   }
   let ts;
+  let gulpTs;
   if (enableTs) {
+    if (!localPkg.isPackageExists("typescript")) {
+      throw new Error("\u8BF7\u5148\u6267\u884C npm / yarn / pnpm \u547D\u4EE4\u5B89\u88C5 `typescript` \u540E\u91CD\u8BD5!");
+    }
     ts = (await import('gulp-typescript')).default;
+    if (typeof typescriptOptions !== "boolean") {
+      gulpTs = ts.createProject(
+        typescriptOptions.tsConfigFileName ?? "tsconfig.json",
+        typescriptOptions.settings
+      );
+    }
   }
   const { transformJs, transformWxml, transformWxss } = gulp.createPlugins(weappTailwindcssOptions);
   const outDirGlobs = [`!${outDir}/**/*`, `!./${outDir}/**/*`];
@@ -641,17 +654,11 @@ async function getTasks(options) {
       globsSet.add(src);
       const isTs = isTsLang(x);
       const loadTs = enableTs && isTs;
-      let gulpTs;
-      if (enableTs && typeof typescriptOptions !== "boolean") {
-        gulpTs = ts.createProject(
-          typescriptOptions.tsConfigFileName ?? "tsconfig.json",
-          typeof typescriptOptions === "boolean" ? {} : typescriptOptions
-        );
-      }
       return function JsTask() {
         const pipes = [];
-        if (loadTs) {
-          pipes.push(gulpTs());
+        if (loadTs && gulpTs) {
+          pipes.push(gulpTs().on("error", () => {
+          }));
         }
         pipes.push(transformJs({
           babelParserOptions: !enableTs && isTs ? {
@@ -718,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: {

package/dist/index.mjs

@@ -5,7 +5,7 @@ import fs, { ensureDirSync } from 'fs-extra';
 import gulp from 'gulp';
 import loadPostcssConfig from 'postcss-load-config';
 import pc from 'picocolors';
-import { getPackageInfo } from 'local-pkg';
+import { isPackageExists, getPackageInfo } from 'local-pkg';
 import createDebug from 'debug';
 import { createPlugins } from 'weapp-tailwindcss/gulp';
 import postcssrc from 'gulp-postcss';
@@ -71,7 +71,7 @@ function createDefu(merger) {
 }
 const defu = createDefu();
 
-const version = "1.0.5";
+const version = "1.0.7";
 
 const debug = createDebug("weapp-tw-cli");
 
@@ -593,12 +593,25 @@ async function getTasks(options) {
   const enableTs = Boolean(typescriptOptions);
   let sass;
   if (enableSass) {
+    if (!isPackageExists("sass")) {
+      throw new Error("\u8BF7\u5148\u6267\u884C npm / yarn / pnpm \u547D\u4EE4\u5B89\u88C5 `sass` \u540E\u91CD\u8BD5!");
+    }
     const sassLib = await import('sass');
     sass = createSass(sassLib);
   }
   let ts;
+  let gulpTs;
   if (enableTs) {
+    if (!isPackageExists("typescript")) {
+      throw new Error("\u8BF7\u5148\u6267\u884C npm / yarn / pnpm \u547D\u4EE4\u5B89\u88C5 `typescript` \u540E\u91CD\u8BD5!");
+    }
     ts = (await import('gulp-typescript')).default;
+    if (typeof typescriptOptions !== "boolean") {
+      gulpTs = ts.createProject(
+        typescriptOptions.tsConfigFileName ?? "tsconfig.json",
+        typescriptOptions.settings
+      );
+    }
   }
   const { transformJs, transformWxml, transformWxss } = createPlugins(weappTailwindcssOptions);
   const outDirGlobs = [`!${outDir}/**/*`, `!./${outDir}/**/*`];
@@ -624,17 +637,11 @@ async function getTasks(options) {
       globsSet.add(src);
       const isTs = isTsLang(x);
       const loadTs = enableTs && isTs;
-      let gulpTs;
-      if (enableTs && typeof typescriptOptions !== "boolean") {
-        gulpTs = ts.createProject(
-          typescriptOptions.tsConfigFileName ?? "tsconfig.json",
-          typeof typescriptOptions === "boolean" ? {} : typescriptOptions
-        );
-      }
       return function JsTask() {
         const pipes = [];
-        if (loadTs) {
-          pipes.push(gulpTs());
+        if (loadTs && gulpTs) {
+          pipes.push(gulpTs().on("error", () => {
+          }));
         }
         pipes.push(transformJs({
           babelParserOptions: !enableTs && isTs ? {
@@ -701,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: {

package/package.json

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