Skip to content

Commit

Permalink
Merge branch 'master' into zetlen/pwadevserver-optional-features
Browse files Browse the repository at this point in the history
  • Loading branch information
zetlen authored Sep 18, 2018
2 parents f774fcf + 14a6683 commit 8e05557
Show file tree
Hide file tree
Showing 32 changed files with 2,240 additions and 6,008 deletions.
4 changes: 3 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,9 @@ jobs:
command: 'npm run test:ci && npm run coveralls || true'
- run:
name: Patch CircleCI environment to help detect pull requests
command: node .circleci/patch_circleci_environment.js >> $BASH_ENV
command: chmod u+x scripts/patch_circleci_env && scripts/patch_circleci_env >> $BASH_ENV
environment:
GITHUB_GRAPHQL_ENDPOINT: https://api.github.com/graphql
- run:
name: DangerCI
command: npm run danger
Expand Down
74 changes: 0 additions & 74 deletions .circleci/patch_circleci_environment.js

This file was deleted.

6 changes: 6 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
const config = {
parser: 'babel-eslint',
extends: ['@magento']
};

module.exports = config;
10 changes: 8 additions & 2 deletions jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,16 @@ module.exports = {
projects: [
'packages/peregrine',
'packages/pwa-buildpack',
'packages/venia-concept'
'packages/venia-concept',
'scripts'
],
collectCoverage: true,
collectCoverageFrom: ['src/**/*.js', '!**/__stories__/**'],
collectCoverageFrom: [
'scripts/**/*.js',
'src/**/*.js',
'!**/__stories__/**',
'!**/__helpers__/**'
],
reporters: [
'default',
[
Expand Down
Loading

0 comments on commit 8e05557

Please sign in to comment.