!404 回退 'Pull Request !396 : 回退 'Pull Request !394 : 回退 'Pull Request !393 : 切ohpm'''

Merge pull request !404 from openharmony_ci/revert-merge-396-master

.gitignore

@@ -1,30 +1,18 @@
 .gradle
 .idea
-.hvigor
 build
 node_modules/
-oh_modules/
-oh-package-lock.json5
 local.properties
 signature/systemui_provision_verified.json
 /product/default/volumepanel/node_modules
-/product/default/volumepanel/oh_modules
 /product/default/notificationmanagement/node_modules
-/product/default/notificationmanagement/oh_modules
 /product/default/navigationBar/node_modules
-/product/default/navigationBar/oh_modules
 /product/pc/controlpanel/node_modules
-/product/pc/controlpanel/oh_modules
 /product/pc/notificationpanel/node_modules
-/product/pc/notificationpanel/oh_modules
 /product/pc/statusbar/node_modules
-/product/pc/statusbar/oh_modules
 /product/phone/dropdownpanel/node_modules
-/product/phone/dropdownpanel/oh_modules
 /product/phone/statusbar/node_modules
-/product/phone/statusbar/oh_modules
 /product/default/dialog/node_modules
-/product/default/dialog/oh_modules
 /product/default/volumepanel/.preview/
 /product/pc/notificationpanel/.preview/
 /product/phone/statusbar/.preview/

OAT.xml

@@ -83,11 +83,9 @@
 			</filefilter>
 			<filefilter name="copyrightPolicyFilter" desc="Filters for copyright header policies">
 				<filteritem type="filename" name="README|README_zh|.*.log|.*.json5|.*.json" desc=""/>
-				<filteritem type="filename" name="hvigorw|hvigorw.bat|hvigor-wrapper.js" desc="Build files"/>
 			</filefilter>
 			<filefilter name="defaultPolicyFilter" desc="Filters for LICENSE file policies">
 				<filteritem type="filename" name="README|README_zh|*.log|*.json5|*.json" desc="json file"/>
-				<filteritem type="filename" name="hvigorw|hvigorw.bat|hvigor-wrapper.js" desc="Build files"/>
 			</filefilter>
 		</filefilterlist>
     </oatconfig>

common/oh-package.json5

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {},
-  "name": "@ohos/common",
-  "description": "a npm package which contains common function",
-  "version": "1.0.0",
-  "dependencies": {}
-}

common/package-lock.json

@@ -0,0 +1,5 @@
+{
+  "name": "@ohos/common",
+  "version": "1.0.0",
+  "lockfileVersion": 1
+}

common/package.json

@@ -0,0 +1,12 @@
+{
+	"devDependencies":{},
+	"name":"@ohos/common",
+	"description":"a npm package which contains common function",
+	"ohos":{
+		"org":"huawei",
+		"directoryLevel":"module",
+		"buildTool":"hvigor"
+	},
+	"version":"1.0.0",
+	"dependencies":{}
+}

entry/pc/oh-package.json5

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {},
-  "name": "pc_entry",
-  "description": "",
-  "version": "1.0.0",
-  "dependencies": {}
-}

entry/pc/package-lock.json

@@ -0,0 +1,5 @@
+{
+	"name": "pc_entry",
+	"version": "1.0.0",
+	"lockfileVersion": 1
+}

entry/pc/package.json

@@ -0,0 +1,11 @@
+{
+	"devDependencies":{},
+	"name":"pc_entry",
+	"ohos":{
+		"org":"huawei",
+		"directoryLevel":"module",
+		"buildTool":"hvigor"
+	},
+	"version":"1.0.0",
+	"dependencies":{}
+}

entry/phone/oh-package.json5

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {},
-  "name": "phone_entry",
-  "description": "",
-  "version": "1.0.0",
-  "dependencies": {}
-}

entry/phone/package-lock.json

@@ -0,0 +1,5 @@
+{
+	"name": "phone_entry",
+	"version": "1.0.0",
+	"lockfileVersion": 1
+}

entry/phone/package.json

