search

vuejs / vue-jest

Jest Vue transformer
MIT License
748 stars 156 forks source link

build: merge 'next' (Vue 3) branch into 'master' (Vue 2) for monorepo #363

Closed nogic1008 closed 3 years ago

nogic1008 commented 3 years ago

ref #355

Resolve Conflicts

  1. Copy 2 files & 4 directories
    • README.md at master
    • yarn.lock at master
    • packages/vue2-jest/ at master
    • packages/vue3-jest/ at next
    • e2e/2.x/ at master
    • e2e/3.x/ at next
  2. Run git merge master
  3. Paste copied files & directories
  4. Run yarn install
  5. Add nohoist option on package.json
lmiller1990 commented 3 years ago

Hey, thanks. Sorry I missed this - don't forget to add me as a reviewer, so I get a notification :)

I'll go over this in the next day or so - big PR, but mostly existing changes, so it won't take long. Thanks @nogic1008!!