Merge pull request #265 from Borales/renovate/typescript-eslint-monorepo

Update dependency @typescript-eslint/parser to ^6.20.0

.github/renovate.json

@@ -0,0 +1,14 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["config:base", "group:typescript-eslintMonorepo"],
+  "labels": ["dependencies"],
+  "rangeStrategy": "bump",
+  "reviewers": ["borales"],
+  "postUpdateOptions": ["yarnDedupeHighest"],
+  "packageRules": [
+    {
+      "matchSourceUrlPrefixes": ["https://github.com/actions/toolkit"],
+      "groupName": "GitHub Actions Toolkit"
+    }
+  ]
+}

.github/workflows/check-dist.yml

@@ -16,20 +16,20 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: Set Node.js 16.x
+      - name: Set Node.js 20
-        uses: actions/setup-node@v3.5.1
+        uses: actions/setup-node@v4.0.1
         with:
-          node-version: 16.x
+          node-version: 20
 
       - name: Install dependencies
-        run: npm ci
+        run: yarn
 
       - name: Rebuild the dist/ directory
         run: |
-          npm run build
+          yarn build
-          npm run package
+          yarn package
       - name: Compare the expected and actual dist/ directories
         run: |
           if [ "$(git diff --ignore-space-at-eol dist/ | wc -l)" -gt "0" ]; then
@@ -40,7 +40,7 @@ jobs:
         id: diff
 
       # If index.js was different than expected, upload the expected version as an artifact
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: ${{ failure() && steps.diff.conclusion == 'failure' }}
         with:
           name: dist

.npmrc

@@ -0,0 +1 @@
+fund=false

.nvmrc

@@ -0,0 +1 @@
+20

CHANGELOG.md

@@ -1,5 +1,17 @@
 # CHANGELOG
 
