Skip to content

Commit 63a9786

Browse files
committedDec 30, 2024·
fix: fix github-corners config priority. #90
1 parent fd58104 commit 63a9786

File tree

2 files changed

+5
-19
lines changed

2 files changed

+5
-19
lines changed
 

Diff for: ‎packages/action/dist/action.js

+3-9
Original file line numberDiff line numberDiff line change
@@ -167599,6 +167599,7 @@ function utils_formatConfig(opts) {
167599167599
var projectPkg = external_path_.resolve(process.cwd(), opts.config || 'package.json');
167600167600
var pgkData = {};
167601167601
if (fs_extra_lib.existsSync(projectPkg)) {
167602+
var _options$document$tit, _ref, _opts$githubCorners;
167602167603
pgkData = fs_extra_lib.readJSONSync(projectPkg);
167603167604
if (pgkData['markdown-to-html']) {
167604167605
var mth = pgkData['markdown-to-html'];
@@ -167613,19 +167614,12 @@ function utils_formatConfig(opts) {
167613167614
link: link
167614167615
}, mth.document)
167615167616
});
167616-
if (mth['github-corners']) {
167617-
options['github-corners'] = mth['github-corners'];
167618-
}
167619167617
} else {
167620167618
options.reurls = _objectSpread2(_objectSpread2({}, options.reurls), pgkData.reurls);
167621167619
options.document = _objectSpread2(_objectSpread2({}, options.document), pgkData.document);
167622167620
}
167623-
if (pgkData.name && !options.document.title) {
167624-
options.document.title = pgkData.name;
167625-
}
167626-
if (pgkData.repository && !opts['github-corners']) {
167627-
options['github-corners'] = typeof pgkData.repository === 'string' ? pgkData.repository : pgkData.repository.url;
167628-
}
167621+
options.document.title = (_options$document$tit = options.document.title) !== null && _options$document$tit !== void 0 ? _options$document$tit : pgkData.name;
167622+
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;
167629167623
}
167630167624
if (opts['github-corners'] && typeof opts['github-corners'] === 'string') {
167631167625
options['github-corners'] = opts['github-corners'].replace(/^git[+]/, '');

Diff for: ‎packages/cli/src/utils.ts

+2-10
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,16 @@ export function formatConfig(opts: Options) {
1313
let pgkData: any = {};
1414
if (fs.existsSync(projectPkg)) {
1515
pgkData = fs.readJSONSync(projectPkg);
16-
1716
if (pgkData['markdown-to-html']) {
1817
const mth = pgkData['markdown-to-html'] as MDToHTMLOptions;
1918
const { title, meta, link } = options.document;
2019
options = { ...options, ...mth, document: { ...options.document, title, meta, link, ...mth.document } }
21-
if (mth['github-corners']) {
22-
options['github-corners'] = mth['github-corners'];
23-
}
2420
} else {
2521
options.reurls = { ...options.reurls, ...pgkData.reurls }
2622
options.document = { ...options.document, ...pgkData.document }
2723
}
28-
if (pgkData.name && !options.document.title) {
29-
options.document.title = pgkData.name;
30-
}
31-
if (pgkData.repository && !opts['github-corners']) {
32-
options['github-corners'] = typeof pgkData.repository === 'string' ? pgkData.repository : pgkData.repository.url;
33-
}
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);
3426
}
3527
if (opts['github-corners'] && typeof opts['github-corners'] === 'string') {
3628
options['github-corners'] = opts['github-corners'].replace(/^git[+]/, '')

0 commit comments

Comments
 (0)
Please sign in to comment.