resolved merge conflicts

jarebudev · jarebudev · commit 9825c826ca9e · 2025-01-02T20:19:28.000Z
Signed-off-by: jarebudev &lt;23311805+jarebudev@users.noreply.github.com&gt;
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -24,7 +24,7 @@ jobs:
           fetch-depth: 0
           submodules: recursive
 
-      - uses: bufbuild/buf-setup-action@v1.45.0
+      - uses: bufbuild/buf-setup-action@1115d0acd3d2a120b30023fac52abc46807c8fd6 # v1.48.0
         with:
           github_token: ${{ github.token }}
       - name: Setup Node
diff --git a/.gitmodules b/.gitmodules
@@ -13,6 +13,7 @@
 [submodule "libs/shared/flagd-core/test-harness"]
 	path = libs/shared/flagd-core/test-harness
 	url = https://github.com/open-feature/flagd-testbed
+	branch = v0.5.20
 [submodule "libs/shared/flagd-core/spec"]
 	path = libs/shared/flagd-core/spec
 	url = https://github.com/open-feature/spec
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -15,7 +15,7 @@
   "libs/providers/flagsmith-client": "0.1.2",
   "libs/providers/flipt-web": "0.1.1",
   "libs/providers/multi-provider": "0.1.2",
-  "libs/providers/multi-provider-web": "0.0.2",
+  "libs/providers/multi-provider-web": "0.0.3",
   "libs/providers/growthbook-client": "0.1.2",
   "libs/providers/config-cat-web": "0.1.3",
   "libs/shared/config-cat-core": "0.1.0",
diff --git a/libs/providers/flagd/docker-compose.yaml b/libs/providers/flagd/docker-compose.yaml
@@ -1,14 +1,14 @@
 services:
   flagd:
-    image: ghcr.io/open-feature/flagd-testbed:v0.5.13
+    image: ghcr.io/open-feature/flagd-testbed:v0.5.20
     ports:
       - 8013:8013
   flagd-unstable:
-    image: ghcr.io/open-feature/flagd-testbed-unstable:v0.5.13
+    image: ghcr.io/open-feature/flagd-testbed-unstable:v0.5.20
     ports:
       - 8014:8013
   flagd-sync:
-    image: ghcr.io/open-feature/sync-testbed:v0.5.13
+    image: ghcr.io/open-feature/sync-testbed:v0.5.20
     ports:
       - 9090:9090
   flagd-sync-unstable:
diff --git a/libs/providers/flagd/spec b/libs/providers/flagd/spec
@@ -1 +1 @@
-Subproject commit ffebdecd725ed1a19c96927f66472c86e97ce551
+Subproject commit ed0f9ef5a3fb4d66f51b9467d8064c82a6b4d930
diff --git a/libs/providers/flagsmith-client/package-lock.json b/libs/providers/flagsmith-client/package-lock.json
diff --git a/libs/providers/flagsmith-client/package.json b/libs/providers/flagsmith-client/package.json
@@ -12,6 +12,6 @@
   },
   "peerDependencies": {
     "@openfeature/web-sdk": "^1.0.0",
-    "flagsmith": "4.0.0"
+    "flagsmith": "4.1.4"
   }
 }
diff --git a/libs/providers/multi-provider-web/CHANGELOG.md b/libs/providers/multi-provider-web/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.0.3](https://github.com/open-feature/js-sdk-contrib/compare/multi-provider-web-v0.0.2...multi-provider-web-v0.0.3) (2024-12-24)
+
+
+### 🧹 Chore
+
+* update sdks, absorb changes ([#1119](https://github.com/open-feature/js-sdk-contrib/issues/1119)) ([456be7c](https://github.com/open-feature/js-sdk-contrib/commit/456be7c81547478062ef16ac86ad05be71ab6c80))
+
 ## [0.0.2](https://github.com/open-feature/js-sdk-contrib/compare/multi-provider-web-v0.0.1...multi-provider-web-v0.0.2) (2024-06-27)
 
 
diff --git a/libs/providers/multi-provider-web/package.json b/libs/providers/multi-provider-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@openfeature/multi-provider-web",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "dependencies": {
     "tslib": "^2.3.0"
   },
diff --git a/libs/shared/config-cat-core/package-lock.json b/libs/shared/config-cat-core/package-lock.json
diff --git a/libs/shared/config-cat-core/package.json b/libs/shared/config-cat-core/package.json
@@ -6,6 +6,6 @@
     "current-version": "echo $npm_package_version"
   },
   "peerDependencies": {
-    "@openfeature/core": "<=1.0.0"
+    "@openfeature/core": "<=1.6.0"
   }
 }
