Skip to content

feat: rename rpk #37

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 1 commit into from
Jun 16, 2023
Merged

feat: rename rpk #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 16 additions & 4 deletions 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 @@ -160,14 +160,26 @@ function getDistFilename(options, distExt) {
)
}
let distName

let { PACKAGE_NAME, PACKAGE_TYPE, NODE_ENV } =
globalConfig.launchOptions?.compileOptions?.defineOptions || {}
// eg. packageName.release.production.customName.version.rpk
const distNameOption = [
PACKAGE_NAME || options.name,
PACKAGE_TYPE || flagSign,
NODE_ENV,
// customName
undefined,
options.versionName,
distExt
]
if (options.buildNameFormat === compileOptionsMeta.buildNameFormat.ORIGINAL) {
distName = `${options.name}.${flagSign}.${distExt}`
} else if (options.buildNameFormat && options.buildNameFormat.startsWith('CUSTOM=')) {
const custom = options.buildNameFormat.split('=')[1]
distName = `${options.name}.${flagSign}.${custom}.${options.versionName}.${distExt}`
} else {
distName = `${options.name}.${flagSign}.${options.versionName}.${distExt}`
// customName
distNameOption[3] = options.buildNameFormat.split('=')[1]
}
distName = distName || distNameOption.filter(Boolean).join('.')
return distName
}

Expand Down
5 changes: 4 additions & 1 deletion packages/hap-packager/src/router/routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,10 @@ async function logger(context, next) {
async function notify(context, next) {
const callback = context.conf.options.callback
if (typeof callback === 'function') {
const params = { action: 'runCompile' }
const params = {
action: 'runCompile',
defineOptions: globalConfig.launchOptions?.compileOptions?.defineOptions
}
callback(params)
}
context.status = 200
Expand Down
1 change: 1 addition & 0 deletions packages/hap-toolkit/src/gen-webpack-conf/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ export default async function genWebpackConf(launchOptions, mode) {
if (launchOptions.ideConfig && typeof launchOptions.ideConfig.cli === 'object') {
launchOptions = Object.assign({}, launchOptions.ideConfig.cli, launchOptions)
}
globalConfig.launchOptions = launchOptions

// 源代码目录
const SRC_DIR = path.resolve(cwd, globalConfig.sourceRoot)
Expand Down