Merge branch 'release'

* release:
  tweak
  v3.2.0
  tweaks
  Updated config.yml
  test
  test
  test
  test
  test
  test
  test
  add lock
  bump
  read
  remove lock
  remove lock
  update playwright

.circleci/config.yml

@@ -15,16 +15,18 @@ jobs:
       - checkout
       - run:
           command: pwd
-      - node/install-packages:
-          pkg-manager: yarn
+      - run:
+          command: npm i --openssl-fips=''
+      # - node/install-packages:
+      #     pkg-manager: npm
       - run:
           command: sudo apt-get update
           name: Update apt-get
       - run:
           command: sudo apt-get install rpm
           name: Install Dependencies
       - run:
-          command: yarn build:rpm
+          command: npm run build:rpm --openssl-fips=""
           name: Build app
       - run:
           name: Create Artifacts
@@ -55,36 +57,36 @@ jobs:
           install-yarn: true
           node-version: "16.20.0"
       # AT SOME POINT YARN INSTALL BROKE FOR NO REASON, TRY SWITCHING BACK TO YARN TO SEE IF IT WORKS
-      - node/install-packages:
-          # If you are using yarn, change the line below from "npm" to "yarn"
-          pkg-manager: yarn
-      # - run:
-      #     name: Install Node modules
-      #     command: npm i  --openssl-fips=''
+      # - node/install-packages:
+      #     # If you are using yarn, change the line below from "npm" to "yarn"
+      #     pkg-manager: yarn
+      - run:
+          name: Install Node modules
+          command: npm i  --openssl-fips=''
       - run:
           name: Brew Clean
           command: rm '/usr/local/lib/python3.9/site-packages/six.py'
       - run:
           name: Install Dependencies
           command: HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_CLEANUP=1 brew install snapcraft rpm
-      - run:
-          name: Run tests
-          command: yarn test || echo "There were test failures, this build may be sour."
+      # - run:
+      #     name: Run tests
+      #     command: yarn test || echo "There were test failures, this build may be sour."
       - run:
           name: Build and Publish - windows
-          command: yarn build:windows $( [ "$CIRCLE_BRANCH" != "release" ] && printf %s '--publish never' )
+          command: npm run build:windows $( [ "$CIRCLE_BRANCH" != "release" ] && printf %s '--publish-never' ) --openssl-fips=""
       # - run:
       #     name: Create Windows EXE
       #     command: yarn sh:copyexe
       - run:
           name: Build and Publish - windows CrossOver.exe
-          command: yarn build:windows:exe || echo 'We error here since latest.yml has already been uploaded.'
+          command: npm run build:windows:exe --openssl-fips="" || echo 'We error here since latest.yml has already been uploaded.'
       - run:
           name: Build and Publish - linux
-          command: yarn build:linux
+          command: npm run build:linux --openssl-fips=""
       - run:
           name: Build and Publish - mac
-          command: yarn build:mac
+          command: npm run build:mac --openssl-fips=""
       - run:
           name: ls dist
           command: ls dist
@@ -113,7 +115,7 @@ jobs:
       #       command: snapcraft login
       - run:
           name: Build and Publish - snap
-          command: yarn build:snap $( [ "$CIRCLE_BRANCH" == "release" ] && printf %s '--publish always' )
+          command: npm run build:snap $( [ "$CIRCLE_BRANCH" == "release" ] && printf %s '--publish-always' )  --openssl-fips=""
 
 workflows:
   # Below is the definition of your workflow.

.gitignore

@@ -1,4 +1,3 @@
 node_modules
-package-lock.json
 dist
 src/renderer/styles/dist

.nvmrc

@@ -1 +1 @@
-14.21
+16

package.json

@@ -2,7 +2,7 @@
 	"name": "crossover",
 	"productName": "CrossOver",
 	"appId": "com.lacymorrow.crossover",
-	"version": "3.1.5",
+	"version": "3.2.0",
 	"description": "A Crosshair Overlay for any screen",
 	"copyright": "Copyright © Lacy Morrow",
 	"repository": "lacymorrow/crossover",
@@ -48,7 +48,7 @@
 		"check:deps": "depcheck --ignores=bindings,electron-builder-squirrel-windows,electron-reloader,sass --ignore-dirs=build,dist",
 		"check:circular": "madge --circular .",
 		"depcheck": "yarn check:deps && yarn check:circular",
