diff --git a/bin/bundle.ts b/bin/bundle.ts index 5e2efa90..776ef4f2 100644 --- a/bin/bundle.ts +++ b/bin/bundle.ts @@ -12,7 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -import { cli } from "https://deno.land/x/cobra@v0.0.9/mod.ts"; +import { cli } from "jsr:@aricart/cobra@0.0.13"; import * as esbuild from "npm:esbuild@0.20.2"; // Import the Wasm build on platforms where running subprocesses is not // permitted, such as Deno Deploy, or when running without `--allow-run`. diff --git a/bin/check-dep-versions.ts b/bin/check-dep-versions.ts index dc0458c1..b8a7fbd3 100644 --- a/bin/check-dep-versions.ts +++ b/bin/check-dep-versions.ts @@ -300,6 +300,15 @@ for (const dir of dirs) { dmm.update(moduleName, v); await dmm.store(d); } + + const onuid = dmm.has("@nats-io/nuid"); + if (onuid) { + nuid = nuid.max(onuid); + } + const onkeys = dmm.has("@nats-io/nkeys"); + if (onkeys) { + nkeys = nkeys.max(onkeys); + } } const nmm = await NodeModule.load(d); if (nmm) { @@ -334,12 +343,32 @@ for (const d of dirs) { dmm.update("@nats-io/nuid", nuid); await dmm.store(d); } + if (dmm.has("@nats-io/nkeys")) { + dmm.update("@nats-io/nkeys", nkeys); + await dmm.store(d); + } } const nmm = await NodeModule.load(d); if (nmm) { + if (nmm.has("@nats-io/nuid")) { + nmm.update("@nats-io/nuid", nuid); + await nmm.store(d); + } if (nmm.has("@nats-io/nkeys")) { nmm.update("@nats-io/nkeys", nkeys); await nmm.store(d); } } + + const map = await ImportMap.load(d); + if (map) { + if (map.has("@nats-io/nuid")) { + map.update("@nats-io/nuid", nuid); + await map.store(d); + } + if (map.has("@nats-io/nkeys")) { + map.update("@nats-io/nkeys", nkeys); + await map.store(d); + } + } } diff --git a/core/deno.json b/core/deno.json index 928199e3..06596aa7 100644 --- a/core/deno.json +++ b/core/deno.json @@ -1,6 +1,6 @@ { "name": "@nats-io/nats-core", - "version": "3.0.0-40", + "version": "3.0.0-42", "exports": { ".": "./src/mod.ts", "./internal": "./src/internal_mod.ts" @@ -35,7 +35,7 @@ "test": "deno test -A --parallel --reload tests/ --import-map=./import_map.json" }, "imports": { - "@nats-io/nkeys": "jsr:@nats-io/nkeys@1.2.0-7", + "@nats-io/nkeys": "jsr:@nats-io/nkeys@~2.0.0-2", "@nats-io/nuid": "jsr:@nats-io/nuid@2.0.1-2" } } diff --git a/core/package.json b/core/package.json index 4603584d..ca2f7adb 100644 --- a/core/package.json +++ b/core/package.json @@ -1,6 +1,6 @@ { "name": "@nats-io/nats-core", - "version": "3.0.0-40", + "version": "3.0.0-42", "files": [ "lib/", "LICENSE", @@ -34,7 +34,7 @@ }, "description": "nats-core library - this library implements all the base functionality for NATS javascript clients", "dependencies": { - "@nats-io/nkeys": "1.2.0-7", + "@nats-io/nkeys": "2.0.0-2", "@nats-io/nuid": "2.0.1-2" }, "devDependencies": { diff --git a/core/src/version.ts b/core/src/version.ts index e4c5506f..ad89dca5 100644 --- a/core/src/version.ts +++ b/core/src/version.ts @@ -1,2 +1,2 @@ // This file is generated - do not edit -export const version = "3.0.0-40"; +export const version = "3.0.0-42"; diff --git a/deno.json b/deno.json index 034e8e21..3e4dc712 100644 --- a/deno.json +++ b/deno.json @@ -70,5 +70,6 @@ "./kv", "./obj", "./services" - ] + ], + "nodeModulesDir": "auto" } diff --git a/jetstream/deno.json b/jetstream/deno.json index 9fba6ed2..99d26b90 100644 --- a/jetstream/deno.json +++ b/jetstream/deno.json @@ -1,6 +1,6 @@ { "name": "@nats-io/jetstream", - "version": "3.0.0-27", + "version": "3.0.0-29", "exports": { ".": "./src/mod.ts", "./internal": "./src/internal_mod.ts" @@ -33,6 +33,6 @@ "test": "deno test -A --parallel --reload --trace-leaks --quiet tests/ --import-map=import_map.json" }, "imports": { - "@nats-io/nats-core": "jsr:@nats-io/nats-core@~3.0.0-40" + "@nats-io/nats-core": "jsr:@nats-io/nats-core@~3.0.0-42" } } diff --git a/jetstream/import_map.json b/jetstream/import_map.json index 21ecb6aa..59259918 100644 --- a/jetstream/import_map.json +++ b/jetstream/import_map.json @@ -1,9 +1,9 @@ { "imports": { - "@nats-io/nkeys": "jsr:@nats-io/nkeys@1.2.0-4", - "@nats-io/nuid": "jsr:@nats-io/nuid@2.0.1-2", - "@nats-io/nats-core": "jsr:@nats-io/nats-core@~3.0.0-40", - "@nats-io/nats-core/internal": "jsr:@nats-io/nats-core@~3.0.0-40/internal", + "@nats-io/nkeys": "jsr:@nats-io/nkeys@~2.0.0-2", + "@nats-io/nuid": "jsr:@nats-io/nuid@~2.0.1-2", + "@nats-io/nats-core": "jsr:@nats-io/nats-core@~3.0.0-42", + "@nats-io/nats-core/internal": "jsr:@nats-io/nats-core@~3.0.0-42/internal", "test_helpers": "../test_helpers/mod.ts", "@std/io": "jsr:@std/io@0.224.0" } diff --git a/jetstream/package.json b/jetstream/package.json index 0904c61b..14802392 100644 --- a/jetstream/package.json +++ b/jetstream/package.json @@ -1,6 +1,6 @@ { "name": "@nats-io/jetstream", - "version": "3.0.0-27", + "version": "3.0.0-29", "files": [ "lib/", "LICENSE", @@ -34,7 +34,7 @@ }, "description": "jetstream library - this library implements all the base functionality for NATS JetStream for javascript clients", "dependencies": { - "@nats-io/nats-core": "3.0.0-40" + "@nats-io/nats-core": "3.0.0-42" }, "devDependencies": { "@types/node": "^22.7.6", diff --git a/kv/deno.json b/kv/deno.json index 920f0fc1..bf5dc963 100644 --- a/kv/deno.json +++ b/kv/deno.json @@ -1,6 +1,6 @@ { "name": "@nats-io/kv", - "version": "3.0.0-21", + "version": "3.0.0-23", "exports": { ".": "./src/mod.ts", "./internal": "./src/internal_mod.ts" @@ -33,7 +33,7 @@ "test": "deno test -A --parallel --reload --quiet tests/ --import-map=import_map.json" }, "imports": { - "@nats-io/nats-core": "jsr:@nats-io/nats-core@~3.0.0-40", - "@nats-io/jetstream": "jsr:@nats-io/jetstream@~3.0.0-27" + "@nats-io/nats-core": "jsr:@nats-io/nats-core@~3.0.0-42", + "@nats-io/jetstream": "jsr:@nats-io/jetstream@~3.0.0-29" } } diff --git a/kv/import_map.json b/kv/import_map.json index 651e0564..aa1ab048 100644 --- a/kv/import_map.json +++ b/kv/import_map.json @@ -1,12 +1,12 @@ { "imports": { - "@nats-io/nats-core": "jsr:@nats-io/nats-core@~3.0.0-40", - "@nats-io/nats-core/internal": "jsr:@nats-io/nats-core@~3.0.0-40/internal", - "@nats-io/jetstream": "jsr:@nats-io/jetstream@~3.0.0-27", - "@nats-io/jetstream/internal": "jsr:@nats-io/jetstream@~3.0.0-27/internal", + "@nats-io/nats-core": "jsr:@nats-io/nats-core@~3.0.0-42", + "@nats-io/nats-core/internal": "jsr:@nats-io/nats-core@~3.0.0-42/internal", + "@nats-io/jetstream": "jsr:@nats-io/jetstream@~3.0.0-29", + "@nats-io/jetstream/internal": "jsr:@nats-io/jetstream@~3.0.0-29/internal", "test_helpers": "../test_helpers/mod.ts", - "@nats-io/nkeys": "jsr:@nats-io/nkeys@1.2.0-4", - "@nats-io/nuid": "jsr:@nats-io/nuid@2.0.1-2", + "@nats-io/nkeys": "jsr:@nats-io/nkeys@~2.0.0-2", + "@nats-io/nuid": "jsr:@nats-io/nuid@~2.0.1-2", "@std/io": "jsr:@std/io@0.224.0" } } diff --git a/kv/package.json b/kv/package.json index 1e0fa052..d34228df 100644 --- a/kv/package.json +++ b/kv/package.json @@ -1,6 +1,6 @@ { "name": "@nats-io/kv", - "version": "3.0.0-21", + "version": "3.0.0-23", "files": [ "lib/", "LICENSE", @@ -34,8 +34,8 @@ }, "description": "kv library - this library implements all the base functionality for NATS KV javascript clients", "dependencies": { - "@nats-io/jetstream": "3.0.0-27", - "@nats-io/nats-core": "3.0.0-40" + "@nats-io/jetstream": "3.0.0-29", + "@nats-io/nats-core": "3.0.0-42" }, "devDependencies": { "@types/node": "^22.7.6", diff --git a/obj/deno.json b/obj/deno.json index d8265c1f..3b8f52de 100644 --- a/obj/deno.json +++ b/obj/deno.json @@ -1,6 +1,6 @@ { "name": "@nats-io/obj", - "version": "3.0.0-22", + "version": "3.0.0-24", "exports": { ".": "./src/mod.ts", "./internal": "./src/internal_mod.ts" @@ -33,7 +33,7 @@ "test": "deno test -A --parallel --reload --quiet tests/ --import-map=import_map.json" }, "imports": { - "@nats-io/nats-core": "jsr:@nats-io/nats-core@~3.0.0-40", - "@nats-io/jetstream": "jsr:@nats-io/jetstream@~3.0.0-27" + "@nats-io/nats-core": "jsr:@nats-io/nats-core@~3.0.0-42", + "@nats-io/jetstream": "jsr:@nats-io/jetstream@~3.0.0-29" } } diff --git a/obj/import_map.json b/obj/import_map.json index 651e0564..aa1ab048 100644 --- a/obj/import_map.json +++ b/obj/import_map.json @@ -1,12 +1,12 @@ { "imports": { - "@nats-io/nats-core": "jsr:@nats-io/nats-core@~3.0.0-40", - "@nats-io/nats-core/internal": "jsr:@nats-io/nats-core@~3.0.0-40/internal", - "@nats-io/jetstream": "jsr:@nats-io/jetstream@~3.0.0-27", - "@nats-io/jetstream/internal": "jsr:@nats-io/jetstream@~3.0.0-27/internal", + "@nats-io/nats-core": "jsr:@nats-io/nats-core@~3.0.0-42", + "@nats-io/nats-core/internal": "jsr:@nats-io/nats-core@~3.0.0-42/internal", + "@nats-io/jetstream": "jsr:@nats-io/jetstream@~3.0.0-29", + "@nats-io/jetstream/internal": "jsr:@nats-io/jetstream@~3.0.0-29/internal", "test_helpers": "../test_helpers/mod.ts", - "@nats-io/nkeys": "jsr:@nats-io/nkeys@1.2.0-4", - "@nats-io/nuid": "jsr:@nats-io/nuid@2.0.1-2", + "@nats-io/nkeys": "jsr:@nats-io/nkeys@~2.0.0-2", + "@nats-io/nuid": "jsr:@nats-io/nuid@~2.0.1-2", "@std/io": "jsr:@std/io@0.224.0" } } diff --git a/obj/package.json b/obj/package.json index 329c0f5e..fe3a7917 100644 --- a/obj/package.json +++ b/obj/package.json @@ -1,6 +1,6 @@ { "name": "@nats-io/obj", - "version": "3.0.0-22", + "version": "3.0.0-24", "files": [ "lib/", "LICENSE", @@ -34,8 +34,8 @@ }, "description": "obj library - this library implements all the base functionality for NATS objectstore for javascript clients", "dependencies": { - "@nats-io/jetstream": "3.0.0-27", - "@nats-io/nats-core": "3.0.0-40" + "@nats-io/jetstream": "3.0.0-29", + "@nats-io/nats-core": "3.0.0-42" }, "devDependencies": { "@types/node": "^22.7.6", diff --git a/services/deno.json b/services/deno.json index c24cc904..caa4442d 100644 --- a/services/deno.json +++ b/services/deno.json @@ -1,6 +1,6 @@ { "name": "@nats-io/services", - "version": "3.0.0-16", + "version": "3.0.0-18", "exports": { ".": "./src/mod.ts", "./internal": "./src/internal_mod.ts" @@ -33,6 +33,6 @@ "test": "deno test -A --parallel --reload --quiet tests/ --import-map=import_map.json" }, "imports": { - "@nats-io/nats-core": "jsr:@nats-io/nats-core@~3.0.0-40" + "@nats-io/nats-core": "jsr:@nats-io/nats-core@~3.0.0-42" } } diff --git a/services/import_map.json b/services/import_map.json index 55321f01..c7300feb 100644 --- a/services/import_map.json +++ b/services/import_map.json @@ -1,10 +1,10 @@ { "imports": { - "@nats-io/nats-core": "jsr:@nats-io/nats-core@~3.0.0-40", - "@nats-io/nats-core/internal": "jsr:@nats-io/nats-core@~3.0.0-40/internal", + "@nats-io/nats-core": "jsr:@nats-io/nats-core@~3.0.0-42", + "@nats-io/nats-core/internal": "jsr:@nats-io/nats-core@~3.0.0-42/internal", "test_helpers": "../test_helpers/mod.ts", - "@nats-io/nkeys": "jsr:@nats-io/nkeys@1.2.0-4", - "@nats-io/nuid": "jsr:@nats-io/nuid@2.0.1-2", + "@nats-io/nkeys": "jsr:@nats-io/nkeys@~2.0.0-2", + "@nats-io/nuid": "jsr:@nats-io/nuid@~2.0.1-2", "@std/io": "jsr:@std/io@0.224.0" } } diff --git a/services/package.json b/services/package.json index 0becf5d2..07d8e3f7 100644 --- a/services/package.json +++ b/services/package.json @@ -1,6 +1,6 @@ { "name": "@nats-io/services", - "version": "3.0.0-16", + "version": "3.0.0-18", "files": [ "lib/", "LICENSE", @@ -34,7 +34,7 @@ }, "description": "services library - this library implements all the base functionality for NATS services for javascript clients", "dependencies": { - "@nats-io/nats-core": "3.0.0-40" + "@nats-io/nats-core": "3.0.0-42" }, "devDependencies": { "@types/node": "^22.7.6", diff --git a/transport-deno/deno.json b/transport-deno/deno.json index f81f79ee..e34c7022 100644 --- a/transport-deno/deno.json +++ b/transport-deno/deno.json @@ -1,6 +1,6 @@ { "name": "@nats-io/transport-deno", - "version": "3.0.0-15", + "version": "3.0.0-16", "exports": { ".": "./src/mod.ts" }, @@ -20,8 +20,8 @@ }, "imports": { "@std/io": "jsr:@std/io@0.225.0", - "@nats-io/nats-core": "jsr:@nats-io/nats-core@~3.0.0-40", - "@nats-io/nkeys": "jsr:@nats-io/nkeys@1.2.0-4", - "@nats-io/nuid": "jsr:@nats-io/nuid@2.0.1-2" + "@nats-io/nats-core": "jsr:@nats-io/nats-core@~3.0.0-42", + "@nats-io/nkeys": "jsr:@nats-io/nkeys@~2.0.0-2", + "@nats-io/nuid": "jsr:@nats-io/nuid@~2.0.1-2" } } diff --git a/transport-deno/src/version.ts b/transport-deno/src/version.ts index 7e38d46f..0873af67 100644 --- a/transport-deno/src/version.ts +++ b/transport-deno/src/version.ts @@ -1,2 +1,2 @@ // This file is generated - do not edit -export const version = "3.0.0-15"; +export const version = "3.0.0-16"; diff --git a/transport-node/package-lock.json b/transport-node/package-lock.json index 68736119..b6cb81c2 100644 --- a/transport-node/package-lock.json +++ b/transport-node/package-lock.json @@ -1,12 +1,12 @@ { "name": "@nats-io/transport-node", - "version": "3.0.0-15", + "version": "3.0.0-27", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@nats-io/transport-node", - "version": "3.0.0-15", + "version": "3.0.0-27", "license": "Apache-2.0", "dependencies": { "@nats-io/nats-core": "~3.0.0-20", diff --git a/transport-node/package.json b/transport-node/package.json index 00044dfa..f6705b9f 100644 --- a/transport-node/package.json +++ b/transport-node/package.json @@ -1,6 +1,6 @@ { "name": "@nats-io/transport-node", - "version": "3.0.0-26", + "version": "3.0.0-27", "description": "Node.js client for NATS, a lightweight, high-performance cloud native messaging system", "keywords": [ "nats", @@ -54,8 +54,8 @@ "node": ">= 18.0.0" }, "dependencies": { - "@nats-io/nats-core": "3.0.0-40", - "@nats-io/nkeys": "1.2.0-7", + "@nats-io/nats-core": "3.0.0-42", + "@nats-io/nkeys": "2.0.0-2", "@nats-io/nuid": "2.0.1-2" }, "devDependencies": { @@ -64,8 +64,8 @@ "nats-jwt": "^0.0.9", "shx": "^0.3.3", "typescript": "5.6.3", - "@nats-io/jetstream": "3.0.0-27", - "@nats-io/kv": "3.0.0-21", - "@nats-io/obj": "3.0.0-22" + "@nats-io/jetstream": "3.0.0-29", + "@nats-io/kv": "3.0.0-23", + "@nats-io/obj": "3.0.0-24" } } diff --git a/transport-node/src/version.ts b/transport-node/src/version.ts index 14b3fbc8..e9228cee 100644 --- a/transport-node/src/version.ts +++ b/transport-node/src/version.ts @@ -1,2 +1,2 @@ // This file is generated - do not edit -export const version = "3.0.0-26"; +export const version = "3.0.0-27";