Skip to content

Commit 8f02d7f

Browse files
authored
Set NPM package version to next unreleased dev & rel-doc tweaks (#1761)
1 parent 6bb4f99 commit 8f02d7f

File tree

4 files changed

+49
-30
lines changed

4 files changed

+49
-30
lines changed

CHANGELOG.md

+30-15
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,31 @@ notes][releases].
1111
Useful links:
1212

1313
- [Releases] & [tags]. Jump to the [latest] release.
14-
- [23Q4] milestone
14+
- Milestones: [23Q4], [24Q1]
1515

16-
[23q4]: https://github.com/google/docsy/milestone/9
16+
[23Q4]: https://github.com/google/docsy/milestone/9
17+
[24Q1]: https://github.com/google/docsy/milestone/10
1718
[latest]: https://github.com/google/docsy/releases/latest
1819
[releases]: https://github.com/google/docsy/releases
1920
[tags]: https://github.com/google/docsy/tags
2021

22+
## 0.8.1 or 0.9.0 - next planned release, WIP
23+
24+
For the full list of changes, see the [0.x.y] release notes.
25+
26+
**Breaking changes**:
27+
28+
- ...
29+
30+
**New**:
31+
32+
**Other changes**:
33+
34+
[0.x.y]: https://github.com/google/docsy/releases/latest?FIXME=v0.X.Y
35+
2136
## 0.8.0
2237

23-
For the full list of changes, see the [release][0.8.0] notes.
38+
For the full list of changes, see the [0.8.0] release notes.
2439

2540
**Breaking changes**:
2641

