fix: fix github-corners option issue. #98

jaywcjlove · jaywcjlove · commit 2ecf9714d5a2 · 2025-01-01T10:00:40.000+08:00
diff --git a/packages/action/dist/action.js b/packages/action/dist/action.js
@@ -167569,7 +167569,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;
+    var _options$document$tit, _ref, _opts$githubCorners, _pgkData$repository;
     pgkData = fs_extra_lib.readJSONSync(projectPkg);
     if (pgkData['markdown-to-html']) {
       var mth = pgkData['markdown-to-html'];
@@ -167589,7 +167589,7 @@ function utils_formatConfig(opts) {
       options.document = _objectSpread2(_objectSpread2({}, options.document), pgkData.document);
     }
     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;
+    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 : typeof pgkData.repository === 'object' && (_pgkData$repository = pgkData.repository) !== null && _pgkData$repository !== void 0 && _pgkData$repository.url ? pgkData.repository.url : undefined;
   }
   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
@@ -22,7 +22,9 @@ export function formatConfig(opts: Options) {
       options.document = { ...options.document, ...pgkData.document }
     }
     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);
+    options['github-corners'] = opts['github-corners'] ?? options['github-corners'] ?? (
+      typeof pgkData.repository === 'string' ? pgkData.repository : (typeof pgkData.repository === 'object' && pgkData.repository?.url ? pgkData.repository.url : undefined)
+    );
   }
   if (opts['github-corners'] && typeof opts['github-corners'] === 'string') {
     options['github-corners'] = opts['github-corners'].replace(/^git[+]/, '')

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,9 @@ export function formatConfig(opts: Options) {`
`22`	`22`	`options.document = { ...options.document, ...pgkData.document }`
`23`	`23`	`}`
`24`	`24`	`options.document.title = options.document.title ?? pgkData.name;`
`25`		`- options['github-corners'] = opts['github-corners'] ?? options['github-corners'] ?? (typeof pgkData.repository === 'string' ? pgkData.repository : pgkData.repository.url);`
	`25`	`+ options['github-corners'] = opts['github-corners'] ?? options['github-corners'] ?? (`
	`26`	`+ typeof pgkData.repository === 'string' ? pgkData.repository : (typeof pgkData.repository === 'object' && pgkData.repository?.url ? pgkData.repository.url : undefined)`
	`27`	`+ );`
`26`	`28`	`}`
`27`	`29`	`if (opts['github-corners'] && typeof opts['github-corners'] === 'string') {`
`28`	`30`	`options['github-corners'] = opts['github-corners'].replace(/^git[+]/, '')`