@cocojs/cli 0.0.1-alpha.7 → 0.0.1-alpha.8
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/dist/index.js +4 -2
- package/package.json +2 -2
package/dist/index.js
CHANGED
|
@@ -485,9 +485,11 @@ function mergeRollupConfig(config1, config2) {
|
|
|
485
485
|
var _config2 = {};
|
|
486
486
|
for (var _i = 0, _validKeys = validKeys; _i < _validKeys.length; _i++) {
|
|
487
487
|
var key = _validKeys[_i];
|
|
488
|
-
_config1[key] = _typeof(config1)
|
|
489
|
-
_config2[key] = _typeof(config2)
|
|
488
|
+
_config1[key] = _typeof(config1) === 'object' || config1 !== null ? config1[key] : undefined;
|
|
489
|
+
_config2[key] = _typeof(config2) === 'object' || config2 !== null ? config2[key] : undefined;
|
|
490
490
|
}
|
|
491
|
+
console.info('config', config1, config2);
|
|
492
|
+
console.info('_config', _config1, _config2);
|
|
491
493
|
return Object.assign({}, _config1, _config2);
|
|
492
494
|
}
|
|
493
495
|
function getRollupConfig() {
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cocojs/cli",
|
|
3
3
|
"description": "命令行工具，支持开发和构建功能",
|
|
4
|
-
"version": "0.0.1-alpha.
|
|
4
|
+
"version": "0.0.1-alpha.8",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
7
7
|
"bin": {
|
|
@@ -43,8 +43,8 @@
|
|
|
43
43
|
"webpack-cli": "^6.0.1",
|
|
44
44
|
"webpack-dev-server": "^5.2.0",
|
|
45
45
|
"webpack-merge": "^6.0.1",
|
|
46
|
-
"@cocojs/webpack-loader-mvc": "0.0.1-alpha.1",
|
|
47
46
|
"@cocojs/type-extractor": "0.0.16",
|
|
47
|
+
"@cocojs/webpack-loader-mvc": "0.0.1-alpha.1",
|
|
48
48
|
"@cocojs/rollup-plugin-mvc": "0.0.1-alpha.4"
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|