Skip to content

Commit 9dbfd23

Browse files
committed
More attempts to fix CI
1 parent 038b668 commit 9dbfd23

File tree

3 files changed

+19
-11
lines changed

3 files changed

+19
-11
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"build": "pnpm build:tsc && pnpm build:locales && pnpm build:themes",
8383
"build:tsc": "tsc --project .",
8484
"build:themes": "node scripts/build_themes.js",
85-
"build:locales": "tsx scripts/build_browser_translations.js",
85+
"build:locales": "node scripts/build_browser_translations.js",
8686
"build:prod": "pnpm build:prod:tsc && pnpm build:locales && pnpm build:themes",
8787
"build:prod:tsc": "tsc --project . --sourceMap false --declarationMap false",
8888
"lint": "eslint . --max-warnings 0 && dprint check",

scripts/build_browser_translations.ts renamed to scripts/build_browser_translations.js

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// Expects to be run with tsx
21
// @ts-check
32

43
import ts from "typescript";
@@ -7,18 +6,24 @@ import { fileURLToPath } from "node:url";
76
import { Logger, Options, TSConfigReader } from "typedoc";
87
import { existsSync, mkdirSync, readdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
98
import { ok } from "node:assert";
9+
import { createRequire } from "node:module";
1010

1111
const browserBundleFolders = [
1212
"/utils-common/",
1313
"/models/",
1414
"/serialization/",
1515
];
1616

17-
const localesDir = join(
17+
const localesDirTs = join(
1818
fileURLToPath(import.meta.url),
1919
"../../src/lib/internationalization/locales",
2020
);
2121

22+
const localesDir = join(
23+
fileURLToPath(import.meta.url),
24+
"../../dist/lib/internationalization/locales",
25+
);
26+
2227
const distDir = join(
2328
fileURLToPath(import.meta.url),
2429
"../../dist/browser-locales",
@@ -56,12 +61,12 @@ const service = ts.createLanguageService(
5661
const program = service.getProgram();
5762
ok(program, "Failed to get program for i18n analysis");
5863

59-
const sf = program.getSourceFile(join(localesDir, "en.cts"));
64+
const sf = program.getSourceFile(join(localesDirTs, "en.cts"));
6065
ok(sf, "Failed to get source file");
6166

6267
const moduleSymbol = program.getTypeChecker().getSymbolAtLocation(sf);
6368
const translatable = moduleSymbol?.exports?.get(
64-
"export=" as ts.__String,
69+
/** @type {ts.__String} */ ("export="),
6570
);
6671
ok(translatable, "Failed to get translatable symbol");
6772

@@ -74,7 +79,8 @@ ok(
7479
);
7580
const translatableObj = translatable.valueDeclaration.expression.expression;
7681

77-
const bundleUsedTranslationKeys: string[] = [];
82+
/** @type {string[]} */
83+
const bundleUsedTranslationKeys = [];
7884

7985
translatableObj.forEachChild((child) => {
8086
ok(ts.isPropertyAssignment(child));
@@ -90,27 +96,29 @@ translatableObj.forEachChild((child) => {
9096

9197
service.dispose();
9298

93-
const enLocale = (await import(join(localesDir, "en.cts"))).default;
99+
const req = createRequire(import.meta.url);
100+
const enLocale = req(join(localesDir, "en.cjs"));
94101

95102
rmSync(distDir, { recursive: true, force: true });
96103
mkdirSync(distDir, { recursive: true });
97104

98105
for (const locale of readdirSync(localesDir)) {
106+
if (!locale.endsWith(".cjs")) continue;
99107
console.log(`Processing ${locale}`);
100108

101109
const browserTranslations = {};
102-
const translations = (await import(join(localesDir, locale))).default;
110+
const translations = req(join(localesDir, locale));
103111
for (const key of bundleUsedTranslationKeys) {
104112
browserTranslations[key] = translations[key] || enLocale[key];
105113
}
106114

107115
writeFileSync(
108-
join(distDir, locale.replace(".cts", ".js")),
116+
join(distDir, locale.replace(".cjs", ".js")),
109117
`export default ${JSON.stringify(browserTranslations, null, 4)}\n`,
110118
);
111119

112120
writeFileSync(
113-
join(distDir, locale.replace(".cts", ".d.ts")),
121+
join(distDir, locale.replace(".cjs", ".d.ts")),
114122
`const translations: Record<string, string>;\nexport default translations;\n`,
115123
);
116124
}

scripts/build_site.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fi
1414
if [[ -n "$CI" || ! -d example/docs ]]; then
1515
cd example
1616
pnpm i
17-
pnpm run typedoc -- --logLevel Error
17+
pnpm run typedoc --logLevel Error
1818
cd ..
1919
fi
2020

0 commit comments

Comments
 (0)