allow to config package name

Author: henryaw

lib/publish.js

@@ -12,28 +12,18 @@ import resolveConfig from "./resolve-config.js";
 import getAssets from "./glob-assets.js";
 import { RELEASE_NAME } from "./definitions/constants.js";
 import getProjectContext from "./get-project-context.js";
-import semver from "semver";
 
 const isUrlScheme = (value) => /^(https|http|ftp):\/\//.test(value);
 
 export default async (pluginConfig, context) => {
   const {
     cwd,
     options: { repositoryUrl },
-    nextRelease: { gitTag, gitHead, notes, version, channel },
+    nextRelease: { gitTag, gitHead, notes, version },
     logger,
   } = context;
-  const {
-    gitlabToken,
-    gitlabUrl,
-    gitlabApiUrl,
-    assets,
-    milestones,
-    proxy,
-    retryLimit,
-    retryStatusCodes,
-    channelAsPkgName,
-  } = resolveConfig(pluginConfig, context);
+  const { gitlabToken, gitlabUrl, gitlabApiUrl, assets, milestones, proxy, retryLimit, retryStatusCodes } =
+    resolveConfig(pluginConfig, context);
   const assetsList = [];
   const { projectPath, projectApiUrl } = getProjectContext(context, gitlabUrl, gitlabApiUrl, repositoryUrl);
 
@@ -85,6 +75,7 @@ export default async (pluginConfig, context) => {
         const filepath = asset.filepath ? template(asset.filepath)(context) : undefined;
         const target = asset.target ? template(asset.target)(context) : undefined;
         const status = asset.status ? template(asset.status)(context) : undefined;
+        const packageName = asset.packageName ? template(asset.packageName)(context) : "release";
 
         if (_url) {
           assetsList.push({ label, rawUrl: _url, type, filepath });
@@ -118,10 +109,10 @@ export default async (pluginConfig, context) => {
 
           if (target === "generic_package") {
             // Upload generic packages
-            const { major, minor, patch } = semver.parse(version);
-            const encodedVersion = encodeURIComponent(channelAsPkgName ? `${major}.${minor}.${patch}` : version);
-            const encodedChannel = encodeURIComponent(channelAsPkgName ? channel : "release");
-            const encodedLabel = encodeURIComponent(label ?? version);
+            const encodedVersion = encodeURIComponent(version);
+            const encodedChannel = encodeURIComponent(packageName);
+            const fileName = pathlib.basename(path);
+            const encodedLabel = encodeURIComponent(label ?? fileName);
             // https://docs.gitlab.com/ee/user/packages/generic_packages/#publish-a-package-file
             uploadEndpoint = urlJoin(
               projectApiUrl,

lib/resolve-config.js

@@ -16,7 +16,6 @@ export default (
     labels,
     assignee,
     retryLimit,
-    channelAsPkgName,
   },
   {
     envCi: { service } = {},
@@ -51,7 +50,6 @@ export default (
     (service === "gitlab" && CI_PROJECT_URL && CI_PROJECT_PATH
       ? CI_PROJECT_URL.replace(new RegExp(`/${CI_PROJECT_PATH}$`), "")
       : "https://gitlab.com");
-  const DEFAULT_CHANNEL_AS_PKG_NAME = false;
   return {
     gitlabToken: GL_TOKEN || GITLAB_TOKEN,
     gitlabUrl: defaultedGitlabUrl,
@@ -73,7 +71,6 @@ export default (
     assignee,
     retryLimit: retryLimit ?? DEFAULT_RETRY_LIMIT,
     retryStatusCodes: DEFAULT_RETRY_STATUS_CODES,
-    channelAsPkgName: DEFAULT_CHANNEL_AS_PKG_NAME,
   };
 };
 

package-lock.json

@@ -29,7 +29,6 @@
     "hpagent": "^1.0.0",
     "lodash-es": "^4.17.21",
     "parse-url": "^10.0.0",
-    "semver": "^7.3.2",
     "url-join": "^4.0.0"
   },
   "devDependencies": {