@@ -0,0 +1,11 @@
+{
+	"devDependencies":{},
+	"name":"phone_entry",
+	"ohos":{
+		"org":"huawei",
+		"directoryLevel":"module",
+		"buildTool":"hvigor"
+	},
+	"version":"1.0.0",
+	"dependencies":{}
+}

features/airplanecomponent/oh-package.json5

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {},
-  "name": "@ohos/airplanecomponent",
-  "description": "a npm package which contains airplanecomponent function",
-  "version": "1.0.0",
-  "dependencies": {}
-}

features/airplanecomponent/package-lock.json

@@ -0,0 +1,5 @@
+{
+  "name": "@ohos/airplanecomponent",
+  "version": "1.0.0",
+  "lockfileVersion": 1
+}

features/airplanecomponent/package.json

@@ -0,0 +1,12 @@
+{
+	"devDependencies":{},
+	"name":"@ohos/airplanecomponent",
+	"description":"a npm package which contains airplanecomponent function",
+	"ohos":{
+		"org":"huawei",
+		"directoryLevel":"module",
+		"buildTool":"hvigor"
+	},
+	"version":"1.0.0",
+	"dependencies":{}
+}

features/autorotatecomponent/oh-package.json5

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {},
-  "name": "@ohos/autorotatecomponent",
-  "description": "a npm package which contains autorotatecomponent function",
-  "version": "1.0.0",
-  "dependencies": {}
-}

features/autorotatecomponent/package-lock.json

@@ -0,0 +1,5 @@
+{
+  "name": "@ohos/autorotatecomponent",
+  "version": "1.0.0",
+  "lockfileVersion": 1
+}

features/autorotatecomponent/package.json

@@ -0,0 +1,12 @@
+{
+	"devDependencies":{},
+	"name":"@ohos/autorotatecomponent",
+	"description":"a npm package which contains autorotatecomponent function",
+	"ohos":{
+		"org":"huawei",
+		"directoryLevel":"module",
+		"buildTool":"hvigor"
+	},
+	"version":"1.0.0",
+	"dependencies":{}
+}

features/batterycomponent/oh-package.json5

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {},
-  "name": "@ohos/batterycomponent",
-  "description": "a npm package which contains batterycomponent function",
-  "version": "1.0.0",
-  "dependencies": {}
-}

features/batterycomponent/package-lock.json

@@ -0,0 +1,5 @@
+{
+  "name": "@ohos/batterycomponent",
+  "version": "1.0.0",
+  "lockfileVersion": 1
+}

features/batterycomponent/package.json

@@ -0,0 +1,12 @@
+{
+	"devDependencies":{},
+	"name":"@ohos/batterycomponent",
+	"description":"a npm package which contains batterycomponent function",
+	"ohos":{
+		"org":"huawei",
+		"directoryLevel":"module",
+		"buildTool":"hvigor"
+	},
+	"version":"1.0.0",
+	"dependencies":{}
+}

features/bluetoothcomponent/oh-package.json5

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {},
-  "name": "@ohos/bluetoothcomponent",
-  "description": "a npm package which contains bluetoothcomponent function",
-  "version": "1.0.0",
-  "dependencies": {}
-}

features/bluetoothcomponent/package-lock.json

@@ -0,0 +1,5 @@
+{
+  "name": "@ohos/bluetoothcomponent",
+  "version": "1.0.0",
+  "lockfileVersion": 1
+}

features/bluetoothcomponent/package.json

@@ -0,0 +1,12 @@
+{
+	"devDependencies":{},
+	"name":"@ohos/bluetoothcomponent",
+	"description":"a npm package which contains bluetoothcomponent function",
+	"ohos":{
+		"org":"huawei",
+		"directoryLevel":"module",
+		"buildTool":"hvigor"
+	},
+	"version":"1.0.0",
+	"dependencies":{}
+}

features/brightnesscomponent/oh-package.json5

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {},
-  "name": "@ohos/brightnesscomponent",
-  "description": "a npm package which contains brightnesscomponent function",
-  "version": "1.0.0",
-  "dependencies": {}
-}

features/brightnesscomponent/package-lock.json

@@ -0,0 +1,5 @@
+{
+  "name": "@ohos/brightnesscomponent",
+  "version": "1.0.0",
+  "lockfileVersion": 1
+}

