Dual-license error-stack and misc drive-by updates

.github/ISSUE_TEMPLATE/bug-report-block.yml

@@ -1,4 +1,4 @@
-name: Bug Report (block)
+name: Bug Report (Blocks)
 description: Create a report to help us improve our blocks
 labels:
   - A-blocks

.github/ISSUE_TEMPLATE/bug-report-deer.yml

@@ -0,0 +1,98 @@
+name: Bug Report (deer)
+description: Create a report to help us improve `deer`
+labels:
+  - A-deer
+  - C-bug
+assignees:
+  - Alfred-Mountfield
+  - TimDiekmann
+  - indietyp
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for taking the time to fill out this bug report!
+
+        Please try to fill out the fields below. If you don't know what to put in the fields please left them blank.
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the bug
+      description: A clear and concise description of what the bug is.
+    validations:
+      required: true
+
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: To reproduce
+      description: Steps to reproduce the behavior.
+      render: Rust
+      placeholder: |
+        fn main() {
+            // How to reproduce the issue
+        }
+    validations:
+      required: false
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: Expected behavior
+      description: A clear and concise description of what you expected to happen.
+    validations:
+      required: false
+
+  - type: input
+    id: rustc
+    attributes:
+      label: Rust compiler
+      description: Which Rust compiler do you use? The current rust version can be printed by `rustc -V`
+      placeholder: e.g. 1.66.0 nightly (2022-09-27)
+    validations:
+      required: false
+
+  - type: input
+    id: os
+    attributes:
+      label: Host
+      description: Which operating system are you on? Please post the output for `host` of `rustc -vV`.
+      placeholder: e.g. aarch64-apple-darwin
+    validations:
+      required: false
+
+  - type: input
+    id: target
+    attributes:
+      label: Target
+      description: What target are you compiling to? You can find a list of all installed targets with `rustup show`.
+      placeholder: e.g. x86_64-unknown-linux-musl
+    validations:
+      required: false
+
+  - type: input
+    id: revision
+    attributes:
+      label: Revision
+      description: What revision of `deer` do you use?
+      placeholder: e.g. abcd1234
+    validations:
+      required: false
+
+  - type: input
+    id: features
+    attributes:
+      label: Features
+      description: What features are enabled?
+      placeholder: default, std
+    validations:
+      required: false
+
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem here, e.g. screenshots.
+    validations:
+      required: false

CONTRIBUTING.md

@@ -19,6 +19,7 @@ These apply across all projects:
   - Always include a link to the issue or discussion proposing the change.
   - Write tests to accompany your PR, or ask for help/guidance if this is a blocker.
   - Make sure that your PR doesn’t break existing tests.
+  - Sign our _Contributor License Agreement_ at the CLA Assistant's prompting. (To learn more, read [why we have a CLA](https://hash.ai/legal/cla))
 - Once you have receive a pull request review, please bear the following in mind:
   - reviewers may make suggestions for _optional_ changes which are not required to get your code merged. It should be obvious which suggestions are optional, and which are required changes. If it is not obvious, ask for clarification.
   - please do not resolve comment threads unless you opened them - leave it to the person who raised a comment to decide if any further discussion is required (GitHub will also automatically resolve any code suggestions you click 'commit' on). Comment threads may also be left open so that they can be linked to later.

packages/libs/error-stack/CHANGELOG.md

