Skip to content

Commit e836ca6

Browse files
davidyukdavidyuk
authored
Merge pull request #1587 from aeternity/release
Release v1.3.0
2 parents cea17b1 + bc335a0 commit e836ca6

File tree

390 files changed

+17135
-14621
lines changed

Some content is hidden

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

390 files changed

+17135
-14621
lines changed

‎.env‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
VUE_APP_BACKEND_URL=https://base-backend.prd.aepps.com
22
VUE_APP_VAPID_PUBLIC_KEY=BHkQhNWW2TKfKfxo7vAgXkZGcVOXGrjhIZJlN1hKp6abIjWJgO8FYPswXJ35XEuKw46O9yZ-8KmsZ4-TXNBePcw
3-
VUE_APP_HOME_PAGE_URL=https://docs.aeternity.com/aepp-base-home-page

‎.env.docker‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
VUE_APP_NETWORK_NAME=Local network
2+
VUE_APP_NODE_URL=http://localhost:3013
3+
VUE_APP_MIDDLEWARE_URL=http://localhost:4000
4+
VUE_APP_EXPLORER_URL=http://localhost:3070
5+
VUE_APP_BACKEND_URL=http://localhost:3079

‎.eslintrc.js‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,8 @@ module.exports = {
66
globals: {
77
ENV_MOBILE_DEVICE: true,
88
},
9-
ignorePatterns: ['dist', 'www'],
10-
extends: [
11-
'plugin:vue/recommended',
12-
'plugin:@intlify/vue-i18n/recommended',
13-
'@vue/airbnb',
14-
],
9+
ignorePatterns: ['dist', 'platforms', 'plugins', 'www'],
10+
extends: ['plugin:vue/recommended', 'plugin:@intlify/vue-i18n/recommended'],
1511
rules: {
1612
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
1713
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
@@ -20,13 +16,16 @@ module.exports = {
2016
'vue/block-spacing': 'error',
2117
'vue/brace-style': 'error',
2218
'vue/camelcase': ['error', { properties: 'never' }],
23-
'vue/comma-dangle': ['error', {
24-
arrays: 'always-multiline',
25-
objects: 'always-multiline',
26-
imports: 'always-multiline',
27-
exports: 'always-multiline',
28-
functions: 'always-multiline',
29-
}],
19+
'vue/comma-dangle': [
20+
'error',
21+
{
22+
arrays: 'always-multiline',
23+
objects: 'always-multiline',
24+
imports: 'always-multiline',
25+
exports: 'always-multiline',
26+
functions: 'always-multiline',
27+
},
28+
],
3029
'vue/component-name-in-template-casing': 'error',
3130
'vue/eqeqeq': 'error',
3231
'vue/key-spacing': 'error',
@@ -44,24 +43,25 @@ module.exports = {
4443
'vuejs-accessibility/label-has-for': 'off',
4544
'vuejs-accessibility/form-control-has-label': 'off',
4645
'vue/multi-word-component-names': 'off',
46+
'vue/max-attributes-per-line': 'off',
47+
'vue/html-self-closing': 'off',
48+
'vue/html-closing-bracket-newline': 'off',
49+
'vue/html-indent': 'off',
50+
'vue/singleline-html-element-content-newline': 'off',
4751
'vuejs-accessibility/no-autofocus': 'off',
4852
'vuejs-accessibility/alt-text': 'off',
4953
},
5054
parserOptions: {
5155
parser: '@babel/eslint-parser',
5256
},
53-
overrides: [{
54-
files: '**/__tests__/*',
55-
env: {
56-
jest: true,
57-
},
58-
}, {
59-
files: 'backend/**',
60-
rules: {
61-
'import/no-extraneous-dependencies': ['error', { packageDir: 'backend' }],
62-
'import/extensions': ['error', 'ignorePackages'],
57+
overrides: [
58+
{
59+
files: '**/__tests__/*',
60+
env: {
61+
jest: true,
62+
},
6363
},
64-
}],
64+
],
6565
settings: {
6666
'vue-i18n': {
6767
localeDir: './src/locales/*.json',

‎.github/workflows/_validate-npm.yml‎

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,25 @@ jobs:
55
build_test:
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/checkout@v4
9-
- uses: actions/setup-node@v4
10-
with:
11-
node-version: 20.x
12-
cache: npm
13-
- run: npm ci
14-
working-directory: 'backend'
15-
- run: npm test
16-
working-directory: 'backend'
17-
- run: npm ci --legacy-peer-deps # TODO: remove --legacy-peer-deps after updating dependencies
18-
- run: npm test
19-
- uses: stefanzweifel/git-auto-commit-action@v5
20-
if: failure()
21-
with:
22-
commit_message: "fixme: update e2e screenshots"
23-
file_pattern: 'tests/e2e/*.png'
24-
- run: docker-compose logs
25-
if: always()
8+
- uses: actions/checkout@v4
9+
with:
10+
ref: ${{ github.head_ref }}
11+
- uses: actions/setup-node@v4
12+
with:
13+
node-version: 20.x
14+
cache: npm
15+
- run: npm ci
16+
working-directory: backend
17+
- run: npm test
18+
working-directory: backend
19+
- run: npm ci --legacy-peer-deps # TODO: remove --legacy-peer-deps after updating dependencies
20+
- run: docker compose up middleware -d --wait --quiet-pull
21+
- run: ./docker-compose/init-state.mjs
22+
- run: npm test
23+
- uses: stefanzweifel/git-auto-commit-action@v5
24+
if: failure()
25+
with:
26+
commit_message: 'fixme: update e2e screenshots'
27+
file_pattern: tests/e2e/*.png
28+
- run: docker compose logs
29+
if: always()

‎.github/workflows/integration.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,23 @@ name: integration
22

33
on:
44
push:
5-
branches: [ develop ]
5+
branches: [develop]
66

77
jobs:
88
validate:
99
uses: ./.github/workflows/_validate-npm.yml
1010
publish:
11-
uses: aeternity/github-actions/.github/workflows/_publish-docker.yml@v2.1.0
12-
needs: [ validate ]
11+
uses: aeternity/github-actions/.github/workflows/_publish-ecr.yml@v2.3.1
12+
needs: [validate]
1313
secrets: inherit
1414
with:
15-
DOCKERHUB_REPO: "aeternitybot/${{ github.event.repository.name }}"
1615
BUILD_ARGS: REVISION=${{ github.sha }}
1716
deploy:
18-
uses: aeternity/github-actions/.github/workflows/_deploy-gitops.yml@v2.1.0
17+
uses: aeternity/github-actions/.github/workflows/_deploy-gitops.yml@v2.3.1
1918
needs: [publish]
2019
secrets: inherit
2120
with:
2221
DEPLOY_ENV: stg
23-
DEPLOY_APP: "${{ github.event.repository.name }}"
22+
DEPLOY_APP: '${{ github.event.repository.name }}'
2423
DEPLOY_VERSION: develop
25-
DEPLOY_SUBDOMAIN: "base"
24+
DEPLOY_SUBDOMAIN: 'base'

‎.github/workflows/pull-request-cleanup.yml‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,24 @@ name: pull-request-cleanup
22

33
on:
44
pull_request:
5-
branches: [ master, develop ]
6-
types: [ closed ]
5+
branches: [master, develop]
6+
types: [closed]
77

88
jobs:
99
rollback:
10-
uses: aeternity/github-actions/.github/workflows/_rollback-gitops.yml@v2.1.0
10+
uses: aeternity/github-actions/.github/workflows/_rollback-gitops.yml@v2.3.1
1111
secrets: inherit
1212
with:
1313
DEPLOY_ENV: stg
1414
DEPLOY_APP: ${{ github.event.repository.name }}
15-
DEPLOY_VERSION: "pr-${{ github.event.number }}"
16-
DEPLOY_SUBDOMAIN: "pr-${{ github.event.number }}-base"
15+
DEPLOY_VERSION: pr-${{ github.event.number }}
16+
DEPLOY_SUBDOMAIN: pr-${{ github.event.number }}-base
1717
delete-tag:
18-
uses: aeternity/github-actions/.github/workflows/_delete-tag-docker.yml@v2.1.0
18+
uses: aeternity/github-actions/.github/workflows/_delete-tag-ecr.yml@v2.3.1
1919
secrets: inherit
2020
with:
21-
DOCKERHUB_REPO: "aeternitybot/${{ github.event.repository.name }}"
22-
DOCKERHUB_TAG: "pr-${{ github.event.number }}"
21+
TAG: pr-${{ github.event.number }}
22+
cleanup:
23+
uses: aeternity/github-actions/.github/workflows/[email protected]
24+
needs: [delete-tag]
25+
secrets: inherit

‎.github/workflows/pull-request.yml‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,23 @@ name: pull-request
22

33
on:
44
pull_request:
5-
branches: [ master, develop ]
5+
branches: [master, develop]
66

77
jobs:
88
validate:
99
uses: ./.github/workflows/_validate-npm.yml
1010
publish:
11-
uses: aeternity/github-actions/.github/workflows/_publish-docker.yml@v2.1.0
12-
needs: [ validate ]
11+
uses: aeternity/github-actions/.github/workflows/_publish-ecr.yml@v2.3.1
12+
needs: [validate]
1313
secrets: inherit
1414
with:
15-
DOCKERHUB_REPO: "aeternitybot/${{ github.event.repository.name }}"
1615
BUILD_ARGS: REVISION=${{ github.sha }}
1716
deploy:
18-
uses: aeternity/github-actions/.github/workflows/_deploy-gitops.yml@v2.1.0
17+
uses: aeternity/github-actions/.github/workflows/_deploy-gitops.yml@v2.3.1
1918
needs: [publish]
2019
secrets: inherit
2120
with:
2221
DEPLOY_ENV: stg
2322
DEPLOY_APP: ${{ github.event.repository.name }}
24-
DEPLOY_VERSION: "pr-${{ github.event.number }}"
25-
DEPLOY_SUBDOMAIN: "pr-${{ github.event.number }}-base"
23+
DEPLOY_VERSION: pr-${{ github.event.number }}
24+
DEPLOY_SUBDOMAIN: pr-${{ github.event.number }}-base

‎.github/workflows/release-please.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: release-please
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [master]
66

77
jobs:
88
release-please:
@@ -13,5 +13,5 @@ jobs:
1313
with:
1414
token: ${{ secrets.GITHUB_TOKEN }}
1515
release-type: node
16-
package-name: ""
16+
package-name: ''
1717
changelog-types: '[{"type":"feat","section":"Features","hidden":false},{"type":"fix","section":"Bug Fixes","hidden":false},{"type":"ci","section":"CI / CD","hidden":false},{"type":"test","section":"Testing","hidden":false},{"type":"refactor","section":"Refactorings","hidden":false},{"type":"chore","section":"Miscellaneous","hidden":false}]'

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ name: release
22

33
on:
44
push:
5-
tags: [ v* ]
5+
tags: [v*]
66

77
jobs:
88
publish:
9-
uses: aeternity/github-actions/.github/workflows/_publish-docker.yml@v2.1.0
9+
uses: aeternity/github-actions/.github/workflows/_publish-ecr.yml@v2.3.1
1010
secrets: inherit
1111
with:
1212
BUILD_ARGS: REVISION=${{ github.sha }}
1313
deploy:
14-
uses: aeternity/github-actions/.github/workflows/_deploy-gitops.yml@v2.1.0
14+
uses: aeternity/github-actions/.github/workflows/_deploy-gitops.yml@v2.3.1
1515
needs: [publish]
1616
secrets: inherit
1717
with:

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
node_modules
33
/dist
44
__image_snapshots_local__
5+
tests/e2e/fixtures/qr-code-videos/video.y4m
56

67
# Cordova files
78
/www

0 commit comments

Comments
 (0)