ci: run next.js deps with netlify-cli dev dep

Author: serhalp

.github/workflows/run-tests.yml

@@ -74,7 +74,7 @@ jobs:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
         run: |
           # Control netlify-cli as a regular dev dep but expose it globally for test fixtures to use
-          npm install -g "netlify-cli@$(npm list --json | jq -r ".devDependencies[\"netlify-cli\"].version")"
+          npm install -g "netlify-cli@$(npm list --json --depth=0 netlify-cli | jq -r ".dependencies[\"netlify-cli\"].version")"
           npx netlify login
       - name: Get installed Playwright version
         id: playwright-version
@@ -209,7 +209,7 @@ jobs:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
         run: |
           # Control netlify-cli as a regular dev dep but expose it globally for test fixtures to use
-          npm install -g "netlify-cli@$(npm list --json | jq -r ".devDependencies[\"netlify-cli\"].version")"
+          npm install -g "netlify-cli@$(npm list --json --depth=0 netlify-cli | jq -r ".dependencies[\"netlify-cli\"].version")"
           npx netlify login
       - name: Resolve Next.js version
         id: resolve-next-version

.github/workflows/test-e2e.yml

@@ -180,10 +180,9 @@ jobs:
         run: npm run build
         working-directory: ${{ env.runtime-path }}
 
-      # TODO(serhalp) Use the netlify-cli dev dep? It's a bit trickier here because we're running in
-      # the next.js directory, not the next-runtime directory. See https://github.com/netlify/next-runtime/pull/2484.
-      - name: add netlify cli
-        run: npm install -g netlify-cli
+      - name: Prepare Netlify CLI
+        # Control netlify-cli as a regular dev dep but expose it globally for test fixtures to use
+        run: npm install -g "netlify-cli@$(npm list --json --depth=0 netlify-cli | jq -r ".dependencies[\"netlify-cli\"].version")"
 
       - name: Install Playwright Browsers
         run: npx playwright install --with-deps

tests/netlify-deploy.ts

@@ -102,19 +102,19 @@ export class NextDeployInstance extends NextInstance {
       await fs.writeFile(path.join(this.testDir, 'netlify.toml'), toml)
     }
 
-    // ensure netlify cli is installed
+    // ensure netlify-cli is installed
     try {
-      const res = await execa('netlify', ['--version'])
+      const res = await execa('npx', ['netlify', '--version'])
       require('console').log(`Using Netlify CLI version:`, res.stdout)
     } catch (_) {
-      require('console').log(`You need to have netlify-cli installed.
+      require('console').log(`netlify-cli is not installed.
 
-      You can do this by running: "npm install -g netlify-cli@latest" or "yarn global add netlify-cli@latest"`)
+      Something went wrong. Try running \`npm install\`.`)
     }
 
     // ensure project is linked
     try {
-      await execa('ntl', ['status', '--json'])
+      await execa('npx', ['netlify', 'status', '--json'])
     } catch (err) {
       if (err.message.includes("You don't appear to be in a folder that is linked to a site")) {
         throw new Error(`Site is not linked. Please set "NETLIFY_AUTH_TOKEN" and "NETLIFY_SITE_ID"`)
@@ -132,8 +132,8 @@ export class NextDeployInstance extends NextInstance {
       : testName
 
     const deployRes = await execa(
-      'ntl',
-      ['deploy', '--build', '--json', '--message', deployTitle ?? ''],
+      'npx',
+      ['netlify', 'deploy', '--build', '--json', '--message', deployTitle ?? ''],
       {
         cwd: this.testDir,
         reject: false,