From d19d7668f44f72f491022b12cf54737e8230a4a8 Mon Sep 17 00:00:00 2001 From: GermanBluefox Date: Tue, 14 Jan 2025 21:05:41 +0000 Subject: [PATCH] Fixed build --- .../components/ContextWrapper/index.tsx | 20 ++++++++++-------- src-editor/src/Dialogs/AddNewScript.tsx | 8 +++---- src-editor/src/Editor.tsx | 12 +++++------ src-editor/src/SideMenu.tsx | 8 +++---- src-editor/{public => src}/assets/blockly.png | Bin src-editor/{public => src}/assets/blockly.svg | 0 .../{public => src}/assets/blockly2js.svg | 0 src-editor/{public => src}/assets/chatgpt.svg | 0 src-editor/{public => src}/assets/js.png | Bin src-editor/{public => src}/assets/js.svg | 0 src-editor/{public => src}/assets/rules.png | Bin src-editor/{public => src}/assets/rules.svg | 0 .../{public => src}/assets/rules2js.svg | 0 .../{public => src}/assets/tileBlockly.png | Bin src-editor/{public => src}/assets/tileJS.png | Bin .../{public => src}/assets/tileRules.png | Bin src-editor/{public => src}/assets/tileTS.png | Bin .../{public => src}/assets/typescript.png | Bin .../{public => src}/assets/typescript.svg | 0 src-editor/src/i18n/de.json | 2 ++ src-editor/src/i18n/en.json | 2 ++ src-editor/src/i18n/es.json | 2 ++ src-editor/src/i18n/fr.json | 2 ++ src-editor/src/i18n/it.json | 2 ++ src-editor/src/i18n/nl.json | 2 ++ src-editor/src/i18n/pl.json | 2 ++ src-editor/src/i18n/pt.json | 2 ++ src-editor/src/i18n/ru.json | 2 ++ src-editor/src/i18n/uk.json | 2 ++ src-editor/src/i18n/zh-cn.json | 2 ++ src-editor/vite.config.ts | 6 ------ 31 files changed, 47 insertions(+), 29 deletions(-) rename src-editor/{public => src}/assets/blockly.png (100%) rename src-editor/{public => src}/assets/blockly.svg (100%) rename src-editor/{public => src}/assets/blockly2js.svg (100%) rename src-editor/{public => src}/assets/chatgpt.svg (100%) rename src-editor/{public => src}/assets/js.png (100%) rename src-editor/{public => src}/assets/js.svg (100%) rename src-editor/{public => src}/assets/rules.png (100%) rename src-editor/{public => src}/assets/rules.svg (100%) rename src-editor/{public => src}/assets/rules2js.svg (100%) rename src-editor/{public => src}/assets/tileBlockly.png (100%) rename src-editor/{public => src}/assets/tileJS.png (100%) rename src-editor/{public => src}/assets/tileRules.png (100%) rename src-editor/{public => src}/assets/tileTS.png (100%) rename src-editor/{public => src}/assets/typescript.png (100%) rename src-editor/{public => src}/assets/typescript.svg (100%) diff --git a/src-editor/src/Components/RulesEditor/components/ContextWrapper/index.tsx b/src-editor/src/Components/RulesEditor/components/ContextWrapper/index.tsx index 06291b27a..91b18b35b 100644 --- a/src-editor/src/Components/RulesEditor/components/ContextWrapper/index.tsx +++ b/src-editor/src/Components/RulesEditor/components/ContextWrapper/index.tsx @@ -2,11 +2,11 @@ import React, { createContext, useEffect, useState } from 'react'; import { type AdminConnection, I18n } from '@iobroker/adapter-react-v5'; -import {registerRemotes, loadRemote} from '@module-federation/runtime'; +import { registerRemotes, loadRemote } from '@module-federation/runtime'; import ActionSayText from '../Blocks/ActionSayText'; import ActionSendEmail from '../Blocks/ActionSendEmail'; -import ActionTelegram from '../Blocks/ActionTelegram'; +// import ActionTelegram from '../Blocks/ActionTelegram'; import ActionPushover from '../Blocks/ActionPushover'; import ActionWhatsappcmb from '../Blocks/ActionWhatsappcmb'; import ActionPushsafer from '../Blocks/ActionPushsafer'; @@ -135,16 +135,18 @@ export const ContextWrapper = ({ children, socket }: { socket: AdminConnection; try { registerRemotes( [ - { - name: obj.common.javascriptRules!.name, - entry: url, - type: (obj.common.javascriptRules! as any).type - } + { + name: obj.common.javascriptRules!.name, + entry: url, + type: (obj.common.javascriptRules! as any).type, + }, ], // force: true // may be needed to sideload remotes after the fact. - ) + ); const Component = ( - await loadRemote(obj.common.javascriptRules!.name + '/' + obj.common.javascriptRules!.name) as any + (await loadRemote( + obj.common.javascriptRules!.name + '/' + obj.common.javascriptRules!.name, + )) as any ).default; if (Component) { diff --git a/src-editor/src/Dialogs/AddNewScript.tsx b/src-editor/src/Dialogs/AddNewScript.tsx index a2d8713cf..5ed779b9f 100644 --- a/src-editor/src/Dialogs/AddNewScript.tsx +++ b/src-editor/src/Dialogs/AddNewScript.tsx @@ -18,10 +18,10 @@ import { Cancel as IconCancel } from '@mui/icons-material'; import { I18n } from '@iobroker/adapter-react-v5'; import type { ScriptType } from '@/types'; -const ImgJS = './assets/tileJS.png'; -const ImgTS = './assets/tileTS.png'; -const ImgBlockly = './assets/tileBlockly.png'; -const ImgRules = './assets/tileRules.png'; +import ImgJS from '../assets/tileJS.png'; +import ImgTS from '../assets/tileTS.png'; +import ImgBlockly from '../assets/tileBlockly.png'; +import ImgRules from '../assets/tileRules.png'; const styles: Record = { card: { diff --git a/src-editor/src/Editor.tsx b/src-editor/src/Editor.tsx index 718ad7d47..430bae156 100644 --- a/src-editor/src/Editor.tsx +++ b/src-editor/src/Editor.tsx @@ -55,12 +55,12 @@ import { FaFlagCheckered as IconCheck, } from 'react-icons/fa'; -const ImgJS = './assets/js.svg'; -const ImgBlockly = './assets/blockly.svg'; -const ImgTypeScript = './assets/typescript.svg'; -const ImgBlockly2Js = './assets/blockly2js.svg'; -const ImgRules2Js = './assets/rules2js.svg'; -const ImgRules = './assets/rules.svg'; +import ImgJS from './assets/js.svg'; +import ImgBlockly from './assets/blockly.svg'; +import ImgTypeScript from './assets/typescript.svg'; +import ImgBlockly2Js from './assets/blockly2js.svg'; +import ImgRules2Js from './assets/rules2js.svg'; +import ImgRules from './assets/rules.svg'; import { I18n, diff --git a/src-editor/src/SideMenu.tsx b/src-editor/src/SideMenu.tsx index 09c978dcd..e8d9073cf 100644 --- a/src-editor/src/SideMenu.tsx +++ b/src-editor/src/SideMenu.tsx @@ -54,10 +54,10 @@ import { IconExpert, } from '@iobroker/adapter-react-v5'; -const ImgJS = './assets/js.svg'; -const ImgBlockly = './assets/blockly.svg'; -const ImgTypeScript = './assets/typescript.svg'; -const ImgRules = './assets/rules.svg'; +import ImgJS from './assets/js.svg'; +import ImgBlockly from './assets/blockly.svg'; +import ImgTypeScript from './assets/typescript.svg'; +import ImgRules from './assets/rules.svg'; import DialogRename from './Dialogs/Rename'; import DialogDelete from './Dialogs/Delete'; diff --git a/src-editor/public/assets/blockly.png b/src-editor/src/assets/blockly.png similarity index 100% rename from src-editor/public/assets/blockly.png rename to src-editor/src/assets/blockly.png diff --git a/src-editor/public/assets/blockly.svg b/src-editor/src/assets/blockly.svg similarity index 100% rename from src-editor/public/assets/blockly.svg rename to src-editor/src/assets/blockly.svg diff --git a/src-editor/public/assets/blockly2js.svg b/src-editor/src/assets/blockly2js.svg similarity index 100% rename from src-editor/public/assets/blockly2js.svg rename to src-editor/src/assets/blockly2js.svg diff --git a/src-editor/public/assets/chatgpt.svg b/src-editor/src/assets/chatgpt.svg similarity index 100% rename from src-editor/public/assets/chatgpt.svg rename to src-editor/src/assets/chatgpt.svg diff --git a/src-editor/public/assets/js.png b/src-editor/src/assets/js.png similarity index 100% rename from src-editor/public/assets/js.png rename to src-editor/src/assets/js.png diff --git a/src-editor/public/assets/js.svg b/src-editor/src/assets/js.svg similarity index 100% rename from src-editor/public/assets/js.svg rename to src-editor/src/assets/js.svg diff --git a/src-editor/public/assets/rules.png b/src-editor/src/assets/rules.png similarity index 100% rename from src-editor/public/assets/rules.png rename to src-editor/src/assets/rules.png diff --git a/src-editor/public/assets/rules.svg b/src-editor/src/assets/rules.svg similarity index 100% rename from src-editor/public/assets/rules.svg rename to src-editor/src/assets/rules.svg diff --git a/src-editor/public/assets/rules2js.svg b/src-editor/src/assets/rules2js.svg similarity index 100% rename from src-editor/public/assets/rules2js.svg rename to src-editor/src/assets/rules2js.svg diff --git a/src-editor/public/assets/tileBlockly.png b/src-editor/src/assets/tileBlockly.png similarity index 100% rename from src-editor/public/assets/tileBlockly.png rename to src-editor/src/assets/tileBlockly.png diff --git a/src-editor/public/assets/tileJS.png b/src-editor/src/assets/tileJS.png similarity index 100% rename from src-editor/public/assets/tileJS.png rename to src-editor/src/assets/tileJS.png diff --git a/src-editor/public/assets/tileRules.png b/src-editor/src/assets/tileRules.png similarity index 100% rename from src-editor/public/assets/tileRules.png rename to src-editor/src/assets/tileRules.png diff --git a/src-editor/public/assets/tileTS.png b/src-editor/src/assets/tileTS.png similarity index 100% rename from src-editor/public/assets/tileTS.png rename to src-editor/src/assets/tileTS.png diff --git a/src-editor/public/assets/typescript.png b/src-editor/src/assets/typescript.png similarity index 100% rename from src-editor/public/assets/typescript.png rename to src-editor/src/assets/typescript.png diff --git a/src-editor/public/assets/typescript.svg b/src-editor/src/assets/typescript.svg similarity index 100% rename from src-editor/public/assets/typescript.svg rename to src-editor/src/assets/typescript.svg diff --git a/src-editor/src/i18n/de.json b/src-editor/src/i18n/de.json index cfce0f390..e88ad14e1 100644 --- a/src-editor/src/i18n/de.json +++ b/src-editor/src/i18n/de.json @@ -1,8 +1,10 @@ { + "%s not found": "%s nicht gefunden", "()": "()", "(optional)": "(optional)", "-": "-", ".": ".", + "AI code generator": "KI-Codegenerator", "Ack": "Bestätigt", "Actions": "Aktionen", "Actual time of day": "Tatsächliche Tageszeit", diff --git a/src-editor/src/i18n/en.json b/src-editor/src/i18n/en.json index 4a9bc5d42..1112cac2e 100644 --- a/src-editor/src/i18n/en.json +++ b/src-editor/src/i18n/en.json @@ -1,8 +1,10 @@ { + "%s not found": "%s not found", "()": "()", "(optional)": "(optional)", "-": "-", ".": ".", + "AI code generator": "AI code generator", "Ack": "Acknowledged", "Actions": "Actions", "Actual time of day": "Actual time of day", diff --git a/src-editor/src/i18n/es.json b/src-editor/src/i18n/es.json index e9351fb12..cb7a4e2bc 100644 --- a/src-editor/src/i18n/es.json +++ b/src-editor/src/i18n/es.json @@ -1,8 +1,10 @@ { + "%s not found": "%s no encontrado", "()": "()", "(optional)": "(Opcional)", "-": "-", ".": ".", + "AI code generator": "Generador de código de IA", "Ack": "Admitido", "Actions": "Comportamiento", "Actual time of day": "Hora real del día", diff --git a/src-editor/src/i18n/fr.json b/src-editor/src/i18n/fr.json index bc356ef97..2fc825097 100644 --- a/src-editor/src/i18n/fr.json +++ b/src-editor/src/i18n/fr.json @@ -1,8 +1,10 @@ { + "%s not found": "%s non trouvé", "()": "()", "(optional)": "(optionnel)", "-": "-", ".": ".", + "AI code generator": "Générateur de code IA", "Ack": "Reconnu", "Actions": "Actions", "Actual time of day": "Heure réelle de la journée", diff --git a/src-editor/src/i18n/it.json b/src-editor/src/i18n/it.json index 788199b3b..ffdc5e138 100644 --- a/src-editor/src/i18n/it.json +++ b/src-editor/src/i18n/it.json @@ -1,8 +1,10 @@ { + "%s not found": "%s non trovato", "()": "()", "(optional)": "(opzionale)", "-": "-", ".": ".", + "AI code generator": "Generatore di codice AI", "Ack": "Riconosciuto", "Actions": "Azioni", "Actual time of day": "Ora effettiva della giornata", diff --git a/src-editor/src/i18n/nl.json b/src-editor/src/i18n/nl.json index 2cba9e2bd..1b3d279b8 100644 --- a/src-editor/src/i18n/nl.json +++ b/src-editor/src/i18n/nl.json @@ -1,8 +1,10 @@ { + "%s not found": "%s niet gevonden", "()": "()", "(optional)": "(optioneel)", "-": "-", ".": ".", + "AI code generator": "AI-codegenerator", "Ack": "Erkend", "Actions": "Acties", "Actual time of day": "Werkelijke tijd van de dag", diff --git a/src-editor/src/i18n/pl.json b/src-editor/src/i18n/pl.json index d13bac788..ad2f69147 100644 --- a/src-editor/src/i18n/pl.json +++ b/src-editor/src/i18n/pl.json @@ -1,8 +1,10 @@ { + "%s not found": "%s nie znaleziono", "()": "()", "(optional)": "(opcjonalny)", "-": "-", ".": ".", + "AI code generator": "Generator kodu AI", "Ack": "Potwierdzony", "Actions": "Działania", "Actual time of day": "Aktualna pora dnia", diff --git a/src-editor/src/i18n/pt.json b/src-editor/src/i18n/pt.json index ee05d1e11..5aed4b3d3 100644 --- a/src-editor/src/i18n/pt.json +++ b/src-editor/src/i18n/pt.json @@ -1,8 +1,10 @@ { + "%s not found": "%s não encontrado", "()": "()", "(optional)": "(opcional)", "-": "-", ".": ".", + "AI code generator": "Gerador de código de IA", "Ack": "Reconhecido", "Actions": "Ações", "Actual time of day": "Hora real do dia", diff --git a/src-editor/src/i18n/ru.json b/src-editor/src/i18n/ru.json index fa7e2b0c1..908ca6801 100644 --- a/src-editor/src/i18n/ru.json +++ b/src-editor/src/i18n/ru.json @@ -1,8 +1,10 @@ { + "%s not found": "%s не найден", "()": "()", "(optional)": "(необязательный)", "-": "-", ".": ".", + "AI code generator": "ИИ Генератор кода", "Ack": "Подтверждение", "Actions": "Действия", "Actual time of day": "Фактическое время суток", diff --git a/src-editor/src/i18n/uk.json b/src-editor/src/i18n/uk.json index d4d8d03d5..c5a4bdf69 100644 --- a/src-editor/src/i18n/uk.json +++ b/src-editor/src/i18n/uk.json @@ -1,8 +1,10 @@ { + "%s not found": "%s не знайдено", "()": "()", "(optional)": "(необов'язково)", "-": "-", ".": ".", + "AI code generator": "Генератор коду ШІ", "Ack": "Визнано", "Actions": "Дії", "Actual time of day": "Фактичний час доби", diff --git a/src-editor/src/i18n/zh-cn.json b/src-editor/src/i18n/zh-cn.json index c9e891e7d..4e879047d 100644 --- a/src-editor/src/i18n/zh-cn.json +++ b/src-editor/src/i18n/zh-cn.json @@ -1,8 +1,10 @@ { + "%s not found": "%s 未找到", "()": "()", "(optional)": "（选修的）", "-": "-", ".": ".", + "AI code generator": "AI代码生成器", "Ack": "确认", "Actions": "动作", "Actual time of day": "一天中的实际时间", diff --git a/src-editor/vite.config.ts b/src-editor/vite.config.ts index bd67d6d90..4dee31eb7 100644 --- a/src-editor/vite.config.ts +++ b/src-editor/vite.config.ts @@ -24,11 +24,8 @@ export default defineConfig({ 'react', 'react-dom', '@mui/material', - //'@mui/styles', - //'@mui/icons-material', 'prop-types', '@iobroker/adapter-react-v5', - 'react-ace', ]), exposes: {}, remotes: {}, @@ -38,9 +35,6 @@ export default defineConfig({ react(), vitetsConfigPaths(), commonjs(), - svgr({ - include: ['src/**/*.svg'], - }), ], server: { port: 3000,