Merge pull request #23 from goosewobbler/0.0.16

.eslintignore

@@ -1,3 +1,4 @@
 .vscode
 dist
+bundle
 static

.gitignore

@@ -2,6 +2,7 @@ lib
 node_modules
 public
 dist
+bundle
 coverage
 *.log
 .DS_Store

.nvmrc

@@ -0,0 +1 @@
+14.18.0

build/entitlements.mac.plist

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+    <true/>
+  </dict>
+</plist>

docs/architecture.md

@@ -4,6 +4,7 @@ This application is comprised of the following root directory structure:
 
 ```
 .vscode/
+bundle/
 dist/
 docs/
 src/
@@ -18,9 +19,13 @@ webpack/
 
 A configuration directory for the VSCode editor.
 
+#### bundle/
+
+This directory is (re)created at build time - all bundled files and everything the app needs to run ends up in here.
+
 #### dist/
 
-This directory is (re)created at build time for the app to load - all compiled files and everything the app needs to run ends up in here.
+This directory is (re)created at build time - all fully built packages for publishing end up in here.
 
 #### docs/
 

electron-builder.json

@@ -0,0 +1,31 @@
+{
+  "asar": true,
+  "appId": "com.dj-helper.app",
+  "copyright": "goosewobbler",
+  "productName": "DJ Helper",
+  "artifactName": "${name}-${version}-${os}-${arch}.${ext}",
+  "afterSign": "./scripts/notarize.js",
+  "files": ["bundle/**/*", "build/**/*"],
+  "mac": {
+    "category": "public.app-category.music",
+    "icon": "build/icon.icns",
+    "hardenedRuntime": true,
+    "entitlements": "./build/entitlements.mac.plist",
+    "entitlementsInherit": "./build/entitlements.mac.plist"
+  },
+  "win": {
+    "target": "nsis",
+    "icon": "build/icon.ico"
+  },
+  "nsis": {
+    "deleteAppDataOnUninstall": true
+  },
+  "linux": {
+    "category": "Audio",
+    "icon": "build/icon/",
+    "desktop": {
+      "StartupWMClass": "dj helper"
+    },
+    "target": ["AppImage"]
+  }
+}

package.json

@@ -1,9 +1,10 @@
 {
   "name": "dj-helper",
   "description": "A tool for constructing DJ sets",
-  "version": "0.0.15",
+  "version": "0.0.16",
   "author": "Sam Maister <[email protected]>",
-  "license": "UNLICENSED",
+  "license": "AGPL-3.0-or-later",
+  "main": "./bundle/main.prod.js",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/goosewobbler/dj-helper.git"
@@ -12,19 +13,27 @@
     "init": "pnpm install",
     "preinstall": "npx only-allow pnpm",
     "check-types": "tsc --noEmit",
-    "clean": "rm -rf ./dist",
-    "clean:all": "rm -rf pnpm-lock.yaml ./node_modules ./dist",
-    "dev": "pnpm clean && pnpm dev:build:main && pnpm dev:build:preload && cross-env pnpm dev:start-server",
-    "dist": "pnpm build && electron-builder",
-    "dist:pack": "pnpm build && electron-builder --dir",
-    "build": "pnpm clean && concurrently 'pnpm build:main' 'pnpm build:preload' 'pnpm build:renderer'",
-    "build:main": "cross-env NODE_ENV=production webpack --config ./webpack/main.config.js --color",
-    "build:preload": "cross-env NODE_ENV=production webpack --config ./webpack/preload.config.js --color",
-    "build:renderer": "cross-env NODE_ENV=production webpack --config ./webpack/renderer.config.js --color",
-    "start": "cross-env NODE_ENV=production electron ./dist/main.prod.js",
-    "dev:build:main": "cross-env NODE_ENV=development webpack --config ./webpack/main.config.js --color",
-    "dev:build:preload": "cross-env NODE_ENV=development webpack --config ./webpack/preload.config.js --color",
-    "dev:start": "cross-env NODE_ENV=development electron -r @babel/register ./dist/main.dev.js",
+    "clean": "cross-env rm -rf pnpm-lock.yaml ./node_modules ./bundle ./dist",    
+    "clean:build": "cross-env rm -rf ./bundle ./dist",
+    "clean:bundle": "cross-env rm -rf ./bundle",
+    "dev": "pnpm clean:build && pnpm dev:bundle:main && pnpm dev:bundle:preload && cross-env pnpm dev:start-server",
+    "build": "pnpm clean:build && pnpm bundle && electron-builder",
+    "build:all": "node scripts/build.mjs all",
+    "build:mac": "node scripts/build.mjs mac",
+    "build:mac-arm64": "node scripts/build.mjs mac-arm64",
+    "build:appimage": "node scripts/build.mjs appimage",
+    "build:appimage-x64": "node scripts/build.mjs appimage-x64",
+    "build:appimage-arm64": "node scripts/build.mjs appimage-arm64",
+    "build:windows": "node scripts/build.mjs windows",
+    "build:dir": "pnpm clean:build && pnpm bundle && electron-builder --dir",
+    "bundle": "concurrently 'pnpm bundle:main' 'pnpm bundle:preload' 'pnpm bundle:renderer'",
+    "bundle:main": "cross-env NODE_ENV=production webpack --config ./webpack/main.config.js --color",
+    "bundle:preload": "cross-env NODE_ENV=production webpack --config ./webpack/preload.config.js --color",
+    "bundle:renderer": "cross-env NODE_ENV=production webpack --config ./webpack/renderer.config.js --color",
+    "start": "cross-env NODE_ENV=production electron ./bundle/main.prod.js",
+    "dev:bundle:main": "cross-env NODE_ENV=development webpack --config ./webpack/main.config.js --color",
+    "dev:bundle:preload": "cross-env NODE_ENV=development webpack --config ./webpack/preload.config.js --color",
+    "dev:start": "cross-env NODE_ENV=development electron -r @babel/register ./bundle/main.dev.js",
     "dev:start-server": "cross-env NODE_ENV=development webpack serve --hot --config ./webpack/renderer.config.js",
     "format": "prettier --write .",
     "format:check": "prettier --check .",
@@ -34,7 +43,7 @@
     "lint:styles": "stylelint --ignore-path .eslintignore '**/*.pcss'",
     "lint:styles:fix": "pnpm --silent lint-styles --fix; exit 0",
     "test": "pnpm test:coverage && pnpm format && pnpm lint",
-    "test:e2e": "pnpx spectron ./spectron.conf.js",
+    "test:e2e": "pnpm build:dir && pnpx spectron ./spectron.conf.js",
     "test:coverage": "jest --coverage",
     "test:watch": "jest --watch",
     "test:watch-coverage": "jest --watch --coverage"
@@ -53,7 +62,7 @@
     "@babel/register": "^7.16.5",
     "@goosewobbler/spectron": "^17.0.0-alpha3",
     "@headlessui/react": "^1.4.2",
-    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.3",
+    "@pmmmwh/react-refresh-webpack-plugin": "^0.5.4",
     "@redux-offline/redux-offline": "^2.6.0",
     "@reduxjs/toolkit": "^1.7.1",
     "@testing-library/dom": "^8.11.1",
@@ -63,37 +72,37 @@
     "@testing-library/webdriverio": "^3.0.5",
     "@types/jest": "^27.0.3",
     "@types/mocha": "^9.0.0",
-    "@types/node": "^17.0.0",
-    "@types/react": "^17.0.37",
+    "@types/node": "^17.0.4",
+    "@types/react": "^17.0.38",
     "@types/react-dom": "^17.0.11",
-    "@types/react-redux": "^7.1.20",
-    "@types/react-tabs": "^2.3.3",
-    "@types/react-virtualized-auto-sizer": "^1.0.0",
-    "@types/react-window": "^1.8.5",
+    "@types/react-redux": "^7.1.21",
+    "@types/react-tabs": "^2.3.4",
     "@types/request": "^2.48.7",
     "@types/source-map-support": "^0.5.2",
     "@types/tailwindcss": "^2.2.4",
     "@types/webpack": "^5.28.0",
     "@types/webpack-env": "^1.16.3",
-    "@typescript-eslint/eslint-plugin": "^5.7.0",
-    "@typescript-eslint/parser": "^5.7.0",
+    "@typescript-eslint/eslint-plugin": "^5.8.0",
+    "@typescript-eslint/parser": "^5.8.0",
     "@wdio/mocha-framework": "^7.16.11",
     "autoprefixer": "^10.4.0",
     "babel-loader": "^8.2.3",
+    "ci-info": "^3.3.0",
     "classnames": "^2.2.6",
-    "concurrently": "^6.5.0",
+    "concurrently": "^6.5.1",
     "copy-webpack-plugin": "^10.2.0",
     "cross-env": "^7.0.3",
     "css-loader": "^6.5.1",
-    "cssnano": "^5.0.13",
+    "cssnano": "^5.0.14",
     "dnd-core": "^14.0.1",
     "electron": "^16.0.5",
     "electron-builder": "^22.14.5",
     "electron-debug": "^3.2.0",
     "electron-devtools-installer": "^3.2.0",
+    "electron-notarize": "^1.1.1",
     "electron-store": "^8.0.1",
     "eslint": "^8.5.0",
-    "eslint-config-airbnb": "^19.0.2",
+    "eslint-config-airbnb": "^19.0.3",
     "eslint-config-airbnb-typescript": "^16.1.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-config-typescript": "^3.0.0",
@@ -105,7 +114,7 @@
     "eslint-plugin-jsx-a11y": "^6.5.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.0.0",
-    "eslint-plugin-react": "^7.27.1",
+    "eslint-plugin-react": "^7.28.0",
     "eslint-plugin-react-hooks": "^4.3.0",
     "eslint-plugin-testing-library": "^5.0.1",
     "expect-webdriverio": "^3.1.4",
@@ -132,7 +141,7 @@
     "redux-devtools-extension": "^2.13.9",
     "source-map-loader": "^3.0.0",
     "source-map-support": "^0.5.21",
-    "stylelint": "^14.1.0",
+    "stylelint": "^14.2.0",
     "stylelint-config-prettier": "^9.0.3",
     "stylelint-config-standard": "^24.0.0",
     "tailwindcss": "^3.0.7",
@@ -144,21 +153,11 @@
     "webpack": "^5.65.0",
     "webpack-bundle-analyzer": "^4.5.0",
     "webpack-cli": "^4.9.1",
-    "webpack-dev-server": "^4.6.0",
+    "webpack-dev-server": "^4.7.1",
     "webpack-electron-reload": "^1.0.1"
   },
   "browserslist": [
     "electron >= 15",
     "node >= 14"
-  ],
-  "main": "./dist/main.prod.js",
-  "build": {
-    "asar": true,
-    "appId": "com.dj_helper.demo",
-    "copyright": "goosewobbler",
-    "productName": "dj_helper",
-    "files": [
-      "dist/**/*"
-    ]
-  }
+  ]
 }