From 5cc043f23866ac23559e3f0186f63d48417d4299 Mon Sep 17 00:00:00 2001 From: Dorseuil Nicolas Date: Tue, 29 Oct 2024 13:29:51 +0100 Subject: [PATCH] remove any deps to @open-next/utils --- packages/tests-e2e/package.json | 1 - packages/tests-e2e/tests/appPagesRouter/isr.test.ts | 3 ++- packages/tests-e2e/tests/appPagesRouter/pages_isr.test.ts | 3 ++- packages/tests-e2e/tests/appPagesRouter/pages_ssr.test.ts | 3 ++- packages/tests-e2e/tests/appPagesRouter/ssr.test.ts | 3 ++- packages/tests-e2e/tests/appRouter/isr.test.ts | 3 ++- packages/tests-e2e/tests/appRouter/sse.test.ts | 3 ++- packages/tests-e2e/tests/appRouter/ssr.test.ts | 3 ++- packages/tests-e2e/tests/pagesRouter/isr.test.ts | 3 ++- packages/tests-e2e/tests/pagesRouter/ssr.test.ts | 3 ++- packages/tests-e2e/tests/utils.ts | 3 +++ packages/tests-unit/package.json | 1 - packages/tests-unit/tests/binary.test.ts | 2 +- pnpm-lock.yaml | 6 ------ 14 files changed, 22 insertions(+), 18 deletions(-) create mode 100644 packages/tests-e2e/tests/utils.ts diff --git a/packages/tests-e2e/package.json b/packages/tests-e2e/package.json index c2c20f000..50d8ab91d 100644 --- a/packages/tests-e2e/package.json +++ b/packages/tests-e2e/package.json @@ -9,7 +9,6 @@ "dependencies": {}, "devDependencies": { "@playwright/test": "1.37.0", - "@open-next/utils": "workspace:*", "start-server-and-test": "2.0.0", "ts-node": "10.9.1" }, diff --git a/packages/tests-e2e/tests/appPagesRouter/isr.test.ts b/packages/tests-e2e/tests/appPagesRouter/isr.test.ts index b2f9bae14..2e9d91ac8 100644 --- a/packages/tests-e2e/tests/appPagesRouter/isr.test.ts +++ b/packages/tests-e2e/tests/appPagesRouter/isr.test.ts @@ -1,6 +1,7 @@ -import { wait } from "@open-next/utils"; import { expect, test } from "@playwright/test"; +import { wait } from "../utils"; + test("Incremental Static Regeneration", async ({ page }) => { test.setTimeout(60000); await page.goto("/"); diff --git a/packages/tests-e2e/tests/appPagesRouter/pages_isr.test.ts b/packages/tests-e2e/tests/appPagesRouter/pages_isr.test.ts index 00887638d..4ec942f3f 100644 --- a/packages/tests-e2e/tests/appPagesRouter/pages_isr.test.ts +++ b/packages/tests-e2e/tests/appPagesRouter/pages_isr.test.ts @@ -1,6 +1,7 @@ -import { wait } from "@open-next/utils"; import { expect, test } from "@playwright/test"; +import { wait } from "../utils"; + test("Incremental Static Regeneration", async ({ page }) => { test.setTimeout(60000); await page.goto("/"); diff --git a/packages/tests-e2e/tests/appPagesRouter/pages_ssr.test.ts b/packages/tests-e2e/tests/appPagesRouter/pages_ssr.test.ts index 2c013e048..8e8af5da4 100644 --- a/packages/tests-e2e/tests/appPagesRouter/pages_ssr.test.ts +++ b/packages/tests-e2e/tests/appPagesRouter/pages_ssr.test.ts @@ -1,6 +1,7 @@ -import { wait } from "@open-next/utils"; import { expect, test } from "@playwright/test"; +import { wait } from "../utils"; + test("Server Side Render", async ({ page }) => { await page.goto("/"); await page.locator('[href="/pages_ssr"]').click(); diff --git a/packages/tests-e2e/tests/appPagesRouter/ssr.test.ts b/packages/tests-e2e/tests/appPagesRouter/ssr.test.ts index b271e3d1b..dc03e1fd5 100644 --- a/packages/tests-e2e/tests/appPagesRouter/ssr.test.ts +++ b/packages/tests-e2e/tests/appPagesRouter/ssr.test.ts @@ -1,6 +1,7 @@ -import { wait } from "@open-next/utils"; import { expect, test } from "@playwright/test"; +import { wait } from "../utils"; + test("Server Side Render", async ({ page }) => { await page.goto("/"); await page.locator('[href="/ssr"]').click(); diff --git a/packages/tests-e2e/tests/appRouter/isr.test.ts b/packages/tests-e2e/tests/appRouter/isr.test.ts index 480250830..52aadb20b 100644 --- a/packages/tests-e2e/tests/appRouter/isr.test.ts +++ b/packages/tests-e2e/tests/appRouter/isr.test.ts @@ -1,6 +1,7 @@ -import { wait } from "@open-next/utils"; import { expect, test } from "@playwright/test"; +import { wait } from "../utils"; + test("Incremental Static Regeneration", async ({ page }) => { test.setTimeout(45000); await page.goto("/"); diff --git a/packages/tests-e2e/tests/appRouter/sse.test.ts b/packages/tests-e2e/tests/appRouter/sse.test.ts index e2102b43a..b848f6239 100644 --- a/packages/tests-e2e/tests/appRouter/sse.test.ts +++ b/packages/tests-e2e/tests/appRouter/sse.test.ts @@ -1,9 +1,10 @@ // NOTE: loading.tsx is currently broken on open - next // This works locally but not on deployed apps -import { wait } from "@open-next/utils"; import { expect, test } from "@playwright/test"; +import { wait } from "../utils"; + // NOTE: We don't await page load b/c we want to see the Loading page test("Server Sent Events", async ({ page }) => { await page.goto("/"); diff --git a/packages/tests-e2e/tests/appRouter/ssr.test.ts b/packages/tests-e2e/tests/appRouter/ssr.test.ts index cd472c44f..bfdfd027b 100644 --- a/packages/tests-e2e/tests/appRouter/ssr.test.ts +++ b/packages/tests-e2e/tests/appRouter/ssr.test.ts @@ -1,9 +1,10 @@ // NOTE: loading.tsx is currently broken on open - next // This works locally but not on deployed apps -import { wait } from "@open-next/utils"; import { expect, test } from "@playwright/test"; +import { wait } from "../utils"; + // NOTE: We don't await page load b/c we want to see the Loading page test("Server Side Render and loading.tsx", async ({ page }) => { test.setTimeout(600000); diff --git a/packages/tests-e2e/tests/pagesRouter/isr.test.ts b/packages/tests-e2e/tests/pagesRouter/isr.test.ts index 160af4174..eaac0dfc0 100644 --- a/packages/tests-e2e/tests/pagesRouter/isr.test.ts +++ b/packages/tests-e2e/tests/pagesRouter/isr.test.ts @@ -1,6 +1,7 @@ -import { wait } from "@open-next/utils"; import { expect, test } from "@playwright/test"; +import { wait } from "../utils"; + test("Incremental Static Regeneration", async ({ page }) => { test.setTimeout(45000); await page.goto("/"); diff --git a/packages/tests-e2e/tests/pagesRouter/ssr.test.ts b/packages/tests-e2e/tests/pagesRouter/ssr.test.ts index 0928b7dad..b518c872d 100644 --- a/packages/tests-e2e/tests/pagesRouter/ssr.test.ts +++ b/packages/tests-e2e/tests/pagesRouter/ssr.test.ts @@ -1,6 +1,7 @@ -import { wait } from "@open-next/utils"; import { expect, test } from "@playwright/test"; +import { wait } from "../utils"; + test("Server Side Render", async ({ page }) => { await page.goto("/"); await page.locator('[href="/ssr/"]').click(); diff --git a/packages/tests-e2e/tests/utils.ts b/packages/tests-e2e/tests/utils.ts new file mode 100644 index 000000000..4e532a464 --- /dev/null +++ b/packages/tests-e2e/tests/utils.ts @@ -0,0 +1,3 @@ +export function wait(ms: number) { + return new Promise((resolve) => setTimeout(resolve, ms)); +} diff --git a/packages/tests-unit/package.json b/packages/tests-unit/package.json index 45f976425..1aca6057c 100644 --- a/packages/tests-unit/package.json +++ b/packages/tests-unit/package.json @@ -8,7 +8,6 @@ "test": "vitest run --coverage" }, "dependencies": { - "@open-next/utils": "workspace:*", "@opennextjs/aws": "workspace:*" }, "devDependencies": { diff --git a/packages/tests-unit/tests/binary.test.ts b/packages/tests-unit/tests/binary.test.ts index 0f8fd4a62..1562716e1 100644 --- a/packages/tests-unit/tests/binary.test.ts +++ b/packages/tests-unit/tests/binary.test.ts @@ -1,4 +1,4 @@ -import { isBinaryContentType } from "@open-next/utils"; +import { isBinaryContentType } from "@opennextjs/aws/adapters/binary.js"; describe("isBinaryContentType", () => { const tests = [ diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3d4e95164..da9033f3d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -232,9 +232,6 @@ importers: packages/tests-e2e: devDependencies: - '@open-next/utils': - specifier: workspace:* - version: link:../utils '@playwright/test': specifier: 1.37.0 version: 1.37.0 @@ -247,9 +244,6 @@ importers: packages/tests-unit: dependencies: - '@open-next/utils': - specifier: workspace:* - version: link:../utils '@opennextjs/aws': specifier: workspace:* version: link:../open-next