Skip to content

Commit 2f3bc65

Browse files
committed
Address PR feedback and resolve main merge conflicts
- openfeature-node-provider example: drop unreachable null-check, use side-effect import for ./reflag plus type-only CreateTodosConfig - .changeset/config.json: remove stale @reflag/eslint-config ignore entry (package was removed in this branch) - node-sdk: bump vite devDependency to ~6.4.2 to match main and reorder package.json fields so it auto-merges against main - yarn.lock: refresh for vite 6.4.2
1 parent e009d4c commit 2f3bc65

4 files changed

Lines changed: 59 additions & 8 deletions

File tree

.changeset/config.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"baseBranch": "main",
99
"updateInternalDependencies": "patch",
1010
"ignore": [
11-
"@reflag/eslint-config",
1211
"@reflag/tsconfig",
1312
"customer-admin-panel",
1413
"nextjs-bootstrap-demo",

packages/node-sdk/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"flush-promises": "~1.0.2",
4646
"ts-node": "~10.9.2",
4747
"typescript": "^5.7.3",
48-
"vite": "~5.4.18",
48+
"vite": "~6.4.2",
4949
"vite-plugin-dts": "~3.9.1",
5050
"vitest": "~1.6.0"
5151
}

packages/openfeature-node-provider/example/app.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
import { EvaluationContext, OpenFeature } from "@openfeature/server-sdk";
22
import express from "express";
33

4-
import reflagProvider, { type CreateTodosConfig } from "./reflag";
5-
6-
if (!reflagProvider) {
7-
throw new Error("Failed to initialize Reflag provider");
8-
}
4+
import "./reflag";
5+
import type { CreateTodosConfig } from "./reflag";
96

107
// In the following, we assume that targetingKey is a unique identifier for the user.
118
type Context = EvaluationContext & {

yarn.lock

Lines changed: 56 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6525,7 +6525,7 @@ __metadata:
65256525
flush-promises: "npm:~1.0.2"
65266526
ts-node: "npm:~10.9.2"
65276527
typescript: "npm:^5.7.3"
6528-
vite: "npm:~5.4.18"
6528+
vite: "npm:~6.4.2"
65296529
vite-plugin-dts: "npm:~3.9.1"
65306530
vitest: "npm:~1.6.0"
65316531
languageName: unknown
@@ -23454,6 +23454,61 @@ __metadata:
2345423454
languageName: node
2345523455
linkType: hard
2345623456

23457+
"vite@npm:~6.4.2":
23458+
version: 6.4.2
23459+
resolution: "vite@npm:6.4.2"
23460+
dependencies:
23461+
esbuild: "npm:^0.25.0"
23462+
fdir: "npm:^6.4.4"
23463+
fsevents: "npm:~2.3.3"
23464+
picomatch: "npm:^4.0.2"
23465+
postcss: "npm:^8.5.3"
23466+
rollup: "npm:^4.34.9"
23467+
tinyglobby: "npm:^0.2.13"
23468+
peerDependencies:
23469+
"@types/node": ^18.0.0 || ^20.0.0 || >=22.0.0
23470+
jiti: ">=1.21.0"
23471+
less: "*"
23472+
lightningcss: ^1.21.0
23473+
sass: "*"
23474+
sass-embedded: "*"
23475+
stylus: "*"
23476+
sugarss: "*"
23477+
terser: ^5.16.0
23478+
tsx: ^4.8.1
23479+
yaml: ^2.4.2
23480+
dependenciesMeta:
23481+
fsevents:
23482+
optional: true
23483+
peerDependenciesMeta:
23484+
"@types/node":
23485+
optional: true
23486+
jiti:
23487+
optional: true
23488+
less:
23489+
optional: true
23490+
lightningcss:
23491+
optional: true
23492+
sass:
23493+
optional: true
23494+
sass-embedded:
23495+
optional: true
23496+
stylus:
23497+
optional: true
23498+
sugarss:
23499+
optional: true
23500+
terser:
23501+
optional: true
23502+
tsx:
23503+
optional: true
23504+
yaml:
23505+
optional: true
23506+
bin:
23507+
vite: bin/vite.js
23508+
checksum: 10c0/9a62bb4259b4b11b9084c8dc5c25a21c9340d87d83de163d3643f15629d8ac3c2a3a4cda565f1a61e98afc9d78e9cb78eb25d1ae3c302e95d42d13ab61537267
23509+
languageName: node
23510+
linkType: hard
23511+
2345723512
"vitest@npm:^2.0.4, vitest@npm:^2.0.5":
2345823513
version: 2.1.9
2345923514
resolution: "vitest@npm:2.1.9"

0 commit comments

Comments
 (0)