fix: handle case of outputPath not being explicitly defined

Author: pieh

src/helpers/fixOutputDir.js

@@ -1,7 +1,7 @@
 const { join } = require('path')
 
 const getAngularJson = require('./getAngularJson')
-const { getProject } = require('./setUpEdgeFunction')
+const { getBuildInformation } = require('./setUpEdgeFunction')
 
 const fixOutputDir = async function ({
   failBuild,
@@ -14,14 +14,9 @@ const fixOutputDir = async function ({
   packagePath,
 }) {
   const angularJson = getAngularJson({ failPlugin, siteRoot, workspaceType, packagePath })
-  const project = getProject(angularJson, failBuild, workspaceType === 'nx')
 
-  const { outputPath } = workspaceType === 'nx' ? project.targets.build.options : project.architect.build.options
+  const { outputPath, isApplicationBuilder } = getBuildInformation(angularJson, failBuild, workspaceType)
 
-  const isApplicationBuilder =
-    workspaceType === 'nx'
-      ? project.targets.build.executor.endsWith(':application')
-      : project.architect.build.builder.endsWith(':application')
   const correctPublishDir = isApplicationBuilder ? join(outputPath, 'browser') : outputPath
   if (correctPublishDir === PUBLISH_DIR) {
     return

src/helpers/setUpEdgeFunction.js

@@ -22,21 +22,17 @@ const getAllFilesIn = (dir) =>
 
 const toPosix = (path) => path.split(sep).join(posix.sep)
 
-const getProject = (angularJson, failBuild, isNxWorkspace = false) => {
+const getProjectName = (angularJson, failBuild) => {
   const selectedProject = process.env.ANGULAR_PROJECT
 
-  if (isNxWorkspace) {
-    return angularJson
-  }
-
   if (selectedProject) {
     const project = angularJson.projects[selectedProject]
     if (!project) {
       return failBuild(
         `Could not find project selected project "${selectedProject}" in angular.json. Please update the ANGULAR_PROJECT environment variable.`,
       )
     }
-    return project
+    return selectedProject
   }
 
   const projectNames = Object.keys(angularJson.projects)
@@ -47,14 +43,47 @@ const getProject = (angularJson, failBuild, isNxWorkspace = false) => {
     )
   }
 
+  return projectName
+}
+
+const getProject = (angularJson, failBuild, isNxWorkspace = false, projectName = null) => {
+  if (isNxWorkspace) {
+    return angularJson
+  }
+  if (!projectName) {
+    projectName = getProjectName(angularJson, failBuild)
+  }
+
   return angularJson.projects[projectName]
 }
 
 module.exports.getProject = getProject
 
+const getBuildInformation = (angularJson, failBuild, workspaceType) => {
+  const projectName = getProjectName(angularJson, failBuild)
+  const project = getProject(angularJson, failBuild, workspaceType === 'nx', projectName)
+
+  let { outputPath } = workspaceType === 'nx' ? project.targets.build.options : project.architect.build.options
+
+  if (!outputPath && workspaceType === 'default') {
+    // outputPath might not be explicitly defined in angular.json
+    // so we will try default which is dist/<project-name>
+    outputPath = join('dist', projectName)
+  }
+
+  const isApplicationBuilder =
+    workspaceType === 'nx'
+      ? project.targets.build.executor.endsWith(':application')
+      : project.architect.build.builder.endsWith(':application')
+
+  return { outputPath, isApplicationBuilder }
+}
+
+module.exports.getBuildInformation = getBuildInformation
+
 // eslint-disable-next-line max-lines-per-function
-const setUpEdgeFunction = async ({ outputDir, constants, failBuild, usedEngine }) => {
-  const serverDistRoot = join(outputDir, 'server')
+const setUpEdgeFunction = async ({ outputPath, constants, failBuild, usedEngine }) => {
+  const serverDistRoot = join(outputPath, 'server')
   if (!existsSync(serverDistRoot)) {
     console.log('No server output generated, skipping SSR setup.')
     return
@@ -66,11 +95,11 @@ const setUpEdgeFunction = async ({ outputDir, constants, failBuild, usedEngine }
   await mkdir(edgeFunctionDir, { recursive: true })
 
   const html = await readFile(join(serverDistRoot, 'index.server.html'), 'utf-8')
-  const staticFiles = getAllFilesIn(join(outputDir, 'browser')).map(
-    (path) => `/${relative(join(outputDir, 'browser'), path)}`,
+  const staticFiles = getAllFilesIn(join(outputPath, 'browser')).map(
+    (path) => `/${relative(join(outputPath, 'browser'), path)}`,
   )
 
-  const excludedPaths = ['/.netlify/*', ...staticFiles, ...Object.keys(await getPrerenderedRoutes(outputDir))].map(
+  const excludedPaths = ['/.netlify/*', ...staticFiles, ...Object.keys(await getPrerenderedRoutes(outputPath))].map(
     toPosix,
   )
 
@@ -115,7 +144,7 @@ const setUpEdgeFunction = async ({ outputDir, constants, failBuild, usedEngine }
     `
   } else if (usedEngine === 'CommonEngine') {
     const cssAssetsManifest = {}
-    const outputBrowserDir = join(outputDir, 'browser')
+    const outputBrowserDir = join(outputPath, 'browser')
     const cssFiles = getAllFilesIn(outputBrowserDir).filter((file) => file.endsWith('.css'))
 
     for (const cssFile of cssFiles) {

src/helpers/setUpHeaders.js

@@ -1,7 +1,7 @@
 const getPrerenderedRoutes = require('./getPrerenderedRoutes')
 
-const setUpHeaders = async ({ outputDir, netlifyConfig }) => {
-  const prerenderRoutes = await getPrerenderedRoutes(outputDir)
+const setUpHeaders = async ({ outputPath, netlifyConfig }) => {
+  const prerenderRoutes = await getPrerenderedRoutes(outputPath)
 
   for (const [route, routeConfig] of Object.entries(prerenderRoutes)) {
     if (routeConfig.headers) {

src/index.js

@@ -6,7 +6,7 @@ const getAngularJson = require('./helpers/getAngularJson')
 const getAngularRoot = require('./helpers/getAngularRoot')
 const { getAngularVersion } = require('./helpers/getPackageVersion')
 const { fixServerTs, revertServerTsFix } = require('./helpers/serverModuleHelpers')
-const { getProject, setUpEdgeFunction } = require('./helpers/setUpEdgeFunction')
+const { getBuildInformation, setUpEdgeFunction } = require('./helpers/setUpEdgeFunction')
 const setUpHeaders = require('./helpers/setUpHeaders')
 const validateAngularVersion = require('./helpers/validateAngularVersion')
 
@@ -60,17 +60,15 @@ module.exports = {
     const { siteRoot, workspaceType } = getAngularRoot({ failBuild, netlifyConfig, onBuild: true })
     const angularJson = getAngularJson({ failPlugin, siteRoot, workspaceType, packagePath: constants.PACKAGE_PATH })
 
-    const project = getProject(angularJson, failBuild, workspaceType === 'nx')
-    const build = workspaceType === 'nx' ? project.targets.build : project.architect.build
-    const outputDir = build?.options?.outputPath
-    if (!outputDir || !existsSync(outputDir)) {
+    const { outputPath } = getBuildInformation(angularJson, failBuild, workspaceType)
+    if (!outputPath || !existsSync(outputPath)) {
       return failBuild('Could not find build output directory')
     }
 
-    await setUpHeaders({ outputDir, netlifyConfig })
+    await setUpHeaders({ outputPath, netlifyConfig })
 
     await setUpEdgeFunction({
-      outputDir,
+      outputPath,
       constants,
       failBuild,
       usedEngine,