Merge branch 'develop' into patch-1

.circleci/config.yml

@@ -3,14 +3,17 @@ workflows:
   version: 2
   build-deploy:
     jobs:
-      - build:
+      - pr:
           filters:
             branches:
-              ignore: master
-      - master:
+              ignore: &integration_branches
+                - master
+                - develop
+                - /release\/\d+\.\d+
+      - integration:
           filters:
             branches:
-              only: master
+              only: *integration_branches
 
 # This key means nothing to CircleCI; it's just a place to keep anchored
 # configuration nodes for reuse.
@@ -42,7 +45,7 @@ common_settings:
     path: "packages/venia-concept/dist"
 
 jobs:
-  master:
+  integration:
     docker: *docker_setup
     steps:
       - checkout
@@ -55,9 +58,13 @@ jobs:
           command: yarn run coveralls
       - run: *full_build
       - run: *storybook_build
+      - run:
+          name: Bundle size analysis
+          command: yarn run bundlesize
+
       - store_test_results: *test_result_path
       - store_artifacts: *artifact_storage_path
-  build:
+  pr:
     docker: *docker_setup
     steps:
       - checkout

.dockerignore

@@ -0,0 +1,2 @@
+packages/**/node_modules
+packages/**/dist

.github/CONTRIBUTING.md

@@ -1,18 +1,18 @@
 # Contributing
 
-Thank you for your interest in contributing to the PWA Studio project! Before you start contributing, please take a moment to read through the following guidelines:
+Thank you for your interest in contributing to the PWA Studio project! Before you start, please take a moment to read through the following guidelines:
 
 -   [Code of Conduct]
 -   [Support]
 
-To contribute to this repository, start by forking the [official repository] and following the installation instructions in the README file.
+To contribute to this repository, fork the [official repository] and follow the installation instructions in the `README` file.
 
-## Pull Request checklist
+## Pull Requests
 
--   PR commits should contain [meaningful commit messages]
--   To help with reviews, your PR should only create/revise a single feature or fix a single issue.
--   If your PR fixes a bug, please provide a step-by-step description of how to reproduce the bug.
--   If your PR addresses an existing issue, please reference that issue in the title or description.
+-   Every PR must be tied to an issue. Create an issue if none exist for the PR.
+-   PRs should only be scoped to a single issue.
+-   PR commits should contain [meaningful commit messages].
+-   Please fill out the entirety of the PR template, including the PR checklist.
 -   If your PR adds a feature with a public API, please add or update documentation in the README for the relevant package.
 
 **Note:**
@@ -28,9 +28,6 @@ Even foundational infrastructure stories are available for a generous developer
 To get started, look for issues tagged with the **[help wanted]** labels.
 These issues are ready for community ownership.
 
-**Note:**
-_We also accept unsolicited new issues/features and pull request, but priority is given to issues in our roadmap that community developers have been kind enough to take on._
-
 ### Claiming an issue on the roadmap
 
 If you are interested in taking ownership of a roadmap feature or issue, we ask that you go through the following process.
@@ -83,7 +80,7 @@ We hope this guide paints a clear picture of your duties and expectations in the
 
 ## Report an issue
 
-Create a [GitHub issue] and put an **X** in the appropriate box to report an issue with the project.
+Create a [GitHub issue].
 Provide as much detail as you can in each section to help us triage and process the issue.
 
 ### Issue types
@@ -99,6 +96,6 @@ _Please avoid creating GitHub issues asking for help on bugs in your project tha
 [support]: SUPPORT.md
 [official repository]: https://github.com/magento-research/pwa-studio
 [meaningful commit messages]: https://chris.beams.io/posts/git-commit/
-[github issue]: https://github.com/magento-research/pwa-studio/issues/new
+[github issue]: https://github.com/magento-research/pwa-studio/issues/new/choose
 [magento research]: https://github.com/magento-research
 [help wanted]: https://github.com/magento-research/pwa-studio/issues?q=is%3Aissue+is%3Aopen+label%3A%22help+wanted%22

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,10 +1,9 @@
 ---
-name: Bug report
-about: Create a report to help us improve
-title: "[BUG]"
+name: Bug Report
+about: Report a bug you've found in our code!
+title: "[bug]: A short, simple sentence describing the bug"
 labels: bug
 assignees: ''
-
 ---
 
 <!--
@@ -35,25 +34,27 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Please complete the following device information:**
- - Device: [e.g. iPhone6, PC]
- - OS: [e.g. iOS8.1, Windows 10]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
- - Magento Version
- - NPM version `npm -v`
- - Node Version `node -v`
+**Additional context**
+Add any other context about the problem here.
+
+**Possible solutions**
+Add any ideas about possible solutions to the problem here.
 
