fix: fix github-corners config priority. #90

jaywcjlove · Dec 30, 2024 · 63a9786 · 63a9786
1 parent fd58104
commit 63a9786
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 19 deletions.
diff --git a/packages/action/dist/action.js b/packages/action/dist/action.js
@@ -167599,6 +167599,7 @@ function utils_formatConfig(opts) {
   var projectPkg = external_path_.resolve(process.cwd(), opts.config || 'package.json');
   var pgkData = {};
   if (fs_extra_lib.existsSync(projectPkg)) {
+    var _options$document$tit, _ref, _opts$githubCorners;
     pgkData = fs_extra_lib.readJSONSync(projectPkg);
     if (pgkData['markdown-to-html']) {
       var mth = pgkData['markdown-to-html'];
@@ -167613,19 +167614,12 @@ function utils_formatConfig(opts) {
           link: link
         }, mth.document)
       });
-      if (mth['github-corners']) {
-        options['github-corners'] = mth['github-corners'];
-      }
     } else {
       options.reurls = _objectSpread2(_objectSpread2({}, options.reurls), pgkData.reurls);
       options.document = _objectSpread2(_objectSpread2({}, options.document), pgkData.document);
     }
-    if (pgkData.name && !options.document.title) {
-      options.document.title = pgkData.name;
-    }
-    if (pgkData.repository && !opts['github-corners']) {
-      options['github-corners'] = typeof pgkData.repository === 'string' ? pgkData.repository : pgkData.repository.url;
-    }
+    options.document.title = (_options$document$tit = options.document.title) !== null && _options$document$tit !== void 0 ? _options$document$tit : pgkData.name;
+    options['github-corners'] = (_ref = (_opts$githubCorners = opts['github-corners']) !== null && _opts$githubCorners !== void 0 ? _opts$githubCorners : options['github-corners']) !== null && _ref !== void 0 ? _ref : typeof pgkData.repository === 'string' ? pgkData.repository : pgkData.repository.url;
   }
   if (opts['github-corners'] && typeof opts['github-corners'] === 'string') {
     options['github-corners'] = opts['github-corners'].replace(/^git[+]/, '');

diff --git a/packages/cli/src/utils.ts b/packages/cli/src/utils.ts
@@ -13,24 +13,16 @@ export function formatConfig(opts: Options) {
   let pgkData: any = {};
   if (fs.existsSync(projectPkg)) {
     pgkData = fs.readJSONSync(projectPkg);
-
     if (pgkData['markdown-to-html']) {
       const mth = pgkData['markdown-to-html'] as MDToHTMLOptions;
       const { title, meta, link } = options.document;
       options = { ...options, ...mth, document: { ...options.document, title, meta, link, ...mth.document } }
-      if (mth['github-corners']) {
-        options['github-corners'] = mth['github-corners'];
-      }
     } else {
       options.reurls = { ...options.reurls, ...pgkData.reurls }
       options.document = { ...options.document, ...pgkData.document }
     }
-    if (pgkData.name && !options.document.title) {
-      options.document.title = pgkData.name;
-    }
-    if (pgkData.repository && !opts['github-corners']) {
-      options['github-corners'] = typeof pgkData.repository === 'string' ? pgkData.repository : pgkData.repository.url;
-    }
+    options.document.title = options.document.title ?? pgkData.name;
+    options['github-corners'] = opts['github-corners'] ?? options['github-corners'] ?? (typeof pgkData.repository === 'string' ? pgkData.repository : pgkData.repository.url);
   }
   if (opts['github-corners'] && typeof opts['github-corners'] === 'string') {
     options['github-corners'] = opts['github-corners'].replace(/^git[+]/, '')