Comparing version 0.6.0 to 0.6.1
@@ -212,3 +212,3 @@ var pageMgr = require('./page.js'); | ||
mkdirp.sync(layoutPath); | ||
console.log(layoutPath); | ||
//console.log(layoutPath); | ||
return templatesDir; | ||
@@ -751,2 +751,2 @@ } | ||
return resources; | ||
} | ||
} |
@@ -260,2 +260,3 @@ var debug = require('debug')('clam:compile'); | ||
pageContent = parseAssetsTool(pageContent); | ||
var pageParam = parsePageParam(pageContent); | ||
@@ -262,0 +263,0 @@ |
@@ -15,2 +15,3 @@ /** | ||
var gconfig = config.get('gconfig'); | ||
/** | ||
@@ -20,4 +21,8 @@ * config merge | ||
if(assetsConfig !={}){ | ||
gconfig['modules'] = _.extend(gconfig['modules'], assetsConfig['modules']); | ||
gconfig['packages'] = _.extend(gconfig['packages'], assetsConfig['packages']); | ||
if(gconfig){ | ||
gconfig['modules'] = _.extend(gconfig['modules'], assetsConfig['modules']); | ||
gconfig['packages'] = _.extend(gconfig['packages'], assetsConfig['packages']); | ||
}else { | ||
gconfig = assetsConfig; | ||
} | ||
} | ||
@@ -24,0 +29,0 @@ |
@@ -9,2 +9,3 @@ var fs = require('fs'); | ||
var hostSwitch = require('./hosts.js'); | ||
var http = require('http'); | ||
@@ -99,2 +100,6 @@ //默认项目配置信息 | ||
actions.push({action:'更新项目元文件', content:'.clam/project.json'}); | ||
getMuiConfig(); | ||
actions.push({action:'更新项目gconfig文件', content: '.clam/gconfig.json'}); | ||
return {succeed:true, | ||
@@ -116,3 +121,3 @@ msg:'更新项目信息', | ||
prjDir = config.root(); | ||
var prj = config.get('project');; | ||
var prj = config.get('project'); | ||
prj.urls = urls; | ||
@@ -177,1 +182,23 @@ config.set('project', prj); | ||
} | ||
/** | ||
* 从mui服务器上拉去最新的 globalConfig,在项目创建时自动生成 | ||
*/ | ||
function getMuiConfig() { | ||
var remoteUrl = 'http://demo.mui.tmall.net/gitsrc/seed/build/config.json'; | ||
var req = http.request(remoteUrl, function(res) { | ||
var str = ''; | ||
res.on('data', function (d) { | ||
str += d; | ||
}); | ||
res.on('end',function(){ | ||
config.set('gconfig', JSON.parse(str.toString())); | ||
process.exit(0); | ||
}); | ||
res.on('error', function() { | ||
debug('远程获取gconfig失败!', ''); | ||
process.exit(0); | ||
}); | ||
}); | ||
req.end(); | ||
} |
{ | ||
"name": "clam", | ||
"version": "0.6.0", | ||
"version": "0.6.1", | ||
"description": "A full Web front end develop envirment.", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
Sorry, the diff of this file is not supported yet
New author
Supply chain riskA new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.
Found 1 instance in 1 package
346813
5843