From 74a910f5becd76793e7bc0a412c36fad2a3cfa2c Mon Sep 17 00:00:00 2001 From: Lukas Date: Thu, 26 Jan 2023 16:15:38 +0100 Subject: [PATCH 1/4] add import assertion for json import --- packages/core/src/helper/urlRegex.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/helper/urlRegex.ts b/packages/core/src/helper/urlRegex.ts index 1855ef604..02711c7e0 100644 --- a/packages/core/src/helper/urlRegex.ts +++ b/packages/core/src/helper/urlRegex.ts @@ -21,7 +21,7 @@ // THE SOFTWARE. import ipRegex from 'ip-regex'; -import tlds from 'tlds'; +import tlds from 'tlds' assert { type: 'json' }; interface RegExOptions { /** From a09a7b92c8da31f4951966eb7833492a7523a399 Mon Sep 17 00:00:00 2001 From: Lukas Date: Thu, 26 Jan 2023 16:16:07 +0100 Subject: [PATCH 2/4] increase min engines version to 14 --- packages/core/package.json | 2 +- packages/react/package.json | 2 +- packages/styles/package.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/core/package.json b/packages/core/package.json index bacc9e68e..78d7baac1 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -54,7 +54,7 @@ "vitest": "^0.26.3" }, "engines": { - "node": ">=10" + "node": ">=14" }, "publishConfig": { "access": "public" diff --git a/packages/react/package.json b/packages/react/package.json index 89b8267b4..c69e8f665 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -61,7 +61,7 @@ "typescript": "^4.9.4" }, "engines": { - "node": ">=10" + "node": ">=14" }, "publishConfig": { "access": "public" diff --git a/packages/styles/package.json b/packages/styles/package.json index 423ddf2ba..7eca09523 100644 --- a/packages/styles/package.json +++ b/packages/styles/package.json @@ -49,9 +49,9 @@ "vitest": "^0.28.1" }, "engines": { - "node": ">=10" + "node": ">=14" }, "publishConfig": { "access": "public" } -} \ No newline at end of file +} From 36b2ccf228a18db4e338763c2bb81f1a67b560da Mon Sep 17 00:00:00 2001 From: Lukas Date: Thu, 26 Jan 2023 16:16:53 +0100 Subject: [PATCH 3/4] changeset --- .changeset/swift-lamps-protect.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/swift-lamps-protect.md diff --git a/.changeset/swift-lamps-protect.md b/.changeset/swift-lamps-protect.md new file mode 100644 index 000000000..fd7cd3fc1 --- /dev/null +++ b/.changeset/swift-lamps-protect.md @@ -0,0 +1,5 @@ +--- +'@livekit/components-core': patch +--- + +Add import assertion to support recent nodeJS versions From 5bdea599b2ff85d51cf1df9dd855dbcf793c5a2b Mon Sep 17 00:00:00 2001 From: Lukas Date: Thu, 26 Jan 2023 16:23:43 +0100 Subject: [PATCH 4/4] use different package instead --- .changeset/swift-lamps-protect.md | 2 +- packages/core/package.json | 2 +- packages/core/src/helper/urlRegex.ts | 5 ++--- yarn.lock | 10 +++++----- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.changeset/swift-lamps-protect.md b/.changeset/swift-lamps-protect.md index fd7cd3fc1..02b70dc3e 100644 --- a/.changeset/swift-lamps-protect.md +++ b/.changeset/swift-lamps-protect.md @@ -2,4 +2,4 @@ '@livekit/components-core': patch --- -Add import assertion to support recent nodeJS versions +Replace tlds dependency with global-tld-list in order to avoid having to deal with JSON imports diff --git a/packages/core/package.json b/packages/core/package.json index 78d7baac1..ea5e58446 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -37,7 +37,7 @@ "rxjs": "^7.8.0", "email-regex": "^5.0.0", "ip-regex": "^5.0.0", - "tlds": "^1.236.0" + "global-tld-list": "^0.0.995" }, "peerDependencies": { "livekit-client": "^1.6.2" diff --git a/packages/core/src/helper/urlRegex.ts b/packages/core/src/helper/urlRegex.ts index 02711c7e0..4c53a0c72 100644 --- a/packages/core/src/helper/urlRegex.ts +++ b/packages/core/src/helper/urlRegex.ts @@ -21,8 +21,7 @@ // THE SOFTWARE. import ipRegex from 'ip-regex'; -import tlds from 'tlds' assert { type: 'json' }; - +import { TLDs } from 'global-tld-list'; interface RegExOptions { /** Only match an exact string. Useful with `RegExp#test` to check if a string is a URL. @@ -51,7 +50,7 @@ export const createUrlRegExp = (options: RegExOptions) => { const tld = `(?:\\.${ options.strict ? '(?:[a-z\\u00a1-\\uffff]{2,})' - : `(?:${tlds.sort((a, b) => b.length - a.length).join('|')})` + : `(?:${TLDs.sort((a, b) => b.length - a.length).join('|')})` })\\.?`; const port = '(?::\\d{2,5})?'; const path = '(?:[/?#][^\\s"]*)?'; diff --git a/yarn.lock b/yarn.lock index 621083158..7c624e764 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6459,6 +6459,11 @@ glob@^8.0.0, glob@^8.0.3, glob@^8.1.0: minimatch "^5.0.1" once "^1.3.0" +global-tld-list@^0.0.995: + version "0.0.995" + resolved "https://registry.yarnpkg.com/global-tld-list/-/global-tld-list-0.0.995.tgz#8fdb70ee00e37e747c469f3cf8e6a2390207df3f" + integrity sha512-9XkQgCi748sER/Opllw71Q85qjNpFv+ILBiURoEnFMQYfNmBO/xstBLhTYft9ArbLAV1DVDpVxmsXQ3xED42Dw== + global@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406" @@ -10210,11 +10215,6 @@ tinyspy@^1.0.2: resolved "https://registry.npmjs.org/tinyspy/-/tinyspy-1.0.2.tgz" integrity sha512-bSGlgwLBYf7PnUsQ6WOc6SJ3pGOcd+d8AA6EUnLDDM0kWEstC1JIlSZA3UNliDXhd9ABoS7hiRBDCu+XP/sf1Q== -tlds@^1.236.0: - version "1.236.0" - resolved "https://registry.yarnpkg.com/tlds/-/tlds-1.236.0.tgz#a118eebe33261c577e3a3025144faeabb7dd813c" - integrity sha512-oP2PZ3KeGlgpHgsEfrtva3/K9kzsJUNliQSbCfrJ7JMCWFoCdtG+9YMq/g2AnADQ1v5tVlbtvKJZ4KLpy/P6MA== - tmp@^0.0.33: version "0.0.33" resolved "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"