Refactor with-intl files

Author: mho22

packages/php-wasm/node/src/lib/extensions/intl/with-intl.ts

@@ -11,14 +11,18 @@ export async function withIntl(
 	version: SupportedPHPVersion = LatestSupportedPHPVersion,
 	options: EmscriptenOptions
 ): Promise<EmscriptenOptions> {
-	const extensionName = 'intl.so';
-	const extensionPath = await getIntlExtensionModule(version);
-	const extension = fs.readFileSync(extensionPath);
-
+	/*
+	 * The Intl extension is hard-coded to look for the `icudt74l` filename,
+	 * which means the ICU data file must use that exact name.
+	 */
 	const dataName = 'icu.dat';
 	const dataPath = `${__dirname}/shared/${dataName}`;
 	const ICUData = fs.readFileSync(dataPath);
 
+	const extensionName = 'intl.so';
+	const extensionPath = await getIntlExtensionModule(version);
+	const extension = fs.readFileSync(extensionPath);
+
 	return {
 		...options,
 		ENV: {
@@ -75,9 +79,6 @@ export async function withIntl(
 			 * via the ICU_DATA environment variable.
 			 * By default, this variable is set to '/internal/shared',
 			 * which corresponds to the actual file location.
-			 *
-			 * The Intl extension is hard-coded to look for the `icudt74l` filename,
-			 * which means the ICU data file must use that exact name.
 			 */
 			if (
 				!FSHelpers.fileExists(
@@ -87,7 +88,7 @@ export async function withIntl(
 			) {
 				phpRuntime.FS.mkdirTree(phpRuntime.ENV.ICU_DATA);
 				phpRuntime.FS.writeFile(
-					`${phpRuntime.ENV.ICU_DATA}/icudt74l.dat`,
+					`${phpRuntime.ENV.ICU_DATA}/${dataName}`,
 					new Uint8Array(ICUData)
 				);
 			}

packages/php-wasm/web/src/lib/extensions/intl/with-intl.ts

@@ -13,17 +13,21 @@ export async function withIntl(
 ): Promise<EmscriptenOptions> {
 	const memoizedFetch = createMemoizedFetch(fetch);
 
+	/*
+	 * The Intl extension is hard-coded to look for the `icudt74l` filename,
+	 * which means the ICU data file must use that exact name.
+	 */
+	const dataName = 'icudt74l.dat';
 	const extensionName = 'intl.so';
-	const dataName = 'icu.dat';
 
-	const extensionPath = await getIntlExtensionModule(version);
 	// @ts-ignore
 	const dataPath = (await import('../../../../public/shared/icu.dat'))
 		.default;
+	const extensionPath = await getIntlExtensionModule(version);
 
-	const [extension, ICUData] = await Promise.all([
-		memoizedFetch(extensionPath).then((response) => response.arrayBuffer()),
+	const [ICUData, extension] = await Promise.all([
 		memoizedFetch(dataPath).then((response) => response.arrayBuffer()),
+		memoizedFetch(extensionPath).then((response) => response.arrayBuffer()),
 	]);
 
 	return {
@@ -82,19 +86,16 @@ export async function withIntl(
 			 * via the ICU_DATA environment variable.
 			 * By default, this variable is set to '/internal/shared',
 			 * which corresponds to the actual file location.
-			 *
-			 * The Intl extension is hard-coded to look for the `icudt74l` filename,
-			 * which means the ICU data file must use that exact name.
 			 */
 			if (
 				!FSHelpers.fileExists(
 					phpRuntime.FS,
-					`${phpRuntime.ENV.ICU_DATA}/icudt74l.dat`
+					`${phpRuntime.ENV.ICU_DATA}/${dataName}`
 				)
 			) {
 				phpRuntime.FS.mkdirTree(phpRuntime.ENV.ICU_DATA);
 				phpRuntime.FS.writeFile(
-					`${phpRuntime.ENV.ICU_DATA}/icudt74l.dat`,
+					`${phpRuntime.ENV.ICU_DATA}/${dataName}`,
 					new Uint8Array(ICUData)
 				);
 			}