Merge branch 'main' into publish-ci-before-run-s

Author: Skn0tt

.github/workflows/test.yml

@@ -12,12 +12,12 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest, windows-latest]
-        node-version: [18.13.0, '*']
+        node-version: [18.18.2, '*']
         exclude:
           - os: macOS-latest
-            node-version: 18.13.0
+            node-version: 18.18.2
           - os: windows-latest
-            node-version: 18.13.0
+            node-version: 18.18.2
       fail-fast: false
 
     steps:

package.json

@@ -18,8 +18,10 @@
     "format:check:prettier": "cross-env-shell prettier --check $npm_package_config_prettier",
     "format:fix:prettier": "cross-env-shell prettier --write $npm_package_config_prettier",
     "prepublishOnly": "npm ci && npm test",
-    "pretest:demo": "cd demo && npm ci && netlify build --cwd . --offline && cd ..",
-    "pretest:fixtures": "cd tests/fixtures/non-angular-project && npm ci",
+    "pretest:demo": "cd demo && npm ci && netlify build --cwd . --offline",
+    "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": "run-s pretest:*",
     "test": "node --test"
   },

src/helpers/validateAngularVersion.js

@@ -7,9 +7,12 @@ const { satisfies } = require('semver')
  * @returns {Promise<boolean>}
  */
 const validateAngularVersion = async function (root) {
-  // eslint-disable-next-line n/no-missing-require
-  const packagePath = require.resolve('@angular/core/package.json', { paths: [root] })
-  if (!packagePath) {
+  let packagePath
+  try {
+    // eslint-disable-next-line n/no-missing-require
+    packagePath = require.resolve('@angular/core/package.json', { paths: [root] })
+  } catch {
+    // module not found
     console.warn('This site does not seem to be using Angular.')
     return false
   }

tests/fixtures/missing-angular-deps/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"

tests/fixtures/missing-angular-deps/package-lock.json

@@ -0,0 +1,12 @@
+{
+  "name": "missing-angular-deps",
+  "version": "0.0.0",
+  "scripts": {
+    "build": "echo hello!"
+  },
+  "private": true,
+  "dependencies": {
+    "@netlify/angular-runtime": "file:../../../"
+  },
+  "devDependencies": {}
+}

tests/fixtures/missing-angular-deps/package.json

@@ -3,11 +3,20 @@ import assert from 'node:assert'
 import { test } from 'node:test'
 import { fileURLToPath } from 'node:url'
 
-test('non angular project fails the plugin execution but does not error', async () => {
+test('project without angular config file fails the plugin execution but does not error', async () => {
   const { severityCode, success } = await build({
     repositoryRoot: fileURLToPath(new URL('./fixtures/non-angular-project', import.meta.url)),
   })
 
   assert.deepEqual(severityCode, 0)
   assert.deepEqual(success, true)
 })
+
+test('project with missing angular dependencies does not error', async () => {
+  const { severityCode, success } = await build({
+    repositoryRoot: fileURLToPath(new URL('./fixtures/missing-angular-deps', import.meta.url)),
+  })
+
+  assert.deepEqual(severityCode, 0)
+  assert.deepEqual(success, true)
+})