diff --git a/.gitignore b/.gitignore index f95844b..07d3afd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,9 @@ -_site +# Ignore metadata generated by Jekyll +_site/ .sass-cache/ +.jekyll-cache/ +.jekyll-metadata + +# Ignore folders generated by Bundler +.bundle/ +vendor/ diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..ff728e0 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,3 @@ +This repository is a TC39 project and subscribes to its [Code of Conduct](https://tc39.github.io/code-of-conduct/). It is available at [https://tc39.github.io/code-of-conduct/](https://tc39.github.io/code-of-conduct/). + +To ask a question or report an issue, please email [tc39-conduct-reports@googlegroups.com](mailto:tc39-conduct-reports@googlegroups.com). diff --git a/FAQ.md b/FAQ.md deleted file mode 100644 index aa24873..0000000 --- a/FAQ.md +++ /dev/null @@ -1,46 +0,0 @@ ---- -layout: home -title: FAQ ---- - -# Frequently Asked Questions - -This FAQ attempts to address common questions and concerns around TC39's [Code of Conduct][]. If you still have questions after reading it, please feel free to [contact us][tc39-conduct]. - -### Why have you adopted a Code of Conduct? - -We think the JS community is awesome. If you're familiar with TC39, you'll probably notice we are making progressive efforts to promote and improve diversity and inclusion to match the Code. - -We know that the TC39 community is transparent, friendly, and welcoming. We want to make sure everyone else knows it too. - -### What does it mean to "adopt" a Code of Conduct? - -For the most part, we don't think it means large changes. We think that the text does a really good job describing the way TC39 already conducts itself. We expect that most people will simply continue to behave in the awesome way they have for years. - -However, we do expect that people will abide by the spirit and words of the CoC when in "official" TC39 spaces. This code has been adopted by TC39. That means that it'll apply both in community spaces _and_ at TC39 events. - -In practice, this means any TC39 IRC channels, bug tracking and code review tools, and "official" TC39 events. - -### What about TC39 events? - -This Code of Conduct also covers all TC39 events since it is all about how we interact as a community. It's about saying that the TC39 community will be open, friendly, and welcoming. The core issue is about ensuring the conversations we have are productive and inviting for all. - -Real-life events, however, require a bit more care. TC39 wants to be sure that all of its events have policies and procedures in place for handling harassment. It's especially important to us that real-life events take steps to protect the physical and mental security of their participants. - -### What happens if someone violates the Code of Conduct? - -Our intent is that anyone in the community can stand up for this Code, and direct people who are unaware of this document. If that doesn't work, or if you need more help, you can contact [tc39-conduct@ecma-international.com][tc39-conduct]. For more details please see our [Reporting Guidelines][]. - -### Why do we need a Code of Conduct? Everyone knows not to be a jerk. - -Sadly, not everyone knows this. - -However, even if everyone were kind, compassionate, and familiar with codes of conduct, it would still be incumbent upon our community to publish our own. Maintaining a Code of Conduct forces us to consider and articulate what kind of community we want to be, and serves as a constant reminder to put our best foot forward. But most importantly, it serves as a signpost to people looking to join our community that we feel these values are important. - -### This is censorship! I have the right to say whatever I want! - -You do -- in _your_ space. If you'd like to hang out in _our_ spaces (as clarified above), we have some simple guidelines to follow. If you want to, for example, form a group where TC39 proposals are discussed using language inappropriate for general channels then nobody's stopping you. We respect your right to establish whatever codes of conduct you want in the spaces that belong to you. Please honor this Code of Conduct in our spaces. - -[Code of Conduct]: /code-of-conduct-proposal -[tc39-conduct]: mailto:tc39-conduct@ecma-international.com -[Reporting Guidelines]: /code-of-conduct-proposal/reporting diff --git a/Gemfile b/Gemfile index 8af2673..ff2c342 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,4 @@ source "https://rubygems.org" -ruby RUBY_VERSION - # Hello! This is where you manage which Jekyll version is used to run. # When you want to use a different version, change it below, save the # file and run `bundle install`. Run Jekyll with `bundle exec`, like so: @@ -9,20 +7,27 @@ ruby RUBY_VERSION # # This will help ensure the proper Jekyll version is running. # Happy Jekylling! -gem "jekyll", "3.4.3" - +gem "jekyll", "~> 4.3.2" # This is the default theme for new Jekyll sites. You may change this to anything you like. -gem "minima", "~> 2.0" - +gem "minima", "~> 2.5" # If you want to use GitHub Pages, remove the "gem "jekyll"" above and # uncomment the line below. To upgrade, run `bundle update github-pages`. # gem "github-pages", group: :jekyll_plugins - # If you have any plugins, put them here! group :jekyll_plugins do - gem "jekyll-feed", "~> 0.6" + gem "jekyll-feed", "~> 0.12" +end + +# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem +# and associated library. +platforms :mingw, :x64_mingw, :mswin, :jruby do + gem "tzinfo", ">= 1", "< 3" + gem "tzinfo-data" end -# Windows does not include zoneinfo files, so bundle the tzinfo-data gem -gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] +# Performance-booster for watching directories on Windows +gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin] +# Lock `http_parser.rb` gem to `v0.6.x` on JRuby builds since newer versions of the gem +# do not have a Java counterpart. +gem "http_parser.rb", "~> 0.6.0", :platforms => [:jruby] diff --git a/Gemfile.lock b/Gemfile.lock index 5bad9cf..d975650 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,57 +1,84 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.5.1) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) colorator (1.1.0) - ffi (1.9.18) + concurrent-ruby (1.2.2) + em-websocket (0.5.3) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0) + eventmachine (1.2.7) + ffi (1.15.5) forwardable-extended (2.6.0) - jekyll (3.4.3) + google-protobuf (3.22.2-arm64-darwin) + http_parser.rb (0.8.0) + i18n (1.12.0) + concurrent-ruby (~> 1.0) + jekyll (4.3.2) addressable (~> 2.4) colorator (~> 1.0) - jekyll-sass-converter (~> 1.0) - jekyll-watch (~> 1.1) - kramdown (~> 1.3) - liquid (~> 3.0) - mercenary (~> 0.3.3) + em-websocket (~> 0.5) + i18n (~> 1.0) + jekyll-sass-converter (>= 2.0, < 4.0) + jekyll-watch (~> 2.0) + kramdown (~> 2.3, >= 2.3.1) + kramdown-parser-gfm (~> 1.0) + liquid (~> 4.0) + mercenary (>= 0.3.6, < 0.5) pathutil (~> 0.9) - rouge (~> 1.7) + rouge (>= 3.0, < 5.0) safe_yaml (~> 1.0) - jekyll-feed (0.9.2) - jekyll (~> 3.3) - jekyll-sass-converter (1.5.0) - sass (~> 3.4) - jekyll-watch (1.5.0) - listen (~> 3.0, < 3.1) - kramdown (1.13.2) - liquid (3.0.6) - listen (3.0.8) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - mercenary (0.3.6) - minima (2.1.0) - jekyll (~> 3.3) - pathutil (0.14.0) + terminal-table (>= 1.8, < 4.0) + webrick (~> 1.7) + jekyll-feed (0.17.0) + jekyll (>= 3.7, < 5.0) + jekyll-sass-converter (3.0.0) + sass-embedded (~> 1.54) + jekyll-seo-tag (2.8.0) + jekyll (>= 3.8, < 5.0) + jekyll-watch (2.2.1) + listen (~> 3.0) + kramdown (2.4.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + liquid (4.0.4) + listen (3.8.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + mercenary (0.4.0) + minima (2.5.1) + jekyll (>= 3.5, < 5.0) + jekyll-feed (~> 0.9) + jekyll-seo-tag (~> 2.1) + pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (2.0.5) - rb-fsevent (0.9.8) - rb-inotify (0.9.8) - ffi (>= 0.5.0) - rouge (1.11.1) - safe_yaml (1.0.4) - sass (3.4.23) + public_suffix (5.0.1) + rb-fsevent (0.11.2) + rb-inotify (0.10.1) + ffi (~> 1.0) + rexml (3.2.5) + rouge (4.1.0) + safe_yaml (1.0.5) + sass-embedded (1.59.3-arm64-darwin) + google-protobuf (~> 3.21) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + unicode-display_width (2.4.2) + webrick (1.8.1) PLATFORMS - ruby + arm64-darwin-22 DEPENDENCIES - jekyll (= 3.4.3) - jekyll-feed (~> 0.6) - minima (~> 2.0) + http_parser.rb (~> 0.6.0) + jekyll (~> 4.3.2) + jekyll-feed (~> 0.12) + minima (~> 2.5) + tzinfo (>= 1, < 3) tzinfo-data - -RUBY VERSION - ruby 2.4.1p111 + wdm (~> 0.1.1) BUNDLED WITH - 1.14.6 + 2.4.9 diff --git a/README.md b/README.md index 625a465..ecf61ad 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ -# tc39 code of conduct proposal +# TC39 Code of Conduct -- Seeking approval from the Ecma Executive Committee. +Official TC39 Code of Conduct, approved by the Ecma Executive Committee. + +This repository is meant for the development of Code of Conduct text. To read the Code of Conduct, see [the rendered copy](https://tc39.github.io/code-of-conduct/). diff --git a/_config.yml b/_config.yml index 186fc2d..6ce6336 100644 --- a/_config.yml +++ b/_config.yml @@ -7,27 +7,49 @@ # # For technical reasons, this file is *NOT* reloaded automatically when you use # 'bundle exec jekyll serve'. If you change this file, please restart the server process. - +# +# If you need help with YAML syntax, here are some quick references for you: +# https://learn-the-web.algonquindesign.ca/topics/markdown-yaml-cheat-sheet/#yaml +# https://learnxinyminutes.com/docs/yaml/ +# # Site settings # These are used to personalize your new site. If you look in the HTML files, # you will see them accessed via {{ site.title }}, {{ site.email }}, and so on. # You can create any custom variable you would like, and they will be accessible # in the templates via {{ site.myvariable }}. -title: Code of Conduct (Proposal) + +title: TC39 Code of Conduct email: tc39-conduct@ecma-international.com -description: > +description: >- # this means to ignore newlines until "baseurl:" The JS community is awesome. -baseurl: "/code-of-conduct-proposal" # the subpath of your site, e.g. /blog +baseurl: "/code-of-conduct" # the subpath of your site, e.g. /blog url: "" # the base hostname & protocol for your site, e.g. http://example.com # Build settings markdown: kramdown + +# Exclude from processing. +# The following items will not be processed, by default. +# Any item listed under the `exclude:` key here will be automatically added to +# the internal "default list". +# +# Excluded items can be processed by explicitly listing the directories or +# their entries' file path in the `include:` list. +# +# exclude: +# - .sass-cache/ +# - .jekyll-cache/ +# - gemfiles/ +# - Gemfile +# - Gemfile.lock +# - node_modules/ +# - vendor/bundle/ +# - vendor/cache/ +# - vendor/gems/ +# - vendor/ruby/ + exclude: - - Gemfile - - Gemfile.lock - - README.md - - CONTRIBUTING.md - - CNAME - LICENSE + - README.md permalink: title diff --git a/_includes/header.html b/_includes/header.html index 91dee19..2cdd8e3 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -2,7 +2,7 @@
- {{ site.title | escape }} +

{{ site.title | escape }}