Comparing version 0.2.2 to 0.2.3-1
@@ -14,4 +14,3 @@ var fis = module.exports = require('fis'); | ||
code : info, | ||
name : arguments[1] || '', | ||
description : arguments[2] || '' | ||
pack : arguments[1] | ||
}; | ||
@@ -18,0 +17,0 @@ } |
{ | ||
"name": "scrat", | ||
"version": "0.2.2", | ||
"version": "0.2.3-1", | ||
"description": "uc front-end integrated solution", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
@@ -108,3 +108,3 @@ /** | ||
if(file.isJsLike){ | ||
var match = file.subpath.match(/^\/components\/(.*?([^\/]+))\/\2\.js$/i); | ||
var match = file.subpath.match(/^\/components\/(.*?([^\/]+))\/\2\.(js|jsx)$/i); | ||
if(match && match[1] && !map.alias.hasOwnProperty(match[1])){ | ||
@@ -111,0 +111,0 @@ map.alias[match[1]] = id; |
@@ -21,7 +21,5 @@ var UNIT_REG = /\{\{\{unit(?=\s)([^}]+)\}\}\}/g; | ||
var olpm = fis.config.get('olpm'); | ||
if(olpm.code && olpm.name){ | ||
if(olpm.code){ | ||
var map = { | ||
name : olpm.name, | ||
code : olpm.code, | ||
description : olpm.description || '', | ||
files : { | ||
@@ -237,5 +235,3 @@ layouts : [], | ||
fis.log.error('missing project code, use `fis.config.set("olpm.code", value);` in fis-conf.js'); | ||
} else if(!olpm.name){ | ||
fis.log.error('missing project name, use `fis.config.set("olpm.name", value);` in fis-conf.js'); | ||
} | ||
}; |
47154
1175