features/brightnesscomponent/package.json

@@ -0,0 +1,12 @@
+{
+	"devDependencies":{},
+	"name":"@ohos/brightnesscomponent",
+	"description":"a npm package which contains brightnesscomponent function",
+	"ohos":{
+		"org":"huawei",
+		"directoryLevel":"module",
+		"buildTool":"hvigor"
+	},
+	"version":"1.0.0",
+	"dependencies":{}
+}

features/capsulecomponent/oh-package.json5

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {},
-  "name": "@ohos/capsulecomponent",
-  "description": "a npm package which contains capsulecomponent function",
-  "version": "1.0.0",
-  "dependencies": {}
-}

features/capsulecomponent/package-lock.json

@@ -0,0 +1,5 @@
+{
+  "name": "@ohos/capsulecomponent",
+  "version": "1.0.0",
+  "lockfileVersion": 1
+}

features/capsulecomponent/package.json

@@ -0,0 +1,12 @@
+{
+	"devDependencies":{},
+	"name":"@ohos/capsulecomponent",
+	"description":"a npm package which contains capsulecomponent function",
+	"ohos":{
+		"org":"huawei",
+		"directoryLevel":"module",
+		"buildTool":"hvigor"
+	},
+	"version":"1.0.0",
+	"dependencies":{}
+}

features/clockcomponent/oh-package.json5

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {},
-  "name": "@ohos/clockcomponent",
-  "description": "a npm package which contains clockcomponent function",
-  "version": "1.0.0",
-  "dependencies": {}
-}

features/clockcomponent/package-lock.json

@@ -0,0 +1,5 @@
+{
+  "name": "@ohos/clockcomponent",
+  "version": "1.0.0",
+  "lockfileVersion": 1
+}

features/clockcomponent/package.json

@@ -0,0 +1,12 @@
+{
+	"devDependencies":{},
+	"name":"@ohos/clockcomponent",
+	"description":"a npm package which contains clockcomponent function",
+	"ohos":{
+		"org":"huawei",
+		"directoryLevel":"module",
+		"buildTool":"hvigor"
+	},
+	"version":"1.0.0",
+	"dependencies":{}
+}

features/controlcentercomponent/oh-package.json5

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {},
-  "name": "@ohos/controlcentercomponent",
-  "description": "a npm package which contains controlcentercomponent function",
-  "version": "1.0.0",
-  "dependencies": {}
-}

features/controlcentercomponent/package-lock.json

@@ -0,0 +1,5 @@
+{
+  "name": "@ohos/controlcentercomponent",
+  "version": "1.0.0",
+  "lockfileVersion": 1
+}

features/controlcentercomponent/package.json

@@ -0,0 +1,12 @@
+{
+	"devDependencies":{},
+	"name":"@ohos/controlcentercomponent",
+	"description":"a npm package which contains controlcentercomponent function",
+	"ohos":{
+		"org":"huawei",
+		"directoryLevel":"module",
+		"buildTool":"hvigor"
+	},
+	"version":"1.0.0",
+	"dependencies":{}
+}

features/locationcomponent/oh-package.json5

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {},
-  "name": "@ohos/locationcomponent",
-  "description": "a npm package which contains locationcomponent function",
-  "version": "1.0.0",
-  "dependencies": {}
-}

features/locationcomponent/package-lock.json

@@ -0,0 +1,5 @@
+{
+  "name": "@ohos/locationcomponent",
+  "version": "1.0.0",
+  "lockfileVersion": 1
+}

features/locationcomponent/package.json

@@ -0,0 +1,12 @@
+{
+	"devDependencies":{},
+	"name":"@ohos/locationcomponent",
+	"description":"a npm package which contains locationcomponent function",
+	"ohos":{
+		"org":"huawei",
+		"directoryLevel":"module",
+		"buildTool":"hvigor"
+	},
+	"version":"1.0.0",
+	"dependencies":{}
+}

features/managementcomponent/oh-package.json5

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {},
-  "name": "@ohos/managementcomponent",
-  "description": "a npm package which contains managementcomponent function",
-  "version": "1.0.0",
-  "dependencies": {}
-}

