Skip to content

Commit 9db4cf0

Browse files
committed
Merge remote-tracking branch 'origin/main' into michalpiechowiak/frb-1629-intermittent-proxy-timeouts-on-runtime-v594
2 parents cff9f73 + 30803ef commit 9db4cf0

File tree

5 files changed

+33
-19
lines changed

5 files changed

+33
-19
lines changed

.github/workflows/lint.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,8 @@ jobs:
2323
cache: 'npm'
2424
cache-dependency-path: '**/package-lock.json'
2525
- run: npm ci
26-
- name: Prettify code
27-
uses: creyD/prettier_action@v4.3
28-
with:
29-
prettier_options: --write .
30-
only_changed: true
31-
commit_message: 'chore: format with prettier'
32-
clean_node_folder: false
33-
26+
- name: Check Format
27+
run: npm run format:check
3428
- name: Lint
3529
# github adds inline annotation for compact or stylish format
3630
# which is different than our default for local usage

LICENSE

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
Copyright (c) 2023 Netlify <team@netlify.com>
2+
3+
MIT License
4+
5+
Permission is hereby granted, free of charge, to any person obtaining
6+
a copy of this software and associated documentation files (the
7+
"Software"), to deal in the Software without restriction, including
8+
without limitation the rights to use, copy, modify, merge, publish,
9+
distribute, sublicense, and/or sell copies of the Software, and to
10+
permit persons to whom the Software is furnished to do so, subject to
11+
the following conditions:
12+
13+
The above copyright notice and this permission notice shall be
14+
included in all copies or substantial portions of the Software.
15+
16+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
19+
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
20+
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
21+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
22+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package-lock.json

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"@netlify/blobs": "^8.1.0",
5353
"@netlify/build": "^29.55.4",
5454
"@netlify/edge-bundler": "^12.2.3",
55-
"@netlify/edge-functions": "^2.11.0",
55+
"@netlify/edge-functions": "^2.11.1",
5656
"@netlify/eslint-config-node": "^7.0.1",
5757
"@netlify/functions": "^3.0.0",
5858
"@netlify/serverless-functions-api": "^1.30.1",

tests/test-config.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,7 @@
124124
{
125125
"file": "test/e2e/app-dir/app-static/app-static.test.ts",
126126
"reason": "Uses CLI output",
127-
"tests": [
128-
"app-dir static/dynamic handling should warn for too many cache tags"
129-
]
127+
"tests": ["app-dir static/dynamic handling should warn for too many cache tags"]
130128
},
131129
{
132130
"file": "test/e2e/app-dir/parallel-routes-and-interception/parallel-routes-and-interception.test.ts",

0 commit comments

Comments
 (0)