Skip to content

Commit 0262088

Browse files
authored
Merge branch 'main' into conditional-modifiers-are-okay
2 parents cf17df3 + 8a88fc5 commit 0262088

40 files changed

Lines changed: 1857 additions & 289 deletions

.github/workflows/linting.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
on: [pull_request]
2+
3+
jobs:
4+
lint:
5+
runs-on: ubuntu-latest
6+
steps:
7+
- uses: actions/checkout@v4
8+
- uses: DavidAnson/markdownlint-cli2-action@v19
9+
with:
10+
globs: |
11+
./**/*.md

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: update-templates
22

3-
on:
3+
on:
44
push:
55
branches:
66
- main

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
.obsidian
2+
3+
node_modules

.hound.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ coffeescript:
22
enabled: false
33
eslint:
44
enabled: true
5-
config_file: javascript/.eslintrc.json
5+
config_file: javascript-typescript/.eslintrc.json
66
version: 6.3.0
77
haml:
88
enabled: true

.markdownlint-cli2.jsonc

Lines changed: 161 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,161 @@
1+
{
2+
// https://github.com/DavidAnson/markdownlint/blob/v0.32.1/README.md#rules--aliases
3+
// https://github.com/DavidAnson/markdownlint-cli2/blob/main/test/markdownlint-cli2-jsonc-example/.markdownlint-cli2.jsonc
4+
// https://github.com/DavidAnson/markdownlint-cli2/blob/main/schema/markdownlint-config-schema.json
5+
"$schema": "https://raw.githubusercontent.com/DavidAnson/markdownlint-cli2/refs/heads/main/schema/markdownlint-cli2-config-schema.json",
6+
"gitignore": true,
7+
"config": {
8+
/* MD001 - Heading levels should only increment by one level at a time */
9+
"heading-increment": true,
10+
11+
/* MD003 - Heading style */
12+
"heading-style": true,
13+
14+
/* MD004 - Unordered list style */
15+
"ul-style": true,
16+
17+
/* MD005 - Inconsistent indentation for list items at the same level */
18+
"list-indent": true,
19+
20+
/* MD007 - Unordered list indentation */
21+
"ul-indent": true,
22+
// { "indent": 2, "start_indented": false },
23+
24+
/* MD009 - Trailing spaces */
25+
"no-trailing-spaces": true,
26+
27+
/* MD010 - Hard tabs */
28+
"no-hard-tabs": true,
29+
30+
/* MD011 - Reversed link syntax */
31+
"no-reversed-links": true,
32+
33+
/* MD012 - Multiple consecutive blank lines */
34+
"no-multiple-blanks": true,
35+
36+
/* MD013 - Line length */
37+
// NOTE: Disabled to allow lines of any length; could be enabled in a separate PR after discussion
38+
"line-length": false,
39+
40+
/* MD014 - Dollar signs used before commands without showing output */
41+
"commands-show-output": true,
42+
43+
/* MD018 - No space after hash on atx style heading */
44+
"no-missing-space-atx": true,
45+
46+
47+
/* MD019 - Multiple spaces after hash on atx style heading */
48+
"no-multiple-space-atx": true,
49+
50+
/* MD020 - No space inside hashes on closed atx style heading */
51+
"no-missing-space-closed-atx": true,
52+
53+
/* MD021 - Multiple spaces inside hashes on closed atx style heading */
54+
"no-multiple-space-closed-atx": true,
55+
56+
/* MD022 - Headings should be surrounded by blank lines */
57+
"blanks-around-headings": true,
58+
59+
/* MD023 - Headings must start at the beginning of the line */
60+
"heading-start-left": true,
61+
62+
/* MD024 - Multiple headings with the same content */
63+
"no-duplicate-heading": {
64+
"siblings_only": true
65+
},
66+
67+
/* MD025 - Multiple top-level headings in the same document */
68+
"single-title": true,
69+
70+
/* MD026 - Trailing punctuation in heading */
71+
"no-trailing-punctuation": true,
72+
73+
/* MD027 - Multiple spaces after blockquote symbol */
74+
"no-multiple-space-blockquote": true,
75+
76+
/* MD028 - Blank line inside blockquote */
77+
"no-blanks-blockquote": true,
78+
79+
/* MD029 - Ordered list item prefix */
80+
"ol-prefix": true,
81+
82+
/* MD030 - Spaces after list markers */
83+
"list-marker-space": true,
84+
85+
/* MD031 - Fenced code blocks should be surrounded by blank lines */
86+
"blanks-around-fences": true,
87+
88+
/* MD032 - Lists should be surrounded by blank lines */
89+
"blanks-around-lists": true,
90+
91+
/* MD033 - Inline HTML */
92+
"no-inline-html": {
93+
"allowed_elements": ["dl", "dt", "dd", "kbd", "details"]
94+
},
95+
96+
/* MD034 - Bare URL used */
97+
"no-bare-urls": true,
98+
99+
/* MD035 - Horizontal rule style */
100+
"hr-style": true,
101+
102+
/* MD036 - Emphasis used instead of a heading */
103+
"no-emphasis-as-heading": true,
104+
105+
/* MD037 - Spaces inside emphasis markers */
106+
"no-space-in-emphasis": true,
107+
108+
/* MD038 - Spaces inside code span elements */
109+
"no-space-in-code": true,
110+
111+
/* MD039 - Spaces inside link text */
112+
"no-space-in-links": true,
113+
114+
/* MD040 - Fenced code blocks should have a language specified */
115+
"fenced-code-language": true,
116+
117+
/* MD041 - First line in a file should be a top-level heading */
118+
"first-line-heading": true,
119+
120+
/* MD042 - No empty links */
121+
"no-empty-links": true,
122+
123+
/* MD043 - Required heading structure */
124+
"required-headings": true,
125+
126+
/* MD044 - Proper names should have the correct capitalization */
127+
"proper-names": true,
128+
129+
/* MD045 - Images should have alternate text (alt text) */
130+
"no-alt-text": true,
131+
132+
/* MD046 - Code block style */
133+
"code-block-style": true,
134+
135+
/* MD047 - Files should end with a single newline character */
136+
"single-trailing-newline": true,
137+
138+
/* MD048 - Code fence style */
139+
"code-fence-style": true,
140+
141+
/* MD049 - Emphasis style */
142+
"emphasis-style": true,
143+
144+
/* MD050 - Strong style */
145+
"strong-style": true,
146+
147+
/* MD051 - Link fragments should be valid */
148+
"link-fragments": true,
149+
150+
/* MD052 - Reference links and images should use a label that is defined */
151+
"reference-links-images": {
152+
"shortcut_syntax": false
153+
},
154+
155+
/* MD053 - Link and image reference definitions should be needed */
156+
"link-image-reference-definitions": true,
157+
158+
/* MD054 - Link and image style */
159+
"link-image-style": true
160+
}
161+
}

