From bfe8e47d2355475f28387bfec524a3bced59ef6c Mon Sep 17 00:00:00 2001 From: Nicholas Cunningham Date: Fri, 16 Jun 2023 10:00:17 -0600 Subject: [PATCH] fix(nextjs): cleanup old options for server executor (proxyConfig) (#17626) --- .../packages/next/executors/server.json | 6 ------ .../src/executors/server/custom-server.impl.ts | 18 +++--------------- packages/next/src/executors/server/schema.json | 6 ------ packages/next/src/utils/types.ts | 1 - 4 files changed, 3 insertions(+), 28 deletions(-) diff --git a/docs/generated/packages/next/executors/server.json b/docs/generated/packages/next/executors/server.json index b8f61ce2ca..c462e35e7c 100644 --- a/docs/generated/packages/next/executors/server.json +++ b/docs/generated/packages/next/executors/server.json @@ -43,12 +43,6 @@ "type": "string", "description": "Hostname on which the application is served." }, - "proxyConfig": { - "type": "string", - "description": "Path to the proxy configuration file.", - "x-completion-type": "file", - "x-deprecated": "Use the built-in rewrite feature from Next.js. See: https://nextjs.org/docs/api-reference/next.config.js/rewrites" - }, "buildLibsFromSource": { "type": "boolean", "description": "Read buildable libraries from source instead of building them separately.", diff --git a/packages/next/src/executors/server/custom-server.impl.ts b/packages/next/src/executors/server/custom-server.impl.ts index 985751af49..d360c8a605 100644 --- a/packages/next/src/executors/server/custom-server.impl.ts +++ b/packages/next/src/executors/server/custom-server.impl.ts @@ -1,16 +1,8 @@ import 'dotenv/config'; -import { - ExecutorContext, - parseTargetString, - readTargetOptions, - runExecutor, -} from '@nx/devkit'; -import { join, resolve } from 'path'; +import { ExecutorContext, parseTargetString, runExecutor } from '@nx/devkit'; +import { join } from 'path'; -import { - NextBuildBuilderOptions, - NextServeBuilderOptions, -} from '../../utils/types'; +import { NextServeBuilderOptions } from '../../utils/types'; export default async function* serveExecutor( options: NextServeBuilderOptions, @@ -26,10 +18,6 @@ export default async function* serveExecutor( // Setting port that the custom server should use. (process.env as any).PORT = options.port; - const buildOptions = readTargetOptions( - parseTargetString(options.buildTarget, context.projectGraph), - context - ); const projectRoot = context.projectGraph.nodes[context.projectName].data.root; yield* runCustomServer(projectRoot, options, context); diff --git a/packages/next/src/executors/server/schema.json b/packages/next/src/executors/server/schema.json index f9636c6282..13f094bbab 100644 --- a/packages/next/src/executors/server/schema.json +++ b/packages/next/src/executors/server/schema.json @@ -40,12 +40,6 @@ "type": "string", "description": "Hostname on which the application is served." }, - "proxyConfig": { - "type": "string", - "description": "Path to the proxy configuration file.", - "x-completion-type": "file", - "x-deprecated": "Use the built-in rewrite feature from Next.js. See: https://nextjs.org/docs/api-reference/next.config.js/rewrites" - }, "buildLibsFromSource": { "type": "boolean", "description": "Read buildable libraries from source instead of building them separately.", diff --git a/packages/next/src/utils/types.ts b/packages/next/src/utils/types.ts index a78c85aca4..c26de21d21 100644 --- a/packages/next/src/utils/types.ts +++ b/packages/next/src/utils/types.ts @@ -49,7 +49,6 @@ export interface NextServeBuilderOptions { buildTarget: string; customServerTarget?: string; hostname?: string; - proxyConfig?: string; buildLibsFromSource?: boolean; keepAliveTimeout?: number; turbo?: boolean;