Error fix

gkajs · May 8, 2018 · 1b738c9 · 1b738c9
1 parent 79dd6b4
commit 1b738c9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/bin/tpl.js b/bin/tpl.js
@@ -7,11 +7,11 @@ var gkaNodeModulesDir = path.join(__dirname, '..', 'node_modules');
 
 gkaNodeModulesDir = fs.existsSync(gkaNodeModulesDir)? gkaNodeModulesDir: path.join(__dirname, '..', '..');
 
-function getNodePath (argument) {
-    var ps = spawn.sync('npm', ['root', '-g'], {}),
-    npmRoot = (ps && ps.stdout) ? ps.stdout.toString().replace(/[\n\t\r]/g,"") : "";
-    return npmRoot;
-}
+// function getNodePath (argument) {
+//     var ps = spawn.sync('npm', ['root', '-g'], {}),
+//     npmRoot = (ps && ps.stdout) ? ps.stdout.toString().replace(/[\n\t\r]/g,"") : "";
+//     return npmRoot;
+// }
 
 function getGlobalTpls() {
     var npmRoot = process.env.NODE_PATH,
@@ -20,7 +20,8 @@ function getGlobalTpls() {
     try {
         tpls = fs.readdirSync(npmRoot); // NODE_PATH 无设置或设置多个值，则使用 catch 中方案
     } catch (e) {
-        npmRoot = getNodePath();
+        // npmRoot = getNodePath();
+        npmRoot = require('global-modules');
         try {
             tpls = fs.readdirSync(npmRoot);
         } catch (e) {

diff --git a/lib/templates/CssTemplatePlugin.js b/lib/templates/CssTemplatePlugin.js
@@ -92,7 +92,7 @@ function effectSubFolderSync(run, dataArr, opts) {
     }
 }
 
-function checkRatio(frames, ratio) {
+function checkRatio(frames, ratio = 1) {
     return frames.map(item => {
         return {
             src: item.src,
@@ -112,7 +112,7 @@ function checkRatio(frames, ratio) {
     })
 }
 
-function toFrameCSSObject(frame, ratio) {
+function toFrameCSSObject(frame, ratio = 1) {
     let {
         width,
         height,

diff --git a/lib/templates/SvgTemplatePlugin.js b/lib/templates/SvgTemplatePlugin.js
@@ -48,7 +48,7 @@ module.exports = class SvgTemplatePlugin {
     }
 }
 
-function toFrameCSSObject(frame, ratio) {
+function toFrameCSSObject(frame, ratio = 1) {
     let {
         width,
         height,