Merge branch 'develop' into trunk

.gitattributes

@@ -0,0 +1,27 @@
+/.wordpress-org export-ignore
+/.github export-ignore
+/bin export-ignore
+/gulp-tasks export-ignore
+/tests export-ignore
+
+/.babelrc export-ignore
+/.browserslistrc export-ignore
+/.editorconfig export-ignore
+/.eslintignore export-ignore
+/.eslintrc export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/CHANGELOG.md export-ignore
+/CODE_OF_CONDUCT.md export-ignore
+/composer.json export-ignore
+/composer.lock export-ignore
+/CONTRIBUTING.md export-ignore
+/CREDITS.md export-ignore
+/gulpfile.babel.js export-ignore
+/LICENSE.md export-ignore
+/package.json export-ignore
+/package-lock.json export-ignore
+/phpcs.xml export-ignore
+/phpunit.xml.dist export-ignore
+/README.md export-ignore
+/webpack.config.babel.js export-ignore

.github/workflows/lint.yml

@@ -0,0 +1,35 @@
+name: Linting
+
+on:
+  push:
+    branches:
+      - develop
+      - trunk
+  pull_request:
+    branches:
+      - develop
+
+jobs:
+  lint_js_css:
+    name: Lint JS and CSS
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: npm install
+      run: npm install
+    - name: eslint
+      run: npm run lint-js
+    - name: stylelint
+      run: npm run lint-css
+  phpcs:
+    name: PHPCS
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: composer install
+      run: composer install
+    - name: PHPCS check
+      run: composer run lint
+    - name: PHP Compatibility Check
+      run: composer run check-php-compat

.github/workflows/push-asset-readme-update.yml

@@ -0,0 +1,16 @@
+name: Plugin assets/readme update
+on:
+  push:
+    branches:
+    - trunk
+jobs:
+  trunk:
+    name: Deploy assets/readme to WP.org
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: WordPress.org plugin asset/readme update
+      uses: 10up/action-wordpress-plugin-asset-update@stable
+      env:
+        SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
+        SVN_USERNAME: ${{ secrets.SVN_USERNAME }}

.github/workflows/push-deploy.yml

@@ -0,0 +1,16 @@
+name: Deploy to WordPress.org
+on:
+  push:
+    tags:
+    - "*"
+jobs:
+  tag:
+    name: Deploy plugin version to WP.org
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - name: WordPress Plugin Deploy
+      uses: 10up/action-wordpress-plugin-deploy@stable
+      env:
+        SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }}
+        SVN_USERNAME: ${{ secrets.SVN_USERNAME }}

.gitignore

@@ -0,0 +1,29 @@
+node_modules
+bower_components
+release
+vendor
+.idea
+*.log
+
+# Project Files
+dist
+
+# Editors
+*.esproj
+*.tmproj
+*.tmproject
+tmtags
+.*.sw[a-z]
+*.un~
+Session.vim
+*.swp
+
+# Mac OSX
+.DS_Store
+._*
+.Spotlight-V100
+.Trashes
+
+# Windows
+Thumbs.db
+Desktop.ini

.stylelintrc

@@ -0,0 +1,8 @@
+{
+	"extends": "@10up/stylelint-config",
+  "rules": {
+    "sh-waqar/declaration-use-variable": null,
+    "color-named": null,
+    "font-weight-notation": null
+  }
+}

CHANGELOG.md

@@ -0,0 +1,40 @@
+# Changelog
+
+All notable changes to this project will be documented in this file, per [the Keep a Changelog standard](http://keepachangelog.com/).
+
+## [2.0.0]
+
+This release drops the support for older versions of WordPress Core, ElasticPress and Debug Bar.
+
+* Code refactoring. Props [@felipeelia](https://github.com/felipeelia)
+* Fixed Query Logs in EP Dashboard [@felipeelia](https://github.com/felipeelia)
+* Fixed typo from "clsas" to "class" in the query output. Props [@Rahmon](https://github.com/Rahmon) 
+
+## [1.4]
+* Support ElasticPress 3.0+
+
+## [1.3]
+* Add query log
+
+## [1.2]
+* Show query errors (i.e. cURL timeout)
+* Add ?explain to query if GET param is set
+
+## [1.1.1]
+* Only show query body if it exits
+
+## [1.1]
+* Improve formatting
+* Show original query args (EP 2.1+)
+
+## [1.0]
+* Initial release
+
+[Unreleased]: https://github.com/10up/debug-bar-elasticpress/compare/trunk...develop
+[2.0.0]: https://github.com/10up/debug-bar-elasticpress/compare/1.4...2.0.0
+[1.4]: https://github.com/10up/debug-bar-elasticpress/compare/1.3...1.4
+[1.3]: https://github.com/10up/debug-bar-elasticpress/compare/1.2...1.3
+[1.2]: https://github.com/10up/debug-bar-elasticpress/compare/1.1.1...1.2
+[1.1.1]: https://github.com/10up/debug-bar-elasticpress/compare/1.1...1.1.1
+[1.1]: https://github.com/10up/debug-bar-elasticpress/compare/55102f1...1.1
+[1.0]: https://github.com/10up/debug-bar-elasticpress/tree/55102f1b

CODE_OF_CONDUCT.md

@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [email protected]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

CONTRIBUTING.md

@@ -0,0 +1,64 @@
+# Contributing and Maintaining
+
+First, thank you for taking the time to contribute!
+
+The following is a set of guidelines for contributors as well as information and instructions around our maintenance process.  The two are closely tied together in terms of how we all work together and set expectations, so while you may not need to know everything in here to submit an issue or pull request, it's best to keep them in the same document.
+
+## Ways to contribute
+
+Contributing isn't just writing code - it's anything that improves the project.  All contributions are managed right here on GitHub.  Here are some ways you can help:
+
+### Reporting bugs
+
+If you're running into an issue, please take a look through [existing issues](https://github.com/10up/debug-bar-elasticpress/issues) and [open a new one](https://github.com/10up/debug-bar-elasticpress/issues/new?assignees=&labels=bug&template=1-bug-report.md&title=) if needed.  If you're able, include steps to reproduce, environment information, and screenshots/screencasts as relevant.
+
+### Suggesting enhancements
+
+New features and enhancements are also managed via [issues](https://github.com/10up/debug-bar-elasticpress/issues).
+
+### Pull requests
+
+Pull requests represent a proposed solution to a specified problem.  They should always reference an issue that describes the problem and contains discussion about the problem itself.  Discussion on pull requests should be limited to the pull request itself, i.e. code review.
+
+For more on how 10up writes and manages code, check out our [10up Engineering Best Practices](https://10up.github.io/Engineering-Best-Practices/).
+
+## Workflow
+
+The `develop` branch is the development branch which means it contains the next version to be released.  `stable` contains the current latest release and `trunk` contains the corresponding stable development version.  Always work on the `develop` branch and open up PRs against `develop`.
+
+## Release instructions
+
+1. Branch: Starting from `develop`, cut a release branch named `release/X.Y.Z` for your changes.
+2. Version bump: Bump the version number in `debug-bar-elasticpress.php`, `package.json`, `readme.txt`, `README.md`, and any other relevant files if it does not already reflect the version being released.  In `debug-bar-elasticpress.php` update both the plugin "Version:" property and the plugin `EP_DEBUG_VERSION` constant.
+3. Changelog: Add/update the changelog in `CHANGELOG.md` and `readme.txt`, ensuring to link the [X.Y.Z] release reference in the footer of `CHANGELOG.md` (e.g., https://github.com/10up/debug-bar-elasticpress/compare/X.Y.Z-1...X.Y.Z).
+4. Props: Update `CREDITS.md` file with any new contributors, confirm maintainers are accurate.
+5. Readme updates: Make any other readme changes as necessary.  `README.md` is geared toward GitHub and `readme.txt` contains WordPress.org-specific content.  The two are slightly different.
+6. New files: Check to be sure any new files/paths that are unnecessary in the production version are included in `.gitattributes`.
+7. Merge: Merge the release branch/PR into `develop`, then make a non-fast-forward merge from `develop` into `trunk` (`git checkout trunk && git merge --no-ff develop`).  `trunk` contains the stable development version.
+8. Test: While still on the `trunk` branch, test for functionality locally.
+9. Push: Push your `trunk` branch to GitHub (e.g. `git push origin trunk`).
+10. Release: Create a [new release](https://github.com/10up/debug-bar-elasticpress/releases/new), naming the tag and the release with the new version number, and targeting the `trunk` branch.  Paste the release changelog from `CHANGELOG.md` into the body of the release and include a link to the closed issues on the [milestone](https://github.com/10up/debug-bar-elasticpress/milestone/#?closed=1).
+11. SVN: Wait for the [GitHub Action](https://github.com/10up/debug-bar-elasticpress/actions?query=workflow%3A%22Deploy+to+WordPress.org%22) to finish deploying to the WordPress.org repository.  If all goes well, users with SVN commit access for that plugin will receive an emailed diff of changes.
+12. Check WordPress.org: Ensure that the changes are live on https://wordpress.org/plugins/debug-bar-elasticpress/.  This may take a few minutes.
+13. Close milestone: Edit the [milestone](https://github.com/10up/debug-bar-elasticpress/milestone/#) with release date (in the `Due date (optional)` field) and link to GitHub release (in the `Description` field), then close the milestone.
+14. Punt incomplete items: If any open issues or PRs which were milestoned for `X.Y.Z` do not make it into the release, update their milestone to `X.Y.Z+1`, `X.Y+1.0`, `X+1.0.0` or `Future Release`.
+
+## Hotfix release instructions
+
+There may be cases where we have an urgent/important fix that ideally gets into a release quickly without any other changes (e.g., a "hotfix") so as to reduce (1) the amount or testing before being confident in the release and (2) to reduce the chance of unintended side effects from the extraneous non-urgent/important changes.  In cases where code has previously been merged into `develop` but that ideally is not part of a hotfix, the normal release instructions above will not suffice as they would release all code merged to `develop` alongside the intended urgent/important "hotfix" change(s).  In case of needing to release a "hotfix" the following are the recommended steps to take.
+
+1. Branch: Starting from `trunk`, cut a hotfix release branch named `hotfix/X.Y.Z` for your hotfix change(s).
+1. Version bump: Bump the version number in `debug-bar-elasticpress.php`, `package.json`, `readme.txt`, and any other relevant files if it does not already reflect the version being released.  In `debug-bar-elasticpress.php` update both the plugin "Version:" property and the plugin `EP_DEBUG_VERSION` constant.
+1. Changelog: Add/update the changelog in `CHANGELOG.md` and `readme.txt`, ensuring to link the [X.Y.Z] release reference in the footer of `CHANGELOG.md` (e.g., https://github.com/10up/debug-bar-elasticpress/compare/X.Y.Z-1...X.Y.Z).
+1. Props: Update `CREDITS.md` file with any new contributors, confirm maintainers are accurate.
+1. Readme updates: Make any other readme changes as necessary.  `README.md` is geared toward GitHub and `readme.txt` contains WordPress.org-specific content.  The two are slightly different.
+1. New files: Check to be sure any new files/paths that are unnecessary in the production version are included in `.gitattributes`.
+1. Merge: Merge the release branch/PR into `trunk`.  `trunk` contains the stable development version.
+1. Test: While still on the `trunk` branch, test for functionality locally.
+1. Push: Push your `trunk` branch to GitHub (e.g. `git push origin trunk`).
+1. Release: Create a [new release](https://github.com/10up/debug-bar-elasticpress/releases/new), naming the tag and the release with the new version number, and targeting the `trunk` branch.  Paste the release changelog from `CHANGELOG.md` into the body of the release and include a link to the closed issues on the [milestone](https://github.com/10up/debug-bar-elasticpress/milestone/#?closed=1).
+1. SVN: Wait for the [GitHub Action](https://github.com/10up/debug-bar-elasticpress/actions?query=workflow%3A%22Deploy+to+WordPress.org%22) to finish deploying to the WordPress.org repository.  If all goes well, users with SVN commit access for that plugin will receive an emailed diff of changes.
+1. Check WordPress.org: Ensure that the changes are live on https://wordpress.org/plugins/elasticpress/.  This may take a few minutes.
+1. Close milestone: Edit the [milestone](https://github.com/10up/debug-bar-elasticpress/milestone/#) with release date (in the `Due date (optional)` field) and link to GitHub release (in the `Description` field), then close the milestone.
+1. Punt incomplete items: If any open issues or PRs which were milestoned for `X.Y.Z` do not make it into the hotfix release, update their milestone to `X.Y.Z+1`, `X.Y+1.0`, `X+1.0.0` or `Future Release`.
+1. Apply hotfix changes to `develop`: Make a non-fast-forward merge from `trunk` into `develop` (`git checkout develop && git merge --no-ff trunk`) to ensure your hotfix change(s) are in sync with active development.

CREDITS.md

@@ -0,0 +1,21 @@
+# Credits
+
+The following acknowledges the Maintainers for this repository, those who have Contributed to this repository (via bug reports, code, design, ideas, project management, translation, testing, etc.), and any Libraries utilized.
+
+## Maintainers
+
+The following individuals are responsible for curating the list of issues, responding to pull requests, and ensuring regular releases happen.
+
+[Taylor Lovett (@tlovett1)](https://github.com/tlovett1) and [Vasken Hauri (@brandwaffle)](https://github.com/brandwaffle).
+
+## Contributors
+
+Thank you to all the people who have already contributed to this repository via bug reports, code, design, ideas, project management, translation, testing, etc.
+
+[Taylor Lovett (@tlovett1)](https://github.com/tlovett1), [Ivan Kristianto (@ivankristianto)](https://github.com/ivankristianto), [Allan Collins (@allan23)](https://github.com/allan23), [Eugene Manuilov (@eugene-manuilov)](https://github.com/eugene-manuilov), [Ricardo Moraleida (@moraleida)](https://github.com/moraleida), [Andreas Ek @ekandreas](https://github.com/ekandreas), [Nathaniel @nathanielks](https://github.com/nathanielks), [Jeffrey Paul (@jeffpaul)](https://github.com/jeffpaul), [Felipe Elia (@felipeelia)](https://github.com/felipeelia), and [Ramon Ahnert @Rahmon](https://github.com/Rahmon).
+
+## Libraries
+
+The following software libraries are utilized in this repository.
+
+N/A.

README.md

@@ -2,12 +2,12 @@
 
 > A WordPress plugin that adds a [Debug Bar](https://wordpress.org/plugins/debug-bar/) panel to examine ElasticPress queries.
 
-[![Support Level](https://img.shields.io/badge/support-active-green.svg)](#support-level) [![Release Version](https://img.shields.io/github/tag/10up/debug-bar-elasticpress.svg?label=release)](https://github.com/10up/debug-bar-elasticpress/releases/latest) ![WordPress tested up to version](https://img.shields.io/badge/WordPress-v5.1%20tested-success.svg) [![GPLv2 License](https://img.shields.io/github/license/10up/debug-bar-elasticpress.svg)](https://github.com/10up/debug-bar-elasticpress/blob/master/LICENSE.md)
+[![Support Level](https://img.shields.io/badge/support-active-green.svg)](#support-level) [![Release Version](https://img.shields.io/github/tag/10up/debug-bar-elasticpress.svg?label=release)](https://github.com/10up/debug-bar-elasticpress/releases/latest) ![WordPress tested up to version](https://img.shields.io/badge/WordPress-v5.7%20tested-success.svg) [![GPLv2 License](https://img.shields.io/github/license/10up/debug-bar-elasticpress.svg)](https://github.com/10up/debug-bar-elasticpress/blob/trunk/LICENSE.md)
 
 ## Requirements
 
-* [ElasticPress](https://wordpress.org/plugins/elasticpress/) 1.8+
-* [Debug Bar](https://wordpress.org/plugins/debug-bar/) 0.8.2+
+* [ElasticPress](https://wordpress.org/plugins/elasticpress/) 3.0+
+* [Debug Bar](https://wordpress.org/plugins/debug-bar/) 1.0+
 * PHP 5.4+
 
 ## Usage
@@ -22,6 +22,14 @@ If you identify any errors or have an idea for improving the plugin, please [ope
 
 **Active:** 10up is actively working on this, and we expect to continue work for the foreseeable future including keeping tested up to the most recent version of WordPress. Bug reports, feature requests, questions, and pull requests are welcome.
 
+## Changelog
+
+A complete listing of all notable changes to Debug Bar ElasticPress are documented in [CHANGELOG.md](https://github.com/10up/debug-bar-elasticpress/blob/develop/CHANGELOG.md).
+
+## Contributing
+
+Please read [CODE_OF_CONDUCT.md](https://github.com/10up/debug-bar-elasticpress/blob/develop/CODE_OF_CONDUCT.md) for details on our code of conduct, [CONTRIBUTING.md](https://github.com/10up/debug-bar-elasticpress/blob/develop/CONTRIBUTING.md) for details on the process for submitting pull requests to us, and [CREDITS.md](https://github.com/10up/debug-bar-elasticpress/blob/develop/CREDITS.md) for a listing of maintainers of, contributors to, and libraries used by Debug Bar ElasticPress.
+
 ## Like what you see?
 
 <a href="http://10up.com/contact/"><img src="https://10up.com/uploads/2016/10/10up-Github-Banner.png" width="850" alt="Work with us at 10up"></a>