Skip to content

Commit a66d6c3

Browse files
mProjectsCodemProjectsCode
committed
Merge branch 'master' into release
2 parents 7cadc7f + 33f55f6 commit a66d6c3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+3018
-1416
lines changed

‎.eslintrc

+19-22
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
11
{
2-
"root": true,
3-
"parser": "@typescript-eslint/parser",
4-
"env": { "node": true },
5-
"plugins": [
6-
"@typescript-eslint"
7-
],
8-
"extends": [
9-
"eslint:recommended",
10-
"plugin:@typescript-eslint/eslint-recommended",
11-
"plugin:@typescript-eslint/recommended"
12-
],
13-
"parserOptions": {
14-
"sourceType": "module"
15-
},
16-
"rules": {
17-
"no-unused-vars": "off",
18-
"@typescript-eslint/no-unused-vars": ["error", { "args": "none" }],
19-
"@typescript-eslint/ban-ts-comment": "off",
20-
"no-prototype-builtins": "off",
21-
"@typescript-eslint/no-empty-function": "off"
22-
}
23-
}
2+
"root": true,
3+
"parser": "@typescript-eslint/parser",
4+
"env": { "node": true },
5+
"plugins": ["@typescript-eslint", "only-warn"],
6+
"extends": ["eslint:recommended", "plugin:@typescript-eslint/eslint-recommended", "plugin:@typescript-eslint/recommended"],
7+
"parserOptions": {
8+
"sourceType": "module"
9+
},
10+
"rules": {
11+
"no-unused-vars": "off",
12+
"@typescript-eslint/no-unused-vars": ["error", { "args": "none" }],
13+
"@typescript-eslint/ban-ts-comment": "off",
14+
"no-prototype-builtins": "off",
15+
"@typescript-eslint/no-empty-function": "off",
16+
"@typescript-eslint/no-inferrable-types": "off",
17+
"@typescript-eslint/no-explicit-any": "off",
18+
"@typescript-eslint/explicit-function-return-type": ["warn"]
19+
}
20+
}

‎.github/ISSUE_TEMPLATE/api-request.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ about: Suggest a new API to be added to this plugin.
44
title: ''
55
labels: API request
66
assignees: ''
7-
87
---
98

109
**Name**
@@ -16,6 +15,5 @@ A link to their API documentation
1615
**What does the API do/offer**
1716
A short description of what data the API offers
1817

19-
20-
- [ ] Is the API free to use
21-
- [ ] Does the API require authentication
18+
- [ ] Is the API free to use
19+
- [ ] Does the API require authentication

‎.github/ISSUE_TEMPLATE/bug_report.md

+9-8
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ about: Create a report to help us improve
44
title: ''
55
labels: bug
66
assignees: ''
7-
87
---
98

10-
- [ ] The Plugin is up to date
11-
- [ ] Obsidian is up to date
9+
- [ ] The Plugin is up to date
10+
- [ ] Obsidian is up to date
1211

1312
**Describe the bug**
1413
A clear and concise description of what the bug is.
1514

1615
**To Reproduce**
1716
Steps to reproduce the behavior:
17+
1818
1. Go to '...'
1919
2. Click on '....'
2020
3. Scroll down to '....'
@@ -27,11 +27,12 @@ A clear and concise description of what you expected to happen.
2727
If applicable, add screenshots to help explain your problem.
2828

2929
**Occurs on**
30-
- [ ] Windows
31-
- [ ] macOS
32-
- [ ] Linux
33-
- [ ] Android
34-
- [ ] iOS
30+
31+
- [ ] Windows
32+
- [ ] macOS
33+
- [ ] Linux
34+
- [ ] Android
35+
- [ ] iOS
3536

3637
**Plugin version**
3738
x.x.x

‎.github/ISSUE_TEMPLATE/feature_request.md

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ about: Suggest an idea for this project
44
title: ''
55
labels: feature request
66
assignees: ''
7-
87
---
98

109
**Is your feature request related to a problem? Please describe.**

‎.github/workflows/release.yml

+72-67
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
# Sequence of patterns matched against refs/tags
66
tags:
7-
- "*" # Push events to matching any tag format, i.e. 1.0, 20.15.10
7+
- '*' # Push events to matching any tag format, i.e. 1.0, 20.15.10
88