@@ -45,7 +60,7 @@ For the full list of changes, see the [release][0.8.0] notes.
4560
[#1385]: https://github.com/google/docsy/issues/1385
4661
[#1726]: https://github.com/google/docsy/pull/1726
4762
[#1727]: https://github.com/google/docsy/pull/1727
48-
[0.8.0]: https://github.com/google/docsy/releases/latest?fixme=v0.8.0
63+
[0.8.0]: https://github.com/google/docsy/releases/v0.8.0
4964
[Docsy NPM install side-effect]:
5065
https://docsy.dev/docs/get-started/other-options/#docsy-npm-install-side-effect
5166
[Use Docsy as a Hugo Module]:
@@ -55,7 +70,7 @@ For the full list of changes, see the [release][0.8.0] notes.
5570

5671
## 0.7.2
5772

58-
For the full list of changes, see the [release][0.7.2] notes. We mention some
73+
For the full list of changes, see the [0.7.2] release notes. We mention some
5974
noteworthy changes here:
6075

6176
- **Algolia**
@@ -84,7 +99,7 @@ noteworthy changes here:
8499

85100
## 0.7.1
86101

87-
For the full list of changes, see the [release][0.7.1] notes.
102+
For the full list of changes, see the [0.7.1] release notes.
88103

89104
Followup changes to **Bootstrap (BS) 5.2 upgrade** ([#470]):
90105

@@ -99,7 +114,7 @@ Followup changes to **Bootstrap (BS) 5.2 upgrade** ([#470]):
99114

100115
## 0.7.0
101116

102-
For the full list of changes, see the [release][0.7.0] notes.
117+
For the full list of changes, see the [0.7.0] release notes.
103118

104119
**New**:
105120

@@ -162,7 +177,7 @@ For the full list of changes, see the [release][0.7.0] notes.
162177

163178
## 0.6.0
164179

165-
For the full list of changes, see the [release][0.6.0] notes.
180+
For the full list of changes, see the [0.6.0] release notes.
166181

167182
With this release we declare a feature freeze while we migrate to the newest
168183
Bootstrap version. See [the announcement][bs-announcement] for more information.
@@ -183,7 +198,7 @@ Bootstrap version. See [the announcement][bs-announcement] for more information.
183198

184199
## 0.5.1
185200

186-
For the full list of changes, see the [release][0.5.1] notes. **BREAKING
201+
For the full list of changes, see the [0.5.1] release notes. **BREAKING
187202
CHANGES** are documented below.
188203

189204
**After you update** your project's Docsy:
@@ -240,7 +255,7 @@ Unpublished.
240255

241256
## 0.4.0
242257

243-
For the full list of changes, see the [release][0.4.0] notes. Potential
258+
For the full list of changes, see the [0.4.0] release notes. Potential
244259
**BREAKING CHANGES** are documented below.
245260

246261
**After you update** your project's Docsy, run `npm install`.
@@ -296,7 +311,7 @@ Proceed as usual to build or serve your site.
296311
297312
## 0.3.0
298313
299-
For the full list of changes, see the [release][0.3.0] notes.
314+
For the full list of changes, see the [0.3.0] release notes.
300315
301316
**Breaking changes**:
302317
@@ -315,7 +330,7 @@ For the full list of changes, see the [release][0.3.0] notes.
315330
316331
## 0.2.0
317332
318-
For the full list of changes, see the [release][0.2.0] notes.
333+
For the full list of changes, see the [0.2.0] release notes.
319334
320335
**New**:
321336
@@ -332,11 +347,11 @@ For the full list of changes, see the [release][0.2.0] notes.
332347
[0.2.0]: https://github.com/google/docsy/releases/v0.2.0
333348
[hugo modules]: https://gohugo.io/hugo-modules/
334349
335-
<!-- SECTION TEMPLATE ------------------------------------------------------
350+
<!-- ENTRY TEMPLATE ------------------------------------------------------
336351
337352
## 0.X.Y - next planned release (unpublished yet)
338353
339-
For the full list of changes, see the [release][0.x.y] notes.
354+
For the full list of changes, see the [0.x.y] release notes.
340355
341356
**Breaking changes**:
342357
@@ -346,6 +361,6 @@ For the full list of changes, see the [release][0.x.y] notes.
346361
347362
**Other changes**:
348363
349-
[0.x.y]: https://github.com/google/docsy/releases/v0.X.Y-FIXME
364+
[0.x.y]: https://github.com/google/docsy/releases/latest?FIXME=v0.X.Y
350365
351366
---------------------------------------------------------------------------->

CONTRIBUTING.md

+13-9
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ These notes are WIP for creating a **release (v0.X.Y)** from a local copy of the
4646
repo.
4747

4848
1. **Change directory** to your local Docsy repo.
49-
2. **Create or update a [CHANGELOG](CHANGELOG.md) entry** for v0.X.Y. The
50-
section should provide a brief summary of breaking changes using the section
51-
template at the end of the file. (Note that change details are autogenerated
52-
by GitHub in a later step.)
49+
2. **Create or update a [CHANGELOG] entry** for v0.X.Y. The section should
50+
provide a brief summary of breaking changes using the section template at
51+
the end of the file. (Note that change details are autogenerated by GitHub
52+
in a later step.)
5353
3. **Update Docsy version** to v0.X.Y for:
5454
- `version` key in [package.json](package.json)
5555
- `version` key in [userguide/hugo.yaml][]
@@ -94,8 +94,6 @@ repo.
9494
See, https://github.com/google/docsy/blob/main/CHANGELOG.md#0XY
9595
```
9696

97-
- Remove the "New contributors" autogenerated text (if present) since we
98-
don't publish that as part of our release notes.
9997
- Select **Create a discussion for this release**.
10098

10199
12. **Publish the release**: click _Publish release_.
@@ -112,11 +110,17 @@ further changes are merged into the default branch:
112110

113111
1. Set `version` in [package.json](package.json) to the next planned (or the
114112
next dot) release with a dev suffix, such as `v0.X.Z-dev.0-unreleased`.
115-
2. **Submit a PR with your changes**, using a title like "Set NPM package
113+
2. In the [CHANGELOG]:
114+
- **Create a new entry** for the next release by copying the ENTRY TEMPLATE
115+
at the end of the file.
116+
- **Pin the 0.X.Y release URL**, which ends with `latest?FIXME=...`, to the
117+
v0.X.Y release at `https://github.com/google/docsy/releases/v0.x.y`.
118+
3. **Submit a PR with your changes**, using a title like "Set NPM package
116119
version to next unreleased dev".
117-
3. **Get PR approved and merged**.
120+
4. **Get PR approved and merged**.
118121

122+
[CHANGELOG]: CHANGELOG.md
119123
[contribution guidelines]: https://www.docsy.dev/docs/contribution-guidelines/
120-
[Draft a new release]: https://github.com/google/docsy/releases/new
121124
[docsy-example]: https://github.com/google/docsy-example
125+
[Draft a new release]: https://github.com/google/docsy/releases/new
122126
[userguide/hugo.yaml]: userguide/hugo.yaml

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ The following are basic prerequisites for using Docsy in your site:
4242
Any additional prerequisites depend on the
4343
[installation option](https://www.docsy.dev/docs/get-started/#installation-options)
4444
you choose. We recommend using Docsy as a Hugo module, which requires that you
45-
have the `go` language installed in addition to Hugo and PostCSS.
45+
have the Go language installed in addition to Hugo and PostCSS.
4646

4747
For complete prerequisites and instructions, see our
4848
[Get started guides](https://www.docsy.dev/docs/get-started/).
@@ -89,8 +89,8 @@ npm run serve
8989

9090
## Contributing
9191

92-
Read [CONTRIBUTING.md] for details on our [code of conduct], and the process for
93-
submitting pull requests to us. Thank you to all past, present, and future
92+
For details on our [code of conduct] and the process for submitting pull
93+
requests, see [CONTRIBUTING.md]. Thank you to all past, present, and future
9494
[contributors]!
9595

9696
## License

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"name": "docsy",
3-
"version": "0.8.0",
4-
"version.next": "0.8.1-dev.0-unreleased",
3+
"version": "0.8.1-dev.0-unreleased",
54
"repository": "github:google/docsy",
65
"homepage": "https://www.docsy.dev",
76
"license": "Apache-2.0",
@@ -15,6 +14,7 @@
1514
"build:production": "npm run cd:docs build:production",
1615
"build": "npm run cd:docs build",
1716
"cd:docs": "npm run _cd:docs -- npm run",
17+
"check": "npm run check:format && npm run check:links--md",
1818
"check:format": "npm run _check:format || (echo '[help] Run: npm run fix:format'; exit 1)",
1919
"check:links--md": "npx markdown-link-check --config .markdown-link-check.json *.md",
2020
"check:links:all": "npm run cd:docs check:links:all",
@@ -30,7 +30,7 @@
3030
"preserve": "npm run _prebuild",
3131
"pretest": "npm run _prebuild",
3232
"serve": "npm run cd:docs serve",
33-
"test": "npm run cd:docs test && npm run check:links--md",
33+
"test": "npm run cd:docs test && npm run check",
3434
"update:pkg:dep": "npm install --save-exact @fortawesome/fontawesome-free@latest bootstrap@latest",
3535
"update:pkg:hugo": "npm install --save-exact -D hugo-extended@latest"
3636
},

0 commit comments

Comments
 (0)