+**Please complete the following device information:**
+ - Device [e.g. iPhone6, PC, Mac, Pixel3]:
+ - OS [e.g. iOS8.1, Windows 10]:
+ - Browser [e.g. Chrome, Safari]:
+ - Browser Version [e.g. 22]:
+ - Magento Version:
+ - PWA Studio Version:
+ - NPM version `npm -v`:
+ - Node Version `node -v`:
+
+<!-- Complete the following sections to help us apply appropriate labels! -->
 **Please let us know what packages this bug is in regards to:**
 - [ ] `venia-concept`
 - [ ] `pwa-buildpack`
 - [ ] `peregrine`
 - [ ] `pwa-devdocs`
 - [ ] `upward-js`
 - [ ] `upward-spec`
-
-**Additional context**
-Add any other context about the problem here.
-
-**Possible solutions**
-Add any ideas about possible solutions to the problem here.

.github/ISSUE_TEMPLATE/doc_change.md

@@ -0,0 +1,33 @@
+---
+name: Documentation Request
+about: Help us improve the documentation
+title: "[doc]: A short, simple sentence describing the doc request"
+labels: documentation
+assignees: 'jcalcaben'
+---
+
+<!--
+Thank you for taking the time to report this issue!
+GitHub Issues should only be created for problems/topics related to this project's codebase.
+
+Before submitting this issue, please make sure you are complying with our Code of Conduct:
+https://github.com/magento-research/pwa-studio/blob/develop/.github/CODE_OF_CONDUCT.md
+
+Issues that do not comply with our Code of Conduct or do not contain enough information may be closed at the maintainers' discretion.
+
+Feel free to remove this section before creating this issue.
+-->
+
+**Describe the request**
+A clear and concise description of the documentation request or where the documentation can be improved.
+
+**Possible solutions**
+How would you word this addition or change?
+
+**Screenshots**
+If applicable, add screenshots to help explain the problem.
+
+<!-- Complete the following sections to help us apply appropriate labels! -->
+**Please let us know whether this is a new topic or a topic change request:**
+ - [ ] New Topic Request (ie. missing entire topic/section)
+ - [ ] Topic Change Request (ie. spelling, organization)

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,10 +1,9 @@
 ---
-name: Feature request
-about: Suggest an idea for this project
-title: "[FEATURE]"
+name: Feature Request
+about: Suggest a new feature!
+title: "[feature]: A short, simple sentence describing the feature"
 labels: enhancement
 assignees: ''
-
 ---
 
 <!--
@@ -19,14 +18,6 @@ Issues that do not comply with our Code of Conduct or do not contain enough info
 Feel free to remove this section before creating this issue.
 -->
 
-**Please let us know what packages this feature is in regards to:**
-- [ ] `venia-concept`
-- [ ] `pwa-buildpack`
-- [ ] `peregrine`
-- [ ] `pwa-devdocs`
-- [ ] `upward-js`
-- [ ] `upward-spec`
-
 **Is your feature request related to a problem? Please describe.**
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
 
@@ -38,3 +29,11 @@ A clear and concise description of any alternative solutions or features you've
 
 **Additional context**
 Add any other context or screenshots about the feature request here.
+
+**Please let us know what packages this feature is in regards to:**
+- [ ] `venia-concept`
+- [ ] `pwa-buildpack`
+- [ ] `peregrine`
+- [ ] `pwa-devdocs`
+- [ ] `upward-js`
+- [ ] `upward-spec`

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,54 +1,49 @@
 <!--
-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/pwa-studio/blob/master/.github/CONTRIBUTION.md
+https://github.com/magento-research/pwa-studio/blob/master/.github/CONTRIBUTING.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. PRs that do not comply with our guidelines may be closed at the maintainers' discretion.
 
-Feel free to remove this section before creating this PR.
+Feel free to remove this section before creating this PR. Thank you for your contribution!
 -->
 
 ## Description
-<!--- Provide a general summary of your changes in the Title above -->
-<!--- Describe your changes in detail here: -->
+<!--- Describe your changes in detail here -->
 
 ## Related Issue
 <!--- This project only accepts pull requests related to open issues -->
 <!--- If suggesting a new feature or change, please discuss it in an issue first -->
 <!--- If fixing a bug, there should be an issue describing it with steps to reproduce -->
 <!--- Please link to the issue here with the specific wording: "Closes #<issue>" -->
 <!--- Using the above wording causes Github to automatically close the issue on merge. -->
-Closes #ISSUENUM.
+Closes #ISSUE_NUMBER.
 
