diff --git a/.editorconfig b/.editorconfig
index 8738948..9947ad1 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,6 +7,14 @@ charset = utf-8
indent_size = 2
indent_style = space
trim_trailing_whitespace = true
+max_line_length = 100
[Makefile]
indent_style = tab
+
+[*.bs]
+indent_size = 2
+max_line_length = off
+
+[*.py]
+indent_size = 4
diff --git a/.github/ISSUE_TEMPLATE/0-new-issue.yml b/.github/ISSUE_TEMPLATE/0-new-issue.yml
new file mode 100644
index 0000000..9ce01b2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/0-new-issue.yml
@@ -0,0 +1,17 @@
+name: New issue
+description: File a new issue against the URL Pattern Standard.
+body:
+ - type: markdown
+ attributes:
+ value: |
+ Before filling out this form, please familiarize yourself with the [Code of Conduct](https://whatwg.org/code-of-conduct). You might also find the [FAQ](https://whatwg.org/faq) and [Working Mode](https://whatwg.org/working-mode) useful.
+
+ If at any point you have questions, please reach out to us on [Chat](https://whatwg.org/chat).
+ - type: textarea
+ attributes:
+ label: "What is the issue with the URL Pattern Standard?"
+ validations:
+ required: true
+ - type: markdown
+ attributes:
+ value: "Thank you for taking the time to improve the URL Pattern Standard!"
diff --git a/.github/ISSUE_TEMPLATE/1-new-feature.yml b/.github/ISSUE_TEMPLATE/1-new-feature.yml
new file mode 100644
index 0000000..5380680
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/1-new-feature.yml
@@ -0,0 +1,27 @@
+name: New feature
+description: Request a new feature in the URL Pattern Standard.
+labels: ["addition/proposal", "needs implementer interest"]
+body:
+ - type: markdown
+ attributes:
+ value: |
+ Before filling out this form, please familiarize yourself with the [Code of Conduct](https://whatwg.org/code-of-conduct), [FAQ](https://whatwg.org/faq), and [Working Mode](https://whatwg.org/working-mode). They help with setting expectations and making sure you know what is required. The FAQ ["How should I go about proposing new features to WHATWG standards?"](https://whatwg.org/faq#adding-new-features) is especially relevant.
+
+ If at any point you have questions, please reach out to us on [Chat](https://whatwg.org/chat).
+ - type: textarea
+ attributes:
+ label: "What problem are you trying to solve?"
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: "What solutions exist today?"
+ - type: textarea
+ attributes:
+ label: "How would you solve it?"
+ - type: textarea
+ attributes:
+ label: "Anything else?"
+ - type: markdown
+ attributes:
+ value: "Thank you for taking the time to improve the URL Pattern Standard!"
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..70e8d0d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+ - name: Chat
+ url: https://whatwg.org/chat
+ about: Please do reach out with questions and feedback!
+ - name: Stack Overflow
+ url: https://stackoverflow.com/
+ about: If you're having trouble building a web page, this is not the right repository. Consider asking your question on Stack Overflow instead.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9a665df..af3476e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -9,14 +9,17 @@ on:
jobs:
build:
name: Build
- runs-on: ubuntu-latest
+ runs-on: ubuntu-22.04
steps:
- - uses: actions/checkout@v2
- - name: Build
- run: make ci
- - name: Deploy
- if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
- uses: peaceiris/actions-gh-pages@v3
+ - uses: actions/checkout@v3
with:
- github_token: ${{ secrets.GITHUB_TOKEN }}
- publish_dir: ./out
+ fetch-depth: 2
+ - uses: actions/setup-python@v4
+ with:
+ python-version: "3.11"
+ # 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 }}
diff --git a/.gitignore b/.gitignore
index dd6648e..3e7476c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/out/
+/urlpattern.spec.whatwg.org/
+/deploy.sh
/spec.html
-*.swp
diff --git a/.pr-preview.json b/.pr-preview.json
index 54feea3..45f78ce 100644
--- a/.pr-preview.json
+++ b/.pr-preview.json
@@ -1,4 +1,9 @@
{
"src_file": "spec.bs",
- "type": "bikeshed"
+ "type": "bikeshed",
+ "params": {
+ "force": 1,
+ "md-status": "LS-PR",
+ "md-Text-Macro": "PR-NUMBER {{ pull_request.number }}"
+ }
}
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
deleted file mode 100644
index 04f41dc..0000000
--- a/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Code of Conduct
-
-All documentation, code and communication under this repository are covered by the [W3C Code of Ethics and Professional Conduct](https://www.w3.org/Consortium/cepc/).
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index fb24f38..0000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,26 +0,0 @@
-## Editing the specification
-
-Edits to the specification are done in the `spec.bs` file, which is then compiled with the [Bikeshed](https://tabatkins.github.io/bikeshed/) spec pre-processor.
-
-To build the specification, you can use one of:
-
-- `make local`: uses a locally-installed copy of Bikeshed
-- `make remote`: uses a Bikeshed web service, so you don't have to install anything locally
-
-## For maintainers: identifying contributors to a pull request
-
-If the author is not the sole contributor to a pull request, please identify all contributors in the pull request comment.
-
-To add a contributor (other than the author, which is automatic), mark them one per line as follows:
-
-```
-+@github_username
-```
-
-If you added a contributor by mistake, you can remove them in a comment with:
-
-```
--@github_username
-```
-
-If the author is making a pull request on behalf of someone else but they had no part in designing the feature, you can remove them with the above syntax.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..f2dcda4
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,356 @@
+Copyright © WHATWG (Apple, Google, Mozilla, Microsoft).
+
+This work is licensed under a Creative Commons Attribution 4.0 International
+License. To the extent portions of it are incorporated into source code,
+such portions in the source code are licensed under the BSD 3-Clause License instead.
+
+- - - -
+
+Creative Commons Attribution 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree
+to be bound by the terms and conditions of this Creative Commons
+Attribution 4.0 International Public License ("Public License"). To the
+extent this Public License may be interpreted as a contract, You are
+granted the Licensed Rights in consideration of Your acceptance of
+these terms and conditions, and the Licensor grants You such rights in
+consideration of benefits the Licensor receives from making the
+Licensed Material available under these terms and conditions.
+
+
+Section 1 -- Definitions.
+
+ a. Adapted Material means material subject to Copyright and Similar
+ Rights that is derived from or based upon the Licensed Material
+ and in which the Licensed Material is translated, altered,
+ arranged, transformed, or otherwise modified in a manner requiring
+ permission under the Copyright and Similar Rights held by the
+ Licensor. For purposes of this Public License, where the Licensed
+ Material is a musical work, performance, or sound recording,
+ Adapted Material is always produced where the Licensed Material is
+ synched in timed relation with a moving image.
+
+ b. Adapter's License means the license You apply to Your Copyright
+ and Similar Rights in Your contributions to Adapted Material in
+ accordance with the terms and conditions of this Public License.
+
+ c. Copyright and Similar Rights means copyright and/or similar rights
+ closely related to copyright including, without limitation,
+ performance, broadcast, sound recording, and Sui Generis Database
+ Rights, without regard to how the rights are labeled or
+ categorized. For purposes of this Public License, the rights
+ specified in Section 2(b)(1)-(2) are not Copyright and Similar
+ Rights.
+
+ d. Effective Technological Measures means those measures that, in the
+ absence of proper authority, may not be circumvented under laws
+ fulfilling obligations under Article 11 of the WIPO Copyright
+ Treaty adopted on December 20, 1996, and/or similar international
+ agreements.
+
+ e. Exceptions and Limitations means fair use, fair dealing, and/or
+ any other exception or limitation to Copyright and Similar Rights
+ that applies to Your use of the Licensed Material.
+
+ f. Licensed Material means the artistic or literary work, database,
+ or other material to which the Licensor applied this Public
+ License.
+
+ g. Licensed Rights means the rights granted to You subject to the
+ terms and conditions of this Public License, which are limited to
+ all Copyright and Similar Rights that apply to Your use of the
+ Licensed Material and that the Licensor has authority to license.
+
+ h. Licensor means the individual(s) or entity(ies) granting rights
+ under this Public License.
+
+ i. Share means to provide material to the public by any means or
+ process that requires permission under the Licensed Rights, such
+ as reproduction, public display, public performance, distribution,
+ dissemination, communication, or importation, and to make material
+ available to the public including in ways that members of the
+ public may access the material from a place and at a time
+ individually chosen by them.
+
+ j. Sui Generis Database Rights means rights other than copyright
+ resulting from Directive 96/9/EC of the European Parliament and of
+ the Council of 11 March 1996 on the legal protection of databases,
+ as amended and/or succeeded, as well as other essentially
+ equivalent rights anywhere in the world.
+
+ k. You means the individual or entity exercising the Licensed Rights
+ under this Public License. Your has a corresponding meaning.
+
+
+Section 2 -- Scope.
+
+ a. License grant.
+
+ 1. Subject to the terms and conditions of this Public License,
+ the Licensor hereby grants You a worldwide, royalty-free,
+ non-sublicensable, non-exclusive, irrevocable license to
+ exercise the Licensed Rights in the Licensed Material to:
+
+ a. reproduce and Share the Licensed Material, in whole or
+ in part; and
+
+ b. produce, reproduce, and Share Adapted Material.
+
+ 2. Exceptions and Limitations. For the avoidance of doubt, where
+ Exceptions and Limitations apply to Your use, this Public
+ License does not apply, and You do not need to comply with
+ its terms and conditions.
+
+ 3. Term. The term of this Public License is specified in Section
+ 6(a).
+
+ 4. Media and formats; technical modifications allowed. The
+ Licensor authorizes You to exercise the Licensed Rights in
+ all media and formats whether now known or hereafter created,
+ and to make technical modifications necessary to do so. The
+ Licensor waives and/or agrees not to assert any right or
+ authority to forbid You from making technical modifications
+ necessary to exercise the Licensed Rights, including
+ technical modifications necessary to circumvent Effective
+ Technological Measures. For purposes of this Public License,
+ simply making modifications authorized by this Section 2(a)
+ (4) never produces Adapted Material.
+
+ 5. Downstream recipients.
+
+ a. Offer from the Licensor -- Licensed Material. Every
+ recipient of the Licensed Material automatically
+ receives an offer from the Licensor to exercise the
+ Licensed Rights under the terms and conditions of this
+ Public License.
+
+ b. No downstream restrictions. You may not offer or impose
+ any additional or different terms or conditions on, or
+ apply any Effective Technological Measures to, the
+ Licensed Material if doing so restricts exercise of the
+ Licensed Rights by any recipient of the Licensed
+ Material.
+
+ 6. No endorsement. Nothing in this Public License constitutes or
+ may be construed as permission to assert or imply that You
+ are, or that Your use of the Licensed Material is, connected
+ with, or sponsored, endorsed, or granted official status by,
+ the Licensor or others designated to receive attribution as
+ provided in Section 3(a)(1)(A)(i).
+
+ b. Other rights.
+
+ 1. Moral rights, such as the right of integrity, are not
+ licensed under this Public License, nor are publicity,
+ privacy, and/or other similar personality rights; however, to
+ the extent possible, the Licensor waives and/or agrees not to
+ assert any such rights held by the Licensor to the limited
+ extent necessary to allow You to exercise the Licensed
+ Rights, but not otherwise.
+
+ 2. Patent and trademark rights are not licensed under this
+ Public License.
+
+ 3. To the extent possible, the Licensor waives any right to
+ collect royalties from You for the exercise of the Licensed
+ Rights, whether directly or through a collecting society
+ under any voluntary or waivable statutory or compulsory
+ licensing scheme. In all other cases the Licensor expressly
+ reserves any right to collect such royalties.
+
+
+Section 3 -- License Conditions.
+
+Your exercise of the Licensed Rights is expressly made subject to the
+following conditions.
+
+ a. Attribution.
+
+ 1. If You Share the Licensed Material (including in modified
+ form), You must:
+
+ a. retain the following if it is supplied by the Licensor
+ with the Licensed Material:
+
+ i. identification of the creator(s) of the Licensed
+ Material and any others designated to receive
+ attribution, in any reasonable manner requested by
+ the Licensor (including by pseudonym if
+ designated);
+
+ ii. a copyright notice;
+
+ iii. a notice that refers to this Public License;
+
+ iv. a notice that refers to the disclaimer of
+ warranties;
+
+ v. a URI or hyperlink to the Licensed Material to the
+ extent reasonably practicable;
+
+ b. indicate if You modified the Licensed Material and
+ retain an indication of any previous modifications; and
+
+ c. indicate the Licensed Material is licensed under this
+ Public License, and include the text of, or the URI or
+ hyperlink to, this Public License.
+
+ 2. You may satisfy the conditions in Section 3(a)(1) in any
+ reasonable manner based on the medium, means, and context in
+ which You Share the Licensed Material. For example, it may be
+ reasonable to satisfy the conditions by providing a URI or
+ hyperlink to a resource that includes the required
+ information.
+
+ 3. If requested by the Licensor, You must remove any of the
+ information required by Section 3(a)(1)(A) to the extent
+ reasonably practicable.
+
+ 4. If You Share Adapted Material You produce, the Adapter's
+ License You apply must not prevent recipients of the Adapted
+ Material from complying with this Public License.
+
+
+Section 4 -- Sui Generis Database Rights.
+
+Where the Licensed Rights include Sui Generis Database Rights that
+apply to Your use of the Licensed Material:
+
+ a. for the avoidance of doubt, Section 2(a)(1) grants You the right
+ to extract, reuse, reproduce, and Share all or a substantial
+ portion of the contents of the database;
+
+ b. if You include all or a substantial portion of the database
+ contents in a database in which You have Sui Generis Database
+ Rights, then the database in which You have Sui Generis Database
+ Rights (but not its individual contents) is Adapted Material; and
+
+ c. You must comply with the conditions in Section 3(a) if You Share
+ all or a substantial portion of the contents of the database.
+
+For the avoidance of doubt, this Section 4 supplements and does not
+replace Your obligations under this Public License where the Licensed
+Rights include other Copyright and Similar Rights.
+
+
+Section 5 -- Disclaimer of Warranties and Limitation of Liability.
+
+ a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
+ EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
+ AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
+ ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
+ IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
+ WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
+ ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
+ KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
+ ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
+
+ b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
+ TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
+ NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
+ INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
+ COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
+ USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
+ ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
+ DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
+ IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
+
+ c. The disclaimer of warranties and limitation of liability provided
+ above shall be interpreted in a manner that, to the extent
+ possible, most closely approximates an absolute disclaimer and
+ waiver of all liability.
+
+
+Section 6 -- Term and Termination.
+
+ a. This Public License applies for the term of the Copyright and
+ Similar Rights licensed here. However, if You fail to comply with
+ this Public License, then Your rights under this Public License
+ terminate automatically.
+
+ b. Where Your right to use the Licensed Material has terminated under
+ Section 6(a), it reinstates:
+
+ 1. automatically as of the date the violation is cured, provided
+ it is cured within 30 days of Your discovery of the
+ violation; or
+
+ 2. upon express reinstatement by the Licensor.
+
+ For the avoidance of doubt, this Section 6(b) does not affect any
+ right the Licensor may have to seek remedies for Your violations
+ of this Public License.
+
+ c. For the avoidance of doubt, the Licensor may also offer the
+ Licensed Material under separate terms or conditions or stop
+ distributing the Licensed Material at any time; however, doing so
+ will not terminate this Public License.
+
+ d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
+ License.
+
+
+Section 7 -- Other Terms and Conditions.
+
+ a. The Licensor shall not be bound by any additional or different
+ terms or conditions communicated by You unless expressly agreed.
+
+ b. Any arrangements, understandings, or agreements regarding the
+ Licensed Material not stated herein are separate from and
+ independent of the terms and conditions of this Public License.
+
+
+Section 8 -- Interpretation.
+
+ a. For the avoidance of doubt, this Public License does not, and
+ shall not be interpreted to, reduce, limit, restrict, or impose
+ conditions on any use of the Licensed Material that could lawfully
+ be made without permission under this Public License.
+
+ b. To the extent possible, if any provision of this Public License is
+ deemed unenforceable, it shall be automatically reformed to the
+ minimum extent necessary to make it enforceable. If the provision
+ cannot be reformed, it shall be severed from this Public License
+ without affecting the enforceability of the remaining terms and
+ conditions.
+
+ c. No term or condition of this Public License will be waived and no
+ failure to comply consented to unless expressly agreed to by the
+ Licensor.
+
+ d. Nothing in this Public License constitutes or may be interpreted
+ as a limitation upon, or waiver of, any privileges and immunities
+ that apply to the Licensor or You, including from the legal
+ processes of any jurisdiction or authority.
+
+- - - -
+
+BSD 3-Clause License
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+- - - -
diff --git a/LICENSE.md b/LICENSE.md
deleted file mode 100644
index 0a9804c..0000000
--- a/LICENSE.md
+++ /dev/null
@@ -1,3 +0,0 @@
-All Reports in this Repository are licensed by Contributors under the [W3C Software and Document License](http://www.w3.org/Consortium/Legal/2015/copyright-software-and-document).
-Contributions to Specifications are made under the [W3C CLA](https://www.w3.org/community/about/agreements/cla/).
-Contributions to Test Suites are made under the [W3C 3-clause BSD License](https://www.w3.org/Consortium/Legal/2008/03-bsd-license.html).
diff --git a/Makefile b/Makefile
index a28941a..42de7ce 100644
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,23 @@
-SHELL=/bin/bash
+SHELL=/bin/bash -o pipefail
+.PHONY: local remote deploy
-local: spec.bs
- bikeshed --die-on=warning spec spec.bs spec.html
-
-spec.html: spec.bs
+remote: spec.bs
@ (HTTP_STATUS=$$(curl https://api.csswg.org/bikeshed/ \
- --output spec.html \
- --write-out "%{http_code}" \
- --header "Accept: text/plain, text/html" \
- -F die-on=warning \
- -F file=@spec.bs) && \
- [[ "$$HTTP_STATUS" -eq "200" ]]) || ( \
- echo ""; cat spec.html; echo ""; \
- rm -f spec.html; \
- exit 22 \
- );
+ --output spec.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=@spec.bs) && \
+ [[ "$$HTTP_STATUS" -eq "200" ]]) || ( \
+ echo ""; cat spec.html; echo ""; \
+ rm -f spec.html; \
+ exit 22 \
+ );
-remote: spec.html
-
-ci: spec.bs
- mkdir -p out
- make remote
- mv spec.html out/index.html
+local: spec.bs
+ bikeshed spec spec.bs spec.html --md-Text-Macro="COMMIT-SHA LOCAL COPY"
-clean:
- rm spec.html
+deploy: spec.bs
+ curl --remote-name --fail https://resources.whatwg.org/build/deploy.sh
+ bash ./deploy.sh
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..47dad46
--- /dev/null
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,21 @@
+
+
+- [ ] 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:
+ * Chromium: …
+ * Gecko: …
+ * WebKit: …
+ * Deno: …
+ * kenchris/urlpattern-polyfill: …
+- [ ] [MDN issue](https://github.com/whatwg/meta/blob/main/MAINTAINERS.md#handling-pull-requests) is filed: …
+- [ ] The top of this comment includes a [clear commit message](https://github.com/whatwg/meta/blob/main/COMMITTING.md) to use.
+
+(See [WHATWG Working Mode: Changes](https://whatwg.org/working-mode#changes) for more details.)
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..628e6ad
--- /dev/null
+++ b/README.md
@@ -0,0 +1,33 @@
+This repository hosts the [URL Pattern Standard](https://urlpattern.spec.whatwg.org/).
+
+## Code of conduct
+
+We are committed to providing a friendly, safe, and welcoming environment for all. Please read and respect the [Code of Conduct](https://whatwg.org/code-of-conduct).
+
+## Contribution opportunities
+
+Folks notice minor and larger issues with the URL Pattern Standard all the time and we'd love your help fixing those. Pull requests for typographical and grammar errors are also most welcome.
+
+Issues labeled ["good first issue"](https://github.com/whatwg/urlpattern/labels/good%20first%20issue) are a good place to get a taste for editing the URL Pattern Standard. Note that we don't assign issues and there's no reason to ask for availability either, just provide a pull request.
+
+If you are thinking of suggesting a new feature, read through the [FAQ](https://whatwg.org/faq) and [Working Mode](https://whatwg.org/working-mode) documents to get yourself familiarized with the process.
+
+We'd be happy to help you with all of this [on Chat](https://whatwg.org/chat).
+
+## Pull requests
+
+In short, change `spec.bs` and submit your patch, with a [good commit message](https://github.com/whatwg/meta/blob/main/COMMITTING.md).
+
+Please add your name to the Acknowledgments section in your first pull request, even for trivial fixes. The names are sorted lexicographically.
+
+To ensure your patch meets all the necessary requirements, please also see the [Contributor Guidelines](https://github.com/whatwg/meta/blob/main/CONTRIBUTING.md). Editors of the URL Pattern Standard are expected to follow the [Maintainer Guidelines](https://github.com/whatwg/meta/blob/main/MAINTAINERS.md).
+
+## Tests
+
+Tests are an essential part of the standardization process and will need to be created or adjusted as changes to the standard are made. Tests for the URL Pattern Standard can be found in the `urlpattern/` directory of [`web-platform-tests/wpt`](https://github.com/web-platform-tests/wpt).
+
+A dashboard showing the tests running against browser engines can be seen at [wpt.fyi/results/urlpattern](https://wpt.fyi/results/urlpattern).
+
+## Building "locally"
+
+For quick local iteration, run `make`; this will use a web service to build the standard, so that you don't have to install anything. See more in the [Contributor Guidelines](https://github.com/whatwg/meta/blob/main/CONTRIBUTING.md#building).
diff --git a/readme.md b/readme.md
deleted file mode 100644
index 4f8b8a4..0000000
--- a/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-This repository proposes creating a native web API to match URLs called URLPattern. URLPattern would support both web developer use in JS and native URL matching in other web APIs. For example, the initial use cases discuss using URLPattern for service worker scope matching.
-
-For more information:
-
-* The [URLPattern documentation](mdn-drafts/QUICK-REFERENCE.md) describes the final API shape and provides a number of examples.
-* The [December 2020 update](202012-update.md) describes the API shape and implementation status at the time.
-* The [explainer](explainer.md) discusses the motivating use cases and early API ideas.
-* The [design document](https://docs.google.com/document/d/17L6b3zlTHtyxQvOAvbK55gQOi5rrJLERwjt_sKXpzqc/edit) goes into more detail, including webidl and how the API might be implemented in Chromium. Some of this has changed during implementation. See the [latest update](202012-update.md) for the most recent API shape.
-
-For questions about usage, please use [Github Discussions](https://github.com/WICG/urlpattern/discussions). For issues with the spec and feature requests, please use [Github Issues](https://github.com/WICG/urlpattern/issues).
diff --git a/spec.bs b/spec.bs
index 5b2e916..524b0fd 100644
--- a/spec.bs
+++ b/spec.bs
@@ -1,21 +1,10 @@
-Title: URLPattern API
+Group: WHATWG
+H1: URL Pattern
Shortname: urlpattern
-Repository: WICG/urlpattern
-Inline Github Issues: true
-Group: WICG
-Status: CG-DRAFT
-Level: 1
-URL: https://wicg.github.io/urlpattern/
-Boilerplate: omit conformance, omit feedback-header
-Editor: Ben Kelly, Google https://www.google.com/, wanderview@chromium.org
-Abstract: The URLPattern API provides a web platform primitive for matching URLs based on a convenient pattern syntax.
-Status Text: This proposal will hopefully move into the WHATWG URL workstream in the future.
-!Participate: GitHub WICG/urlpattern (new issue, open issues)
-!Commits: GitHub spec.bs commits
-Complain About: accidental-2119 yes, missing-example-ids yes
+Text Macro: TWITTER urlpatternapi
+Abstract: The URL Pattern Standard provides a web platform primitive for matching URLs based on a convenient pattern syntax.
Indent: 2
-Default Biblio Status: current
Markup Shorthands: markdown yes
@@ -31,113 +20,55 @@ spec: ECMASCRIPT; urlPrefix: https://tc39.es/ecma262/
text: IdentifierStart; url: #prod-IdentifierStart
-
-
-
-
-The {{URLPattern}} class
+The {{URLPattern}} class
A {{URLPattern}} consists of several [=components=], each of which represents a [=/pattern string|pattern=] which could be matched against the corresponding component of a [=/URL=].
It can be constructed using a string for each component, or from a shorthand string. It can optionally be resolved relative to a base URL.
-
- The shorthand "`https://example.com/:category/*`" corresponds to the following components:
+
+
The shorthand "`https://example.com/:category/*`" corresponds to the following components:
- : [=URLPattern/protocol component|protocol=]
- :: "`https`"
- : [=URLPattern/username component|username=]
- :: ""
- : [=URLPattern/password component|password=]
- :: ""
- : [=URLPattern/hostname component|hostname=]
- :: "`example.com`"
- : [=URLPattern/port component|port=]
- :: ""
- : [=URLPattern/pathname component|pathname=]
- :: "`/:category/*`"
- : [=URLPattern/search component|search=]
- :: ""
- : [=URLPattern/hash component|hash=]
- :: ""
+ - [=URLPattern/protocol component|protocol=]
+
- "`https`"
+
+
- [=URLPattern/username component|username=]
+
- ""
+
+
- [=URLPattern/password component|password=]
+
- ""
+
+
- [=URLPattern/hostname component|hostname=]
+
- "`example.com`"
+
+
- [=URLPattern/port component|port=]
+
- ""
+
+
- [=URLPattern/pathname component|pathname=]
+
- "`/:category/*`"
+
+
- [=URLPattern/search component|search=]
+
- ""
+
+
- [=URLPattern/hash component|hash=]
+
- ""
It matches the following URLs:
- * `https://example.com/products/`
- * `https://example.com/blog/our-greatest-product-ever`
+
+
+ * `https://example.com/products/`
+ * `https://example.com/blog/our-greatest-product-ever`
+
It does not match the following URLs:
- * `https://example.com/`
- * `http://example.com/products/`
- * `https://example.com:8443/blog/our-greatest-product-ever`
+
+
+ * `https://example.com/`
+ * `http://example.com/products/`
+ * `https://example.com:8443/blog/our-greatest-product-ever`
+