Skip to content

Commit

Permalink
Super basic implementation of category page using apollo client for d…
Browse files Browse the repository at this point in the history
…ata fetching (#52)

~~**Note** This branch surfaced an issue with the unit/integration test setup in the monorepo. Freezing work on this branch until I've completed #54

Closes #20 

<!-- (REQUIRED) What is the nature of this PR? -->

## This PR is a:

[ ] New feature
[X] Enhancement/Optimization
[ ] Refactor
[ ] Bugfix
[ ] Test for existing code
[ ] Documentation

<!-- (REQUIRED) What does this PR change? -->

## Summary

Same code from magento-research/venia-pwa-concept#89, now moved over and tests fixed.
<!-- (OPTIONAL) What other information can you provide about this PR? -->

## Additional information

<!--
Thank you for your contribution!

Before submitting this pull request, please make sure you have read our Contribution Guidelines and your PR meets our contribution standards:
https://github.com/magento-research/venia-pwa-concept/blob/master/.github/CONTRIBUTION.md

Please fill out as much information as you can about your PR to help speed up the review process.
If your PR addresses an existing GitHub Issue, please refer to it in the title or Additional Information section to make the connection.

We may ask you for changes in your PR in order to meet the standards set in our Contribution Guidelines. PR's that do not comply with our guidelines may be closed at the maintainers' discretion.

Feel free to remove this section before creating this PR.
-->
  • Loading branch information
DrewML committed Jun 21, 2018
1 parent 1b62c17 commit 40626e2
Show file tree
Hide file tree
Showing 13 changed files with 462 additions and 152 deletions.
2 changes: 1 addition & 1 deletion packages/peregrine/package.json
Expand Up @@ -13,7 +13,7 @@
"url": "https://github.com/magento-research/peregrine"
},
"scripts": {
"build": "babel src -d dist --ignore test.js",
"build": "babel src -d dist --ignore '*.test.js,*.spec.js'",
"danger": "danger-ci",
"clean": "rimraf dist",
"prepare": "npm-merge-driver install",
Expand Down
3 changes: 2 additions & 1 deletion packages/venia-concept/babel.config.js
Expand Up @@ -7,7 +7,8 @@ const plugins = [
'syntax-jsx',
'transform-class-properties',
'transform-object-rest-spread',
['transform-react-jsx', { pragma: 'createElement' }]
['transform-react-jsx', { pragma: 'createElement' }],
'graphql-tag'
];

// define default babel options
Expand Down
237 changes: 235 additions & 2 deletions packages/venia-concept/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions packages/venia-concept/package.json
Expand Up @@ -17,10 +17,14 @@
},
"dependencies": {
"@magento/peregrine": "^0.4.0",
"apollo-boost": "^0.1.9",
"babel-runtime": "^6.26.0",
"dotenv": "^4.0.0",
"feather-icons": "^4.6.0",
"graphql": "^0.13.2",
"graphql-tag": "^2.9.2",
"react": "^16.2.0",
"react-apollo": "^2.1.5",
"react-dom": "^16.2.0",
"react-redux": "^5.0.6",
"react-router-dom": "^4.2.2",
Expand All @@ -30,6 +34,7 @@
"@magento/pwa-buildpack": "^0.8.2",
"babel-core": "^6.26.0",
"babel-loader": "^7.1.2",
"babel-plugin-graphql-tag": "^1.6.0",
"babel-plugin-syntax-dynamic-import": "^6.18.0",
"babel-plugin-syntax-jsx": "^6.18.0",
"babel-plugin-transform-class-properties": "^6.24.1",
Expand Down

0 comments on commit 40626e2

Please sign in to comment.