Merge remote-tracking branch 'origin/main' into fetch-metadata

.editorconfig

@@ -4,13 +4,16 @@ root = true
 end_of_line = lf
 insert_final_newline = true
 charset = utf-8
-indent_size = 1
+indent_size = 2
 indent_style = space
 trim_trailing_whitespace = true
 max_line_length = 100
 
 [Makefile]
 indent_style = tab
 
-[.travis.yml]
-indent_size = 2
+[*.bs]
+indent_size = 1
+
+[*.py]
+indent_size = 4

.github/workflows/build.yml

@@ -0,0 +1,26 @@
+name: Build
+on:
+  pull_request:
+    branches:
+    - main
+  push:
+    branches:
+    - main
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-20.04
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 2
+    # Note: `python` will also be this version, which various scripts depend on.
+    - uses: actions/setup-python@v2
+      with:
+        python-version: 3.8
+    # Note: `make deploy` will do a deploy dry run on PRs.
+    - run: make deploy
+      env:
+        SERVER: ${{ secrets.MARQUEE_SERVER }}
+        SERVER_PUBLIC_KEY: ${{ secrets.MARQUEE_PUBLIC_KEY }}
+        SERVER_DEPLOY_KEY: ${{ secrets.MARQUEE_DEPLOY_KEY }}

.gitignore

@@ -1,6 +1,4 @@
 /fetch.spec.whatwg.org/
-/deploy_key
-/deploy_key.pub
 /deploy.sh
 /fetch.html
 /review.sh

.pr-preview.json

@@ -1,15 +1,9 @@
 {
-    "src_file": "fetch.bs",
-    "type": "bikeshed",
-    "params": {
-        "force": 1,
-        "md-status": "LS-COMMIT",
-        "md-h1": "Fetch <small>(<a href=\"{{ pull_request.html_url }}\">PR #{{ pull_request.number }}</a>)</small>",
-        "md-warning": "Commit {{ short_sha }} {{ pull_request.head.repo.html_url }}/commit/{{ sha }} replaced by {{ config.ls_url }}",
-        "md-title": "{{ config.title }} (Pull Request Snapshot #{{ pull_request.number }})",
-        "md-Text-Macro": "SNAPSHOT-LINK {{ config.back_to_ls_link }}"
-    },
-    "ls_url": "https://fetch.spec.whatwg.org/",
-    "title": "Fetch Standard",
-    "back_to_ls_link": "<a href=\"https://fetch.spec.whatwg.org/\" id=\"commit-snapshot-link\">Go to the living standard</a>"
+  "src_file": "fetch.bs",
+  "type": "bikeshed",
+  "params": {
+    "force": 1,
+    "md-status": "LS-PR",
+    "md-Text-Macro": "PR-NUMBER {{ pull_request.number }}"
+  }
 }

CONTRIBUTING.md

