Skip to content

Added patch to resolve adminjs conflict. #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
juan-rivera-2020 wants to merge 1 commit into
base: containerized
Choose a base branch
from
Open

Added patch to resolve adminjs conflict. #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@fastify/multipart": "^8.3.0",
"@fastify/session": "^10.9.0",
"@fastify/static": "^7.0.1",
"adminjs": "^7.8.4",
"adminjs": "^7.8.13",
"bcrypt": "^5.1.1",
"body-parser": "^1.20.2",
"dotenv": "^16.4.5",
Expand Down
47 changes: 47 additions & 0 deletions server/patches/adminjs+7.8.13.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
diff --git a/node_modules/adminjs/lib/locale/index.js b/node_modules/adminjs/lib/locale/index.js
index 4968859..3c24b28 100644
--- a/node_modules/adminjs/lib/locale/index.js
+++ b/node_modules/adminjs/lib/locale/index.js
@@ -1,22 +1,23 @@
-import deLocale from './de/translation.json' with { type: 'json' };
-import enLocale from './en/translation.json' with { type: 'json' };
-import esLocale from './es/translation.json' with { type: 'json' };
-import itLocale from './it/translation.json' with { type: 'json' };
-import jaLocale from './ja/translation.json' with { type: 'json' };
-import plLocale from './pl/translation.json' with { type: 'json' };
-import ptBrLocale from './pt-BR/translation.json' with { type: 'json' };
-import uaLocale from './ua/translation.json' with { type: 'json' };
-import zhCNLocale from './zh-CN/translation.json' with { type: 'json' };
+const deLocale = await import('./de/translation.json', { assert: { type: 'json' } });
+const enLocale = await import('./en/translation.json', { assert: { type: 'json' } });
+const esLocale = await import('./es/translation.json', { assert: { type: 'json' } });
+const itLocale = await import('./it/translation.json', { assert: { type: 'json' } });
+const jaLocale = await import('./ja/translation.json', { assert: { type: 'json' } });
+const plLocale = await import('./pl/translation.json', { assert: { type: 'json' } });
+const ptBrLocale = await import('./pt-BR/translation.json', { assert: { type: 'json' } });
+const uaLocale = await import('./ua/translation.json', { assert: { type: 'json' } });
+const zhCNLocale = await import('./zh-CN/translation.json', { assert: { type: 'json' } });
+
export * from './config.js';
export * from './default-config.js';
export const locales = {
- de: deLocale,
- en: enLocale,
- es: esLocale,
- it: itLocale,
- ja: jaLocale,
- pl: plLocale,
- 'pt-BR': ptBrLocale,
- ua: uaLocale,
- 'zh-CN': zhCNLocale
+ de: (await deLocale).default,
+ en: (await enLocale).default,
+ es: (await esLocale).default,
+ it: (await itLocale).default,
+ ja: (await jaLocale).default,
+ pl: (await plLocale).default,
+ 'pt-BR': (await ptBrLocale).default,
+ ua: (await uaLocale).default,
+ 'zh-CN': (await zhCNLocale).default
};
\ No newline at end of file