chore: improve test coverage (#1440)

Co-authored-by: GitHub Action <action@github.com>

HISTORY.md

@@ -1,5 +1,36 @@
 # Changelog
 
+# [37.5.2](https://github.com/tj-actions/changed-files/compare/v37.5.1...v37.5.2) - (2023-08-03)
+
+## <!-- 26 -->🔄 Update
+
+- Update README.md ([948fd1a](https://github.com/tj-actions/changed-files/commit/948fd1aec0f923945aefa5b428966a3148c14b6f))  - (Tonye Jack)
+- Update README.md ([bde04d3](https://github.com/tj-actions/changed-files/commit/bde04d3ec66f15d1bc7856d05ca626fb6573dc64))  - (Tonye Jack)
+- Update README.md ([3fdcd6b](https://github.com/tj-actions/changed-files/commit/3fdcd6b1fa054b93db539c7b381c93fa2268d74e))  - (Tonye Jack)
+- Update README.md ([6b62acf](https://github.com/tj-actions/changed-files/commit/6b62acfc401246667fa6575c368224614e69d150))  - (Tonye Jack)
+- Updated README.md ([#1420](https://github.com/tj-actions/changed-files/issues/1420))
+
+Co-authored-by: jackton1 <jackton1@users.noreply.github.com> ([c10ebdc](https://github.com/tj-actions/changed-files/commit/c10ebdc85fde7af2ea8c66779702ccdc2c09c3ba))  - (tj-actions[bot])
+- Update README.md ([1b00b76](https://github.com/tj-actions/changed-files/commit/1b00b76bc1c9caf00f684c3bb3147d85da101580))  - (Tonye Jack)
+
+## <!-- 7 -->⚙️ Miscellaneous Tasks
+
+- Improve test coverage ([#1430](https://github.com/tj-actions/changed-files/issues/1430)) ([85c8b82](https://github.com/tj-actions/changed-files/commit/85c8b8252fc9893e00b3633a16670e53040e6d71))  - (Tonye Jack)
+- **deps:** Update dependency prettier to v3.0.1 ([#1428](https://github.com/tj-actions/changed-files/issues/1428)) ([213a6fb](https://github.com/tj-actions/changed-files/commit/213a6fbf71815875a70e39d3f252fe0b13646e14))  - (renovate[bot])
+- **deps:** Lock file maintenance ([#1427](https://github.com/tj-actions/changed-files/issues/1427)) ([c089e39](https://github.com/tj-actions/changed-files/commit/c089e392a94aa3fb0651d7893b8d45513851ca14))  - (renovate[bot])
+- **deps-dev:** Bump @types/node from 20.4.5 to 20.4.6 ([#1426](https://github.com/tj-actions/changed-files/issues/1426)) ([387fa91](https://github.com/tj-actions/changed-files/commit/387fa91a199f7def6ffb96525119cce72a40c3d2))  - (dependabot[bot])
+- **deps:** Lock file maintenance ([#1424](https://github.com/tj-actions/changed-files/issues/1424)) ([ce7dcea](https://github.com/tj-actions/changed-files/commit/ce7dceac93d38ea5365ee8ec231c4c25529ecbfd))  - (renovate[bot])
+- **deps:** Lock file maintenance ([#1423](https://github.com/tj-actions/changed-files/issues/1423)) ([18832c2](https://github.com/tj-actions/changed-files/commit/18832c2f0d0dcbf0a631fb9ae64a5b2c840b72d8))  - (renovate[bot])
+- **deps:** Update typescript-eslint monorepo to v6.2.1 ([#1422](https://github.com/tj-actions/changed-files/issues/1422)) ([2b564ea](https://github.com/tj-actions/changed-files/commit/2b564ea5437173b3e7dcb0d7aec9ee0ad166d488))  - (renovate[bot])
+- **deps:** Lock file maintenance ([#1421](https://github.com/tj-actions/changed-files/issues/1421)) ([62411c0](https://github.com/tj-actions/changed-files/commit/62411c0bbfd74101a58615b1443f3b112aab34f7))  - (renovate[bot])
+- **deps:** Lock file maintenance ([#1419](https://github.com/tj-actions/changed-files/issues/1419)) ([8ffb34e](https://github.com/tj-actions/changed-files/commit/8ffb34e4dbad285f2f06e6fc82d72b24d5de2534))  - (renovate[bot])
+
+## <!-- 9 -->⬆️ Upgrades
+
+- Upgraded to v37.5.1 ([#1418](https://github.com/tj-actions/changed-files/issues/1418))
+
+Co-authored-by: jackton1 <jackton1@users.noreply.github.com> ([81ce706](https://github.com/tj-actions/changed-files/commit/81ce7062432f3f2a5ba687cce3f289de9da66332))  - (tj-actions[bot])
+
 # [37.5.1](https://github.com/tj-actions/changed-files/compare/v37.5.0...v37.5.1) - (2023-07-28)
 
 ## <!-- 26 -->🔄 Update

README.md

@@ -70,7 +70,7 @@ Effortlessly track all changed files and directories relative to a target branch
         *   Supports [YAML anchors & aliases](https://www.educative.io/blog/advanced-yaml-syntax-cheatsheet#anchors).
         *   Supports [YAML multi-line strings](https://learnxinyminutes.com/docs/yaml/).
 
-And many more.
+And many more...
 
 ## Usage
 
@@ -115,9 +115,9 @@ jobs:
         with:
           files_yaml: |
             doc:
-              - '**.md'
+              - '**/*.md'
               - docs/**
-              - docs/README.md
+              - README.md
             test:
               - test/**
               - '!test/**.md'
@@ -538,7 +538,7 @@ See [outputs](#outputs) for a list of all available outputs.
           *.png
           !*.md
           test_directory
-          **.sql
+          **/*.sql
 ...
 ```
 
@@ -561,7 +561,7 @@ See [inputs](#inputs) for more information.
           *.png
           !*.md
           test_directory
-          **.sql
+          **/*.sql
 
     - name: Run step if any of the listed files above change
       if: steps.changed-files-specific.outputs.any_changed == 'true'
@@ -820,7 +820,9 @@ See [inputs](#inputs) for more information.
 </li>
 </ul>
 
-> **Warning**: This setting overrides the commit sha used by setting `since_last_remote_commit` to true.
+> **Warning**:
+>
+> This setting overrides the commit sha used by setting `since_last_remote_commit` to true.
 > It is recommended to use either solution that works for your use case.
 
 See [inputs](#inputs) for more information.
@@ -929,9 +931,8 @@ With the switch from using grep's Extended regex to match files to the natively
 -            \.sh$
 -            .(sql|py)$
 -            ^(dir1|dir2)
-+            *.{sh,sql,py}
-+            dir1
-+            dir2
++            **/*.{sh,sql,py}
++            {dir1,dir2}/**
 ```
 
 *   Free software: [MIT license](LICENSE)

dist/index.js

@@ -326,12 +326,7 @@ const utils_1 = __nccwpck_require__(918);
 const getOutputKey = (key, outputPrefix) => {
     return outputPrefix ? `${outputPrefix}_${key}` : key;
 };
-const setChangedFilesOutput = ({ allDiffFiles, inputs, filePatterns = [], outputPrefix = '' }) => __awaiter(void 0, void 0, void 0, function* () {
-    const allFilteredDiffFiles = yield (0, utils_1.getFilteredChangedFiles)({
-        allDiffFiles,
-        filePatterns
-    });
-    core.debug(`All filtered diff files: ${JSON.stringify(allFilteredDiffFiles)}`);
+const setChangedFilesOutput = ({ allDiffFiles, allFilteredDiffFiles, inputs, filePatterns = [], outputPrefix = '' }) => __awaiter(void 0, void 0, void 0, function* () {
     const addedFiles = yield (0, changedFiles_1.getChangeTypeFiles)({
         inputs,
         changedFiles: allFilteredDiffFiles,
@@ -1364,10 +1359,16 @@ const utils_1 = __nccwpck_require__(918);
 const changedFilesOutput = ({ filePatterns, allDiffFiles, inputs, yamlFilePatterns }) => __awaiter(void 0, void 0, void 0, function* () {
     if (filePatterns.length > 0) {
         core.startGroup('changed-files-patterns');
+        const allFilteredDiffFiles = yield (0, utils_1.getFilteredChangedFiles)({
+            allDiffFiles,
+            filePatterns
+        });
+        core.debug(`All filtered diff files: ${JSON.stringify(allFilteredDiffFiles)}`);
         yield (0, changedFilesOutput_1.setChangedFilesOutput)({
             allDiffFiles,
-            filePatterns,
-            inputs
+            allFilteredDiffFiles,
+            inputs,
+            filePatterns
         });
         core.info('All Done!');
         core.endGroup();
@@ -1375,11 +1376,17 @@ const changedFilesOutput = ({ filePatterns, allDiffFiles, inputs, yamlFilePatter
     if (Object.keys(yamlFilePatterns).length > 0) {
         for (const key of Object.keys(yamlFilePatterns)) {
             core.startGroup(`changed-files-yaml-${key}`);
+            const allFilteredDiffFiles = yield (0, utils_1.getFilteredChangedFiles)({
+                allDiffFiles,
+                filePatterns: yamlFilePatterns[key]
+            });
+            core.debug(`All filtered diff files for ${key}: ${JSON.stringify(allFilteredDiffFiles)}`);
             yield (0, changedFilesOutput_1.setChangedFilesOutput)({
                 allDiffFiles,
+                allFilteredDiffFiles,
+                inputs,
                 filePatterns: yamlFilePatterns[key],
-                outputPrefix: key,
-                inputs
+                outputPrefix: key
             });
             core.info('All Done!');
             core.endGroup();
@@ -1389,6 +1396,7 @@ const changedFilesOutput = ({ filePatterns, allDiffFiles, inputs, yamlFilePatter
         core.startGroup('changed-files-all');
         yield (0, changedFilesOutput_1.setChangedFilesOutput)({
             allDiffFiles,
+            allFilteredDiffFiles: allDiffFiles,
             inputs
         });
         core.info('All Done!');
@@ -2198,18 +2206,48 @@ const getPreviousGitTag = ({ cwd }) => __awaiter(void 0, void 0, void 0, functio
 });
 exports.getPreviousGitTag = getPreviousGitTag;
 const canDiffCommits = ({ cwd, sha1, sha2, diff }) => __awaiter(void 0, void 0, void 0, function* () {
-    const { exitCode, stderr } = yield exec.getExecOutput('git', ['diff', '--name-only', '--ignore-submodules=all', `${sha1}${diff}${sha2}`], {
+    if (diff === '...') {
+        const mergeBase = yield getMergeBase(cwd, sha1, sha2);
+        if (!mergeBase) {
+            core.warning(`Unable to find merge base between ${sha1} and ${sha2}`);
+            return false;
+        }
+        const { exitCode, stderr } = yield exec.getExecOutput('git', ['log', '--format=%H', `${mergeBase}..${sha2}`], {
+            cwd,
+            ignoreReturnCode: true,
+            silent: !core.isDebug()
+        });
+        if (exitCode !== 0) {
+            core.warning(stderr || `Error checking commit history`);
+            return false;
+        }
+        return true;
+    }
+    else {
+        const { exitCode, stderr } = yield exec.getExecOutput('git', ['diff', '--quiet', sha1, sha2], {
+            cwd,
+            ignoreReturnCode: true,
+            silent: !core.isDebug()
+        });
+        if (exitCode !== 0) {
+            core.warning(stderr || `Error checking commit history`);
+            return false;
+        }
+        return true;
+    }
+});
+exports.canDiffCommits = canDiffCommits;
+const getMergeBase = (cwd, sha1, sha2) => __awaiter(void 0, void 0, void 0, function* () {
+    const { exitCode, stdout } = yield exec.getExecOutput('git', ['merge-base', sha1, sha2], {
         cwd,
         ignoreReturnCode: true,
         silent: !core.isDebug()
     });
     if (exitCode !== 0) {
-        core.warning(stderr || `Unable find merge base between ${sha1} and ${sha2}`);
-        return false;
+        return null;
     }
-    return true;
+    return stdout.trim();
 });
-exports.canDiffCommits = canDiffCommits;
 const getDirnameMaxDepth = ({ relativePath, dirNamesMaxDepth, excludeCurrentDir }) => {
     const pathArr = (0, exports.getDirname)(relativePath).split(path.sep);
     const maxDepth = Math.min(dirNamesMaxDepth || pathArr.length, pathArr.length);
@@ -6349,6 +6387,19 @@ class HttpClientResponse {
             }));
         });
     }
+    readBodyBuffer() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () {
+                const chunks = [];
+                this.message.on('data', (chunk) => {
+                    chunks.push(chunk);
+                });
+                this.message.on('end', () => {
+                    resolve(Buffer.concat(chunks));
+                });
+            }));
+        });
+    }
 }
 exports.HttpClientResponse = HttpClientResponse;
 function isHttps(requestUrl) {
@@ -6853,7 +6904,13 @@ function getProxyUrl(reqUrl) {
         }
     })();
     if (proxyVar) {
-        return new URL(proxyVar);
+        try {
+            return new URL(proxyVar);
+        }
+        catch (_a) {
+            if (!proxyVar.startsWith('http://') && !proxyVar.startsWith('https://'))
+                return new URL(`http://${proxyVar}`);
+        }
     }
     else {
         return undefined;

src/__tests__/utils.test.ts

@@ -315,7 +315,14 @@ describe('utils test', () => {
     // Tests that the function returns only the files that match the file patterns
     it('should return only the files that match the file patterns', async () => {
       const allDiffFiles = {
-        [ChangeTypeEnum.Added]: ['file1.txt', 'file2.md', 'file3.txt'],
+        [ChangeTypeEnum.Added]: [
+          'file1.txt',
+          'file2.md',
+          'file3.txt',
+          'test/dir/file4.txt',
+          '/test/dir/file5.txt',
+          'dir/file6.md'
+        ],
         [ChangeTypeEnum.Copied]: [],
         [ChangeTypeEnum.Deleted]: [],
         [ChangeTypeEnum.Modified]: [],
@@ -340,6 +347,46 @@ describe('utils test', () => {
       })
     })
 
+    // Tests that the function returns only the files that match the file patterns with globstar
+    it('should return only the files that match the file patterns with globstar', async () => {
+      const allDiffFiles = {
+        [ChangeTypeEnum.Added]: [
+          'file1.txt',
+          'file2.md',
+          'file3.txt',
+          'test/dir/file4.txt',
+          '/test/dir/file5.txt',
+          'dir/file6.md'
+        ],
+        [ChangeTypeEnum.Copied]: [],
+        [ChangeTypeEnum.Deleted]: [],
+        [ChangeTypeEnum.Modified]: [],
+        [ChangeTypeEnum.Renamed]: [],
+        [ChangeTypeEnum.TypeChanged]: [],
+        [ChangeTypeEnum.Unmerged]: [],
+        [ChangeTypeEnum.Unknown]: []
+      }
+      const result = await getFilteredChangedFiles({
+        allDiffFiles,
+        filePatterns: ['**.txt']
+      })
+      expect(result).toEqual({
+        [ChangeTypeEnum.Added]: [
+          'file1.txt',
+          'file3.txt',
+          'test/dir/file4.txt',
+          '/test/dir/file5.txt'
+        ],
+        [ChangeTypeEnum.Copied]: [],
+        [ChangeTypeEnum.Deleted]: [],
+        [ChangeTypeEnum.Modified]: [],
+        [ChangeTypeEnum.Renamed]: [],
+        [ChangeTypeEnum.TypeChanged]: [],
+        [ChangeTypeEnum.Unmerged]: [],
+        [ChangeTypeEnum.Unknown]: []
+      })
+    })
+
     // Tests that the function returns an empty object when there are no files that match the file patterns
     it('should return an empty object when there are no files that match the file patterns', async () => {
       const allDiffFiles = {
@@ -421,5 +468,30 @@ describe('utils test', () => {
         'test/migrations/test.sql'
       ])
     })
+
+    // Tests that getFilteredChangedFiles correctly filters files using ignore glob patterns
+    it('should filter files using ignore glob patterns', async () => {
+      const allDiffFiles = {
+        [ChangeTypeEnum.Added]: [],
+        [ChangeTypeEnum.Copied]: [],
+        [ChangeTypeEnum.Deleted]: [],
+        [ChangeTypeEnum.Modified]: [
+          'assets/scripts/configure-minikube-linux.sh'
+        ],
+        [ChangeTypeEnum.Renamed]: [],
+        [ChangeTypeEnum.TypeChanged]: [],
+        [ChangeTypeEnum.Unmerged]: [],
+        [ChangeTypeEnum.Unknown]: []
+      }
+      const filePatterns = [
+        'assets/scripts/**.sh',
+        '!assets/scripts/configure-minikube-linux.sh'
+      ]
+      const filteredFiles = await getFilteredChangedFiles({
+        allDiffFiles,
+        filePatterns
+      })
+      expect(filteredFiles[ChangeTypeEnum.Modified]).toEqual([])
+    })
   })
 })

src/changedFilesOutput.ts

@@ -6,7 +6,7 @@ import {
   getChangeTypeFiles
 } from './changedFiles'
 import {Inputs} from './inputs'
-import {getFilteredChangedFiles, setOutput} from './utils'
+import {setOutput} from './utils'
 
 const getOutputKey = (key: string, outputPrefix: string): string => {
   return outputPrefix ? `${outputPrefix}_${key}` : key
@@ -14,21 +14,17 @@ const getOutputKey = (key: string, outputPrefix: string): string => {
 
 export const setChangedFilesOutput = async ({
   allDiffFiles,
+  allFilteredDiffFiles,
   inputs,
   filePatterns = [],
   outputPrefix = ''
 }: {
   allDiffFiles: ChangedFiles
+  allFilteredDiffFiles: ChangedFiles
   inputs: Inputs
   filePatterns?: string[]
   outputPrefix?: string
 }): Promise<void> => {
-  const allFilteredDiffFiles = await getFilteredChangedFiles({
-    allDiffFiles,
-    filePatterns
-  })
-  core.debug(`All filtered diff files: ${JSON.stringify(allFilteredDiffFiles)}`)
-
   const addedFiles = await getChangeTypeFiles({
     inputs,
     changedFiles: allFilteredDiffFiles,

src/main.ts

@@ -18,6 +18,7 @@ import {Env, getEnv} from './env'
 import {getInputs, Inputs} from './inputs'
 import {
   getFilePatterns,
+  getFilteredChangedFiles,
   getRecoverFilePatterns,
   getSubmodulePath,
   getYamlFilePatterns,
@@ -43,10 +44,18 @@ const changedFilesOutput = async ({
 }): Promise<void> => {
   if (filePatterns.length > 0) {
     core.startGroup('changed-files-patterns')
+    const allFilteredDiffFiles = await getFilteredChangedFiles({
+      allDiffFiles,
+      filePatterns
+    })
+    core.debug(
+      `All filtered diff files: ${JSON.stringify(allFilteredDiffFiles)}`
+    )
     await setChangedFilesOutput({
       allDiffFiles,
-      filePatterns,
-      inputs
+      allFilteredDiffFiles,
+      inputs,
+      filePatterns
     })
     core.info('All Done!')
     core.endGroup()
@@ -55,11 +64,21 @@ const changedFilesOutput = async ({
   if (Object.keys(yamlFilePatterns).length > 0) {
     for (const key of Object.keys(yamlFilePatterns)) {
       core.startGroup(`changed-files-yaml-${key}`)
+      const allFilteredDiffFiles = await getFilteredChangedFiles({
+        allDiffFiles,
+        filePatterns: yamlFilePatterns[key]
+      })
+      core.debug(
+        `All filtered diff files for ${key}: ${JSON.stringify(
+          allFilteredDiffFiles
+        )}`
+      )
       await setChangedFilesOutput({
         allDiffFiles,
+        allFilteredDiffFiles,
+        inputs,
         filePatterns: yamlFilePatterns[key],
-        outputPrefix: key,
-        inputs
+        outputPrefix: key
       })
       core.info('All Done!')
       core.endGroup()
@@ -70,6 +89,7 @@ const changedFilesOutput = async ({
     core.startGroup('changed-files-all')
     await setChangedFilesOutput({
       allDiffFiles,
+      allFilteredDiffFiles: allDiffFiles,
       inputs
     })
     core.info('All Done!')

src/utils.ts

@@ -786,9 +786,58 @@ export const canDiffCommits = async ({
   sha2: string
   diff: string
 }): Promise<boolean> => {
-  const {exitCode, stderr} = await exec.getExecOutput(
+  if (diff === '...') {
+    const mergeBase = await getMergeBase(cwd, sha1, sha2)
+
+    if (!mergeBase) {
+      core.warning(`Unable to find merge base between ${sha1} and ${sha2}`)
+      return false
+    }
+
+    const {exitCode, stderr} = await exec.getExecOutput(
+      'git',
+      ['log', '--format=%H', `${mergeBase}..${sha2}`],
+      {
+        cwd,
+        ignoreReturnCode: true,
+        silent: !core.isDebug()
+      }
+    )
+
+    if (exitCode !== 0) {
+      core.warning(stderr || `Error checking commit history`)
+      return false
+    }
+
+    return true
+  } else {
+    const {exitCode, stderr} = await exec.getExecOutput(
+      'git',
+      ['diff', '--quiet', sha1, sha2],
+      {
+        cwd,
+        ignoreReturnCode: true,
+        silent: !core.isDebug()
+      }
+    )
+
+    if (exitCode !== 0) {
+      core.warning(stderr || `Error checking commit history`)
+      return false
+    }
+
+    return true
+  }
+}
+
+const getMergeBase = async (
+  cwd: string,
+  sha1: string,
+  sha2: string
+): Promise<string | null> => {
+  const {exitCode, stdout} = await exec.getExecOutput(
     'git',
-    ['diff', '--name-only', '--ignore-submodules=all', `${sha1}${diff}${sha2}`],
+    ['merge-base', sha1, sha2],
     {
       cwd,
       ignoreReturnCode: true,
@@ -797,11 +846,10 @@ export const canDiffCommits = async ({
   )
 
   if (exitCode !== 0) {
-    core.warning(stderr || `Unable find merge base between ${sha1} and ${sha2}`)
-    return false
+    return null
   }
 
-  return true
+  return stdout.trim()
 }
 
 export const getDirnameMaxDepth = ({

yarn.lock

@@ -33,9 +33,9 @@
     "@octokit/plugin-rest-endpoint-methods" "^5.13.0"
 
 "@actions/http-client@^2.0.1":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@actions/http-client/-/http-client-2.1.0.tgz#b6d8c3934727d6a50d10d19f00a711a964599a9f"
-  integrity sha512-BonhODnXr3amchh4qkmjPMUO8mFi/zLaaCeCAJZqch8iQqyDnVIkySjB38VHAC8IJ+bnlgfOqlhpyCUZHlQsqw==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@actions/http-client/-/http-client-2.1.1.tgz#a8e97699c315bed0ecaeaaeb640948470d4586a0"
+  integrity sha512-qhrkRMB40bbbLo7gF+0vu+X+UawOvQQqNAA/5Unx774RS8poaOhThDOG6BGmxvAnxhQnDp2BG/ZUm65xZILTpw==
   dependencies:
     tunnel "^0.0.6"
 
@@ -990,9 +990,9 @@
     "@types/braces" "*"
 
 "@types/node@*", "@types/node@^20.3.2":
-  version "20.4.6"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.4.6.tgz#b66b66c9bb5d49b199f03399e341c9d6036e9e88"
-  integrity sha512-q0RkvNgMweWWIvSMDiXhflGUKMdIxBo2M2tYM/0kEGDueQByFzK4KZAgu5YHGFNxziTlppNpTIBcqHQAxlfHdA==
+  version "20.4.8"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.4.8.tgz#b5dda19adaa473a9bf0ab5cbd8f30ec7d43f5c85"
+  integrity sha512-0mHckf6D2DiIAzh8fM8f3HQCvMKDpK94YQ0DSVkfWTG9BZleYIWudw9cJxX8oCk9bM+vAkDyujDV6dmKHbvQpg==
 
 "@types/semver@^7.3.12", "@types/semver@^7.5.0":
   version "7.5.0"
@@ -1484,9 +1484,9 @@ camelcase@^6.2.0:
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
 caniuse-lite@^1.0.30001517:
-  version "1.0.30001518"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001518.tgz#b3ca93904cb4699c01218246c4d77a71dbe97150"
-  integrity sha512-rup09/e3I0BKjncL+FesTayKtPrdwKhUufQFd3riFw1hHg8JmIFoInYfB102cFcY/pPgGmdyl/iy+jgiDi2vdA==
+  version "1.0.30001519"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz#3e7b8b8a7077e78b0eb054d69e6edf5c7df35601"
+  integrity sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg==
 
 chalk@^2.0.0:
   version "2.4.2"
@@ -1694,9 +1694,9 @@ doctrine@^3.0.0:
     esutils "^2.0.2"
 
 electron-to-chromium@^1.4.477:
-  version "1.4.482"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.482.tgz#77c5ed37b93d4dda860e27538e0e2a01d6a19e02"
-  integrity sha512-h+UqpfmEr1Qkk0zp7ej/jid7CXoq4m4QzW6wNTb0ELJ/BZCpA4wgUylBIMGCe621tnr4l5VmoHjdoSx2lbnNJA==
+  version "1.4.485"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.485.tgz#fde3ee9ee8112a3414c0dfa545385ad08ec43408"
+  integrity sha512-1ndQ5IBNEnFirPwvyud69GHL+31FkE09gH/CJ6m3KCbkx3i0EVOrjwz4UNxRmN9H8OVHbC6vMRZGN1yCvjSs9w==
 
 emittery@^0.13.1:
   version "0.13.1"
@@ -1811,18 +1811,18 @@ escape-string-regexp@^4.0.0:
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
 eslint-config-prettier@>=8.0.0:
-  version "8.9.0"
-  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.9.0.tgz#094b6254b2804b0544f7cee535f802b6d29ee10b"
-  integrity sha512-+sbni7NfVXnOpnRadUA8S28AUlsZt9GjgFvABIRL9Hkn8KqNzOp+7Lw4QWtrwn20KzU3wqu1QoOj2m+7rKRqkA==
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz#eb25485946dd0c66cd216a46232dc05451518d1f"
+  integrity sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==
 
 eslint-import-resolver-node@^0.3.7:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz#83b375187d412324a1963d84fa664377a23eb4d7"
-  integrity sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.8.tgz#be719e72f5e96dcef7a60f74147c842db0c74b06"
+  integrity sha512-tEe+Pok22qIGaK3KoMP+N96GVDS66B/zreoVVmiavLvRUEmGRtvb4B8wO9jwnb8d2lvHtrkhZ7UD73dWBVnf/Q==
   dependencies:
     debug "^3.2.7"
-    is-core-module "^2.11.0"
-    resolve "^1.22.1"
+    is-core-module "^2.13.0"
+    resolve "^1.22.4"
 
 eslint-module-utils@^2.8.0:
   version "2.8.0"
@@ -2489,10 +2489,10 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
-is-core-module@^2.11.0, is-core-module@^2.12.0, is-core-module@^2.12.1:
-  version "2.12.1"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd"
-  integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==
+is-core-module@^2.12.1, is-core-module@^2.13.0:
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db"
+  integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==
   dependencies:
     has "^1.0.3"
 
@@ -3611,21 +3611,12 @@ resolve.exports@^2.0.0:
   resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.2.tgz#f8c934b8e6a13f539e38b7098e2e36134f01e800"
   integrity sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==
 
-resolve@^1.20.0, resolve@^1.22.1:
-  version "1.22.2"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
-  integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
+resolve@^1.20.0, resolve@^1.22.3, resolve@^1.22.4:
+  version "1.22.4"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.4.tgz#1dc40df46554cdaf8948a486a10f6ba1e2026c34"
+  integrity sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==
   dependencies:
-    is-core-module "^2.11.0"
-    path-parse "^1.0.7"
-    supports-preserve-symlinks-flag "^1.0.0"
-
-resolve@^1.22.3:
-  version "1.22.3"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.3.tgz#4b4055349ffb962600972da1fdc33c46a4eb3283"
-  integrity sha512-P8ur/gp/AmbEzjr729bZnLjXK5Z+4P0zhIJgBgzqRih7hL7BOukHGtSTA3ACMY467GRFz3duQsi0bDZdR7DKdw==
-  dependencies:
-    is-core-module "^2.12.0"
+    is-core-module "^2.13.0"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"