Skip to content

Commit

Permalink
Merge pull request #95 from filestack/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
MowiliMi authored Jul 29, 2020
2 parents 0427a14 + c2a176c commit 0ef1732
Show file tree
Hide file tree
Showing 10 changed files with 12,481 additions and 8,883 deletions.
11 changes: 5 additions & 6 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
# http://editorconfig.org
root = true

[{src,scripts,config}/**.{ts,json,js}]
[*]
indent_style = space
indent_size = 2
end_of_line = lf
charset = utf-8
quote_type = single
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = space
indent_size = 2

[*.md]
insert_final_newline = false
trim_trailing_whitespace = false
trim_trailing_whitespace = true
8 changes: 2 additions & 6 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"parser": "babel-eslint",
"extends": "airbnb",
"extends": ["airbnb", "prettier", "prettier/react"],
"parserOptions": {
"ecmaVersion": 6,
"sourceType": "module",
Expand Down Expand Up @@ -30,11 +30,7 @@
}
}
],
"plugins": [
"react",
"jsx-a11y",
"babel"
],
"plugins": ["react", "jsx-a11y", "babel"],
"env": {
"browser": true,
"jest": true,
Expand Down
10 changes: 10 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"trailingComma": "all",
"tabWidth": 2,
"semi": true,
"singleQuote": true,
"printWidth": 180,
"useTabs": false,
"bracketSpacing": true,
"arrowParens": "always"
}
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
# Change Log
# Changelog

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [3.2.0](https://github.com/filestack/filestack-react/compare/v3.1.0...v3.2.0) (2020-07-29)


### Features

* 🎸 add typescript type definitions ([f7a4e80](https://github.com/filestack/filestack-react/commit/f7a4e80ab44edb1e0e0858d65a9ed1c3e7214e8c))

# [3.1.0](https://github.com/filestack/filestack-react/compare/v3.0.1...v3.1.0) (2019-07-29)


Expand Down
Loading

0 comments on commit 0ef1732

Please sign in to comment.