Merge branch 'releases/v4' of https://github.com/JamesIves/github-pages-deploy-action into releases/v4

Author: JamesIves

lib/constants.js

@@ -1,137 +1,101 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefaultExcludedFiles = exports.SupportedOperatingSystems = exports.OperatingSystems = exports.Status = exports.action = exports.TestFlag = void 0;
-const core_1 = require("@actions/core");
-const github = __importStar(require("@actions/github"));
-const util_1 = require("./util");
+import { getInput } from '@actions/core';
+import * as github from '@actions/github';
+import { isNullOrUndefined, stripProtocolFromUrl } from './util.js';
 const { pusher, repository } = github.context.payload;
 /*
  * Flags to signal different scenarios to test cases
  */
-var TestFlag;
+export var TestFlag;
 (function (TestFlag) {
     TestFlag[TestFlag["NONE"] = 0] = "NONE";
     TestFlag[TestFlag["HAS_CHANGED_FILES"] = 2] = "HAS_CHANGED_FILES";
     TestFlag[TestFlag["HAS_REMOTE_BRANCH"] = 4] = "HAS_REMOTE_BRANCH";
     TestFlag[TestFlag["UNABLE_TO_REMOVE_ORIGIN"] = 8] = "UNABLE_TO_REMOVE_ORIGIN";
     TestFlag[TestFlag["UNABLE_TO_UNSET_GIT_CONFIG"] = 16] = "UNABLE_TO_UNSET_GIT_CONFIG";
     TestFlag[TestFlag["HAS_REJECTED_COMMIT"] = 32] = "HAS_REJECTED_COMMIT"; // Assume commit rejection.
-})(TestFlag || (exports.TestFlag = TestFlag = {}));
+})(TestFlag || (TestFlag = {}));
 /* Required action data that gets initialized when running within the GitHub Actions environment. */
-exports.action = {
-    folder: (0, core_1.getInput)('folder'),
-    branch: (0, core_1.getInput)('branch'),
-    commitMessage: (0, core_1.getInput)('commit-message'),
-    dryRun: !(0, util_1.isNullOrUndefined)((0, core_1.getInput)('dry-run'))
-        ? (0, core_1.getInput)('dry-run').toLowerCase() === 'true'
+export const action = {
+    folder: getInput('folder'),
+    branch: getInput('branch'),
+    commitMessage: getInput('commit-message'),
+    dryRun: !isNullOrUndefined(getInput('dry-run'))
+        ? getInput('dry-run').toLowerCase() === 'true'
         : false,
-    force: !(0, util_1.isNullOrUndefined)((0, core_1.getInput)('force'))
-        ? (0, core_1.getInput)('force').toLowerCase() === 'true'
+    force: !isNullOrUndefined(getInput('force'))
+        ? getInput('force').toLowerCase() === 'true'
         : true,
-    attemptLimit: !(0, util_1.isNullOrUndefined)((0, core_1.getInput)('attempt-limit'))
-        ? parseInt((0, core_1.getInput)('attempt-limit'), 10)
+    attemptLimit: !isNullOrUndefined(getInput('attempt-limit'))
+        ? parseInt(getInput('attempt-limit'), 10)
         : 3,
-    clean: !(0, util_1.isNullOrUndefined)((0, core_1.getInput)('clean'))
-        ? (0, core_1.getInput)('clean').toLowerCase() === 'true'
+    clean: !isNullOrUndefined(getInput('clean'))
+        ? getInput('clean').toLowerCase() === 'true'
         : false,
-    cleanExclude: ((0, core_1.getInput)('clean-exclude') || '')
+    cleanExclude: (getInput('clean-exclude') || '')
         .split('\n')
         .filter(l => l !== ''),
     hostname: process.env.GITHUB_SERVER_URL
-        ? (0, util_1.stripProtocolFromUrl)(process.env.GITHUB_SERVER_URL)
+        ? stripProtocolFromUrl(process.env.GITHUB_SERVER_URL)
         : 'github.com',
     isTest: TestFlag.NONE,
-    email: !(0, util_1.isNullOrUndefined)((0, core_1.getInput)('git-config-email'))
-        ? (0, core_1.getInput)('git-config-email')
+    email: !isNullOrUndefined(getInput('git-config-email'))
+        ? getInput('git-config-email')
         : pusher && pusher.email
             ? pusher.email
             : `${process.env.GITHUB_ACTOR || 'github-pages-deploy-action'}@users.noreply.${process.env.GITHUB_SERVER_URL
-                ? (0, util_1.stripProtocolFromUrl)(process.env.GITHUB_SERVER_URL)
+                ? stripProtocolFromUrl(process.env.GITHUB_SERVER_URL)
                 : 'github.com'}`,
-    name: !(0, util_1.isNullOrUndefined)((0, core_1.getInput)('git-config-name'))
-        ? (0, core_1.getInput)('git-config-name')
+    name: !isNullOrUndefined(getInput('git-config-name'))
+        ? getInput('git-config-name')
         : pusher && pusher.name
             ? pusher.name
             : process.env.GITHUB_ACTOR
                 ? process.env.GITHUB_ACTOR
                 : 'GitHub Pages Deploy Action',
-    repositoryName: !(0, util_1.isNullOrUndefined)((0, core_1.getInput)('repository-name'))
-        ? (0, core_1.getInput)('repository-name')
+    repositoryName: !isNullOrUndefined(getInput('repository-name'))
+        ? getInput('repository-name')
         : repository && repository.full_name
             ? repository.full_name
             : process.env.GITHUB_REPOSITORY,
-    token: (0, core_1.getInput)('token'),
-    singleCommit: !(0, util_1.isNullOrUndefined)((0, core_1.getInput)('single-commit'))
-        ? (0, core_1.getInput)('single-commit').toLowerCase() === 'true'
+    token: getInput('token'),
+    singleCommit: !isNullOrUndefined(getInput('single-commit'))
+        ? getInput('single-commit').toLowerCase() === 'true'
         : false,
-    silent: !(0, util_1.isNullOrUndefined)((0, core_1.getInput)('silent'))
-        ? (0, core_1.getInput)('silent').toLowerCase() === 'true'
+    silent: !isNullOrUndefined(getInput('silent'))
+        ? getInput('silent').toLowerCase() === 'true'
         : false,
-    sshKey: (0, util_1.isNullOrUndefined)((0, core_1.getInput)('ssh-key'))
+    sshKey: isNullOrUndefined(getInput('ssh-key'))
         ? false
-        : !(0, util_1.isNullOrUndefined)((0, core_1.getInput)('ssh-key')) &&
-            (0, core_1.getInput)('ssh-key').toLowerCase() === 'true'
+        : !isNullOrUndefined(getInput('ssh-key')) &&
+            getInput('ssh-key').toLowerCase() === 'true'
             ? true
-            : (0, core_1.getInput)('ssh-key'),
-    targetFolder: (0, core_1.getInput)('target-folder'),
+            : getInput('ssh-key'),
+    targetFolder: getInput('target-folder'),
     workspace: process.env.GITHUB_WORKSPACE || '',
-    tag: (0, core_1.getInput)('tag')
+    tag: getInput('tag')
 };
 /** Status codes for the action. */
-var Status;
+export var Status;
 (function (Status) {
     Status["SUCCESS"] = "success";
     Status["FAILED"] = "failed";
     Status["SKIPPED"] = "skipped";
     Status["RUNNING"] = "running";
-})(Status || (exports.Status = Status = {}));
+})(Status || (Status = {}));
 /* Platform codes. */
