From c60f89007bef12463bad41e14d7d6ad087c2fab7 Mon Sep 17 00:00:00 2001 From: Victor Berchet Date: Mon, 4 Nov 2024 15:51:29 +0100 Subject: [PATCH] fix: fix CI errors Update the lock file Format the files --- examples/middleware/app/layout.tsx | 6 +----- packages/cloudflare/src/cli/build/index.ts | 17 +++++++++-------- packages/cloudflare/src/cli/templates/worker.ts | 1 - pnpm-lock.yaml | 9 ++------- 4 files changed, 12 insertions(+), 21 deletions(-) diff --git a/examples/middleware/app/layout.tsx b/examples/middleware/app/layout.tsx index 81e02ec..4036c99 100644 --- a/examples/middleware/app/layout.tsx +++ b/examples/middleware/app/layout.tsx @@ -1,10 +1,6 @@ import type { Metadata } from "next"; -export default function RootLayout({ - children, -}: { - children: React.ReactNode; -}) { +export default function RootLayout({ children }: { children: React.ReactNode }) { return ( {children} diff --git a/packages/cloudflare/src/cli/build/index.ts b/packages/cloudflare/src/cli/build/index.ts index a7c5b85..124c96b 100644 --- a/packages/cloudflare/src/cli/build/index.ts +++ b/packages/cloudflare/src/cli/build/index.ts @@ -1,18 +1,19 @@ import { cpSync } from "node:fs"; -import { dirname, join } from "node:path"; import { createRequire } from "node:module"; +import { dirname, join } from "node:path"; -import type { ProjectOptions } from "../config"; -import { containsDotNextDir, getConfig } from "../config"; -import { buildWorker } from "./build-worker"; -import { printHeader, showWarningOnWindows } from "@opennextjs/aws/build/utils.js"; -import { compileOpenNextConfig } from "@opennextjs/aws/build/compileConfig.js"; -import logger from "@opennextjs/aws/logger.js"; -import * as buildHelper from "@opennextjs/aws/build/helper.js"; import { buildNextjsApp, setStandaloneBuildMode } from "@opennextjs/aws/build/buildNextApp.js"; +import { compileOpenNextConfig } from "@opennextjs/aws/build/compileConfig.js"; import { createMiddleware } from "@opennextjs/aws/build/createMiddleware.js"; +import * as buildHelper from "@opennextjs/aws/build/helper.js"; +import { printHeader, showWarningOnWindows } from "@opennextjs/aws/build/utils.js"; +import logger from "@opennextjs/aws/logger.js"; import type { OpenNextConfig } from "@opennextjs/aws/types/open-next.js"; +import type { ProjectOptions } from "../config"; +import { containsDotNextDir, getConfig } from "../config"; +import { buildWorker } from "./build-worker"; + /** * Builds the application in a format that can be passed to workerd * diff --git a/packages/cloudflare/src/cli/templates/worker.ts b/packages/cloudflare/src/cli/templates/worker.ts index 7bcc4c1..a531ee3 100644 --- a/packages/cloudflare/src/cli/templates/worker.ts +++ b/packages/cloudflare/src/cli/templates/worker.ts @@ -8,7 +8,6 @@ import { MockedResponse } from "next/dist/server/lib/mock-request"; import type { NodeRequestHandler } from "next/dist/server/next-server"; import type { CloudflareContext } from "../../api"; - // @ts-expect-error: resolved by wrangler build import { handler as middlewareHandler } from "./middleware/handler.mjs"; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index cd2c4db..db29fa9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -198,8 +198,8 @@ importers: specifier: 'catalog:' version: 1.47.0 '@types/node': - specifier: 18.0.0 - version: 18.0.0 + specifier: 'catalog:' + version: 22.2.0 '@types/react': specifier: 'catalog:' version: 18.3.3 @@ -2119,9 +2119,6 @@ packages: '@types/node@12.20.55': resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} - '@types/node@18.0.0': - resolution: {integrity: sha512-cHlGmko4gWLVI27cGJntjs/Sj8th9aYwplmZFwmmgYQQvL5NUsgVJG7OddLvNfLqYS31KFN0s3qlaD9qCaxACA==} - '@types/node@20.14.12': resolution: {integrity: sha512-r7wNXakLeSsGT0H1AU863vS2wa5wBOK4bWMjZz2wj+8nBx+m5PeIn0k8AloSLpRuiwdRQZwarZqHE4FNArPuJQ==} @@ -7134,8 +7131,6 @@ snapshots: '@types/node@12.20.55': {} - '@types/node@18.0.0': {} - '@types/node@20.14.12': dependencies: undici-types: 5.26.5