From b628311d4ce4c2dfbe89784c9fb11ead264d02c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 Mar 2021 04:15:35 +0000 Subject: [PATCH 1/2] chore(deps-dev): bump @types/fs-extra from 9.0.3 to 9.0.8 Bumps [@types/fs-extra](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/fs-extra) from 9.0.3 to 9.0.8. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/fs-extra) Signed-off-by: dependabot[bot] --- yarn.lock | 40 ++++++++-------------------------------- 1 file changed, 8 insertions(+), 32 deletions(-) diff --git a/yarn.lock b/yarn.lock index e038735a54..b5eaab9c6f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6195,24 +6195,10 @@ dependencies: "@types/node" "*" -"@types/fs-extra@^9.0.1": - version "9.0.1" - resolved "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.1.tgz#91c8fc4c51f6d5dbe44c2ca9ab09310bd00c7918" - integrity sha512-B42Sxuaz09MhC3DDeW5kubRcQ5by4iuVQ0cRRWM2lggLzAa/KVom0Aft/208NgMvNQQZ86s5rVcqDdn/SH0/mg== - dependencies: - "@types/node" "*" - -"@types/fs-extra@^9.0.3": - version "9.0.3" - resolved "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.3.tgz#9996e5cce993508c32325380b429f04a1327523e" - integrity sha512-NKdGoXLTFTRED3ENcfCsH8+ekV4gbsysanx2OPbstXVV6fZMgUCqTxubs6I9r7pbOJbFgVq1rpFtLURjKCZWUw== - dependencies: - "@types/node" "*" - -"@types/fs-extra@^9.0.5": - version "9.0.5" - resolved "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.5.tgz#2afb76a43a4bef80a363b94b314d0ca1694fc4f8" - integrity sha512-wr3t7wIW1c0A2BIJtdVp4EflriVaVVAsCAIHVzzh8B+GiFv9X1xeJjCs4upRXtzp7kQ6lP5xvskjoD4awJ1ZeA== +"@types/fs-extra@^9.0.1", "@types/fs-extra@^9.0.3", "@types/fs-extra@^9.0.5": + version "9.0.8" + resolved "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-9.0.8.tgz#32c3c07ddf8caa5020f84b5f65a48470519f78ba" + integrity sha512-bnlTVTwq03Na7DpWxFJ1dvnORob+Otb8xHyUqUWhqvz/Ksg8+JXPlR52oeMSZ37YEOa5PyccbgUNutiQdi13TA== dependencies: "@types/node" "*" @@ -6593,15 +6579,10 @@ "@types/node" "*" form-data "^3.0.0" -"@types/node@*", "@types/node@>= 8": - version "14.0.26" - resolved "https://registry.npmjs.org/@types/node/-/node-14.0.26.tgz#22a3b8a46510da8944b67bfc27df02c34a35331c" - integrity sha512-W+fpe5s91FBGE0pEa0lnqGLL4USgpLgs4nokw16SrBBco/gQxuua7KnArSEOd5iaMqbbSHV10vUDkJYJJqpXKA== - -"@types/node@>=12.12.47": - version "14.14.31" - resolved "https://registry.npmjs.org/@types/node/-/node-14.14.31.tgz#72286bd33d137aa0d152d47ec7c1762563d34055" - integrity sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g== +"@types/node@*", "@types/node@>= 8", "@types/node@>=12.12.47", "@types/node@^14.14.32": + version "14.14.32" + resolved "https://registry.npmjs.org/@types/node/-/node-14.14.32.tgz#90c5c4a8d72bbbfe53033f122341343249183448" + integrity sha512-/Ctrftx/zp4m8JOujM5ZhwzlWLx22nbQJiVqz8/zE15gOeEW+uly3FSX4fGFpcfEvFzXcMCJwq9lGVWgyARXhg== "@types/node@^10.1.0", "@types/node@^10.12.0": version "10.17.35" @@ -6618,11 +6599,6 @@ resolved "https://registry.npmjs.org/@types/node/-/node-13.13.45.tgz#e6676bcca092bae5751d015f074a234d5a82eb63" integrity sha512-703YTEp8AwQeapI0PTXDOj+Bs/mtdV/k9VcTP7z/de+lx6XjFMKdB+JhKnK+6PZ5za7omgZ3V6qm/dNkMj/Zow== -"@types/node@^14.14.32": - version "14.14.32" - resolved "https://registry.npmjs.org/@types/node/-/node-14.14.32.tgz#90c5c4a8d72bbbfe53033f122341343249183448" - integrity sha512-/Ctrftx/zp4m8JOujM5ZhwzlWLx22nbQJiVqz8/zE15gOeEW+uly3FSX4fGFpcfEvFzXcMCJwq9lGVWgyARXhg== - "@types/normalize-package-data@^2.4.0": version "2.4.0" resolved "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" From 3f21e46725ad9e1029f8eeb9b38ceca52ae1cbba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20Adel=C3=B6w?= Date: Tue, 23 Mar 2021 09:07:35 +0100 Subject: [PATCH 2/2] fix types in tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fredrik Adelöw --- plugins/app-backend/src/lib/config.test.ts | 8 ++++---- .../stages/templater/cookiecutter.test.ts | 14 ++++++-------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/plugins/app-backend/src/lib/config.test.ts b/plugins/app-backend/src/lib/config.test.ts index 95b34c8422..4018766ac9 100644 --- a/plugins/app-backend/src/lib/config.test.ts +++ b/plugins/app-backend/src/lib/config.test.ts @@ -36,7 +36,7 @@ const baseOptions = { describe('injectConfig', () => { beforeEach(() => { - fsMock.readdir.mockResolvedValue(['main.js']); + fsMock.readdir.mockResolvedValue(['main.js'] as any); }); afterEach(() => { @@ -44,7 +44,7 @@ describe('injectConfig', () => { }); it('should inject without config', async () => { - fsMock.readdir.mockResolvedValue(['main.js']); + fsMock.readdir.mockResolvedValue(['main.js'] as any); readFileMock.mockImplementation( async () => '"__APP_INJECTED_RUNTIME_CONFIG__"', ); @@ -68,7 +68,7 @@ describe('injectConfig', () => { 'not-js.txt', 'main.js', 'after.js', - ]); + ] as any); readFileMock.mockImplementation(async (file: string) => { if (file.endsWith('main.js')) { return '"__APP_INJECTED_RUNTIME_CONFIG__"'; @@ -111,7 +111,7 @@ describe('injectConfig', () => { }); it('should re-inject config', async () => { - fsMock.readdir.mockResolvedValue(['main.js']); + fsMock.readdir.mockResolvedValue(['main.js'] as any); readFileMock.mockResolvedValue( 'JSON.parse("__APP_INJECTED_RUNTIME_CONFIG__")', ); diff --git a/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.test.ts b/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.test.ts index 537aac3088..763572fda5 100644 --- a/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.test.ts +++ b/plugins/scaffolder-backend/src/scaffolder/stages/templater/cookiecutter.test.ts @@ -48,7 +48,7 @@ describe('CookieCutter Templater', () => { }, }; - jest.spyOn(fs, 'readdir').mockResolvedValueOnce(['newthing']); + jest.spyOn(fs, 'readdir').mockResolvedValueOnce(['newthing'] as any); const templater = new CookieCutter(); await templater.run({ @@ -72,7 +72,7 @@ describe('CookieCutter Templater', () => { jest .spyOn(fs, 'readJSON') .mockImplementationOnce(() => Promise.resolve(existingJson)); - jest.spyOn(fs, 'readdir').mockResolvedValueOnce(['newthing']); + jest.spyOn(fs, 'readdir').mockResolvedValueOnce(['newthing'] as any); const values = { owner: 'blobby', @@ -135,12 +135,10 @@ describe('CookieCutter Templater', () => { }, }; - jest.spyOn(fs, 'readdir').mockResolvedValueOnce(['newthing']); + jest.spyOn(fs, 'readdir').mockResolvedValueOnce(['newthing'] as any); jest .spyOn(fs, 'realpath') - .mockImplementation((filePath: string | Buffer) => - Promise.resolve(filePath as string), - ); + .mockImplementation(x => Promise.resolve(x.toString())); const templater = new CookieCutter(); await templater.run({ @@ -182,7 +180,7 @@ describe('CookieCutter Templater', () => { }, }; - jest.spyOn(fs, 'readdir').mockResolvedValueOnce(['newthing']); + jest.spyOn(fs, 'readdir').mockResolvedValueOnce(['newthing'] as any); const templater = new CookieCutter(); await templater.run({ @@ -226,7 +224,7 @@ describe('CookieCutter Templater', () => { }, }; - jest.spyOn(fs, 'readdir').mockResolvedValueOnce(['newthing']); + jest.spyOn(fs, 'readdir').mockResolvedValueOnce(['newthing'] as any); commandExists.mockImplementationOnce(() => () => true); const templater = new CookieCutter();