Merge remote-tracking branch 'origin/main' into fix/upgrade-glob

Author: mrstork

.circleci/config.yml

@@ -49,7 +49,7 @@ workflows:
 executors:
   node:
     docker:
-      - image: cimg/node:18.20.7
+      - image: cimg/node:18.20.8
   windows:
     machine:
       image: windows-server-2019-vs2019:stable

.eslintrc.cjs

@@ -13,7 +13,7 @@ const config = {
     ecmaVersion: 'latest',
     sourceType: 'module',
   },
-  plugins: ['import', '@typescript-eslint'],
+  plugins: ['import', '@typescript-eslint', 'ava', '@vitest'],
 
   ignorePatterns: [
     // TODO: remove when they are migrated to typescript
@@ -60,6 +60,14 @@ const config = {
         },
       },
     ],
+
+    // -----------------------------------------------------------
+    // Test rules
+    'ava/no-only-test': 'error',
+    // 'ava/no-skip-test': 'error', // Uncomment once we remove all skipped tests
+    // 'vitest/no-commented-out-tests': 'error', // Uncomment once we remove all commented out tests
+    '@vitest/no-disabled-tests': 'error',
+    '@vitest/no-focused-tests': 'error',
   },
   overrides: [
     {

.github/workflows/workflow.yml

@@ -50,12 +50,12 @@ jobs:
         os: [ubuntu-24.04, macos-14, windows-2022]
         node-version: ['22']
         # Must include the minimum deno version from the `DENO_VERSION_RANGE` constant in `node/bridge.ts`.
-        deno-version: ['v1.39.0', 'v1.46.3']
+        deno-version: ['v1.39.0', 'v2.2.4']
         include:
           - os: ubuntu-24.04
             # Earliest supported version
-            node-version: '14.16.0'
-            deno-version: 'v1.46.3'
+            node-version: '18.14.0'
+            deno-version: 'v2.2.4'
       fail-fast: false
     steps:
       # Sets an output parameter if this is a release PR
@@ -76,9 +76,6 @@ jobs:
           node-version: ${{ matrix.node-version }}
           cache: 'npm'
         if: ${{ !steps.release-check.outputs.IS_RELEASE }}
-      - name: Install npm@7
-        run: npm install -g npm@7
-        if: ${{ matrix.node-version == '14.16.0' && !steps.release-check.outputs.IS_RELEASE }}
       - name: Setup Deno
         uses: denoland/setup-deno@v1
         with:
@@ -115,23 +112,23 @@ jobs:
           # We test on the oldest supported Node.js version, but only with a
           # single combination (Ubuntu)
           - os: ubuntu-24.04
-            node-version: '14.16.0'
+            node-version: '18.14.0'
             install-command: npm ci
             machine: '0'
           - os: ubuntu-24.04
-            node-version: '14.16.0'
+            node-version: '18.14.0'
             install-command: npm ci
             machine: '1'
           - os: ubuntu-24.04
-            node-version: '14.16.0'
+            node-version: '18.14.0'
             install-command: npm ci
             machine: '2'
           - os: ubuntu-24.04
-            node-version: '14.16.0'
+            node-version: '18.14.0'
             install-command: npm ci
             machine: '3'
           - os: ubuntu-24.04
-            node-version: '14.16.0'
+            node-version: '18.14.0'
             install-command: npm ci
             machine: '4'
       fail-fast: false
@@ -149,27 +146,24 @@ jobs:
         with:
           fetch-depth: 0
         if: ${{ !steps.release-check.outputs.IS_RELEASE }}
-      - name: corepack update
-        # corepack version distributed with Node.js has a problem with new package manager releases,
-        # so forcing fixed version of corepack here
-        run: npm i -g corepack --force
-      - name: setup pnpm/yarn
-        run: corepack enable
-        if: ${{ !steps.release-check.outputs.IS_RELEASE }}
       - name: Setup Deno
         uses: denoland/setup-deno@v1
         with:
-          deno-version: v1.46.3
+          deno-version: v2.2.4
         if: ${{ !steps.release-check.outputs.IS_RELEASE }}
       - name: Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
           cache: 'npm'
         if: ${{ !steps.release-check.outputs.IS_RELEASE }}
-      - name: Install npm@7
-        run: npm install -g npm@7
-        if: ${{ matrix.node-version == '14.16.0' && !steps.release-check.outputs.IS_RELEASE }}
+      - name: corepack update
+        # corepack version distributed with Node.js has a problem with new package manager releases,
+        # so forcing fixed version of corepack here
+        run: npm i -g corepack --force
+      - name: setup pnpm/yarn
+        run: corepack enable
+        if: ${{ !steps.release-check.outputs.IS_RELEASE }}
       - name: Set up Go
         uses: actions/setup-go@v5
         with:

.gitignore

@@ -9,6 +9,7 @@ coverage
 .cache
 .vscode
 .fleet
+.nx
 
 lerna-debug.log
 

.release-please-manifest.json

@@ -1,18 +1,18 @@
 {
-  "packages/build-info": "9.0.0",
-  "packages/build": "30.0.1",
-  "packages/edge-bundler": "12.3.2",
-  "packages/cache-utils": "5.2.0",
-  "packages/config": "21.0.1",
-  "packages/framework-info": "9.9.1",
-  "packages/functions-utils": "5.3.10",
-  "packages/git-utils": "5.2.0",
-  "packages/headers-parser": "8.0.0",
-  "packages/js-client": "13.3.3",
-  "packages/nock-udp": "4.0.0",
-  "packages/redirect-parser": "14.5.0",
-  "packages/run-utils": "5.2.0",
-  "packages/opentelemetry-sdk-setup": "1.2.0",
-  "packages/opentelemetry-utils": "1.3.0",
-  "packages/zip-it-and-ship-it": "10.0.1"
+  "packages/build-info": "10.0.4",
+  "packages/build": "33.2.0",
+  "packages/edge-bundler": "14.0.4",
+  "packages/cache-utils": "6.0.2",
+  "packages/config": "23.0.6",
+  "packages/framework-info": "10.0.4",
+  "packages/functions-utils": "6.0.6",
+  "packages/git-utils": "6.0.1",
+  "packages/headers-parser": "9.0.0",
+  "packages/js-client": "14.0.1",
+  "packages/nock-udp": "5.0.0",
+  "packages/redirect-parser": "15.0.1",
+  "packages/run-utils": "6.0.1",
+  "packages/opentelemetry-sdk-setup": "2.0.1",
+  "packages/opentelemetry-utils": "2.0.0",
+  "packages/zip-it-and-ship-it": "12.1.0"
 }

lerna.json

@@ -1,6 +1,4 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "useNx": true,
-  "useWorkspaces": true,
   "version": "independent"
 }

nx.json

@@ -1,27 +1,24 @@
 {
   "implicitDependencies": {
     ".c8rc.json": "*",
-    "ava.base.js": ["@netlify/build", "@netlify/config", "netlify"],
+    "ava.base.js": ["@netlify/build", "@netlify/config", "@netlify/api"],
     "package.json": "*",
     "package-lock.json": "*",
     "nx.json": "*",
     "tsconfig.base.json": "*"
   },
-  "tasksRunnerOptions": {
-    "default": {
-      "runner": "nx/tasks-runners/default",
-      "options": {
-        "cacheableOperations": ["build", "test", "test:ci"]
-      }
-    }
-  },
   "targetDefaults": {
     "build": {
       "dependsOn": ["^build"],
-      "outputs": ["{projectRoot}/lib"]
+      "outputs": ["{projectRoot}/lib"],
+      "cache": true
     },
     "test:ci": {
-      "dependsOn": ["build"]
+      "dependsOn": ["build"],
+      "cache": true
+    },
+    "test": {
+      "cache": true
     }
   }
 }