Skip to content

Commit

Permalink
done
Browse files Browse the repository at this point in the history
  • Loading branch information
lacymorrow committed Jan 18, 2024
1 parent 417066a commit b6d4a22
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 15 deletions.
14 changes: 7 additions & 7 deletions .circleci/parallel-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ jobs:
# command: HOMEBREW_NO_AUTO_UPDATE=1 brew install snapcraft rpm
- node/install-packages:
# If you are using yarn, change the line below from "npm" to "yarn"
pkg-manager: yarn
pkg-manager: npm
# - run:
# name: Install Node Modules
# command: yarn --skip-integrity-check --network-timeout 300000
# command: npm run --skip-integrity-check --network-timeout 300000
- persist_to_workspace:
# Must be an absolute path, or relative path from working_directory. This is a directory on the container which is
# taken to be the root directory of the workspace.
Expand All @@ -65,7 +65,7 @@ jobs:
at: /tmp/crossover
- run:
name: Run snap
command: yarn build:snap
command: npm run build:snap

build_linux:
executor: macos-executor
Expand All @@ -75,7 +75,7 @@ jobs:
at: /tmp/crossover
- run:
name: Run snap
command: yarn build:linux
command: npm run build:linux

build_windows:
executor: macos-executor
Expand All @@ -85,10 +85,10 @@ jobs:
at: /tmp/crossover
- run:
name: Run windows
command: yarn build:windows
command: npm run build:windows
- run:
name: Create Windows EXE
command: yarn sh:copyexe
command: npm run sh:copyexe

build_mac:
executor: macos-executor
Expand All @@ -98,7 +98,7 @@ jobs:
at: /tmp/crossover
- run:
name: Run mac
command: yarn build:mac
command: npm run build:mac

cleanup:
executor: macos-executor
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16
14 || 16
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@
"node": "14"
},
"scripts": {
"install": "yarn css",
"install": "npm run css",
"postinstall": "electron-builder install-app-deps",
"css": "sass src/renderer/styles/index.scss:src/renderer/styles/dist/index.css src/renderer/styles/preferences.scss:src/renderer/styles/dist/preferences.css -s compressed",
"start": "yarn css && electron --disable-gpu-sandbox --trace-warnings .",
"start": "npm run css && electron --disable-gpu-sandbox --trace-warnings .",
"watch": "nodemon -e js,ts,scss --ignore 'dist/' --watch . --exec 'npm run start'",
"lint": "eslint --fix .",
"lint:src": "eslint --fix src",
Expand All @@ -54,7 +54,7 @@
"test:debug:console": "PWDEBUG=console CI=1 playwright test",
"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",
"depcheck": "npm run check:deps && npm run check:circular",
"release": "np --no-tests --branch release",
"release:snap": "snapcraft upload --release=CrossOver*.snap",
"pack": "rm -f *.tgz && electron-builder --dir",
Expand All @@ -72,12 +72,12 @@
"build:deb": "electron-builder --linux deb",
"build:rpm": "electron-builder --linux rpm",
"build:snap": "electron-builder --linux snap",
"build:release": "rm -rf dist && yarn build:mac && yarn build:wl && yarn build:snap && yarn sh:copyexe",
"build:release:snap": "electron-builder --linux snap && yarn snap:release",
"build:release:windows": "yarn build:windows && yarn sh:copyexe",
"build:release": "rm -rf dist && npm run build:mac && npm run build:wl && npm run build:snap && npm run sh:copyexe",
"build:release:snap": "electron-builder --linux snap && npm run snap:release",
"build:release:windows": "npm run build:windows && npm run sh:copyexe",
"snap:login:export": "snapcraft export-login --snaps crossover --channels edge,stable -",
"snap:release": "snapcraft upload --release=stable dist/*.snap",
"upgrade:interactive": "yarn upgrade-interactive --latest"
"upgrade:interactive": "npm run upgrade-interactive --latest"
},
"dependencies": {
"electron-debug": "^3.2.0",
Expand Down
3 changes: 3 additions & 0 deletions src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ const init = require( './main/init.js' )
const reset = require( './main/reset.js' )
const tray = require( './main/tray.js' )
const { appId } = require( '../package.json' )
const { menuBarHeight } = require( 'electron-util' )

const start = async () => {

Expand Down Expand Up @@ -180,6 +181,8 @@ const ready = async () => {

console.timeEnd( 'init' )

console.log( menuBarHeight() )

}

module.exports = async () => {
Expand Down

0 comments on commit b6d4a22

Please sign in to comment.