features/managementcomponent/package-lock.json

@@ -0,0 +1,5 @@
+{
+  "name": "@ohos/managementcomponent",
+  "version": "1.0.0",
+  "lockfileVersion": 1
+}

features/managementcomponent/package.json

@@ -0,0 +1,12 @@
+{
+	"devDependencies":{},
+	"name":"@ohos/managementcomponent",
+	"description":"a npm package which contains managementcomponent function",
+	"ohos":{
+		"org":"huawei",
+		"directoryLevel":"module",
+		"buildTool":"hvigor"
+	},
+	"version":"1.0.0",
+	"dependencies":{}
+}

features/navigationservice/oh-package.json5

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {},
-  "name": "@ohos/navigationservice",
-  "description": "a npm package which contains navigationservice function",
-  "version": "1.0.0",
-  "dependencies": {}
-}

features/navigationservice/package-lock.json

@@ -0,0 +1,5 @@
+{
+  "name": "@ohos/navigationservice",
+  "version": "1.0.0",
+  "lockfileVersion": 1
+}

features/navigationservice/package.json

@@ -0,0 +1,12 @@
+{
+	"devDependencies":{},
+	"name":"@ohos/navigationservice",
+	"description":"a npm package which contains navigationservice function",
+	"ohos":{
+		"org":"huawei",
+		"directoryLevel":"module",
+		"buildTool":"hvigor"
+	},
+	"version":"1.0.0",
+	"dependencies":{}
+}

features/nfccomponent/oh-package.json5

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {},
-  "name": "@ohos/nfccomponent",
-  "description": "a npm package which contains nfccomponent function",
-  "version": "1.0.0",
-  "dependencies": {}
-}

features/nfccomponent/package-lock.json

@@ -0,0 +1,5 @@
+{
+  "name": "@ohos/nfccomponent",
+  "version": "1.0.0",
+  "lockfileVersion": 1
+}

features/nfccomponent/package.json

@@ -0,0 +1,12 @@
+{
+	"devDependencies":{},
+	"name":"@ohos/nfccomponent",
+	"description":"a npm package which contains nfccomponent function",
+	"ohos":{
+		"org":"huawei",
+		"directoryLevel":"module",
+		"buildTool":"hvigor"
+	},
+	"version":"1.0.0",
+	"dependencies":{}
+}

features/noticeitem/oh-package.json5

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {},
-  "name": "@ohos/noticeitem",
-  "description": "a npm package which contains noticeitem function",
-  "version": "1.0.0",
-  "dependencies": {}
-}

features/noticeitem/package-lock.json

@@ -0,0 +1,5 @@
+{
+  "name": "@ohos/noticeitem",
+  "version": "1.0.0",
+  "lockfileVersion": 1
+}

features/noticeitem/package.json

@@ -0,0 +1,12 @@
+{
+	"devDependencies":{},
+	"name":"@ohos/noticeitem",
+	"description":"a npm package which contains noticeitem function",
+	"ohos":{
+		"org":"huawei",
+		"directoryLevel":"module",
+		"buildTool":"hvigor"
+	},
+	"version":"1.0.0",
+	"dependencies":{}
+}

features/ringmodecomponent/oh-package.json5

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {},
-  "name": "@ohos/ringmodecomponent",
-  "description": "a npm package which contains ringmodecomponent function",
-  "version": "1.0.0",
-  "dependencies": {}
-}

features/ringmodecomponent/package-lock.json

@@ -0,0 +1,5 @@
+{
+  "name": "@ohos/ringmodecomponent",
+  "version": "1.0.0",
+  "lockfileVersion": 1
+}

features/ringmodecomponent/package.json

@@ -0,0 +1,12 @@
+{
+	"devDependencies":{},
+	"name":"@ohos/ringmodecomponent",
+	"description":"a npm package which contains ringmodecomponent function",
+	"ohos":{
+		"org":"huawei",
+		"directoryLevel":"module",
+		"buildTool":"hvigor"
+	},
+	"version":"1.0.0",
+	"dependencies":{}
+}

features/signalcomponent/oh-package.json5

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {},
-  "name": "@ohos/signalcomponent",
-  "description": "a npm package which contains signalcomponent function",
-  "version": "1.0.0",
-  "dependencies": {}
-}

