From ee56b7bf5b1821daa20ff137185b08457d575726 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 10 Mar 2021 09:57:06 +0000 Subject: [PATCH 1/3] chore(deps): update dependency type-fest to v0.21.3 --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 0e2f24622..9ceaeb70e 100644 --- a/package.json +++ b/package.json @@ -132,7 +132,7 @@ "ts-jest": "26.5.3", "ts-node": "9.1.1", "tslint": "6.1.3", - "type-fest": "0.21.2", + "type-fest": "0.21.3", "typescript": "4.2.3" } } diff --git a/yarn.lock b/yarn.lock index 41736b396..1482f8ee5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10468,10 +10468,10 @@ type-detect@4.0.8: resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" integrity sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g== -type-fest@0.21.2: - version "0.21.2" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.2.tgz#43b9dc71d9dc5593ea71bf7b0e013ec10f838249" - integrity sha512-pvQl0WNazvfQ0rq2XDdhpWv49sohh2t+buFbglaJ9N9+Xj4BhFRpuo+uJxemeARteRxRloJ1m+8gBR6Z2Nfktg== +type-fest@0.21.3: + version "0.21.3" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" + integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== type-fest@^0.11.0: version "0.11.0" From 23b0f6ff93a495b6c542b13f5b7825402d76e6fc Mon Sep 17 00:00:00 2001 From: "hidde.wieringa" Date: Wed, 10 Mar 2021 13:10:54 +0100 Subject: [PATCH 2/3] fix: add overwrite: true to overwrite on existing file --- .../services/version-manager.service.spec.ts | 20 +++++++++---------- .../app/services/version-manager.service.ts | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apps/generator-cli/src/app/services/version-manager.service.spec.ts b/apps/generator-cli/src/app/services/version-manager.service.spec.ts index e080abd4c..f40df5edd 100644 --- a/apps/generator-cli/src/app/services/version-manager.service.spec.ts +++ b/apps/generator-cli/src/app/services/version-manager.service.spec.ts @@ -1,14 +1,14 @@ -import { Test } from '@nestjs/testing'; -import { Version, VersionManagerService } from './version-manager.service'; -import { HttpService } from '@nestjs/common'; -import { of } from 'rxjs'; -import { mocked } from 'ts-jest/utils'; -import { LOGGER } from '../constants'; +import {Test} from '@nestjs/testing'; +import {Version, VersionManagerService} from './version-manager.service'; +import {HttpService} from '@nestjs/common'; +import {of} from 'rxjs'; +import {mocked} from 'ts-jest/utils'; +import {LOGGER} from '../constants'; import * as chalk from 'chalk'; -import { ConfigService } from './config.service'; -import { resolve } from 'path'; +import {ConfigService} from './config.service'; +import {resolve} from 'path'; import * as os from 'os'; -import { TestingModule } from '@nestjs/testing/testing-module'; +import {TestingModule} from '@nestjs/testing/testing-module'; jest.mock('fs-extra'); // eslint-disable-next-line @typescript-eslint/no-var-requires @@ -450,7 +450,7 @@ describe('VersionManagerService', () => { }); it('moves the file to the target location', () => { - expect(fs.moveSync).toHaveBeenNthCalledWith(1, '/tmp/generator-cli-abcDEF/4.2.0', `${fixture.storage}/4.2.0.jar`); + expect(fs.moveSync).toHaveBeenNthCalledWith(1, '/tmp/generator-cli-abcDEF/4.2.0', `${fixture.storage}/4.2.0.jar`, {overwrite: true}); }); it('receives the data piped', () => { diff --git a/apps/generator-cli/src/app/services/version-manager.service.ts b/apps/generator-cli/src/app/services/version-manager.service.ts index 8128c749a..3ac377c2f 100644 --- a/apps/generator-cli/src/app/services/version-manager.service.ts +++ b/apps/generator-cli/src/app/services/version-manager.service.ts @@ -116,7 +116,7 @@ export class VersionManagerService { const file = fs.createWriteStream(temporaryFilePath); res.data.pipe(file); file.on('finish', content => { - fs.moveSync(temporaryFilePath, filePath); + fs.moveSync(temporaryFilePath, filePath, {overwrite: true}); resolve(content); }); }) From b36d24ee7cc55af4f0b4a62b092ae02cf283ec58 Mon Sep 17 00:00:00 2001 From: "hidde.wieringa" Date: Wed, 10 Mar 2021 13:16:48 +0100 Subject: [PATCH 3/3] Revert formatting --- .../services/version-manager.service.spec.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/generator-cli/src/app/services/version-manager.service.spec.ts b/apps/generator-cli/src/app/services/version-manager.service.spec.ts index f40df5edd..989d92d1f 100644 --- a/apps/generator-cli/src/app/services/version-manager.service.spec.ts +++ b/apps/generator-cli/src/app/services/version-manager.service.spec.ts @@ -1,14 +1,14 @@ -import {Test} from '@nestjs/testing'; -import {Version, VersionManagerService} from './version-manager.service'; -import {HttpService} from '@nestjs/common'; -import {of} from 'rxjs'; -import {mocked} from 'ts-jest/utils'; -import {LOGGER} from '../constants'; +import { Test } from '@nestjs/testing'; +import { Version, VersionManagerService } from './version-manager.service'; +import { HttpService } from '@nestjs/common'; +import { of } from 'rxjs'; +import { mocked } from 'ts-jest/utils'; +import { LOGGER } from '../constants'; import * as chalk from 'chalk'; -import {ConfigService} from './config.service'; -import {resolve} from 'path'; +import { ConfigService } from './config.service'; +import { resolve } from 'path'; import * as os from 'os'; -import {TestingModule} from '@nestjs/testing/testing-module'; +import { TestingModule } from '@nestjs/testing/testing-module'; jest.mock('fs-extra'); // eslint-disable-next-line @typescript-eslint/no-var-requires