v6.0.0 (#105)

will-stone · Jun 15, 2019 · ae79d23 · ae79d23
1 parent bda542e
commit ae79d23
Show file tree

Hide file tree

Showing 61 changed files with 4,372 additions and 5,605 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,14 +1,14 @@
 {
   "presets": [
     [
-      "@babel/env",
+      "@babel/preset-env",
       {
         "targets": {
           "chrome": 69
         }
       }
     ],
-    "@babel/react",
-    "@babel/typescript"
+    "@babel/preset-react",
+    "@babel/preset-typescript"
   ]
 }
diff --git a/.compilerc b/.compilerc
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .DS_Store
 node_modules
 out
+.webpack
 yarn-error.log
-.env
+.env
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,7 @@
 language: node_js
 script:
+  - yarn run lint
+  - yarn run typecheck
   - yarn run test
   - yarn run package
 cache:
@@ -8,8 +10,8 @@ cache:
     - "node_modules"
     - $HOME/.cache/electron
 before_install:
-  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.7.0
+  - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.16.0
   - export PATH="$HOME/.yarn/bin:$PATH"
 os:
 - osx
-osx_image: xcode9.4
+osx_image: xcode10.2
diff --git a/@types/execa.d.ts b/@types/execa.d.ts
@@ -0,0 +1 @@
+declare module 'execa'
diff --git a/@types/globals.d.ts b/@types/globals.d.ts
@@ -0,0 +1 @@
+declare module '*.png'
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ cd browserosaurus
 Install dependencies:
 
 ```
-yarn install
+yarn
 ```
 
 Run Browserosaurus in dev mode:
@@ -40,10 +40,12 @@ Run Browserosaurus in dev mode:
 yarn start
 ```
 
-Package and make installer:
+Prepare for publishing:
 
 ```
-yarn run make
+yarn package
+yarn notarize
+yarn make
 ```
 
 ### Browser logos

diff --git a/__mocks__/electron.js b/__mocks__/electron.js
@@ -1,20 +1,27 @@
+// eslint-disable-next-line @typescript-eslint/no-var-requires
 const EventEmitter = require('events')
 const eventEmitter = new EventEmitter()
 
 module.exports = {
   app: jest.fn(),
   dialog: jest.fn(),
   ipcRenderer: {
-    on: jest.fn((name, fn) => eventEmitter.on(name, payload => fn(null, payload))),
-    removeAllListeners: jest.fn(channel => eventEmitter.removeAllListeners(channel)),
+    on: jest.fn((name, fn) =>
+      eventEmitter.on(name, payload => fn(null, payload)),
+    ),
+    removeAllListeners: jest.fn(channel =>
+      eventEmitter.removeAllListeners(channel),
+    ),
     send: jest.fn(),
   },
   match: jest.fn(),
   remote: {
     BrowserWindow: function() {
       return {
         webContents: {
-          send: jest.fn((eventName, payload) => eventEmitter.emit(eventName, payload)),
+          send: jest.fn((eventName, payload) =>
+            eventEmitter.emit(eventName, payload),
+          ),
         },
       }
     },

diff --git a/docs/index.html b/docs/index.html
@@ -199,9 +199,9 @@ <h2 class="display-4 mb-4">See it in action</h2>
           <p class="text-center">
             <a
               class="btn btn-primary btn-lg"
-              href="https://github.com/will-stone/browserosaurus/releases/download/v5.6.0/Browserosaurus-5.6.0.dmg"
+              href="https://github.com/will-stone/browserosaurus/releases/download/v6.0.0/Browserosaurus-6.0.0.dmg"
             >
-              Download Browserosaurus v5.6.0 for Mac
+              Download Browserosaurus v6.0.0 for Mac
             </a>
           </p>
 

diff --git a/package.json b/package.json
@@ -1,13 +1,13 @@
 {
   "name": "browserosaurus",
   "productName": "Browserosaurus",
-  "version": "5.6.0",
+  "version": "6.0.0",
   "engines": {
     "node": ">=10.4.1"
   },
   "description": "The browser prompter for macOS",
   "homepage": "https://browserosaurus.com/",
-  "main": "src/main.ts",
+  "main": ".webpack/main",
   "scripts": {
     "docs": "http-server ./docs",
     "start": "ENV=DEV electron-forge start",
@@ -18,81 +18,23 @@
     "package": "export $(cat .env | xargs) && electron-forge package --platform=darwin --arch=x64",
     "notarize": "export $(cat .env | xargs) && ts-node ./scripts/notarize.ts",
     "make": "electron-forge make --skip-package",
-    "icns": "cd ./src/images/icon && ./png2icns.sh icon.png",
+    "icns": "cd ./src/images/icon && ./scripts/png2icns.sh icon.png",
     "env": "export $(cat .env | xargs) && env"
   },
   "repository": "https://github.com/will-stone/browserosaurus",
   "bugs": {
     "url": "https://github.com/will-stone/browserosaurus/issues"
   },
   "keywords": [
+    "macOS",
     "Electron",
     "Browser chooser"
   ],
   "author": "Will Stone",
   "license": "MIT",
-  "prettier": "@will-stone/prettier-config",
-  "devDependencies": {
-    "@babel/core": "^7.4.4",
-    "@babel/preset-env": "^7.4.4",
-    "@babel/preset-react": "^7.0.0",
-    "@babel/preset-typescript": "^7.3.3",
-    "@types/jest": "^24.0.12",
-    "@types/jsonpath": "^0.2.0",
-    "@types/lodash": "^4.14.123",
-    "@types/mousetrap": "^1.6.2",
-    "@types/react": "^16.8.16",
-    "@types/react-dom": "^16.8.4",
-    "@types/xml2js": "^0.4.4",
-    "@typescript-eslint/eslint-plugin": "^1.7.0",
-    "@typescript-eslint/parser": "^1.7.0",
-    "@will-stone/prettier-config": "^1.0.0",
-    "electron-forge": "^5.2.4",
-    "electron-notarize": "^0.1.1",
-    "electron-packager": "^13.1.1",
-    "electron-prebuilt-compile": "4.0.0",
-    "eslint": "^5.16.0",
-    "eslint-config-prettier": "^4.2.0",
-    "eslint-plugin-jest": "^22.5.1",
-    "eslint-plugin-prettier": "^3.0.1",
-    "eslint-plugin-react": "^7.13.0",
-    "eslint-plugin-react-hooks": "^1.6.0",
-    "http-server": "^0.11.1",
-    "jest": "^24.0.0",
-    "jest-dom": "^3.1.4",
-    "prettier": "^1.17.0",
-    "react-testing-library": "^7.0.0",
-    "ts-node": "^8.2.0",
-    "typescript": "^3.4.0"
-  },
-  "dependencies": {
-    "@artossystems/a": "^3.1.0",
-    "electron-compile": "^6.4.4",
-    "electron-store": "^3.2.0",
-    "execa": "^1.0.0",
-    "immer": "^3.0.0",
-    "jsonpath": "^1.0.1",
-    "lodash": "^4.17.11",
-    "mousetrap": "^1.6.3",
-    "react": "^16.8.4",
-    "react-dom": "^16.8.4",
-    "tslib": "^1.9.3",
-    "update-electron-app": "^1.3.0",
-    "xml2js": "^0.4.19"
-  },
   "config": {
     "forge": {
-      "github_repository": {
-        "owner": "will-stone",
-        "name": "browserosaurus"
-      },
-      "make_targets": {
-        "darwin": [
-          "dmg",
-          "zip"
-        ]
-      },
-      "electronPackagerConfig": {
+      "packagerConfig": {
         "appBundleId": "com.browserosaurus",
         "asar": true,
         "appCategoryType": "public.app-category.developer-tools",
@@ -103,15 +45,7 @@
           "entitlements": "build/entitlements.mac.plist",
           "entitlements-inherit": "build/entitlements.mac.plist"
         },
-        "icon": "src/images/icon/icon.icns",
-        "ignore": [
-          "docs",
-          "__mocks__",
-          "@types",
-          ".vscode",
-          "node_modules",
-          "designs"
-        ],
+        "icon": "src/main/static/icon/icon.icns",
         "protocols": [
           {
             "name": "HTTP link",
@@ -127,12 +61,111 @@
             ]
           }
         ]
-      }
+      },
+      "makers": [
+        {
+          "name": "@electron-forge/maker-zip",
+          "platforms": [
+            "darwin"
+          ]
+        },
+        {
+          "name": "@electron-forge/maker-dmg",
+          "config": {
+            "format": "ULFO"
+          }
+        }
+      ],
+      "plugins": [
+        [
+          "@electron-forge/plugin-webpack",
+          {
+            "mainConfig": "./webpack.main.config.js",
+            "renderer": {
+              "config": "./webpack.renderer.config.js",
+              "entryPoints": [
+                {
+                  "html": "./src/renderer/index.html",
+                  "js": "./src/renderer/index.tsx",
+                  "name": "main_window"
+                }
+              ]
+            }
+          }
+        ]
+      ]
     }
   },
+  "dependencies": {
+    "@artossystems/a": "^3.1.0",
+    "electron-squirrel-startup": "^1.0.0",
+    "electron-store": "^3.2.0",
+    "execa": "^1.0.0",
+    "immer": "^3.1.2",
+    "jsonpath": "^1.0.2",
+    "lodash": "^4.17.11",
+    "mousetrap": "^1.6.3",
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6",
+    "styled-components": "^4.3.1",
+    "styled-system": "^4.0.0",
+    "update-electron-app": "^1.3.0",
+    "xml2js": "^0.4.19"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.4.5",
+    "@babel/preset-env": "^7.4.5",
+    "@babel/preset-react": "^7.0.0",
+    "@babel/preset-typescript": "^7.3.3",
+    "@electron-forge/cli": "6.0.0-beta.39",
+    "@electron-forge/maker-deb": "6.0.0-beta.39",
+    "@electron-forge/maker-dmg": "^6.0.0-beta.39",
+    "@electron-forge/maker-rpm": "6.0.0-beta.39",
+    "@electron-forge/maker-squirrel": "6.0.0-beta.39",
+    "@electron-forge/maker-zip": "6.0.0-beta.39",
+    "@electron-forge/plugin-webpack": "6.0.0-beta.39",
+    "@marshallofsound/webpack-asset-relocator-loader": "^0.5.0",
+    "@testing-library/react": "^8.0.1",
+    "@types/jest": "^24.0.13",
+    "@types/jsonpath": "^0.2.0",
+    "@types/lodash": "^4.14.133",
+    "@types/mousetrap": "^1.6.2",
+    "@types/node": "^12.0.4",
+    "@types/react": "^16.8.19",
+    "@types/react-dom": "^16.8.4",
+    "@types/styled-components": "^4.1.16",
+    "@types/styled-system": "^4.2.1",
+    "@types/xml2js": "^0.4.4",
+    "@typescript-eslint/eslint-plugin": "^1.9.0",
+    "@typescript-eslint/parser": "^1.9.0",
+    "@will-stone/prettier-config": "^1.0.0",
+    "babel-loader": "^8.0.6",
+    "browser-logos": "alrra/browser-logos#52.0.0",
+    "copy-webpack-plugin": "^5.0.3",
+    "css-loader": "^2.1.1",
+    "electron": "5.0.2",
+    "electron-notarize": "^0.1.1",
+    "eslint": "^5.16.0",
+    "eslint-config-prettier": "^4.3.0",
+    "eslint-plugin-jest": "^22.6.4",
+    "eslint-plugin-prettier": "^3.1.0",
+    "eslint-plugin-react": "^7.13.0",
+    "eslint-plugin-react-hooks": "^1.6.0",
+    "http-server": "^0.11.1",
+    "jest": "^24.8.0",
+    "jest-dom": "^3.4.0",
+    "node-loader": "^0.6.0",
+    "prettier": "^1.17.1",
+    "style-loader": "^0.23.1",
+    "ts-node": "^8.3.0",
+    "typescript": "^3.5.1",
+    "url-loader": "^2.0.0",
+    "webpack": "^4.34.0"
+  },
+  "prettier": "@will-stone/prettier-config",
   "jest": {
     "setupFilesAfterEnv": [
-      "react-testing-library/cleanup-after-each",
+      "@testing-library/react/cleanup-after-each",
       "jest-dom/extend-expect"
     ],
     "modulePathIgnorePatterns": [

diff --git a/src/images/icon/png2icns.sh → scripts/png2icns.sh b/src/images/icon/png2icns.sh → scripts/png2icns.sh