fix(taro-plugin-sass): 修复 plugins.sass 只配置了 resource 时编译出错的问题

NervJS · Oct 23, 2019 · 92b53d7 · 92b53d7
1 parent 5839608
commit 92b53d7
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 11 deletions.
diff --git a/packages/taro-plugin-sass/bundler.js b/packages/taro-plugin-sass/bundler.js
@@ -0,0 +1,24 @@
+const Bundler = require('scss-bundle').Bundler
+
+/**
+ * Return bundled sass content.
+ * 
+ * @param {string} url Absolute file path.
+ * @param {(string | undefined)} projectDirectory Absolute project location, where node_modules are located. Used for resolving tilde imports.
+ * @returns Bundle result.
+ */
+async function getBundleContent(url, projectDirectory = undefined) {
+  let bundler = undefined
+  if (projectDirectory) {
+    bundler = new Bundler(undefined, projectDirectory)
+  } else {
+    bundler = new Bundler()
+  }
+  if (!bundler) {
+    throw new ReferenceError(`'bundler' is not defined.`)
+  }
+  const res = await bundler.Bundle(url)
+  return res
+}
+
+module.exports = getBundleContent
diff --git a/packages/taro-plugin-sass/index.js b/packages/taro-plugin-sass/index.js
@@ -1,38 +1,59 @@
 const sass = require('node-sass')
-const Bundler = require('scss-bundle').Bundler
+const getBundleContent = require('./bundler')
 
 module.exports = function compileSass (content, file, config) {
   return new Promise(async (resolve, reject) => {
     let bundledContent = ''
+
+    // when plugins.sass only configured resource property
+    if (config.resource && !config.projectDirectory) {
+      const { resource } = config
+      try {
+        if (typeof resource === 'string') {
+          const res = await getBundleContent(resource)
+          bundledContent += res.bundledContent
+        }
+        if (Array.isArray(resource)) {
+          for (const url of resource) {
+            const res = await getBundleContent(url)
+            bundledContent += res.bundledContent
+          }
+        }
+      } catch (e) {
+        reject(e)
+      }
+    }
+
     // check resource & projectDirectory property
     // projectDirectory used for resolving tilde imports
     if (config.resource && config.projectDirectory) {
       const { resource, projectDirectory } = config
-      const getBundleContent = async (url) => {
-        const bundler = new Bundler(undefined, projectDirectory)
-        const res = await bundler.Bundle(url)
-        bundledContent += res.bundledContent
-      }
       try {
         if (typeof resource === 'string') {
-          await getBundleContent(resource)
-        } else if (Array.isArray(resource)) {
-          for (let url of resource) {
-            await getBundleContent(url)
+          const res = await getBundleContent(resource, projectDirectory)
+          bundledContent += res.bundledContent
+        }
+        if (Array.isArray(resource)) {
+          for (const url of resource) {
+            const res = await getBundleContent(url, projectDirectory)
+            bundledContent += res.bundledContent
           }
         }
       } catch (e) {
         reject(e)
       }
     }
+
     if (config.data) {
       bundledContent += config.data
     }
+
     const opts = Object.assign({}, config, {
       file,
       data: bundledContent ? bundledContent + content : content
     })
-    var result
+
+    let result
     try {
       result = sass.renderSync(opts)
     } catch (e) {

diff --git a/packages/taro-plugin-sass/package.json b/packages/taro-plugin-sass/package.json
@@ -3,6 +3,10 @@
   "version": "1.3.21",
   "description": "Taro编译sass文件",
   "main": "index.js",
+  "files": [
+    "bundler.js",
+    "index.js"
+  ],
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },