chore: merge master (a37ab76) into develop (#15412)

Co-authored-by: Barthélémy Ledoux <[email protected]> Co-authored-by: ElevateBart <[email protected]> Co-authored-by: Jessica Sachs <[email protected]>
cypress-io · Mar 13, 2021 · ef1b02d · ef1b02d · cypress-bot · Mar 13, 2021
1 parent a94c9d5
commit ef1b02d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/circle.yml b/circle.yml
@@ -1056,7 +1056,6 @@ jobs:
       - run:
           name: Run tests
           command: yarn workspace @cypress/webpack-dev-server test
-
   npm-vite-dev-server:
     <<: *defaults
     steps:

diff --git a/npm/vite-dev-server/README.md b/npm/vite-dev-server/README.md
@@ -1,3 +1,15 @@
 # ⚡️ + 🌲 Cypress Component Testing w/ Vite
 
-> **Note** this package is not meant to be used outside of cypress component testing.
+To install vite in you component testing environment,
+1. Install it `yarn add @cypress/vite-dev-server`
+2. Add it to `cypress/plugins/index.js`
+
+```js
+import { startDevServer } from '@cypress/vite-dev-server'
+
+module.exports = (on, config) => {
+  on('dev-server:start', async (options) => startDevServer({ options }))
+
+  return config
+}
+```
diff --git a/npm/vue/README.md b/npm/vue/README.md
@@ -743,6 +743,8 @@ module.exports = (on, config) => {
 The Cypress.io Component Testing Team
 
 - [Jessica Sachs](https://github.com/jessicasachs) (Current Maintainer, [Vue Test Utils](https://github.com/vuejs/vue-test-utils) Maintainer)
+- [Lachlan Miller](https://github.com/lmiller1990) (Current Maintainer, [Vue Test Utils](https://github.com/vuejs/vue-test-utils) Maintainer)
+- [Bart Ledoux](https://github.com/elevatebart) (Current Maintainer, [Vue Styleguidist](https://github.com/vue-styleguidist/vue-styleguidist) Maintainer)
 - [Gleb Bahmutov](https://github.com/bahmutov) (Original Author, Current Maintainer of [@cypress/react](https://github.com//cypress-io/@cypress/react))
 
 Support: if you find any problems with this module, [tweet](https://twitter.com/_jessicasachs) / [open issue](https://github.com/cypress-io/cypress/issues) on Github

diff --git a/npm/webpack-dev-server/README.md b/npm/webpack-dev-server/README.md
@@ -2,6 +2,8 @@
 
 > **Note** this package is not meant to be used outside of cypress component testing.
 
+Install `@cypress/vue` or `@cypress/react` to get this package working properly
+
 ## Responsibilities
 
 - Make a `webpack.config` from the users setup