From 11b1226a5a60894fc10027d84f3cd1ddfa030c20 Mon Sep 17 00:00:00 2001 From: JYC Date: Sun, 15 Oct 2023 21:48:37 +0200 Subject: [PATCH] Bump kitql dependencies (#1219) --- e2e/_api/graphql.mjs | 2 +- e2e/_api/package.json | 2 +- e2e/_api/server.mjs | 6 +- e2e/kit/package.json | 4 +- e2e/kit/src/lib/utils/testsHelper.ts | 2 +- e2e/kit/src/routes/blocking/spec.ts | 2 +- .../routes/fragment-masking-partial/spec.ts | 2 +- .../pagination/query/backwards-cursor/spec.ts | 2 +- .../pagination/query/forward-cursor/spec.ts | 16 ++--- .../pagination/query/offset-variable/spec.ts | 2 +- .../routes/pagination/query/offset/spec.ts | 2 +- .../src/routes/stores/action-mutation/spec.ts | 2 +- .../stores/component_no_load_no_setup/spec.ts | 2 +- .../routes/stores/mutation-opti-list/spec.ts | 2 +- .../stores/mutation-update/+page.svelte | 2 +- .../src/routes/stores/mutation/+page.svelte | 2 +- e2e/kit/src/routes/stores/mutation/spec.ts | 2 +- .../pagination/query/forward-cursor/spec.ts | 16 ++--- .../src/routes/stores/partial/partial/spec.ts | 2 +- .../stores/prefetch-[userId]/+page.svelte | 2 +- .../routes/stores/ssr-[userId]/+page.svelte | 2 +- .../routes/subscriptions/[snapshot]/spec.ts | 2 +- e2e/kit/src/routes/subscriptions/two/spec.ts | 2 +- e2e/svelte/package.json | 2 +- e2e/svelte/src/spec.ts | 2 +- packages/houdini-svelte/package.json | 2 +- .../src/plugin/extractLoadFunction.ts | 6 +- .../plugin/transforms/componentQuery.test.ts | 2 +- .../src/plugin/transforms/componentQuery.ts | 4 +- .../src/plugin/transforms/kit/load.ts | 4 +- packages/houdini/package.json | 4 +- .../generators/typescript/documentTypes.ts | 8 +-- .../houdini/src/codegen/transforms/list.ts | 22 +++--- .../src/codegen/transforms/lists.test.ts | 2 +- .../src/codegen/validators/typeCheck.ts | 4 +- packages/houdini/src/lib/introspection.ts | 6 +- .../src/runtime/client/documentStore.test.ts | 2 +- packages/houdini/src/vite/schema.ts | 2 +- pnpm-lock.yaml | 71 +++++++++---------- 39 files changed, 108 insertions(+), 115 deletions(-) diff --git a/e2e/_api/graphql.mjs b/e2e/_api/graphql.mjs index 20e31e019..645bd8e4a 100644 --- a/e2e/_api/graphql.mjs +++ b/e2e/_api/graphql.mjs @@ -1,4 +1,4 @@ -import { sleep } from '@kitql/helper' +import { sleep } from '@kitql/helpers' import fs from 'fs-extra' import { GraphQLError } from 'graphql' import { GraphQLScalarType, Kind } from 'graphql' diff --git a/e2e/_api/package.json b/e2e/_api/package.json index be01b2472..00ef10a8a 100644 --- a/e2e/_api/package.json +++ b/e2e/_api/package.json @@ -13,7 +13,7 @@ "dependencies": { "@graphql-yoga/plugin-persisted-operations": "^1.9.1", "@envelop/core": "^3.0.6", - "@kitql/helper": "^0.5.0", + "@kitql/helpers": "^0.8.2", "fs-extra": "^10.1.0", "graphql": "^15.8.0", "graphql-relay": "^0.10.0", diff --git a/e2e/_api/server.mjs b/e2e/_api/server.mjs index e7f371ddc..ce736ea31 100755 --- a/e2e/_api/server.mjs +++ b/e2e/_api/server.mjs @@ -1,5 +1,5 @@ import { usePersistedOperations } from '@graphql-yoga/plugin-persisted-operations' -import { logGreen } from '@kitql/helper' +import { green } from '@kitql/helpers' import fs from 'fs-extra' import { useServer } from 'graphql-ws/lib/use/ws' import { createYoga, createSchema } from 'graphql-yoga' @@ -137,8 +137,8 @@ mutation AddUser { httpServer.prependOnceListener('error', (err) => { if (err.code === 'EADDRINUSE') { - console.info(logGreen(` 🧐 Port 4000 is already in use.`)) - console.info(logGreen(` ✅ API probably started by another e2e test, It's all good.`)) + console.info(green(` 🧐 Port 4000 is already in use.`)) + console.info(green(` ✅ API probably started by another e2e test, It's all good.`)) process.exit(0) } }) diff --git a/e2e/kit/package.json b/e2e/kit/package.json index ab0b2734d..ef7b8912b 100644 --- a/e2e/kit/package.json +++ b/e2e/kit/package.json @@ -23,7 +23,7 @@ "format": "prettier --ignore-path .gitignore --write --plugin-search-dir=. ." }, "devDependencies": { - "@kitql/helper": "^0.5.0", + "@kitql/helpers": "^0.8.2", "@playwright/test": "1.30.0", "@sveltejs/adapter-auto": "2.0.0", "@sveltejs/kit": "1.9.3", @@ -46,7 +46,7 @@ "tslib": "^2.3.1", "typescript": "^4.9", "vite": "^4.1.4", - "vite-plugin-lib-reporter": "^0.0.6" + "vite-plugin-lib-reporter": "^0.0.7" }, "dependencies": { "graphql-ws": "^5.8.2" diff --git a/e2e/kit/src/lib/utils/testsHelper.ts b/e2e/kit/src/lib/utils/testsHelper.ts index 9557925b4..d02da06ae 100644 --- a/e2e/kit/src/lib/utils/testsHelper.ts +++ b/e2e/kit/src/lib/utils/testsHelper.ts @@ -1,5 +1,5 @@ import { routes } from './routes.js'; -import { sleep, stry } from '@kitql/helper'; +import { sleep, stry } from '@kitql/helpers'; import type { Page, Response } from '@playwright/test'; import { expect } from '@playwright/test'; diff --git a/e2e/kit/src/routes/blocking/spec.ts b/e2e/kit/src/routes/blocking/spec.ts index 7845c5c40..c3c2b3693 100644 --- a/e2e/kit/src/routes/blocking/spec.ts +++ b/e2e/kit/src/routes/blocking/spec.ts @@ -1,4 +1,4 @@ -import { sleep } from '@kitql/helper'; +import { sleep } from '@kitql/helpers'; import { expect, test } from '@playwright/test'; import { routes } from '../../lib/utils/routes.js'; import { clientSideNavigation, expect_to_be, goto } from '../../lib/utils/testsHelper.js'; diff --git a/e2e/kit/src/routes/fragment-masking-partial/spec.ts b/e2e/kit/src/routes/fragment-masking-partial/spec.ts index c9a45873f..88fa27a92 100644 --- a/e2e/kit/src/routes/fragment-masking-partial/spec.ts +++ b/e2e/kit/src/routes/fragment-masking-partial/spec.ts @@ -1,4 +1,4 @@ -import { sleep } from '@kitql/helper'; +import { sleep } from '@kitql/helpers'; import { test } from '@playwright/test'; import { routes } from '../../lib/utils/routes.js'; import { expect_to_be, goto_expect_n_gql } from '../../lib/utils/testsHelper.js'; diff --git a/e2e/kit/src/routes/pagination/query/backwards-cursor/spec.ts b/e2e/kit/src/routes/pagination/query/backwards-cursor/spec.ts index 5282cae70..e004916fc 100644 --- a/e2e/kit/src/routes/pagination/query/backwards-cursor/spec.ts +++ b/e2e/kit/src/routes/pagination/query/backwards-cursor/spec.ts @@ -30,7 +30,7 @@ test.describe('backwards cursor paginatedQuery', () => { // wait for the api response const response = await expect_1_gql(page, 'button[id=refetch]'); expect(response).toBe( - '{"data":{"usersConnection":{"edges":[{"node":{"name":"Will Smith","id":"pagination-query-backwards-cursor:5","__typename":"User"},"cursor":"YXJyYXljb25uZWN0aW9uOjQ="},{"node":{"name":"Harrison Ford","id":"pagination-query-backwards-cursor:6","__typename":"User"},"cursor":"YXJyYXljb25uZWN0aW9uOjU="},{"node":{"name":"Eddie Murphy","id":"pagination-query-backwards-cursor:7","__typename":"User"},"cursor":"YXJyYXljb25uZWN0aW9uOjY="},{"node":{"name":"Clint Eastwood","id":"pagination-query-backwards-cursor:8","__typename":"User"},"cursor":"YXJyYXljb25uZWN0aW9uOjc="}],"pageInfo":{"endCursor":"YXJyYXljb25uZWN0aW9uOjc=","hasNextPage":false,"hasPreviousPage":true,"startCursor":"YXJyYXljb25uZWN0aW9uOjQ="}}}}' + '{"data":{"usersConnection":{"edges":[{"cursor":"YXJyYXljb25uZWN0aW9uOjQ=","node":{"__typename":"User","id":"pagination-query-backwards-cursor:5","name":"Will Smith"}},{"cursor":"YXJyYXljb25uZWN0aW9uOjU=","node":{"__typename":"User","id":"pagination-query-backwards-cursor:6","name":"Harrison Ford"}},{"cursor":"YXJyYXljb25uZWN0aW9uOjY=","node":{"__typename":"User","id":"pagination-query-backwards-cursor:7","name":"Eddie Murphy"}},{"cursor":"YXJyYXljb25uZWN0aW9uOjc=","node":{"__typename":"User","id":"pagination-query-backwards-cursor:8","name":"Clint Eastwood"}}],"pageInfo":{"endCursor":"YXJyYXljb25uZWN0aW9uOjc=","hasNextPage":false,"hasPreviousPage":true,"startCursor":"YXJyYXljb25uZWN0aW9uOjQ="}}}}' ); }); diff --git a/e2e/kit/src/routes/pagination/query/forward-cursor/spec.ts b/e2e/kit/src/routes/pagination/query/forward-cursor/spec.ts index 32764f004..30b15b5f8 100644 --- a/e2e/kit/src/routes/pagination/query/forward-cursor/spec.ts +++ b/e2e/kit/src/routes/pagination/query/forward-cursor/spec.ts @@ -27,21 +27,21 @@ test.describe('forwards cursor paginatedQuery', () => { // wait for the api response let response = await expect_1_gql(page, 'button[id=next]'); expect(response).not.toContain( - '"name":"Bruce Willis","id":"pagination-query-forwards-cursor:1"' + '"id":"pagination-query-forwards-cursor:1","name":"Bruce Willis"' ); expect(response).not.toContain( - '"name":"Samuel Jackson","id":"pagination-query-forwards-cursor:2"' + '"id":"pagination-query-forwards-cursor:2","name":"Samuel Jackson"' ); - expect(response).toContain('"name":"Morgan Freeman","id":"pagination-query-forwards-cursor:3"'); - expect(response).toContain('"name":"Tom Hanks","id":"pagination-query-forwards-cursor:4"'); + expect(response).toContain('"id":"pagination-query-forwards-cursor:3","name":"Morgan Freeman"'); + expect(response).toContain('"id":"pagination-query-forwards-cursor:4","name":"Tom Hanks"'); // wait for the api response response = await expect_1_gql(page, 'button[id=refetch]'); - expect(response).toContain('"name":"Bruce Willis","id":"pagination-query-forwards-cursor:1"'); - expect(response).toContain('"name":"Samuel Jackson","id":"pagination-query-forwards-cursor:2"'); - expect(response).toContain('"name":"Morgan Freeman","id":"pagination-query-forwards-cursor:3"'); - expect(response).toContain('"name":"Tom Hanks","id":"pagination-query-forwards-cursor:4"'); + expect(response).toContain('"id":"pagination-query-forwards-cursor:1","name":"Bruce Willis"'); + expect(response).toContain('"id":"pagination-query-forwards-cursor:2","name":"Samuel Jackson"'); + expect(response).toContain('"id":"pagination-query-forwards-cursor:3","name":"Morgan Freeman"'); + expect(response).toContain('"id":"pagination-query-forwards-cursor:4","name":"Tom Hanks"'); }); test('page info tracks connection state', async ({ page }) => { diff --git a/e2e/kit/src/routes/pagination/query/offset-variable/spec.ts b/e2e/kit/src/routes/pagination/query/offset-variable/spec.ts index eeb128abf..5651db5f7 100644 --- a/e2e/kit/src/routes/pagination/query/offset-variable/spec.ts +++ b/e2e/kit/src/routes/pagination/query/offset-variable/spec.ts @@ -24,7 +24,7 @@ test.describe('offset paginatedQuery', () => { // wait for the api response const response = await expect_1_gql(page, 'button[id=refetch]'); expect(response).toBe( - '{"data":{"usersList":[{"name":"Bruce Willis","id":"pagination-query-offset-variables:1"},{"name":"Samuel Jackson","id":"pagination-query-offset-variables:2"},{"name":"Morgan Freeman","id":"pagination-query-offset-variables:3"},{"name":"Tom Hanks","id":"pagination-query-offset-variables:4"}]}}' + '{"data":{"usersList":[{"id":"pagination-query-offset-variables:1","name":"Bruce Willis"},{"id":"pagination-query-offset-variables:2","name":"Samuel Jackson"},{"id":"pagination-query-offset-variables:3","name":"Morgan Freeman"},{"id":"pagination-query-offset-variables:4","name":"Tom Hanks"}]}}' ); }); }); diff --git a/e2e/kit/src/routes/pagination/query/offset/spec.ts b/e2e/kit/src/routes/pagination/query/offset/spec.ts index c0ed2dcda..ade5ae42b 100644 --- a/e2e/kit/src/routes/pagination/query/offset/spec.ts +++ b/e2e/kit/src/routes/pagination/query/offset/spec.ts @@ -24,7 +24,7 @@ test.describe('offset paginatedQuery', () => { // wait for the api response const response = await expect_1_gql(page, 'button[id=refetch]'); expect(response).toBe( - '{"data":{"usersList":[{"name":"Bruce Willis","id":"pagination-query-offset:1"},{"name":"Samuel Jackson","id":"pagination-query-offset:2"},{"name":"Morgan Freeman","id":"pagination-query-offset:3"},{"name":"Tom Hanks","id":"pagination-query-offset:4"}]}}' + '{"data":{"usersList":[{"id":"pagination-query-offset:1","name":"Bruce Willis"},{"id":"pagination-query-offset:2","name":"Samuel Jackson"},{"id":"pagination-query-offset:3","name":"Morgan Freeman"},{"id":"pagination-query-offset:4","name":"Tom Hanks"}]}}' ); }); }); diff --git a/e2e/kit/src/routes/stores/action-mutation/spec.ts b/e2e/kit/src/routes/stores/action-mutation/spec.ts index 709797818..1572f4adb 100644 --- a/e2e/kit/src/routes/stores/action-mutation/spec.ts +++ b/e2e/kit/src/routes/stores/action-mutation/spec.ts @@ -1,4 +1,4 @@ -import { sleep } from '@kitql/helper'; +import { sleep } from '@kitql/helpers'; import { test } from '@playwright/test'; import { routes } from '../../../lib/utils/routes.js'; import { expect_to_be, goto } from '../../../lib/utils/testsHelper.js'; diff --git a/e2e/kit/src/routes/stores/component_no_load_no_setup/spec.ts b/e2e/kit/src/routes/stores/component_no_load_no_setup/spec.ts index ac8a2372d..ed59dc94a 100644 --- a/e2e/kit/src/routes/stores/component_no_load_no_setup/spec.ts +++ b/e2e/kit/src/routes/stores/component_no_load_no_setup/spec.ts @@ -1,7 +1,7 @@ import { test } from '@playwright/test'; import { routes } from '../../../lib/utils/routes.js'; import { expect_to_be, goto } from '../../../lib/utils/testsHelper.js'; -import { sleep } from '@kitql/helper'; +import { sleep } from '@kitql/helpers'; test("Components without load shouldn't subscribe to the cache", async ({ page }) => { await goto(page, routes.Stores_Component_no_load_no_setup); diff --git a/e2e/kit/src/routes/stores/mutation-opti-list/spec.ts b/e2e/kit/src/routes/stores/mutation-opti-list/spec.ts index 3afb8d38e..0f75bd046 100644 --- a/e2e/kit/src/routes/stores/mutation-opti-list/spec.ts +++ b/e2e/kit/src/routes/stores/mutation-opti-list/spec.ts @@ -1,4 +1,4 @@ -import { sleep } from '@kitql/helper'; +import { sleep } from '@kitql/helpers'; import { test } from '@playwright/test'; import { routes } from '../../../lib/utils/routes.js'; import { expect_to_be, goto, locator_click } from '../../../lib/utils/testsHelper.js'; diff --git a/e2e/kit/src/routes/stores/mutation-update/+page.svelte b/e2e/kit/src/routes/stores/mutation-update/+page.svelte index 0fb53e1b9..cc24f66ea 100644 --- a/e2e/kit/src/routes/stores/mutation-update/+page.svelte +++ b/e2e/kit/src/routes/stores/mutation-update/+page.svelte @@ -1,6 +1,6 @@