@weapp-tailwindcss/cli 1.0.4 → 1.0.6

package/dist/index.cjs

@@ -14,6 +14,7 @@ const postcssrc = require('gulp-postcss');
 const createSass = require('gulp-sass');
 const rename = require('gulp-rename');
 const less = require('gulp-less');
+const postcssScssParser = require('postcss-scss');
 const cosmiconfig = require('cosmiconfig');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
@@ -29,6 +30,7 @@ const postcssrc__default = /*#__PURE__*/_interopDefaultCompat(postcssrc);
 const createSass__default = /*#__PURE__*/_interopDefaultCompat(createSass);
 const rename__default = /*#__PURE__*/_interopDefaultCompat(rename);
 const less__default = /*#__PURE__*/_interopDefaultCompat(less);
+const postcssScssParser__default = /*#__PURE__*/_interopDefaultCompat(postcssScssParser);
 
 function isPlainObject$2(value) {
   if (value === null || typeof value !== "object") {
@@ -86,7 +88,7 @@ function createDefu(merger) {
 }
 const defu = createDefu();
 
-const version = "1.0.4";
+const version = "1.0.6";
 
 const debug = createDebug__default("weapp-tw-cli");
 
@@ -608,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}/**/*`];
@@ -639,16 +654,9 @@ 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) {
+        if (loadTs && gulpTs) {
           pipes.push(gulpTs());
         }
         pipes.push(transformJs({
@@ -716,7 +724,17 @@ async function getTasks(options) {
         if (postcssOptions) {
           pipes.push(postcssrc__default(postcssOptions?.plugins, postcssOptions?.options));
         }
-        pipes.push(transformWxss());
+        if (x === "scss") {
+          pipes.push(transformWxss({
+            postcssOptions: {
+              options: {
+                parser: postcssScssParser__default
+              }
+            }
+          }));
+        } else {
+          pipes.push(transformWxss());
+        }
         if (loadSass || loadLess) {
           pipes.push(rename__default({
             extname: ".wxss"

package/dist/index.mjs

@@ -5,13 +5,14 @@ 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';
 import createSass from 'gulp-sass';
 import rename from 'gulp-rename';
 import less from 'gulp-less';
+import postcssScssParser from 'postcss-scss';
 import { cosmiconfigSync } from 'cosmiconfig';
 
 function isPlainObject$2(value) {
@@ -70,7 +71,7 @@ function createDefu(merger) {
 }
 const defu = createDefu();
 
-const version = "1.0.4";
+const version = "1.0.6";
 
 const debug = createDebug("weapp-tw-cli");
 
@@ -592,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}/**/*`];
@@ -623,16 +637,9 @@ 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) {
+        if (loadTs && gulpTs) {
           pipes.push(gulpTs());
         }
         pipes.push(transformJs({
@@ -700,7 +707,17 @@ async function getTasks(options) {
         if (postcssOptions) {
           pipes.push(postcssrc(postcssOptions?.plugins, postcssOptions?.options));
         }
-        pipes.push(transformWxss());
+        if (x === "scss") {
+          pipes.push(transformWxss({
+            postcssOptions: {
+              options: {
+                parser: postcssScssParser
+              }
+            }
+          }));
+        } else {
+          pipes.push(transformWxss());
+        }
         if (loadSass || loadLess) {
           pipes.push(rename({
             extname: ".wxss"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weapp-tailwindcss/cli",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "The cli of weapp-tailwindcss",
   "author": "SonOfMagic <qq1324318532@gmail.com>",
   "license": "MIT",
@@ -68,7 +68,8 @@
     "local-pkg": "^0.5.0",
     "picocolors": "^1.0.1",
     "postcss": "^8.4.39",
-    "postcss-load-config": "^6.0.1"
+    "postcss-load-config": "^6.0.1",
+    "postcss-scss": "^4.0.9"
   },
   "publishConfig": {
     "access": "public",