Merge pull request Alethio#67 from Alethio/update-cms

Update cms version

Dockerfile

@@ -12,11 +12,11 @@ COPY . .
 RUN npm run build --verbose
 
 RUN acp install \
-    @alethio/explorer-plugin-eth-common@3.0.0 \
+    @alethio/explorer-plugin-eth-common@4.0.0 \
     @alethio/explorer-plugin-eth-lite@4.1.0 \
-    @alethio/explorer-plugin-eth-memento@2.0.0 \
+    @alethio/explorer-plugin-eth-memento@2.0.2 \
     @alethio/explorer-plugin-eth-ibft2@2.0.0 \
-    @alethio/explorer-plugin-3box@1.1.0
+    @alethio/explorer-plugin-3box@1.1.1
 
 FROM nginx:stable-alpine
 

config.default.json

@@ -6,9 +6,9 @@
     "pluginsUrl": "plugins",
 
     "plugins": [{
-        "uri": "plugin://aleth.io/eth-common?v=3.0.0"
+        "uri": "plugin://aleth.io/eth-common?v=4.0.0"
     }, {
-        "uri": "plugin://aleth.io/3box?v=1.1.0",
+        "uri": "plugin://aleth.io/3box?v=1.1.1",
         "config": {
             "ipfsUrlMask": "https://ipfs.infura.io/ipfs/%s"
         }

config.ibft2.json

@@ -6,9 +6,9 @@
     "pluginsUrl": "plugins",
 
     "plugins": [{
-        "uri": "plugin://aleth.io/eth-common?v=3.0.0"
+        "uri": "plugin://aleth.io/eth-common?v=4.0.0"
     }, {
-        "uri": "plugin://aleth.io/3box?v=1.1.0",
+        "uri": "plugin://aleth.io/3box?v=1.1.1",
         "config": {
             "ipfsUrlMask": "https://ipfs.infura.io/ipfs/%s"
         }

config.memento.json

@@ -6,14 +6,14 @@
     "pluginsUrl": "plugins",
 
     "plugins": [{
-        "uri": "plugin://aleth.io/eth-common?v=3.0.0"
+        "uri": "plugin://aleth.io/eth-common?v=4.0.0"
     }, {
-        "uri": "plugin://aleth.io/3box?v=1.1.0",
+        "uri": "plugin://aleth.io/3box?v=1.1.1",
         "config": {
             "ipfsUrlMask": "https://ipfs.infura.io/ipfs/%s"
         }
     }, {
-        "uri": "plugin://aleth.io/eth-memento?v=2.0.0",
+        "uri": "plugin://aleth.io/eth-memento?v=2.0.2",
         "config": {
             "apiBasePath": "http://localhost:3001/api/explorer"
         }

package.json

@@ -42,7 +42,7 @@
     "html-webpack-plugin": "^3.2.0",
     "husky": "^1.3.1",
     "interpolate-html-plugin": "^3.0.0",
-    "plugin-api": "npm:@alethio/cms-plugin-api@^1.0.0-beta.6",
+    "plugin-api": "npm:@alethio/cms-plugin-api@^1.0.0-beta.7",
     "rimraf": "^2.6.3",
     "source-map-loader": "^0.2.4",
     "source-map-support": "^0.5.11",
@@ -51,7 +51,7 @@
     "ts-node": "^8.0.3",
     "tslib": "^1.9.3",
     "tslint": "^5.14.0",
-    "typescript": "^3.4.1",
+    "typescript": "^3.7.5",
     "typescript-plugin-styled-components": "^1.4.2",
     "typescript-styled-plugin": "^0.14.0",
     "typescript-tslint-plugin": "^0.3.1",
@@ -63,9 +63,9 @@
     "webpack-runner": "^3.1.0"
   },
   "dependencies": {
-    "@alethio/cms": "^1.0.0-beta.9",
+    "@alethio/cms": "^1.0.0-beta.11",
     "@alethio/explorer-ui": "^1.0.0-beta.2",
-    "@alethio/ui": "^1.0.1",
+    "@alethio/ui": "^1.1.0",
     "@puzzl/browser": "^1.0.0-beta.2",
     "@puzzl/core": "^1.0.0-beta.1",
     "@sentry/browser": "^4.4.0",

src/app/components/App.tsx

@@ -3,7 +3,8 @@ import styled from "@alethio/explorer-ui/lib/styled-components";
 import { ITheme } from "@alethio/explorer-ui/lib/ITheme";
 import { createPalette } from "@alethio/explorer-ui/lib/theme/createPalette";
 import { createTheme } from "@alethio/explorer-ui/lib/theme/createTheme";
-import { Link, Cms, Translation, ExternalLink } from "@alethio/cms";
+import { Link, Cms, Translation } from "@alethio/cms";
+import { ExternalLink } from "@alethio/ui/lib/control/ExternalLink";
 import { AppConfig } from "app/AppConfig";
 import { observer } from "mobx-react";
 import { Toolbar } from "@alethio/ui/lib/layout/toolbar/Toolbar";

src/app/components/topbar/TopMenuLayer.tsx

@@ -4,7 +4,10 @@ import { observable } from "mobx";
 import { LanguageSwitcher } from "app/components/toolbar/LanguageSwitcher";
 import { AppConfig } from "app/AppConfig";
 import { UserPreferences } from "app/UserPreferences";
-import { MenuItem, MenuLayer, Translation, ExternalLink } from "@alethio/cms";
+import { Translation } from "@alethio/cms";
+import { MobileMenuItem } from "@alethio/ui/lib/layout/topbar/MobileMenuItem";
+import { MobileMenuLayer } from "@alethio/ui/lib/layout/topbar/MobileMenuLayer";
+import { ExternalLink } from "@alethio/ui/lib/control/ExternalLink";
 import { ToolbarIconButton } from "@alethio/ui/lib/layout/toolbar/ToolbarIconButton";
 import { BriefcaseIcon } from "@alethio/ui/lib/icon/BriefcaseIcon";
 
@@ -25,22 +28,22 @@ export class TopMenuLayer extends React.Component<ITomMenuLayerProps> {
     render() {
         let { open, translation: tr } = this.props;
 
-        return <MenuLayer open={open} onRequestClose={this.props.onRequestClose}>
+        return <MobileMenuLayer open={open} onRequestClose={this.props.onRequestClose}>
             { this.props.slots }
-            <MenuItem title={tr.get("toolbar.localization.label")} sticky>
+            <MobileMenuItem title={tr.get("toolbar.localization.label")} sticky>
                 <LanguageSwitcher
                     appConfig={this.props.appConfig}
                     translation={tr}
                     userPreferences={this.props.userPreferences}
                     onLocaleChange={this.onClose}
                 />
-            </MenuItem>
-            <MenuItem title={tr.get("toolbar.alethio.label")}>
+            </MobileMenuItem>
+            <MobileMenuItem title={tr.get("toolbar.alethio.label")}>
                 <ExternalLink href="https://company.aleth.io" rel="noopener noreferrer">
                     <ToolbarIconButton Icon={BriefcaseIcon} />
                 </ExternalLink>
-            </MenuItem>
-        </MenuLayer>;
+            </MobileMenuItem>
+        </MobileMenuLayer>;
     }
 
     private onClose = () => {