Publish Stable

- vercel@28.16.1

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vercel",
-  "version": "28.16.0",
+  "version": "28.16.1",
   "preferGlobal": true,
   "license": "Apache-2.0",
   "description": "The command-line interface for Vercel",

packages/cli/src/commands/build.ts

@@ -751,12 +751,12 @@ function mergeImages(
 }
 
 function mergeCrons(
-  crons: BuildOutputConfig['crons'],
+  crons: BuildOutputConfig['crons'] = [],
   buildResults: Iterable<BuildResult | BuildOutputConfig>
 ): BuildOutputConfig['crons'] {
   for (const result of buildResults) {
     if ('crons' in result && result.crons) {
-      crons = Object.assign({}, crons, result.crons);
+      crons = crons.concat(result.crons);
     }
   }
   return crons;

packages/cli/test/fixtures/unit/commands/build/with-cron-merge/.vercel/project.json

@@ -0,0 +1,7 @@
+{
+  "orgId": ".",
+  "projectId": ".",
+  "settings": {
+    "framework": null
+  }
+}

packages/cli/test/fixtures/unit/commands/build/with-cron-merge/build.js

@@ -0,0 +1,9 @@
+const fs = require('fs');
+const path = require('path');
+
+fs.rmSync(path.join(__dirname, '.vercel', 'output'), { recursive: true });
+fs.mkdirSync(path.join(__dirname, '.vercel', 'output'));
+fs.copyFileSync(
+  path.join(__dirname, 'output', 'config.json'),
+  path.join(__dirname, '.vercel', 'output', 'config.json')
+);

packages/cli/test/fixtures/unit/commands/build/with-cron-merge/index.html

@@ -0,0 +1 @@
+<h1>Vercel</h1>

packages/cli/test/fixtures/unit/commands/build/with-cron-merge/output/config.json

@@ -0,0 +1,9 @@
+{
+  "version": 3,
+  "crons": [
+    {
+      "path": "/api/cron-job-build-output",
+      "schedule": "0 0 * * *"
+    }
+  ]
+}

packages/cli/test/fixtures/unit/commands/build/with-cron-merge/package.json

@@ -0,0 +1,5 @@
+{
+  "scripts": {
+    "build": "node build"
+  }
+}

packages/cli/test/fixtures/unit/commands/build/with-cron-merge/vercel.json

@@ -0,0 +1,8 @@
+{
+  "crons": [
+    {
+      "path": "/api/cron-job",
+      "schedule": "0 0 * * *"
+    }
+  ]
+}

packages/cli/test/fixtures/unit/commands/build/with-cron/api/cron-job.js

@@ -0,0 +1,3 @@
+export default function (req, res) {
+  res.send('Hello from cron job!');
+}

packages/cli/test/unit/commands/build/index.test.ts

@@ -1124,6 +1124,32 @@ describe('build', () => {
     }
   });
 
+  it('should merge crons property from build output with vercel.json crons property', async () => {
+    const cwd = fixture('with-cron-merge');
+    const output = join(cwd, '.vercel', 'output');
+
+    try {
+      process.chdir(cwd);
+      const exitCode = await build(client);
+      expect(exitCode).toBe(0);
+
+      const config = await fs.readJSON(join(output, 'config.json'));
+      expect(config).toHaveProperty('crons', [
+        {
+          path: '/api/cron-job',
+          schedule: '0 0 * * *',
+        },
+        {
+          path: '/api/cron-job-build-output',
+          schedule: '0 0 * * *',
+        },
+      ]);
+    } finally {
+      process.chdir(originalCwd);
+      delete process.env.__VERCEL_BUILD_RUNNING;
+    }
+  });
+
   describe('should find packages with different main/module/browser keys', function () {
     let output: string;