已合并
回退 'Pull Request !394 : 回退 'Pull Request !393 : 切ohpm'' #396
openharmony_ci创建于 2023年10月8日
回退 'Pull Request !394 : 回退 'Pull Request !393 : 切ohpm'' #396
已合并
openharmony_ci创建于 2023年10月8日
86 个文件变更+344-1807
@@ -1,18 +1,30 @@
1.gradle1.gradle
2.idea2.idea
3+.hvigor
3build4build
4node_modules/5node_modules/
6+oh_modules/
7+oh-package-lock.json5
5local.properties8local.properties
6signature/systemui_provision_verified.json9signature/systemui_provision_verified.json
7/product/default/volumepanel/node_modules10/product/default/volumepanel/node_modules
11+/product/default/volumepanel/oh_modules
8/product/default/notificationmanagement/node_modules12/product/default/notificationmanagement/node_modules
13+/product/default/notificationmanagement/oh_modules
9/product/default/navigationBar/node_modules14/product/default/navigationBar/node_modules
15+/product/default/navigationBar/oh_modules
10/product/pc/controlpanel/node_modules16/product/pc/controlpanel/node_modules
17+/product/pc/controlpanel/oh_modules
11/product/pc/notificationpanel/node_modules18/product/pc/notificationpanel/node_modules
19+/product/pc/notificationpanel/oh_modules
12/product/pc/statusbar/node_modules20/product/pc/statusbar/node_modules
21+/product/pc/statusbar/oh_modules
13/product/phone/dropdownpanel/node_modules22/product/phone/dropdownpanel/node_modules
23+/product/phone/dropdownpanel/oh_modules
14/product/phone/statusbar/node_modules24/product/phone/statusbar/node_modules
25+/product/phone/statusbar/oh_modules
15/product/default/dialog/node_modules26/product/default/dialog/node_modules
27+/product/default/dialog/oh_modules
16/product/default/volumepanel/.preview/28/product/default/volumepanel/.preview/
17/product/pc/notificationpanel/.preview/29/product/pc/notificationpanel/.preview/
18/product/phone/statusbar/.preview/30/product/phone/statusbar/.preview/
MOAT.xml+2-0
@@ -83,9 +83,11 @@
83 </filefilter>83 </filefilter>
84 <filefilter name="copyrightPolicyFilter" desc="Filters for copyright header policies">84 <filefilter name="copyrightPolicyFilter" desc="Filters for copyright header policies">
85 <filteritem type="filename" name="README|README_zh|.*.log|.*.json5|.*.json" desc=""/>85 <filteritem type="filename" name="README|README_zh|.*.log|.*.json5|.*.json" desc=""/>
86+ <filteritem type="filename" name="hvigorw|hvigorw.bat|hvigor-wrapper.js" desc="Build files"/>
86 </filefilter>87 </filefilter>
87 <filefilter name="defaultPolicyFilter" desc="Filters for LICENSE file policies">88 <filefilter name="defaultPolicyFilter" desc="Filters for LICENSE file policies">
88 <filteritem type="filename" name="README|README_zh|*.log|*.json5|*.json" desc="json file"/>89 <filteritem type="filename" name="README|README_zh|*.log|*.json5|*.json" desc="json file"/>
90+ <filteritem type="filename" name="hvigorw|hvigorw.bat|hvigor-wrapper.js" desc="Build files"/>
89 </filefilter>91 </filefilter>
90 </filefilterlist>92 </filefilterlist>
91 </oatconfig>93 </oatconfig>
Rcommon/package-lock.jsoncommon/oh-package.json5+4-2
@@ -1,5 +1,7 @@
1{1{
2+ "devDependencies": {},
2 "name": "@ohos/common",3 "name": "@ohos/common",
4+ "description": "a npm package which contains common function",
3 "version": "1.0.0",5 "version": "1.0.0",
4- "lockfileVersion": 16+ "dependencies": {}
5-}7+}
@@ -1,12 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"@ohos/common",
4- "description":"a npm package which contains common function",
5- "ohos":{
6- "org":"huawei",
7- "directoryLevel":"module",
8- "buildTool":"hvigor"
9- },
10- "version":"1.0.0",
11- "dependencies":{}
12-}
@@ -0,0 +1,7 @@
1+{
2+ "devDependencies": {},
3+ "name": "pc_entry",
4+ "description": "",
5+ "version": "1.0.0",
6+ "dependencies": {}
7+}
@@ -1,5 +0,0 @@
1-{
2- "name": "pc_entry",
3- "version": "1.0.0",
4- "lockfileVersion": 1
5-}
@@ -1,11 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"pc_entry",
4- "ohos":{
5- "org":"huawei",
6- "directoryLevel":"module",
7- "buildTool":"hvigor"
8- },
9- "version":"1.0.0",
10- "dependencies":{}
11-}
@@ -0,0 +1,7 @@
1+{
2+ "devDependencies": {},
3+ "name": "phone_entry",
4+ "description": "",
5+ "version": "1.0.0",
6+ "dependencies": {}
7+}
@@ -1,5 +0,0 @@
1-{
2- "name": "phone_entry",
3- "version": "1.0.0",
4- "lockfileVersion": 1
5-}
@@ -1,11 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"phone_entry",
4- "ohos":{
5- "org":"huawei",
6- "directoryLevel":"module",
7- "buildTool":"hvigor"
8- },
9- "version":"1.0.0",
10- "dependencies":{}
11-}
Rfeatures/airplanecomponent/package-lock.jsonfeatures/airplanecomponent/oh-package.json5+4-2
@@ -1,5 +1,7 @@
1{1{
2+ "devDependencies": {},
2 "name": "@ohos/airplanecomponent",3 "name": "@ohos/airplanecomponent",
4+ "description": "a npm package which contains airplanecomponent function",
3 "version": "1.0.0",5 "version": "1.0.0",
4- "lockfileVersion": 16+ "dependencies": {}
5-}7+}
@@ -1,12 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"@ohos/airplanecomponent",
4- "description":"a npm package which contains airplanecomponent function",
5- "ohos":{
6- "org":"huawei",
7- "directoryLevel":"module",
8- "buildTool":"hvigor"
9- },
10- "version":"1.0.0",
11- "dependencies":{}
12-}
Rfeatures/autorotatecomponent/package-lock.jsonfeatures/autorotatecomponent/oh-package.json5+4-2
@@ -1,5 +1,7 @@
1{1{
2+ "devDependencies": {},
2 "name": "@ohos/autorotatecomponent",3 "name": "@ohos/autorotatecomponent",
4+ "description": "a npm package which contains autorotatecomponent function",
3 "version": "1.0.0",5 "version": "1.0.0",
4- "lockfileVersion": 16+ "dependencies": {}
5-}7+}
@@ -1,12 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"@ohos/autorotatecomponent",
4- "description":"a npm package which contains autorotatecomponent function",
5- "ohos":{
6- "org":"huawei",
7- "directoryLevel":"module",
8- "buildTool":"hvigor"
9- },
10- "version":"1.0.0",
11- "dependencies":{}
12-}
Rfeatures/batterycomponent/package-lock.jsonfeatures/batterycomponent/oh-package.json5+4-2
@@ -1,5 +1,7 @@
1{1{
2+ "devDependencies": {},
2 "name": "@ohos/batterycomponent",3 "name": "@ohos/batterycomponent",
4+ "description": "a npm package which contains batterycomponent function",
3 "version": "1.0.0",5 "version": "1.0.0",
4- "lockfileVersion": 16+ "dependencies": {}
5-}7+}
@@ -1,12 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"@ohos/batterycomponent",
4- "description":"a npm package which contains batterycomponent function",
5- "ohos":{
6- "org":"huawei",
7- "directoryLevel":"module",
8- "buildTool":"hvigor"
9- },
10- "version":"1.0.0",
11- "dependencies":{}
12-}
Rfeatures/bluetoothcomponent/package-lock.jsonfeatures/bluetoothcomponent/oh-package.json5+4-2
@@ -1,5 +1,7 @@
1{1{
2+ "devDependencies": {},
2 "name": "@ohos/bluetoothcomponent",3 "name": "@ohos/bluetoothcomponent",
4+ "description": "a npm package which contains bluetoothcomponent function",
3 "version": "1.0.0",5 "version": "1.0.0",
4- "lockfileVersion": 16+ "dependencies": {}
5-}7+}
@@ -1,12 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"@ohos/bluetoothcomponent",
4- "description":"a npm package which contains bluetoothcomponent function",
5- "ohos":{
6- "org":"huawei",
7- "directoryLevel":"module",
8- "buildTool":"hvigor"
9- },
10- "version":"1.0.0",
11- "dependencies":{}
12-}
Rfeatures/brightnesscomponent/package-lock.jsonfeatures/brightnesscomponent/oh-package.json5+4-2
@@ -1,5 +1,7 @@
1{1{
2+ "devDependencies": {},
2 "name": "@ohos/brightnesscomponent",3 "name": "@ohos/brightnesscomponent",
4+ "description": "a npm package which contains brightnesscomponent function",
3 "version": "1.0.0",5 "version": "1.0.0",
4- "lockfileVersion": 16+ "dependencies": {}
5-}7+}
@@ -1,12 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"@ohos/brightnesscomponent",
4- "description":"a npm package which contains brightnesscomponent function",
5- "ohos":{
6- "org":"huawei",
7- "directoryLevel":"module",
8- "buildTool":"hvigor"
9- },
10- "version":"1.0.0",
11- "dependencies":{}
12-}
Rfeatures/capsulecomponent/package-lock.jsonfeatures/capsulecomponent/oh-package.json5+4-2
@@ -1,5 +1,7 @@
1{1{
2+ "devDependencies": {},
2 "name": "@ohos/capsulecomponent",3 "name": "@ohos/capsulecomponent",
4+ "description": "a npm package which contains capsulecomponent function",
3 "version": "1.0.0",5 "version": "1.0.0",
4- "lockfileVersion": 16+ "dependencies": {}
5-}7+}
@@ -1,12 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"@ohos/capsulecomponent",
4- "description":"a npm package which contains capsulecomponent function",
5- "ohos":{
6- "org":"huawei",
7- "directoryLevel":"module",
8- "buildTool":"hvigor"
9- },
10- "version":"1.0.0",
11- "dependencies":{}
12-}
Rfeatures/clockcomponent/package-lock.jsonfeatures/clockcomponent/oh-package.json5+4-2
@@ -1,5 +1,7 @@
1{1{
2+ "devDependencies": {},
2 "name": "@ohos/clockcomponent",3 "name": "@ohos/clockcomponent",
4+ "description": "a npm package which contains clockcomponent function",
3 "version": "1.0.0",5 "version": "1.0.0",
4- "lockfileVersion": 16+ "dependencies": {}
5-}7+}
@@ -1,12 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"@ohos/clockcomponent",
4- "description":"a npm package which contains clockcomponent function",
5- "ohos":{
6- "org":"huawei",
7- "directoryLevel":"module",
8- "buildTool":"hvigor"
9- },
10- "version":"1.0.0",
11- "dependencies":{}
12-}
Rfeatures/controlcentercomponent/package-lock.jsonfeatures/controlcentercomponent/oh-package.json5+4-2
@@ -1,5 +1,7 @@
1{1{
2+ "devDependencies": {},
2 "name": "@ohos/controlcentercomponent",3 "name": "@ohos/controlcentercomponent",
4+ "description": "a npm package which contains controlcentercomponent function",
3 "version": "1.0.0",5 "version": "1.0.0",
4- "lockfileVersion": 16+ "dependencies": {}
5-}7+}
@@ -1,12 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"@ohos/controlcentercomponent",
4- "description":"a npm package which contains controlcentercomponent function",
5- "ohos":{
6- "org":"huawei",
7- "directoryLevel":"module",
8- "buildTool":"hvigor"
9- },
10- "version":"1.0.0",
11- "dependencies":{}
12-}
Rfeatures/locationcomponent/package-lock.jsonfeatures/locationcomponent/oh-package.json5+4-2
@@ -1,5 +1,7 @@
1{1{
2+ "devDependencies": {},
2 "name": "@ohos/locationcomponent",3 "name": "@ohos/locationcomponent",
4+ "description": "a npm package which contains locationcomponent function",
3 "version": "1.0.0",5 "version": "1.0.0",
4- "lockfileVersion": 16+ "dependencies": {}
5-}7+}
@@ -1,12 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"@ohos/locationcomponent",
4- "description":"a npm package which contains locationcomponent function",
5- "ohos":{
6- "org":"huawei",
7- "directoryLevel":"module",
8- "buildTool":"hvigor"
9- },
10- "version":"1.0.0",
11- "dependencies":{}
12-}
Rfeatures/managementcomponent/package-lock.jsonfeatures/managementcomponent/oh-package.json5+4-2
@@ -1,5 +1,7 @@
1{1{
2+ "devDependencies": {},
2 "name": "@ohos/managementcomponent",3 "name": "@ohos/managementcomponent",
4+ "description": "a npm package which contains managementcomponent function",
3 "version": "1.0.0",5 "version": "1.0.0",
4- "lockfileVersion": 16+ "dependencies": {}
5-}7+}
@@ -1,12 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"@ohos/managementcomponent",
4- "description":"a npm package which contains managementcomponent function",
5- "ohos":{
6- "org":"huawei",
7- "directoryLevel":"module",
8- "buildTool":"hvigor"
9- },
10- "version":"1.0.0",
11- "dependencies":{}
12-}
Rfeatures/navigationservice/package-lock.jsonfeatures/navigationservice/oh-package.json5+4-2
@@ -1,5 +1,7 @@
1{1{
2+ "devDependencies": {},
2 "name": "@ohos/navigationservice",3 "name": "@ohos/navigationservice",
4+ "description": "a npm package which contains navigationservice function",
3 "version": "1.0.0",5 "version": "1.0.0",
4- "lockfileVersion": 16+ "dependencies": {}
5-}7+}
@@ -1,12 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"@ohos/navigationservice",
4- "description":"a npm package which contains navigationservice function",
5- "ohos":{
6- "org":"huawei",
7- "directoryLevel":"module",
8- "buildTool":"hvigor"
9- },
10- "version":"1.0.0",
11- "dependencies":{}
12-}
Rfeatures/nfccomponent/package-lock.jsonfeatures/nfccomponent/oh-package.json5+4-2
@@ -1,5 +1,7 @@
1{1{
2+ "devDependencies": {},
2 "name": "@ohos/nfccomponent",3 "name": "@ohos/nfccomponent",
4+ "description": "a npm package which contains nfccomponent function",
3 "version": "1.0.0",5 "version": "1.0.0",
4- "lockfileVersion": 16+ "dependencies": {}
5-}7+}
@@ -1,12 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"@ohos/nfccomponent",
4- "description":"a npm package which contains nfccomponent function",
5- "ohos":{
6- "org":"huawei",
7- "directoryLevel":"module",
8- "buildTool":"hvigor"
9- },
10- "version":"1.0.0",
11- "dependencies":{}
12-}
Rfeatures/noticeitem/package-lock.jsonfeatures/noticeitem/oh-package.json5+4-2
@@ -1,5 +1,7 @@
1{1{
2+ "devDependencies": {},
2 "name": "@ohos/noticeitem",3 "name": "@ohos/noticeitem",
4+ "description": "a npm package which contains noticeitem function",
3 "version": "1.0.0",5 "version": "1.0.0",
4- "lockfileVersion": 16+ "dependencies": {}
5-}7+}
@@ -1,12 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"@ohos/noticeitem",
4- "description":"a npm package which contains noticeitem function",
5- "ohos":{
6- "org":"huawei",
7- "directoryLevel":"module",
8- "buildTool":"hvigor"
9- },
10- "version":"1.0.0",
11- "dependencies":{}
12-}
Rfeatures/ringmodecomponent/package-lock.jsonfeatures/ringmodecomponent/oh-package.json5+4-2
@@ -1,5 +1,7 @@
1{1{
2+ "devDependencies": {},
2 "name": "@ohos/ringmodecomponent",3 "name": "@ohos/ringmodecomponent",
4+ "description": "a npm package which contains ringmodecomponent function",
3 "version": "1.0.0",5 "version": "1.0.0",
4- "lockfileVersion": 16+ "dependencies": {}
5-}7+}
@@ -1,12 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"@ohos/ringmodecomponent",
4- "description":"a npm package which contains ringmodecomponent function",
5- "ohos":{
6- "org":"huawei",
7- "directoryLevel":"module",
8- "buildTool":"hvigor"
9- },
10- "version":"1.0.0",
11- "dependencies":{}
12-}
Rfeatures/signalcomponent/package-lock.jsonfeatures/signalcomponent/oh-package.json5+4-2
@@ -1,5 +1,7 @@
1{1{
2+ "devDependencies": {},
2 "name": "@ohos/signalcomponent",3 "name": "@ohos/signalcomponent",
4+ "description": "a npm package which contains signalcomponent function",
3 "version": "1.0.0",5 "version": "1.0.0",
4- "lockfileVersion": 16+ "dependencies": {}
5-}7+}
@@ -1,12 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"@ohos/signalcomponent",
4- "description":"a npm package which contains signalcomponent function",
5- "ohos":{
6- "org":"huawei",
7- "directoryLevel":"module",
8- "buildTool":"hvigor"
9- },
10- "version":"1.0.0",
11- "dependencies":{}
12-}
Rfeatures/statusbarcomponent/package-lock.jsonfeatures/statusbarcomponent/oh-package.json5+4-2
@@ -1,5 +1,7 @@
1{1{
2+ "devDependencies": {},
2 "name": "@ohos/statusbarcomponent",3 "name": "@ohos/statusbarcomponent",
4+ "description": "a npm package which contains statusbarcomponent function",
3 "version": "1.0.0",5 "version": "1.0.0",
4- "lockfileVersion": 16+ "dependencies": {}
5-}7+}
@@ -1,12 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"@ohos/statusbarcomponent",
4- "description":"a npm package which contains statusbarcomponent function",
5- "ohos":{
6- "org":"huawei",
7- "directoryLevel":"module",
8- "buildTool":"hvigor"
9- },
10- "version":"1.0.0",
11- "dependencies":{}
12-}
Rfeatures/volumecomponent/package-lock.jsonfeatures/volumecomponent/oh-package.json5+4-2
@@ -1,5 +1,7 @@
1{1{
2+ "devDependencies": {},
2 "name": "@ohos/volumecomponent",3 "name": "@ohos/volumecomponent",
4+ "description": "a npm package which contains volumecomponent function",
3 "version": "1.0.0",5 "version": "1.0.0",
4- "lockfileVersion": 16+ "dependencies": {}
5-}7+}
@@ -1,12 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"@ohos/volumecomponent",
4- "description":"a npm package which contains volumecomponent function",
5- "ohos":{
6- "org":"huawei",
7- "directoryLevel":"module",
8- "buildTool":"hvigor"
9- },
10- "version":"1.0.0",
11- "dependencies":{}
12-}
Rfeatures/volumepanelcomponent/package-lock.jsonfeatures/volumepanelcomponent/oh-package.json5+4-2
@@ -1,5 +1,7 @@
1{1{
2+ "devDependencies": {},
2 "name": "@ohos/volumepanelcomponent",3 "name": "@ohos/volumepanelcomponent",
4+ "description": "a npm package which contains volumepanelcomponent function",
3 "version": "1.0.0",5 "version": "1.0.0",
4- "lockfileVersion": 16+ "dependencies": {}
5-}7+}
@@ -1,12 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"@ohos/volumepanelcomponent",
4- "description":"a npm package which contains volumepanelcomponent function",
5- "ohos":{
6- "org":"huawei",
7- "directoryLevel":"module",
8- "buildTool":"hvigor"
9- },
10- "version":"1.0.0",
11- "dependencies":{}
12-}
Rfeatures/wificomponent/package-lock.jsonfeatures/wificomponent/oh-package.json5+4-2
@@ -1,5 +1,7 @@
1{1{
2+ "devDependencies": {},
2 "name": "@ohos/wificomponent",3 "name": "@ohos/wificomponent",
4+ "description": "a npm package which contains wificomponent function",
3 "version": "1.0.0",5 "version": "1.0.0",
4- "lockfileVersion": 16+ "dependencies": {}
5-}7+}
@@ -1,12 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"@ohos/wificomponent",
4- "description":"a npm package which contains wificomponent function",
5- "ohos":{
6- "org":"huawei",
7- "directoryLevel":"module",
8- "buildTool":"hvigor"
9- },
10- "version":"1.0.0",
11- "dependencies":{}
12-}
@@ -0,0 +1,6 @@
1+{
2+ "hvigorVersion": "2.1.1",
3+ "dependencies": {
4+ "@ohos/hvigor-ohos-plugin": "2.1.1"
5+ }
6+}
Ahvigorw+48-0
@@ -0,0 +1,48 @@
1+#!/bin/bash
2+ 
3+# ----------------------------------------------------------------------------
4+# Hvigor startup script, version 1.0.0
5+#
6+# Required ENV vars:
7+# ------------------
8+# NODE_HOME - location of a Node home dir
9+# or
10+# Add /usr/local/nodejs/bin to the PATH environment variable
11+# ----------------------------------------------------------------------------
12+ 
13+HVIGOR_APP_HOME=$(dirname $(readlink -f $0))
14+HVIGOR_WRAPPER_SCRIPT=${HVIGOR_APP_HOME}/hvigor/hvigor-wrapper.js
15+warn() {
16+ echo ""
17+ echo -e "\033[1;33m`date '+[%Y-%m-%d %H:%M:%S]'`$@\033[0m"
18+}
19+ 
20+error() {
21+ echo ""
22+ echo -e "\033[1;31m`date '+[%Y-%m-%d %H:%M:%S]'`$@\033[0m"
23+}
24+ 
25+fail() {
26+ error "$@"
27+ exit 1
28+}
29+ 
30+# Determine node to start hvigor wrapper script
31+if [ -n "${NODE_HOME}" ];then
32+ EXECUTABLE_NODE="${NODE_HOME}/bin/node"
33+ if [ ! -x "$EXECUTABLE_NODE" ];then
34+ fail "ERROR: NODE_HOME is set to an invalid directory,check $NODE_HOME\n\nPlease set NODE_HOME in your environment to the location where your nodejs installed"
35+ fi
36+else
37+ EXECUTABLE_NODE="node"
38+ which ${EXECUTABLE_NODE} > /dev/null 2>&1 || fail "ERROR: NODE_HOME is not set and not 'node' command found in your path"
39+fi
40+ 
41+# Check hvigor wrapper script
42+if [ ! -r "$HVIGOR_WRAPPER_SCRIPT" ];then
43+ fail "ERROR: Couldn't find hvigor/hvigor-wrapper.js in ${HVIGOR_APP_HOME}"
44+fi
45+ 
46+# start hvigor-wrapper script
47+exec "${EXECUTABLE_NODE}" \
48+ "${HVIGOR_WRAPPER_SCRIPT}" "$@"
@@ -0,0 +1,64 @@
1+@if "%DEBUG%" == "" @echo off
2+@rem ##########################################################################
3+@rem
4+@rem Hvigor startup script for Windows
5+@rem
6+@rem ##########################################################################
7+ 
8+@rem Set local scope for the variables with windows NT shell
9+if "%OS%"=="Windows_NT" setlocal
10+ 
11+set DIRNAME=%~dp0
12+if "%DIRNAME%" == "" set DIRNAME=.
13+set APP_BASE_NAME=%~n0
14+set APP_HOME=%DIRNAME%
15+ 
16+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
17+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
18+ 
19+set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
20+set NODE_EXE=node.exe
21+ 
22+goto start
23+ 
24+:start
25+@rem Find node.exe
26+if defined NODE_HOME goto findNodeFromNodeHome
27+ 
28+%NODE_EXE% --version >NUL 2>&1
29+if "%ERRORLEVEL%" == "0" goto execute
30+ 
31+echo.
32+echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
33+echo.
34+echo Please set the NODE_HOME variable in your environment to match the
35+echo location of your NodeJs installation.
36+ 
37+goto fail
38+ 
39+:findNodeFromNodeHome
40+set NODE_HOME=%NODE_HOME:"=%
41+set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
42+ 
43+if exist "%NODE_EXE_PATH%" goto execute
44+echo.
45+echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
46+echo.
47+echo Please set the NODE_HOME variable in your environment to match the
48+echo location of your NodeJs installation.
49+ 
50+goto fail
51+ 
52+:execute
53+@rem Execute hvigor
54+"%NODE_EXE%" %WRAPPER_MODULE_PATH% %*
55+ 
56+if "%ERRORLEVEL%" == "0" goto hvigorwEnd
57+ 
58+:fail
59+exit /b 1
60+ 
61+:hvigorwEnd
62+if "%OS%" == "Windows_NT" endlocal
63+ 
64+:end
@@ -0,0 +1,9 @@
1+{
2+ "devDependencies": {
3+ "@ohos/hypium": "1.0.6"
4+ },
5+ "name": "systemui",
6+ "description": "",
7+ "version": "1.0.0",
8+ "dependencies": {}
9+}
@@ -1,15 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"systemui",
4- "ohos":{
5- "org":"huawei",
6- "directoryLevel":"project",
7- "buildTool":"hvigor"
8- },
9- "version":"1.0.0",
10- "dependencies":{
11- "@ohos/hypium":"1.0.0",
12- "@ohos/hvigor-ohos-plugin":"1.1.3",
13- "@ohos/hvigor":"1.1.3"
14- }
15-}
@@ -1,4 +1,8 @@
1{1{
2+ "entryModules": [
3+ "phone_entry",
4+ "pc_entry"
5+ ],
2 "apiType": 'stageMode',6 "apiType": 'stageMode',
3 "targets": [7 "targets": [
4 {8 {
Rproduct/default/dialog/package.jsonproduct/default/dialog/oh-package.json5+2-6
@@ -1,10 +1,6 @@
1{1{
2 "devDependencies": {},2 "devDependencies": {},
3 "name": "default_dialog",3 "name": "default_dialog",
4- "ohos": {4+ "description": "",
5- "org": "huawei",
6- "directoryLevel": "module",
7- "buildTool": "hvigor"
8- },
9 "version": "1.0.0"5 "version": "1.0.0"
10-}6+}
@@ -1,5 +0,0 @@
1-{
2- "name": "default_dialog",
3- "version": "1.0.0",
4- "lockfileVersion": 1
5-}
@@ -1,4 +1,8 @@
1{1{
2+ "entryModules": [
3+ "phone_entry",
4+ "pc_entry",
5+ ],
2 "apiType": 'stageMode',6 "apiType": 'stageMode',
3 "targets": [7 "targets": [
4 {8 {
Rproduct/default/navigationBar/package-lock.jsonproduct/default/navigationBar/oh-package.json5+4-6
@@ -1,11 +1,9 @@
1{1{
2+ "devDependencies": {},
2 "name": "default_navigationBar",3 "name": "default_navigationBar",
4+ "description": "",
3 "version": "1.0.0",5 "version": "1.0.0",
4- "lockfileVersion": 1,
5- "requires": true,
6 "dependencies": {6 "dependencies": {
7- "@ohos/navigationservice": {7+ "@ohos/navigationservice": "file:../../../features/navigationservice"
8- "version": "file:../../../features/navigationservice"
9- }
10 }8 }
11-}9+}
@@ -1,13 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"default_navigationBar",
4- "ohos":{
5- "org":"huawei",
6- "directoryLevel":"module",
7- "buildTool":"hvigor"
8- },
9- "version":"1.0.0",
10- "dependencies":{
11- "@ohos/navigationservice":"file:../../../features/navigationservice"
12- }
13-}
@@ -1,4 +1,8 @@
1{1{
2+ "entryModules": [
3+ "phone_entry",
4+ "pc_entry"
5+ ],
2 "apiType": 'stageMode',6 "apiType": 'stageMode',
3 "targets": [7 "targets": [
4 {8 {
@@ -0,0 +1,9 @@
1+{
2+ "devDependencies": {},
3+ "name": "default_notificationmanagement",
4+ "description": "",
5+ "version": "1.0.0",
6+ "dependencies": {
7+ "@ohos/managementcomponent": "file:../../../features/managementcomponent"
8+ }
9+}
@@ -1,11 +0,0 @@
1-{
2- "name": "default_notificationmanagement",
3- "version": "1.0.0",
4- "lockfileVersion": 1,
5- "requires": true,
6- "dependencies": {
7- "@ohos/managementcomponent": {
8- "version": "file:../../../features/managementcomponent"
9- }
10- }
11-}
@@ -1,13 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"default_notificationmanagement",
4- "ohos":{
5- "org":"huawei",
6- "directoryLevel":"module",
7- "buildTool":"hvigor"
8- },
9- "version":"1.0.0",
10- "dependencies":{
11- "@ohos/managementcomponent":"file:../../../features/managementcomponent"
12- }
13-}
@@ -1,4 +1,8 @@
1{1{
2+ "entryModules": [
3+ "phone_entry",
4+ "pc_entry"
5+ ],
2 "apiType": 'stageMode',6 "apiType": 'stageMode',
3 "targets": [7 "targets": [
4 {8 {
Rproduct/default/volumepanel/package-lock.jsonproduct/default/volumepanel/oh-package.json5+4-6
@@ -1,11 +1,9 @@
1{1{
2+ "devDependencies": {},
2 "name": "default_volumepanel",3 "name": "default_volumepanel",
4+ "description": "",
3 "version": "1.0.0",5 "version": "1.0.0",
4- "lockfileVersion": 1,
5- "requires": true,
6 "dependencies": {6 "dependencies": {
7- "@ohos/volumepanelcomponent": {7+ "@ohos/volumepanelcomponent": "file:../../../features/volumepanelcomponent"
8- "version": "file:../../../features/volumepanelcomponent"
9- }
10 }8 }
11-}9+}
@@ -1,13 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"default_volumepanel",
4- "ohos":{
5- "org":"huawei",
6- "directoryLevel":"module",
7- "buildTool":"hvigor"
8- },
9- "version":"1.0.0",
10- "dependencies":{
11- "@ohos/volumepanelcomponent":"file:../../../features/volumepanelcomponent"
12- }
13-}
@@ -1,4 +1,7 @@
1{1{
2+ "entryModules": [
3+ "pc_entry"
4+ ],
2 "apiType": 'stageMode',5 "apiType": 'stageMode',
3 "targets": [6 "targets": [
4 {7 {
@@ -0,0 +1,11 @@
1+{
2+ "devDependencies": {},
3+ "name": "pc_controlpanel",
4+ "description": "",
5+ "version": "1.0.0",
6+ "dependencies": {
7+ "@ohos/controlcentercomponent": "file:../../../features/controlcentercomponent",
8+ "@ohos/autorotatecomponent": "file:../../../features/autorotatecomponent",
9+ "@ohos/airplanecomponent": "file:../../../features/airplanecomponent"
10+ }
11+}
@@ -1,17 +0,0 @@
1-{
2- "name": "pc_controlpanel",
3- "version": "1.0.0",
4- "lockfileVersion": 1,
5- "requires": true,
6- "dependencies": {
7- "@ohos/airplanecomponent": {
8- "version": "file:../../../features/airplanecomponent"
9- },
10- "@ohos/autorotatecomponent": {
11- "version": "file:../../../features/autorotatecomponent"
12- },
13- "@ohos/controlcentercomponent": {
14- "version": "file:../../../features/controlcentercomponent"
15- }
16- }
17-}
@@ -1,15 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"pc_controlpanel",
4- "ohos":{
5- "org":"huawei",
6- "directoryLevel":"module",
7- "buildTool":"hvigor"
8- },
9- "version":"1.0.0",
10- "dependencies":{
11- "@ohos/controlcentercomponent":"file:../../../features/controlcentercomponent",
12- "@ohos/autorotatecomponent":"file:../../../features/autorotatecomponent",
13- "@ohos/airplanecomponent":"file:../../../features/airplanecomponent"
14- }
15-}
@@ -1,4 +1,7 @@
1{1{
2+ "entryModules": [
3+ "pc_entry"
4+ ],
2 "apiType": 'stageMode',5 "apiType": 'stageMode',
3 "targets": [6 "targets": [
4 {7 {
Rproduct/pc/notificationpanel/package-lock.jsonproduct/pc/notificationpanel/oh-package.json5+4-6
@@ -1,11 +1,9 @@
1{1{
2+ "devDependencies": {},
2 "name": "pc_notificationpanel",3 "name": "pc_notificationpanel",
4+ "description": "",
3 "version": "1.0.0",5 "version": "1.0.0",
4- "lockfileVersion": 1,
5- "requires": true,
6 "dependencies": {6 "dependencies": {
7- "@ohos/noticeitem": {7+ "@ohos/noticeitem": "file:../../../features/noticeitem"
8- "version": "file:../../../features/noticeitem"
9- }
10 }8 }
11-}9+}
@@ -1,13 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"pc_notificationpanel",
4- "ohos":{
5- "org":"huawei",
6- "directoryLevel":"module",
7- "buildTool":"hvigor"
8- },
9- "version":"1.0.0",
10- "dependencies":{
11- "@ohos/noticeitem":"file:../../../features/noticeitem"
12- }
13-}
@@ -1,4 +1,7 @@
1{1{
2+ "entryModules": [
3+ "pc_entry"
4+ ],
2 "apiType": 'stageMode',5 "apiType": 'stageMode',
3 "targets": [6 "targets": [
4 {7 {
@@ -0,0 +1,18 @@
1+{
2+ "devDependencies": {},
3+ "name": "pc_statusbar",
4+ "description": "",
5+ "version": "1.0.0",
6+ "dependencies": {
7+ "@ohos/statusbarcomponent": "file:../../../features/statusbarcomponent",
8+ "@ohos/wificomponent": "file:../../../features/wificomponent",
9+ "@ohos/bluetoothcomponent": "file:../../../features/bluetoothcomponent",
10+ "@ohos/signalcomponent": "file:../../../features/signalcomponent",
11+ "@ohos/clockcomponent": "file:../../../features/clockcomponent",
12+ "@ohos/locationcomponent": "file:../../../features/locationcomponent",
13+ "@ohos/batterycomponent": "file:../../../features/batterycomponent",
14+ "@ohos/ringmodecomponent": "file:../../../features/ringmodecomponent",
15+ "@ohos/capsulecomponent": "file:../../../features/capsulecomponent",
16+ "@ohos/airplanecomponent": "file:../../../features/airplanecomponent"
17+ }
18+}
@@ -1,38 +0,0 @@
1-{
2- "name": "pc_statusbar",
3- "version": "1.0.0",
4- "lockfileVersion": 1,
5- "requires": true,
6- "dependencies": {
7- "@ohos/airplanecomponent": {
8- "version": "file:../../../features/airplanecomponent"
9- },
10- "@ohos/batterycomponent": {
11- "version": "file:../../../features/batterycomponent"
12- },
13- "@ohos/bluetoothcomponent": {
14- "version": "file:../../../features/bluetoothcomponent"
15- },
16- "@ohos/capsulecomponent": {
17- "version": "file:../../../features/capsulecomponent"
18- },
19- "@ohos/clockcomponent": {
20- "version": "file:../../../features/clockcomponent"
21- },
22- "@ohos/locationcomponent": {
23- "version": "file:../../../features/locationcomponent"
24- },
25- "@ohos/ringmodecomponent": {
26- "version": "file:../../../features/ringmodecomponent"
27- },
28- "@ohos/signalcomponent": {
29- "version": "file:../../../features/signalcomponent"
30- },
31- "@ohos/statusbarcomponent": {
32- "version": "file:../../../features/statusbarcomponent"
33- },
34- "@ohos/wificomponent": {
35- "version": "file:../../../features/wificomponent"
36- }
37- }
38-}
@@ -1,22 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"pc_statusbar",
4- "ohos":{
5- "org":"huawei",
6- "directoryLevel":"module",
7- "buildTool":"hvigor"
8- },
9- "version":"1.0.0",
10- "dependencies":{
11- "@ohos/statusbarcomponent":"file:../../../features/statusbarcomponent",
12- "@ohos/wificomponent":"file:../../../features/wificomponent",
13- "@ohos/bluetoothcomponent":"file:../../../features/bluetoothcomponent",
14- "@ohos/signalcomponent":"file:../../../features/signalcomponent",
15- "@ohos/clockcomponent":"file:../../../features/clockcomponent",
16- "@ohos/locationcomponent":"file:../../../features/locationcomponent",
17- "@ohos/batterycomponent":"file:../../../features/batterycomponent",
18- "@ohos/ringmodecomponent":"file:../../../features/ringmodecomponent",
19- "@ohos/capsulecomponent":"file:../../../features/capsulecomponent",
20- "@ohos/airplanecomponent":"file:../../../features/airplanecomponent"
21- }
22-}
@@ -1,4 +1,7 @@
1{1{
2+ "entryModules": [
3+ "phone_entry",
4+ ],
2 "apiType": 'stageMode',5 "apiType": 'stageMode',
3 "targets": [6 "targets": [
4 {7 {
@@ -0,0 +1,20 @@
1+{
2+ "devDependencies": {},
3+ "name": "phone_dropdownpanel",
4+ "description": "",
5+ "version": "1.0.0",
6+ "dependencies": {
7+ "@ohos/statusbarcomponent": "file:../../../features/statusbarcomponent",
8+ "@ohos/wificomponent": "file:../../../features/wificomponent",
9+ "@ohos/bluetoothcomponent": "file:../../../features/bluetoothcomponent",
10+ "@ohos/signalcomponent": "file:../../../features/signalcomponent",
11+ "@ohos/clockcomponent": "file:../../../features/clockcomponent",
12+ "@ohos/locationcomponent": "file:../../../features/locationcomponent",
13+ "@ohos/batterycomponent": "file:../../../features/batterycomponent",
14+ "@ohos/controlcentercomponent": "file:../../../features/controlcentercomponent",
15+ "@ohos/ringmodecomponent": "file:../../../features/ringmodecomponent",
16+ "@ohos/autorotatecomponent": "file:../../../features/autorotatecomponent",
17+ "@ohos/noticeitem": "file:../../../features/noticeitem",
18+ "@ohos/airplanecomponent": "file:../../../features/airplanecomponent"
19+ }
20+}
@@ -1,44 +0,0 @@
1-{
2- "name": "phone_dropdownpanel",
3- "version": "1.0.0",
4- "lockfileVersion": 1,
5- "requires": true,
6- "dependencies": {
7- "@ohos/airplanecomponent": {
8- "version": "file:../../../features/airplanecomponent"
9- },
10- "@ohos/autorotatecomponent": {
11- "version": "file:../../../features/autorotatecomponent"
12- },
13- "@ohos/batterycomponent": {
14- "version": "file:../../../features/batterycomponent"
15- },
16- "@ohos/bluetoothcomponent": {
17- "version": "file:../../../features/bluetoothcomponent"
18- },
19- "@ohos/clockcomponent": {
20- "version": "file:../../../features/clockcomponent"
21- },
22- "@ohos/controlcentercomponent": {
23- "version": "file:../../../features/controlcentercomponent"
24- },
25- "@ohos/locationcomponent": {
26- "version": "file:../../../features/locationcomponent"
27- },
28- "@ohos/noticeitem": {
29- "version": "file:../../../features/noticeitem"
30- },
31- "@ohos/ringmodecomponent": {
32- "version": "file:../../../features/ringmodecomponent"
33- },
34- "@ohos/signalcomponent": {
35- "version": "file:../../../features/signalcomponent"
36- },
37- "@ohos/statusbarcomponent": {
38- "version": "file:../../../features/statusbarcomponent"
39- },
40- "@ohos/wificomponent": {
41- "version": "file:../../../features/wificomponent"
42- }
43- }
44-}
@@ -1,24 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"phone_dropdownpanel",
4- "ohos":{
5- "org":"huawei",
6- "directoryLevel":"module",
7- "buildTool":"hvigor"
8- },
9- "version":"1.0.0",
10- "dependencies":{
11- "@ohos/statusbarcomponent":"file:../../../features/statusbarcomponent",
12- "@ohos/wificomponent":"file:../../../features/wificomponent",
13- "@ohos/bluetoothcomponent":"file:../../../features/bluetoothcomponent",
14- "@ohos/signalcomponent":"file:../../../features/signalcomponent",
15- "@ohos/clockcomponent":"file:../../../features/clockcomponent",
16- "@ohos/locationcomponent":"file:../../../features/locationcomponent",
17- "@ohos/batterycomponent":"file:../../../features/batterycomponent",
18- "@ohos/controlcentercomponent":"file:../../../features/controlcentercomponent",
19- "@ohos/ringmodecomponent":"file:../../../features/ringmodecomponent",
20- "@ohos/autorotatecomponent":"file:../../../features/autorotatecomponent",
21- "@ohos/noticeitem":"file:../../../features/noticeitem",
22- "@ohos/airplanecomponent":"file:../../../features/airplanecomponent"
23- }
24-}
@@ -1,4 +1,7 @@
1{1{
2+ "entryModules": [
3+ "phone_entry",
4+ ],
2 "apiType": 'stageMode',5 "apiType": 'stageMode',
3 "targets": [6 "targets": [
4 {7 {
Rproduct/phone/statusbar/package-lock.jsonproduct/phone/statusbar/oh-package.json5+4-6
@@ -1,11 +1,9 @@
1{1{
2+ "devDependencies": {},
2 "name": "phone_statusbar",3 "name": "phone_statusbar",
4+ "description": "",
3 "version": "1.0.0",5 "version": "1.0.0",
4- "lockfileVersion": 1,
5- "requires": true,
6 "dependencies": {6 "dependencies": {
7- "@ohos/statusbarcomponent": {7+ "@ohos/statusbarcomponent": "file:../../../features/statusbarcomponent"
8- "version": "file:../../../features/statusbarcomponent"
9- }
10 }8 }
11-}9+}
@@ -1,13 +0,0 @@
1-{
2- "devDependencies":{},
3- "name":"phone_statusbar",
4- "ohos":{
5- "org":"huawei",
6- "directoryLevel":"module",
7- "buildTool":"hvigor"
8- },
9- "version":"1.0.0",
10- "dependencies":{
11- "@ohos/statusbarcomponent":"file:../../../features/statusbarcomponent"
12- }
13-}