From 9fe5520a641d7529b935eda0f532b64d0dfa6d44 Mon Sep 17 00:00:00 2001 From: Vladimir Lewandowski Date: Fri, 13 May 2022 21:58:14 +0400 Subject: [PATCH 1/2] Add: React 18 support --- package-lock.json | 3 ++- packages/brandi-react/package.json | 2 +- packages/brandi-react/src/conditions/ConditionsProvider.tsx | 1 + packages/brandi-react/src/container/ContainerProvider.tsx | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 99c2fe0..a959e96 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,7 @@ "requires": true, "packages": { "": { + "name": "brandi-workspace", "license": "ISC", "workspaces": [ "./packages/*" @@ -8660,7 +8661,7 @@ "license": "ISC", "peerDependencies": { "brandi": "^3 || ^4", - "react": "^16.8.0 || ^17" + "react": "^16.8.0 || ^17 || ^18" } } }, diff --git a/packages/brandi-react/package.json b/packages/brandi-react/package.json index bb1f97b..f66bf22 100644 --- a/packages/brandi-react/package.json +++ b/packages/brandi-react/package.json @@ -48,6 +48,6 @@ ], "peerDependencies": { "brandi": "^3 || ^4", - "react": "^16.8.0 || ^17" + "react": "^16.8.0 || ^17 || ^18" } } diff --git a/packages/brandi-react/src/conditions/ConditionsProvider.tsx b/packages/brandi-react/src/conditions/ConditionsProvider.tsx index a6ec34e..71bad29 100644 --- a/packages/brandi-react/src/conditions/ConditionsProvider.tsx +++ b/packages/brandi-react/src/conditions/ConditionsProvider.tsx @@ -5,6 +5,7 @@ import { ConditionsContext } from './ConditionsContext'; import { useConditions } from './useConditions'; export const ConditionsProvider: React.FunctionComponent<{ + children?: React.ReactNode; conditions: ResolutionCondition[]; isolated?: boolean; }> = ({ children, conditions, isolated = false }) => { diff --git a/packages/brandi-react/src/container/ContainerProvider.tsx b/packages/brandi-react/src/container/ContainerProvider.tsx index e0dcc1f..3a5bd56 100644 --- a/packages/brandi-react/src/container/ContainerProvider.tsx +++ b/packages/brandi-react/src/container/ContainerProvider.tsx @@ -5,6 +5,7 @@ import { ContainerContext } from './ContainerContext'; import { useContainer } from './useContainer'; export const ContainerProvider: React.FunctionComponent<{ + children?: React.ReactNode; container: Container; isolated?: boolean; }> = ({ children, container, isolated = false }) => { From b5115b7da2e7e7977662fc739fd447e483453a9e Mon Sep 17 00:00:00 2001 From: Vladimir Lewandowski Date: Fri, 13 May 2022 22:11:23 +0400 Subject: [PATCH 2/2] Sets: package versions to `4.0.2` --- package-lock.json | 4 ++-- packages/brandi-react/package.json | 2 +- packages/brandi/package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index a959e96..4bf5769 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8653,11 +8653,11 @@ } }, "packages/brandi": { - "version": "4.0.1", + "version": "4.0.2", "license": "ISC" }, "packages/brandi-react": { - "version": "4.0.1", + "version": "4.0.2", "license": "ISC", "peerDependencies": { "brandi": "^3 || ^4", diff --git a/packages/brandi-react/package.json b/packages/brandi-react/package.json index f66bf22..9ab4f5a 100644 --- a/packages/brandi-react/package.json +++ b/packages/brandi-react/package.json @@ -1,6 +1,6 @@ { "name": "brandi-react", - "version": "4.0.1", + "version": "4.0.2", "description": "React bindings for Brandi — the dependency injection container.", "main": "./lib/brandi-react.js", "module": "./lib/brandi-react.mjs", diff --git a/packages/brandi/package.json b/packages/brandi/package.json index 1d4357e..6f47a0e 100644 --- a/packages/brandi/package.json +++ b/packages/brandi/package.json @@ -1,6 +1,6 @@ { "name": "brandi", - "version": "4.0.1", + "version": "4.0.2", "description": "The dependency injection container.", "main": "./lib/brandi.js", "module": "./lib/brandi.mjs",