From dde1d897e4622ac0376a3156d86350f8c3c030c3 Mon Sep 17 00:00:00 2001 From: Anthony Law Date: Fri, 29 Oct 2021 16:10:06 +0800 Subject: [PATCH 1/2] feat: update latest SDK (#953) * feat: update latest SDK * fix: package dependecy issue * fix: use npm v7 * fix: specify engines version --- .travis.yml | 2 ++ package-lock.json | 76 +++++++++++++++-------------------------------- package.json | 12 +++++--- 3 files changed, 34 insertions(+), 56 deletions(-) diff --git a/.travis.yml b/.travis.yml index 72ed3872d..8f5deee13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,8 @@ cache: - "node_modules" override: - npx cypress verify +before_install: + - npm i -g npm@7 before_script: - . ./travis/node-functions.sh - VERSION="$(node_load_version)" diff --git a/package-lock.json b/package-lock.json index 5ac4162ea..78cad3c30 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,7 +23,7 @@ "merkletreejs": "^0.2.9", "moment-timezone": "^0.5.28", "nem-sdk": "^1.6.8", - "symbol-sdk": "^1.0.2-alpha-202110111207", + "symbol-sdk": "^1.0.2", "url-parse": "^1.5.2", "utf8": "^3.0.0", "vue": "^2.6.11", @@ -8140,9 +8140,9 @@ "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, "node_modules/catbuffer-typescript": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/catbuffer-typescript/-/catbuffer-typescript-0.1.1.tgz", - "integrity": "sha512-r/z3UKG3YCCdsTEHRXGe3IQxA8OaBRBE31e9du2LOaLStGxYCmxUjfRtJ/DyKfgpS55fJPl3w/VFMnsfwIHmkA==" + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/catbuffer-typescript/-/catbuffer-typescript-1.0.0.tgz", + "integrity": "sha512-pVpsk0AGcPjaQQVax2rz4EbIQ3/9LvNOYuY2b3KKYlp9Smd6Aohx6gPhZV//D7IYWsFcqntyVbf8/Z4xc5PT+w==" }, "node_modules/ccount": { "version": "1.0.4", @@ -10202,14 +10202,6 @@ "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==", "dev": true }, - "node_modules/diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "engines": { - "node": ">=0.3.1" - } - }, "node_modules/diff-sequences": { "version": "24.9.0", "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz", @@ -20159,6 +20151,7 @@ "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz", "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==", "dev": true, + "hasInstallScript": true, "dependencies": { "async-foreach": "^0.1.3", "chalk": "^1.1.1", @@ -25699,42 +25692,34 @@ } }, "node_modules/symbol-openapi-typescript-fetch-client": { - "version": "1.0.1-SNAPSHOT.202106160954", - "resolved": "https://registry.npmjs.org/symbol-openapi-typescript-fetch-client/-/symbol-openapi-typescript-fetch-client-1.0.1-SNAPSHOT.202106160954.tgz", - "integrity": "sha512-Aj/lGcQOpBdGSYt5z+0H3o5E75w6llOi+RGS+CRQXF8FqPOIdTuf6KqAoKxCWctGFct3Fii1dDbJPsQrhMFDJg==" + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/symbol-openapi-typescript-fetch-client/-/symbol-openapi-typescript-fetch-client-1.0.2.tgz", + "integrity": "sha512-eFfDSr8RHqYaVYdviX30gsfd1VUP3VQV5DLB9kc3yPoFLCOHNO+4rtwItS9rF9xGmICBMB9iR8GDCa6YCTU+WA==" }, "node_modules/symbol-sdk": { - "version": "1.0.2-alpha-202110111207", - "resolved": "https://registry.npmjs.org/symbol-sdk/-/symbol-sdk-1.0.2-alpha-202110111207.tgz", - "integrity": "sha512-ty7dg8S/OQi93DxH3IBp2pzWX06g4a9RXnXQ7kR61uDS5f/Mzo9Lbdk/tifB8dEFaROKfN3oKlG6uIea4npQ/w==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/symbol-sdk/-/symbol-sdk-1.0.2.tgz", + "integrity": "sha512-AkiMBhCg5UwfkjVUaNnIcnLaaqVOPclsMbALeylzLPDHK39I0YSVKMuXKeEWBG/6rramZ7ffTS7+Oug3xiqUQA==", "dependencies": { "@js-joda/core": "^3.2.0", - "bluebird": "^3.7.2", - "catbuffer-typescript": "0.1.1", + "catbuffer-typescript": "1.0.0", "crypto-js": "^4.0.0", - "diff": "^4.0.2", "futoin-hkdf": "^1.3.2", "js-sha256": "^0.9.0", "js-sha3": "^0.8.0", "js-sha512": "^0.8.0", "long": "^4.0.0", "merkletreejs": "^0.2.9", - "minimist": "^1.2.5", "node-fetch": "^2.6.0", "ripemd160": "^2.0.2", "rxjs": "^6.6.7", "rxjs-compat": "^6.6.3", - "symbol-openapi-typescript-fetch-client": "1.0.1-SNAPSHOT.202106160954", + "symbol-openapi-typescript-fetch-client": "^1.0.2", "tweetnacl": "^1.0.3", "utf8": "^2.1.2", "ws": "^7.3.1" } }, - "node_modules/symbol-sdk/node_modules/bluebird": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", - "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" - }, "node_modules/symbol-sdk/node_modules/rxjs": { "version": "6.6.7", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", @@ -35896,9 +35881,9 @@ "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, "catbuffer-typescript": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/catbuffer-typescript/-/catbuffer-typescript-0.1.1.tgz", - "integrity": "sha512-r/z3UKG3YCCdsTEHRXGe3IQxA8OaBRBE31e9du2LOaLStGxYCmxUjfRtJ/DyKfgpS55fJPl3w/VFMnsfwIHmkA==" + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/catbuffer-typescript/-/catbuffer-typescript-1.0.0.tgz", + "integrity": "sha512-pVpsk0AGcPjaQQVax2rz4EbIQ3/9LvNOYuY2b3KKYlp9Smd6Aohx6gPhZV//D7IYWsFcqntyVbf8/Z4xc5PT+w==" }, "ccount": { "version": "1.0.4", @@ -37640,11 +37625,6 @@ "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==", "dev": true }, - "diff": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", - "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==" - }, "diff-sequences": { "version": "24.9.0", "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-24.9.0.tgz", @@ -50538,42 +50518,34 @@ "dev": true }, "symbol-openapi-typescript-fetch-client": { - "version": "1.0.1-SNAPSHOT.202106160954", - "resolved": "https://registry.npmjs.org/symbol-openapi-typescript-fetch-client/-/symbol-openapi-typescript-fetch-client-1.0.1-SNAPSHOT.202106160954.tgz", - "integrity": "sha512-Aj/lGcQOpBdGSYt5z+0H3o5E75w6llOi+RGS+CRQXF8FqPOIdTuf6KqAoKxCWctGFct3Fii1dDbJPsQrhMFDJg==" + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/symbol-openapi-typescript-fetch-client/-/symbol-openapi-typescript-fetch-client-1.0.2.tgz", + "integrity": "sha512-eFfDSr8RHqYaVYdviX30gsfd1VUP3VQV5DLB9kc3yPoFLCOHNO+4rtwItS9rF9xGmICBMB9iR8GDCa6YCTU+WA==" }, "symbol-sdk": { - "version": "1.0.2-alpha-202110111207", - "resolved": "https://registry.npmjs.org/symbol-sdk/-/symbol-sdk-1.0.2-alpha-202110111207.tgz", - "integrity": "sha512-ty7dg8S/OQi93DxH3IBp2pzWX06g4a9RXnXQ7kR61uDS5f/Mzo9Lbdk/tifB8dEFaROKfN3oKlG6uIea4npQ/w==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/symbol-sdk/-/symbol-sdk-1.0.2.tgz", + "integrity": "sha512-AkiMBhCg5UwfkjVUaNnIcnLaaqVOPclsMbALeylzLPDHK39I0YSVKMuXKeEWBG/6rramZ7ffTS7+Oug3xiqUQA==", "requires": { "@js-joda/core": "^3.2.0", - "bluebird": "^3.7.2", - "catbuffer-typescript": "0.1.1", + "catbuffer-typescript": "1.0.0", "crypto-js": "^4.0.0", - "diff": "^4.0.2", "futoin-hkdf": "^1.3.2", "js-sha256": "^0.9.0", "js-sha3": "^0.8.0", "js-sha512": "^0.8.0", "long": "^4.0.0", "merkletreejs": "^0.2.9", - "minimist": "^1.2.5", "node-fetch": "^2.6.0", "ripemd160": "^2.0.2", "rxjs": "^6.6.7", "rxjs-compat": "^6.6.3", - "symbol-openapi-typescript-fetch-client": "1.0.1-SNAPSHOT.202106160954", + "symbol-openapi-typescript-fetch-client": "^1.0.2", "tweetnacl": "^1.0.3", "utf8": "^2.1.2", "ws": "^7.3.1" }, "dependencies": { - "bluebird": { - "version": "3.7.2", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", - "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" - }, "rxjs": { "version": "6.6.7", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", diff --git a/package.json b/package.json index bfbee823b..e4ad1cda7 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,10 @@ "description": "Symbol Block and Network Explorer", "homepage": "https://github.com/nemgrouplimited/symbol-explorer", "version": "1.1.1", + "engines": { + "node": ">=12.0", + "npm": ">=7" + }, "scripts": { "dev": "vue-cli-service serve", "build": "vue-cli-service build", @@ -20,8 +24,8 @@ "apexcharts": "^3.24.0", "await-lock": "^2.0.1", "axios": "^0.21.1", - "bootstrap": "^4.4.1", - "bootstrap-vue": "^2.7.0", + "bootstrap": "^4.5.3", + "bootstrap-vue": "^2.21.2", "chart.js": "^2.9.4", "core-js": "^2.6.11", "js-sha3": "^0.8.0", @@ -30,7 +34,7 @@ "merkletreejs": "^0.2.9", "moment-timezone": "^0.5.28", "nem-sdk": "^1.6.8", - "symbol-sdk": "^1.0.2-alpha-202110111207", + "symbol-sdk": "^1.0.2", "url-parse": "^1.5.2", "utf8": "^3.0.0", "vue": "^2.6.11", @@ -57,7 +61,7 @@ "eslint-plugin-vue": "^5.0.0", "isomorphic-fetch": "^2.2.1", "jest": "^26.0.1", - "node-sass": "^4.14.1", + "sass": "1.32", "sass-loader": "^8.0.2", "stylelint": "^11.1.1", "stylelint-config-standard": "^19.0.0", From be28f66ba2e8ca4ccfab0c26ba1f4f691fdfe443 Mon Sep 17 00:00:00 2001 From: Anthony Law Date: Fri, 29 Oct 2021 17:03:36 +0800 Subject: [PATCH 2/2] fix: update footer config (#952) --- src/components/layout/Footer.vue | 8 ++------ src/config/default.json | 26 ++++++++------------------ 2 files changed, 10 insertions(+), 24 deletions(-) diff --git a/src/components/layout/Footer.vue b/src/components/layout/Footer.vue index 4567d45b4..e0c596b79 100644 --- a/src/components/layout/Footer.vue +++ b/src/components/layout/Footer.vue @@ -55,9 +55,7 @@ import NodeSelector from '@/components/controls/NodeSelector.vue'; import IconGithub from 'vue-material-design-icons/GithubCircle.vue'; import IconNewspaper from 'vue-material-design-icons/Newspaper.vue'; -import IconReddit from 'vue-material-design-icons/Reddit.vue'; -import IconForum from 'vue-material-design-icons/Forum.vue'; -import IconTelegram from 'vue-material-design-icons/Telegram.vue'; +import IconDiscord from 'vue-material-design-icons/Discord.vue'; import IconHomeCurrencyUsd from 'vue-material-design-icons/HomeCurrencyUsd.vue'; import globalConfig from '../../config/globalConfig'; @@ -69,9 +67,7 @@ export default { IconGithub, IconNewspaper, - IconReddit, - IconForum, - IconTelegram, + IconDiscord, IconHomeCurrencyUsd }, diff --git a/src/config/default.json b/src/config/default.json index 0416f05f9..6ecd791bf 100644 --- a/src/config/default.json +++ b/src/config/default.json @@ -26,30 +26,20 @@ "footer": { "link": [ { - "href": "https://nemflash.io/", - "text": "NEM News", + "href": "https://nem.io", + "text": "NEM", "icon": "IconNewspaper" }, { - "href": "https://forum.nem.io/", - "text": "Forum", - "icon": "IconForum" - }, - { - "href": "https://t.me/nemred", - "text": "Telegram", - "icon": "IconTelegram" - }, - { - "href": "https://www.reddit.com/r/nem/", - "text": "Reddit", - "icon": "IconReddit" - }, - { - "href": "https://github.com/nemtech", + "href": "https://github.com/symbol", "text": "Github", "icon": "IconGithub" }, + { + "href": "https://discord.com/invite/xymcity", + "text": "Join Discord", + "icon": "IconDiscord" + }, { "href": "http://faucet.testnet.symboldev.network/", "text": "Faucet",