-		"release": "np --branch release && yarn build:release",
+		"release": "np --no-tests --branch release",
 		"release:snap": "snapcraft upload --release=CrossOver*.snap",
 		"pack": "rm -f *.tgz && electron-builder --dir",
 		"sh:copyexe": "cp dist/CrossOver-[!Portable]*.exe dist/CrossOver.exe",
@@ -87,7 +87,7 @@
 	"devDependencies": {
 		"@babel/core": "^7.17.8",
 		"@babel/eslint-parser": "^7.17.0",
-		"@playwright/test": "^1.21.0",
+		"@playwright/test": "^1.39.0",
 		"axe-playwright": "^1.1.11",
 		"bindings": "^1.5.0",
 		"depcheck": "^1.4.3",

readme.md

@@ -8,6 +8,16 @@
 
 ![Latest releases](https://img.shields.io/github/downloads/lacymorrow/crossover/latest/total?label=CrossOver%40latest) [![Snapcraft](https://snapcraft.io/crossover/badge.svg)](https://snapcraft.io/crossover) [![Trending](https://snapcraft.io/crossover/trending.svg?name=0)](https://snapcraft.io/crossover) [![Maintainability](https://api.codeclimate.com/v1/badges/2f447345bdeff3565392/maintainability)](https://codeclimate.com/github/lacymorrow/crossover/maintainability) [![CircleCI](https://circleci.com/gh/lacymorrow/crossover/tree/release.svg?style=shield)](https://circleci.com/gh/lacymorrow/crossover/) [![Appveyor](https://ci.appveyor.com/api/projects/status/qtxvaliwymvhxiwx/branch/release?svg=true)](https://ci.appveyor.com/project/lacymorrow/crossover/)
 
+[![forthebadge](http://forthebadge.com/images/badges/built-by-developers.svg)](http://forthebadge.com)&nbsp;&nbsp;&nbsp;&nbsp;[![forthebadge](http://forthebadge.com/images/badges/for-developers.svg)](http://forthebadge.com)<br />
+
+<div>
+<a href="https://gitHub.com/lacymorrow/crossover/stargazers/"><img src="https://img.shields.io/github/stars/lacymorrow/crossover.svg?style=social&amp;label=Star&amp;maxAge=2592000" alt="GitHub stars" style="max-width: 100%;"></a>&nbsp;&nbsp;&nbsp;<a href="https://gitHub.com/lacymorrow/crossover/network/"><img src="https://img.shields.io/github/forks/lacymorrow/crossover.svg?style=social&amp;label=Forks&amp;maxAge=2592000" alt="GitHub forks" style="max-width: 100%;"></a>&nbsp;&nbsp;&nbsp;<a href="https://gitHub.com/lacymorrow/crossover/watchers/"><img src="https://img.shields.io/github/watchers/lacymorrow/crossover.svg?style=social&amp;label=Watching&amp;maxAge=2592000" alt="GitHub watchers" style="max-width: 100%;"></a>
+</div>
+<br />
+
+[!["Buy Me A Coffee"](https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png)](https://www.buymeacoffee.com/lm)
+
+
 #### Get it on the Windows App Store and Linux Snap Store
 
 <div>

src/renderer/index.html

@@ -5,7 +5,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
 		<title>CrossOver</title>
-		<meta http-equiv="Content-Security-Policy" content="default-src 'self'; script-src 'self' 'unsafe-eval' 'unsafe-inline'; media-src *;">
+		<meta http-equiv="Content-Security-Policy" content="default-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-eval' 'unsafe-inline'; media-src *;">
 		<link rel="stylesheet" href="styles/dist/index.css">
 		<script type="text/javascript" src="vendor/feather/feather-icons.min.js"></script>
 		<script type="text/javascript" src="vendor/inline-svg/inline-svg.min.js"></script>

test/helpers.js

@@ -84,12 +84,18 @@ const closeApp = async () => {
 
 const focusedMinimizedVisible = async ( { electronApp, windowName } ) => electronApp.evaluate( async ( { BrowserWindow }, windowName ) => {
 
-	console.log( windowName )
 	const windows = await BrowserWindow.getAllWindows()
-	const win = windows.find( w => w.title === windowName )
+	let win = windows.find( w => w.title === windowName )
+	if ( !win ) {
+
+		console.warn( `Window "${windowName}" not found, using "${win.title}" instead` )
+		win = windows[0]
+
+	}
+
 	win?.focus()
 
-	return { focused: win.isFocused(), minimized: win.isMinimized(), visible: win.isVisible() }
+	return { focused: win?.isFocused(), minimized: win?.isMinimized(), visible: win?.isVisible() }
 
 }, windowName )