From 0b16ff573756f08bf9b9b7481c3e197f17053c15 Mon Sep 17 00:00:00 2001 From: neilime Date: Mon, 17 Jan 2022 18:46:47 +0000 Subject: [PATCH] Publish - @ts-dev-tools/core@1.5.13 - @ts-dev-tools/react@1.5.13 --- packages/core/CHANGELOG.md | 8 ++++++++ packages/core/package.json | 2 +- packages/core/src/services/PackageJsonMerge.ts | 3 +-- packages/react/CHANGELOG.md | 8 ++++++++ packages/react/package.json | 4 ++-- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md index e7e1fcf9..340a2095 100644 --- a/packages/core/CHANGELOG.md +++ b/packages/core/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## 1.5.13 (2022-01-17) + +**Note:** Version bump only for package @ts-dev-tools/core + + + + + ## 1.5.12 (2022-01-12) **Note:** Version bump only for package @ts-dev-tools/core diff --git a/packages/core/package.json b/packages/core/package.json index 41d10271..3bd8aee7 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@ts-dev-tools/core", - "version": "1.5.12", + "version": "1.5.13", "description": "TS dev tools Core", "keywords": [ "linter", diff --git a/packages/core/src/services/PackageJsonMerge.ts b/packages/core/src/services/PackageJsonMerge.ts index af5f425b..6a4abdd0 100644 --- a/packages/core/src/services/PackageJsonMerge.ts +++ b/packages/core/src/services/PackageJsonMerge.ts @@ -34,8 +34,7 @@ export class PackageJsonMerge { } private static mergeObjects(source: JsonFileData, update: JsonFileData): JsonFileData { - const updateKeys = Object.keys(update); - for (const updateKey of updateKeys) { + for (const updateKey in update) { source[updateKey] = PackageJsonMerge.mergeValues(source[updateKey], update[updateKey]); } return source; diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md index 27c8e039..0743df7f 100644 --- a/packages/react/CHANGELOG.md +++ b/packages/react/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## 1.5.13 (2022-01-17) + +**Note:** Version bump only for package @ts-dev-tools/react + + + + + ## 1.5.12 (2022-01-12) **Note:** Version bump only for package @ts-dev-tools/react diff --git a/packages/react/package.json b/packages/react/package.json index d28fc281..64c1d6ca 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -1,6 +1,6 @@ { "name": "@ts-dev-tools/react", - "version": "1.5.12", + "version": "1.5.13", "description": "TS dev tools for React", "keywords": [ "linter", @@ -41,7 +41,7 @@ "@testing-library/jest-dom": "^5.16.1", "@testing-library/react": "^12.1.2", "@testing-library/react-hooks": "^7.0.2", - "@ts-dev-tools/core": "^1.5.12", + "@ts-dev-tools/core": "^1.5.13", "@types/react": "^17.0.38", "@types/react-dom": "^17.0.11", "eslint-plugin-react": "^7.28.0",