Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 87 commits into from
Jul 6, 2021
Merged

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

merged 87 commits into from
Jul 6, 2021

Conversation

nogic1008
Copy link
Collaborator

@nogic1008 nogic1008 commented Jun 24, 2021 •
edited
Loading

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 and others added 30 commits March 28, 2020 17:40
@lmiller1990
chore: bump deps
4d32026
@lmiller1990
feat: use vue 3 compiler
443a928
@lmiller1990
refactor: decouple tests from vue test utils
eb65c82
@lmiller1990
fix: update tests and bump deps
2a43675
@lmiller1990
refactor: tests
8549590
@lmiller1990
chore: bump deps
13534c8
@lmiller1990
chore: bump deps
5697ee0
@lmiller1990
chore: refactor and bump deps
fc7cb1f
@lmiller1990
refactor: update test runner
c988dbb
@lmiller1990
refactor: code style
7305926
@lmiller1990
docs: update readme
6b47660
@lmiller1990
fix: force es5 for TS
b287fed
@lmiller1990
Merge pull request vuejs#250 from vuejs/lachlan/force-es5
4eb19bc 
Force ES5 for TS compilation
@lmiller1990
chore: 5.0.0-alpha.1
e0cbca7
@lmiller1990
fix: use babel to transpile template code
5e9a544
@lmiller1990
chore: update snapshots
07f71a3
@lmiller1990
chore: lint
0da767d
@haoqunjiang
fix: should require vue 3 as peer dependency
64e854f
@haoqunjiang
refactor!: support wider range of jest versions by making babel-jest …
8aef247 
…& ts-jest peer dependencies

It is mainly because ts-jest has a hard-coded jest version requirement.

And ts-jest is listed as optional, because not every project needs it.
@lmiller1990
Merge pull request vuejs#261 from sodatea/fix-vue-version
c5e69b2 
fix: should require vue 3 as peer dependency
@lmiller1990
Merge branch 'next' into refactor-jest-dependencies
d688d7d
@lmiller1990
Merge pull request vuejs#260 from vuejs/transpile-template
a0dfa5a 
Transpile template using babel
@lmiller1990
Merge pull request vuejs#262 from sodatea/refactor-jest-dependencies
198b3cc 
refactor!: support wider range of jest versions by making babel-jest & ts-jest peer dependencies
@lmiller1990
chore: 5.0.0-alpha.2
9de7917
@lmiller1990
fix: use ts compiler or babel depending on environment
efdec06
@lmiller1990
fix: update snapshots
b7ab5d6
@lmiller1990
Merge pull request vuejs#264 from vuejs/combine-ts-and-babel
f88a719 
Use transpileModule for TS and transform for babel conditionally
@lmiller1990
chore: update yarn.lock
98c5d81
@nogic1008
Add fallback for tsconfig api
251ce2a 
- pick from vuejs#246
@nogic1008
fix: convert SourceMapGenerator to RawSourceMap
6a48f76 
- pick from vuejs#275
xiaohulu and others added 22 commits March 29, 2021 11:08
@xiaohulu
feat: add support for specific tsconfig file path inside of vue-jest …
e2853d7 
…jest.config.js options (vuejs#324)

* feat: add support for specific tsconfig file path inside of vue-jest jest.config.js options (vuejs#309)
* chore: modify package name property
* style: avoid use Optional Chaining
@nogic1008
ci: setup GitHub Actions to next branch (vuejs#326)
acab463 
* ci: enable GitHub Actions (Port from vuejs#278)
* chore: update test run script (Port from vuejs#284)
* chore: remove yarn lock file
* chore(deps): bump e2e projects deps version
* chore: hoist package dependencies
@jolting
Fix coverage reports for typescript for vue3 (vuejs#331)
af80ab0 
* Fix coverage reports for typescript

* Add unit test for TsSrc
@Evertvdw @mett-development
fix: support for class component mixins (vuejs#334)
76dfcad 
Fix for using class component with mixins and also for importing
Vue from vue-property-decorator instead of vue-class-component.

Co-authored-by: Evert van der Weit <evert@mett.nl>
@0x009922
fix: process render function, exported as default (vuejs#335)
9cd1062
@lmiller1990
publish: 5.0.0-alpha.9
d086ee5
@YutamaKotaro
add css-module feature (vuejs#345)
84c15ed 
* add css-module feature

* remove excess code
@lmiller1990
chore: publish alpha 10
68ea450
@YutamaKotaro
add less relative import (vuejs#349)
eeaf205
@nogic1008
fix(deps): add missing devDependencies in e2e/ projects (for 5.x) (vu…
c590d2e 
…ejs#358)

* chore(deps-dev): add missing deps in babel-in-package

* chore(deps-dev): add missing devDeps in basic

* chore(deps-dev): add missing deps in custom-transformer

* chore(deps-dev): add missing deps in javascript

* chore(deps-dev): add missing deps in style

* chore(deps-dev): add missing deps in typescript
@nogic1008
build: move library to /packages/vue3-jest
d993fd9
@nogic1008
test: move e2e projects
ae4561f
@nogic1008
build: add package.json for monorepo
f62f762
@nogic1008
chore(deps): remove lint & e2e deps in vue3-jest
595d310
@nogic1008
test: rename e2e projects
90f8503
@nogic1008
chore(deps-dev): add vue-jest deps in e2e projects
b013c8f
@nogic1008
build: change package name to vue3-jest
3b35abe
@nogic1008
test: remove unused test runner
2dd8e6a
@nogic1008
build: support jest 26.x only
c42dc7d
@lmiller1990
Merge pull request vuejs#361 from nogic1008/build/monorepo-vue3
f10563a 
build: migrate to monorepo (for vue-jest@5)
@nogic1008
Merge branch 'master' into next
e40cc7a
@nogic1008
chore(deps): nohoist vue package
a75242e
@nogic1008 nogic1008 added this to the 27.x milestone Jun 24, 2021
@nogic1008 nogic1008 mentioned this pull request Jun 24, 2021
Closed
10 tasks
@lmiller1990
Copy link
Member

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!!

@lmiller1990 lmiller1990 self-requested a review June 28, 2021 23:53
@lmiller1990 lmiller1990 merged commit efe0488 into vuejs:master Jul 6, 2021
@nogic1008 nogic1008 deleted the next branch July 9, 2021 08:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lmiller1990 lmiller1990 Awaiting requested review from lmiller1990

Assignees
No one assigned
Labels
deployment vue3-jest Vue 3
Projects
None yet
Milestone
27.x
Development

Successfully merging this pull request may close these issues.