build: relocate site netlify.toml to site/ directory

Author: ndhoule

.github/workflows/verify-docs.yml

@@ -11,19 +11,22 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-      - name: Git checkout
-        uses: actions/checkout@v4
-      - name: Use Node.js
-        uses: actions/setup-node@v4
+      - uses: actions/checkout@v4
+
+      - uses: actions/setup-node@v4
         with:
-          node-version: lts/*
+          node-version: 18.14.0
           cache: npm
-      - name: Install core dependencies
+
+      - name: Install dependencies
         run: npm ci --no-audit
-      - name: Install site dependencies
-        run: npm run site:build:install
+
+      - name: Install ./site dependencies
+        run: npm ci  --prefix=site --no-audit
+
       - name: Generate docs
-        run: npm run docs
+        run: npm run --prefix=site build
+
       - name: Check for changes
         run: |
           if [ -z "$(git status --porcelain)" ]; then

CONTRIBUTING.md

@@ -24,7 +24,6 @@ promote a positive and inclusive environment.
 - [Releasing](#releasing)
 - [License](#license)
 
-
 ## Developing locally
 
 First, fork and clone the repository. If you’re not sure how to do this, please watch
@@ -33,7 +32,7 @@ First, fork and clone the repository. If you’re not sure how to do this, pleas
 Run:
 
 ```bash
-npm install && npm run site:build:install
+npm install
 ```
 
 Tests are run with:
@@ -91,11 +90,14 @@ DEBUG=true ./bin/run.js [command]
 
 ### Attaching a Debugger
 
-When debugging a project, it's super helpful to attach a debugger to the CLI. If you use VS Code, here's how you can do it:
+When debugging a project, it's super helpful to attach a debugger to the CLI. If you use VS Code, here's how you can do
+it:
 
 1. Open this repository in VS Code.
-2. Open a "JavaScript Debug Terminal" (e.g. by searching for it in the Command Palette (Shift-Cmd+P)). Every Node process that's opened in this terminal will have a debugger attached.
-3. Place a breakpoint somewhere in the CLI. You will have to place them in the compiled `.js` files as opposed to the `.ts` files.
+2. Open a "JavaScript Debug Terminal" (e.g. by searching for it in the Command Palette (Shift-Cmd+P)). Every Node
+   process that's opened in this terminal will have a debugger attached.
+3. Place a breakpoint somewhere in the CLI. You will have to place them in the compiled `.js` files as opposed to the
+   `.ts` files.
 4. In your JavaScript Debug Terminal, navigate to the project you'd like to debug.
 5. Run `/path/to/netlify/cli/bin/run.js`. The debugger should be connecting automatically.
 
@@ -113,9 +115,9 @@ A good place to start is reading the base command README and looking at the comm
 
 > If you’d like to learn more on how `netlify dev` works, check [here](./docs/netlify-dev.md)
 
-
 ### Adding or updating a command
-If you're adding a new command or updating an existing one, make sure to also add docs for it by running `npm run site:build`.
+
+If you're adding a new command or updating an existing one, make sure to also add docs for it by running `npm run docs`.
 
 This will automatically generate documentation for you that will look like the following:
 
@@ -130,17 +132,17 @@ description: A description.
 <!-- AUTO-GENERATED-CONTENT:START (GENERATE_COMMANDS_DOCS) -->
 
 <!-- AUTO-GENERATED-CONTENT:END -->
-
 ```
 
-When adding a new command, you will also need to add it to the nav sidebar manually by adding it to the `navOrder` array in `site/src/_app.js`
+When adding a new command, you will also need to add it to the nav sidebar manually by adding it to the `navOrder` array
+in `site/src/_app.js`
 
 ### Updating our documentation
 
 If documentation looks to be out of date, it is likely that the code for the command itself is not correct.
 
-To update the documentation, update the code (rather than the markdown files) and then run `npm run docs` to sync the docs. To confirm that the changes to the docs are correct, run `cd site && npm run dev:start` to run the docs locally.
-
+To update the documentation, update the code (rather than the markdown files) and then run `npm run docs` to sync the
+docs. To confirm that the changes to the docs are correct, run `cd site && npm run dev:start` to run the docs locally.
 
 ### Testing
 
@@ -200,7 +202,8 @@ We actively welcome your pull requests.
 
 ## Releasing
 
-Tag the 'release' pull request using the `automerge` label. This will merge the pull request on GitHub and publish the package to npm.
+Tag the 'release' pull request using the `automerge` label. This will merge the pull request on GitHub and publish the
+package to npm.
 
 ### Creating a prerelease
 

package-lock.json

@@ -54,16 +54,12 @@
     "e2e": "node ./tools/e2e/run.js",
     "docs": "npm run --prefix=site build",
     "watch": "c8 --reporter=lcov vitest --watch",
-    "site:build": "run-s site:build:*",
-    "site:build:install": "cd site && npm install --no-audit",
-    "site:build:assets": "cd site && npm run build",
     "postinstall-pack": "node ./scripts/postinstall.js",
     "postinstall": "npm run build && node ./scripts/postinstall.js",
     "prepublishOnly": "node ./scripts/prepare-for-publish.js",
     "certs": "openssl req -x509 -out localhost.crt -keyout localhost.key -newkey rsa:2048 -nodes -sha256 -subj \"/CN=localhost\" -extensions EXT -config certconf"
   },
   "dependencies": {
-    "@bugsnag/js": "8.2.0",
     "@fastify/static": "7.0.4",
     "@netlify/blobs": "8.1.1",
     "@netlify/build": "29.59.2",
@@ -169,6 +165,7 @@
   },
   "devDependencies": {
     "@babel/preset-react": "7.26.3",
+    "@bugsnag/js": "8.2.0",
     "@eslint/compat": "^1.2.7",
     "@eslint/js": "^9.21.0",
     "@netlify/functions": "3.0.1",

package.json

@@ -1,14 +1,8 @@
 [build]
-  # This will be run the site build
-  command = "npm run site:build"
-  # This is the directory is publishing to netlify's CDN
-  publish = "site/dist"
+  command = "pushd .. && npm ci --no-verify && popd && npm run build"
+  publish = "dist"
 
 [functions]
-  # Sets a custom directory for Netlify Functions
-  directory = "functions"
-
-  # Specifies `esbuild` for functions bundling
   node_bundler = "esbuild"
 
 #####################

netlify.toml renamed to site/netlify.toml

@@ -1,7 +1,7 @@
 import process from 'process'
 
 import Bugsnag from '@bugsnag/js'
-import { Handler } from '@netlify/functions'
+import type { Handler } from '@netlify/functions'
 
 Bugsnag.start({
   apiKey: `${process.env.NETLIFY_BUGSNAG_API_KEY}`,

functions/error-reporting.ts renamed to site/netlify/functions/error-reporting.ts

@@ -1,5 +1,3 @@
-import fetch from 'node-fetch'
-
 const TELEMETRY_SERVICE_URL = 'https://cli-telemetry.netlify.engineering'
 
 // This function is a workaround for our inability to redirect traffic to a ntl function in another site