Skip to content

Commit

Permalink
Merge pull request #72 from little-buddy/next
Browse files Browse the repository at this point in the history
Migrate: build-tool use vite replace vue-cli
  • Loading branch information
Linkontoask authored Nov 29, 2023
2 parents 77529d5 + 4163981 commit f6b2134
Show file tree
Hide file tree
Showing 124 changed files with 29,403 additions and 22,070 deletions.
47 changes: 47 additions & 0 deletions .electron-builder.config.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .env.electron.build
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
VUE_APP_PLATFORM = electron
VUE_APP_NODE_ENV = production
VUE_APP_PORTABLE_EXECUTABLE_DIR
6 changes: 6 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,9 @@ packages/
cypress/
tests/e2e/
src/mp3
.yarn/
build/
dist/
node_modules/
public/
dist-electron/
57 changes: 41 additions & 16 deletions .eslintrc.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 19 additions & 9 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ jobs:
steps.cache-node-modules.outputs.cache-hit != 'true' ||
steps.cache-cypress-binary.outputs.cache-hit != 'true'
run: |
npx [email protected] bootstrap
npx cypress install
corepack enable
yarn
# cypress-run:
# name: Cypress run
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:

- uses: actions/setup-node@v1
with:
node-version: 12
node-version: 16

- name: Load node_modules
id: cache-node-modules
Expand All @@ -116,21 +116,25 @@ jobs:

- name: Install
if: steps.cache-node-modules.outputs.cache-hit != 'true'
run: yarn install --frozen-lockfile
run: |
corepack enable
yarn install --frozen-lockfile
- name: Lint
run: yarn lint
run: |
corepack enable
yarn lint
build-electron:
name: Automatically release electron version
runs-on: ubuntu-latest
runs-on: macos-latest
needs: install
steps:
- uses: actions/checkout@v2

- uses: actions/setup-node@v1
with:
node-version: 12
node-version: 16

- name: Load node_modules
id: cache-node-modules
Expand All @@ -143,10 +147,16 @@ jobs:

- name: Install
if: steps.cache-node-modules.outputs.cache-hit != 'true'
run: yarn install --frozen-lockfile
run: |
corepack enable
yarn install --frozen-lockfile
- name: Build electron
run: yarn build:electron:linux
run: |
corepack enable
yarn pkg
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Releases to github
run: |
Expand Down
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ node_modules
/dist-electron
/cypress
/tests/e2e/video
/out


# local env files
Expand Down Expand Up @@ -31,3 +32,11 @@ pnpm-debug.log*
/packages/api/dist

.vercel

.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
node_modules
*.md
.prettierrc.js
6 changes: 6 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"semi": false,
"singleQuote": true,
"trailingComma": "none",
"arrowParens": "avoid"
}
4 changes: 0 additions & 4 deletions .prettierrc.js

This file was deleted.

6 changes: 2 additions & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
{
"editor.tabSize": 2,
"merge-conflict.autoNavigateNextConflict.enabled": true,
"stylelint.packageManager": "yarn",
"prettier.packageManager": "yarn",
"prettier.semi": false,
"prettier.singleQuote": true,
"eslint.enable": true,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
},
},
"eslint.validate": ["javascript", "typescript", "typescriptreact", "vue"],
"prettier.disableLanguages": ["json", "md"],
"typescript.tsdk": "node_modules\\typescript\\lib",
"[less]": {
"editor.formatOnSave": true
Expand Down
2 changes: 2 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
nodeLinker: node-modules
npmRegistryServer: 'https://registry.npmmirror.com'
24 changes: 0 additions & 24 deletions babel.config.js

This file was deleted.

35 changes: 35 additions & 0 deletions electron.vite.config.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 21 additions & 0 deletions lyrics.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit f6b2134

Please sign in to comment.