feat: add support for open-next v3

jetbridge · Nov 12, 2024 · 962b41b · 962b41b
1 parent cf1a9a8
commit 962b41b
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 12 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "open-next"]
 	path = open-next
-	url = https://github.com/sst/open-next.git
+	url = https://github.com/opennextjs/opennextjs-aws.git
diff --git a/API.md b/API.md
diff --git a/examples/app-router/src/app-router-stack.ts b/examples/app-router/src/app-router-stack.ts
@@ -11,7 +11,6 @@ export class AppRouterStack extends Stack {
 
     const nextjs = new Nextjs(this, 'nextjs', {
       nextjsPath: '../../open-next/examples/app-router',
-      buildCommand: 'npx open-next@^2 build',
       // skipBuild: true,
     });
 

diff --git a/examples/app-router/src/overrides-stack.ts b/examples/app-router/src/overrides-stack.ts
@@ -15,7 +15,7 @@ export class OverridesStack extends Stack {
 
     const nextjs = new Nextjs(this, 'nextjs', {
       nextjsPath: '../../open-next/examples/app-router',
-      buildCommand: 'npx open-next@^2 build',
+      buildCommand: 'npx @opennextjs/aws@^3 build',
       // skipBuild: true,
       overrides: {
         nextjs: {

diff --git a/open-next b/open-next
diff --git a/src/Nextjs.ts b/src/Nextjs.ts
@@ -45,8 +45,8 @@ export interface NextjsProps {
    */
   readonly basePath?: string;
   /**
-   * Optional value used to install NextJS node dependencies.
-   * @default 'npx --yes open-next@^2 build'
+   * Optional build command override value.
+   * @default 'npx @opennextjs/aws@^3 build'
    */
   readonly buildCommand?: string;
   /**

diff --git a/src/NextjsBuild.ts b/src/NextjsBuild.ts
@@ -146,8 +146,7 @@ export class NextjsBuild extends Construct {
 
   private build() {
     const buildPath = this.props.buildPath ?? this.props.nextjsPath;
-    const defaultBuildCommand = `npx open-next@^2 build ${this.props.streaming ? '--streaming' : ''}`;
-    const buildCommand = this.props.buildCommand ?? defaultBuildCommand;
+    const buildCommand = this.props.buildCommand ?? `npx @opennextjs/aws@^3 build`;
     // run build
     if (!this.props.quiet) {
       console.debug(`Running "${buildCommand}" in`, buildPath);

diff --git a/src/constants.ts b/src/constants.ts
@@ -5,4 +5,4 @@ export const NEXTJS_CACHE_DIR = 'cache';
 export const NEXTJS_BUILD_REVALIDATE_FN_DIR = 'revalidation-function';
 export const NEXTJS_BUILD_DYNAMODB_PROVIDER_FN_DIR = 'dynamodb-provider';
 export const NEXTJS_BUILD_IMAGE_FN_DIR = 'image-optimization-function';
-export const NEXTJS_BUILD_SERVER_FN_DIR = 'server-function';
+export const NEXTJS_BUILD_SERVER_FN_DIR = 'server-functions/default';