.tool-versions

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node latest

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ to abide by the [thoughtbot Code Of Conduct].
55

66
We expect everyone to follow the code of conduct anywhere in thoughtbot's
77
project codebases, issue trackers, chatrooms, mailing lists, meetups, at other events, and in-person.
8-
Violators will be warned by the core team.
8+
Violators will be warned by the core team.
99
Repeat violations will result in being blocked or banned by the core team at or before the 3rd violation.
1010

1111
[thoughtbot code of conduct]: https://thoughtbot.com/open-source-code-of-conduct

README.md

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# Guides
22

3-
[![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
4-
53
Guides for working together, getting things done, programming well, and
64
programming in style.
75

@@ -43,29 +41,25 @@ programming in style.
4341
### Languages
4442

4543
- [Bash](/bash/)
46-
- [CoffeeScript](/coffeescript/)
4744
- [CSS](/css/)
4845
- [Elixir](/elixir/)
4946
- [ERB](/erb/)
5047
- [HAML](/haml/)
51-
- [Handlebars](/handlebars/)
5248
- [Haskell](/haskell/)
5349
- [HTML](/html/)
5450
- [Java](/java/)
55-
- [JavaScript](/javascript/)
51+
- [JavaScript & TypeScript](/javascript-typescript/)
5652
- [Objective-C](/objective-c/)
5753
- [Python](/python/)
5854
- [Ruby](/ruby/)
5955
- [Sass](/sass/)
6056
- [Scala](/scala/)
6157
- [Shell](/shell/)
6258
- [Swift](/swift/)
63-
- [TypeScript](/typescript/)
6459

6560
### Frameworks and platforms
6661

6762
- [Android](/android/)
68-
- [Angular](/angular/)
6963
- [Ember](/ember/)
7064
- [iOS](/ios/)
7165
- [Rails](/rails/)
@@ -96,8 +90,8 @@ Thank you,
9690

9791
## License
9892

99-
Guides is © 2020-2024 thoughtbot, inc. It is distributed under the [Creative Commons
100-
Attribution License](http://creativecommons.org/licenses/by/3.0/).
93+
Guides is © 2020-2025 thoughtbot, inc. It is distributed under the [Creative
94+
Commons Attribution License](http://creativecommons.org/licenses/by/3.0/).
10195

10296
<!-- START /templates/footer.md -->
10397
## About thoughtbot
@@ -114,5 +108,4 @@ We are [available for hire][hire].
114108
[community]: https://thoughtbot.com/community?utm_source=github
115109
[hire]: https://thoughtbot.com/hire-us?utm_source=github
116110

117-
118111
<!-- END /templates/footer.md -->

_template/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ This typically takes one of three forms:
1616
2. Primarily textual sections
1717
3. A combination of both
1818

19-
## How to...
19+
## How To Guides
2020

2121
This section, if applicable, should index a list of "How-to" guides for this
2222
guide's topic. These should be stored relative to this `README.md` file in a
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
## How to Do Something Else
1+
# How to Do Something Else
22

33
This is an example how-to guide. Write anything you want here!

0 commit comments

Comments
 (0)