Skip to content

Commit

Permalink
chore(app): upgrade dependencies, add eslint import fix
Browse files Browse the repository at this point in the history
  • Loading branch information
kiily committed Apr 24, 2020
1 parent 2d72c55 commit 9d73e93
Show file tree
Hide file tree
Showing 7 changed files with 111 additions and 95 deletions.
4 changes: 3 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,17 @@
"plugin:@typescript-eslint/recommended",
"prettier/@typescript-eslint"
],
"plugins": ["react", "@typescript-eslint", "prettier"],
"plugins": ["react", "@typescript-eslint", "prettier", "simple-import-sort"],
"env": {
"browser": true,
"jasmine": true,
"jest": true,
"es6": true
},
"rules": {
"no-console": "error",
"prettier/prettier": ["error", { "singleQuote": true }],
"simple-import-sort/sort": "error",
"@typescript-eslint/explicit-member-accessibility": 0,
"@typescript-eslint/explicit-function-return-type": 0,
"@typescript-eslint/interface-name-prefix": 0,
Expand Down
6 changes: 3 additions & 3 deletions .yarn/build-state.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
"30d80a2ef8f47f82bf641519be4696656242ca58892f371fe566f83e7cad0edec8c51cb01e9758f0a3217e2533bce8b54033a8d334bea489f2f7fcc747e5977d":
f91d5376cea9b38f81985c2af7ca8d0ce5f97dfafb3d8f456c306dce1faac30593221aaf99e3b9ad7253591db09bf2c64f5e6f4770e92a9485f791f3b280e3ac

# node-sass@npm:4.13.1
"c5583e43b20b252e10be1db4953d7bfc0d140a5d39fa16c6f91fcf5595a8a1221ac8fe965d8af29c5791588df6a39d56ab9a5575e84b4a19c1effc6a2378376a":
180c70271a414a866472854352e71ead8c443fbdcfde00f04541ba7d4b404e02c18b953f338da9cc4ecbced9a396badcec09f33c6110f38f05cca04844932ef1
# node-sass@npm:4.14.0
"11f8c2446f17d58b29f154dc7467de5ccfa9b83c6cd4af5799b7b630c883a7a0806fe6586b36cf80de6dfe92599f33d1d0d5c11bcffeddb9a554b852aea212b7":
42a7d32f4fa78317f74976482ca25854eb5de78148c00ef6467b8ce180dfa3c6a13bae534468ee4bf202eb98eb225c98cc9b89fd5b4019b16119345dd843d322
21 changes: 11 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-ts",
"description": "A template for a react PWA built with CRA with a complete and custom CI/CD workflow around it (w/ yarn)",
"description": "A template for a react PWA built with CRA with a complete and custom CI/CD workflow around it (w/ yarn)-4r",
"version": "1.0.0",
"private": true,
"repository": {
Expand All @@ -17,7 +17,7 @@
"release": "semantic-release"
},
"dependencies": {
"node-sass": "4.13.1",
"node-sass": "4.14.0",
"react": "16.13.1",
"react-dom": "16.13.1",
"typescript": "3.8.3"
Expand All @@ -27,24 +27,25 @@
"@commitlint/config-conventional": "8.3.4",
"@semantic-release/git": "9.0.0",
"@testing-library/jest-dom": "5.5.0",
"@testing-library/react": "10.0.2",
"@testing-library/user-event": "10.0.1",
"@testing-library/react": "10.0.3",
"@testing-library/user-event": "10.1.0",
"@types/jest": "25.2.1",
"@types/node": "13.11.1",
"@types/node": "13.13.2",
"@types/react": "16.9.34",
"@types/react-dom": "16.9.6",
"commitizen": "4.0.4",
"cross-env": "7.0.2",
"cz-conventional-changelog": "3.1.0",
"eslint": "6.8.0",
"eslint-config-prettier": "6.10.1",
"eslint-config-prettier": "6.11.0",
"eslint-config-react": "1.1.7",
"eslint-plugin-prettier": "3.1.2",
"eslint-plugin-prettier": "3.1.3",
"eslint-plugin-simple-import-sort": "5.0.2",
"husky": "4.2.5",
"lint-staged": "10.1.3",
"prettier": "2.0.4",
"lint-staged": "10.1.7",
"prettier": "2.0.5",
"react-scripts": "3.4.1",
"semantic-release": "17.0.4"
"semantic-release": "17.0.7"
},
"browserslist": {
"production": [
Expand Down
3 changes: 2 additions & 1 deletion src/App.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from 'react';
import { render } from '@testing-library/react';
import React from 'react';

import App from './App';

test('renders learn react link', () => {
Expand Down
4 changes: 3 additions & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import './App.scss';

import React from 'react';

import logo from './logo.svg';
import './App.scss';

function App() {
return (
Expand Down
4 changes: 3 additions & 1 deletion src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import './index.scss';

import React from 'react';
import ReactDOM from 'react-dom';
import './index.scss';

import App from './App';
import * as serviceWorker from './serviceWorker';

Expand Down
Loading

0 comments on commit 9d73e93

Please sign in to comment.