Skip to content

fix widget rpk name error & update lite card custom component path for windows #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 23, 2024
Merged

fix widget rpk name error & update lite card custom component path for windows #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
beda86d
fix: widget rpk name error
ZhangYingchun-OPPO Oct 23, 2024
0449f3a
fix: component path for lite card bundle json file
ZhangYingchun-OPPO Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions packages/hap-packager/src/plugins/lite-card-plugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ class LiteCardPlugin {
stage: Compilation.PROCESS_ASSETS_STAGE_ADDITIONAL
},
() => {
const { pathSrc } = this.options
let { pathSrc } = this.options
pathSrc = pathSrc.replace(/\\/g, '/')
const moduleGraph = compilation.moduleGraph
for (const chunk of compilation.chunks) {
const entryModule = chunk.entryModule
Expand Down Expand Up @@ -194,23 +195,27 @@ class LiteCardPlugin {
const reqArr = reqPath.split('!')
const lastItem = reqArr[reqArr.length - 1]
const pathArr = lastItem.split('?')
const uxPath = pathArr[0]
const relativeSrcPath = this.getRelativeCompPath(pathSrc, uxPath)
const paramStr = pathArr[1]
const compUxType = 'uxType=comp'
const namePrefix = 'name='
let compName = relativeSrcPath
if (paramStr && paramStr.includes(compUxType) && paramStr.includes(namePrefix)) {
const paramArr = paramStr.split('&')
const nameStr = paramArr.find((item) => item.indexOf(namePrefix) === 0)
const compName = nameStr && nameStr.substring(namePrefix.length)
const uxPath = pathArr[0]
const relativeSrcPath = this.getRelativeCompPath(pathSrc, uxPath)
return { compName, relativeSrcPath }
if (nameStr) {
compName = nameStr.substring(namePrefix.length)
}
}
return { compName, relativeSrcPath }
}
return {}
}

getRelativeCompPath(pathSrc, uxPath) {
const relativeSrcPathStr = path.relative(pathSrc, uxPath)
let relativeSrcPathStr = path.relative(pathSrc, uxPath)
relativeSrcPathStr = relativeSrcPathStr.replace(/\\/g, '/')
if (relativeSrcPathStr && relativeSrcPathStr.endsWith('.ux')) {
return relativeSrcPathStr.substring(0, relativeSrcPathStr.length - SUFFIX_UX.length)
}
Expand All @@ -233,7 +238,7 @@ class LiteCardPlugin {
throw new Error(`Invalid request path or src path:\n${requestPath}\n${pathSrc}`)
}
requestPath = requestPath.replace(/\\/g, '/')
pathSrc = pathSrc.replace(/\\/g, '/')
// pathSrc = pathSrc.replace(/\\/g, '/')
// const requestPathNormal = path.normalize(requestPath)
const reqPathArr = requestPath.split('!')
let uxPathStr = reqPathArr[reqPathArr.length - 1]
Expand Down
2 changes: 1 addition & 1 deletion packages/hap-packager/src/plugins/zip-plugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,7 @@ ZipPlugin.prototype.apply = function (compiler) {
const widgets = manifest?.router?.widgets || {}
Object.keys(widgets).forEach((key) => {
subpackageOptions.push({
name: key.replace('/', '.'),
name: key.replaceAll('/', '.'),
resource: key,
_widget: true
})
Expand Down
Loading