kn-cli 1.0.110 → 1.0.112
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/start.sh +3 -3
- package/package.json +1 -1
- package/src/build.js +2 -0
package/build/start.sh
CHANGED
|
@@ -91,15 +91,15 @@ setNpmSetup(){
|
|
|
91
91
|
|
|
92
92
|
if [ $build_log_level = 'clear' ]
|
|
93
93
|
then
|
|
94
|
-
showWarn "开始npm install 简洁日志模式"
|
|
94
|
+
showWarn "开始npm install 简洁日志模式 $(TZ='Asia/Shanghai' date +%Y-%m-%d\ %H:%M:%S)"
|
|
95
95
|
npm config set loglevel error
|
|
96
96
|
npm install
|
|
97
97
|
else
|
|
98
|
-
showWarn "开始npm install"
|
|
98
|
+
showWarn "开始npm install $(TZ='Asia/Shanghai' date +%Y-%m-%d\ %H:%M:%S)"
|
|
99
99
|
npm config set loglevel warn
|
|
100
100
|
npm install
|
|
101
101
|
fi
|
|
102
|
-
checkResult "npm install"
|
|
102
|
+
checkResult "npm install $(TZ='Asia/Shanghai' date +%Y-%m-%d\ %H:%M:%S)"
|
|
103
103
|
else
|
|
104
104
|
showWarn "跳过 npm install"
|
|
105
105
|
fi
|
package/package.json
CHANGED
package/src/build.js
CHANGED
|
@@ -166,6 +166,8 @@ module.exports= async (options={})=> {
|
|
|
166
166
|
// 将项目文件夹下的package.json内dependencies部分合并入 _webpack/package.json
|
|
167
167
|
webpackPackage.dependencies = {...webpackPackage.dependencies ,...projectPackage.dependencies};
|
|
168
168
|
webpackPackage.devDependencies = {...webpackPackage.devDependencies ,...projectPackage.devDependencies};
|
|
169
|
+
webpackPackage.overrides = {...webpackPackage.overrides ,...projectPackage.overrides};
|
|
170
|
+
|
|
169
171
|
|
|
170
172
|
// 将package配置写回_webpack/package.json内
|
|
171
173
|
jsonfile.writeFile(tempWebpackPackagePath,webpackPackage,{spaces: 2, EOL: '\r\n' },function(err){
|