Skip to content

Commit 4cbb529

Browse files
committed
chore(prettier): fix all files
1 parent 19ee861 commit 4cbb529

File tree

571 files changed

+23281
-23995
lines changed

Some content is hidden

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

571 files changed

+23281
-23995
lines changed

.github/workflows_old/docker.yaml

+50-50
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
11
name: Publish Docker image
22
on:
3-
push:
4-
tags: [v*]
3+
push:
4+
tags: [v*]
55
jobs:
6-
push_to_registries:
7-
name: Push Docker image to multiple registries
8-
runs-on: ubuntu-latest
9-
permissions:
10-
packages: write
11-
contents: read
12-
steps:
13-
- name: Checkout
14-
uses: actions/checkout@v2
15-
- name: Set up QEMU
16-
uses: docker/setup-qemu-action@v1
17-
- name: Docker meta
18-
id: meta
19-
uses: docker/metadata-action@v3
20-
with:
21-
images: |
22-
zadam/trilium
23-
ghcr.io/zadam/trilium
24-
tags: |
25-
type=semver,pattern={{version}}
26-
type=semver,pattern={{major}}.{{minor}}-latest
27-
type=match,pattern=(\d+.\d+).\d+\-beta,enable=${{ endsWith(github.ref, 'beta') }},group=1,suffix=-latest
28-
- name: Set up Docker Buildx
29-
uses: docker/setup-buildx-action@v1
30-
with:
31-
install: true
32-
- name: Log in to Docker Hub
33-
uses: docker/login-action@v1
34-
with:
35-
username: ${{ secrets.DOCKER_USERNAME }}
36-
password: ${{ secrets.DOCKER_PASSWORD }}
37-
- name: Log in to GitHub Docker Registry
38-
uses: docker/login-action@v1
39-
with:
40-
registry: ghcr.io
41-
username: ${{ github.repository_owner }}
42-
password: ${{ secrets.GITHUB_TOKEN }}
43-
- name: Create server-package.json
44-
run: cat package.json | grep -v electron > server-package.json
45-
- name: Build and Push
46-
uses: docker/[email protected]
47-
with:
48-
context: .
49-
platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
50-
push: true
51-
cache-from: type=registry,ref=zadam/trilium:buildcache
52-
cache-to: type=registry,ref=zadam/trilium:buildcache,mode=max
53-
tags: ${{ steps.meta.outputs.tags }}
6+
push_to_registries:
7+
name: Push Docker image to multiple registries
8+
runs-on: ubuntu-latest
9+
permissions:
10+
packages: write
11+
contents: read
12+
steps:
13+
- name: Checkout
14+
uses: actions/checkout@v2
15+
- name: Set up QEMU
16+
uses: docker/setup-qemu-action@v1
17+
- name: Docker meta
18+
id: meta
19+
uses: docker/metadata-action@v3
20+
with:
21+
images: |
22+
zadam/trilium
23+
ghcr.io/zadam/trilium
24+
tags: |
25+
type=semver,pattern={{version}}
26+
type=semver,pattern={{major}}.{{minor}}-latest
27+
type=match,pattern=(\d+.\d+).\d+\-beta,enable=${{ endsWith(github.ref, 'beta') }},group=1,suffix=-latest
28+
- name: Set up Docker Buildx
29+
uses: docker/setup-buildx-action@v1
30+
with:
31+
install: true
32+
- name: Log in to Docker Hub
33+
uses: docker/login-action@v1
34+
with:
35+
username: ${{ secrets.DOCKER_USERNAME }}
36+
password: ${{ secrets.DOCKER_PASSWORD }}
37+
- name: Log in to GitHub Docker Registry
38+
uses: docker/login-action@v1
39+
with:
40+
registry: ghcr.io
41+
username: ${{ github.repository_owner }}
42+
password: ${{ secrets.GITHUB_TOKEN }}
43+
- name: Create server-package.json
44+
run: cat package.json | grep -v electron > server-package.json
45+
- name: Build and Push
46+
uses: docker/[email protected]
47+
with:
48+
context: .
49+
platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
50+
push: true
51+
cache-from: type=registry,ref=zadam/trilium:buildcache
52+
cache-to: type=registry,ref=zadam/trilium:buildcache,mode=max
53+
tags: ${{ steps.meta.outputs.tags }}

.vscode/extensions.json

+2-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
{
2-
"recommendations": [
3-
"lokalise.i18n-ally",
4-
"editorconfig.editorconfig"
5-
]
6-
}
2+
"recommendations": ["lokalise.i18n-ally", "editorconfig.editorconfig"]
3+
}

.vscode/launch.json