+## 5.0.0 (3 Feb 2024)
+
+- Switching to `node20`
+
+## 4.2.0 (5 Dec 2022)
+
+- Added proper support for multiple arguments
+
+## 4.1.0 (26 Nov 2022)
+
+- Added `dir` option
+
 ## 4.0.0 (26 Nov 2022)
 
 - Migrated to Actions toolkit

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 Oleksandr Bordun
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -6,11 +6,14 @@ This Action for [yarn](https://yarnpkg.com) enables arbitrary actions with the `
 
 ## Usage
 
+> It is required to run `actions/setup-node@v3` before `borales/actions-yarn` in order to setup the desired node version.
+
 An example workflow how to install packages via Yarn (using repository syntax):
 
 ```yml
 name: CI
 on: [push]
+
 jobs:
   build:
     name: Test
@@ -37,8 +40,16 @@ jobs:
         uses: borales/actions-yarn@v4
         with:
           cmd: test # will run `yarn test` command
+
+      - name: Run test in sub-folder
+        uses: borales/actions-yarn@v4
+        with:
+          cmd: test
+          dir: 'frontend' # will run `yarn test` in `frontend` sub folder
 ```
 
 > `cmd` value will be used as a command for Yarn
+>
+> `dir` value will be used for Yarn `cwd`
 
 More information about [private registry setup](https://github.com/actions/setup-node/blob/main/docs/advanced-usage.md#use-private-packages).

action.yml

@@ -8,13 +8,10 @@ inputs:
   cmd:
     description: 'Yarn command'
     required: true
-#  auth-token:
+  dir:
-#    description: 'NPM_AUTH_TOKEN'
+    description: 'Yarn sub-folder (if needed)'
-#  registry-url:
+    required: false
-#    description: 'NPM_REGISTRY_URL'
+    default: ''
 runs:
-  using: 'node16'
+  using: 'node20'
   main: 'dist/index.js'
-#  env:
-#    NPM_AUTH_TOKEN: ${{ inputs.auth-token }}
-#    NPM_REGISTRY_URL: ${{ inputs.registry-url }}

dist/index.js

@@ -19,10 +19,12 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 const core_1 = __nccwpck_require__(186);
 const yarn_1 = __nccwpck_require__(820);
 const run_1 = __nccwpck_require__(884);
+const path_1 = __nccwpck_require__(17);
 const main = () => __awaiter(void 0, void 0, void 0, function* () {
     yield (0, yarn_1.ensureYarnIsInstalled)();
     const cmd = (0, core_1.getInput)('cmd', { required: true });
-    const cwd = (0, core_1.getState)('repositoryPath');
+    const dir = (0, core_1.getInput)('dir');
+    const cwd = (0, path_1.resolve)((0, core_1.getState)('repositoryPath'), dir || '');
     try {
         (0, core_1.debug)(`Running "${cmd}" command`);
         yield (0, run_1.run)(cmd, { cwd });
@@ -55,7 +57,7 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.run = void 0;
 const exec_1 = __nccwpck_require__(514);
 const run = (cmd, { cwd }) => __awaiter(void 0, void 0, void 0, function* () {
-    yield (0, exec_1.exec)('yarn', [cmd], { cwd });
+    yield (0, exec_1.exec)('yarn', cmd.split(' '), { cwd });
 });
 exports.run = run;
 
@@ -658,7 +660,7 @@ class OidcClient {
                 .catch(error => {
                 throw new Error(`Failed to get ID Token. \n 
         Error Code : ${error.statusCode}\n 
-        Error Message: ${error.result.message}`);
+        Error Message: ${error.message}`);
             });
             const id_token = (_a = res.result) === null || _a === void 0 ? void 0 : _a.value;
             if (!id_token) {
@@ -2632,11 +2634,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 var _a;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.getCmdPath = exports.tryGetExecutablePath = exports.isRooted = exports.isDirectory = exports.exists = exports.IS_WINDOWS = exports.unlink = exports.symlink = exports.stat = exports.rmdir = exports.rename = exports.readlink = exports.readdir = exports.mkdir = exports.lstat = exports.copyFile = exports.chmod = void 0;
+exports.getCmdPath = exports.tryGetExecutablePath = exports.isRooted = exports.isDirectory = exports.exists = exports.READONLY = exports.UV_FS_O_EXLOCK = exports.IS_WINDOWS = exports.unlink = exports.symlink = exports.stat = exports.rmdir = exports.rm = exports.rename = exports.readlink = exports.readdir = exports.open = exports.mkdir = exports.lstat = exports.copyFile = exports.chmod = void 0;
 const fs = __importStar(__nccwpck_require__(147));
 const path = __importStar(__nccwpck_require__(17));
-_a = fs.promises, exports.chmod = _a.chmod, exports.copyFile = _a.copyFile, exports.lstat = _a.lstat, exports.mkdir = _a.mkdir, exports.readdir = _a.readdir, exports.readlink = _a.readlink, exports.rename = _a.rename, exports.rmdir = _a.rmdir, exports.stat = _a.stat, exports.symlink = _a.symlink, exports.unlink = _a.unlink;
+_a = fs.promises
+// export const {open} = 'fs'
+, exports.chmod = _a.chmod, exports.copyFile = _a.copyFile, exports.lstat = _a.lstat, exports.mkdir = _a.mkdir, exports.open = _a.open, exports.readdir = _a.readdir, exports.readlink = _a.readlink, exports.rename = _a.rename, exports.rm = _a.rm, exports.rmdir = _a.rmdir, exports.stat = _a.stat, exports.symlink = _a.symlink, exports.unlink = _a.unlink;
+// export const {open} = 'fs'
 exports.IS_WINDOWS = process.platform === 'win32';
+// See https://github.com/nodejs/node/blob/d0153aee367422d0858105abec186da4dff0a0c5/deps/uv/include/uv/win.h#L691
+exports.UV_FS_O_EXLOCK = 0x10000000;
+exports.READONLY = fs.constants.O_RDONLY;
 function exists(fsPath) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -2817,12 +2825,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.findInPath = exports.which = exports.mkdirP = exports.rmRF = exports.mv = exports.cp = void 0;
 const assert_1 = __nccwpck_require__(491);
-const childProcess = __importStar(__nccwpck_require__(81));
 const path = __importStar(__nccwpck_require__(17));
-const util_1 = __nccwpck_require__(837);
 const ioUtil = __importStar(__nccwpck_require__(962));
-const exec = util_1.promisify(childProcess.exec);
-const execFile = util_1.promisify(childProcess.execFile);
 /**
  * Copies a file or folder.
  * Based off of shelljs - https://github.com/shelljs/shelljs/blob/9237f66c52e5daa40458f94f9565e18e8132f5a6/src/cp.js
@@ -2903,61 +2907,23 @@ exports.mv = mv;
 function rmRF(inputPath) {
     return __awaiter(this, void 0, void 0, function* () {
         if (ioUtil.IS_WINDOWS) {
-            // Node doesn't provide a delete operation, only an unlink function. This means that if the file is being used by another
-            // program (e.g. antivirus), it won't be deleted. To address this, we shell out the work to rd/del.
             // Check for invalid characters
             // https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file
             if (/[*"<>|]/.test(inputPath)) {
                 throw new Error('File path must not contain `*`, `"`, `<`, `>` or `|` on Windows');
             }
-            try {
-                const cmdPath = ioUtil.getCmdPath();
-                if (yield ioUtil.isDirectory(inputPath, true)) {
-                    yield exec(`${cmdPath} /s /c "rd /s /q "%inputPath%""`, {
-                        env: { inputPath }
-                    });
-                }
-                else {
-                    yield exec(`${cmdPath} /s /c "del /f /a "%inputPath%""`, {
-                        env: { inputPath }
-                    });
-                }
-            }
-            catch (err) {
-                // if you try to delete a file that doesn't exist, desired result is achieved
-                // other errors are valid
-                if (err.code !== 'ENOENT')
-                    throw err;
-            }
-            // Shelling out fails to remove a symlink folder with missing source, this unlink catches that
-            try {
-                yield ioUtil.unlink(inputPath);
-            }
-            catch (err) {
-                // if you try to delete a file that doesn't exist, desired result is achieved
-                // other errors are valid
-                if (err.code !== 'ENOENT')
-                    throw err;
-            }
         }
-        else {
+        try {
-            let isDir = false;
+            // note if path does not exist, error is silent
-            try {
+            yield ioUtil.rm(inputPath, {
-                isDir = yield ioUtil.isDirectory(inputPath);
+                force: true,
-            }
+                maxRetries: 3,
-            catch (err) {
+                recursive: true,
-                // if you try to delete a file that doesn't exist, desired result is achieved
+                retryDelay: 300
-                // other errors are valid
+            });
-                if (err.code !== 'ENOENT')
+        }
-                    throw err;
+        catch (err) {
-                return;
+            throw new Error(`File was unable to be removed ${err}`);
-            }
-            if (isDir) {
-                yield execFile(`rm`, [`-rf`, `${inputPath}`]);
-            }
-            else {
-                yield ioUtil.unlink(inputPath);
-            }
         }
     });
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@borales/actions-yarn",
-  "version": "4.0.0",
+  "version": "4.2.0",
   "main": "lib/index.js",
   "scripts": {
     "build": "tsc",
@@ -9,22 +9,22 @@
     "lint": "eslint src/**/*.ts",
     "package": "ncc build --source-map --license licenses.txt",
     "test": "jest",
-    "all": "npm run build && npm run format && npm run lint && npm run package && npm test"
+    "all": "yarn build && yarn format && yarn lint && yarn package && yarn test"
   },
   "dependencies": {
-    "@actions/core": "^1.10.0",
+    "@actions/core": "^1.10.1",
     "@actions/exec": "^1.1.1",
-    "@actions/io": "^1.1.2"
+    "@actions/io": "^1.1.3"
   },
   "devDependencies": {
-    "@types/node": "^18.11.9",
+    "@types/node": "^20.11.16",
-    "@typescript-eslint/parser": "^5.44.0",
+    "@typescript-eslint/parser": "^6.20.0",
-    "@vercel/ncc": "^0.34.0",
+    "@vercel/ncc": "^0.38.1",
-    "eslint-plugin-github": "^4.4.1",
+    "eslint-plugin-github": "^4.10.1",
-    "eslint-plugin-jest": "^27.1.6",
+    "eslint-plugin-jest": "^27.6.3",
-    "eslint": "^8.28.0",
+    "eslint": "^8.56.0",
-    "jest": "^29.3.1",
+    "jest": "^29.7.0",
-    "prettier": "^2.8.0",
+    "prettier": "^3.2.4",
-    "typescript": "^4.9.3"
+    "typescript": "^5.3.3"
   }
 }

src/index.ts

@@ -1,12 +1,14 @@
 import {debug, getInput, setFailed, getState} from '@actions/core'
 import {ensureYarnIsInstalled} from './yarn'
 import {run} from './run'
+import {resolve} from 'path'
 
-const main = async () => {
+const main = async (): Promise<void> => {
   await ensureYarnIsInstalled()
 
   const cmd: string = getInput('cmd', {required: true})
-  const cwd: string = getState('repositoryPath')
+  const dir: string = getInput('dir')
+  const cwd: string = resolve(getState('repositoryPath'), dir || '')
 
   try {
     debug(`Running "${cmd}" command`)

src/run.ts

@@ -1,5 +1,5 @@
 import {exec} from '@actions/exec'
 
-export const run = async (cmd: string, {cwd}: {cwd: string}) => {
+export const run = async (cmd: string, {cwd}: {cwd: string}): Promise<void> => {
-  await exec('yarn', [cmd], {cwd})
+  await exec('yarn', cmd.split(' '), {cwd})
 }

src/yarn.ts

@@ -2,7 +2,7 @@ import {debug, setOutput} from '@actions/core'
 import {exec, getExecOutput} from '@actions/exec'
 import {which} from '@actions/io'
 
-export const ensureYarnIsInstalled = async () => {
+export const ensureYarnIsInstalled = async (): Promise<void> => {
   try {
     await which('yarn', true)
   } catch (e) {