aiot-toolkit 1.0.20-beta.6 → 1.0.20-beta.7
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/gen-webpack-conf/index.js +2 -2
- package/package.json +10 -9
|
@@ -46,7 +46,7 @@ const pathMap = {
|
|
|
46
46
|
}
|
|
47
47
|
|
|
48
48
|
const eventBus = require('@aiot-toolkit/shared-utils/event-bus')
|
|
49
|
-
|
|
49
|
+
const lodash = require('lodash')
|
|
50
50
|
const { PACKAGER_BUILD_PROGRESS } = eventBus
|
|
51
51
|
|
|
52
52
|
// 能使用抽取公共js功能的调试器最低版本
|
|
@@ -88,7 +88,7 @@ module.exports = function genWebpackConf(launchOptions, mode) {
|
|
|
88
88
|
quickappConfig = require(hapConfigPath)
|
|
89
89
|
if (typeof quickappConfig.cli === 'object') {
|
|
90
90
|
cli = quickappConfig.cli
|
|
91
|
-
launchOptions =
|
|
91
|
+
launchOptions = lodash.merge({}, launchOptions, cli)
|
|
92
92
|
}
|
|
93
93
|
} catch (err) {
|
|
94
94
|
colorconsole.error(
|
package/package.json
CHANGED
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "aiot-toolkit",
|
|
3
|
-
"version": "1.0.20-beta.
|
|
3
|
+
"version": "1.0.20-beta.7",
|
|
4
4
|
"description": "A command line toolkit for developing Aiot Quick Apps.",
|
|
5
5
|
"engines": {
|
|
6
6
|
"node": ">=8.0.0"
|
|
7
7
|
},
|
|
8
8
|
"dependencies": {
|
|
9
|
-
"@aiot-toolkit/compiler": "1.0.20-beta.
|
|
10
|
-
"@aiot-toolkit/debugger": "1.0.20-beta.
|
|
11
|
-
"@aiot-toolkit/dsl-vue": "1.0.20-beta.
|
|
12
|
-
"@aiot-toolkit/dsl-xvm": "1.0.20-beta.
|
|
13
|
-
"@aiot-toolkit/packager": "1.0.20-beta.
|
|
14
|
-
"@aiot-toolkit/server": "1.0.20-beta.
|
|
15
|
-
"@aiot-toolkit/shared-utils": "1.0.20-beta.
|
|
9
|
+
"@aiot-toolkit/compiler": "1.0.20-beta.7",
|
|
10
|
+
"@aiot-toolkit/debugger": "1.0.20-beta.7",
|
|
11
|
+
"@aiot-toolkit/dsl-vue": "1.0.20-beta.7",
|
|
12
|
+
"@aiot-toolkit/dsl-xvm": "1.0.20-beta.7",
|
|
13
|
+
"@aiot-toolkit/packager": "1.0.20-beta.7",
|
|
14
|
+
"@aiot-toolkit/server": "1.0.20-beta.7",
|
|
15
|
+
"@aiot-toolkit/shared-utils": "1.0.20-beta.7",
|
|
16
16
|
"@babel/core": "^7.9.6",
|
|
17
17
|
"@babel/plugin-syntax-jsx": "^7.8.3",
|
|
18
18
|
"@babel/preset-env": "^7.9.6",
|
|
@@ -27,6 +27,7 @@
|
|
|
27
27
|
"fs-extra": "^7.0.1",
|
|
28
28
|
"inquirer": "^6.5.2",
|
|
29
29
|
"jszip": "^3.4.0",
|
|
30
|
+
"lodash": "^4.17.21",
|
|
30
31
|
"request": "^2.88.2",
|
|
31
32
|
"semver": "^5.7.1",
|
|
32
33
|
"socket.io": "^2.3.0",
|
|
@@ -51,5 +52,5 @@
|
|
|
51
52
|
"supertest": "^3.3.0",
|
|
52
53
|
"webpack-cli": "^4.3.0"
|
|
53
54
|
},
|
|
54
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "d776e6052ab0a66f686c85c1cad31384310f16eb"
|
|
55
56
|
}
|