node-package-release-action 2.1.21 → 2.3.0-0

package/dist/checkDiff.d.ts

@@ -1 +1 @@
-export declare function checkDiff(tag: string): Promise<boolean>;
+export declare function checkDiff(tag: string, directory: string, diffTargets: string): Promise<boolean>;

package/dist/checkDiff.js

@@ -5,9 +5,7 @@ const node_path_1 = require("node:path");
 const core_1 = require("@actions/core");
 const exec_1 = require("@actions/exec");
 const glob_1 = require("glob");
-async function checkDiff(tag) {
-    const directory = (0, core_1.getInput)('directory');
-    const diffTargets = (0, core_1.getInput)('diff-targets');
+async function checkDiff(tag, directory, diffTargets) {
     const diffOutput = await (0, exec_1.getExecOutput)('git', [
         'diff',
         tag,

package/dist/configGit.d.ts

@@ -1,5 +1 @@
-import type { Octokit } from '@octokit/core';
-import type { Api } from '@octokit/plugin-rest-endpoint-methods/dist-types/types';
-export declare const GITHUB_ACTION_USER_NAME = "GitHub Action";
-export declare const GITHUB_ACTION_USER_EMAIL = "41898282+github-actions[bot]@users.noreply.github.com";
-export declare function configGit(octokit: Octokit & Api): Promise<void>;
+export declare function configGit(): Promise<void>;

package/dist/configGit.js

@@ -1,24 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GITHUB_ACTION_USER_EMAIL = exports.GITHUB_ACTION_USER_NAME = void 0;
 exports.configGit = configGit;
-const core_1 = require("@actions/core");
 const exec_1 = require("@actions/exec");
-exports.GITHUB_ACTION_USER_NAME = 'GitHub Action';
-exports.GITHUB_ACTION_USER_EMAIL = '41898282+github-actions[bot]@users.noreply.github.com';
-async function configGit(octokit) {
-    await (0, exec_1.getExecOutput)('git', [
-        'config',
-        '--global',
-        'user.name',
-        exports.GITHUB_ACTION_USER_NAME,
-    ]);
-    await (0, exec_1.getExecOutput)('git', [
-        'config',
-        '--global',
-        'user.email',
-        exports.GITHUB_ACTION_USER_EMAIL,
-    ]);
+async function configGit() {
     await (0, exec_1.getExecOutput)('git', ['config', '--global', 'push.default', 'simple']);
     await (0, exec_1.getExecOutput)('git', [
         'config',
@@ -26,28 +10,4 @@ async function configGit(octokit) {
         'push.autoSetupRemote',
         'true',
     ]);
-    const githubToken = (0, core_1.getInput)('github-token');
-    (0, core_1.exportVariable)('GH_TOKEN', githubToken);
-    await (0, exec_1.getExecOutput)('gh', ['auth', 'status']);
-    await (0, exec_1.getExecOutput)('gh', ['auth', 'setup-git']);
-    const { viewer: { login }, } = await octokit.graphql(`
-      query {
-        viewer {
-          login
-        }
-      }
-    `, {});
-    const remoteOutput = await (0, exec_1.getExecOutput)('git', [
-        'remote',
-        'get-url',
-        'origin',
-    ]);
-    const remoteUrl = remoteOutput.stdout.trim();
-    const remoteUrlWithToken = remoteUrl.replace(/https:\/\//, `https://${login}:${githubToken}@`);
-    await (0, exec_1.getExecOutput)('git', [
-        'remote',
-        'set-url',
-        'origin',
-        remoteUrlWithToken,
-    ]);
 }

package/dist/createRelease.d.ts

@@ -1,4 +1,4 @@
 import type { Octokit } from '@octokit/core';
-import type { components } from '@octokit/openapi-types/types.js';
 import type { Api } from '@octokit/plugin-rest-endpoint-methods/dist-types/types';
-export declare function createRelease(owner: string, repo: string, version: string, octokit: Octokit & Api): Promise<components['schemas']['release'] | undefined>;
+import type { Release } from '@octokit/webhooks-types/schema';
+export declare function createRelease(owner: string, repo: string, version: string, prerelease: boolean, dryRun: boolean, octokit: Octokit & Api): Promise<Release | undefined>;

package/dist/createRelease.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRelease = createRelease;
 const core_1 = require("@actions/core");
-async function createRelease(owner, repo, version, octokit) {
-    const dryRun = (0, core_1.getBooleanInput)('dry-run');
+async function createRelease(owner, repo, version, prerelease, dryRun, octokit) {
     if (dryRun) {
         (0, core_1.notice)('Release creation is skipped in dry run');
         const response = await octokit.rest.repos.generateReleaseNotes({
@@ -22,7 +21,7 @@ async function createRelease(owner, repo, version, octokit) {
         tag_name: `v${version}`,
         name: `v${version}`,
         generate_release_notes: true,
-        prerelease: (0, core_1.getBooleanInput)('prerelease'),
+        prerelease,
     });
     (0, core_1.notice)(`GitHub Release created: ${releasesResponse.data.html_url}`);
     return releasesResponse.data;

package/dist/getPackageVersion.d.ts

@@ -1,2 +1,2 @@
 export declare const DEFAULT_WORKING_DIRECTORY: string;
-export declare function getPackageVersion(): string | null;
+export declare function getPackageVersion(directory: string): string | null;

package/dist/getPackageVersion.js

@@ -7,8 +7,7 @@ const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const core_1 = require("@actions/core");
 exports.DEFAULT_WORKING_DIRECTORY = process.cwd();
-function getPackageVersion() {
-    const directory = (0, core_1.getInput)('directory');
+function getPackageVersion(directory) {
     const absoluteDirectory = (0, node_path_1.resolve)(exports.DEFAULT_WORKING_DIRECTORY, directory);
     const packageJsonPath = (0, node_path_1.resolve)(absoluteDirectory, 'package.json');
     if (!(0, node_fs_1.existsSync)(packageJsonPath)) {

package/dist/index.d.ts

@@ -1,2 +1,12 @@
-import type { components } from '@octokit/openapi-types/types.js';
-export declare function nodePackageRelease(githubToken: string): Promise<components['schemas']['release'] | undefined>;
+import type { Release } from '@octokit/webhooks-types/schema';
+import { type ReleaseType } from 'semver';
+export declare function nodePackageRelease({ githubToken, directory, releaseType, prerelease, updateShorthandRelease, skipIfNoDiff, diffTargets, dryRun, }: {
+    githubToken: string;
+    directory: string;
+    releaseType: ReleaseType;
+    prerelease: boolean;
+    updateShorthandRelease: boolean;
+    skipIfNoDiff: boolean;
+    diffTargets: string;
+    dryRun: boolean;
+}): Promise<Release | undefined>;

package/dist/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.nodePackageRelease = nodePackageRelease;
 const core_1 = require("@actions/core");
 const github_1 = require("@actions/github");
+const config_git_with_token_action_1 = require("config-git-with-token-action");
 const semver_1 = require("semver");
 const ReleaseType_1 = require("./ReleaseType");
 const checkDiff_1 = require("./checkDiff");
@@ -18,9 +19,10 @@ const pushBranch_1 = require("./pushBranch");
 const setVersion_1 = require("./setVersion");
 const updateTags_1 = require("./updateTags");
 const DEFAULT_VERSION = '0.1.0';
-async function nodePackageRelease(githubToken) {
+async function nodePackageRelease({ githubToken, directory, releaseType, prerelease, updateShorthandRelease, skipIfNoDiff, diffTargets, dryRun, }) {
     const octokit = (0, getOctokit_1.getOctokit)(githubToken);
-    await (0, configGit_1.configGit)(octokit);
+    await (0, config_git_with_token_action_1.configGitWithToken)({ githubToken });
+    await (0, configGit_1.configGit)();
     (0, core_1.startGroup)('Fetch every git tag');
     await (0, fetchEverything_1.fetchEverything)();
     (0, core_1.endGroup)();
@@ -29,7 +31,7 @@ async function nodePackageRelease(githubToken) {
     (0, core_1.notice)(`Last git tag: ${lastGitTag}`);
     (0, core_1.endGroup)();
     (0, core_1.startGroup)('Get package.json version');
-    const packageVersion = (0, getPackageVersion_1.getPackageVersion)();
+    const packageVersion = (0, getPackageVersion_1.getPackageVersion)(directory);
     (0, core_1.notice)(`package.json version: ${packageVersion}`);
     (0, core_1.endGroup)();
     (0, core_1.startGroup)('Get latest release tag');
@@ -41,22 +43,17 @@ async function nodePackageRelease(githubToken) {
     const sortedVersions = (0, semver_1.rsort)(versions);
     const highestVersion = sortedVersions.length === 0 ? DEFAULT_VERSION : sortedVersions[0];
     (0, core_1.notice)(`Highest version: ${highestVersion}`);
-    const releaseType = ReleaseType_1.RELEASE_TYPES.find((releaseType) => (0, core_1.getInput)('release-type').toLowerCase() === releaseType);
-    if (releaseType === undefined) {
-        (0, core_1.setFailed)(`Invalid release-type input: ${(0, core_1.getInput)('release-type')}`);
-        return;
-    }
     const releaseVersion = (0, semver_1.inc)(highestVersion, releaseType);
     if (releaseVersion === null) {
         (0, core_1.setFailed)('Failed to compute release version');
         return;
     }
     (0, core_1.notice)(`Release version: ${releaseVersion}`);
-    if ((0, core_1.getBooleanInput)('skip-if-no-diff')) {
+    if (skipIfNoDiff) {
         const lastSameReleaseTypeVersion = await (0, findLastSameReleaseTypeVersion_1.findLastSameReleaseTypeVersion)(releaseVersion, releaseType);
         (0, core_1.notice)(`Last same release type version: ${lastSameReleaseTypeVersion}`);
         if (lastSameReleaseTypeVersion !== null) {
-            const diff = await (0, checkDiff_1.checkDiff)(lastSameReleaseTypeVersion);
+            const diff = await (0, checkDiff_1.checkDiff)(lastSameReleaseTypeVersion, directory, diffTargets);
             if (!diff) {
                 (0, core_1.notice)(`Skip due to lack of diff between HEAD..${lastSameReleaseTypeVersion}`);
                 (0, core_1.setOutput)('skipped', true);
@@ -66,16 +63,29 @@ async function nodePackageRelease(githubToken) {
         (0, core_1.setOutput)('skipped', false);
     }
     (0, core_1.setOutput)('tag', `v${releaseVersion}`);
-    await (0, setVersion_1.setVersion)(releaseVersion);
-    await (0, pushBranch_1.pushBranch)();
-    const release = await (0, createRelease_1.createRelease)(owner, repo, releaseVersion, octokit);
-    if ((0, core_1.getBooleanInput)('update-shorthand-release')) {
-        await (0, updateTags_1.updateTags)(releaseVersion);
+    await (0, setVersion_1.setVersion)(releaseVersion, directory);
+    await (0, pushBranch_1.pushBranch)(dryRun);
+    const release = await (0, createRelease_1.createRelease)(owner, repo, releaseVersion, prerelease, dryRun, octokit);
+    if (updateShorthandRelease) {
+        await (0, updateTags_1.updateTags)(releaseVersion, dryRun);
     }
     return release;
 }
 async function run() {
-    const githubToken = (0, core_1.getInput)('github-token');
-    await nodePackageRelease(githubToken);
+    const releaseType = ReleaseType_1.RELEASE_TYPES.find((releaseType) => (0, core_1.getInput)('release-type').toLowerCase() === releaseType);
+    if (releaseType === undefined) {
+        (0, core_1.setFailed)(`Invalid release-type input: ${(0, core_1.getInput)('release-type')}`);
+        return;
+    }
+    await nodePackageRelease({
+        githubToken: (0, core_1.getInput)('github-token'),
+        directory: (0, core_1.getInput)('directory'),
+        releaseType,
+        prerelease: (0, core_1.getBooleanInput)('prerelease'),
+        updateShorthandRelease: (0, core_1.getBooleanInput)('update-shorthand-release'),
+        skipIfNoDiff: (0, core_1.getBooleanInput)('skip-if-no-diff'),
+        diffTargets: (0, core_1.getInput)('diff-targets'),
+        dryRun: (0, core_1.getBooleanInput)('dry-run'),
+    });
 }
 run().catch((error) => (0, core_1.setFailed)(error));

package/dist/pushBranch.d.ts

@@ -1 +1 @@
-export declare function pushBranch(): Promise<void>;
+export declare function pushBranch(dryRun: boolean): Promise<void>;

package/dist/pushBranch.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.pushBranch = pushBranch;
 const core_1 = require("@actions/core");
 const exec_1 = require("@actions/exec");
-async function pushBranch() {
-    const dryRun = (0, core_1.getBooleanInput)('dry-run');
+async function pushBranch(dryRun) {
     const gitBranchOutput = await (0, exec_1.getExecOutput)('git', [
         'branch',
         '--show-current',

package/dist/setVersion.d.ts

@@ -1,2 +1,2 @@
 export declare const DEFAULT_WORKING_DIRECTORY: string;
-export declare function setVersion(version: string): Promise<void>;
+export declare function setVersion(version: string, directory: string): Promise<void>;

package/dist/setVersion.js

@@ -7,8 +7,7 @@ const node_path_1 = require("node:path");
 const core_1 = require("@actions/core");
 const exec_1 = require("@actions/exec");
 exports.DEFAULT_WORKING_DIRECTORY = process.cwd();
-async function setVersion(version) {
-    const directory = (0, core_1.getInput)('directory');
+async function setVersion(version, directory) {
     const absoluteDirectory = (0, node_path_1.resolve)(exports.DEFAULT_WORKING_DIRECTORY, directory);
     const packageJsonPath = (0, node_path_1.resolve)(absoluteDirectory, 'package.json');
     if ((0, node_fs_1.existsSync)(packageJsonPath)) {

package/dist/updateTags.d.ts

@@ -1 +1 @@
-export declare function updateTags(version: string): Promise<void>;
+export declare function updateTags(version: string, dryRun: boolean): Promise<void>;

package/dist/updateTags.js

@@ -4,9 +4,8 @@ exports.updateTags = updateTags;
 const core_1 = require("@actions/core");
 const exec_1 = require("@actions/exec");
 const semver_1 = require("semver");
-async function updateTags(version) {
+async function updateTags(version, dryRun) {
     const semver = (0, semver_1.parse)(version);
-    const dryRun = (0, core_1.getBooleanInput)('dry-run');
     if (semver === null) {
         throw new Error(`Failed to parse the version as semver: ${version}`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-package-release-action",
-  "version": "2.1.21",
+  "version": "2.3.0-0",
   "description": "A template to create custom GitHub Action with TypeScript/JavaScript.",
   "main": "dist/index.js",
   "types": "dist/index.d.js",
@@ -30,7 +30,6 @@
     "@eslint/eslintrc": "^3.0.2",
     "@eslint/js": "^9.1.1",
     "@octokit/graphql-schema": "^15.1.2",
-    "@octokit/webhooks-definitions": "^3.67.3",
     "@serverless-guru/prettier-plugin-import-order": "^0.4.1",
     "@types/glob": "^8.0.0",
     "@types/node": "^22.0.0",
@@ -55,6 +54,8 @@
     "@actions/github": "^6.0.0",
     "@octokit/plugin-retry": "^7.1.1",
     "@octokit/plugin-throttling": "^9.3.0",
+    "@octokit/webhooks-types": "^7.6.1",
+    "config-git-with-token-action": "^2.0.0",
     "glob": "^11.0.0",
     "semver": "^7.3.8"
   },