fix: update static assets path for widgets (#108)

* fix: update static assets path for widgets

Signed-off-by: lileirjyb <lileirjyb@vivo.com>

* fix: add killAdb export

Signed-off-by: lileirjyb <lileirjyb@vivo.com>

---------

Signed-off-by: lileirjyb <lileirjyb@vivo.com>

Author: lilei946

packages/hap-compiler/src/style/index.js

@@ -30,6 +30,7 @@ function parse(source) {
 
   let code = source.code || ''
   const filePath = source.filePath
+  const cardEntry = source.cardEntry
   const curDir = path.dirname(filePath)
   // 引入的CSS文件列表
   const depList = []
@@ -93,7 +94,8 @@ function parse(source) {
             } else if (name === 'src') {
               // 校验属性值
               const subResult = validateDelaration('fontSrc', value, {
-                filePath
+                filePath,
+                cardEntry
               })
               if (subResult.log) {
                 log.push({

packages/hap-compiler/src/style/validator.js

@@ -803,7 +803,7 @@ const validator = {
       let value = url[2]
       if (!/^data:/.test(value) && !/^http(s)?:/.test(value)) {
         // 转换为以项目源码为根的绝对路径
-        value = resolvePath(value, options.filePath)
+        value = resolvePath(value, options.filePath, options.cardEntry)
       }
       return { value: value }
     }

packages/hap-compiler/src/utils.js

@@ -198,13 +198,21 @@ export function isValidValue(value) {
  * @returns {*}
  * @desc 将文件相对路径转为项目根目录('src/')下的绝对路径
  */
-export function resolvePath(relativePath, filePath, cardEntry = '') {
+export function resolvePath(relativePath, filePath, cardEntry) {
   if (filePath && !path.isAbsolute(relativePath)) {
     const absolutePath = path.join(path.dirname(filePath), relativePath)
-    const relativeProjectPath = path.relative(
-      path.resolve(globalConfig.projectPath, './src', cardEntry),
-      absolutePath
-    )
+    let relativeProjectPath
+    if (cardEntry && filePath.indexOf('node_modules') > -1) {
+      relativeProjectPath = path.join(
+        cardEntry,
+        path.relative(globalConfig.projectPath, absolutePath)
+      )
+    } else {
+      relativeProjectPath = path.relative(
+        path.resolve(globalConfig.projectPath, './src'),
+        absolutePath
+      )
+    }
     const newAbsolutePath = path.join('/', relativeProjectPath)
     // 兼容windows
     relativePath = newAbsolutePath.replace(/\\/g, '/')

packages/hap-dsl-xvm/src/loaders/style-loader.js

@@ -37,6 +37,7 @@ export default function styleLoader(code) {
   const resourcePath = this.resourcePath // 当前文件绝对路径
 
   const { depList, log, depFiles, jsonStyle } = parseStyle({
+    cardEntry: options.cardEntry,
     filePath: resourcePath,
     code: code,
     query: loaderQuery

packages/hap-toolkit/src/index.js

@@ -5,7 +5,7 @@
 
 import { BuildModeManager } from '@hap-toolkit/shared-utils'
 import { launchServer, stopServer, updateWebViewOptions } from '@hap-toolkit/server'
-import { compile, stopWatch } from './commands/compile'
+import { compile, stopWatch, killAdb } from './commands/compile'
 
 /**
  * 关闭开发服务及停止webpack watching
@@ -65,6 +65,7 @@ export {
   stopServer,
   launchWithWatch,
   stopAll,
+  killAdb,
   BuildModeManager,
   updateWebViewOptions
 }