Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
aironavt committed Mar 31, 2021
2 parents 974c1fb + a0e5b84 commit 8a3d96d
Show file tree
Hide file tree
Showing 7 changed files with 4,398 additions and 4,122 deletions.
9 changes: 8 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,14 @@
"@babel/plugin-syntax-dynamic-import",
"@babel/plugin-proposal-class-properties",
"@babel/plugin-proposal-optional-chaining",
"babel-plugin-inline-react-svg",
["inline-react-svg", {
"svgo": {
"plugins": [{
"name": "removeViewBox",
"active": false
}]
}
}],
"@babel/plugin-proposal-nullish-coalescing-operator"
]
}
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: 2
updates:
- package-ecosystem: "npm"
directory: "/"
schedule:
interval: "weekly"
open-pull-requests-limit: 10
target-branch: "develop"
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ Google Chrome extension, which allows you to run custom scripts using keyboard s
- The extension can synchronize settings between browsers within one Google Account.

## TODO
- [ ] Migrating to Manifest V3
- [ ] Form validation
- [ ] Search the list of commands
- [ ] Import/Export settings
Expand Down
8,421 changes: 4,339 additions & 4,082 deletions package-lock.json

Large diffs are not rendered by default.

77 changes: 40 additions & 37 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "global-shortcuts",
"version": "0.2.1",
"version": "0.2.2",
"description": "Chrome extension allows you to run your scripts on any website using keyboard shortcuts when the browser window is minimized",
"private": true,
"scripts": {
Expand All @@ -13,6 +13,9 @@
"lint:scss": "stylelint ./src/styles/*.scss !**/normalize.scss --color --formatter verbose --cache",
"lint:locales": "jsonlint ./src/_locales/**/messages.json --sort-keys --no-duplicate-keys --quiet --in-place"
},
"engines": {
"node": ">=10.13.0"
},
"repository": {
"type": "git",
"url": "https://github.com/aironavt/global-shortcuts.git"
Expand All @@ -24,54 +27,54 @@
"author": "Evgeniy Vladykin <aironavt@gmail.com>",
"license": "MIT",
"devDependencies": {
"@babel/core": "7.10.1",
"@babel/plugin-proposal-class-properties": "7.10.1",
"@babel/plugin-proposal-nullish-coalescing-operator": "7.10.1",
"@babel/plugin-proposal-optional-chaining": "7.10.1",
"@babel/core": "7.13.14",
"@babel/plugin-proposal-class-properties": "7.13.0",
"@babel/plugin-proposal-nullish-coalescing-operator": "7.13.8",
"@babel/plugin-proposal-optional-chaining": "7.13.12",
"@babel/plugin-syntax-dynamic-import": "7.8.3",
"@babel/preset-env": "7.10.1",
"@babel/preset-env": "7.13.12",
"@prantlf/jsonlint": "10.2.0",
"babel-eslint": "11.0.0-beta.2",
"babel-loader": "8.1.0",
"babel-plugin-inline-react-svg": "1.1.1",
"babel-plugin-module-resolver": "4.0.0",
"babel-loader": "8.2.2",
"babel-plugin-inline-react-svg": "2.0.1",
"babel-plugin-module-resolver": "4.1.0",
"babel-plugin-transform-react-jsx": "6.24.1",
"camelcase": "6.0.0",
"camelcase": "6.2.0",
"clean-webpack-plugin": "3.0.0",
"copy-webpack-plugin": "6.0.1",
"css-loader": "3.5.3",
"eslint": "7.1.0",
"eslint-config-airbnb": "18.1.0",
"copy-webpack-plugin": "8.1.0",
"css-loader": "5.2.0",
"eslint": "7.23.0",
"eslint-config-airbnb": "18.2.1",
"eslint-config-standard-preact": "1.1.6",
"eslint-import-resolver-babel-module": "5.1.2",
"eslint-import-resolver-webpack": "0.12.1",
"eslint-plugin-babel": "5.3.0",
"eslint-plugin-import": "2.20.2",
"eslint-plugin-jsx-a11y": "6.2.3",
"html-webpack-plugin": "4.3.0",
"husky": "4.2.5",
"lint-staged": "10.2.7",
"mini-css-extract-plugin": "0.9.0",
"node-sass": "4.14.1",
"sass-loader": "8.0.2",
"stylelint": "13.5.0",
"eslint-import-resolver-babel-module": "5.2.0",
"eslint-import-resolver-webpack": "0.13.0",
"eslint-plugin-babel": "5.3.1",
"eslint-plugin-import": "2.22.1",
"eslint-plugin-jsx-a11y": "6.4.1",
"html-webpack-plugin": "5.3.1",
"husky": "6.0.0",
"lint-staged": "10.5.4",
"mini-css-extract-plugin": "1.4.0",
"node-sass": "5.0.0",
"sass-loader": "11.0.1",
"stylelint": "13.12.0",
"stylelint-config-rational-order": "0.1.2",
"stylelint-config-standard": "20.0.0",
"stylelint-order": "4.0.0",
"stylelint-scss": "3.17.2",
"webpack": "4.43.0",
"webpack-cli": "3.3.11",
"webpack-dev-server": "3.11.0",
"stylelint-config-standard": "21.0.0",
"stylelint-order": "4.1.0",
"stylelint-scss": "3.19.0",
"webpack": "5.28.0",
"webpack-cli": "4.6.0",
"webpack-dev-server": "3.11.2",
"write-file-webpack-plugin": "4.5.1",
"zip-webpack-plugin": "3.0.0"
"zip-webpack-plugin": "4.0.1"
},
"dependencies": {
"ace-builds": "1.4.11",
"ace-builds": "1.4.12",
"classnames": "2.2.6",
"history": "4.10.1",
"preact": "10.4.4",
"history": "5.0.0",
"preact": "10.5.13",
"preact-router": "3.2.1",
"prop-types": "15.7.2",
"react-ace": "9.0.0"
"react-ace": "9.4.0"
}
}
2 changes: 1 addition & 1 deletion src/js/options/components/code-editor/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class Code extends Component {
return [
{
name: 'previousFormControl',
bindKey: { win: 'Ctrl-,', mac: 'Command-.' },
bindKey: { win: 'Ctrl-,', mac: 'Command-,' },
exec: this.onPreviousFormControl,
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/js/options/components/select/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class SelectWrapper extends Component {
} = this.state;

const filteredOptions = inputValue ?
options.filter((option) => option.name.indexOf(inputValue) !== -1) :
options.filter((option) => option.description.toLowerCase().indexOf(inputValue.toLowerCase()) !== -1) :
options;

return (
Expand Down

0 comments on commit 8a3d96d

Please sign in to comment.