fix: adapt publish directory based on builder

.eslintignore

@@ -1,3 +1,4 @@
 node_modules
 test
 README.md
+tests/fixtures

.gitignore

@@ -144,3 +144,4 @@ Temporary Items
 .netlify/functions
 .netlify/functions-serve
 .netlify/functions-internal
+.angular

package.json

@@ -22,6 +22,8 @@
     "pretest:fixtures": "run-s pretest:fixtures:*",
     "pretest:fixtures:non-angular-project": "cd tests/fixtures/non-angular-project && npm ci",
     "pretest:fixtures:missing-angular-deps": "cd tests/fixtures/missing-angular-deps && npm ci",
+    "pretest:fixtures:application-builder": "cd tests/fixtures/application-builder && npm ci",
+    "pretest:fixtures:browser-builder": "cd tests/fixtures/browser-builder && npm ci",
     "pretest": "run-s pretest:*",
     "test": "node --test"
   },

src/helpers/fixOutputDir.js

@@ -9,7 +9,8 @@ const fixOutputDir = async function ({ failBuild, failPlugin, siteRoot, PUBLISH_
 
   const { outputPath } = project.architect.build.options
 
-  const correctPublishDir = join(outputPath, 'browser')
+  const isApplicationBuilder = project.architect.build.builder.endsWith(':application')
+  const correctPublishDir = isApplicationBuilder ? join(outputPath, 'browser') : outputPath
   if (correctPublishDir === PUBLISH_DIR) {
     return
   }

src/helpers/validateAngularVersion.js

@@ -18,7 +18,7 @@ const validateAngularVersion = async function (root) {
   }
 
   const { version } = await readJSON(packagePath)
-  if (!satisfies(version, '^17.0.0-rc')) {
+  if (!satisfies(version, '^17.0.0-rc', { includePrerelease: true })) {
     console.warn(`This site does not seem to be using Angular 17.`)
     return false
   }

tests/fixtures/application-builder/angular.json

@@ -0,0 +1,62 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "test-browser-dir": {
+      "projectType": "application",
+      "schematics": {},
+      "root": "",
+      "sourceRoot": "src",
+      "prefix": "app",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:application",
+          "options": {
+            "outputPath": "dist/test-browser-dir",
+            "index": "src/index.html",
+            "browser": "src/main.ts",
+            "polyfills": [
+              "zone.js"
+            ],
+            "tsConfig": "tsconfig.app.json",
+            "assets": [
+              "src/favicon.ico",
+              "src/assets"
+            ],
+            "styles": [
+              "src/styles.css"
+            ],
+            "scripts": []
+          },
+          "configurations": {
+            "production": {
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "500kb",
+                  "maximumError": "1mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "2kb",
+                  "maximumError": "4kb"
+                }
+              ],
+              "outputHashing": "all"
+            },
+            "development": {
+              "optimization": false,
+              "extractLicenses": false,
+              "sourceMap": true
+            }
+          },
+          "defaultConfiguration": "production"
+        }
+      }
+    }
+  },
+  "cli": {
+    "analytics": false
+  }
+}

tests/fixtures/application-builder/netlify.toml

@@ -0,0 +1,6 @@
+[build]
+  command="npm run build"
+  ignore="exit 1" ## always build, there might be changes in the plugin
+
+[[plugins]]
+  package="@netlify/angular-runtime"