Skip to content

Commit

Permalink
Merge pull request #33 from will-stone/v2
Browse files Browse the repository at this point in the history
V2.0.0
  • Loading branch information
will-stone authored Jan 14, 2018
2 parents 61b3520 + f3ba332 commit e357768
Show file tree
Hide file tree
Showing 18 changed files with 849 additions and 569 deletions.
36 changes: 36 additions & 0 deletions .compilerc
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"env": {
"development": {
"application/javascript": {
"presets": [
[
"env",
{
"targets": {
"chrome": 58
}
}
]
],
"plugins": ["transform-object-rest-spread"],
"sourceMaps": "inline"
}
},
"production": {
"application/javascript": {
"presets": [
[
"env",
{
"targets": {
"chrome": 58
}
}
]
],
"plugins": ["transform-object-rest-spread"],
"sourceMaps": "none"
}
}
}
}
44 changes: 23 additions & 21 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
{
"env": {
"browser": true,
"commonjs": true,
"es6": true,
"node": true
"parser": "babel-eslint",
"env": {
"browser": true,
"commonjs": true,
"es6": true,
"node": true
},
"parserOptions": {
"ecmaVersion": 2017,
"ecmaFeatures": {
"jsx": true
},
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"sourceType": "module"
},
"rules": {
"no-const-assign": "warn",
"no-this-before-super": "warn",
"no-undef": "warn",
"no-unreachable": "warn",
"no-unused-vars": "warn",
"constructor-super": "warn",
"valid-typeof": "warn"
}
}
"sourceType": "module"
},
"rules": {
"no-const-assign": "warn",
"no-this-before-super": "warn",
"no-undef": "warn",
"no-unreachable": "warn",
"no-unused-vars": "warn",
"constructor-super": "warn",
"valid-typeof": "warn"
}
}
9 changes: 6 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "browserosaurus",
"productName": "Browserosaurus",
"version": "1.3.1",
"version": "2.0.0",
"description": "The browser prompter for macOS",
"homepage": "http://wstone.io/browserosaurus/",
"main": "src/main.js",
Expand All @@ -22,6 +22,7 @@
"devDependencies": {
"babel-eslint": "7.2.3",
"babel-plugin-transform-async-to-generator": "^6.24.1",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-preset-env": "^1.5.1",
"babel-preset-react": "^6.24.1",
"electron-forge": "^4.1.3",
Expand All @@ -31,16 +32,18 @@
"eslint-plugin-import": "2.2.0",
"eslint-plugin-jsx-a11y": "5.0.1",
"eslint-plugin-react": "7.0.1",
"prettier": "^1.9.1"
"prettier": "^1.10.2"
},
"dependencies": {
"about-window": "^1.7.1",
"electron-compile": "^6.4.2",
"electron-store": "^1.3.0",
"jsonpath": "^0.2.11",
"lodash": "^4.17.4",
"mousetrap": "^1.6.1",
"node-fetch": "^1.7.3",
"opn": "^5.1.0",
"pretty-checkbox": "^3.0.3",
"semver": "^5.4.1",
"sortablejs": "^1.7.0",
"xml2json": "^0.11.0"
},
Expand Down
21 changes: 0 additions & 21 deletions src/browsers.js

This file was deleted.

28 changes: 28 additions & 0 deletions src/config/browsers.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/**
* The white-listed browsers.
*
* {
* AppName: {
* key: {string} - keyboard shortcut, single key.
* Uses Mousetrap: https://craig.is/killing/mice
* alias: {string} - actual text shown in prefs and picker windows.
* }
* }
*/

export default {
Brave: { key: 'b' },
Chromium: { key: 'c' },
Firefox: { key: 'f' },
FirefoxDeveloperEdition: { alias: 'Firefox Developer Edition', key: 'd' },
FirefoxNightly: { alias: 'Nightly', key: 'n' },
'Google Chrome': { key: 'g' },
'Google Chrome Canary': { key: 'y' },
Iridium: { key: 'i' },
Maxthon: { key: 'm' },
Min: { key: '-' },
Opera: { key: 'o' },
Safari: { key: 's' },
TorBrowser: { key: 't' },
Vivaldi: { key: 'v' }
}
Loading

0 comments on commit e357768

Please sign in to comment.