features/signalcomponent/package-lock.json

@@ -0,0 +1,5 @@
+{
+  "name": "@ohos/signalcomponent",
+  "version": "1.0.0",
+  "lockfileVersion": 1
+}

features/signalcomponent/package.json

@@ -0,0 +1,12 @@
+{
+	"devDependencies":{},
+	"name":"@ohos/signalcomponent",
+	"description":"a npm package which contains signalcomponent function",
+	"ohos":{
+		"org":"huawei",
+		"directoryLevel":"module",
+		"buildTool":"hvigor"
+	},
+	"version":"1.0.0",
+	"dependencies":{}
+}

features/statusbarcomponent/oh-package.json5

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {},
-  "name": "@ohos/statusbarcomponent",
-  "description": "a npm package which contains statusbarcomponent function",
-  "version": "1.0.0",
-  "dependencies": {}
-}

features/statusbarcomponent/package-lock.json

@@ -0,0 +1,5 @@
+{
+  "name": "@ohos/statusbarcomponent",
+  "version": "1.0.0",
+  "lockfileVersion": 1
+}

features/statusbarcomponent/package.json

@@ -0,0 +1,12 @@
+{
+	"devDependencies":{},
+	"name":"@ohos/statusbarcomponent",
+	"description":"a npm package which contains statusbarcomponent function",
+	"ohos":{
+		"org":"huawei",
+		"directoryLevel":"module",
+		"buildTool":"hvigor"
+	},
+	"version":"1.0.0",
+	"dependencies":{}
+}

features/volumecomponent/oh-package.json5

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {},
-  "name": "@ohos/volumecomponent",
-  "description": "a npm package which contains volumecomponent function",
-  "version": "1.0.0",
-  "dependencies": {}
-}

features/volumecomponent/package-lock.json

@@ -0,0 +1,5 @@
+{
+  "name": "@ohos/volumecomponent",
+  "version": "1.0.0",
+  "lockfileVersion": 1
+}

features/volumecomponent/package.json

@@ -0,0 +1,12 @@
+{
+	"devDependencies":{},
+	"name":"@ohos/volumecomponent",
+	"description":"a npm package which contains volumecomponent function",
+	"ohos":{
+		"org":"huawei",
+		"directoryLevel":"module",
+		"buildTool":"hvigor"
+	},
+	"version":"1.0.0",
+	"dependencies":{}
+}

features/volumepanelcomponent/oh-package.json5

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {},
-  "name": "@ohos/volumepanelcomponent",
-  "description": "a npm package which contains volumepanelcomponent function",
-  "version": "1.0.0",
-  "dependencies": {}
-}

features/volumepanelcomponent/package-lock.json

@@ -0,0 +1,5 @@
+{
+  "name": "@ohos/volumepanelcomponent",
+  "version": "1.0.0",
+  "lockfileVersion": 1
+}

features/volumepanelcomponent/package.json

@@ -0,0 +1,12 @@
+{
+	"devDependencies":{},
+	"name":"@ohos/volumepanelcomponent",
+	"description":"a npm package which contains volumepanelcomponent function",
+	"ohos":{
+		"org":"huawei",
+		"directoryLevel":"module",
+		"buildTool":"hvigor"
+	},
+	"version":"1.0.0",
+	"dependencies":{}
+}

features/wificomponent/oh-package.json5

@@ -1,7 +0,0 @@
-{
-  "devDependencies": {},
-  "name": "@ohos/wificomponent",
-  "description": "a npm package which contains wificomponent function",
-  "version": "1.0.0",
-  "dependencies": {}
-}

features/wificomponent/package-lock.json

@@ -0,0 +1,5 @@
+{
+  "name": "@ohos/wificomponent",
+  "version": "1.0.0",
+  "lockfileVersion": 1
+}

features/wificomponent/package.json

@@ -0,0 +1,12 @@
+{
+	"devDependencies":{},
+	"name":"@ohos/wificomponent",
+	"description":"a npm package which contains wificomponent function",
+	"ohos":{
+		"org":"huawei",
+		"directoryLevel":"module",
+		"buildTool":"hvigor"
+	},
+	"version":"1.0.0",
+	"dependencies":{}
+}

