diff --git a/CHANGELOG.md b/CHANGELOG.md index a4697aef..d0ee8022 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Changelog All notable changes to this project will be documented in this file. +## [Unreleased] + +- Update to @alethio/cms@1.0.0-beta.7, which adds support for dependencies between plugin data adapters +- Update all plugins with support for new CMS version + ## [1.0.0-beta.6] - 2019-09-09 - Fix APP_BASE_URL slash (/) escaping diff --git a/Dockerfile b/Dockerfile index 84fe51a7..02e6d33e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,17 +5,17 @@ WORKDIR /build COPY package.json package-lock.json ./ RUN npm install -RUN npm i -g @alethio/cms-plugin-tool@^1.0.0-beta.4 +RUN npm i -g @alethio/cms-plugin-tool@^1.0.0-beta.5 COPY . . RUN npm run build --verbose RUN acp install \ - @alethio/explorer-plugin-eth-common@2.3.0 \ - @alethio/explorer-plugin-eth-lite@2.1.0 \ - @alethio/explorer-plugin-eth-ibft2@1.0.1 \ - @alethio/explorer-plugin-3box@1.0.1 + @alethio/explorer-plugin-eth-common@2.4.0 \ + @alethio/explorer-plugin-eth-lite@2.2.0 \ + @alethio/explorer-plugin-eth-ibft2@1.1.0 \ + @alethio/explorer-plugin-3box@1.1.0 FROM nginx:stable-alpine diff --git a/config.default.json b/config.default.json index 0b282a97..398d327f 100644 --- a/config.default.json +++ b/config.default.json @@ -6,13 +6,13 @@ "pluginsUrl": "plugins", "plugins": { - "plugin://aleth.io/eth-common?v=2.3.0": { + "plugin://aleth.io/eth-common?v=2.4.0": { }, - "plugin://aleth.io/3box?v=1.0.1": { + "plugin://aleth.io/3box?v=1.1.0": { "ipfsUrlMask": "https://ipfs.infura.io/ipfs/%s" }, - "plugin://aleth.io/eth-lite?v=2.1.0": { + "plugin://aleth.io/eth-lite?v=2.2.0": { "nodeUrl": "https://mainnet.infura.io/" } }, diff --git a/config.ibft2.json b/config.ibft2.json index 0301ec6b..93b94068 100644 --- a/config.ibft2.json +++ b/config.ibft2.json @@ -6,16 +6,16 @@ "pluginsUrl": "plugins", "plugins": { - "plugin://aleth.io/eth-common?v=2.3.0": { + "plugin://aleth.io/eth-common?v=2.4.0": { }, - "plugin://aleth.io/3box?v=1.0.1": { + "plugin://aleth.io/3box?v=1.1.0": { "ipfsUrlMask": "https://ipfs.infura.io/ipfs/%s" }, - "plugin://aleth.io/eth-lite?v=2.1.0": { + "plugin://aleth.io/eth-lite?v=2.2.0": { "nodeUrl": "https://mainnet.infura.io/" }, - "plugin://aleth.io/eth-ibft2?v=1.0.1": { + "plugin://aleth.io/eth-ibft2?v=1.1.0": { } }, diff --git a/package-lock.json b/package-lock.json index dedf8774..953ce726 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,20 +1,29 @@ { "name": "ethereum-lite-explorer", - "version": "1.0.0-beta.5", + "version": "1.0.0-beta.6", "lockfileVersion": 1, "requires": true, "dependencies": { "@alethio/cms": { - "version": "1.0.0-beta.6", - "resolved": "https://registry.npmjs.org/@alethio/cms/-/cms-1.0.0-beta.6.tgz", - "integrity": "sha512-O1cOUvRkKtdDHIrbbhQbOAJp2YfUzg5UijNg/9ryAYpMZYX1K5GcaubsTHbIm0K6JZ1dcHuzxSXdYOQc3Bmwog==", + "version": "1.0.0-beta.7", + "resolved": "https://registry.npmjs.org/@alethio/cms/-/cms-1.0.0-beta.7.tgz", + "integrity": "sha512-OHlLMqZrN3MagKET7951VoAhNTHKKt/UIeeRiLMz0/PkYaR0kcyJOjBiuu/4a9zYtcuqC3No9fIORhebdTRAHg==", "requires": { "@alethio/ui": "^1.0.0-beta.11", "@puzzl/browser": "^1.0.0-beta.1", "@puzzl/core": "^1.0.0-beta.1", "react-router-dom": "^4.2.2", "react-router-hash-link": "^1.2.1", + "semver": "^6.3.0", + "task-graph-runner": "^1.0.2", "uuid": "^3.3.2" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" + } } }, "@alethio/explorer-ui": { @@ -853,6 +862,15 @@ "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", "dev": true }, + "array-includes": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz", + "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=", + "requires": { + "define-properties": "^1.1.2", + "es-abstract": "^1.7.0" + } + }, "array-union": { "version": "1.0.2", "resolved": "http://registry.npm.taobao.org/array-union/download/array-union-1.0.2.tgz", @@ -2084,7 +2102,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz", "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", - "dev": true, "requires": { "foreach": "^2.0.5", "object-keys": "^1.0.8" @@ -2375,7 +2392,6 @@ "version": "1.11.0", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.11.0.tgz", "integrity": "sha512-ZnQrE/lXTTQ39ulXZ+J1DTFazV9qBy61x2bY071B+qGco8Z8q1QddsLdt/EF8Ai9hcWH72dWS0kFqXLxOxqslA==", - "dev": true, "requires": { "es-to-primitive": "^1.1.1", "function-bind": "^1.1.1", @@ -2388,7 +2404,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz", "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=", - "dev": true, "requires": { "is-callable": "^1.1.1", "is-date-object": "^1.0.1", @@ -2899,8 +2914,7 @@ "foreach": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", - "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=", - "dev": true + "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=" }, "forever-agent": { "version": "0.6.1", @@ -3541,8 +3555,7 @@ "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "get-caller-file": { "version": "1.0.3", @@ -3833,7 +3846,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz", "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=", - "dev": true, "requires": { "function-bind": "^1.0.2" } @@ -4387,8 +4399,7 @@ "is-callable": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz", - "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=", - "dev": true + "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=" }, "is-ci": { "version": "2.0.0", @@ -4422,8 +4433,7 @@ "is-date-object": { "version": "1.0.1", "resolved": "http://registry.npm.taobao.org/is-date-object/download/is-date-object-1.0.1.tgz", - "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=", - "dev": true + "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=" }, "is-descriptor": { "version": "0.1.6", @@ -4521,7 +4531,6 @@ "version": "1.0.4", "resolved": "http://registry.npm.taobao.org/is-regex/download/is-regex-1.0.4.tgz", "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", - "dev": true, "requires": { "has": "^1.0.1" } @@ -4534,8 +4543,7 @@ "is-symbol": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz", - "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=", - "dev": true + "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=" }, "is-typedarray": { "version": "1.0.0", @@ -5337,8 +5345,7 @@ "object-keys": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz", - "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=", - "dev": true + "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=" }, "object-visit": { "version": "1.0.1", @@ -5760,9 +5767,9 @@ } }, "plugin-api": { - "version": "npm:@alethio/cms-plugin-api@1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/@alethio/cms-plugin-api/-/cms-plugin-api-1.0.0-beta.2.tgz", - "integrity": "sha512-VotLN8RKlvxRqSBvtdLVDy9w/iyfELrRNsI7/ewDSCX9f7/EzADRFVC7ni4caKoU9qjPW60V059X9Yf3alNDcw==", + "version": "npm:@alethio/cms-plugin-api@1.0.0-beta.6", + "resolved": "https://registry.npmjs.org/@alethio/cms-plugin-api/-/cms-plugin-api-1.0.0-beta.6.tgz", + "integrity": "sha512-KKSef+uCkLnOIQZ7wzs99/zuDs9wTCv2/i9VK4meYyQSjIsw09Lnjp3QZDBvMs50Sl/b3hnZfhKP++l9ehdqtQ==", "dev": true, "requires": { "@alethio/ui": "^1.0.0-beta.11", @@ -5776,9 +5783,9 @@ }, "dependencies": { "@types/react": { - "version": "16.8.23", - "resolved": "https://registry.npmjs.org/@types/react/-/react-16.8.23.tgz", - "integrity": "sha512-abkEOIeljniUN9qB5onp++g0EY38h7atnDHxwKUFz1r3VH1+yG1OKi2sNPTyObL40goBmfKFpdii2lEzwLX1cA==", + "version": "16.9.2", + "resolved": "https://registry.npmjs.org/@types/react/-/react-16.9.2.tgz", + "integrity": "sha512-jYP2LWwlh+FTqGd9v7ynUKZzjj98T8x7Yclz479QdRhHfuW9yQ+0jjnD31eXSXutmBpppj5PYNLYLRfnZJvcfg==", "dev": true, "requires": { "@types/prop-types": "*", @@ -7470,6 +7477,14 @@ "integrity": "sha512-dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg==", "dev": true }, + "task-graph-runner": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/task-graph-runner/-/task-graph-runner-1.0.2.tgz", + "integrity": "sha512-ua9VE+cJ4LVT1TcSl31vFi50NaPFFyAUdjsqpXuooe8AZm1nBP443swgNRjA3CxatSZKtP6vacErIbClMSCmTA==", + "requires": { + "array-includes": "^3.0.3" + } + }, "terser": { "version": "3.17.0", "resolved": "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz", diff --git a/package.json b/package.json index 10b7c14d..09a91040 100644 --- a/package.json +++ b/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.1", + "plugin-api": "npm:@alethio/cms-plugin-api@^1.0.0-beta.6", "rimraf": "^2.6.3", "source-map-loader": "^0.2.4", "source-map-support": "^0.5.11", @@ -63,7 +63,7 @@ "webpack-runner": "^3.1.0" }, "dependencies": { - "@alethio/cms": "^1.0.0-beta.6", + "@alethio/cms": "^1.0.0-beta.7", "@alethio/explorer-ui": "^1.0.0-beta.0", "@alethio/ui": "^1.0.0-beta.18", "@puzzl/browser": "^1.0.0-beta.2",