Skip to content

Commit

Permalink
Fixed warning. Moved resolutions to the root of the workspace
Browse files Browse the repository at this point in the history
  • Loading branch information
tsiotska committed Sep 13, 2023
2 parents 85e8de0 + d1f732c commit c5fc32a
Show file tree
Hide file tree
Showing 95 changed files with 5,238 additions and 1,529 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/test-e2e-composable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ jobs:
- name: Build
run: pnpm run build

- name: Build app
working-directory: ${{env.dir}}
run: pnpm run build

- name: E2E tests
working-directory: ${{env.dir}}
run: pnpm run test:e2e
Expand Down
73 changes: 73 additions & 0 deletions .github/workflows/test-e2e-ssr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
name: E2E composable + SSR

on:
push:
branches:
- main
- v4
- feat/*
- fix/*
pull_request:
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build-and-test:
runs-on: ubuntu-latest
name: Build and test

env:
dir: ./packages/test-e2e-ssr

steps:
- uses: actions/checkout@v2

- name: Install node
uses: actions/setup-node@v2
with:
node-version: 18

- name: Install pnpm
uses: pnpm/[email protected]
with:
version: 8.6.2

- name: Get pnpm store directory
id: pnpm-cache
run: |
echo "::set-output name=pnpm_cache_dir::$(pnpm store path)"
- name: Cache pnpm modules
uses: actions/cache@v2
with:
path: |
${{ steps.pnpm-cache.outputs.pnpm_cache_dir }}
~/.cache/Cypress
key: pnpm-v1-${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
pnpm-v1-${{ runner.os }}-
- name: Install dependencies
run: pnpm install

- name: Build
run: pnpm run build

- name: E2E tests
working-directory: ${{env.dir}}
run: pnpm run test:e2e

- uses: actions/upload-artifact@v2
if: failure()
with:
name: cypress-screenshots
path: ${{env.dir}}/tests/e2e/screenshots

- uses: actions/upload-artifact@v2
if: always()
with:
name: cypress-videos
path: ${{env.dir}}/tests/e2e/videos
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
node_modules/
dist/
cache/
66 changes: 66 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,71 @@
# Changelog

## v4.0.0-beta.11


### 🩹 Fixes

- Remove console.log, console log remained in code #1507 (#1507)

### 📖 Documentation

- Update README.md logo (68addf8)
- Update vitepress + fix components API menu (f545763)

### ❤️ Contributors

- Guillaume Chau ([@Akryum](http://github.com/Akryum))

## v4.0.0-beta.10


### 🚀 Enhancements

- Support effect scope outside of component, fix #1505 (#1505)
- **useLazyQuery:** Load returns Promise, fix #1486 (#1486)

### 🩹 Fixes

- Apollo components should have emits (#1504)

### 🌊 Types

- Extended "enabled" option type (#1492)

### 🏡 Chore

- Package test-e2e-composable-vue3, update deps, migrate to vite (#1488)
- Upgrade vitepress to 1.0 RC (daffd75)
- Seq test (995131d)

### ✅ Tests

- **lint:** Fix (1ac1372)
- Ssr (574bd8f)

### ❤️ Contributors

- Guillaume Chau ([@Akryum](http://github.com/Akryum))
- Viktor ([@websitevirtuoso](http://github.com/websitevirtuoso))
- Vitaliy
- Forgottencsc <[email protected]>

## v4.0.0-beta.9


### 🩹 Fixes

- Don't call debounced restart too much (1adf135)

### 🏡 Chore

- Update throttle-debounce (500cc49)
- Update deps (f47759e)

### ❤️ Contributors

- Guillaume Chau ([@Akryum](http://github.com/Akryum))

## v4.0.0-beta.8


Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ pnpm install

Go to a package in `packages`.

Build the library with watching:
Build the library:

```
pnpm run dev
pnpm run build
```

Run tests:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[![CircleCI branch](https://img.shields.io/circleci/build/github/vuejs/vue-apollo/v4.svg)](https://circleci.com/gh/vuejs/vue-apollo/tree/v4)

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


Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "vue-apollo-monorepo",
"version": "4.0.0-beta.8",
"version": "4.0.0-beta.11",
"private": true,
"scripts": {
"build": "pnpm run -r --filter \"vue-apollo*\" --filter \"@vue/apollo*\" build",
"test": "pnpm run -r test",
"test": "pnpm run -r --sequential test",
"test:unit": "pnpm run -r test:unit",
"test:types": "pnpm run -r test:types",
"lint": "eslint . --ext js,vue,ts",
Expand Down
3 changes: 2 additions & 1 deletion packages/docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
"name": "private-vue-apollo-docs",
"version": "4.0.0-alpha.16",
"private": true,
"type": "module",
"scripts": {
"dev": "vitepress dev src",
"build": "vitepress build src"
},
"devDependencies": {
"vitepress": "^0.22.4"
"vitepress": "^1.0.0-rc.13"
},
"dependencies": {
"vue-github-button": "^3.0.3"
Expand Down
Loading

0 comments on commit c5fc32a

Please sign in to comment.