@sapphire-sh/utils 3.6.0 → 3.8.0

package/bin/sapphire-bootstrap.js

@@ -20,6 +20,7 @@ const workflowsDir = join('.github', 'workflows');
 const workflowValuesPath = join('.github', 'sapphire-workflows.json');
 const withLinePattern = /^\s*with:\s*$/m;
 const pathsIgnoreLinePattern = /^\s*paths-ignore:\s*$/m;
+const reviewersOnlyBlockPattern = /^\n {6}reviewers: .*\n$/;
 const pushBlockPattern = /^on:\n(?:[ \t].*\n|\n)*? {2}push:\n((?: {4}.*\n|\n)*)/m;
 const branchesListPattern = /^ {2}push:\n {4}branches:\n(?: {6}- .*\n)*/m;
 const entryKeys = new Set(['push', 'with']);
@@ -64,7 +65,7 @@ const readWorkflowValues = () => {
 
 const codeOwnersPath = join('.github', 'CODEOWNERS');
 
-const readCodeOwnerAssignees = () => {
+const readCodeOwnerUsers = () => {
 	const filepath = join(cwd, codeOwnersPath);
 
 	if (existsSync(filepath) === false) {
@@ -125,8 +126,17 @@ const writeWorkflow = (outputName, template) => {
 	let content = template;
 
 	if (values === undefined) {
-		if (existsSync(filepath) && withLinePattern.test(readFileSync(filepath, 'utf-8'))) {
-			console.log(`warning: ${outputName} had with: values that are not in ${workflowValuesPath}`);
+		if (existsSync(filepath)) {
+			const existing = readFileSync(filepath, 'utf-8');
+			const withLine = withLinePattern.exec(existing);
+
+			if (
+				withLine !== null &&
+				(basename(outputName, '.yml') !== 'dependabot-review-request' ||
+					reviewersOnlyBlockPattern.test(existing.slice(withLine.index + withLine[0].length)) === false)
+			) {
+				console.log(`warning: ${outputName} had with: values that are not in ${workflowValuesPath}`);
+			}
 		}
 	} else {
 		const { push = {}, with: withValues } = values;
@@ -147,6 +157,18 @@ const writeWorkflow = (outputName, template) => {
 		}
 	}
 
+	if (basename(outputName, '.yml') === 'dependabot-review-request') {
+		const reviewers = readCodeOwnerUsers();
+
+		if (reviewers.length > 0) {
+			if (withLinePattern.test(content) === false) {
+				content += '    with:\n';
+			}
+
+			content += `      reviewers: ${formatYamlValue(reviewers.join(' '))}\n`;
+		}
+	}
+
 	if (
 		(values?.push === undefined || Object.hasOwn(values.push, 'paths-ignore') === false) &&
 		existsSync(filepath) &&
@@ -200,7 +222,7 @@ const writeDependabotConfig = (outputName, template) => {
 		);
 	}
 
-	const assignees = readCodeOwnerAssignees();
+	const assignees = readCodeOwnerUsers();
 
 	if (assignees.length > 0) {
 		const assigneeLines = assignees.map((assignee) => `      - ${formatYamlValue(assignee)}\n`).join('');

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapphire-sh/utils",
-	"version": "3.6.0",
+	"version": "3.8.0",
 	"description": "@sapphire-sh/utils",
 	"type": "module",
 	"sideEffects": false,

package/templates/.github/workflows/dependabot-review-request.yml

@@ -0,0 +1,12 @@
+name: dependabot-review-request
+
+on:
+  pull_request:
+    types:
+      - opened
+
+jobs:
+  request:
+    uses: sapphire-sh/github-actions/.github/workflows/dependabot-review-request-template.yml@main
+    permissions:
+      pull-requests: write

package/templates/.github/workflows/docker-publish.yml

@@ -13,6 +13,9 @@ concurrency:
 jobs:
   call-shared-ci:
     uses: sapphire-sh/github-actions/.github/workflows/docker-publish-template.yml@main
+    permissions:
+      actions: read
+      contents: read
     secrets: inherit
     with:
       image_name: ${{ github.event.repository.name }}

package/templates/.github/workflows/userscript-publish.yml

@@ -14,5 +14,6 @@ jobs:
   call-shared-publish:
     uses: sapphire-sh/github-actions/.github/workflows/userscript-publish-template.yml@main
     permissions:
+      actions: read
       contents: write
     secrets: inherit