feat: support new monorepo setup

Author: eduardoboucas

demos/default/netlify.toml

@@ -1,17 +1,17 @@
 [build]
-command = "next build"
-publish = ".next"
-ignore = "if [ $CACHED_COMMIT_REF == $COMMIT_REF ]; then (exit 1); else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF ../..; fi;"
+command = "npm --workspace default-demo run build"
+publish = "/demos/default/.next"
 
+# ignore = "if [ $CACHED_COMMIT_REF == $COMMIT_REF ]; then (exit 1); else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF ../..; fi;"
 [build.environment]
 # cache Cypress binary in local "node_modules" folder
 # so Netlify caches it
 CYPRESS_CACHE_FOLDER = "../node_modules/.CypressBinary"
 # set TERM variable for terminal output
-TERM = "xterm"
-NODE_VERSION = "16.15.1"
-NEXT_SPLIT_API_ROUTES = "true"
 NEXT_BUNDLE_BASED_ON_NFT_FILES = "true"
+NEXT_SPLIT_API_ROUTES = "true"
+NODE_VERSION = "16.15.1"
+TERM = "xterm"
 
 [[headers]]
 for = "/_next/image/*"
@@ -28,4 +28,4 @@ package = "@netlify/plugin-nextjs"
 package = "@netlify/plugin-local-install-core"
 
 [[plugins]]
-package = "../plugin-wrapper"
+package = "/demos/plugin-wrapper"

packages/runtime/src/helpers/functions.ts

@@ -64,7 +64,7 @@ export const generateFunctions = async (
   ssrLambdas: SSRLambda[],
 ): Promise<void> => {
   const publish = resolve(PUBLISH_DIR)
-  const functionsDir = resolve(INTERNAL_FUNCTIONS_SRC || FUNCTIONS_SRC)
+  const functionsDir = resolve(appDir, INTERNAL_FUNCTIONS_SRC || FUNCTIONS_SRC)
   const functionDir = join(functionsDir, HANDLER_FUNCTION_NAME)
   const publishDir = relative(functionDir, publish)
 
@@ -173,13 +173,16 @@ export const generatePagesResolver = async ({
   INTERNAL_FUNCTIONS_SRC,
   FUNCTIONS_SRC = DEFAULT_FUNCTIONS_SRC,
   PUBLISH_DIR,
+  // @ts-expect-error TODO: The types need to be updated:
+  // https://github.com/netlify/build/blob/ad77b62e524381a5952535dacdda76b28f77cd43/packages/build/types/netlify_plugin_constants.d.ts#L1
+  PACKAGE_PATH = '',
 }: NetlifyPluginConstants): Promise<void> => {
   const functionsPath = INTERNAL_FUNCTIONS_SRC || FUNCTIONS_SRC
 
-  const jsSource = await getResolverForPages(PUBLISH_DIR)
+  const jsSource = await getResolverForPages(PUBLISH_DIR, PACKAGE_PATH)
 
-  await writeFile(join(functionsPath, ODB_FUNCTION_NAME, 'pages.js'), jsSource)
-  await writeFile(join(functionsPath, HANDLER_FUNCTION_NAME, 'pages.js'), jsSource)
+  await writeFile(join(PACKAGE_PATH, functionsPath, ODB_FUNCTION_NAME, 'pages.js'), jsSource)
+  await writeFile(join(PACKAGE_PATH, functionsPath, HANDLER_FUNCTION_NAME, 'pages.js'), jsSource)
 }
 
 // Move our next/image function into the correct functions directory

packages/runtime/src/templates/getPageResolver.ts

@@ -43,8 +43,8 @@ export const getResolverForDependencies = ({
   `
 }
 
-export const getResolverForPages = async (publish: string) => {
-  const functionDir = resolve('.netlify', 'functions', HANDLER_FUNCTION_NAME)
+export const getResolverForPages = async (publish: string, packagePath: string) => {
+  const functionDir = resolve(packagePath, '.netlify', 'functions', HANDLER_FUNCTION_NAME)
   const dependencies = await getAllPageDependencies(publish)
   return getResolverForDependencies({ dependencies, functionDir })
 }