Skip to content

Commit a8abad3

Browse files
committed
Merge remote-tracking branch 'upstream/main'
2 parents 0e73b1d + d762f72 commit a8abad3

File tree

178 files changed

+6540
-7988
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

178 files changed

+6540
-7988
lines changed

.changeset/aggregate.mjs

Lines changed: 31 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,52 +2,50 @@ import fs from "node:fs/promises";
22
import path from "node:path";
33
import { execSync } from "node:child_process";
44

5-
const THANKLESS_COMMITTERS = ["thdxr", "fwang", "jayair"];
5+
const THANKLESS_COMMITTERS = ["thdxr", "fwang", "jayair", "conico974"];
66

77
const { version } = JSON.parse(
88
await fs.readFile("./packages/open-next/package.json"),
99
);
1010

11-
const changesets = JSON.parse(await fs.readFile(".changeset/config.json"));
12-
const packages = changesets.fixed[0];
13-
1411
const changes = new Set();
15-
for (const pkg of packages) {
16-
const changelog = path.join(
17-
"packages",
18-
pkg.split("/").at(-1),
19-
"CHANGELOG.md",
20-
);
21-
const lines = (await fs.readFile(changelog)).toString().split("\n");
22-
let start = false;
23-
for (let line of lines) {
24-
if (!start) {
25-
if (line === `## ${version}`) {
26-
start = true;
27-
continue;
28-
}
12+
13+
// We only need to look for changes in packages/open-next
14+
const changelog = path.join(
15+
"packages",
16+
"open-next",
17+
"CHANGELOG.md",
18+
);
19+
const lines = (await fs.readFile(changelog)).toString().split("\n");
20+
let start = false;
21+
for (let line of lines) {
22+
if (!start) {
23+
if (line === `## ${version}`) {
24+
start = true;
25+
continue;
2926
}
27+
}
3028

31-
if (start) {
32-
if (line.startsWith("-") || line.startsWith("*")) {
33-
if (line.includes("Updated dependencies")) continue;
34-
if (line.includes("@serverless-stack/")) continue;
35-
36-
for (const user of THANKLESS_COMMITTERS) {
37-
line = line.replace(
38-
`Thanks [@${user}](https://github.com/${user})! `,
39-
"",
40-
);
41-
}
42-
changes.add(line);
43-
continue;
44-
}
29+
if (start) {
30+
if (line.startsWith("-") || line.startsWith("*")) {
31+
if (line.includes("Updated dependencies")) continue;
32+
if (line.includes("@serverless-stack/")) continue;
4533

46-
if (line.startsWith("## ")) break;
34+
for (const user of THANKLESS_COMMITTERS) {
35+
line = line.replace(
36+
`Thanks [@${user}](https://github.com/${user})! `,
37+
"",
38+
);
39+
}
40+
changes.add(line);
41+
continue;
4742
}
43+
44+
if (line.startsWith("## ")) break;
4845
}
4946
}
5047

48+
5149
const notes = ["#### Changes", ...changes];
5250
console.log(notes.join("\n"));
5351
console.log(`::set-output name=notes::${notes.join("%0A")}`);

.changeset/config.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
{
22
"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
3-
"changelog": "@changesets/cli/changelog",
3+
"changelog": [
4+
"@changesets/changelog-github",
5+
{ "repo": "Genez-io/open-next" }
6+
],
47
"commit": false,
58
"fixed": [["@genezio/open-next"]],
69
"linked": [],

.changeset/giant-vans-shop.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@opennextjs/aws": patch
3+
---
4+
5+
Hides the x-opennext header from server requests when poweredByHeader is false in next config

.changeset/snapshot

Lines changed: 0 additions & 11 deletions
This file was deleted.

.eslintrc.cjs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ module.exports = {
1515
],
1616
"sonarjs/elseif-without-else": "warn",
1717
"sonarjs/no-duplicate-string": "warn",
18-
"sonarjs/cognitive-complexity": "warn",
18+
"sonarjs/cognitive-complexity": ["warn", 35],
1919

2020
// We add some typescript rules - The recommended rules breaks too much stuff
2121
// TODO: We should add more rules, especially around typescript types
@@ -29,9 +29,15 @@ module.exports = {
2929
],
3030

3131
"@typescript-eslint/unbound-method": "error",
32-
33-
"@typescript-eslint/no-non-null-assertion": "warn",
3432
},
33+
overrides: [
34+
{
35+
files: ["example/**/*", "examples/**/*"],
36+
rules: {
37+
"unused-imports/no-unused-vars": "off",
38+
},
39+
},
40+
],
3541
parserOptions: {
3642
project: ["./tsconfig.eslint.json", "./**/tsconfig.json"],
3743
},

.github/actions/build-docs/action.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/actions/pnpm-setup/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ runs:
66
steps:
77
# Install nodejs. https://github.com/actions/setup-node
88
- name: Setup Node.js
9-
uses: actions/setup-node@v3
9+
uses: actions/setup-node@v4
1010
with:
1111
node-version: 18.x
1212

1313
# Install pnpm. https://github.com/pnpm/action-setup
14-
- uses: pnpm/action-setup@v2
14+
- uses: pnpm/action-setup@v4
1515
with:
1616
version: 8
1717
# run_install: false
@@ -22,7 +22,7 @@ runs:
2222
run: |
2323
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
2424
25-
- uses: actions/cache@v3
25+
- uses: actions/cache@v4
2626
name: Setup pnpm cache
2727
with:
2828
path: ${{ env.STORE_PATH }}

.github/actions/test/action.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name: Unit tests
2+
description: Run unit tests and ensure code quality
3+
4+
runs:
5+
using: 'composite'
6+
steps:
7+
- name: Run tests
8+
run: pnpm test
9+
shell: bash

.github/workflows/check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v3
13+
uses: actions/checkout@v4
1414
- uses: ./.github/actions/pnpm-setup
1515
- uses: ./.github/actions/lint
16+
- uses: ./.github/actions/test
1617
- uses: ./.github/actions/build-example
17-
- uses: ./.github/actions/build-docs

.github/workflows/docs.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Deploy docs to GitHub Pages
2+
3+
on:
4+
workflow_dispatch:
5+
6+
defaults:
7+
run:
8+
working-directory: docs
9+
10+
permissions:
11+
contents: read
12+
pages: write
13+
id-token: write
14+
15+
concurrency:
16+
group: 'pages'
17+
cancel-in-progress: false
18+
19+
jobs:
20+
deploy:
21+
environment:
22+
name: github-pages
23+
url: ${{ steps.deployment.outputs.page_url }}
24+
runs-on: ubuntu-latest
25+
steps:
26+
- name: Checkout
27+
uses: actions/checkout@v4
28+
- name: Setup Pages
29+
uses: actions/configure-pages@v5
30+
- name: Upload artifact
31+
uses: actions/upload-pages-artifact@v3
32+
with:
33+
path: 'docs/'
34+
- name: Deploy to GitHub Pages
35+
id: deployment
36+
uses: actions/deploy-pages@v4

0 commit comments

Comments
 (0)