diff options
| author |   Dan Timoney <dtimoney@att.com> | 2022-02-03 16:41:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2022-02-03 16:41:14 +0000 |
| commit | 652d7ca972652ef437769cc2e88afddbb7f06ca2 (patch) | |
| tree | 08da4fc171617be44aa95cf7d80a5cec1468de8d /sdnr/wt/odlux/apps/apiDemo | |
| parent | f23a3d5d957c4c510a7436c0acba57d95e4a13ce (diff) | |
| parent | 1a868116614dd9996c78e69941b537e9da19460b (diff) | |
Merge "Update ODLUX"
Diffstat (limited to 'sdnr/wt/odlux/apps/apiDemo')
| -rw-r--r-- | sdnr/wt/odlux/apps/apiDemo/package.json | 19 | ||||
| -rw-r--r-- | sdnr/wt/odlux/apps/apiDemo/pom.xml | 3 | ||||
| -rw-r--r-- | sdnr/wt/odlux/apps/apiDemo/src/plugin.tsx | 2 | ||||
| -rw-r--r-- | sdnr/wt/odlux/apps/apiDemo/webpack.config.js | 4 |
4 files changed, 16 insertions, 12 deletions
diff --git a/sdnr/wt/odlux/apps/apiDemo/package.json b/sdnr/wt/odlux/apps/apiDemo/package.json index af47a025e..f01a396e8 100644 --- a/sdnr/wt/odlux/apps/apiDemo/package.json +++ b/sdnr/wt/odlux/apps/apiDemo/package.json @@ -21,20 +21,23 @@ "author": "Matthias Fischer", "license": "Apache-2.0", "dependencies": { + "@emotion/react": "^11.7.0", + "@emotion/styled": "^11.6.0", + "@mui/icons-material": "^5.2.0", + "@mui/material": "^5.2.2", + "@mui/styles": "^5.2.2", "@odlux/framework": "*" }, "peerDependencies": { - "@types/react": "17.0.3", - "@types/react-dom": "17.0.2", - "@types/react-router-dom": "5.1.7", - "@material-ui/core": "4.11.4", - "@material-ui/icons": "4.11.2", "@types/classnames": "2.2.6", "@types/flux": "3.1.8", "@types/jquery": "3.3.10", + "@types/react": "17.0.37", + "@types/react-dom": "17.0.11", + "@types/react-router-dom": "5.1.7", "jquery": "3.3.1", - "react": "17.0.1", - "react-dom": "17.0.1", + "react": "17.0.2", + "react-dom": "17.0.2", "react-router-dom": "5.2.0" } -}
\ No newline at end of file +} diff --git a/sdnr/wt/odlux/apps/apiDemo/pom.xml b/sdnr/wt/odlux/apps/apiDemo/pom.xml index 77917570a..f7ed19b3f 100644 --- a/sdnr/wt/odlux/apps/apiDemo/pom.xml +++ b/sdnr/wt/odlux/apps/apiDemo/pom.xml @@ -19,13 +19,14 @@ ~ ============LICENSE_END======================================================= ~ --> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.2.4</version> <relativePath/> </parent> diff --git a/sdnr/wt/odlux/apps/apiDemo/src/plugin.tsx b/sdnr/wt/odlux/apps/apiDemo/src/plugin.tsx index 6790ee929..076eb5c70 100644 --- a/sdnr/wt/odlux/apps/apiDemo/src/plugin.tsx +++ b/sdnr/wt/odlux/apps/apiDemo/src/plugin.tsx @@ -32,7 +32,7 @@ type AppProps = RouteComponentProps & Connect & { modules: Module[], requestModu const App = (props: AppProps ) => ( <> - <button onClick={ props.requestModules }>Load Modules</button> + <button color="inherit" onClick={ props.requestModules }>Load Modules</button> <ul>{ props.modules.map((mod, ind) => (<li key={ ind }>{ mod.name }</li>)) }</ul> </> ); diff --git a/sdnr/wt/odlux/apps/apiDemo/webpack.config.js b/sdnr/wt/odlux/apps/apiDemo/webpack.config.js index 1c699e15b..6564bef26 100644 --- a/sdnr/wt/odlux/apps/apiDemo/webpack.config.js +++ b/sdnr/wt/odlux/apps/apiDemo/webpack.config.js @@ -88,7 +88,7 @@ module.exports = (env) => { manifest: require(path.resolve(frameworkPath, "app-manifest.json")), sourceType: "umd2" }), - ...(env === "release") ? [ + ...(env === "release" ? [ new webpack.DefinePlugin({ "process.env": { NODE_ENV: "'production'", @@ -106,7 +106,7 @@ module.exports = (env) => { from: 'index.html', to: distPath }]), - ] + ]) ], devServer: { |