hvigor/hvigor-config.json5

@@ -1,6 +0,0 @@
-{
-  "hvigorVersion": "2.1.1",
-  "dependencies": {
-    "@ohos/hvigor-ohos-plugin": "2.1.1"
-  }
-}

hvigorw

@@ -1,48 +0,0 @@
-#!/bin/bash
-
-# ----------------------------------------------------------------------------
-#  Hvigor startup script, version 1.0.0
-# 
-#  Required ENV vars:
-#  ------------------
-#    NODE_HOME - location of a Node home dir
-#    or 
-#    Add /usr/local/nodejs/bin to the PATH environment variable
-# ----------------------------------------------------------------------------
-
-HVIGOR_APP_HOME=$(dirname $(readlink -f $0))
-HVIGOR_WRAPPER_SCRIPT=${HVIGOR_APP_HOME}/hvigor/hvigor-wrapper.js
-warn() {
-	echo ""
-	echo -e "\033[1;33m`date '+[%Y-%m-%d %H:%M:%S]'`$@\033[0m"
-}
-
-error() {
-	echo ""
-	echo -e "\033[1;31m`date '+[%Y-%m-%d %H:%M:%S]'`$@\033[0m"
-}
-
-fail() {
-	error "$@"
-	exit 1
-}
-
-# Determine node to start hvigor wrapper script
-if [ -n "${NODE_HOME}" ];then
-   EXECUTABLE_NODE="${NODE_HOME}/bin/node"
-   if [ ! -x "$EXECUTABLE_NODE" ];then
-       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"
-   fi
-else
-   EXECUTABLE_NODE="node"
-   which ${EXECUTABLE_NODE} > /dev/null 2>&1 || fail "ERROR: NODE_HOME is not set and not 'node' command found in your path"
-fi
-
-# Check hvigor wrapper script
-if [ ! -r "$HVIGOR_WRAPPER_SCRIPT" ];then
-	fail "ERROR: Couldn't find hvigor/hvigor-wrapper.js in ${HVIGOR_APP_HOME}"
-fi
-
-# start hvigor-wrapper script
-exec "${EXECUTABLE_NODE}" \
-	"${HVIGOR_WRAPPER_SCRIPT}" "$@"

hvigorw.bat

@@ -1,64 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Hvigor startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
-set NODE_EXE=node.exe
-
-goto start
-
-:start
-@rem Find node.exe
-if defined NODE_HOME goto findNodeFromNodeHome
-
-%NODE_EXE% --version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
-echo.
-echo Please set the NODE_HOME variable in your environment to match the
-echo location of your NodeJs installation.
-
-goto fail
-
-:findNodeFromNodeHome
-set NODE_HOME=%NODE_HOME:"=%
-set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
-
-if exist "%NODE_EXE_PATH%" goto execute
-echo.
-echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
-echo.
-echo Please set the NODE_HOME variable in your environment to match the
-echo location of your NodeJs installation.
-
-goto fail
-
-:execute
-@rem Execute hvigor
-"%NODE_EXE%" %WRAPPER_MODULE_PATH% %*
-
-if "%ERRORLEVEL%" == "0" goto hvigorwEnd
-
-:fail
-exit /b 1
-
-:hvigorwEnd
-if "%OS%" == "Windows_NT" endlocal
-
-:end

oh-package.json5

@@ -1,9 +0,0 @@
-{
-  "devDependencies": {
-    "@ohos/hypium": "1.0.6"
-  },
-  "name": "systemui",
-  "description": "",
-  "version": "1.0.0",
-  "dependencies": {}
-}

package.json

@@ -0,0 +1,15 @@
+{
+	"devDependencies":{},
+	"name":"systemui",
+	"ohos":{
+		"org":"huawei",
+		"directoryLevel":"project",
+		"buildTool":"hvigor"
+	},
+	"version":"1.0.0",
+	"dependencies":{
+		"@ohos/hypium":"1.0.0",
+		"@ohos/hvigor-ohos-plugin":"1.1.3",
+		"@ohos/hvigor":"1.1.3"
+	}
+}

