feat: support new monorepo setup

Author: Lukas Holzer

demos/base-path/netlify.toml

@@ -1,6 +1,6 @@
 [build]
-command = "next build"
-publish = ".next"
+command = "npm --workspace base-path-demo run build"
+publish = "/demos/base-path/.next"
 ignore = "if [ $CACHED_COMMIT_REF == $COMMIT_REF ]; then (exit 1); else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF ../..; fi;"
 
 [build.environment]
@@ -16,4 +16,4 @@ package = "@netlify/plugin-nextjs"
 package = "@netlify/plugin-local-install-core"
 
 [[plugins]]
-package = "../plugin-wrapper"
+package = "/demos/plugin-wrapper"

demos/canary/netlify.toml

@@ -1,6 +1,6 @@
 [build]
-command = "next build"
-publish = ".next"
+command = "npm --workspace canary run build"
+publish = "/demos/canary/.next"
 ignore = "if [ $CACHED_COMMIT_REF == $COMMIT_REF ]; then (exit 1); else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF ../..; fi;"
 
 [build.environment]
@@ -15,4 +15,4 @@ package = "@netlify/plugin-nextjs"
 package = "@netlify/plugin-local-install-core"
 
 [[plugins]]
-package = "../plugin-wrapper"
+package = "/demos/plugin-wrapper"

demos/custom-routes/netlify.toml

@@ -1,6 +1,6 @@
 [build]
-command = "next build"
-publish = ".next"
+command = "npm --workspace custom-routes run build"
+publish = "/demos/custom-routes/.next"
 ignore = "if [ $CACHED_COMMIT_REF == $COMMIT_REF ]; then (exit 1); else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF ../..; fi;"
 
 [[plugins]]
@@ -11,4 +11,4 @@ package = "@netlify/plugin-nextjs"
 package = "@netlify/plugin-local-install-core"
 
 [[plugins]]
-package = "../plugin-wrapper"
+package = "/demos/plugin-wrapper"

demos/default/netlify.toml

@@ -1,17 +1,17 @@
 [build]
-command = "next build"
-publish = ".next"
+command = "npm --workspace default-demo run build"
 ignore = "if [ $CACHED_COMMIT_REF == $COMMIT_REF ]; then (exit 1); else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF ../..; fi;"
+publish = "/demos/default/.next"
 
 [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"

demos/middleware/netlify.toml

@@ -1,6 +1,6 @@
 [build]
-command = "npm run build"
-publish = ".next"
+command = "npm --workspace middleware run build"
+publish = "/demos/middleware/.next"
 ignore = "if [ $CACHED_COMMIT_REF == $COMMIT_REF ]; then (exit 1); else git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF ../..; fi;"
 
 [build.environment]
@@ -15,7 +15,7 @@ package = "@netlify/plugin-nextjs"
 package = "@netlify/plugin-local-install-core"
 
 [[plugins]]
-package = "../plugin-wrapper"
+package = "/demos/plugin-wrapper"
 # Uncomment this if testing the built files rather than dev
 # [dev]
 # framework = "#static"

package-lock.json

@@ -53,7 +53,7 @@
     "@babel/preset-env": "^7.15.8",
     "@babel/preset-typescript": "^7.16.0",
     "@delucis/if-env": "^1.1.2",
-    "@netlify/build": "^29.20.1",
+    "@netlify/build": "^29.20.3",
     "@netlify/eslint-config-node": "^7.0.1",
     "@testing-library/cypress": "^9.0.0",
     "@types/fs-extra": "^9.0.13",

package.json

@@ -354,9 +354,11 @@ export const getEdgeFunctionPatternForPage = ({
 export const writeEdgeFunctions = async ({
   netlifyConfig,
   routesManifest,
+  constants: { PACKAGE_PATH = '' },
 }: {
   netlifyConfig: NetlifyConfig
   routesManifest: RoutesManifest
+  constants: NetlifyPluginConstants
 }) => {
   const generator = await getPluginVersion()
 
@@ -366,7 +368,7 @@ export const writeEdgeFunctions = async ({
     version: 1,
   }
 
-  const edgeFunctionRoot = resolve('.netlify', 'edge-functions')
+  const edgeFunctionRoot = resolve(PACKAGE_PATH, '.netlify', 'edge-functions')
   await emptyDir(edgeFunctionRoot)
 
   const { publish } = netlifyConfig.build

packages/runtime/src/helpers/edge.ts

@@ -58,7 +58,12 @@ export interface APILambda extends SSRLambda {
 }
 
 export const generateFunctions = async (
-  { FUNCTIONS_SRC = DEFAULT_FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC, PUBLISH_DIR }: NetlifyPluginConstants,
+  {
+    INTERNAL_FUNCTIONS_SRC,
+    PUBLISH_DIR,
+    PACKAGE_PATH = '',
+    FUNCTIONS_SRC = join(PACKAGE_PATH, DEFAULT_FUNCTIONS_SRC),
+  }: NetlifyPluginConstants,
   appDir: string,
   apiLambdas: APILambda[],
   ssrLambdas: SSRLambda[],
@@ -171,20 +176,26 @@ export const generateFunctions = async (
  */
 export const generatePagesResolver = async ({
   INTERNAL_FUNCTIONS_SRC,
-  FUNCTIONS_SRC = DEFAULT_FUNCTIONS_SRC,
   PUBLISH_DIR,
+  PACKAGE_PATH = '',
+  FUNCTIONS_SRC = join(PACKAGE_PATH, DEFAULT_FUNCTIONS_SRC),
 }: 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)
 }
 
 // Move our next/image function into the correct functions directory
 export const setupImageFunction = async ({
-  constants: { INTERNAL_FUNCTIONS_SRC, FUNCTIONS_SRC = DEFAULT_FUNCTIONS_SRC, IS_LOCAL },
+  constants: {
+    IS_LOCAL,
+    INTERNAL_FUNCTIONS_SRC,
+    PACKAGE_PATH = '',
+    FUNCTIONS_SRC = join(PACKAGE_PATH, DEFAULT_FUNCTIONS_SRC),
+  },
   imageconfig = {},
   netlifyConfig,
   basePath,

packages/runtime/src/helpers/functions.ts

@@ -213,7 +213,7 @@ const plugin: NetlifyPlugin = {
       apiLambdas,
     })
 
-    await writeEdgeFunctions({ netlifyConfig, routesManifest })
+    await writeEdgeFunctions({ constants, netlifyConfig, routesManifest })
   },
 
   async onPostBuild({

packages/runtime/src/index.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 })
 }