feat: 支持wxs

ximing · Jul 8, 2019 · e10937d · e10937d
1 parent 9ec5359
commit e10937d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/src/asset.js b/src/asset.js
@@ -58,13 +58,17 @@ module.exports = class Asset {
     get contents() {
         if (!this.__content) {
             try {
-                if (/\.(ts|tsx|js|jsx|wxml|wxss|css|less|scss|text|txt|json)$/.test(this.name)) {
+                if (
+                    /\.(ts|tsx|js|jsx|wxml|wxss|css|less|scss|text|txt|json|wxs)$/.test(this.name)
+                ) {
                     this.__content = fs.readFileSync(this.filePath, 'utf-8');
                 } else {
                     this.__content = fs.readFileSync(this.filePath);
                 }
                 this.__stats = fs.statSync(this.filePath);
             } catch (e) {
+                console.log('读取文件失败', this.filePath);
+                console.error(e);
                 this.__content = null;
             }
         }

diff --git a/src/plugin/handleJSDep.js b/src/plugin/handleJSDep.js
@@ -14,7 +14,7 @@ module.exports = class HandleJSDep {
         mpb.hooks.beforeEmitFile.tapPromise('HandleJSDep', async (asset) => {
             const deps = [];
             try {
-                if (/\.js$/.test(asset.outputFilePath) && asset.contents) {
+                if (/\.(js|wxs)$/.test(asset.outputFilePath) && asset.contents) {
                     const code = asset.contents;
                     const ast = babylon.parse(code, { sourceType: 'module' });
                     babelTraverse(ast, {
@@ -80,9 +80,7 @@ module.exports = class HandleJSDep {
                                             libOutputPath
                                         );
                                         if (node.arguments[0].value[0] !== '.') {
-                                            node.arguments[0].value = `./${
-                                                node.arguments[0].value
-                                            }`;
+                                            node.arguments[0].value = `./${node.arguments[0].value}`;
                                         }
                                         deps.push({
                                             libPath,

diff --git a/src/plugin/handleWXMLDep.js b/src/plugin/handleWXMLDep.js
@@ -18,6 +18,8 @@ module.exports = class HandleWXMLDep {
                                         deps.push(attribs.src);
                                     } else if (name === 'include' && attribs.src) {
                                         deps.push(attribs.src);
+                                    } else if (name === 'wxs' && attribs.src) {
+                                        deps.push(attribs.src);
                                     }
                                 },
                                 onerror(error) {

diff --git a/src/watching.js b/src/watching.js
@@ -98,7 +98,7 @@ module.exports = class Watching {
         const asset = this.mpb.assetManager.getAsset(path);
         if (asset) {
             if (type === 'change') {
-                console.log('[watching-add-asset]',path)
+                console.log('[watching-add-asset]', path);
                 await this.mpb.assetManager.addAsset(path, asset.outputFilePath, asset.meta);
             } else if (type === 'unlink') {
                 await this.mpb.assetManager.delAsset(asset);