chore: address some PR feedback and remove lingering schematic logic

Author: lindsaylevine

demo/angular.json

@@ -109,27 +109,6 @@
             }
           }
         },
-        "serverless": {
-          "builder": "@angular-devkit/build-angular:server",
-          "options": {
-            "outputPath": "dist/angular-bfdx/serverless",
-            "main": "serverless.ts",
-            "tsConfig": "tsconfig.serverless.json"
-          },
-          "configurations": {
-            "production": {
-              "outputHashing": "media",
-              "fileReplacements": [
-                {
-                  "replace": "src/environments/environment.ts",
-                  "with": "src/environments/environment.prod.ts"
-                }
-              ],
-              "sourceMap": false,
-              "optimization": true
-            }
-          }
-        },
         "server": {
           "builder": "@angular-devkit/build-angular:server",
           "options": {

package-lock.json

@@ -1,16 +1,14 @@
-const { existsSync, readFileSync } = require('fs')
-const path = require('path')
+const { join } = require('path')
+
+const { existsSync, readJsonSync } = require('fs-extra')
 
 // Get contents of project's angular.json file
-const getAngularJson = function ({ failBuild }) {
-  const siteRoot = process.cwd()
-  if (!existsSync(path.join(siteRoot, 'angular.json'))) {
+const getAngularJson = function ({ failBuild, siteRoot }) {
+  if (!existsSync(join(siteRoot, 'angular.json'))) {
     return failBuild(`No angular.json found at project root`)
   }
   try {
-    const angularJsonFile = readFileSync(path.join(siteRoot, 'angular.json'), 'utf-8')
-    const angularJson = JSON.parse(angularJsonFile)
-    return angularJson
+    return readJsonSync(join(siteRoot, 'angular.json'))
   } catch (error) {
     return failBuild(`Could not parse contents of angular.json`)
   }

src/helpers/getAngularJson.js

@@ -1,16 +1,13 @@
-const { existsSync } = require('fs')
 const { join } = require('path')
 
-const { copySync, removeSync } = require('fs-extra')
+const { copySync } = require('fs-extra')
 
 const setUpBuilderFunction = ({ FUNCTIONS_SRC }) => {
   const TEMPLATES_DIR = join('..', 'src', 'templates')
   const FUNCTIONS_DEST = join(FUNCTIONS_SRC, 'angular-builder.js')
-  if (existsSync(FUNCTIONS_DEST)) {
-    removeSync(FUNCTIONS_DEST)
-  }
+
   copySync(join(TEMPLATES_DIR, 'angularBuilder.js'), join(FUNCTIONS_SRC, 'angular-builder.js'), {
-    overwrite: false,
+    overwrite: true,
     dereference: true,
   })
 }

src/helpers/setUpBuilderFunction.js

@@ -1,12 +1,12 @@
 // Modify [functions] of netlify config
 const setUpFunctionsConfig = function ({ netlifyConfig }) {
-  // netlifyConfig.functions.node_bundler = 'esbuild'
-  // const includedDist = 'dist/netlify-serverless'
-  // if (Array.isArray(netlifyConfig.functions.included_files)) {
-  //   netlifyConfig.functions.included_files.push(includedDist)
-  // } else {
-  //   netlifyConfig.functions.included_files = [includedDist]
-  // }
+  netlifyConfig.functions.node_bundler = 'esbuild'
+  const includedDist = 'dist/netlify-serverless'
+  if (Array.isArray(netlifyConfig.functions.included_files)) {
+    netlifyConfig.functions.included_files.push(includedDist)
+  } else {
+    netlifyConfig.functions.included_files = [includedDist]
+  }
 }
 
 module.exports = setUpFunctionsConfig

src/helpers/setUpFunctionsConfig.js

@@ -6,7 +6,7 @@ const setUpRedirects = function ({ netlifyConfig }) {
   }
   netlifyConfig.redirects.push({
     from: '/*',
-    to: '/.netlify/functions/angular_builder',
+    to: '/.netlify/functions/angular-builder',
     status: '200',
   })
 }

src/helpers/setUpRedirects.js

@@ -0,0 +1,44 @@
+const { join } = require('path')
+
+const { writeJsonSync } = require('fs-extra')
+
+// Add necessary serverless script to angular.json
+const updateAngularJson = function ({ failBuild, angularJson, projectName, siteRoot }) {
+  if (!projectName) {
+    return failBuild('No value defined for projectName. Check plugin inputs in netlify.toml.')
+  }
+
+  if (!angularJson.projects[projectName]) {
+    return failBuild(`No project found in angular.json by the name of: ${projectName}.`)
+  }
+
+  try {
+    angularJson.projects[projectName].architect.serverless = {
+      builder: '@angular-devkit/build-angular:server',
+      options: {
+        outputPath: `dist/netlify-serverless/serverless`,
+        main: 'serverless.ts',
+        tsConfig: 'tsconfig.serverless.json',
+      },
+      configurations: {
+        production: {
+          outputHashing: 'media',
+          fileReplacements: [
+            {
+              replace: 'src/environments/environment.ts',
+              with: 'src/environments/environment.prod.ts',
+            },
+          ],
+          sourceMap: false,
+          optimization: true,
+        },
+      },
+    }
+    const angularJsonPath = join(siteRoot, 'angular.json')
+    writeJsonSync(angularJsonPath, angularJson)
+  } catch (error) {
+    return failBuild(`Could not update angular.json with serverless project configuration`)
+  }
+}
+
+module.exports = updateAngularJson

src/helpers/updateAngularJson.js

@@ -4,35 +4,40 @@ const getAngularJson = require('./helpers/getAngularJson')
 const setUpBuilderFunction = require('./helpers/setUpBuilderFunction')
 const setUpFunctionsConfig = require('./helpers/setUpFunctionsConfig')
 const setUpRedirects = require('./helpers/setUpRedirects')
+const updateAngularJson = require('./helpers/updateAngularJson')
 const validateAngularUniversalUsage = require('./helpers/validateAngularUniversalUsage')
 const validateNetlifyConfig = require('./helpers/validateNetlifyConfig')
-const validateSchematicWasRun = require('./helpers/validateSchematicWasRun')
 
 // Currently unsupported:
 // - monorepo structures
 
 module.exports = {
-  async onPreBuild({ netlifyConfig, utils, inputs }) {
+  async onPreBuild({ netlifyConfig, utils }) {
     const { failBuild } = utils.build
-    const { projectName } = inputs
 
     validateAngularUniversalUsage({ failBuild })
 
-    const angularJson = getAngularJson({ failBuild })
+    const siteRoot = process.cwd()
+    const angularJson = getAngularJson({ failBuild, siteRoot })
+    const projectName = angularJson.defaultProject
 
-    validateSchematicWasRun({ failBuild, angularJson, projectName })
+    updateAngularJson({ failBuild, angularJson, projectName, siteRoot })
 
     validateNetlifyConfig({ failBuild, netlifyConfig, projectName })
 
     addAngularServerlessFiles()
   },
-  async onBuild({ netlifyConfig, constants: { FUNCTIONS_SRC = 'netlify/functions' }, inputs }) {
-    copyProjectDist({ projectName: inputs.projectName })
+  async onBuild({ utils, netlifyConfig, constants: { INTERNAL_FUNCTIONS_SRC, FUNCTIONS_SRC = 'netlify/functions' } }) {
+    const { failBuild } = utils.build
+    const siteRoot = process.cwd()
+    const angularJson = getAngularJson({ failBuild, siteRoot })
+
+    copyProjectDist({ projectName: angularJson.defaultProject })
 
     setUpRedirects({ netlifyConfig })
 
     setUpFunctionsConfig({ netlifyConfig })
 
-    setUpBuilderFunction({ FUNCTIONS_SRC })
+    setUpBuilderFunction({ FUNCTIONS_SRC: INTERNAL_FUNCTIONS_SRC || FUNCTIONS_SRC })
   },
 }

src/helpers/validateSchematicWasRun.js

@@ -17,10 +17,6 @@ const indexHtml = existsSync(join(distFolder, 'index.original.html'))
   ? 'index.original.html'
   : 'index'
 
-  console.log('TESTING TESTING TESTING TESTING')
-  console.log({ rootFolder, distFolder, indexHtml, cwd: process.cwd() })
-  console.log('EXISTS', existsSync(join(distFolder, 'index.html')))
-
 // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
 app.engine(
   'html',
@@ -40,20 +36,6 @@ app.get('*', (req, res) => {
       res,
       req,
       providers: [{ provide: APP_BASE_HREF, useValue: req.baseUrl }],
-    },
-    (err: Error, html: string) => {
-      console.log({ err });
-      res
-        .status(html ? 200 : 500)
-        .send(
-          html +
-            `<!--${process.cwd()} ${readdirSync(process.cwd())} ${
-              existsSync(distFolder)
-                ? readdirSync(distFolder)
-                : distFolder + `does not exist`
-            } -->` ||
-            err.message + JSON.stringify(process.env) + ' cwd ' + process.cwd()
-        )
     }
   )
 })