diff --git a/package-lock.json b/package-lock.json index 67a5b34f..ebba4135 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1105,9 +1105,9 @@ } }, "node_modules/@unicode/unicode-15.0.0": { - "version": "1.6.17", - "resolved": "https://registry.npmjs.org/@unicode/unicode-15.0.0/-/unicode-15.0.0-1.6.17.tgz", - "integrity": "sha512-sVPtqhNRrf7cbyEtU1H7y4JHAa5rIP+JNnicVtypjDBAh/THgfR4nvga9ZE5OeUHBzsBtKrLEOvyks9dx21rMQ==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@unicode/unicode-15.0.0/-/unicode-15.0.0-2.0.7.tgz", + "integrity": "sha512-8d0z/dm7Gk7z9UrSlmFeT80i/V+eoBqG5kIO/PSKyqGJ0OKJlZlM7bACtWQaBD8ylGqbNFBX3DOGMj4+ExGMOA==", "dev": true, "license": "MIT" }, @@ -2086,7 +2086,7 @@ "version": "0.6.1", "license": "MIT", "devDependencies": { - "@unicode/unicode-15.0.0": "^1.6.17", + "@unicode/unicode-15.0.0": "^2.0.7", "@unicode/unicode-16.0.0": "^1.6.17", "unicode-property-value-aliases": "^3.9.0" } diff --git a/packages/re2/package.json b/packages/re2/package.json index b0c71a4a..e2eaab61 100644 --- a/packages/re2/package.json +++ b/packages/re2/package.json @@ -42,7 +42,7 @@ } }, "devDependencies": { - "@unicode/unicode-15.0.0": "^1.6.17", + "@unicode/unicode-15.0.0": "^2.0.7", "@unicode/unicode-16.0.0": "^1.6.17", "unicode-property-value-aliases": "^3.9.0" } diff --git a/packages/re2/scripts/genUnicodeTable.js b/packages/re2/scripts/genUnicodeTable.js index a4aa9c8a..7ede4196 100644 --- a/packages/re2/scripts/genUnicodeTable.js +++ b/packages/re2/scripts/genUnicodeTable.js @@ -1,8 +1,8 @@ import { CodepointRange } from "./codepointRange.js"; import unicode16 from "@unicode/unicode-16.0.0"; // Imported for its side effect of being a declared devDependency. -// loadCodePoints() below dynamically imports `@unicode/unicode-15.0.0///code-points.js` -// paths, and requires the package to be installed. +// loadCodePoints() below dynamically imports the Unicode 15 package's .mjs +// modules, and requires the package to be installed. import "@unicode/unicode-15.0.0"; import CommonCaseFolding from "@unicode/unicode-16.0.0/Case_Folding/C/code-points.js"; import SimpleCaseFolding from "@unicode/unicode-16.0.0/Case_Folding/S/code-points.js"; @@ -91,8 +91,9 @@ const reducedOrbit = buildReducedOrbit(); const loadCodePoints = async (pkg, type, name) => { try { + const extension = pkg === "@unicode/unicode-15.0.0" ? "mjs" : "js"; const { default: codePoints } = await import( - `${pkg}/${type}/${name}/code-points.js` + `${pkg}/${type}/${name}/code-points.${extension}` ); return new Set(codePoints); } catch (_e) { diff --git a/packages/re2/src/UnicodeTableContents.test.ts b/packages/re2/src/UnicodeTableContents.test.ts index d76a97aa..d20621c0 100644 --- a/packages/re2/src/UnicodeTableContents.test.ts +++ b/packages/re2/src/UnicodeTableContents.test.ts @@ -41,8 +41,9 @@ const loadCodePoints = async ( longName: string, ): Promise | null> => { try { + const extension = pkg === "@unicode/unicode-15.0.0" ? "mjs" : "js"; const mod = (await import( - `${pkg}/${property}/${longName}/code-points.js` + `${pkg}/${property}/${longName}/code-points.${extension}` )) as { default: number[] }; return new Set(mod.default); } catch {