Skip to content

Commit cea40b8

Browse files
authored
Merge pull request #1246 from pjkaufman/master
Prereleas Work
2 parents d27b7db + 8487a39 commit cea40b8

File tree

6 files changed

+47
-5
lines changed

6 files changed

+47
-5
lines changed

docs/docs/settings/spacing-rules.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -902,7 +902,7 @@ Paragraph here...
902902

903903
Alias: `line-break-at-document-end`
904904

905-
Ensures that there is exactly one line break at the end of a document.
905+
Ensures that there is exactly one line break at the end of a document if the note is not empty.
906906

907907

908908

@@ -941,6 +941,20 @@ After:
941941
`````` markdown
942942
Lorem ipsum dolor sit amet, consectetur adipiscing elit.
943943

944+
``````
945+
</details>
946+
<details><summary>Empty files will not have a blank line added</summary>
947+
948+
Before:
949+
950+
`````` markdown
951+
952+
``````
953+
954+
After:
955+
956+
`````` markdown
957+
944958
``````
945959
</details>
946960

manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"id": "obsidian-linter",
33
"name": "Linter",
4-
"version": "1.27.1",
4+
"version": "1.28.0",
55
"minAppVersion": "1.5.7",
66
"description": "Formats and styles your notes. It can be used to format YAML tags, aliases, arrays, and metadata; footnotes; headings; spacing; math blocks; regular markdown contents like list, italics, and bold styles; and more with the use of custom rule options as well.",
77
"author": "Victor Tao",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "obsidian-linter",
3-
"version": "1.27.1",
3+
"version": "1.28.0",
44
"description": "Enforces consistent markdown styling for Obsidian (https://obsidian.md). It can be used to format YAML tags, aliases, arrays, and metadata; footnotes; headings; spacing; math blocks; regular markdown contents like list, italics, and bold styles; and more with the use of custom rule options as well.",
55
"main": "main.js",
66
"scripts": {

scripts/pre-beta-release

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ rm -f manifest-beta.tmp.json
1818
# Rewrite versions in relevant files.
1919
jq ".version=\"${NEW_VERSION}\"" package.json > package.tmp.json && mv package.tmp.json package.json
2020
jq ".version=\"${NEW_VERSION}\"" manifest-beta.json > manifest-beta.tmp.json && mv manifest-beta.tmp.json manifest-beta.json
21-
# jq ". + {\"${NEW_VERSION}\": \"1.5.8\"}" versions.json > versions.tmp.json && mv versions.tmp.json versions.json
2221

2322
# Create commit & commit.
2423
git commit -a -m "Auto-release beta ${NEW_VERSION}"

scripts/pre-regular-release

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#!/usr/bin/env bash
2+
# Automatically update versions in files and commit changes
3+
4+
set -e
5+
6+
NEW_VERSION=$1
7+
8+
if [ -z "$NEW_VERSION" ]; then
9+
NEW_VERSION=$(jq -r ".version" manifest.json | awk -F. -v OFS=. '{$NF += 1 ; print}')
10+
fi
11+
12+
echo "Releasing version '${NEW_VERSION}'"
13+
14+
# Delete old files if they exist
15+
rm -f package.tmp.json
16+
rm -f manifest.tmp.json
17+
18+
# Rewrite versions in relevant files.
19+
jq ".version=\"${NEW_VERSION}\"" package.json > package.tmp.json && mv package.tmp.json package.json
20+
jq ".version=\"${NEW_VERSION}\"" manifest.json > manifest.tmp.json && mv manifest.tmp.json manifest.json
21+
jq ". + {\"${NEW_VERSION}\": \"1.5.7\"}" versions.json > versions.tmp.json && mv versions.tmp.json versions.json
22+
23+
npm run build && npm run docs
24+
25+
# Create commit & commit.
26+
git commit -a -m "Auto-release ${NEW_VERSION}"
27+
git push
28+

versions.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,5 +66,6 @@
6666
"1.25.0": "1.5.7",
6767
"1.26.0": "1.5.7",
6868
"1.27.0": "1.5.7",
69-
"1.27.1": "1.5.7"
69+
"1.27.1": "1.5.7",
70+
"1.28.0": "1.5.7"
7071
}

0 commit comments

Comments
 (0)