Moved from yarn to npm

nathan-fiscaletti · Apr 18, 2024 · 5264d3e · 5264d3e
1 parent 191ded2
commit 5264d3e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 19 deletions.
diff --git a/.github/workflows/package_release.yml b/.github/workflows/package_release.yml
@@ -14,15 +14,12 @@ jobs:
         - uses: actions/setup-node@v1
           with:
             node-version: '18.x'
-        # Install yarn
-        - name: Install Yarn
-          run: npm install -g yarn
         # Install dependencies
         - name: Install Dependencies
-          run: yarn install
+          run: npm install
         # Build the project
         - name: Package for Linux
-          run: yarn electron:package:linux
+          run: npm run electron:package:linux
         # Rename the release artifact
         - name: Rename Artifact
           run: mv dist/frame-cast_*.deb dist/frame-cast_${{ github.event.release.tag_name }}_amd64.deb
@@ -41,20 +38,12 @@ jobs:
         - uses: actions/setup-node@v1
           with:
             node-version: '18.x'
-        # Install yarn
-        - name: Install Yarn
-          run: npm install -g yarn
-        # Disable yarn proxy
-        - name: Disable Yarn Proxy
-          run: npm config rm proxy
-        - name: Disable Yarn HTTPS Proxy
-          run: npm config rm https-proxy
         # Install dependencies
         - name: Install Dependencies
-          run: yarn install
+          run: npm install
         # Build the project
         - name: Package for Windows
-          run: yarn electron:package:win
+          run: npm run electron:package:win
         # Rename artifacts
         - name: Rename Artifact Executable
           run: mv "dist/FrameCast Setup *.exe" "dist/FrameCast Setup ${{ github.event.release.tag_name }}.exe"

diff --git a/package.json b/package.json
@@ -56,10 +56,10 @@
     "build": "react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
-    "electron:start": "concurrently -k \"cross-env BROWSER=none yarn start\" \"wait-on http://127.0.0.1:3000 && electronmon .\"",
-    "electron:package:mac": "yarn build && electron-builder -m -c.extraMetadata.main=build/electron.js",
-    "electron:package:win": "yarn build && electron-builder -w -c.extraMetadata.main=build/electron.js",
-    "electron:package:linux": "yarn build && electron-builder -l -c.extraMetadata.main=build/electron.js"
+    "electron:start": "concurrently -k \"cross-env BROWSER=none npm run start\" \"wait-on http://127.0.0.1:3000 && electronmon .\"",
+    "electron:package:mac": "npm run build && electron-builder -m -c.extraMetadata.main=build/electron.js",
+    "electron:package:win": "npm run build && electron-builder -w -c.extraMetadata.main=build/electron.js",
+    "electron:package:linux": "npm run build && electron-builder -l -c.extraMetadata.main=build/electron.js"
   },
   "eslintConfig": {
     "extends": [