Merge pull request #11 from cupcakearmy/1.3.2

1.3.2

.github/workflows/release.yml

@@ -1,7 +1,9 @@
 name: Main
 
 on:
-  workflow_dispatch:
+  push:
+    tags:
+      - "v*.*.*"
 
 jobs:
   build:
@@ -12,9 +14,11 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: "14"
+      - name: PNPM
+        run: npm i -g pnpm
       - name: Install dependencies
-        run: yarn install --frozen-lockfile
+        run: pnpm install --frozen-lockfile
       - name: Build
-        run: yarn run dist
+        run: pnpm run dist
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.npmrc

@@ -0,0 +1 @@
+engine-strict=true

CHANGELOG.md

@@ -5,44 +5,54 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.3.2] - 2022-01-09
+
+### Changed
+
+- Moved to pnpm
+
+### Security
+
+- Updated all dependencies.
+
 ## [1.3.1] - 2021-06-17
 
 ### Fixed
 
-- Pause on Mic/Camera was not working correctly
+- Pause on Mic/Camera was not working correctly.
 
 ## [1.3.0] - 2021-06-10
 
 ### Added
 
-- [macOS] Pause on Mic/Camera
+- [macOS] Pause on Mic/Camera.
 
 ## [1.2.0] - 2021-06-01
 
 ### Added
 
-- Progress bar
+- Progress bar.
 
 ## [1.1.2] - 2021-05-31
 
 ### Fixed
 
-- Bug with update window when banner is currently open
+- Bug with update window when banner is currently open.
 
 ## [1.1.1] - 2021-05-28
 
 ### Added
 
-- Restore focus to previous window when closing banner
-- Responsive image
+- Restore focus to previous window when closing banner.
+- Responsive image.
 
 ### Fixed
 
-- Settings page not opening
+- Settings page not opening.
 
 ## [1.1.0] - 2021-05-15
 
 ### Added
 
-- Only pause for a limited time
-- Volume slider for the sound
+- Only pause for a limited time.
+- Volume slider for the sound.

README.md

@@ -25,10 +25,10 @@ Head to the [release page](https://github.com/cupcakearmy/unpixel/releases) and
 ## 🛠 Building / Development
 
 1. Clone the repo
-2. `yarn install`
-3. `yarn dist` to build for all platforms
+2. `pnpm install`
+3. `pnpm dist` to build for all platforms
 
-Alternatively you can run `yarn build` and the `yarn electron-builder -m` for `macOS`, `-l` fir `linux` or `-w` for `windows`.
+Alternatively you can run `pnpm build` and the `pnpm electron-builder -m` for `macOS`, `-l` fir `linux` or `-w` for `windows`.
 
 ## 📦 Release
 

package.json

@@ -11,12 +11,17 @@
   "repository": {
     "url": "https://github.com/cupcakearmy/unpixel"
   },
-  "version": "1.3.1",
+  "version": "1.3.2",
   "main": "./dist/back/index.js",
+  "engines": {
+    "node": "14",
+    "npm": "please-use-pnpm",
+    "yarn": "please-use-pnpm"
+  },
   "scripts": {
     "start": "electron .",
-    "watch:front": "parcel watch --target front --no-hmr --no-cache ./src/front/*/index.html",
-    "watch:back": "parcel watch --target back --no-hmr --no-cache ./src/back/index.ts",
+    "watch:front": "parcel watch --target front --no-hmr ./src/front/*/index.html",
+    "watch:back": "parcel watch --target back --no-hmr ./src/back/index.ts",
     "dev": "run-p watch:*",
     "build:front": "parcel build --target front ./src/front/*/index.html",
     "build:back": "parcel build --target back ./src/back/index.ts",
@@ -42,10 +47,10 @@
   },
   "dependencies": {
     "auto-launch": "^5.0.5",
-    "axios": "^0.21.1",
-    "dayjs": "^1.10.4",
-    "electron-log": "^4.3.2",
-    "electron-store": "^7.0.2",
+    "axios": "^0.25.0",
+    "dayjs": "^1.10.7",
+    "electron-log": "^4.4.5",
+    "electron-store": "^8.0.1",
     "ms": "^2.1.3",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
@@ -54,17 +59,17 @@
     "tachyons": "^4.12.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.0-0",
-    "@types/auto-launch": "^5.0.1",
+    "@babel/core": "^7.16.10",
+    "@types/auto-launch": "^5.0.2",
     "@types/ms": "^0.7.31",
-    "@types/react": "^17.0.3",
-    "@types/react-dom": "^17.0.3",
-    "@types/semver": "^7.3.4",
-    "electron": "^11",
-    "electron-builder": "^22.10.5",
+    "@types/react": "^17.0.38",
+    "@types/react-dom": "^17.0.11",
+    "@types/semver": "^7.3.9",
+    "electron": "^11.5.0",
+    "electron-builder": "^22.14.5",
     "npm-run-all": "^4.1.5",
-    "parcel": "^2.0.0-beta.3.1",
-    "postcss": "^8.2.10",
-    "typescript": "^4.2.3"
+    "parcel": "^2.2.1",
+    "postcss": "^8.4.5",
+    "typescript": "^4.5.5"
   }
 }

src/back/index.ts

@@ -10,8 +10,10 @@ import { InputDevicesStatus } from './utils'
 export const DEV = !app.isPackaged
 
 // Enforce single instance
-const isMain = app.requestSingleInstanceLock()
-if (!isMain) app.quit()
+if (!app.requestSingleInstanceLock()) {
+  logger.warn('Another instance is already running. Exiting.')
+  app.quit()
+}
 
 // Disable gpu
 app.disableHardwareAcceleration()

src/front/banner/index.css

@@ -1,4 +1,4 @@
-@import 'tachyons/css/tachyons.css';
+@import '../../../node_modules/tachyons/css/tachyons.css';
 
 body {
   background-color: #111;

src/front/banner/index.html

@@ -8,6 +8,6 @@
   </head>
   <body>
     <main></main>
-    <script src="./index.tsx"></script>
+    <script type="module" src="./index.tsx"></script>
   </body>
 </html>

src/front/base.css

@@ -1,5 +1,5 @@
-@import 'spectre.css/dist/spectre.min.css';
-@import 'tachyons/css/tachyons.min.css';
+@import '../../node_modules/spectre.css/dist/spectre.css';
+@import '../../node_modules/tachyons/css/tachyons.css';
 
 body {
   font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans',

src/front/settings/index.html

@@ -8,6 +8,6 @@
   </head>
   <body>
     <main></main>
-    <script src="./index.tsx"></script>
+    <script type="module" src="./index.tsx"></script>
   </body>
 </html>