Comparing version 0.1.3 to 0.1.4
20
index.js
@@ -32,11 +32,11 @@ var fis = module.exports = require('fis'); | ||
function createResourceMap(ret, conf, settings, opt){ | ||
var map = { | ||
version : fis.config.get('version'), | ||
name : fis.config.get('name'), | ||
combo : !!opt.pack, | ||
urlPattern : fis.config.get('urlPattern', '/c/%s'), | ||
comboPattern : fis.config.get('comboPattern', '/??%s'), | ||
alias : {}, | ||
deps : {} | ||
}; | ||
var map = fis.config.get('framework', {}); | ||
var aliasConfig = map.alias || {}; | ||
map.version = fis.config.get('version'); | ||
map.name = fis.config.get('name'); | ||
map.combo = !!opt.pack; | ||
map.urlPattern = map.urlPattern || '/c/%s'; | ||
map.comboPattern = map.comboPattern || '/??%s'; | ||
map.alias = {}; | ||
map.deps = {}; | ||
var componentFile = ret.src['/component.json']; | ||
@@ -83,3 +83,3 @@ if(componentFile){ | ||
} | ||
fis.util.map(fis.config.get('alias', {}), function(name, subpath){ | ||
fis.util.map(aliasConfig, function(name, subpath){ | ||
var file = ret.src['/' + subpath.replace(/^\//, '')]; | ||
@@ -86,0 +86,0 @@ if(file){ |
{ | ||
"name": "scrat", | ||
"version": "0.1.3", | ||
"version": "0.1.4", | ||
"description": "uc front-end integrated solution", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
8703