-## Motivation and Context
-<!--- Why is this change required? What problem does it solve? -->
+## Verification Steps
+<!-- Please describe in detail how a reviewer can verify your changes. -->
+1. Go to the FOO page.
+2. Verify the BAR shows up.
+3. Make sure BAZ does a thing.
 
-## How Has This Been Tested?
+## How Have YOU Tested this?
 <!--- Please describe in detail how you tested your changes. -->
 <!--- Include details of your testing environment, and the tests you ran to -->
 <!--- see how your change affects other areas of the code, etc. -->
 
-## Screenshots (if appropriate):
+## Screenshots / Screen Captures (if appropriate):
 
 ## Proposed Labels for Change Type/Package
-<!--- What types of changes does your code introduce? Let us know if this is a -->
-<!--- BUG, FEATURE, DOCUMENTATION, or TEST change. -->
-
-<!--- What packages are modified by this code? Let us know if this applies to -->
-<!--- peregrine, pwa-buildpack, upward-js, upward-spec, venia-concept or pwa-devdocs -->
+<!--- What type of change level would you suggest for this PR? -->
+<!--- Major, Minor, or Patch? -->
+<!--- See https://magento-research.github.io/pwa-studio/technologies/versioning/ for help -->
+- [ ] major (e.g x.0.0 - a breaking change)
+- [ ] minor (e.g 0.x.0 - a backwards compatible addition)
+- [ ] patch (e.g 0.0.x - a bug fix)
 
 ## Checklist:
 <!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
 <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
-- [ ] I have read the **CONTRIBUTING** document.
-- [ ] I have linked an issue to this PR.
-- [ ] I have indicated the change type and relevant package(s).
-- [ ] I have updated the documentation accordingly.
-- [ ] I have added tests to cover my changes.
-- [ ] All new and existing tests passed.
-- [ ] All CI checks are green (linting, build/deploy, etc).
-- [ ] At least one core contributor has approved this PR.
+- [ ] I have updated the documentation accordingly, if necessary.
+- [ ] I have added tests to cover my changes, if necessary.

.gitignore

@@ -15,3 +15,4 @@ lerna-debug.log
 yarn-error.log
 # Packages that build partially transpiled ES modules put them here
 packages/*/esm/*
+docker/certs

.npmrc

@@ -1 +1 @@
-save-prefix="~"
+save-prefix="^"

.yarnrc

@@ -1 +1 @@
-save-prefix "~"
+save-prefix "^"

CHANGELOG.md

@@ -1,8 +1,54 @@
 # Release 2.0
 
-## What's new
+## Table of contents
 
-This is a brief development summary for this release.
+* [2.1.0](#whats-new-in-210)
+* [2.0.0](#whats-new-in-200)
+
+## What's new in 2.1.0
+
+Release **2.1.0** is a compatibility release for the core **Magento 2.3.1** release.
+
+Notable changes include:
+
+* Updated GraphQL queries
+* Magento GraphQL query validation tool
+
+### Updated GraphQL queries
+
+The Magento 2.3.1 release contains GraphQL schema changes that are not compatible with PWA Studio 2.0.0 presentational components.
+This release adds a mapping layer to the wrapper components to maintain backwards compatibility for the presentational components.
+
+This update also includes a change to the `.env.dist` file in the Venia project.
+This change sets the `MAGENTO_BACKEND_URL` variable to that of a Magento 2.3.1 instance.
+
+If you have previously set up Venia and copied the `.env.dist` file into your project's `.env` file, you must update the `MAGENTO_BACKEND_URL` variable to keep your project compatible.
+
+Pull Request: [#990](https://github.com/magento-research/pwa-studio/pull/990)
+
+### Query validation tool
+
+PWA Studio 2.1.0 creates a new `graphql-cli` plugin called `validate-magento-pwa-queries` to replace the `validate-queries.js` script in the Venia package.
+
+This tool lets developers know when a breaking change occurs with GraphQL to address incompatibility or breaking changes.
+It provides clear error messages regarding where and how to resolve issues.
+
+Pull Request: [#1004](https://github.com/magento-research/pwa-studio/pull/1004)
+
+### Other updates
+
+* Unit tests created to increase test coverage
+* Documentation typo fixes
+* Devdocs script created for auto-generating reference docs from source
+* Misc code cleanup
+* Bugfix for shopping cart error when continuing to shop after checkout
+* Bugfix for the full screen checkout drawer
+* Bugfix for pagination persisting during Query loading state
+* Bugfix for Search autocomplete rendering loading component on clear
+
+## What's new in 2.0.0
+
+This is a brief development summary for the 2.0.0 release.
 
 For a list of relevant Pull Requests related to the 2.0 release, see this [GitHub query result][].