Skip to content

Commit

Permalink
Merge pull request #38 from JuckZ/develop
Browse files Browse the repository at this point in the history
So many changes
  • Loading branch information
JuckZ authored Sep 16, 2023
2 parents 5def8b6 + 8580dbf commit e23a63e
Show file tree
Hide file tree
Showing 104 changed files with 7,869 additions and 3,674 deletions.
10 changes: 8 additions & 2 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module.exports = {
es6: true,
node: true,
browser: true,
// obsidian: true, TODO,one-eslint
},
extends: [
'plugin:vue/base',
Expand All @@ -20,22 +21,27 @@ module.exports = {
Atomics: 'readonly',
SharedArrayBuffer: 'readonly',
activeDocument: 'readonly',
app: 'readonly',
},
parser: 'vue-eslint-parser',
parserOptions: {
parser: '@typescript-eslint/parser',
tsconfigRootDir: './',
extraFileExtensions: ['.vue'],
// TODO 在工作区中,指定此目录会导致无法正常工作
// tsconfigRootDir: './',
// project: './tsconfig.json',
ecmaVersion: 6,
sourceType: 'module',
jsx: true,
ecmaFeatures: {
modules: true,
jsx: true,
},
},
plugins: ['@typescript-eslint', 'import'],
rules: {
// TODO
'import/no-unresolved': 'error',
'import/no-unresolved': ['error', { ignore: ['^virtual:'] }],
'vue/multi-word-component-names': 1,
'vue/no-v-model-argument': 'off',
'linebreak-style': ['error', 'unix'],
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ jobs:
name: Install pnpm
id: pnpm-install
with:
version: 7
run_install: false

- name: Get pnpm store directory
Expand All @@ -46,13 +45,20 @@ jobs:

- name: Test
run: pnpm run report:coverage

- name: Get the branch name
id: get-branch-name
run: echo "BRANCH_NAME=$(echo ${GITHUB_REF#refs/heads/})" >> $GITHUB_OUTPUT

- name: Build
id: build
if: ${{ steps.get-branch-name.outputs.BRANCH_NAME == 'master' }}
run: |
pnpm run build
cp manifest.json dest
- name: Release
if: ${{ steps.get-branch-name.outputs.BRANCH_NAME == 'master' }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -88,3 +88,4 @@ typings/
dist/**

.env.local
stats.html
4 changes: 2 additions & 2 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# tag-version-prefix=""
registry = https://registry.npmjs.org
@local:registry = http://localhost:4873/
# registry = https://registry.npmjs.org
# @local:registry = http://localhost:4873/
# registry = https://registry.npm.taobao.org
electron_mirror=https://npmmirror.com/mirrors/electron/
# proxy=http://localhost:7890
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ It's not too long now. Just finish reading.🤣

#### 番茄钟功能展示

<a href="https://w11ww.bilibili.com/video/BV1284y1H74R/?spm_id_from=333.999.0.0">
<a href="https://www.bilibili.com/video/BV1284y1H74R/?spm_id_from=333.999.0.0">
<img src="https://raw.githubusercontent.com/JuckZ/awesome-brain-manager/master/public/recording/preview/番茄钟示例.png" alt="番茄钟功能展示" width="200">
</a>

Expand Down
2 changes: 1 addition & 1 deletion README_en.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ It's not too long now. Just finish reading.🤣

#### pomodoro

<a href="https://w11ww.bilibili.com/video/BV1284y1H74R/?spm_id_from=333.999.0.0">
<a href="https://www.bilibili.com/video/BV1284y1H74R/?spm_id_from=333.999.0.0">
<img src="https://raw.githubusercontent.com/JuckZ/awesome-brain-manager/master/public/recording/preview/番茄钟示例.png" alt="番茄钟功能展示" width="49%">
</a>

Expand Down
3 changes: 2 additions & 1 deletion manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
"description": "A toolkit tries to solve all the trivial problems most people usually encountered in obsidian.",
"author": "Juck",
"authorUrl": "https://github.com/JuckZ",
"isDesktopOnly": false
"isDesktopOnly": false,
"fundingUrl": "https://github.com/JuckZ/awesome-brain-manager"
}
Loading

0 comments on commit e23a63e

Please sign in to comment.