+21-23
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
{
2-
"version": "0.2.0",
3-
"configurations": [
4-
// nodemon should be installed globally, use npm i -g nodemon
5-
{
6-
"console": "integratedTerminal",
7-
"internalConsoleOptions": "neverOpen",
8-
"name": "nodemon start-server",
9-
"program": "${workspaceFolder}/src/www",
10-
"request": "launch",
11-
"restart": true,
12-
"runtimeExecutable": "nodemon",
13-
"env": {
14-
"TRILIUM_ENV": "dev",
15-
"TRILIUM_DATA_DIR": "./data"
16-
},
17-
"skipFiles": [
18-
"<node_internals>/**"
19-
],
20-
"type": "node",
21-
"outputCapture": "std",
22-
},
23-
]
24-
}
2+
"version": "0.2.0",
3+
"configurations": [
4+
// nodemon should be installed globally, use npm i -g nodemon
5+
{
6+
"console": "integratedTerminal",
7+
"internalConsoleOptions": "neverOpen",
8+
"name": "nodemon start-server",
9+
"program": "${workspaceFolder}/src/www",
10+
"request": "launch",
11+
"restart": true,
12+
"runtimeExecutable": "nodemon",
13+
"env": {
14+
"TRILIUM_ENV": "dev",
15+
"TRILIUM_DATA_DIR": "./data"
16+
},
17+
"skipFiles": ["<node_internals>/**"],
18+
"type": "node",
19+
"outputCapture": "std"
20+
}
21+
]
22+
}

.vscode/settings.json

+20-25
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,22 @@
11
{
2-
"editor.formatOnSave": false,
3-
"editor.defaultFormatter": "esbenp.prettier-vscode",
4-
"files.eol": "\n",
5-
"typescript.tsdk": "node_modules/typescript/lib",
6-
"i18n-ally.sourceLanguage": "en",
7-
"i18n-ally.keystyle": "nested",
8-
"i18n-ally.localesPaths": [
9-
"./src/public/translations",
10-
"./translations"
11-
],
12-
"[jsonc]": {
13-
"editor.defaultFormatter": "vscode.json-language-features"
14-
},
15-
"[javascript]": {
16-
"editor.defaultFormatter": "vscode.typescript-language-features"
17-
},
18-
"[typescript]": {
19-
"editor.defaultFormatter": "vscode.typescript-language-features"
20-
},
21-
"github-actions.workflows.pinned.workflows": [
22-
".github/workflows/nightly.yml"
23-
],
24-
"[css]": {
25-
"editor.defaultFormatter": "vscode.css-language-features"
26-
},
2+
"editor.formatOnSave": false,
3+
"editor.defaultFormatter": "esbenp.prettier-vscode",
4+
"files.eol": "\n",
5+
"typescript.tsdk": "node_modules/typescript/lib",
6+
"i18n-ally.sourceLanguage": "en",
7+
"i18n-ally.keystyle": "nested",
8+
"i18n-ally.localesPaths": ["./src/public/translations", "./translations"],
9+
"[jsonc]": {
10+
"editor.defaultFormatter": "vscode.json-language-features"
11+
},
12+
"[javascript]": {
13+
"editor.defaultFormatter": "vscode.typescript-language-features"
14+
},
15+
"[typescript]": {
16+
"editor.defaultFormatter": "vscode.typescript-language-features"
17+
},
18+
"github-actions.workflows.pinned.workflows": [".github/workflows/nightly.yml"],
19+
"[css]": {
20+
"editor.defaultFormatter": "vscode.css-language-features"
21+
}
2722
}

.vscode/snippets.code-snippets

+22-24
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
11
{
2-
// Place your Notes workspace snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and
3-
// description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope
4-
// is left empty or omitted, the snippet gets applied to all languages. The prefix is what is
5-
// used to trigger the snippet and the body will be expanded and inserted. Possible variables are:
6-
// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders.
7-
// Placeholders with the same ids are connected.
8-
// Example:
9-
// "Print to console": {
10-
// "scope": "javascript,typescript",
11-
// "prefix": "log",
12-
// "body": [
13-
// "console.log('$1');",
14-
// "$2"
15-
// ],
16-
// "description": "Log output to console"
17-
// }
2+
// Place your Notes workspace snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and
3+
// description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope
4+
// is left empty or omitted, the snippet gets applied to all languages. The prefix is what is
5+
// used to trigger the snippet and the body will be expanded and inserted. Possible variables are:
6+
// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders.
7+
// Placeholders with the same ids are connected.
8+
// Example:
9+
// "Print to console": {
10+
// "scope": "javascript,typescript",
11+
// "prefix": "log",
12+
// "body": [
13+
// "console.log('$1');",
14+
// "$2"
15+
// ],
16+
// "description": "Log output to console"
17+
// }
1818

19-
"JQuery HTMLElement field": {
20-
"scope": "typescript",
21-
"prefix": "jqf",
22-
"body": [
23-
"private $${1:name}!: JQuery<HTMLElement>;"
24-
]
25-
}
26-
}
19+
"JQuery HTMLElement field": {
20+
"scope": "typescript",
21+
"prefix": "jqf",
22+
"body": ["private $${1:name}!: JQuery<HTMLElement>;"]
23+
}
24+
}

0 commit comments

Comments
 (0)