@@ -7,6 +7,10 @@ All notable changes to `error-stack` will be documented in this file.
 - Support for [`serde`](https://serde.rs) (`Serialize` only)
 - Support for [`defmt`](https://defmt.ferrous-systems.com)
 
+## Unreleased
+
+- Add Apache 2.0 as an additional license option ([#1172](https://github.com/hashintel/hash/pull/1172))
+
 ## [0.2.2](https://github.com/hashintel/hash/tree/error-stack%400.2.2/packages/libs/error-stack) - 2022-10-07
 
 - Add a space before attachment formatting ([#1174](https://github.com/hashintel/hash/pull/1174))

packages/libs/error-stack/Cargo.toml

@@ -8,7 +8,7 @@ version = "0.2.2"
 authors = ["HASH"]
 edition = "2021"
 rust-version = "1.63.0"
-license = "MIT"
+license = "MIT OR Apache-2.0"
 description = "A context-aware error-handling library that supports arbitrary attached user data"
 documentation = "https://docs.rs/error-stack"
 readme = "README.md"

packages/libs/error-stack/LICENSE-APACHE.md

@@ -0,0 +1,191 @@
+<!-- markdownlint-disable -->
+
+# Apache License
+
+_Version 2.0, January 2004_  
+_&lt;<http://www.apache.org/licenses/>&gt;_
+
+### Terms and Conditions for use, reproduction, and distribution
+
+#### 1. Definitions
+
+“License” shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+“Licensor” shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+“Legal Entity” shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, “control” means **(i)** the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or **(ii)** ownership of fifty percent (50%) or more of the
+outstanding shares, or **(iii)** beneficial ownership of such entity.
+
+“You” (or “Your”) shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+“Source” form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+“Object” form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+“Work” shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+“Derivative Works” shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+“Contribution” shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+“submitted” means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as “Not a Contribution.”
+
+“Contributor” shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+#### 2. Grant of Copyright License
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+#### 3. Grant of Patent License
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+#### 4. Redistribution
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+- **(a)** You must give any other recipients of the Work or Derivative Works a copy of
+  this License; and
+- **(b)** You must cause any modified files to carry prominent notices stating that You
+  changed the files; and
+- **(c)** You must retain, in the Source form of any Derivative Works that You distribute,
+  all copyright, patent, trademark, and attribution notices from the Source form
+  of the Work, excluding those notices that do not pertain to any part of the
+  Derivative Works; and
+- **(d)** If the Work includes a “NOTICE” text file as part of its distribution, then any
+  Derivative Works that You distribute must include a readable copy of the
+  attribution notices contained within such NOTICE file, excluding those notices
+  that do not pertain to any part of the Derivative Works, in at least one of the
+  following places: within a NOTICE text file distributed as part of the
+  Derivative Works; within the Source form or documentation, if provided along
+  with the Derivative Works; or, within a display generated by the Derivative
+  Works, if and wherever such third-party notices normally appear. The contents of
+  the NOTICE file are for informational purposes only and do not modify the
+  License. You may add Your own attribution notices within Derivative Works that
+  You distribute, alongside or as an addendum to the NOTICE text from the Work,
+  provided that such additional attribution notices cannot be construed as
+  modifying the License.
+
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+#### 5. Submission of Contributions
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+#### 6. Trademarks
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+#### 7. Disclaimer of Warranty
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an “AS IS” BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+#### 8. Limitation of Liability
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+#### 9. Accepting Warranty or Additional Liability
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.
+
+_END OF TERMS AND CONDITIONS_
+
+### APPENDIX: Apply the Apache License to a specific file
+
+To apply the Apache License to an individual file, attach the following notice.
+The text should be enclosed in the appropriate comment syntax for the file
+format.
+
+    Copyright © 2022–, HASH
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.

packages/libs/error-stack/LICENSE.md → packages/libs/error-stack/LICENSE-MIT.md

@@ -1,7 +1,6 @@
-MIT License
-===========
+# MIT License
 
-Copyright © 2022, HASH
+Copyright © 2022–, HASH
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

packages/libs/error-stack/README.md

@@ -97,6 +97,18 @@ This will most likely result in an error and print
 
 ![](https://github.com/hashintel/hash/blob/8ed55bd73045fba83a7ea2e199b31d5b829537b9/packages/libs/error-stack/assets/full.png?raw=true)
 
-Please see the [documentation] for a full description.
+## Usage
 
-For more examples, please check out the [examples](./examples) folder.
+Please see the [documentation].
+
+For more examples of `error-stack` in use, please check out the [examples](https://github.com/hashintel/hash/tree/main/packages/libs/error-stack/examples) folder.
+
+## Contributors
+
+`error-stack` was created and is maintained by [HASH](https://hash.dev/). As an open-source project, we gratefully accept external contributions and have published a [contributing guide](https://github.com/hashintel/hash/blob/main/CONTRIBUTING.md) that outlines the process. If you have questions, please reach out to us on our [Discord server](https://hash.ai/discord).
+
+## License
+
+Licensed under either of [Apache License, Version 2.0](LICENSE-APACHE.md) or [MIT license](LICENSE-MIT.md) at your option.
+
+For more information about contributing to this crate, see our top-level [CONTRIBUTING](https://github.com/hashintel/hash/blob/main/CONTRIBUTING.md) policy.

sites/hashai/README.md

@@ -5,4 +5,4 @@ The [hash.ai](https://hash.ai) website code currently resides in our private [`i
 - **User Guide** ([hash.ai/docs](https://hash.ai/docs)): found in this repository under the [`resources/docs`](https://github.com/hashintel/hash/tree/main/sites/hashai/resources/docs) directory
 - **Glossary Definitions** ([hash.ai/glossary](https://hash.ai/glossary)): found in this repository under the [`resources/glossary`](https://github.com/hashintel/hash/tree/main/sites/hashai/resources/glossary) directory
 
-Other hash.ai website content will be uploaded to this `sites/hashai` directory and the `resources` subdirectory in due course.
+Other hash.ai website content will be uploaded to the `resources` directory in due course.

sites/hashdev/public/blog/1_block-design/README.md → sites/hashdev/public/blog/0001_block-design/README.md

@@ -1,4 +1,4 @@
 This directory contains assets for Maggie's "Design guidelines for building blocks with the Block Protocol" blog post.
 
 - Public on the [hash.dev blog](https://hash.dev/blog/block-design)
-- Editable on [GitHub](https://github.com/hashintel/hash/blob/main/sites/hashdev/src/_pages/blog/1_block-design.mdx)
+- Editable on [GitHub](https://github.com/hashintel/hash/blob/main/sites/hashdev/src/_pages/blog/0001_block-design.mdx)

sites/hashdev/public/blog/2_open-source/README.md → sites/hashdev/public/blog/0002_open-source/README.md

@@ -1,4 +1,4 @@
 This directory contains assets for David's "Open source at HASH" blog post.
 
 - Public on the [hash.dev blog](https://hash.dev/blog/open-source)
-- Editable on [GitHub](https://github.com/hashintel/hash/blob/main/sites/hashdev/src/_pages/blog/2_open-source.mdx)
+- Editable on [GitHub](https://github.com/hashintel/hash/blob/main/sites/hashdev/src/_pages/blog/0002_open-source.mdx)

sites/hashdev/public/blog/3_one-principle/README.md → sites/hashdev/public/blog/0003_one-principle/README.md

@@ -1,4 +1,4 @@
 This directory contains assets for David's "The Non-Negotiable Principle" blog post.
 
 - Public on the [hash.dev blog](https://hash.dev/blog/one-principle)
-- Editable on [GitHub](https://github.com/hashintel/hash/blob/main/sites/hashdev/src/_pages/blog/3_one-principle.mdx)
+- Editable on [GitHub](https://github.com/hashintel/hash/blob/main/sites/hashdev/src/_pages/blog/0003_one-principle.mdx)

sites/hashdev/public/blog/4_announcing-error-stack/README.md → sites/hashdev/public/blog/0004_announcing-error-stack/README.md

@@ -1,4 +1,4 @@
 This directory contains assets for Tim's "Announcing error-stack" blog post.
 
 - Public on the [hash.dev blog](https://hash.dev/blog/announcing-error-stack)
-- Editable on [GitHub](https://github.com/hashintel/hash/blob/main/sites/hashdev/src/_pages/blog/4_announcing-error-stack.mdx)
+- Editable on [GitHub](https://github.com/hashintel/hash/blob/main/sites/hashdev/src/_pages/blog/0004_announcing-error-stack.mdx)

sites/hashdev/public/blog/0005_build-blocks-in-any-language/README.md

@@ -0,0 +1,4 @@
+This directory contains assets for Ahmad's "How to build Block Protocol blocks in any language" blog post.
+
+- Public on the [hash.dev blog](https://hash.dev/blog/build-blocks-in-any-language)
+- Editable on [GitHub](https://github.com/hashintel/hash/blob/main/sites/hashdev/src/_pages/blog/0005_build-blocks-in-any-language.mdx)