Skip to content

Commit

Permalink
Merge pull request #1473 from blockchain/release/4.9.x
Browse files Browse the repository at this point in the history
Release/4.9.x
  • Loading branch information
plondon committed Feb 20, 2019
2 parents 53b51af + 20c655f commit 4968c93
Show file tree
Hide file tree
Showing 626 changed files with 14,063 additions and 11,414 deletions.
9 changes: 0 additions & 9 deletions .babelrc

This file was deleted.

10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ references:
- image: circleci/node:10.12.0-jessie-browsers

npm_cache_key: &npm_cache_key
v4-dependency-npm-{{ checksum "yarn.lock" }}
v7-dependency-npm-{{ checksum "yarn.lock" }}

restore_node_modules: &restore_node_modules
restore_cache:
Expand All @@ -25,9 +25,9 @@ references:
restore_repo: &restore_repo
restore_cache:
keys:
- v4-repo-{{ .Branch }}-{{ .Revision }}
- v4-repo-{{ .Branch }}
- v4-repo
- v7-repo-{{ .Branch }}-{{ .Revision }}
- v7-repo-{{ .Branch }}
- v7-repo

jobs:
pull_code:
Expand All @@ -36,7 +36,7 @@ jobs:
- *restore_repo
- checkout
- save_cache:
key: v4-repo-{{ .Branch }}-{{ .Revision }}
key: v7-repo-{{ .Branch }}-{{ .Revision }}
paths:
- .
npm_install:
Expand Down
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
},
"rules": {
"camelcase": 0,
"new-cap": 0,
"no-case-declarations": 0,
"no-console": 2,
"no-underscore-dangle": 0,
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ This repo contains the three codebases/packages listed below.

## Local Development
1. Ensure Node version >= 10.2 and Yarn version >= 1.12 are installed
2. Run the following command to install necessary global packages: `npm install -g yarn babel-cli rimraf cross-env`
3. Install, link and hoist packages: `yarn`
2. From the project root, run the following command to install dependencies: `chmod +x ./setup.sh && ./setup.sh`.
4. Start the application in development mode: `yarn start`
5. The frontend application will now be accessible via browser at `localhost:8080`

Expand Down Expand Up @@ -96,6 +95,8 @@ Testing is done via [Jest](https://facebook.github.io/jest/) and [Enzyme](http:/
* `yarn test:components` Runs unit tests for only [blockchain-info-components](./packages/blockchain-info-components)
* `yarn test:core` Runs unit tests for only [blockchain-wallet-v4](./packages/blockchain-wallet-v4)
* `yarn test:frontend` Runs unit tests for only [blockchain-wallet-v4-frontend](./packages/blockchain-wallet-v4-frontend)

_Note: if you see errors that Jest cannot resolve package imports, you may need to run `yarn test` before testing specific packages (eg, `yarn test:frontend`)_

#### Running Tests via Watch
* `yarn test:watch` Watches and then runs desired tests
Expand Down
13 changes: 13 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
module.exports = {
env: {
test: {
presets: ['@babel/preset-env', '@babel/preset-react']
}
},
presets: ['@babel/preset-env', '@babel/preset-react'],
plugins: [
'@babel/plugin-proposal-class-properties',
'@babel/plugin-proposal-object-rest-spread',
'babel-plugin-styled-components'
]
}

0 comments on commit 4968c93

Please sign in to comment.