Skip to content

Commit f77d276

Browse files
authored
Merge branch 'main' into rs/fallback-false-fix
2 parents 4f41b49 + e24534a commit f77d276

Some content is hidden

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

50 files changed

+7469
-240
lines changed

.github/workflows/fossa.yml

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,32 +6,11 @@ on:
66
- main
77
- chore/fossa-workflow # convenience branch for future fossa tweaks
88

9-
defaults:
10-
run:
11-
shell: bash
12-
139
jobs:
14-
fossa:
10+
fossa-scan:
1511
runs-on: ubuntu-latest
1612
steps:
17-
- name: Checkout
18-
uses: actions/checkout@v2
19-
- name: Download fossa cli
20-
run: |-
21-
curl -L https://github.com/fossas/fossa-cli/releases/download/v1.1.2/fossa-cli_1.1.2_linux_amd64.tar.gz > fossa-cli.tar.gz
22-
tar -xvzf fossa-cli.tar.gz
23-
mkdir -p $HOME/.local/bin
24-
echo "$HOME/.local/bin" >> $GITHUB_PATH
25-
mv fossa $HOME/.local/bin/fossa
26-
- name: Fossa init
27-
run: fossa init
28-
- name: Set env
29-
run: echo "line_number=$(grep -n "project" .fossa.yml | cut -f1 -d:)" >> $GITHUB_ENV
30-
- name: Configuration
31-
run: |-
32-
sed -i "${line_number}s|.*| project: git@github.com:${GITHUB_REPOSITORY}.git|" .fossa.yml
33-
cat .fossa.yml
34-
- name: Upload dependencies
35-
run: fossa analyze --debug
36-
env:
37-
FOSSA_API_KEY: ${{ secrets.FOSSA_API_KEY }}
13+
- uses: actions/checkout@v3
14+
- uses: fossas/fossa-action@main # Use a specific version if locking is preferred
15+
with:
16+
api-key: ${{secrets.FOSSA_API_KEY}}

.release-please-manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"packages/runtime": "4.21.2",
3-
"packages/next": "1.1.1"
2+
"packages/runtime": "4.22.0",
3+
"packages/next": "1.2.0"
44
}

demos/canary/next.config.js

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,13 @@ const nextConfig = {
88
},
99
images: {
1010
formats: ['image/avif', 'image/webp'],
11-
},
12-
experimental: {
13-
images: {
14-
remotePatterns: [
15-
{
16-
protocol: 'https',
17-
hostname: '*.githubusercontent.com',
18-
},
19-
],
20-
},
21-
},
11+
remotePatterns: [
12+
{
13+
protocol: 'https',
14+
hostname: '*.githubusercontent.com',
15+
},
16+
],
17+
}
2218
}
2319

2420
module.exports = nextConfig

0 commit comments

Comments
 (0)