Skip to content

Commit c5fc32a

Browse files
committed
Fixed warning. Moved resolutions to the root of the workspace
2 parents 85e8de0 + d1f732c commit c5fc32a

File tree

95 files changed

+5238
-1529
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+5238
-1529
lines changed

.github/workflows/test-e2e-composable.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ jobs:
5656
- name: Build
5757
run: pnpm run build
5858

59+
- name: Build app
60+
working-directory: ${{env.dir}}
61+
run: pnpm run build
62+
5963
- name: E2E tests
6064
working-directory: ${{env.dir}}
6165
run: pnpm run test:e2e

.github/workflows/test-e2e-ssr.yml

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
name: E2E composable + SSR
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- v4
8+
- feat/*
9+
- fix/*
10+
pull_request:
11+
workflow_dispatch:
12+
13+
concurrency:
14+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
15+
cancel-in-progress: true
16+
17+
jobs:
18+
build-and-test:
19+
runs-on: ubuntu-latest
20+
name: Build and test
21+
22+
env:
23+
dir: ./packages/test-e2e-ssr
24+
25+
steps:
26+
- uses: actions/checkout@v2
27+
28+
- name: Install node
29+
uses: actions/setup-node@v2
30+
with:
31+
node-version: 18
32+
33+
- name: Install pnpm
34+
uses: pnpm/[email protected]
35+
with:
36+
version: 8.6.2
37+
38+
- name: Get pnpm store directory
39+
id: pnpm-cache
40+
run: |
41+
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
42+
43+
- name: Cache pnpm modules
44+
uses: actions/cache@v2
45+
with:
46+
path: |
47+
${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
48+
~/.cache/Cypress
49+
key: pnpm-v1-${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
50+
restore-keys: |
51+
pnpm-v1-${{ runner.os }}-
52+
53+
- name: Install dependencies
54+
run: pnpm install
55+
56+
- name: Build
57+
run: pnpm run build
58+
59+
- name: E2E tests
60+
working-directory: ${{env.dir}}
61+
run: pnpm run test:e2e
62+
63+
- uses: actions/upload-artifact@v2
64+
if: failure()
65+
with:
66+
name: cypress-screenshots
67+
path: ${{env.dir}}/tests/e2e/screenshots
68+
69+
- uses: actions/upload-artifact@v2
70+
if: always()
71+
with:
72+
name: cypress-videos
73+
path: ${{env.dir}}/tests/e2e/videos

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
node_modules/
22
dist/
3+
cache/

CHANGELOG.md

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,71 @@
11
# Changelog
22

3+
## v4.0.0-beta.11
4+
5+
6+
### 🩹 Fixes
7+
8+
- Remove console.log, console log remained in code #1507 (#1507)
9+
10+
### 📖 Documentation
11+
12+
- Update README.md logo (68addf8)
13+
- Update vitepress + fix components API menu (f545763)
14+
15+
### ❤️ Contributors
16+
17+
- Guillaume Chau ([@Akryum](http://github.com/Akryum))
18+
19+
## v4.0.0-beta.10
20+
21+
22+
### 🚀 Enhancements
23+
24+
- Support effect scope outside of component, fix #1505 (#1505)
25+
- **useLazyQuery:** Load returns Promise, fix #1486 (#1486)
26+
27+
### 🩹 Fixes
28+
29+
- Apollo components should have emits (#1504)
30+
31+
### 🌊 Types
32+
33+
- Extended "enabled" option type (#1492)
34+
35+
### 🏡 Chore
36+
37+
- Package test-e2e-composable-vue3, update deps, migrate to vite (#1488)
38+
- Upgrade vitepress to 1.0 RC (daffd75)
39+
- Seq test (995131d)
40+
41+
### ✅ Tests
42+
43+
- **lint:** Fix (1ac1372)
44+
- Ssr (574bd8f)
45+
46+
### ❤️ Contributors
47+
48+
- Guillaume Chau ([@Akryum](http://github.com/Akryum))
49+
- Viktor ([@websitevirtuoso](http://github.com/websitevirtuoso))
50+
- Vitaliy
51+
- Forgottencsc <[email protected]>
52+
53+
## v4.0.0-beta.9
54+
55+
56+
### 🩹 Fixes
57+
58+
- Don't call debounced restart too much (1adf135)
59+
60+
### 🏡 Chore
61+
62+
- Update throttle-debounce (500cc49)
63+
- Update deps (f47759e)
64+
65+
### ❤️ Contributors
66+
67+
- Guillaume Chau ([@Akryum](http://github.com/Akryum))
68+
369
## v4.0.0-beta.8
470

571

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ pnpm install
1010

1111
Go to a package in `packages`.
1212

13-
Build the library with watching:
13+
Build the library:
1414

1515
```
16-
pnpm run dev
16+
pnpm run build
1717
```
1818

1919
Run tests:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[![CircleCI branch](https://img.shields.io/circleci/build/github/vuejs/vue-apollo/v4.svg)](https://circleci.com/gh/vuejs/vue-apollo/tree/v4)
77

88
<p align="center">
9-
<img src="https://cdn-images-1.medium.com/max/400/1*H9AANoofLqjS10Xd5TwRYw.png">
9+
<img src="./packages/docs/src/public/hero.svg" width="512">
1010
</p>
1111

1212

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "vue-apollo-monorepo",
3-
"version": "4.0.0-beta.8",
3+
"version": "4.0.0-beta.11",
44
"private": true,
55
"scripts": {
66
"build": "pnpm run -r --filter \"vue-apollo*\" --filter \"@vue/apollo*\" build",
7-
"test": "pnpm run -r test",
7+
"test": "pnpm run -r --sequential test",
88
"test:unit": "pnpm run -r test:unit",
99
"test:types": "pnpm run -r test:types",
1010
"lint": "eslint . --ext js,vue,ts",

packages/docs/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
"name": "private-vue-apollo-docs",
33
"version": "4.0.0-alpha.16",
44
"private": true,
5+
"type": "module",
56
"scripts": {
67
"dev": "vitepress dev src",
78
"build": "vitepress build src"
89
},
910
"devDependencies": {
10-
"vitepress": "^0.22.4"
11+
"vitepress": "^1.0.0-rc.13"
1112
},
1213
"dependencies": {
1314
"vue-github-button": "^3.0.3"

0 commit comments

Comments
 (0)