Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

パッケージマネージャを yarn に変更 #127

Merged
merged 1 commit into from
Nov 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions .github/workflows/run-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,20 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: ${{ env.NODE_VERSION }}
- name: Cache .pnpm-store
uses: actions/cache@v1
- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn cache dir)"
- uses: actions/cache@v2
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: ~/.pnpm-store
key: ${{ runner.os }}-node${{ env.NODE_VERSION }}-${{ hashFiles('**/pnpm-lock.yaml') }}
- run: npm i -g pnpm
- run: pnpm install
- run: pnpm lint
- run: pnpm type-check
- run: pnpm test -- --coverage
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
restore-keys: |
${{ runner.os }}-yarn-
- run: yarn install
- run: yarn lint
- run: yarn type-check
- run: yarn test -- --coverage
- name: Codecov
uses: codecov/codecov-action@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ node_modules
app
dist
package.json
pnpm-lock.yaml
yarn.lock
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
"version": "0.7.0",
"main": "./dist/app.js",
"scripts": {
"dev": "pnpm vite:dev & pnpm electron:dev",
"build": "pnpm clean && pnpm vite:build && pnpm electron:build",
"clean": "pnpm clean:app & pnpm clean:dist",
"dev": "yarn vite:dev & yarn electron:dev",
"build": "yarn clean && yarn vite:build && yarn electron:build",
"clean": "yarn clean:app & yarn clean:dist",
"serve": "vite preview",
"vite:dev": "vite",
"vite:build": "tsc && vite build",
"electron:dev": "pnpm electron:tsc && pnpm electron:copy && NODE_ENV=development electron --require dotenv/config ./dist/app.js",
"electron:build": "pnpm electron:tsc && pnpm electron:copy && env-cmd -f \".env.production\" babel dist/src --out-dir dist/src && node build.js",
"electron:dev": "yarn electron:tsc && yarn electron:copy && NODE_ENV=development electron --require dotenv/config ./dist/app.js",
"electron:build": "yarn electron:tsc && yarn electron:copy && env-cmd -f \".env.production\" babel dist/src --out-dir dist/src && node build.js",
"electron:copy": "cpx 'electron/assets/images/**' dist/assets/images",
"electron:tsc": "tsc -p tsconfig.electron.json",
"clean:app": "rimraf app",
Expand All @@ -20,7 +20,7 @@
"prepare": "husky install",
"format": "prettier --write \"**/*.{js,ts,tsx,json}\"",
"test": "jest",
"type-check": "pnpm type-check:renderer && pnpm type-check:electron",
"type-check": "yarn type-check:renderer && yarn type-check:electron",
"type-check:renderer": "tsc --noEmit",
"type-check:electron": "tsc -p tsconfig.electron.json --noEmit"
},
Expand Down Expand Up @@ -80,10 +80,10 @@
},
"lint-staged": {
"*.{js,ts,tsx,json}": [
"pnpm format"
"yarn format"
],
"*.{js,ts,tsx}": [
"pnpm lint"
"yarn lint"
]
}
}
Loading