Skip to content

Commit 11d1f74

Browse files
author
Ivelin Mollov
authored
Merge pull request #1144 from aeternity/release/v0.5.4
Release 0.5.4
2 parents e347f17 + 715c44e commit 11d1f74

File tree

140 files changed

+9649
-9293
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+9649
-9293
lines changed

.dockerignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
node_modules
2+
/dist

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[*.{js,jsx,ts,tsx,vue,scss,svg}]
1+
[*.{js,jsx,ts,tsx,vue,scss,svg,html}]
22
indent_style = space
33
indent_size = 2
44
end_of_line = lf

.env.tnet

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
VUE_APP_BACKEND_URL=https://test-tipping.aeternity.art
1+
VUE_APP_BACKEND_URL=https://testnet.superhero.aeternity.art
22
VUE_APP_NODE_URL=https://testnet.aeternity.io
33
VUE_APP_MIDDLEWARE_URL=https://testnet.aeternity.io/mdw
44
VUE_APP_EXPLORER_URL=https://testnet.aeternal.io
5+
56
VUE_APP_CONTRACT_V1_ADDRESS=ct_2Cvbf3NYZ5DLoaNYAU71t67DdXLHeSXhodkSNifhgd7Xsw28Xd
6-
VUE_APP_CONTRACT_V2_ADDRESS=ct_2ZEoCKcqXkbz2uahRrsWeaPooZs9SdCv6pmC4kc55rD4MhqYSu
7+
VUE_APP_CONTRACT_V2_ADDRESS=ct_2bvoxQ6cwwzoFASuddUxzsYVBZUet9KGHRAp7i25xsMXEWvSvx
78
VUE_APP_CONTRACT_V3_ADDRESS=ct_WscpdLQf6ZZxoVqrsEwUwmuAEdzEkJii5W5TzG84rVgHeK6BW
8-
VUE_APP_WORD_REGISTRY_ADDRESS=ct_2sHzycCWkiyfZkCMoprn3Q7U8SQh3FYXp6iB1RAFVJy1pNWZAY
9+
10+
VUE_APP_WORD_REGISTRY_ADDRESS=ct_2vTMtHgJTxTpsQ8Tm3o6DmfDkhc3vM4DefV845Yp9FSDuS6YWB
11+
VUE_APP_BONDING_CURVE_18_DECIMALS_ADDRESS=ct_2e1ZjvVXVi5f2ZiTqiFgs29oN1r1dhhdv2irvnnkvkoGZBgMPf
912
VUE_APP_WORDBAZAAR_ENABLED=true

.eslintrc.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ module.exports = {
4242
'vue/v-on-function-call': 'error',
4343
'vue-i18n/no-dynamic-keys': 'error',
4444
'vue-i18n/no-unused-keys': 'error',
45-
'vue-i18n/no-raw-text': 'error',
45+
'vue-i18n/no-raw-text': 'off',
4646
},
4747
overrides: [
4848
{

.github/workflows/ssr.yml

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
name: SSR deploy
2+
on: [push, pull_request]
3+
jobs:
4+
deploy:
5+
if: github.event_name == 'push'
6+
runs-on: ubuntu-latest
7+
env:
8+
TARGET: ${{ format('/home/{0}/superhero-ui', secrets.SSR_STAGE_USER) }}
9+
steps:
10+
- uses: actions/checkout@v2
11+
- uses: actions/setup-node@v2
12+
with:
13+
node-version: 14.x
14+
- uses: actions/cache@v2
15+
with:
16+
path: ~/.npm
17+
key: ${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
18+
- run: npm ci
19+
- run: npm run ssr:build
20+
21+
- name: Deploy to stage
22+
uses: easingthemes/ssh-deploy@v2.1.5
23+
env:
24+
SSH_PRIVATE_KEY: ${{ secrets.SSR_STAGE_PRIVATE_KEY }}
25+
REMOTE_HOST: ${{ secrets.SSR_STAGE_HOST }}
26+
REMOTE_USER: ${{ secrets.SSR_STAGE_USER }}
27+
SOURCE: .
28+
TARGET: ${{ env.TARGET }}
29+
EXCLUDE: '/.git/, /node_modules/'
30+
31+
- name: Execute SSH commmands on remote server
32+
uses: JimCronqvist/action-ssh@master
33+
env:
34+
NODE_ENV: production
35+
HOME: /home/${{ secrets.SSR_STAGE_USER }}
36+
NVM_DIR: /home/${{ secrets.SSR_STAGE_USER }}/.nvm
37+
TARGET: ${{ env.TARGET }}
38+
with:
39+
hosts: '${{ secrets.SSR_STAGE_USER }}@${{ secrets.SSR_STAGE_HOST }}'
40+
privateKey: ${{ secrets.SSR_STAGE_PRIVATE_KEY }}
41+
debug: true
42+
command: |
43+
source ${{ env.NVM_DIR }}/nvm.sh || exit 1
44+
cd ${{ env.TARGET }} || exit 1
45+
nvm install 14 --latest-npm --no-progress --default || exit 1
46+
npm ci || exit 1
47+
killall node
48+
setsid nohup npm run ssr:start </dev/null &2>log.log &
49+
disown
50+
51+
comment:
52+
if: github.event_name == 'pull_request'
53+
runs-on: ubuntu-latest
54+
steps:
55+
- uses: unsplash/comment-on-pr@85a56be792d927ac4bfa2f4326607d38e80e6e60
56+
env:
57+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
58+
HOST: ${{ secrets.SSR_STAGE_HOST }}
59+
with:
60+
msg: SSR will be deployed to [${{ env.HOST }}](https://${{ env.HOST }}), [bundle report](https://${{ env.HOST }}/report.html)
61+
check_for_duplicate_msg: true

Dockerfile

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
FROM node:14 as builder
2+
3+
RUN mkdir -p /home/node/app
4+
WORKDIR /home/node/app
5+
COPY package*.json /home/node/app/
6+
RUN chown -R node:node /home/node/
7+
8+
USER node
9+
10+
RUN npm ci
11+
COPY --chown=node:node . /home/node/app
12+
ENV NODE_ENV=production
13+
RUN npm run ssr:build
14+
15+
16+
FROM node:14-alpine
17+
18+
ENV NODE_ENV production
19+
ENV HOST 0.0.0.0
20+
ENV PORT 8080
21+
EXPOSE 8080
22+
23+
USER node
24+
WORKDIR /home/node/app
25+
26+
COPY --chown=node:node --from=builder /home/node/app /home/node/app
27+
28+
CMD ["./node_modules/@uvue/server/start.js"]

babel.config.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,8 @@ module.exports = {
22
presets: [
33
'@vue/cli-plugin-babel/preset',
44
],
5+
plugins: [
6+
'@babel/plugin-proposal-optional-chaining',
7+
'@babel/plugin-proposal-nullish-coalescing-operator',
8+
],
59
};

0 commit comments

Comments
 (0)