@@ -1 +1 @@
-Please see the [contributor guidelines](https://github.com/whatwg/meta/blob/master/CONTRIBUTING.md).
+Please see the [contributor guidelines](https://github.com/whatwg/meta/blob/main/CONTRIBUTING.md).

LICENSE

@@ -1,4 +1,4 @@
-Copyright © 2018 WHATWG (Apple, Google, Mozilla, Microsoft).
+Copyright © WHATWG (Apple, Google, Mozilla, Microsoft).
 This work is licensed under a Creative Commons Attribution 4.0 International License:
 
 Attribution 4.0 International

Makefile

@@ -1,8 +1,22 @@
+SHELL=/bin/bash -o pipefail
+.PHONY: local remote deploy review
+
 remote: fetch.bs
-	curl https://api.csswg.org/bikeshed/ -f -F file=@fetch.bs > fetch.html -F md-Text-Macro="SNAPSHOT-LINK LOCAL COPY"
+	@ (HTTP_STATUS=$$(curl https://api.csswg.org/bikeshed/ \
+	                       --output fetch.html \
+	                       --write-out "%{http_code}" \
+	                       --header "Accept: text/plain, text/html" \
+	                       -F die-on=warning \
+	                       -F md-Text-Macro="COMMIT-SHA LOCAL COPY" \
+	                       -F file=@fetch.bs) && \
+	[[ "$$HTTP_STATUS" -eq "200" ]]) || ( \
+		echo ""; cat fetch.html; echo ""; \
+		rm -f fetch.html; \
+		exit 22 \
+	);
 
 local: fetch.bs
-	bikeshed spec fetch.bs fetch.html --md-Text-Macro="SNAPSHOT-LINK LOCAL COPY"
+	bikeshed spec fetch.bs fetch.html --md-Text-Macro="COMMIT-SHA LOCAL COPY"
 
 deploy: fetch.bs
 	curl --remote-name --fail https://resources.whatwg.org/build/deploy.sh

PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,15 @@
+<!--
+Thank you for contributing to the Fetch Standard! Please describe the change you are making and complete the checklist below if your change is not editorial.
+-->
+
+- [ ] At least two implementers are interested (and none opposed):
+   * …
+   * …
+- [ ] [Tests](https://github.com/web-platform-tests/wpt) are written and can be reviewed and commented upon at:
+   * …
+- [ ] [Implementation bugs](https://github.com/whatwg/meta/blob/main/MAINTAINERS.md#handling-pull-requests) are filed:
+   * Chrome: …
+   * Firefox: …
+   * Safari: …
+
+(See [WHATWG Working Mode: Changes](https://whatwg.org/working-mode#changes) for more details.)

README.md

@@ -16,7 +16,7 @@ started, leave a comment on the issue or ask around [on IRC](https://whatwg.org/
 ## Pull requests
 
 In short, change `fetch.bs` and submit your patch, with a
-[good commit message](https://github.com/whatwg/meta/blob/master/COMMITTING.md). Consider
+[good commit message](https://github.com/whatwg/meta/blob/main/COMMITTING.md). Consider
 reading through the [WHATWG FAQ](https://whatwg.org/faq) if you are new here.
 
 Please add your name to the Acknowledgments section in your first pull request, even for trivial
@@ -26,7 +26,7 @@ fixes. The names are sorted lexicographically.
 
 For quick local iteration, run `make`. To verify your changes locally, run `make deploy`. See more
 in the
-[WHATWG Contributor Guidelines](https://github.com/whatwg/meta/blob/master/CONTRIBUTING.md#building).
+[WHATWG Contributor Guidelines](https://github.com/whatwg/meta/blob/main/CONTRIBUTING.md#building).
 
 ## Formatting
 
@@ -80,10 +80,43 @@ is.
 End tags must be omitted when possible and attribute values must not be quoted (if necessary, use
 double quotes).
 
+Place one newline between paragraphs (including list elements). Place three newlines before `<h2>`,
+and two newlines before other headings. This does not apply when a nested heading follows the parent
+heading.
+
+```html
+<ul>
+ <li><p>Do not place a newline above.
+
+ <li><p>Place a newline above.
+</ul>
+
+<p>Place a newline above.
+
+
+<h3>Place two newlines above.</h3>
+
+<h4>Placing one newline is OK here.</h4>
+
+
+<h4>Place two newlines above.</h4>
+```
+
+Use camel case for variable names and sentence case use spaced names for definitions, algorithms,
+etc.
+
+```html
+<p>A <a for=/>request</a> has an associated
+<dfn export for=request id=concept-request-redirect-mode>redirect mode</dfn>,...
+```
+```html
+<p>Let <var>redirectMode</var> be <var>request</var>'s <a for=request>redirect mode</a>.
+```
+
 ## Merge policy
 
 If you can commit to this repository, see the
-[maintainer guidelines](https://github.com/whatwg/meta/blob/master/MAINTAINERS.md).
+[maintainer guidelines](https://github.com/whatwg/meta/blob/main/MAINTAINERS.md).
 
 ## Tests