Merge pull request #75 from little-buddy/flac

Update music-api version

.github/workflows/deploy.yml

@@ -8,10 +8,12 @@ on:
 
 jobs:
   install:
-    name: Install dependencies and cache modeles
+    name: Cache node_modules
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: recursive
 
       - name: Cache node modules
         id: cache-node-modules
@@ -38,7 +40,7 @@ jobs:
           steps.cache-cypress-binary.outputs.cache-hit != 'true'
         run: |
           corepack enable
-          yarn
+          yarn workspaces foreach install
 
   # cypress-run:
   #   name: Cypress run
@@ -95,11 +97,13 @@ jobs:
   #         ./script/deploy.sh $ACCESS_TOKEN github.com/hq001/test_video.git tests/e2e
 
   lint:
-    name: Yarn build
+    name: Lint code
     runs-on: ubuntu-latest
     needs: install
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: recursive
 
       - uses: actions/setup-node@v1
         with:
@@ -118,43 +122,65 @@ jobs:
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: |
           corepack enable 
-          yarn install --frozen-lockfile
+          yarn workspaces foreach install
 
       - name: Lint
         run: |
           corepack enable 
           yarn lint
 
   build-electron:
-    name: Automatically release electron version
-    runs-on: macos-latest
+    name: Deploy Radishes
+    strategy:
+      matrix:
+        os: [macos-latest, windows-latest, ubuntu-latest]
+    runs-on: ${{ matrix.os }}
     needs: install
     steps:
       - uses: actions/checkout@v2
+        with:
+          submodules: recursive
 
       - uses: actions/setup-node@v1
         with:
           node-version: 16
 
-      - name: Load node_modules
-        id: cache-node-modules
-        uses: actions/cache@v2
-        with:
-          path: |
-            node_modules
-            */*/node_modules
-          key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
+      # - name: Load node_modules
+      #   id: cache-node-modules
+      #   uses: actions/cache@v2
+      #   with:
+      #     path: |
+      #       node_modules
+      #       */*/node_modules
+      #     key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
 
       - name: Install
-        if: steps.cache-node-modules.outputs.cache-hit != 'true'
+        # if: steps.cache-node-modules.outputs.cache-hit != 'true'
+        run: |
+          corepack enable
+          yarn workspaces foreach install
+
+      - name: Build electron win
+        if: matrix.os == 'windows-latest'
         run: |
           corepack enable
-          yarn install --frozen-lockfile
+          yarn pkg:win
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build electron linux
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          corepack enable
+          yarn pkg:linux
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build electron
+      - name: Build electron macos
+        if: matrix.os == 'macos-latest'
         run: |
           corepack enable
-          yarn pkg
+          yarn pkg:macos
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "radishes-v2"]
+	path = packages/api
+	url = git@github.com:radishes-music/NeteaseCloudMusicApi.git
+	branch = radishes

.yarnrc.yml

@@ -1,2 +1,7 @@
 nodeLinker: node-modules
-npmRegistryServer: 'https://registry.npmmirror.com'
+
+npmRegistryServer: "https://registry.npmmirror.com"
+
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
+    spec: "@yarnpkg/plugin-workspace-tools"

package.json

@@ -6,18 +6,17 @@
   "author": "Linkontoask",
   "description": "Cross-platform copyright-free music platform",
   "scripts": {
-    "bootstrap": "npx lerna@3.22.1 bootstrap",
+    "bootstrap": "yarn workspaces foreach install",
     "dev": "concurrently -r \"yarn dev:api\" \"yarn generate:theme\" \"yarn dev:web\"",
     "dev:web": "cross-env NODE_ENV=development vite --mode browser",
-    "dev:api": "lerna exec --scope @radishes/api -- yarn run dev",
+    "dev:api": "yarn workspace @radishes/api run dev",
     "dev:electron": "concurrently -r \"yarn generate:theme\" \"electron-vite dev --mode electron.dev --outDir dist-electron\"",
-    "build": "cross-env NODE_ENV=production vite build --mode browser",
-    "build:electron": "npx electron-vite build --mode electron.build --outDir dist-electron",
-    "build:electron:win": "node script/build.js --win",
-    "build:electron:linux": "node script/build.js --linux",
-    "build:electron:macos": "node script/build.js --mac",
-    "build:api": "lerna exec --scope @radishes/api -- yarn run build",
-    "pkg": "npx rimraf dist-electron && yarn build:electron && npx electron-builder --config .electron-builder.config.js",
+    "build:web": "yarn generate:theme && cross-env NODE_ENV=production vite build --mode browser",
+    "build:electron": "npx rimraf dist-electron &&  npx electron-vite build --mode electron.build --outDir dist-electron",
+    "build:api": "yarn workspace @radishes/api run build",
+    "pkg:win": "yarn build:electron && yarn workspace @radishes/api run buildwin && npx electron-builder --config .electron-builder.config.js -w",
+    "pkg:linux": "yarn build:electron && yarn workspace @radishes/api run buildlinux && npx electron-builder --config .electron-builder.config.js -l",
+    "pkg:macos": "yarn build:electron && yarn workspace @radishes/api run buildmacos && npx electron-builder --config .electron-builder.config.js -m",
     "test": "lerna run test --stream",
     "test:unit": "vue-cli-service test:unit",
     "test:open": "cypress open",