diff --git a/CHANGELOG.md b/CHANGELOG.md index fa59d2578..1f7f4ef37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ ## __WORK IN PROGRESS__ (at the beginning of a new line ) --> +## __WORK IN PROGRESS__ +* (stevenengland) Migrate from adapter-react to adapter-react-v5 (#1095) + ## 2.6.2 (2024-02-12) * (theknut) Make ioBroker types available in the test directory (#1091) * (theknut) Add `licenseInformation` field to `io-package.json` (#1092) diff --git a/templates/admin/src/app.tsx_jsx.ts b/templates/admin/src/app.tsx_jsx.ts index 949bb9b42..072a8f571 100644 --- a/templates/admin/src/app.tsx_jsx.ts +++ b/templates/admin/src/app.tsx_jsx.ts @@ -8,19 +8,21 @@ const templateFunction: TemplateFunction = answers => { const template = ` import React from "react"; -import { ${useTypeScript ? "Theme, " : ""}withStyles } from "@material-ui/core/styles"; +import { withStyles } from "@mui/styles"; +${useTypeScript ? +"import { Theme } from '@mui/material/styles';" : ""} -import GenericApp from "@iobroker/adapter-react/GenericApp"; +import GenericApp from "@iobroker/adapter-react-v5/GenericApp"; import Settings from "./components/settings"; ${useTypeScript ? -`import { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react/types"; -import { StyleRules } from "@material-ui/core/styles"; +`import { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react-v5/types"; +import { StyleRules } from "@mui/styles/withStyles"; ` : ""} ${useTypeScript ? `const styles = (_theme: Theme): StyleRules => ({ root: {}, });` : `/** - * @type {(_theme: import("@material-ui/core/styles").Theme) => import("@material-ui/styles").StyleRules} + * @type {(_theme: import("@mui/material/styles").Theme) => import("@mui/styles/withStyles").StyleRules} */ const styles = (_theme) => ({ root: {}, diff --git a/templates/admin/src/components/settings.tsx_jsx.ts b/templates/admin/src/components/settings.tsx_jsx.ts index b50d75f35..49038f59c 100644 --- a/templates/admin/src/components/settings.tsx_jsx.ts +++ b/templates/admin/src/components/settings.tsx_jsx.ts @@ -25,20 +25,20 @@ const templateFunction: TemplateFunction = answers => { const template = ` import React from "react"; -import { withStyles } from "@material-ui/core/styles"; -${useTypeScript ? `import { CreateCSSProperties } from "@material-ui/core/styles/withStyles"; -` : ""}import TextField from "@material-ui/core/TextField"; -import Input from "@material-ui/core/Input"; -import FormHelperText from "@material-ui/core/FormHelperText"; -import FormControl from "@material-ui/core/FormControl"; -import Select from "@material-ui/core/Select"; -import MenuItem from "@material-ui/core/MenuItem"; -import FormControlLabel from "@material-ui/core/FormControlLabel"; -import Checkbox from "@material-ui/core/Checkbox"; -import I18n from "@iobroker/adapter-react/i18n"; +import { withStyles } from "@mui/styles"; +${useTypeScript ? `import { CreateCSSProperties } from "@mui/styles/withStyles"; +` : ""}import TextField from "@mui/material/TextField"; +import Input from "@mui/material/Input"; +import FormHelperText from "@mui/material/FormHelperText"; +import FormControl from "@mui/material/FormControl"; +import Select from "@mui/material/Select"; +import MenuItem from "@mui/material/MenuItem"; +import FormControlLabel from "@mui/material/FormControlLabel"; +import Checkbox from "@mui/material/Checkbox"; +import I18n from "@iobroker/adapter-react-v5/i18n"; ${useTypeScript ? "" : `/** - * @type {() => Record} + * @type {() => Record} */`} const styles = ()${useTypeScript ? ": Record" : ""} => ({ input: { @@ -119,6 +119,7 @@ ${useTypeScript ? "" : `/** type={type || "text"} onChange={(e) => this.props.onChange(attr, e.target.value)} margin="normal" + variant="standard" /> ); } @@ -142,11 +143,13 @@ ${useTypeScript ? "" : `/** paddingTop: 5, ...style }} + variant="standard" > } + variant="standard" > {options.map((item) => ( diff --git a/templates/admin/src/i18n/i18n.dts.ts b/templates/admin/src/i18n/i18n.dts.ts index 421370056..aee50abab 100644 --- a/templates/admin/src/i18n/i18n.dts.ts +++ b/templates/admin/src/i18n/i18n.dts.ts @@ -13,7 +13,7 @@ const templateFunction: TemplateFunction = answers => { const template = ` /* * This file loads the translations keys from \`i18n/en.json\` file and overrides - * the declarations for the translate function \`I18n.t\` available in "@iobroker/adapter-react/i18n". + * the declarations for the translate function \`I18n.t\` available in "@iobroker/adapter-react-v5/i18n". * Using these definitions it is ensured that all used translations in the React * context are defined at least in the english translations file. * This will add no overhead in the generated code since it just reexports the @@ -29,7 +29,7 @@ const templateFunction: TemplateFunction = answers => { */ declare type AdminWord = keyof typeof import("./en.json"); -declare module "@iobroker/adapter-react/i18n" { +declare module "@iobroker/adapter-react-v5/i18n" { /** * Translate the given string to the selected language. * @param word The (key) word to look up the string. Has to be defined at least in \`i18n/en.json\`. diff --git a/templates/admin/src/index.tsx_jsx.ts b/templates/admin/src/index.tsx_jsx.ts index bff53dd6a..05c3293cc 100644 --- a/templates/admin/src/index.tsx_jsx.ts +++ b/templates/admin/src/index.tsx_jsx.ts @@ -9,24 +9,26 @@ const templateFunction: TemplateFunction = answers => { const template = ` import React from "react"; import ReactDOM from "react-dom"; -import { MuiThemeProvider } from "@material-ui/core/styles"; -import theme from "@iobroker/adapter-react/Theme"; -import Utils from "@iobroker/adapter-react/Components/Utils"; +import { ThemeProvider, StyledEngineProvider } from '@mui/material/styles'; +import theme from "@iobroker/adapter-react-v5/Theme"; +import Utils from "@iobroker/adapter-react-v5/Components/Utils"; import App from "./app"; let themeName = Utils.getThemeName(); -function build()${useTypeScript ? ": void" : ""} { +function build(${useTypeScript ? "this: any" : ""})${useTypeScript ? ": void" : ""} { ReactDOM.render( - - { - themeName = _theme; - build(); - }} - /> - , + + + { + themeName = _theme; + build(); + }} + /> + + , document.getElementById("root"), ); } diff --git a/templates/admin/src/tab-app.tsx_jsx.ts b/templates/admin/src/tab-app.tsx_jsx.ts index fbd080c04..0c47a7230 100644 --- a/templates/admin/src/tab-app.tsx_jsx.ts +++ b/templates/admin/src/tab-app.tsx_jsx.ts @@ -8,18 +8,20 @@ const templateFunction: TemplateFunction = answers => { const template = ` import React from "react"; -import { ${useTypeScript ? "Theme, " : ""}withStyles } from "@material-ui/core/styles"; +import { withStyles } from "@mui/styles"; +${useTypeScript ? +"import { Theme } from '@mui/material/styles';" : ""} -import GenericApp from "@iobroker/adapter-react/GenericApp"; +import GenericApp from "@iobroker/adapter-react-v5/GenericApp"; ${useTypeScript ? -`import { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react/types"; -import { StyleRules } from "@material-ui/core/styles"; +`import { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react-v5/types"; +import { StyleRules } from "@mui/styles/withStyles"; ` : ""} ${useTypeScript ? `const styles = (_theme: Theme): StyleRules => ({ root: {}, });` : `/** - * @type {(_theme: Theme) => import("@material-ui/styles").StyleRules} + * @type {(_theme: Theme) => import("@mui/styles/withStyles").StyleRules} */ const styles = (_theme) => ({ root: {}, diff --git a/templates/admin/src/tab.tsx_jsx.ts b/templates/admin/src/tab.tsx_jsx.ts index f3c7c0da6..bfacebf85 100644 --- a/templates/admin/src/tab.tsx_jsx.ts +++ b/templates/admin/src/tab.tsx_jsx.ts @@ -9,24 +9,26 @@ const templateFunction: TemplateFunction = answers => { const template = ` import React from "react"; import ReactDOM from "react-dom"; -import { MuiThemeProvider } from "@material-ui/core/styles"; -import theme from "@iobroker/adapter-react/Theme"; -import Utils from "@iobroker/adapter-react/Components/Utils"; +import { ThemeProvider, StyledEngineProvider } from '@mui/material/styles'; +import theme from "@iobroker/adapter-react-v5/Theme"; +import Utils from "@iobroker/adapter-react-v5/Components/Utils"; import TabApp from "./tab-app"; let themeName = Utils.getThemeName(); function build()${useTypeScript ? ": void" : ""} { ReactDOM.render( - - { - themeName = _theme; - build(); - }} - /> - , + + + { + themeName = _theme; + build(); + }} + /> + + , document.getElementById("root"), ); } diff --git a/templates/package.json.ts b/templates/package.json.ts index bcfe319c8..bc1dbfda4 100644 --- a/templates/package.json.ts +++ b/templates/package.json.ts @@ -76,9 +76,11 @@ const templateFunction: TemplateFunction = async answers => { "react@17", "react-dom@17", // ioBroker react framework - "@iobroker/adapter-react@2.0.22", + "@iobroker/adapter-react-v5@4", // UI library - "@material-ui/core", + "@mui/material", + "@mui/styles", + "babel-eslint", ] : []), ...(useTypeChecking && useReact ? [ // React's type definitions diff --git a/test/baselines/ReleaseScript_JS/package.json b/test/baselines/ReleaseScript_JS/package.json index 2c857c5b0..a1f7b4cbb 100644 --- a/test/baselines/ReleaseScript_JS/package.json +++ b/test/baselines/ReleaseScript_JS/package.json @@ -29,7 +29,7 @@ "@alcalzone/release-script-plugin-iobroker": "^3.7.0", "@alcalzone/release-script-plugin-license": "^3.7.0", "@alcalzone/release-script-plugin-manual-review": "^3.7.0", - "@iobroker/adapter-dev": "^1.2.0", + "@iobroker/adapter-dev": "^1.3.0", "@iobroker/testing": "^4.1.0", "chai-as-promised": "^7.1.1", "chai": "^4.4.1", diff --git a/test/baselines/ReleaseScript_TS/package.json b/test/baselines/ReleaseScript_TS/package.json index 52e6f72d7..1f0092ad8 100644 --- a/test/baselines/ReleaseScript_TS/package.json +++ b/test/baselines/ReleaseScript_TS/package.json @@ -29,18 +29,18 @@ "@alcalzone/release-script-plugin-iobroker": "^3.7.0", "@alcalzone/release-script-plugin-license": "^3.7.0", "@alcalzone/release-script-plugin-manual-review": "^3.7.0", - "@iobroker/adapter-dev": "^1.2.0", + "@iobroker/adapter-dev": "^1.3.0", "@iobroker/testing": "^4.1.0", "@tsconfig/node18": "^18.2.2", "@types/chai": "^4.3.11", "@types/chai-as-promised": "^7.1.8", "@types/mocha": "^10.0.6", - "@types/node": "^18.19.15", + "@types/node": "^18.19.17", "@types/proxyquire": "^1.3.31", "@types/sinon": "^17.0.3", "@types/sinon-chai": "^3.2.12", - "@typescript-eslint/eslint-plugin": "^6.21.0", - "@typescript-eslint/parser": "^6.21.0", + "@typescript-eslint/eslint-plugin": "^7.0.2", + "@typescript-eslint/parser": "^7.0.2", "chai-as-promised": "^7.1.1", "chai": "^4.4.1", "eslint": "^8.56.0", diff --git a/test/baselines/TS_Prettier/package.json b/test/baselines/TS_Prettier/package.json index 12aa5c26b..05d2d9581 100644 --- a/test/baselines/TS_Prettier/package.json +++ b/test/baselines/TS_Prettier/package.json @@ -25,18 +25,18 @@ "@iobroker/adapter-core": "^3.0.4" }, "devDependencies": { - "@iobroker/adapter-dev": "^1.2.0", + "@iobroker/adapter-dev": "^1.3.0", "@iobroker/testing": "^4.1.0", "@tsconfig/node18": "^18.2.2", "@types/chai": "^4.3.11", "@types/chai-as-promised": "^7.1.8", "@types/mocha": "^10.0.6", - "@types/node": "^18.19.15", + "@types/node": "^18.19.17", "@types/proxyquire": "^1.3.31", "@types/sinon": "^17.0.3", "@types/sinon-chai": "^3.2.12", - "@typescript-eslint/eslint-plugin": "^6.21.0", - "@typescript-eslint/parser": "^6.21.0", + "@typescript-eslint/eslint-plugin": "^7.0.2", + "@typescript-eslint/parser": "^7.0.2", "chai-as-promised": "^7.1.1", "chai": "^4.4.1", "eslint": "^8.56.0", diff --git a/test/baselines/TS_SingleQuotes/admin/src/app.tsx b/test/baselines/TS_SingleQuotes/admin/src/app.tsx index cc7de6757..859587757 100644 --- a/test/baselines/TS_SingleQuotes/admin/src/app.tsx +++ b/test/baselines/TS_SingleQuotes/admin/src/app.tsx @@ -1,10 +1,11 @@ import React from 'react'; -import { Theme, withStyles } from '@material-ui/core/styles'; +import { withStyles } from '@mui/styles'; +import { Theme } from '@mui/material/styles'; -import GenericApp from '@iobroker/adapter-react/GenericApp'; +import GenericApp from '@iobroker/adapter-react-v5/GenericApp'; import Settings from './components/settings'; -import { GenericAppProps, GenericAppSettings } from '@iobroker/adapter-react/types'; -import { StyleRules } from '@material-ui/core/styles'; +import { GenericAppProps, GenericAppSettings } from '@iobroker/adapter-react-v5/types'; +import { StyleRules } from '@mui/styles/withStyles'; const styles = (_theme: Theme): StyleRules => ({ root: {}, diff --git a/test/baselines/TS_SingleQuotes/admin/src/components/settings.tsx b/test/baselines/TS_SingleQuotes/admin/src/components/settings.tsx index 75832b410..f44d3f104 100644 --- a/test/baselines/TS_SingleQuotes/admin/src/components/settings.tsx +++ b/test/baselines/TS_SingleQuotes/admin/src/components/settings.tsx @@ -1,15 +1,15 @@ import React from 'react'; -import { withStyles } from '@material-ui/core/styles'; -import { CreateCSSProperties } from '@material-ui/core/styles/withStyles'; -import TextField from '@material-ui/core/TextField'; -import Input from '@material-ui/core/Input'; -import FormHelperText from '@material-ui/core/FormHelperText'; -import FormControl from '@material-ui/core/FormControl'; -import Select from '@material-ui/core/Select'; -import MenuItem from '@material-ui/core/MenuItem'; -import FormControlLabel from '@material-ui/core/FormControlLabel'; -import Checkbox from '@material-ui/core/Checkbox'; -import I18n from '@iobroker/adapter-react/i18n'; +import { withStyles } from '@mui/styles'; +import { CreateCSSProperties } from '@mui/styles/withStyles'; +import TextField from '@mui/material/TextField'; +import Input from '@mui/material/Input'; +import FormHelperText from '@mui/material/FormHelperText'; +import FormControl from '@mui/material/FormControl'; +import Select from '@mui/material/Select'; +import MenuItem from '@mui/material/MenuItem'; +import FormControlLabel from '@mui/material/FormControlLabel'; +import Checkbox from '@mui/material/Checkbox'; +import I18n from '@iobroker/adapter-react-v5/i18n'; const styles = (): Record => ({ input: { @@ -71,6 +71,7 @@ class Settings extends React.Component { type={type || 'text'} onChange={(e) => this.props.onChange(attr, e.target.value)} margin="normal" + variant="standard" /> ); } @@ -88,11 +89,13 @@ class Settings extends React.Component { paddingTop: 5, ...style }} + variant="standard" > } + variant="standard" > {options.map((item) => ( diff --git a/test/baselines/TS_SingleQuotes/admin/src/index.tsx b/test/baselines/TS_SingleQuotes/admin/src/index.tsx index 677ef3044..5f1b65367 100644 --- a/test/baselines/TS_SingleQuotes/admin/src/index.tsx +++ b/test/baselines/TS_SingleQuotes/admin/src/index.tsx @@ -1,23 +1,25 @@ import React from 'react'; import ReactDOM from 'react-dom'; -import { MuiThemeProvider } from '@material-ui/core/styles'; -import theme from '@iobroker/adapter-react/Theme'; -import Utils from '@iobroker/adapter-react/Components/Utils'; +import { ThemeProvider, StyledEngineProvider } from '@mui/material/styles'; +import theme from '@iobroker/adapter-react-v5/Theme'; +import Utils from '@iobroker/adapter-react-v5/Components/Utils'; import App from './app'; let themeName = Utils.getThemeName(); -function build(): void { +function build(this: any): void { ReactDOM.render( - - { - themeName = _theme; - build(); - }} - /> - , + + + { + themeName = _theme; + build(); + }} + /> + + , document.getElementById('root'), ); } diff --git a/test/baselines/TS_SingleQuotes/src/main.ts b/test/baselines/TS_SingleQuotes/src/main.ts index efe8ebcea..83530de94 100644 --- a/test/baselines/TS_SingleQuotes/src/main.ts +++ b/test/baselines/TS_SingleQuotes/src/main.ts @@ -1,5 +1,5 @@ /* - * Created with @iobroker/create-adapter v2.6.1 + * Created with @iobroker/create-adapter v2.6.2 */ // The adapter-core module gives you access to the core ioBroker functions diff --git a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/.create-adapter.json b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/.create-adapter.json index 604588105..a8e8fdfab 100644 --- a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/.create-adapter.json +++ b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/.create-adapter.json @@ -34,5 +34,5 @@ "type": "free", "license": "MIT" }, - "creatorVersion": "2.6.1" + "creatorVersion": "2.6.2" } \ No newline at end of file diff --git a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/main.js b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/main.js index f4622b517..a5d5d0142 100644 --- a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/main.js +++ b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/main.js @@ -1,7 +1,7 @@ 'use strict'; /* - * Created with @iobroker/create-adapter v2.6.1 + * Created with @iobroker/create-adapter v2.6.2 */ // The adapter-core module gives you access to the core ioBroker functions diff --git a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/package.json b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/package.json index c6551ae95..ce92aed92 100644 --- a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/package.json +++ b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/package.json @@ -25,13 +25,13 @@ "@iobroker/adapter-core": "^3.0.4" }, "devDependencies": { - "@iobroker/adapter-dev": "^1.2.0", + "@iobroker/adapter-dev": "^1.3.0", "@iobroker/testing": "^4.1.0", "@tsconfig/node18": "^18.2.2", "@types/chai": "^4.3.11", "@types/chai-as-promised": "^7.1.8", "@types/mocha": "^10.0.6", - "@types/node": "^18.19.15", + "@types/node": "^18.19.17", "@types/proxyquire": "^1.3.31", "@types/sinon": "^17.0.3", "@types/sinon-chai": "^3.2.12", diff --git a/test/baselines/adapter_JS_React/.create-adapter.json b/test/baselines/adapter_JS_React/.create-adapter.json index 2e532ba33..394fe8d42 100644 --- a/test/baselines/adapter_JS_React/.create-adapter.json +++ b/test/baselines/adapter_JS_React/.create-adapter.json @@ -33,5 +33,5 @@ "type": "free", "license": "MIT" }, - "creatorVersion": "2.6.1" + "creatorVersion": "2.6.2" } \ No newline at end of file diff --git a/test/baselines/adapter_JS_React/admin/src/app.jsx b/test/baselines/adapter_JS_React/admin/src/app.jsx index 473b61bcb..61f4e32a5 100644 --- a/test/baselines/adapter_JS_React/admin/src/app.jsx +++ b/test/baselines/adapter_JS_React/admin/src/app.jsx @@ -1,11 +1,11 @@ import React from "react"; -import { withStyles } from "@material-ui/core/styles"; +import { withStyles } from "@mui/styles"; -import GenericApp from "@iobroker/adapter-react/GenericApp"; +import GenericApp from "@iobroker/adapter-react-v5/GenericApp"; import Settings from "./components/settings"; /** - * @type {(_theme: import("@material-ui/core/styles").Theme) => import("@material-ui/styles").StyleRules} + * @type {(_theme: import("@mui/material/styles").Theme) => import("@mui/styles/withStyles").StyleRules} */ const styles = (_theme) => ({ root: {}, diff --git a/test/baselines/adapter_JS_React/admin/src/components/settings.jsx b/test/baselines/adapter_JS_React/admin/src/components/settings.jsx index b105ee9a0..e6d2570a8 100644 --- a/test/baselines/adapter_JS_React/admin/src/components/settings.jsx +++ b/test/baselines/adapter_JS_React/admin/src/components/settings.jsx @@ -1,17 +1,17 @@ import React from "react"; -import { withStyles } from "@material-ui/core/styles"; -import TextField from "@material-ui/core/TextField"; -import Input from "@material-ui/core/Input"; -import FormHelperText from "@material-ui/core/FormHelperText"; -import FormControl from "@material-ui/core/FormControl"; -import Select from "@material-ui/core/Select"; -import MenuItem from "@material-ui/core/MenuItem"; -import FormControlLabel from "@material-ui/core/FormControlLabel"; -import Checkbox from "@material-ui/core/Checkbox"; -import I18n from "@iobroker/adapter-react/i18n"; +import { withStyles } from "@mui/styles"; +import TextField from "@mui/material/TextField"; +import Input from "@mui/material/Input"; +import FormHelperText from "@mui/material/FormHelperText"; +import FormControl from "@mui/material/FormControl"; +import Select from "@mui/material/Select"; +import MenuItem from "@mui/material/MenuItem"; +import FormControlLabel from "@mui/material/FormControlLabel"; +import Checkbox from "@mui/material/Checkbox"; +import I18n from "@iobroker/adapter-react-v5/i18n"; /** - * @type {() => Record} + * @type {() => Record} */ const styles = () => ({ input: { @@ -81,6 +81,7 @@ class Settings extends React.Component { type={type || "text"} onChange={(e) => this.props.onChange(attr, e.target.value)} margin="normal" + variant="standard" /> ); } @@ -99,11 +100,13 @@ class Settings extends React.Component { paddingTop: 5, ...style }} + variant="standard" > } + variant="standard" > {options.map((item) => ( diff --git a/test/baselines/adapter_JS_React/admin/src/index.jsx b/test/baselines/adapter_JS_React/admin/src/index.jsx index 723e773b7..8db44efd7 100644 --- a/test/baselines/adapter_JS_React/admin/src/index.jsx +++ b/test/baselines/adapter_JS_React/admin/src/index.jsx @@ -1,23 +1,25 @@ import React from "react"; import ReactDOM from "react-dom"; -import { MuiThemeProvider } from "@material-ui/core/styles"; -import theme from "@iobroker/adapter-react/Theme"; -import Utils from "@iobroker/adapter-react/Components/Utils"; +import { ThemeProvider, StyledEngineProvider } from "@mui/material/styles"; +import theme from "@iobroker/adapter-react-v5/Theme"; +import Utils from "@iobroker/adapter-react-v5/Components/Utils"; import App from "./app"; let themeName = Utils.getThemeName(); function build() { ReactDOM.render( - - { - themeName = _theme; - build(); - }} - /> - , + + + { + themeName = _theme; + build(); + }} + /> + + , document.getElementById("root"), ); } diff --git a/test/baselines/adapter_JS_React/main.js b/test/baselines/adapter_JS_React/main.js index f352e242a..2450b7232 100644 --- a/test/baselines/adapter_JS_React/main.js +++ b/test/baselines/adapter_JS_React/main.js @@ -1,7 +1,7 @@ "use strict"; /* - * Created with @iobroker/create-adapter v2.6.1 + * Created with @iobroker/create-adapter v2.6.2 */ // The adapter-core module gives you access to the core ioBroker functions diff --git a/test/baselines/adapter_JS_React/package.json b/test/baselines/adapter_JS_React/package.json index 5590f6f5e..df17482b0 100644 --- a/test/baselines/adapter_JS_React/package.json +++ b/test/baselines/adapter_JS_React/package.json @@ -25,10 +25,12 @@ "@iobroker/adapter-core": "^3.0.4" }, "devDependencies": { - "@iobroker/adapter-dev": "^1.2.0", - "@iobroker/adapter-react": "2.0.22", + "@iobroker/adapter-dev": "^1.3.0", + "@iobroker/adapter-react-v5": "^4.9.10", "@iobroker/testing": "^4.1.0", - "@material-ui/core": "^4.12.4", + "@mui/material": "^5.15.10", + "@mui/styles": "^5.15.10", + "babel-eslint": "^10.1.0", "chai-as-promised": "^7.1.1", "chai": "^4.4.1", "eslint": "^8.56.0", diff --git a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/.create-adapter.json b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/.create-adapter.json index 35aa2cff3..da8536d2c 100644 --- a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/.create-adapter.json +++ b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/.create-adapter.json @@ -35,5 +35,5 @@ "licenseInformation": { "type": "free" }, - "creatorVersion": "2.6.1" + "creatorVersion": "2.6.2" } \ No newline at end of file diff --git a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/package.json b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/package.json index 79f95a252..597e8b9dc 100644 --- a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/package.json +++ b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/package.json @@ -25,18 +25,18 @@ "@iobroker/adapter-core": "^3.0.4" }, "devDependencies": { - "@iobroker/adapter-dev": "^1.2.0", + "@iobroker/adapter-dev": "^1.3.0", "@iobroker/testing": "^4.1.0", "@tsconfig/node18": "^18.2.2", "@types/chai": "^4.3.11", "@types/chai-as-promised": "^7.1.8", "@types/mocha": "^10.0.6", - "@types/node": "^18.19.15", + "@types/node": "^18.19.17", "@types/proxyquire": "^1.3.31", "@types/sinon": "^17.0.3", "@types/sinon-chai": "^3.2.12", - "@typescript-eslint/eslint-plugin": "^6.21.0", - "@typescript-eslint/parser": "^6.21.0", + "@typescript-eslint/eslint-plugin": "^7.0.2", + "@typescript-eslint/parser": "^7.0.2", "chai-as-promised": "^7.1.1", "chai": "^4.4.1", "eslint": "^8.56.0", diff --git a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/src/main.ts b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/src/main.ts index 5a1427f76..590890234 100644 --- a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/src/main.ts +++ b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/src/main.ts @@ -1,5 +1,5 @@ /* - * Created with @iobroker/create-adapter v2.6.1 + * Created with @iobroker/create-adapter v2.6.2 */ // The adapter-core module gives you access to the core ioBroker functions diff --git a/test/baselines/adapter_TS_React/.create-adapter.json b/test/baselines/adapter_TS_React/.create-adapter.json index a34c183ca..219d7a9b6 100644 --- a/test/baselines/adapter_TS_React/.create-adapter.json +++ b/test/baselines/adapter_TS_React/.create-adapter.json @@ -33,5 +33,5 @@ "type": "free", "license": "MIT" }, - "creatorVersion": "2.6.1" + "creatorVersion": "2.6.2" } \ No newline at end of file diff --git a/test/baselines/adapter_TS_React/admin/src/app.tsx b/test/baselines/adapter_TS_React/admin/src/app.tsx index b4f93806a..eaefc8a8f 100644 --- a/test/baselines/adapter_TS_React/admin/src/app.tsx +++ b/test/baselines/adapter_TS_React/admin/src/app.tsx @@ -1,10 +1,11 @@ import React from "react"; -import { Theme, withStyles } from "@material-ui/core/styles"; +import { withStyles } from "@mui/styles"; +import { Theme } from "@mui/material/styles"; -import GenericApp from "@iobroker/adapter-react/GenericApp"; +import GenericApp from "@iobroker/adapter-react-v5/GenericApp"; import Settings from "./components/settings"; -import { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react/types"; -import { StyleRules } from "@material-ui/core/styles"; +import { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react-v5/types"; +import { StyleRules } from "@mui/styles/withStyles"; const styles = (_theme: Theme): StyleRules => ({ root: {}, diff --git a/test/baselines/adapter_TS_React/admin/src/components/settings.tsx b/test/baselines/adapter_TS_React/admin/src/components/settings.tsx index a504b063a..d106da835 100644 --- a/test/baselines/adapter_TS_React/admin/src/components/settings.tsx +++ b/test/baselines/adapter_TS_React/admin/src/components/settings.tsx @@ -1,15 +1,15 @@ import React from "react"; -import { withStyles } from "@material-ui/core/styles"; -import { CreateCSSProperties } from "@material-ui/core/styles/withStyles"; -import TextField from "@material-ui/core/TextField"; -import Input from "@material-ui/core/Input"; -import FormHelperText from "@material-ui/core/FormHelperText"; -import FormControl from "@material-ui/core/FormControl"; -import Select from "@material-ui/core/Select"; -import MenuItem from "@material-ui/core/MenuItem"; -import FormControlLabel from "@material-ui/core/FormControlLabel"; -import Checkbox from "@material-ui/core/Checkbox"; -import I18n from "@iobroker/adapter-react/i18n"; +import { withStyles } from "@mui/styles"; +import { CreateCSSProperties } from "@mui/styles/withStyles"; +import TextField from "@mui/material/TextField"; +import Input from "@mui/material/Input"; +import FormHelperText from "@mui/material/FormHelperText"; +import FormControl from "@mui/material/FormControl"; +import Select from "@mui/material/Select"; +import MenuItem from "@mui/material/MenuItem"; +import FormControlLabel from "@mui/material/FormControlLabel"; +import Checkbox from "@mui/material/Checkbox"; +import I18n from "@iobroker/adapter-react-v5/i18n"; const styles = (): Record => ({ input: { @@ -71,6 +71,7 @@ class Settings extends React.Component { type={type || "text"} onChange={(e) => this.props.onChange(attr, e.target.value)} margin="normal" + variant="standard" /> ); } @@ -88,11 +89,13 @@ class Settings extends React.Component { paddingTop: 5, ...style }} + variant="standard" > } + variant="standard" > {options.map((item) => ( diff --git a/test/baselines/adapter_TS_React/admin/src/i18n/i18n.d.ts b/test/baselines/adapter_TS_React/admin/src/i18n/i18n.d.ts index f4a769e59..0a5a99945 100644 --- a/test/baselines/adapter_TS_React/admin/src/i18n/i18n.d.ts +++ b/test/baselines/adapter_TS_React/admin/src/i18n/i18n.d.ts @@ -1,6 +1,6 @@ /* * This file loads the translations keys from `i18n/en.json` file and overrides - * the declarations for the translate function `I18n.t` available in "@iobroker/adapter-react/i18n". + * the declarations for the translate function `I18n.t` available in "@iobroker/adapter-react-v5/i18n". * Using these definitions it is ensured that all used translations in the React * context are defined at least in the english translations file. * This will add no overhead in the generated code since it just reexports the @@ -16,7 +16,7 @@ */ declare type AdminWord = keyof typeof import("./en.json"); -declare module "@iobroker/adapter-react/i18n" { +declare module "@iobroker/adapter-react-v5/i18n" { /** * Translate the given string to the selected language. * @param word The (key) word to look up the string. Has to be defined at least in `i18n/en.json`. diff --git a/test/baselines/adapter_TS_React/admin/src/index.tsx b/test/baselines/adapter_TS_React/admin/src/index.tsx index e114005c8..3b18c29c5 100644 --- a/test/baselines/adapter_TS_React/admin/src/index.tsx +++ b/test/baselines/adapter_TS_React/admin/src/index.tsx @@ -1,23 +1,25 @@ import React from "react"; import ReactDOM from "react-dom"; -import { MuiThemeProvider } from "@material-ui/core/styles"; -import theme from "@iobroker/adapter-react/Theme"; -import Utils from "@iobroker/adapter-react/Components/Utils"; +import { ThemeProvider, StyledEngineProvider } from "@mui/material/styles"; +import theme from "@iobroker/adapter-react-v5/Theme"; +import Utils from "@iobroker/adapter-react-v5/Components/Utils"; import App from "./app"; let themeName = Utils.getThemeName(); -function build(): void { +function build(this: any): void { ReactDOM.render( - - { - themeName = _theme; - build(); - }} - /> - , + + + { + themeName = _theme; + build(); + }} + /> + + , document.getElementById("root"), ); } diff --git a/test/baselines/adapter_TS_React/package.json b/test/baselines/adapter_TS_React/package.json index 0c0c07106..87f940a18 100644 --- a/test/baselines/adapter_TS_React/package.json +++ b/test/baselines/adapter_TS_React/package.json @@ -25,22 +25,24 @@ "@iobroker/adapter-core": "^3.0.4" }, "devDependencies": { - "@iobroker/adapter-dev": "^1.2.0", - "@iobroker/adapter-react": "2.0.22", + "@iobroker/adapter-dev": "^1.3.0", + "@iobroker/adapter-react-v5": "^4.9.10", "@iobroker/testing": "^4.1.0", - "@material-ui/core": "^4.12.4", + "@mui/material": "^5.15.10", + "@mui/styles": "^5.15.10", "@tsconfig/node18": "^18.2.2", "@types/chai": "^4.3.11", "@types/chai-as-promised": "^7.1.8", "@types/mocha": "^10.0.6", - "@types/node": "^18.19.15", + "@types/node": "^18.19.17", "@types/proxyquire": "^1.3.31", "@types/react-dom": "^17.0.25", "@types/react": "^17.0.75", "@types/sinon": "^17.0.3", "@types/sinon-chai": "^3.2.12", - "@typescript-eslint/eslint-plugin": "^6.21.0", - "@typescript-eslint/parser": "^6.21.0", + "@typescript-eslint/eslint-plugin": "^7.0.2", + "@typescript-eslint/parser": "^7.0.2", + "babel-eslint": "^10.1.0", "chai-as-promised": "^7.1.1", "chai": "^4.4.1", "eslint": "^8.56.0", diff --git a/test/baselines/adapter_TS_React/src/main.ts b/test/baselines/adapter_TS_React/src/main.ts index 5a1427f76..590890234 100644 --- a/test/baselines/adapter_TS_React/src/main.ts +++ b/test/baselines/adapter_TS_React/src/main.ts @@ -1,5 +1,5 @@ /* - * Created with @iobroker/create-adapter v2.6.1 + * Created with @iobroker/create-adapter v2.6.2 */ // The adapter-core module gives you access to the core ioBroker functions diff --git a/test/baselines/connectionIndicator_yes/src/main.ts b/test/baselines/connectionIndicator_yes/src/main.ts index a8cac4e09..cb85a7248 100644 --- a/test/baselines/connectionIndicator_yes/src/main.ts +++ b/test/baselines/connectionIndicator_yes/src/main.ts @@ -1,5 +1,5 @@ /* - * Created with @iobroker/create-adapter v2.6.1 + * Created with @iobroker/create-adapter v2.6.2 */ // The adapter-core module gives you access to the core ioBroker functions diff --git a/test/baselines/contributors/package.json b/test/baselines/contributors/package.json index 5fb6e5177..d56d1e877 100644 --- a/test/baselines/contributors/package.json +++ b/test/baselines/contributors/package.json @@ -33,18 +33,18 @@ "@iobroker/adapter-core": "^3.0.4" }, "devDependencies": { - "@iobroker/adapter-dev": "^1.2.0", + "@iobroker/adapter-dev": "^1.3.0", "@iobroker/testing": "^4.1.0", "@tsconfig/node18": "^18.2.2", "@types/chai": "^4.3.11", "@types/chai-as-promised": "^7.1.8", "@types/mocha": "^10.0.6", - "@types/node": "^18.19.15", + "@types/node": "^18.19.17", "@types/proxyquire": "^1.3.31", "@types/sinon": "^17.0.3", "@types/sinon-chai": "^3.2.12", - "@typescript-eslint/eslint-plugin": "^6.21.0", - "@typescript-eslint/parser": "^6.21.0", + "@typescript-eslint/eslint-plugin": "^7.0.2", + "@typescript-eslint/parser": "^7.0.2", "chai-as-promised": "^7.1.1", "chai": "^4.4.1", "eslint": "^8.56.0", diff --git a/test/baselines/customAdapterSettings/src/main.ts b/test/baselines/customAdapterSettings/src/main.ts index ab2671420..43824aa97 100644 --- a/test/baselines/customAdapterSettings/src/main.ts +++ b/test/baselines/customAdapterSettings/src/main.ts @@ -1,5 +1,5 @@ /* - * Created with @iobroker/create-adapter v2.6.1 + * Created with @iobroker/create-adapter v2.6.2 */ // The adapter-core module gives you access to the core ioBroker functions diff --git a/test/baselines/git_SSH/package.json b/test/baselines/git_SSH/package.json index 56ddc2940..e93e0996e 100644 --- a/test/baselines/git_SSH/package.json +++ b/test/baselines/git_SSH/package.json @@ -25,18 +25,18 @@ "@iobroker/adapter-core": "^3.0.4" }, "devDependencies": { - "@iobroker/adapter-dev": "^1.2.0", + "@iobroker/adapter-dev": "^1.3.0", "@iobroker/testing": "^4.1.0", "@tsconfig/node18": "^18.2.2", "@types/chai": "^4.3.11", "@types/chai-as-promised": "^7.1.8", "@types/mocha": "^10.0.6", - "@types/node": "^18.19.15", + "@types/node": "^18.19.17", "@types/proxyquire": "^1.3.31", "@types/sinon": "^17.0.3", "@types/sinon-chai": "^3.2.12", - "@typescript-eslint/eslint-plugin": "^6.21.0", - "@typescript-eslint/parser": "^6.21.0", + "@typescript-eslint/eslint-plugin": "^7.0.2", + "@typescript-eslint/parser": "^7.0.2", "chai-as-promised": "^7.1.1", "chai": "^4.4.1", "eslint": "^8.56.0", diff --git a/test/baselines/keywords/package.json b/test/baselines/keywords/package.json index 977150403..4ec8c184b 100644 --- a/test/baselines/keywords/package.json +++ b/test/baselines/keywords/package.json @@ -26,18 +26,18 @@ "@iobroker/adapter-core": "^3.0.4" }, "devDependencies": { - "@iobroker/adapter-dev": "^1.2.0", + "@iobroker/adapter-dev": "^1.3.0", "@iobroker/testing": "^4.1.0", "@tsconfig/node18": "^18.2.2", "@types/chai": "^4.3.11", "@types/chai-as-promised": "^7.1.8", "@types/mocha": "^10.0.6", - "@types/node": "^18.19.15", + "@types/node": "^18.19.17", "@types/proxyquire": "^1.3.31", "@types/sinon": "^17.0.3", "@types/sinon-chai": "^3.2.12", - "@typescript-eslint/eslint-plugin": "^6.21.0", - "@typescript-eslint/parser": "^6.21.0", + "@typescript-eslint/eslint-plugin": "^7.0.2", + "@typescript-eslint/parser": "^7.0.2", "chai-as-promised": "^7.1.1", "chai": "^4.4.1", "eslint": "^8.56.0", diff --git a/test/baselines/minNodeVersion_18/package.json b/test/baselines/minNodeVersion_18/package.json index 79f95a252..597e8b9dc 100644 --- a/test/baselines/minNodeVersion_18/package.json +++ b/test/baselines/minNodeVersion_18/package.json @@ -25,18 +25,18 @@ "@iobroker/adapter-core": "^3.0.4" }, "devDependencies": { - "@iobroker/adapter-dev": "^1.2.0", + "@iobroker/adapter-dev": "^1.3.0", "@iobroker/testing": "^4.1.0", "@tsconfig/node18": "^18.2.2", "@types/chai": "^4.3.11", "@types/chai-as-promised": "^7.1.8", "@types/mocha": "^10.0.6", - "@types/node": "^18.19.15", + "@types/node": "^18.19.17", "@types/proxyquire": "^1.3.31", "@types/sinon": "^17.0.3", "@types/sinon-chai": "^3.2.12", - "@typescript-eslint/eslint-plugin": "^6.21.0", - "@typescript-eslint/parser": "^6.21.0", + "@typescript-eslint/eslint-plugin": "^7.0.2", + "@typescript-eslint/parser": "^7.0.2", "chai-as-promised": "^7.1.1", "chai": "^4.4.1", "eslint": "^8.56.0", diff --git a/test/baselines/minNodeVersion_20/package.json b/test/baselines/minNodeVersion_20/package.json index 5d7630888..10560d469 100644 --- a/test/baselines/minNodeVersion_20/package.json +++ b/test/baselines/minNodeVersion_20/package.json @@ -25,18 +25,18 @@ "@iobroker/adapter-core": "^3.0.4" }, "devDependencies": { - "@iobroker/adapter-dev": "^1.2.0", + "@iobroker/adapter-dev": "^1.3.0", "@iobroker/testing": "^4.1.0", "@tsconfig/node20": "^20.1.2", "@types/chai": "^4.3.11", "@types/chai-as-promised": "^7.1.8", "@types/mocha": "^10.0.6", - "@types/node": "^20.11.17", + "@types/node": "^20.11.19", "@types/proxyquire": "^1.3.31", "@types/sinon": "^17.0.3", "@types/sinon-chai": "^3.2.12", - "@typescript-eslint/eslint-plugin": "^6.21.0", - "@typescript-eslint/parser": "^6.21.0", + "@typescript-eslint/eslint-plugin": "^7.0.2", + "@typescript-eslint/parser": "^7.0.2", "chai-as-promised": "^7.1.1", "chai": "^4.4.1", "eslint": "^8.56.0", diff --git a/test/baselines/tabReact_adminHtml_JS/admin/src/tab-app.jsx b/test/baselines/tabReact_adminHtml_JS/admin/src/tab-app.jsx index 9e0ae262d..133803249 100644 --- a/test/baselines/tabReact_adminHtml_JS/admin/src/tab-app.jsx +++ b/test/baselines/tabReact_adminHtml_JS/admin/src/tab-app.jsx @@ -1,10 +1,10 @@ import React from "react"; -import { withStyles } from "@material-ui/core/styles"; +import { withStyles } from "@mui/styles"; -import GenericApp from "@iobroker/adapter-react/GenericApp"; +import GenericApp from "@iobroker/adapter-react-v5/GenericApp"; /** - * @type {(_theme: Theme) => import("@material-ui/styles").StyleRules} + * @type {(_theme: Theme) => import("@mui/styles/withStyles").StyleRules} */ const styles = (_theme) => ({ root: {}, diff --git a/test/baselines/tabReact_adminHtml_JS/admin/src/tab.jsx b/test/baselines/tabReact_adminHtml_JS/admin/src/tab.jsx index e70544ba0..74cb2d9bf 100644 --- a/test/baselines/tabReact_adminHtml_JS/admin/src/tab.jsx +++ b/test/baselines/tabReact_adminHtml_JS/admin/src/tab.jsx @@ -1,23 +1,25 @@ import React from "react"; import ReactDOM from "react-dom"; -import { MuiThemeProvider } from "@material-ui/core/styles"; -import theme from "@iobroker/adapter-react/Theme"; -import Utils from "@iobroker/adapter-react/Components/Utils"; +import { ThemeProvider, StyledEngineProvider } from "@mui/material/styles"; +import theme from "@iobroker/adapter-react-v5/Theme"; +import Utils from "@iobroker/adapter-react-v5/Components/Utils"; import TabApp from "./tab-app"; let themeName = Utils.getThemeName(); function build() { ReactDOM.render( - - { - themeName = _theme; - build(); - }} - /> - , + + + { + themeName = _theme; + build(); + }} + /> + + , document.getElementById("root"), ); } diff --git a/test/baselines/tabReact_adminReact_TS/admin/src/app.tsx b/test/baselines/tabReact_adminReact_TS/admin/src/app.tsx index b4f93806a..eaefc8a8f 100644 --- a/test/baselines/tabReact_adminReact_TS/admin/src/app.tsx +++ b/test/baselines/tabReact_adminReact_TS/admin/src/app.tsx @@ -1,10 +1,11 @@ import React from "react"; -import { Theme, withStyles } from "@material-ui/core/styles"; +import { withStyles } from "@mui/styles"; +import { Theme } from "@mui/material/styles"; -import GenericApp from "@iobroker/adapter-react/GenericApp"; +import GenericApp from "@iobroker/adapter-react-v5/GenericApp"; import Settings from "./components/settings"; -import { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react/types"; -import { StyleRules } from "@material-ui/core/styles"; +import { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react-v5/types"; +import { StyleRules } from "@mui/styles/withStyles"; const styles = (_theme: Theme): StyleRules => ({ root: {}, diff --git a/test/baselines/tabReact_adminReact_TS/admin/src/components/settings.tsx b/test/baselines/tabReact_adminReact_TS/admin/src/components/settings.tsx index a504b063a..d106da835 100644 --- a/test/baselines/tabReact_adminReact_TS/admin/src/components/settings.tsx +++ b/test/baselines/tabReact_adminReact_TS/admin/src/components/settings.tsx @@ -1,15 +1,15 @@ import React from "react"; -import { withStyles } from "@material-ui/core/styles"; -import { CreateCSSProperties } from "@material-ui/core/styles/withStyles"; -import TextField from "@material-ui/core/TextField"; -import Input from "@material-ui/core/Input"; -import FormHelperText from "@material-ui/core/FormHelperText"; -import FormControl from "@material-ui/core/FormControl"; -import Select from "@material-ui/core/Select"; -import MenuItem from "@material-ui/core/MenuItem"; -import FormControlLabel from "@material-ui/core/FormControlLabel"; -import Checkbox from "@material-ui/core/Checkbox"; -import I18n from "@iobroker/adapter-react/i18n"; +import { withStyles } from "@mui/styles"; +import { CreateCSSProperties } from "@mui/styles/withStyles"; +import TextField from "@mui/material/TextField"; +import Input from "@mui/material/Input"; +import FormHelperText from "@mui/material/FormHelperText"; +import FormControl from "@mui/material/FormControl"; +import Select from "@mui/material/Select"; +import MenuItem from "@mui/material/MenuItem"; +import FormControlLabel from "@mui/material/FormControlLabel"; +import Checkbox from "@mui/material/Checkbox"; +import I18n from "@iobroker/adapter-react-v5/i18n"; const styles = (): Record => ({ input: { @@ -71,6 +71,7 @@ class Settings extends React.Component { type={type || "text"} onChange={(e) => this.props.onChange(attr, e.target.value)} margin="normal" + variant="standard" /> ); } @@ -88,11 +89,13 @@ class Settings extends React.Component { paddingTop: 5, ...style }} + variant="standard" > } + variant="standard" > {options.map((item) => ( diff --git a/test/baselines/tabReact_adminReact_TS/admin/src/i18n/i18n.d.ts b/test/baselines/tabReact_adminReact_TS/admin/src/i18n/i18n.d.ts index f4a769e59..0a5a99945 100644 --- a/test/baselines/tabReact_adminReact_TS/admin/src/i18n/i18n.d.ts +++ b/test/baselines/tabReact_adminReact_TS/admin/src/i18n/i18n.d.ts @@ -1,6 +1,6 @@ /* * This file loads the translations keys from `i18n/en.json` file and overrides - * the declarations for the translate function `I18n.t` available in "@iobroker/adapter-react/i18n". + * the declarations for the translate function `I18n.t` available in "@iobroker/adapter-react-v5/i18n". * Using these definitions it is ensured that all used translations in the React * context are defined at least in the english translations file. * This will add no overhead in the generated code since it just reexports the @@ -16,7 +16,7 @@ */ declare type AdminWord = keyof typeof import("./en.json"); -declare module "@iobroker/adapter-react/i18n" { +declare module "@iobroker/adapter-react-v5/i18n" { /** * Translate the given string to the selected language. * @param word The (key) word to look up the string. Has to be defined at least in `i18n/en.json`. diff --git a/test/baselines/tabReact_adminReact_TS/admin/src/index.tsx b/test/baselines/tabReact_adminReact_TS/admin/src/index.tsx index e114005c8..3b18c29c5 100644 --- a/test/baselines/tabReact_adminReact_TS/admin/src/index.tsx +++ b/test/baselines/tabReact_adminReact_TS/admin/src/index.tsx @@ -1,23 +1,25 @@ import React from "react"; import ReactDOM from "react-dom"; -import { MuiThemeProvider } from "@material-ui/core/styles"; -import theme from "@iobroker/adapter-react/Theme"; -import Utils from "@iobroker/adapter-react/Components/Utils"; +import { ThemeProvider, StyledEngineProvider } from "@mui/material/styles"; +import theme from "@iobroker/adapter-react-v5/Theme"; +import Utils from "@iobroker/adapter-react-v5/Components/Utils"; import App from "./app"; let themeName = Utils.getThemeName(); -function build(): void { +function build(this: any): void { ReactDOM.render( - - { - themeName = _theme; - build(); - }} - /> - , + + + { + themeName = _theme; + build(); + }} + /> + + , document.getElementById("root"), ); } diff --git a/test/baselines/tabReact_adminReact_TS/admin/src/tab-app.tsx b/test/baselines/tabReact_adminReact_TS/admin/src/tab-app.tsx index c84a968cb..8f488ead8 100644 --- a/test/baselines/tabReact_adminReact_TS/admin/src/tab-app.tsx +++ b/test/baselines/tabReact_adminReact_TS/admin/src/tab-app.tsx @@ -1,9 +1,10 @@ import React from "react"; -import { Theme, withStyles } from "@material-ui/core/styles"; +import { withStyles } from "@mui/styles"; +import { Theme } from "@mui/material/styles"; -import GenericApp from "@iobroker/adapter-react/GenericApp"; -import { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react/types"; -import { StyleRules } from "@material-ui/core/styles"; +import GenericApp from "@iobroker/adapter-react-v5/GenericApp"; +import { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react-v5/types"; +import { StyleRules } from "@mui/styles/withStyles"; const styles = (_theme: Theme): StyleRules => ({ root: {}, diff --git a/test/baselines/tabReact_adminReact_TS/admin/src/tab.tsx b/test/baselines/tabReact_adminReact_TS/admin/src/tab.tsx index a10100bcd..d42316c36 100644 --- a/test/baselines/tabReact_adminReact_TS/admin/src/tab.tsx +++ b/test/baselines/tabReact_adminReact_TS/admin/src/tab.tsx @@ -1,23 +1,25 @@ import React from "react"; import ReactDOM from "react-dom"; -import { MuiThemeProvider } from "@material-ui/core/styles"; -import theme from "@iobroker/adapter-react/Theme"; -import Utils from "@iobroker/adapter-react/Components/Utils"; +import { ThemeProvider, StyledEngineProvider } from "@mui/material/styles"; +import theme from "@iobroker/adapter-react-v5/Theme"; +import Utils from "@iobroker/adapter-react-v5/Components/Utils"; import TabApp from "./tab-app"; let themeName = Utils.getThemeName(); function build(): void { ReactDOM.render( - - { - themeName = _theme; - build(); - }} - /> - , + + + { + themeName = _theme; + build(); + }} + /> + + , document.getElementById("root"), ); } diff --git a/test/baselines/vis_Widget/.create-adapter.json b/test/baselines/vis_Widget/.create-adapter.json index 07e0fa5e7..36ea08ef1 100644 --- a/test/baselines/vis_Widget/.create-adapter.json +++ b/test/baselines/vis_Widget/.create-adapter.json @@ -18,5 +18,5 @@ "gitCommit": "no", "defaultBranch": "main", "license": "MIT License", - "creatorVersion": "2.6.1" + "creatorVersion": "2.6.2" } \ No newline at end of file diff --git a/test/baselines/vis_Widget/package.json b/test/baselines/vis_Widget/package.json index cdaaa23ca..7d67ccc64 100644 --- a/test/baselines/vis_Widget/package.json +++ b/test/baselines/vis_Widget/package.json @@ -23,7 +23,7 @@ }, "dependencies": {}, "devDependencies": { - "@iobroker/adapter-dev": "^1.2.0", + "@iobroker/adapter-dev": "^1.3.0", "@iobroker/testing": "^4.1.0" }, "main": "widgets/test-widget.html",