diff --git a/libs/shared/flagd-core/flagd-schemas b/libs/shared/flagd-core/flagd-schemas
@@ -1 +1 @@
-Subproject commit 76d611fd94689d906af316105ac12670d40f7648
+Subproject commit b81a56eea3b2c4c543a50d4f7f79a8f32592a0af
diff --git a/libs/shared/flagd-core/spec b/libs/shared/flagd-core/spec
@@ -1 +1 @@
-Subproject commit ffebdecd725ed1a19c96927f66472c86e97ce551
+Subproject commit ed0f9ef5a3fb4d66f51b9467d8064c82a6b4d930
diff --git a/libs/shared/flagd-core/test-harness b/libs/shared/flagd-core/test-harness
@@ -1 +1 @@
-Subproject commit 36b07d5bddbe854e05e60f5ea93ca70cf1a7b5c5
+Subproject commit 706a7e951bb72a145523b38fe83060becc34c4d7
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -26,19 +26,19 @@
     "@protobuf-ts/runtime-rpc": "^2.9.0",
     "@swc/helpers": "0.5.13",
     "ajv": "^8.12.0",
-    "axios": "1.7.7",
+    "axios": "1.7.9",
     "configcat-js-ssr": "^8.4.3",
     "configcat-node": "^11.3.1",
     "copy-anything": "^3.0.5",
     "flagsmith": "^4.0.0",
     "imurmurhash": "^0.1.4",
-    "json-logic-engine": "1.3.6",
+    "json-logic-engine": "1.3.9",
     "launchdarkly-js-client-sdk": "^3.1.3",
     "lodash.isempty": "^4.4.0",
     "lodash.isequal": "^4.5.0",
     "lru-cache": "^11.0.0",
     "object-hash": "^3.0.0",
-    "tslib": "2.8.0",
+    "tslib": "2.8.1",
     "unleash-proxy-client": "^3.6.0"
   },
   "devDependencies": {
@@ -65,7 +65,7 @@
     "@types/jest": "29.5.14",
     "@types/lodash.isempty": "^4.4.7",
     "@types/lodash.isequal": "^4.5.6",
-    "@types/node": "20.17.9",
+    "@types/node": "20.17.10",
     "@types/object-hash": "^3.0.0",
     "@types/semver": "^7.5.4",
     "@typescript-eslint/eslint-plugin": "5.62.0",
diff --git a/renovate.json b/renovate.json
@@ -1,12 +1,6 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    "config:base"
-  ],
-  "semanticCommits": "enabled",
-  "labels": [
-    "renovate"
-  ],
+  "extends": ["github>open-feature/community-tooling"],
   "packageRules": [
     {
       "matchPackagePatterns": ["^@nx/", "nx"],

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@`
`12`	`12`	`},`
`13`	`13`	`"peerDependencies": {`
`14`	`14`	`"@openfeature/web-sdk": "^1.0.0",`
`15`		`- "flagsmith": "4.0.0"`
	`15`	`+ "flagsmith": "4.1.4"`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@openfeature/multi-provider-web",`
`3`		`- "version": "0.0.2",`
	`3`	`+ "version": "0.0.3",`
`4`	`4`	`"dependencies": {`
`5`	`5`	`"tslib": "^2.3.0"`
`6`	`6`	`},`