Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
hodgef committed Mar 21, 2021
2 parents 98d9591 + e39a70c commit a71a516
Show file tree
Hide file tree
Showing 58 changed files with 8,801 additions and 22,691 deletions.
24 changes: 10 additions & 14 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,31 @@
{
"parser": "babel-eslint",
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module",
"ecmaFeatures": {
"jsx": true,
"modules": true,
"experimentalObjectRestSpread": true
}
},
"plugins": [
"react"
],
"extends": ["eslint:recommended", "plugin:react/recommended"],
"plugins": ["@typescript-eslint"],
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
"rules": {
"comma-dangle": 0,
"no-unused-vars": "warn",
"no-unexpected-multiline": "warn",
"prefer-const": "warn"
},
"settings": {
"react": {
"pragma": "React",
"version": "15.6.1"
}
"prefer-const": "warn",
"@typescript-eslint/no-empty-function": "off",
"@typescript-eslint/explicit-module-boundary-types": "off",
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-var-requires": "off"
},
"settings": {},
"env": {
"browser": true,
"node": true,
"jasmine": true,
"jest": true,
"es6": true
}
}
}
2 changes: 1 addition & 1 deletion .github/github.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# About .github

This directory handles special features to be used on react-simple-keyboard's Github repository.
It is not needed for simple-keyboard to run and can be safely removed.
It is not needed for simple-keyboard to run and can be safely removed.
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ A few sentences describing the overall goals of the pull request's commits.

## Checks

- [ ] Tests ( `npm run test -- --coverage` ) Coverage at `./coverage/lcov-report/index.html` should be 100%
- [ ] Tests ( `npm run coverage` ) Coverage at `./coverage/lcov-report/index.html` should be 100%
63 changes: 30 additions & 33 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,36 +9,33 @@ jobs:
node-version: [12.x]
os: [ubuntu-latest]
steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node_version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node_version }}
- name: npm install, build, and test
run: |
npm install
npm run start -- --testMode
npm run demo
npm run coverage
- uses: codecov/[email protected]
with:
token: ${{secrets.CODECOV_TOKEN}}
env:
CI: true

- name: Discord notification
if: success()
env:
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
uses: Ilshidur/action-discord@master
with:
args: 'react-simple-keyboard - CI Build Passed'

- name: Discord notification
if: failure()
env:
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
uses: Ilshidur/action-discord@master
with:
args: 'react-simple-keyboard - CI Build Failed'

- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node_version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node_version }}
- name: npm install, build, and test
run: |
npm install
npm run coverage
- uses: codecov/[email protected]
with:
token: ${{secrets.CODECOV_TOKEN}}
env:
CI: true

- name: Discord notification
if: success()
env:
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
uses: Ilshidur/action-discord@master
with:
args: "react-simple-keyboard - CI Build Passed"

- name: Discord notification
if: failure()
env:
DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
uses: Ilshidur/action-discord@master
with:
args: "react-simple-keyboard - CI Build Failed"
12 changes: 5 additions & 7 deletions .github/workflows/mirroring.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ jobs:
mirroring:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v1
- uses: pixta-dev/repository-mirroring-action@v1
with:
target_repo_url:
[email protected]:hodgef/react-simple-keyboard.git
ssh_private_key:
${{ secrets.GL_KEY }}
- uses: actions/checkout@v1
- uses: pixta-dev/repository-mirroring-action@v1
with:
target_repo_url: [email protected]:hodgef/react-simple-keyboard.git
ssh_private_key: ${{ secrets.GL_KEY }}
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
/.pnp
.pnp.js

# production
/demo

# testing
/coverage

Expand Down
10 changes: 7 additions & 3 deletions .npmignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
/node_modules

# testing
/tests
/coverage

# docs
Expand All @@ -13,12 +14,13 @@
.env.development.local
.env.test.local
.env.production.local
/.github
/demo
.esdoc.json

npm-debug.log*
yarn-debug.log*
yarn-error.log*
/.github
/demo

# Development folders and files
public
Expand All @@ -29,4 +31,6 @@ config
CHANGELOG.md
README.md
.eslintignore
.eslintrc.json
.eslintrc.json
webpack.config.js
babel.config.js
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2019 Francisco Hodge
Copyright (c) 2019 Francisco Hodge and project contributors.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
SOFTWARE.
13 changes: 8 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<img alt="simple-keyboard: Javscript Virtual Keyboard" src="https://i.imgur.com/ay03Uw4.png">
</a>

<blockquote>The slick virtual keyboard for React. Customizable, responsive and lightweight.</blockquote>
<blockquote>Virtual Keyboard for React. Customizable, responsive and lightweight.</blockquote>

<p>
<a href="https://www.npmjs.com/package/react-simple-keyboard">
Expand Down Expand Up @@ -63,10 +63,13 @@ Feel free to browse the [Questions & Answers](https://simple-keyboard.com/qa-use

## Compatibility 🎯

> Simple-keyboard is intended for modern, standards-compliant browsers.
> Internet Explorer is sadly not one of them, and since its market-share is negligible (~2% for IE11), resources won't be spent in trying to support it.
>
> For more information, check out [this Q&A entry](https://hodgef.com/simple-keyboard/questions-answers/internet-explorer-not-supported/).
- Internet Explorer 11
- Edge (Spartan) 16+
- Edge (Anaheim/Edge Chromium) 79+
- Chrome 49+
- Safari 9+
- Firefox 57+
- iOS 9+

## Contributing ✅

Expand Down
24 changes: 24 additions & 0 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
module.exports = {
presets: [
"@babel/preset-react",
["@babel/env", {
corejs:"3",
useBuiltIns: 'entry',
"targets": {
"browsers": [
"edge >= 16",
"safari >= 9",
"firefox >= 57",
"ie >= 11",
"ios >= 9",
"chrome >= 49"
]
},
}],
"@babel/preset-typescript"
],
plugins: [
["@babel/plugin-proposal-class-properties"],
["@babel/plugin-transform-typescript"]
]
};
Loading

0 comments on commit a71a516

Please sign in to comment.