Skip to content
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

feat(vue): vetur support #22403

Merged
merged 12 commits into from
Nov 6, 2020
Merged

feat(vue): vetur support #22403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
50217a8
vetur test
liamdebeasi Oct 15, 2020
536dd01
sync with master
liamdebeasi Oct 29, 2020
9dc2a93
fix vetur
liamdebeasi Oct 29, 2020
14e7f43
add dep
liamdebeasi Oct 29, 2020
a454ff0
cleanup
liamdebeasi Oct 29, 2020
cf7d816
Fix deps for node 15
liamdebeasi Oct 29, 2020
ca9a5a2
fix core dep
liamdebeasi Oct 29, 2020
9f84894
fix vue router deps
liamdebeasi Oct 29, 2020
5c379dc
s;ync with master
liamdebeasi Nov 5, 2020
26399e9
Merge branch 'master' into vue-vetur
liamdebeasi Nov 5, 2020
74897b6
sync
liamdebeasi Nov 5, 2020
f92c89b
Sync
liamdebeasi Nov 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ jobs:
- attach_workspace:
at: /tmp/workspace
- run:
command: npm install --legacy-peer-deps
command: npm install
working_directory: /tmp/workspace/packages/vue
- run:
command: sudo npm link
Expand All @@ -208,7 +208,7 @@ jobs:
- attach_workspace:
at: /tmp/workspace
- run:
command: npm install --legacy-peer-deps
command: npm install
working_directory: /tmp/workspace/packages/vue-router
- run:
command: sudo npm link
Expand Down
8 changes: 4 additions & 4 deletions packages/vue-router/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@
"@ionic/vue": "5.4.1",
"@types/jest": "^26.0.13",
"@types/node": "^14.10.1",
"jest": "^26.4.2",
"jest": "^26.6.1",
"rimraf": "^3.0.2",
"rollup": "^2.29.0",
"rollup": "^2.32.1",
"rollup-plugin-terser": "^7.0.2",
"ts-jest": "^26.3.0",
"typescript": "^3.9.7",
"ts-jest": "^26.4.3",
"typescript": "^4.0.5",
"vue": "^3.0.0",
"vue-router": "^4.0.0-beta.11"
},
Expand Down
Loading