Skip to content

Commit

Permalink
Merge pull request #135 from aeternity/develop
Browse files Browse the repository at this point in the history
Release 0.0.14
  • Loading branch information
mradkov authored Apr 3, 2020
2 parents 075ba85 + 74c1d0b commit 380a40c
Show file tree
Hide file tree
Showing 129 changed files with 2,761 additions and 1,171 deletions.
10 changes: 6 additions & 4 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
{
"plugins": [
"@babel/plugin-proposal-optional-chaining",
"@babel/plugin-transform-spread"
"@babel/plugin-transform-spread",
"@babel/plugin-proposal-class-properties"
],
"presets": [
["@babel/preset-env", {
"useBuiltIns": "usage",
["@babel/preset-env", {
"useBuiltIns": "usage",
"targets": {
// https://jamie.build/last-2-versions
"browsers": ["> 0.25%", "not ie 11", "not op_mini all"]
}
},
"corejs": 3
}]
]
}
7 changes: 0 additions & 7 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,9 @@ module.exports = {
props: true,
ignorePropertyModificationsFor: [
'state', // for vuex state
'acc', // for reduce accumulators
'e' // for e.returnvalue
]
}],
// disallow default export over named export
'import/prefer-default-export': 'off',
// allow debugger during development
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
"class-methods-use-this": "warn",
"no-empty": "warn",
"no-restricted-globals": "warn"
}
}
24 changes: 16 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,24 @@ cache:

script:
- npm run lint -- --no-fix
- npm test
- npm run build

before_deploy: scripts/before-deploy.sh

deploy:
provider: pages
skip_cleanup: true
github_token: $GITHUB_TOKEN
keep_history: true
local_dir: dist/web/root
on:
branch: master
- provider: pages
skip_cleanup: true
github_token: $GITHUB_TOKEN
keep_history: true
local_dir: dist/web/root
on:
branch: master
- provider: pages
skip_cleanup: true
github_token: $GITHUB_TOKEN_SUPERHEROWALLET
keep_history: true
local_dir: dist/web/root
repo: superherowallet/wallet
target_branch: master
on:
branch: develop
2 changes: 1 addition & 1 deletion config.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<widget id="com.superhero.cordova" version="0.0.13" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="com.superhero.cordova" version="0.0.14" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>SuperHero</name>
<description>SuperHero wallet</description>
<author email="dev@cordova.apache.org" href="http://cordova.io">
Expand Down
Loading

0 comments on commit 380a40c

Please sign in to comment.