Skip to content

Commit e357768

Browse files
authored
Merge pull request #33 from will-stone/v2
V2.0.0
2 parents 61b3520 + f3ba332 commit e357768

18 files changed

+849
-569
lines changed

.compilerc

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"env": {
3+
"development": {
4+
"application/javascript": {
5+
"presets": [
6+
[
7+
"env",
8+
{
9+
"targets": {
10+
"chrome": 58
11+
}
12+
}
13+
]
14+
],
15+
"plugins": ["transform-object-rest-spread"],
16+
"sourceMaps": "inline"
17+
}
18+
},
19+
"production": {
20+
"application/javascript": {
21+
"presets": [
22+
[
23+
"env",
24+
{
25+
"targets": {
26+
"chrome": 58
27+
}
28+
}
29+
]
30+
],
31+
"plugins": ["transform-object-rest-spread"],
32+
"sourceMaps": "none"
33+
}
34+
}
35+
}
36+
}

.eslintrc.json

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
{
2-
"env": {
3-
"browser": true,
4-
"commonjs": true,
5-
"es6": true,
6-
"node": true
2+
"parser": "babel-eslint",
3+
"env": {
4+
"browser": true,
5+
"commonjs": true,
6+
"es6": true,
7+
"node": true
8+
},
9+
"parserOptions": {
10+
"ecmaVersion": 2017,
11+
"ecmaFeatures": {
12+
"jsx": true
713
},
8-
"parserOptions": {
9-
"ecmaFeatures": {
10-
"jsx": true
11-
},
12-
"sourceType": "module"
13-
},
14-
"rules": {
15-
"no-const-assign": "warn",
16-
"no-this-before-super": "warn",
17-
"no-undef": "warn",
18-
"no-unreachable": "warn",
19-
"no-unused-vars": "warn",
20-
"constructor-super": "warn",
21-
"valid-typeof": "warn"
22-
}
23-
}
14+
"sourceType": "module"
15+
},
16+
"rules": {
17+
"no-const-assign": "warn",
18+
"no-this-before-super": "warn",
19+
"no-undef": "warn",
20+
"no-unreachable": "warn",
21+
"no-unused-vars": "warn",
22+
"constructor-super": "warn",
23+
"valid-typeof": "warn"
24+
}
25+
}

package.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "browserosaurus",
33
"productName": "Browserosaurus",
4-
"version": "1.3.1",
4+
"version": "2.0.0",
55
"description": "The browser prompter for macOS",
66
"homepage": "http://wstone.io/browserosaurus/",
77
"main": "src/main.js",
@@ -22,6 +22,7 @@
2222
"devDependencies": {
2323
"babel-eslint": "7.2.3",
2424
"babel-plugin-transform-async-to-generator": "^6.24.1",
25+
"babel-plugin-transform-object-rest-spread": "^6.26.0",
2526
"babel-preset-env": "^1.5.1",
2627
"babel-preset-react": "^6.24.1",
2728
"electron-forge": "^4.1.3",
@@ -31,16 +32,18 @@
3132
"eslint-plugin-import": "2.2.0",
3233
"eslint-plugin-jsx-a11y": "5.0.1",
3334
"eslint-plugin-react": "7.0.1",
34-
"prettier": "^1.9.1"
35+
"prettier": "^1.10.2"
3536
},
3637
"dependencies": {
37-
"about-window": "^1.7.1",
3838
"electron-compile": "^6.4.2",
3939
"electron-store": "^1.3.0",
4040
"jsonpath": "^0.2.11",
41+
"lodash": "^4.17.4",
4142
"mousetrap": "^1.6.1",
43+
"node-fetch": "^1.7.3",
4244
"opn": "^5.1.0",
4345
"pretty-checkbox": "^3.0.3",
46+
"semver": "^5.4.1",
4447
"sortablejs": "^1.7.0",
4548
"xml2json": "^0.11.0"
4649
},

src/browsers.js

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/config/browsers.js

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
/**
2+
* The white-listed browsers.
3+
*
4+
* {
5+
* AppName: {
6+
* key: {string} - keyboard shortcut, single key.
7+
* Uses Mousetrap: https://craig.is/killing/mice
8+
* alias: {string} - actual text shown in prefs and picker windows.
9+
* }
10+
* }
11+
*/
12+
13+
export default {
14+
Brave: { key: 'b' },
15+
Chromium: { key: 'c' },
16+
Firefox: { key: 'f' },
17+
FirefoxDeveloperEdition: { alias: 'Firefox Developer Edition', key: 'd' },
18+
FirefoxNightly: { alias: 'Nightly', key: 'n' },
19+
'Google Chrome': { key: 'g' },
20+
'Google Chrome Canary': { key: 'y' },
21+
Iridium: { key: 'i' },
22+
Maxthon: { key: 'm' },
23+
Min: { key: '-' },
24+
Opera: { key: 'o' },
25+
Safari: { key: 's' },
26+
TorBrowser: { key: 't' },
27+
Vivaldi: { key: 'v' }
28+
}

0 commit comments

Comments
 (0)