product/default/dialog/build-profile.json5

@@ -1,8 +1,4 @@
 {
-  "entryModules": [
-    "phone_entry",
-    "pc_entry"
-  ],
   "apiType": 'stageMode',
   "targets": [
     {

product/default/dialog/oh-package.json5

@@ -1,6 +0,0 @@
-{
-  "devDependencies": {},
-  "name": "default_dialog",
-  "description": "",
-  "version": "1.0.0"
-}

product/default/dialog/package-lock.json

@@ -0,0 +1,5 @@
+{
+  "name": "default_dialog",
+  "version": "1.0.0",
+  "lockfileVersion": 1
+}

product/default/dialog/package.json

@@ -0,0 +1,10 @@
+{
+  "devDependencies": {},
+  "name": "default_dialog",
+  "ohos": {
+    "org": "huawei",
+    "directoryLevel": "module",
+    "buildTool": "hvigor"
+  },
+  "version": "1.0.0"
+}

product/default/navigationBar/build-profile.json5

@@ -1,8 +1,4 @@
 {
-  "entryModules": [
-    "phone_entry",
-    "pc_entry",
-  ],
   "apiType": 'stageMode',
     "targets": [
     {

product/default/navigationBar/oh-package.json5

@@ -1,9 +0,0 @@
-{
-  "devDependencies": {},
-  "name": "default_navigationBar",
-  "description": "",
-  "version": "1.0.0",
-  "dependencies": {
-    "@ohos/navigationservice": "file:../../../features/navigationservice"
-  }
-}

product/default/navigationBar/package-lock.json

@@ -0,0 +1,11 @@
+{
+  "name": "default_navigationBar",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@ohos/navigationservice": {
+      "version": "file:../../../features/navigationservice"
+    }
+  }
+}

product/default/navigationBar/package.json

@@ -0,0 +1,13 @@
+{
+	"devDependencies":{},
+	"name":"default_navigationBar",
+	"ohos":{
+		"org":"huawei",
+		"directoryLevel":"module",
+		"buildTool":"hvigor"
+	},
+	"version":"1.0.0",
+	"dependencies":{
+		"@ohos/navigationservice":"file:../../../features/navigationservice"
+	}
+}

product/default/notificationmanagement/build-profile.json5

@@ -1,8 +1,4 @@
 {
-  "entryModules": [
-    "phone_entry",
-    "pc_entry"
-  ],
   "apiType": 'stageMode',
     "targets": [
     {

product/default/notificationmanagement/oh-package.json5

@@ -1,9 +0,0 @@
-{
-  "devDependencies": {},
-  "name": "default_notificationmanagement",
-  "description": "",
-  "version": "1.0.0",
-  "dependencies": {
-    "@ohos/managementcomponent": "file:../../../features/managementcomponent"
-  }
-}

product/default/notificationmanagement/package-lock.json

@@ -0,0 +1,11 @@
+{
+	"name": "default_notificationmanagement",
+	"version": "1.0.0",
+	"lockfileVersion": 1,
+	"requires": true,
+	"dependencies": {
+		"@ohos/managementcomponent": {
+			"version": "file:../../../features/managementcomponent"
+		}
+	}
+}

product/default/notificationmanagement/package.json

@@ -0,0 +1,13 @@
+{
+	"devDependencies":{},
+	"name":"default_notificationmanagement",
+	"ohos":{
+		"org":"huawei",
+		"directoryLevel":"module",
+		"buildTool":"hvigor"
+	},
+	"version":"1.0.0",
+	"dependencies":{
+		"@ohos/managementcomponent":"file:../../../features/managementcomponent"
+	}
+}

product/default/volumepanel/build-profile.json5

@@ -1,8 +1,4 @@
 {
-  "entryModules": [
-    "phone_entry",
-    "pc_entry"
-  ],
   "apiType": 'stageMode',
     "targets": [
     {

product/default/volumepanel/oh-package.json5

@@ -1,9 +0,0 @@
-{
-  "devDependencies": {},
-  "name": "default_volumepanel",
-  "description": "",
-  "version": "1.0.0",
-  "dependencies": {
-    "@ohos/volumepanelcomponent": "file:../../../features/volumepanelcomponent"
-  }
-}

product/default/volumepanel/package-lock.json

@@ -0,0 +1,11 @@
+{
+  "name": "default_volumepanel",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@ohos/volumepanelcomponent": {
+      "version": "file:../../../features/volumepanelcomponent"
+    }
+  }
+}

product/default/volumepanel/package.json

@@ -0,0 +1,13 @@
+{
+	"devDependencies":{},
+	"name":"default_volumepanel",
+	"ohos":{
+		"org":"huawei",
+		"directoryLevel":"module",
+		"buildTool":"hvigor"
+	},
+	"version":"1.0.0",
+	"dependencies":{
+		"@ohos/volumepanelcomponent":"file:../../../features/volumepanelcomponent"
+	}
+}

product/pc/controlpanel/build-profile.json5

@@ -1,7 +1,4 @@
 {
-  "entryModules": [
-    "pc_entry"
-  ],
   "apiType": 'stageMode',
     "targets": [
     {

product/pc/controlpanel/oh-package.json5

@@ -1,11 +0,0 @@
-{
-  "devDependencies": {},
-  "name": "pc_controlpanel",
-  "description": "",
-  "version": "1.0.0",
-  "dependencies": {
-    "@ohos/controlcentercomponent": "file:../../../features/controlcentercomponent",
-    "@ohos/autorotatecomponent": "file:../../../features/autorotatecomponent",
-    "@ohos/airplanecomponent": "file:../../../features/airplanecomponent"
-  }
-}

product/pc/controlpanel/package-lock.json

@@ -0,0 +1,17 @@
+{
+  "name": "pc_controlpanel",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@ohos/airplanecomponent": {
+      "version": "file:../../../features/airplanecomponent"
+    },
+    "@ohos/autorotatecomponent": {
+      "version": "file:../../../features/autorotatecomponent"
+    },
+    "@ohos/controlcentercomponent": {
+      "version": "file:../../../features/controlcentercomponent"
+    }
+  }
+}

product/pc/controlpanel/package.json

@@ -0,0 +1,15 @@
+{
+	"devDependencies":{},
+	"name":"pc_controlpanel",
+	"ohos":{
+		"org":"huawei",
+		"directoryLevel":"module",
+		"buildTool":"hvigor"
+	},
+	"version":"1.0.0",
+	"dependencies":{
+		"@ohos/controlcentercomponent":"file:../../../features/controlcentercomponent",
+		"@ohos/autorotatecomponent":"file:../../../features/autorotatecomponent",
+		"@ohos/airplanecomponent":"file:../../../features/airplanecomponent"
+	}
+}

product/pc/notificationpanel/build-profile.json5

@@ -1,7 +1,4 @@
 {
-  "entryModules": [
-    "pc_entry"
-  ],
   "apiType": 'stageMode',
     "targets": [
     {

product/pc/notificationpanel/oh-package.json5

@@ -1,9 +0,0 @@
-{
-  "devDependencies": {},
-  "name": "pc_notificationpanel",
-  "description": "",
-  "version": "1.0.0",
-  "dependencies": {
-    "@ohos/noticeitem": "file:../../../features/noticeitem"
-  }
-}

product/pc/notificationpanel/package-lock.json

@@ -0,0 +1,11 @@
+{
+  "name": "pc_notificationpanel",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@ohos/noticeitem": {
+      "version": "file:../../../features/noticeitem"
+    }
+  }
+}

product/pc/notificationpanel/package.json

@@ -0,0 +1,13 @@
+{
+	"devDependencies":{},
+	"name":"pc_notificationpanel",
+	"ohos":{
+		"org":"huawei",
+		"directoryLevel":"module",
+		"buildTool":"hvigor"
+	},
+	"version":"1.0.0",
+	"dependencies":{
+		"@ohos/noticeitem":"file:../../../features/noticeitem"
+	}
+}

product/pc/statusbar/build-profile.json5

@@ -1,7 +1,4 @@
 {
-  "entryModules": [
-    "pc_entry"
-  ],
   "apiType": 'stageMode',
     "targets": [
     {