-var OperatingSystems;
+export var OperatingSystems;
 (function (OperatingSystems) {
     OperatingSystems["LINUX"] = "Linux";
     OperatingSystems["WINDOWS"] = "Windows";
     OperatingSystems["MACOS"] = "macOS";
-})(OperatingSystems || (exports.OperatingSystems = OperatingSystems = {}));
-exports.SupportedOperatingSystems = [OperatingSystems.LINUX];
+})(OperatingSystems || (OperatingSystems = {}));
+export const SupportedOperatingSystems = [OperatingSystems.LINUX];
 /* Excluded files. */
-var DefaultExcludedFiles;
+export var DefaultExcludedFiles;
 (function (DefaultExcludedFiles) {
     DefaultExcludedFiles["CNAME"] = "CNAME";
     DefaultExcludedFiles["NOJEKYLL"] = ".nojekyll";
     DefaultExcludedFiles["SSH"] = ".ssh";
     DefaultExcludedFiles["GIT"] = ".git";
     DefaultExcludedFiles["GITHUB"] = ".github";
-})(DefaultExcludedFiles || (exports.DefaultExcludedFiles = DefaultExcludedFiles = {}));
+})(DefaultExcludedFiles || (DefaultExcludedFiles = {}));

lib/execute.js

@@ -1,22 +1,5 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.execute = execute;
-exports.stdout = stdout;
-exports.stderr = stderr;
-const exec_1 = require("@actions/exec");
-const buffer_1 = __importDefault(require("buffer"));
+import { exec } from '@actions/exec';
+import buffer from 'buffer';
 const output = { stdout: '', stderr: '' };
 /** Wrapper around the GitHub toolkit exec command which returns the output.
  * Also allows you to easily toggle the current working directory.
@@ -27,37 +10,35 @@ const output = { stdout: '', stderr: '' };
  * @param {boolean} ignoreReturnCode - Determines whether to throw an error
  * on a non-zero exit status or to leave implementation up to the caller.
  */
-function execute(cmd_1, cwd_1, silent_1) {
-    return __awaiter(this, arguments, void 0, function* (cmd, cwd, silent, ignoreReturnCode = false) {
-        output.stdout = '';
-        output.stderr = '';
-        yield (0, exec_1.exec)(cmd, [], {
-            // Silences the input unless the INPUT_DEBUG flag is set.
-            silent,
-            cwd,
-            listeners: { stdout, stderr },
-            ignoreReturnCode
-        });
-        return Promise.resolve(output);
+export async function execute(cmd, cwd, silent, ignoreReturnCode = false) {
+    output.stdout = '';
+    output.stderr = '';
+    await exec(cmd, [], {
+        // Silences the input unless the INPUT_DEBUG flag is set.
+        silent,
+        cwd,
+        listeners: { stdout, stderr },
+        ignoreReturnCode
     });
+    return Promise.resolve(output);
 }
 /**
  * Writes the output of a command to the stdout buffer.
  */
-function stdout(data) {
+export function stdout(data) {
     const dataString = data.toString().trim();
     if (output.stdout.length + dataString.length <
-        buffer_1.default.constants.MAX_STRING_LENGTH) {
+        buffer.constants.MAX_STRING_LENGTH) {
         output.stdout += dataString;
     }
 }
 /**
  * Writes the output of a command to the stderr buffer.
  */
-function stderr(data) {
+export function stderr(data) {
     const dataString = data.toString().trim();
     if (output.stderr.length + dataString.length <
-        buffer_1.default.constants.MAX_STRING_LENGTH) {
+        buffer.constants.MAX_STRING_LENGTH) {
         output.stderr += dataString;
     }
 }

lib/git.d.ts

@@ -1,4 +1,4 @@
-import { ActionInterface, Status } from './constants';
+import { ActionInterface, Status } from './constants.js';
 /**
  * Initializes git in the workspace.
  */