tidy

prosopo · Feb 14, 2025 · e453bab · e453bab
1 parent 439b0b9
commit e453bab
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 31 deletions.
diff --git a/demos/client-bundle-example/vite.config.ts b/demos/client-bundle-example/vite.config.ts
@@ -19,8 +19,7 @@ export default defineConfig(({ command, mode }) => {
 	loadEnv();
 	return {
 		watch: false,
-		mode: "production",
-		base: "./",
+		mode: "development",
 		server: {
 			host: true,
 			cors: true,

diff --git a/demos/provider-mock/src/start.ts b/demos/provider-mock/src/start.ts
@@ -26,8 +26,7 @@ async function startApi() {
 
 	apiApp.use(cors());
 	apiApp.use(express.json());
-	// @ts-ignore
-	apiApp.use(i18nMiddleware({}));
+	apiApp.use(await i18nMiddleware({}));
 	apiApp.use(prosopoRouter());
 	apiApp.use(handleErrors);
 

diff --git a/packages/api-express-router/src/errorHandler.ts b/packages/api-express-router/src/errorHandler.ts
@@ -22,7 +22,6 @@ export const handleErrors = (
 	response: Response,
 	next: NextFunction,
 ) => {
-	// @ts-ignore
 	const { code, statusMessage, jsonError } = unwrapError(err, request.i18n);
 	response.statusMessage = statusMessage;
 	response.set("content-type", "application/json");

diff --git a/packages/cli/src/cli.ts b/packages/cli/src/cli.ts
@@ -84,10 +84,7 @@ async function main() {
 
 //if main process
 if (isMain(import.meta.url, "provider")) {
-	loadI18next(true).then((i18n) => {
-		console.log("\ni18next.language", i18n.language, "\n");
-		// @ts-ignore
-		console.log("\ni18next.id", i18n.id, "\n");
+	loadI18next(true).then(() => {
 		main()
 			.then(() => {
 				log.info("Running main process...");

diff --git a/packages/common/src/error.ts b/packages/common/src/error.ts
@@ -43,18 +43,7 @@ type ApiContextParams = BaseContextParams & {
 	i18n?: { t: TFunction<"translation", undefined> };
 };
 
-// let i18next: i18n;
-//
-// async function loadi18nextLocal() {
-// 	i18next = await loadI18next();
-// 	// @ts-ignore
-// 	i18next.id = "error";
-// }
-//
-// // Immediately call the function (synchronously starts, but it’s async)
-// console.log("i18next being loaded from error.ts");
-// loadi18nextLocal();
-
+// if i18n is not loaded then we use this
 const backupTranslationObj = { t: (key: string) => key };
 
 export abstract class ProsopoBaseError<
@@ -73,17 +62,13 @@ export abstract class ProsopoBaseError<
 		if (error instanceof Error) {
 			super(error.message);
 			this.translationKey = options?.translationKey;
-
-			console.log("\ntranslating error 1", options?.translationKey, "\n");
-
 			this.context = {
 				...(options?.context as ContextType),
 				...(options?.translationKey
 					? { translationMessage: i18n.t(options.translationKey) }
 					: {}),
 			};
 		} else {
-			console.log("\ntranslating error 2", error, "\n");
 			super(i18n.t(error));
 			this.translationKey = error;
 			this.context = options?.context;

diff --git a/packages/locale/README.md b/packages/locale/README.md
@@ -1,3 +1 @@
-# i18next browser localization for Prosopo in various frameworks
-
-- React
+# i18next localization for Prosopo
diff --git a/packages/locale/src/i18nFrontend.ts b/packages/locale/src/i18nFrontend.ts
@@ -32,7 +32,6 @@ const reactOptions: InitOptions = {
 };
 
 const getLoadPath = (language: string, namespace: string) => {
-	console.log(import.meta);
 	const filename = import.meta.url.split("/").pop();
 	return `${import.meta.url.replace(`/${filename}`, "")}/locales/${language}/${namespace}.json`;
 };

diff --git a/packages/locale/src/index.ts b/packages/locale/src/index.ts
@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 export { default as i18nMiddleware } from "./i18nMiddleware.js";
 export { default as loadI18next } from "./loadI18next.js";
 export { Languages, LanguageSchema } from "./translations.js";

diff --git a/packages/locale/src/translationKey.ts b/packages/locale/src/translationKey.ts
@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 import { z } from "zod";
 import translationEn from "./locales/en/translation.json" assert {
 	type: "json",

diff --git a/packages/procaptcha-bundle/vite.config.ts b/packages/procaptcha-bundle/vite.config.ts
@@ -47,7 +47,6 @@ for (const packageName of packages) {
 	// Add the tsconfig for each package to tsConfigPaths
 	tsConfigPaths.push(path.resolve(`../${packageName}/tsconfig.json`));
 }
-console.log(`${workspaceRoot}/packages/locale/src/locales/.*.json`);
 
 const copyDir = {
 	srcDir: `${workspaceRoot}/packages/locale/src/locales`,

diff --git a/packages/procaptcha-react/src/components/ProcaptchaWidget.tsx b/packages/procaptcha-react/src/components/ProcaptchaWidget.tsx
@@ -58,7 +58,6 @@ const ProcaptchaWidget = (props: ProcaptchaProps) => {
 
 	useEffect(() => {
 		if (config.language) {
-			console.log("Language changed");
 			loadI18next(false).then((i18n) => {
 				i18n.changeLanguage(config.language).then((r) => r);
 			});

diff --git a/packages/provider/src/express.d.ts b/packages/provider/src/express.d.ts
@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 import type { TFunction } from "i18next";
 
 declare module "express-serve-static-core" {