Skip to content

Commit

Permalink
chore: add missing .gitignore file
Browse files Browse the repository at this point in the history
  • Loading branch information
emosheeep committed Jan 24, 2024
1 parent 138d48c commit daf92ed
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 7 deletions.
5 changes: 5 additions & 0 deletions .changeset/thin-beers-sin.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"lockfile-conflicts": patch
---

chore: add missing .gitignore file
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"files": [
"dist",
"config",
"config/*",
"CHANGELOG.md"
],
"scripts": {
Expand Down
16 changes: 10 additions & 6 deletions src/cleanup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,19 @@ export default async (

logger.info(`Note there're conflicts on lockfile before:`);
conflictFiles.forEach((v) => logger.info(`→ ${v}`));
logger.info(chalk.bold(`And we've accepted theirs version.`));

const { runAfter, commitMessage = defaultCommitMessage } = getConfigJson();

if (runAfter) {
logger.info(
`And you've configured ${chalk.underline('runAfter')} script, please wait to update.`,
`Now we need to execute configured ${chalk.underline('runAfter')} script to update it, please wait.`,
);
logger.info(
chalk.bold(
"This action won't affect commit result, if it runs unexpectedly, just exit with",
"This action won't affect commit result, just exit with",
chalk.underline('Ctrl + C'),
'if it runs unexpectedly.',
),
);

Expand All @@ -60,7 +62,7 @@ export default async (
return logger.error(
chalk.bold(
`Failed to run ${chalk.underline(e.cmd)} for some reasons, ` +
'please make sure the lockfile is up-to-date.',
'please manually make sure the lockfile is up-to-date.',
),
);
}
Expand All @@ -80,9 +82,11 @@ export default async (
logger.info('Nothing to commit.');
}
} else {
logger.warn(
`But no ${chalk.underline('runAfter')} script was configured, ` +
chalk.bold('please make sure the lockfile is up-to-date.'),
logger.info(
chalk.bold(
`But you've not configured ${chalk.underline('runAfter')} script, ` +
'please manually make sure the lockfile is up-to-date.',
),
);
}
};

0 comments on commit daf92ed

Please sign in to comment.