99
env:
1010
PLUGIN_NAME: obsidian-media-db-plugin # Change this to the name of your plugin-id folder
@@ -14,69 +14,74 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- uses: actions/checkout@v2
18-
- name: Use Node.js
19-
uses: actions/setup-node@v1
20-
with:
21-
node-version: "14.x" # You might need to adjust this value to your own version
22-
- name: Build
23-
id: build
24-
run: |
25-
yarn
26-
yarn run build --if-present
27-
mkdir ${{ env.PLUGIN_NAME }}
28-
cp main.js manifest.json styles.css ${{ env.PLUGIN_NAME }}
29-
zip -r ${{ env.PLUGIN_NAME }}.zip ${{ env.PLUGIN_NAME }}
30-
ls
31-
echo "::set-output name=tag_name::$(git tag --sort version:refname | tail -n 1)"
32-
- name: Create Release
33-
id: create_release
34-
uses: actions/create-release@v1
35-
env:
36-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
37-
VERSION: ${{ github.ref }}
38-
with:
39-
tag_name: ${{ github.ref }}
40-
release_name: ${{ github.ref }}
41-
draft: false
42-
prerelease: false
43-
- name: Upload zip file
44-
id: upload-zip
45-
uses: actions/upload-release-asset@v1
46-
env:
47-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
48-
with:
49-
upload_url: ${{ steps.create_release.outputs.upload_url }}
50-
asset_path: ./${{ env.PLUGIN_NAME }}.zip
51-
asset_name: ${{ env.PLUGIN_NAME }}-${{ steps.build.outputs.tag_name }}.zip
52-
asset_content_type: application/zip
53-
- name: Upload main.js
54-
id: upload-main
55-
uses: actions/upload-release-asset@v1
56-
env:
57-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
58-
with:
59-
upload_url: ${{ steps.create_release.outputs.upload_url }}
60-
asset_path: ./main.js
61-
asset_name: main.js
62-
asset_content_type: text/javascript
63-
- name: Upload manifest.json
64-
id: upload-manifest
65-
uses: actions/upload-release-asset@v1
66-
env:
67-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
68-
with:
69-
upload_url: ${{ steps.create_release.outputs.upload_url }}
70-
asset_path: ./manifest.json
71-
asset_name: manifest.json
72-
asset_content_type: application/json
73-
- name: Upload styles.css
74-
id: upload-css
75-
uses: actions/upload-release-asset@v1
76-
env:
77-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
78-
with:
79-
upload_url: ${{ steps.create_release.outputs.upload_url }}
80-
asset_path: ./styles.css
81-
asset_name: styles.css
82-
asset_content_type: text/css
17+
- uses: actions/checkout@v3
18+
- name: Use Node.js
19+
uses: actions/setup-node@v3
20+
with:
21+
node-version: '16.x' # You might need to adjust this value to your own version
22+
- name: Build
23+
id: build
24+
run: |
25+
yarn
26+
yarn run build --if-present
27+
mkdir ${{ env.PLUGIN_NAME }}
28+
cp main.js manifest.json styles.css ${{ env.PLUGIN_NAME }}
29+
zip -r ${{ env.PLUGIN_NAME }}.zip ${{ env.PLUGIN_NAME }}
30+
ls
31+
echo "tag_name=$(git tag --sort version:refname | tail -n 1)" >> $GITHUB_OUTPUT
32+
33+
- name: Create Release
34+
id: create_release
35+
uses: actions/create-release@v1
36+
env:
37+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
38+
VERSION: ${{ github.ref }}
39+
with:
40+
tag_name: ${{ github.ref }}
41+
release_name: ${{ github.ref }}
42+
draft: false
43+
prerelease: false
44+
45+
- name: Upload zip file
46+
id: upload-zip
47+
uses: actions/upload-release-asset@v1
48+
env:
49+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
50+
with:
51+
upload_url: ${{ steps.create_release.outputs.upload_url }}
52+
asset_path: ./${{ env.PLUGIN_NAME }}.zip
53+
asset_name: ${{ env.PLUGIN_NAME }}-${{ steps.build.outputs.tag_name }}.zip
54+
asset_content_type: application/zip
55+
56+
- name: Upload main.js
57+
id: upload-main
58+
uses: actions/upload-release-asset@v1
59+
env:
60+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
61+
with:
62+
upload_url: ${{ steps.create_release.outputs.upload_url }}
63+
asset_path: ./main.js
64+
asset_name: main.js
65+
asset_content_type: text/javascript
66+
67+
- name: Upload manifest.json
68+
id: upload-manifest
69+
uses: actions/upload-release-asset@v1
70+
env:
71+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
72+
with:
73+
upload_url: ${{ steps.create_release.outputs.upload_url }}
74+
asset_path: ./manifest.json
75+
asset_name: manifest.json
76+
asset_content_type: application/json
77+
78+
- name: Upload styles.css
79+
id: upload-css
80+
uses: actions/upload-release-asset@v1
81+
env:
82+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
83+
with:
84+
upload_url: ${{ steps.create_release.outputs.upload_url }}
85+
asset_path: ./styles.css
86+
asset_name: styles.css
87+
asset_content_type: text/css

‎.prettierignore

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/lib
2+
node_modules
3+
package-lock.json
4+
data.json
5+
main.js

‎.prettierrc.json

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"printWidth": 180,
3+
"useTabs": true,
4+
"semi": true,
5+
"singleQuote": true,
6+
"arrowParens": "avoid"
7+
}

0 commit comments

Comments
 (0)