diff --git a/package.json b/package.json index e8799193..8053669a 100644 --- a/package.json +++ b/package.json @@ -64,7 +64,7 @@ ], "homepage": "https://www.keycloakify.dev", "dependencies": { - "tsafe": "^1.7.5" + "tsafe": "^1.8.5" }, "devDependencies": { "@babel/core": "^7.24.5", @@ -95,14 +95,14 @@ "cli-select": "^1.1.2", "dompurify": "^3.1.6", "eslint-plugin-storybook": "^0.6.7", - "evt": "^2.5.7", + "evt": "^2.5.8", "html-entities": "^2.5.2", "husky": "^4.3.8", "isomorphic-dompurify": "^2.15.0", "lint-staged": "^11.0.0", "magic-string": "^0.30.7", "make-fetch-happen": "^11.0.3", - "powerhooks": "^1.0.10", + "powerhooks": "^1.0.19", "prettier": "^3.2.5", "properties-parser": "^0.3.1", "react": "^18.2.0", diff --git a/scripts/dump-keycloak-realm.ts b/scripts/dump-keycloak-realm.ts index 5f726cc7..8b7469d8 100644 --- a/scripts/dump-keycloak-realm.ts +++ b/scripts/dump-keycloak-realm.ts @@ -4,8 +4,7 @@ import { SemVer } from "../src/bin/tools/SemVer"; import { join as pathJoin, relative as pathRelative } from "path"; import chalk from "chalk"; import { Deferred } from "evt/tools/Deferred"; -import { assert } from "tsafe/assert"; -import { is } from "tsafe/is"; +import { assert, is } from "tsafe/assert"; import { run } from "./shared/run"; (async () => { diff --git a/src/bin/initialize-account-theme/initializeAccountTheme_singlePage.ts b/src/bin/initialize-account-theme/initializeAccountTheme_singlePage.ts index 77984d3b..ae6ae190 100644 --- a/src/bin/initialize-account-theme/initializeAccountTheme_singlePage.ts +++ b/src/bin/initialize-account-theme/initializeAccountTheme_singlePage.ts @@ -9,8 +9,7 @@ import { import { SemVer } from "../tools/SemVer"; import fetch from "make-fetch-happen"; import { z } from "zod"; -import { assert, type Equals } from "tsafe/assert"; -import { is } from "tsafe/is"; +import { assert, type Equals, is } from "tsafe/assert"; import { id } from "tsafe/id"; import { npmInstall } from "../tools/npmInstall"; import { copyBoilerplate } from "./copyBoilerplate"; diff --git a/src/bin/initialize-account-theme/updateAccountThemeImplementationInConfig.ts b/src/bin/initialize-account-theme/updateAccountThemeImplementationInConfig.ts index 65b3ba39..5ff8fcf5 100644 --- a/src/bin/initialize-account-theme/updateAccountThemeImplementationInConfig.ts +++ b/src/bin/initialize-account-theme/updateAccountThemeImplementationInConfig.ts @@ -1,11 +1,10 @@ import { join as pathJoin } from "path"; -import { assert, type Equals } from "tsafe/assert"; +import { assert, type Equals, is } from "tsafe/assert"; import type { BuildContext } from "../shared/buildContext"; import * as fs from "fs"; import chalk from "chalk"; import { z } from "zod"; import { id } from "tsafe/id"; -import { is } from "tsafe/is"; export type BuildContextLike = { bundler: BuildContext["bundler"]; diff --git a/src/bin/postinstall/installUiModulesPeerDependencies.ts b/src/bin/postinstall/installUiModulesPeerDependencies.ts index 9d873751..17f61b0d 100644 --- a/src/bin/postinstall/installUiModulesPeerDependencies.ts +++ b/src/bin/postinstall/installUiModulesPeerDependencies.ts @@ -1,5 +1,4 @@ -import { assert, type Equals } from "tsafe/assert"; -import { is } from "tsafe/is"; +import { assert, type Equals, is } from "tsafe/assert"; import type { BuildContext } from "../shared/buildContext"; import type { UiModuleMeta } from "./uiModuleMeta"; import { z } from "zod"; diff --git a/src/bin/postinstall/uiModuleMeta.ts b/src/bin/postinstall/uiModuleMeta.ts index 1416d8df..6a427a21 100644 --- a/src/bin/postinstall/uiModuleMeta.ts +++ b/src/bin/postinstall/uiModuleMeta.ts @@ -1,10 +1,9 @@ -import { assert, type Equals } from "tsafe/assert"; +import { assert, type Equals, is } from "tsafe/assert"; import { id } from "tsafe/id"; import { z } from "zod"; import { join as pathJoin, dirname as pathDirname } from "path"; import * as fsPr from "fs/promises"; import type { BuildContext } from "../shared/buildContext"; -import { is } from "tsafe/is"; import { existsAsync } from "../tools/fs.existsAsync"; import { listInstalledModules } from "../tools/listInstalledModules"; import { crawlAsync } from "../tools/crawlAsync"; diff --git a/src/bin/shared/buildContext.ts b/src/bin/shared/buildContext.ts index 5ae3f925..aab272e3 100644 --- a/src/bin/shared/buildContext.ts +++ b/src/bin/shared/buildContext.ts @@ -9,7 +9,7 @@ import { import { getAbsoluteAndInOsFormatPath } from "../tools/getAbsoluteAndInOsFormatPath"; import { z } from "zod"; import * as fs from "fs"; -import { assert, type Equals } from "tsafe/assert"; +import { assert, type Equals, is } from "tsafe/assert"; import * as child_process from "child_process"; import { VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES, @@ -23,7 +23,6 @@ import { objectEntries } from "tsafe/objectEntries"; import { id } from "tsafe/id"; import chalk from "chalk"; import { getProxyFetchOptions, type FetchOptionsLike } from "../tools/fetchProxyOptions"; -import { is } from "tsafe/is"; export type BuildContext = { themeVersion: string; diff --git a/src/bin/tools/listInstalledModules.ts b/src/bin/tools/listInstalledModules.ts index ef2f9116..2a9d801b 100644 --- a/src/bin/tools/listInstalledModules.ts +++ b/src/bin/tools/listInstalledModules.ts @@ -1,9 +1,8 @@ -import { assert, type Equals } from "tsafe/assert"; +import { assert, type Equals, is } from "tsafe/assert"; import { id } from "tsafe/id"; import { z } from "zod"; import { join as pathJoin, dirname as pathDirname } from "path"; import * as fsPr from "fs/promises"; -import { is } from "tsafe/is"; import { getInstalledModuleDirPath } from "../tools/getInstalledModuleDirPath"; import { exclude } from "tsafe/exclude"; diff --git a/src/bin/tools/npmInstall.ts b/src/bin/tools/npmInstall.ts index e2f689d0..4d917bec 100644 --- a/src/bin/tools/npmInstall.ts +++ b/src/bin/tools/npmInstall.ts @@ -3,9 +3,8 @@ import { join as pathJoin, dirname as pathDirname } from "path"; import * as child_process from "child_process"; import chalk from "chalk"; import { z } from "zod"; -import { assert, type Equals } from "tsafe/assert"; +import { assert, type Equals, is } from "tsafe/assert"; import { id } from "tsafe/id"; -import { is } from "tsafe/is"; import { objectKeys } from "tsafe/objectKeys"; import { getAbsoluteAndInOsFormatPath } from "./getAbsoluteAndInOsFormatPath"; import { exclude } from "tsafe/exclude"; diff --git a/src/bin/tools/runPrettier.ts b/src/bin/tools/runPrettier.ts index ca1e0213..a9d92bee 100644 --- a/src/bin/tools/runPrettier.ts +++ b/src/bin/tools/runPrettier.ts @@ -2,10 +2,9 @@ import { getNodeModulesBinDirPath } from "./nodeModulesBinDirPath"; import { join as pathJoin, resolve as pathResolve } from "path"; import * as fsPr from "fs/promises"; import { id } from "tsafe/id"; -import { assert } from "tsafe/assert"; +import { assert, is } from "tsafe/assert"; import chalk from "chalk"; import * as crypto from "crypto"; -import { is } from "tsafe/is"; import { symToStr } from "tsafe/symToStr"; import { readThisNpmPackageVersion } from "./readThisNpmPackageVersion"; diff --git a/src/lib/getKcClsx.ts b/src/lib/getKcClsx.ts index b433cfa1..83ade080 100644 --- a/src/lib/getKcClsx.ts +++ b/src/lib/getKcClsx.ts @@ -1,8 +1,7 @@ import type { Param0 } from "tsafe"; import { type CxArg, clsx_withTransform } from "../tools/clsx_withTransform"; import { clsx } from "../tools/clsx"; -import { assert } from "tsafe/assert"; -import { is } from "tsafe/is"; +import { assert, is } from "tsafe/assert"; export function createGetKcClsx(params: { defaultClasses: Record; diff --git a/src/login/i18n/noJsx/getI18n.tsx b/src/login/i18n/noJsx/getI18n.tsx index b902b6e2..56fded1c 100644 --- a/src/login/i18n/noJsx/getI18n.tsx +++ b/src/login/i18n/noJsx/getI18n.tsx @@ -1,11 +1,10 @@ import "keycloakify/tools/Object.fromEntries"; -import { assert } from "tsafe/assert"; +import { assert, is } from "tsafe/assert"; import messages_defaultSet_fallbackLanguage from "../messages_defaultSet/en"; import { fetchMessages_defaultSet } from "../messages_defaultSet"; import type { KcContext } from "../../KcContext"; import { FALLBACK_LANGUAGE_TAG } from "keycloakify/bin/shared/constants"; import { id } from "tsafe/id"; -import { is } from "tsafe/is"; import { Reflect } from "tsafe/Reflect"; import { type LanguageTag as LanguageTag_defaultSet, diff --git a/src/tools/StatefulObservable/StatefulObservable.ts b/src/tools/StatefulObservable/StatefulObservable.ts index 50fcefbf..fd81b875 100644 --- a/src/tools/StatefulObservable/StatefulObservable.ts +++ b/src/tools/StatefulObservable/StatefulObservable.ts @@ -1,5 +1,4 @@ -import { assert } from "tsafe/assert"; -import { is } from "tsafe/is"; +import { assert, is } from "tsafe/assert"; export type StatefulObservable = { current: T; diff --git a/src/tools/deepAssign.ts b/src/tools/deepAssign.ts index 04fa75b9..cd8d5659 100644 --- a/src/tools/deepAssign.ts +++ b/src/tools/deepAssign.ts @@ -1,5 +1,4 @@ -import { assert } from "tsafe/assert"; -import { is } from "tsafe/is"; +import { assert, is } from "tsafe/assert"; import { structuredCloneButFunctions } from "./structuredCloneButFunctions"; /** NOTE: Array a copied over, not merged. */ diff --git a/yarn.lock b/yarn.lock index c8b469f3..fd7fede2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6172,6 +6172,14 @@ d@1, d@^1.0.1: es5-ext "^0.10.50" type "^1.0.1" +d@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/d/-/d-1.0.2.tgz#2aefd554b81981e7dccf72d6842ae725cb17e5de" + integrity sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw== + dependencies: + es5-ext "^0.10.64" + type "^2.7.2" + data-urls@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-5.0.0.tgz#2f76906bce1824429ffecb6920f45a0b30f00dde" @@ -6743,7 +6751,7 @@ es-to-primitive@^1.2.1: is-date-object "^1.0.1" is-symbol "^1.0.2" -es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@^0.10.53, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46: +es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@~0.10.14, es5-ext@~0.10.2, es5-ext@~0.10.46: version "0.10.62" resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.62.tgz#5e6adc19a6da524bf3d1e02bbc8960e5eb49a9a5" integrity sha512-BHLqn0klhEpnOKSrzn/Xsz2UIW8j+cGmo9JLzr8BiUapV8hPL9+FliFqjwr9ngW7jWdnxv6eO+/LqyhJVqgrjA== @@ -6752,6 +6760,16 @@ es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@^0.10.53, es5-ext@ es6-symbol "^3.1.3" next-tick "^1.1.0" +es5-ext@^0.10.62, es5-ext@^0.10.64: + version "0.10.64" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.64.tgz#12e4ffb48f1ba2ea777f1fcdd1918ef73ea21714" + integrity sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg== + dependencies: + es6-iterator "^2.0.3" + es6-symbol "^3.1.3" + esniff "^2.0.1" + next-tick "^1.1.0" + es5-shim@^4.5.13: version "4.6.7" resolved "https://registry.yarnpkg.com/es5-shim/-/es5-shim-4.6.7.tgz#bc67ae0fc3dd520636e0a1601cc73b450ad3e955" @@ -6920,6 +6938,16 @@ eslint-visitor-keys@^3.3.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz#c7f0f956124ce677047ddbc192a68f999454dedc" integrity sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ== +esniff@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/esniff/-/esniff-2.0.1.tgz#a4d4b43a5c71c7ec51c51098c1d8a29081f9b308" + integrity sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg== + dependencies: + d "^1.0.1" + es5-ext "^0.10.62" + event-emitter "^0.3.5" + type "^2.7.2" + esprima@^4.0.1, esprima@~4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" @@ -6994,14 +7022,14 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: md5.js "^1.3.4" safe-buffer "^5.1.1" -evt@^2.5.7: - version "2.5.7" - resolved "https://registry.yarnpkg.com/evt/-/evt-2.5.7.tgz#55c5f8ff910f4b7531bfac91e963d4cb3231f253" - integrity sha512-dr7Wd16ry5F8WNU1xXLKpFpO3HsoAGg8zC48e08vDdzMzGWCP9/QFGt1PQptEEDh8SwYP3EL8M+d/Gb0kgUp6g== +evt@^2.5.8: + version "2.5.8" + resolved "https://registry.yarnpkg.com/evt/-/evt-2.5.8.tgz#4cc4e2db92d89cc43e00a0755703317f5f9b6d4c" + integrity sha512-wjurRtEqepH03fZSzkCUAw2tNNtEoeoEYXf7EqG8uU52wQ3D/+ctyQE8hf+YR/5DXZlwl2jNGLMm4hAd/wyD6g== dependencies: minimal-polyfills "^2.2.3" run-exclusive "^2.2.19" - tsafe "^1.6.6" + tsafe "^1.8.5" execa@^5.1.1: version "5.1.1" @@ -9350,13 +9378,13 @@ memfs@^3.1.2, memfs@^3.2.2: dependencies: fs-monkey "^1.0.3" -memoizee@^0.4.15: - version "0.4.15" - resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.15.tgz#e6f3d2da863f318d02225391829a6c5956555b72" - integrity sha512-UBWmJpLZd5STPm7PMUlOw/TSy972M+z8gcyQ5veOnSDRREz/0bmpyTfKt3/51DhEBqCZQn1udM/5flcSPYhkdQ== +memoizee@^0.4.17: + version "0.4.17" + resolved "https://registry.yarnpkg.com/memoizee/-/memoizee-0.4.17.tgz#942a5f8acee281fa6fb9c620bddc57e3b7382949" + integrity sha512-DGqD7Hjpi/1or4F/aYAspXKNm5Yili0QDAFAY4QYvpqpgiY6+1jOfqpmByzjxbWd/T9mChbCArXAbDAsTm5oXA== dependencies: - d "^1.0.1" - es5-ext "^0.10.53" + d "^1.0.2" + es5-ext "^0.10.64" es6-weak-map "^2.0.3" event-emitter "^0.3.5" is-promise "^2.2.2" @@ -10629,14 +10657,14 @@ postcss@^8.4.38: picocolors "^1.0.0" source-map-js "^1.2.0" -powerhooks@^1.0.10: - version "1.0.10" - resolved "https://registry.yarnpkg.com/powerhooks/-/powerhooks-1.0.10.tgz#9d532b23294cba69d5872d859bdf843b91cb9c41" - integrity sha512-fJmKSVJk9Bkotl9rK1ryVPSqhY4xOZKxM6deyTaMbICK8jHh/CQztN2mNTxlKu6vkJBIFj1cRd/7N6slh3uM6w== +powerhooks@^1.0.19: + version "1.0.19" + resolved "https://registry.yarnpkg.com/powerhooks/-/powerhooks-1.0.19.tgz#e93ce44f55d31ca26a4511883a49cfe5341d47af" + integrity sha512-kmZX0LLvJyaIphwf2FjKABAQwQFrRqsEA41N4CB8EzfDobyXle545t4teajVo/NPboy0HEaioyv55FWN7d58/Q== dependencies: - evt "^2.5.7" - memoizee "^0.4.15" - tsafe "^1.6.6" + evt "^2.5.8" + memoizee "^0.4.17" + tsafe "^1.8.5" prelude-ls@~1.1.2: version "1.1.2" @@ -12574,15 +12602,10 @@ ts-pnp@^1.1.6: resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92" integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw== -tsafe@^1.6.6: - version "1.6.6" - resolved "https://registry.yarnpkg.com/tsafe/-/tsafe-1.6.6.tgz#fd93e64d6eb13ef83ed1650669cc24bad4f5df9f" - integrity sha512-gzkapsdbMNwBnTIjgO758GujLCj031IgHK/PKr2mrmkCSJMhSOR5FeOuSxKLMUoYc0vAA4RGEYYbjt/v6afD3g== - -tsafe@^1.7.5: - version "1.7.5" - resolved "https://registry.yarnpkg.com/tsafe/-/tsafe-1.7.5.tgz#0d3a31202b5ef87c7ba997e66e03fd80801278ef" - integrity sha512-tbNyyBSbwfbilFfiuXkSOj82a6++ovgANwcoqBAcO9/REPoZMEQoE8kWPeO0dy5A2D/2Lajr8Ohue5T0ifIvLQ== +tsafe@^1.8.5: + version "1.8.5" + resolved "https://registry.yarnpkg.com/tsafe/-/tsafe-1.8.5.tgz#cdf9fa3111974ac480d7ee519f8241815e5d22ea" + integrity sha512-LFWTWQrW6rwSY+IBNFl2ridGfUzVsPwrZ26T4KUJww/py8rzaQ/SY+MIz6YROozpUCaRcuISqagmlwub9YT9kw== tsc-alias@^1.8.10: version "1.8.10"