Merge pull request #414 from technote-space/release/next-v5.3.5

technote-space · web-flow · commit 31aac08e86b6 · 2022-06-01T19:42:09.000+09:00
release: v5.3.6
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@technote-space/github-action-helper",
-  "version": "5.3.5",
+  "version": "5.3.6",
   "description": "Helper for GitHub Action.",
   "keywords": [
     "github",
@@ -31,7 +31,7 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsc && rm -f dist/*.js && rollup -c",
+    "build": "tsc --emitDeclarationOnly && rollup -c",
     "cover": "vitest run --coverage",
     "postinstall": "[ -n \"$CI\" ] || [ ! -f node_modules/.bin/husky ] || husky install",
     "lint": "eslint 'src/**/*.ts' --cache",
@@ -43,33 +43,33 @@
     "update": "npm_config_yes=true npx npm-check-updates -u --timeout 100000 && yarn install && yarn upgrade && yarn audit"
   },
   "dependencies": {
-    "@actions/core": "^1.6.0",
-    "@actions/github": "^5.0.1",
+    "@actions/core": "^1.8.2",
+    "@actions/github": "^5.0.3",
     "@octokit/openapi-types": "^11.2.0",
     "@octokit/plugin-rest-endpoint-methods": "^5.13.0",
-    "@technote-space/github-action-log-helper": "^0.2.4",
+    "@technote-space/github-action-log-helper": "^0.2.5",
     "shell-escape": "^0.2.0",
     "sprintf-js": "^1.1.2"
   },
   "devDependencies": {
-    "@commitlint/cli": "^16.2.3",
-    "@commitlint/config-conventional": "^16.2.1",
+    "@commitlint/cli": "^17.0.2",
+    "@commitlint/config-conventional": "^17.0.2",
     "@rollup/plugin-typescript": "^8.3.2",
-    "@sindresorhus/tsconfig": "^2.0.0",
-    "@technote-space/github-action-test-helper": "^0.9.5",
-    "@types/node": "^17.0.25",
+    "@sindresorhus/tsconfig": "^3.0.1",
+    "@technote-space/github-action-test-helper": "^0.9.7",
+    "@types/node": "^17.0.38",
     "@types/shell-escape": "^0.2.0",
-    "@typescript-eslint/eslint-plugin": "^5.20.0",
-    "@typescript-eslint/parser": "^5.20.0",
-    "c8": "^7.11.2",
-    "eslint": "^8.13.0",
+    "@typescript-eslint/eslint-plugin": "^5.27.0",
+    "@typescript-eslint/parser": "^5.27.0",
+    "c8": "^7.11.3",
+    "eslint": "^8.16.0",
     "eslint-plugin-import": "^2.26.0",
-    "husky": "^7.0.4",
-    "lint-staged": "^12.4.0",
+    "husky": "^8.0.1",
+    "lint-staged": "^13.0.0",
     "nock": "^13.2.4",
-    "rollup": "^2.70.2",
-    "typescript": "^4.6.3",
-    "vitest": "^0.9.4"
+    "rollup": "^2.75.4",
+    "typescript": "^4.7.2",
+    "vitest": "^0.13.1"
   },
   "publishConfig": {
     "access": "public"
diff --git a/src/api-helper.ts b/src/api-helper.ts
@@ -1,12 +1,12 @@
-import type { Octokit } from './types';
-import type { Context } from '@actions/github/lib/context';
+import type { Octokit } from './types.js';
+import type { Context } from '@actions/github/lib/context.js';
 import type { components } from '@octokit/openapi-types';
 import type { OctokitResponse } from '@octokit/types';
 import type { Logger } from '@technote-space/github-action-log-helper';
 import fs from 'fs';
 import path from 'path';
 import { exportVariable } from '@actions/core';
-import { getSender } from './context-helper';
+import { getSender } from './context-helper.js';
 import {
   getRefForUpdate,
   isPrRef,
@@ -18,7 +18,7 @@ import {
   generateNewMinorVersion,
   ensureNotNull,
   objectGet,
-} from './utils';
+} from './utils.js';
 
 type GitGetCommitResponseData = components['schemas']['git-commit'];
 type PullsGetResponseData = components['schemas']['pull-request'];
diff --git a/src/api-helper1.test.ts b/src/api-helper1.test.ts
@@ -15,7 +15,7 @@ import {
 } from '@technote-space/github-action-test-helper';
 import nock from 'nock';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { ApiHelper } from '../src';
+import { ApiHelper } from '../src/index.js';
 
 type GitCreateCommitResponseData = components['schemas']['git-commit'];
 const rootDir = path.resolve(__dirname, 'fixtures');
diff --git a/src/api-helper2.test.ts b/src/api-helper2.test.ts
@@ -13,7 +13,7 @@ import {
 } from '@technote-space/github-action-test-helper';
 import nock from 'nock';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { ApiHelper } from '../src';
+import { ApiHelper } from '../src/index.js';
 
 type GitCreateCommitResponseData = components['schemas']['git-commit'];
 const rootDir = path.resolve(__dirname, 'fixtures');
diff --git a/src/command1.test.ts b/src/command1.test.ts
@@ -9,7 +9,7 @@ import {
   stdoutCalledWith,
 } from '@technote-space/github-action-test-helper';
 import { beforeEach, describe, expect, it } from 'vitest';
-import { Command } from '../src';
+import { Command } from '../src/index.js';
 
 describe('execAsync', () => {
   testChildProcess();
diff --git a/src/command2.test.ts b/src/command2.test.ts
@@ -9,7 +9,7 @@ import {
   stdoutCalledWith,
 } from '@technote-space/github-action-test-helper';
 import { beforeEach, describe, expect, it } from 'vitest';
-import { Command } from '../src';
+import { Command } from '../src/index.js';
 
 describe('execAsync', () => {
   testChildProcess();
diff --git a/src/context-helper.test.ts b/src/context-helper.test.ts
@@ -7,7 +7,7 @@ import {
 } from '@technote-space/github-action-test-helper';
 import { testEnv, getContext } from '@technote-space/github-action-test-helper';
 import { beforeEach, describe, expect, it } from 'vitest';
-import { ContextHelper } from '../src';
+import { ContextHelper } from '../src/index.js';
 
 const { isRelease, isPush, isPr, isIssue, isCron, isCustomEvent, isManualEvent, isWorkflowRun, isCreateTag } = ContextHelper;
 const { getGitUrl, getRepository, getTagName, getSender, showActionInfo }                                    = ContextHelper;
diff --git a/src/context-helper.ts b/src/context-helper.ts
@@ -1,7 +1,7 @@
-import type { Context } from '@actions/github/lib/context';
+import type { Context } from '@actions/github/lib/context.js';
 import type { Logger } from '@technote-space/github-action-log-helper';
 import path from 'path';
-import { getAccessToken, getActor, getBuildInfo, mask } from './utils';
+import { getAccessToken, getActor, getBuildInfo, mask } from './utils.js';
 
 export const isRelease = (context: Context): boolean => 'release' === context.eventName;
 
diff --git a/src/git-helper.test.ts b/src/git-helper.test.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-magic-numbers */
-import type { Context } from '@actions/github/lib/context';
+import type { Context } from '@actions/github/lib/context.js';
 import type { ExecException } from 'child_process';
 import { Logger } from '@technote-space/github-action-log-helper';
 import {
@@ -14,7 +14,7 @@ import {
   stdoutCalledWith,
 } from '@technote-space/github-action-test-helper';
 import { beforeEach, describe, expect, it } from 'vitest';
-import { GitHelper } from '../src';
+import { GitHelper } from '../src/index.js';
 
 beforeEach(() => {
   Logger.resetForTesting();
@@ -355,13 +355,9 @@ describe('GitHelper', () => {
     });
 
     it('should throw error', async() => {
-      /**
-       * Logger
-       */
       class ThrowErrorLogger extends Logger {
-        /**
-         * @return {void}
-         */
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
         public override displayStdout = (): void => {
           throw new Error('test');
         };
diff --git a/src/git-helper.ts b/src/git-helper.ts
@@ -1,8 +1,8 @@
-import type { Context } from '@actions/github/lib/context';
+import type { Context } from '@actions/github/lib/context.js';
 import type { Logger } from '@technote-space/github-action-log-helper';
 import fs from 'fs';
-import Command from './command';
-import { getGitUrlWithToken } from './context-helper';
+import Command from './command.js';
+import { getGitUrlWithToken } from './context-helper.js';
 import {
   getBranch,
   isBranch,
@@ -18,7 +18,7 @@ import {
   generateNewMajorVersion,
   isCommandDebug,
   isOutputDebug,
-} from './utils';
+} from './utils.js';
 
 type CommandType = string | {
   command: string;
diff --git a/src/index.test.ts b/src/index.test.ts
@@ -1,5 +1,5 @@
 import { expect, it } from 'vitest';
-import { Command, ApiHelper, GitHelper, Types, Utils, ContextHelper } from '.';
+import { Command, ApiHelper, GitHelper, Types, Utils, ContextHelper } from './index.js';
 
 it('helpers can be imported', () => {
   expect(Command).not.toBeFalsy();
diff --git a/src/index.ts b/src/index.ts
@@ -1,9 +1,9 @@
-import ApiHelper from './api-helper';
-import Command from './command';
-import GitHelper from './git-helper';
+import ApiHelper from './api-helper.js';
+import Command from './command.js';
+import GitHelper from './git-helper.js';
 
-export * as Types from './types';
-export * as Utils from './utils';
-export * as ContextHelper from './context-helper';
+export * as Types from './types.js';
+export * as Utils from './utils.js';
+export * as ContextHelper from './context-helper.js';
 
 export { Command, ApiHelper, GitHelper };
diff --git a/src/types.ts b/src/types.ts
@@ -1,5 +1,5 @@
-import type { GitHub } from '@actions/github/lib/utils';
-import type { RestEndpointMethods } from '@octokit/plugin-rest-endpoint-methods/dist-types/generated/method-types';
+import type { GitHub } from '@actions/github/lib/utils.js';
+import type { RestEndpointMethods } from '@octokit/plugin-rest-endpoint-methods/dist-types/generated/method-types.js';
 
 export type Octokit = InstanceType<typeof GitHub> & {
   rest: RestEndpointMethods;
diff --git a/src/utils.ts b/src/utils.ts
@@ -1,5 +1,5 @@
-import type { Octokit } from './types';
-import type { Context } from '@actions/github/lib/context';
+import type { Octokit } from './types.js';
+import type { Context } from '@actions/github/lib/context.js';
 import fs from 'fs';
 import path from 'path';
 import { getInput } from '@actions/core' ;
diff --git a/src/utils1.test.ts b/src/utils1.test.ts
@@ -2,14 +2,12 @@
 import path from 'path';
 import { testEnv, getContext, testFs } from '@technote-space/github-action-test-helper';
 import { describe, expect, it, vi } from 'vitest';
-import { Utils } from '../src';
+import { Utils } from '../src/index.js';
 
 const { getWorkspace, getActor, escapeRegExp, getRegExp, getPrefixRegExp, getSuffixRegExp, getPrBranch, getPrHeadRef } = Utils;
 const { parseVersion, normalizeVersion, isValidSemanticVersioning, isPrRef, getPrMergeRef, replaceAll, sleep }         = Utils;
 const { getBranch, getRefForUpdate, uniqueArray, getBuildInfo, split, getArrayInput, useNpm, getBoolValue }            = Utils;
 
-vi.useFakeTimers();
-
 describe('getWorkspace', () => {
   testEnv();
 
@@ -500,16 +498,23 @@ describe('getArrayInput', () => {
 });
 
 describe('sleep', () => {
-  it('should sleep', done => {
-    const fn = vi.fn();
-
-    sleep(1000).then(() => {
-      fn();
-      done();
-    });
-
-    expect(fn).not.toBeCalled();
-    vi.advanceTimersByTime(1500);
+  it('should sleep', async() => {
+    vi.useFakeTimers();
+    try {
+      const fn = vi.fn();
+
+      const promise = sleep(1000).then(() => {
+        fn();
+      });
+
+      expect(fn).not.toBeCalled();
+
+      vi.advanceTimersByTime(1100);
+      await promise;
+      expect(fn).toBeCalled();
+    } finally {
+      vi.useRealTimers();
+    }
   });
 });
 
diff --git a/src/utils2.test.ts b/src/utils2.test.ts
@@ -1,7 +1,7 @@
 /* eslint-disable no-magic-numbers */
 import { testEnv } from '@technote-space/github-action-test-helper';
 import { describe, expect, it, vi } from 'vitest';
-import { Utils } from '../src';
+import { Utils } from '../src/index.js';
 
 const { generateNewPatchVersion, generateNewMinorVersion, generateNewMajorVersion, arrayChunk, versionCompare, isCommandDebug, isOutputDebug, objectGet, mask }             = Utils;
 const { isBranch, isTagRef, normalizeRef, trimRef, getTag, getRefspec, getRemoteRefspec, getLocalRefspec, getOctokit, replaceVariables, ensureNotNullValue, ensureNotNull } = Utils;
diff --git a/yarn.lock b/yarn.lock
