From 8cc47c2f825296817f224245eb8ca494d575fe2e Mon Sep 17 00:00:00 2001 From: Ruidy Nemausat Date: Tue, 12 May 2020 09:41:58 +0200 Subject: [PATCH] create React App with TypeScript --- .gitignore | 48 ++-- README.md | 98 +++---- package.json | 9 +- public/favicon.ico | Bin 3585 -> 3150 bytes public/index.html | 86 +++---- public/logo192.png | Bin 4153 -> 5347 bytes public/logo512.png | Bin 12066 -> 9664 bytes public/manifest.json | 50 ++-- public/robots.txt | 5 +- src/App.css | 77 +++--- src/App.js | 58 ----- src/App.test.js | 15 -- src/App.test.tsx | 9 + src/App.tsx | 26 ++ src/app/store.js | 8 - src/features/counter/Counter.js | 60 ----- src/features/counter/Counter.module.css | 74 ------ src/features/counter/counterSlice.js | 42 --- src/index.css | 26 +- src/{index.js => index.tsx} | 38 ++- src/logo.svg | 8 +- src/react-app-env.d.ts | 1 + src/{serviceWorker.js => serviceWorker.ts} | 286 +++++++++++---------- src/{setupTests.js => setupTests.ts} | 10 +- tsconfig.json | 25 ++ yarn.lock | 83 ++---- 26 files changed, 444 insertions(+), 698 deletions(-) delete mode 100644 src/App.js delete mode 100644 src/App.test.js create mode 100644 src/App.test.tsx create mode 100644 src/App.tsx delete mode 100644 src/app/store.js delete mode 100644 src/features/counter/Counter.js delete mode 100644 src/features/counter/Counter.module.css delete mode 100644 src/features/counter/counterSlice.js rename src/{index.js => index.tsx} (76%) create mode 100644 src/react-app-env.d.ts rename src/{serviceWorker.js => serviceWorker.ts} (87%) rename src/{setupTests.js => setupTests.ts} (98%) create mode 100644 tsconfig.json diff --git a/.gitignore b/.gitignore index c067634..07b2e55 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1,25 @@ -# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. - -# dependencies -/node_modules -/.pnp -.pnp.js - -# testing -/coverage - -# production -/build - -# misc -.DS_Store -.env.local -.env.development.local -.env.test.local -.env.production.local - -npm-debug.log* -yarn-debug.log* -yarn-error.log* +# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. + +# dependencies +/node_modules +/.pnp +.pnp.js + +# testing +/coverage + +# production +/build +/bin +/resources + +# misc +.DS_Store +.env.local +.env.development.local +.env.test.local +.env.production.local + +npm-debug.log* +yarn-debug.log* +yarn-error.log* diff --git a/README.md b/README.md index d85e9e3..df88d9a 100644 --- a/README.md +++ b/README.md @@ -1,68 +1,30 @@ -This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app), using the [Redux](https://redux.js.org/) and [Redux Toolkit](https://redux-toolkit.js.org/) template. - -## Available Scripts - -In the project directory, you can run: - -### `yarn start` - -Runs the app in the development mode.
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser. - -The page will reload if you make edits.
-You will also see any lint errors in the console. - -### `yarn test` - -Launches the test runner in the interactive watch mode.
-See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information. - -### `yarn build` - -Builds the app for production to the `build` folder.
-It correctly bundles React in production mode and optimizes the build for the best performance. - -The build is minified and the filenames include the hashes.
-Your app is ready to be deployed! - -See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information. - -### `yarn eject` - -**Note: this is a one-way operation. Once you `eject`, you can’t go back!** - -If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project. - -Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own. - -You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it. - -## Learn More - -You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started). - -To learn React, check out the [React documentation](https://reactjs.org/). - -### Code Splitting - -This section has moved here: https://facebook.github.io/create-react-app/docs/code-splitting - -### Analyzing the Bundle Size - -This section has moved here: https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size - -### Making a Progressive Web App - -This section has moved here: https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app - -### Advanced Configuration - -This section has moved here: https://facebook.github.io/create-react-app/docs/advanced-configuration - -### Deployment - -This section has moved here: https://facebook.github.io/create-react-app/docs/deployment - -### `yarn build` fails to minify - -This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify +# DevBook + +Social App for connecting with developers & tech enthusiasts. + + +## Built With + +* [ReactJs](https://reactjs.org/) - A JavaScript library for building user interfaces +* [Redux](https://redux.js.org/) - A predictable statea container for JavaScript apps +* [ROME](https://fiirebase.google.com/) - Firebase helps mobile and web app teams succeed + + + +## Versioning + +We use [SemVer](http://semver.org/) for versioning. For the versions available, see the [tags on this repository](https://github.com/your/project/tags). + +## Authors + +* **Ruidy Nemausat** - *Initial work* - [rjNemo](https://github.com/rjNemo/) + + +## License + +This project is licensed under the MIT License - see the [LICENSE.md](LICENSE.md) file for details + +## Acknowledgments + +* [Inspiration](https://github.com/bradtraversy/devconnector_2.0) + diff --git a/package.json b/package.json index 53be532..52e7131 100644 --- a/package.json +++ b/package.json @@ -3,14 +3,17 @@ "version": "0.1.0", "private": true, "dependencies": { - "@reduxjs/toolkit": "^1.1.0", "@testing-library/jest-dom": "^4.2.4", "@testing-library/react": "^9.3.2", "@testing-library/user-event": "^7.1.2", + "@types/jest": "^24.0.0", + "@types/node": "^12.0.0", + "@types/react": "^16.9.0", + "@types/react-dom": "^16.9.0", "react": "^16.13.1", "react-dom": "^16.13.1", - "react-redux": "^7.1.3", - "react-scripts": "3.4.1" + "react-scripts": "3.4.1", + "typescript": "~3.7.2" }, "scripts": { "start": "react-scripts start", diff --git a/public/favicon.ico b/public/favicon.ico index 354202a4e6baec3429e928e13d54144f8eebb62c..bcd5dfd67cd0361b78123e95c2dd96031f27f743 100644 GIT binary patch literal 3150 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 MDeX2GIKR{Qf5okjU;qFB literal 3585 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 Hu0mjfhdT@% diff --git a/public/index.html b/public/index.html index 430b58f..aa069f2 100644 --- a/public/index.html +++ b/public/index.html @@ -1,43 +1,43 @@ - - - - - - - - - - - - - React Redux App - - - -
- - - + + + + + + + + + + + + + React App + + + +
+ + + diff --git a/public/logo192.png b/public/logo192.png index 33624109cdc98874ea8657a2a3a7ce71c81d1837..fc44b0a3796c0e0a64c3d858ca038bd4570465d9 100644 GIT binary patch literal 5347 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 diff --git a/public/logo512.png b/public/logo512.png index b3516222f0b978579b871c871b955b5fc5b4ca5e..a4e47a6545bc15971f8f63fba70e4013df88a664 100644 GIT binary patch literal 9664 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 b{|{}U^kRn2wo}j7|0ATu<;8xA7zX}7|B6mN literal 12066 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 A^#A|> diff --git a/public/manifest.json b/public/manifest.json index 2f2be64..080d6c7 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -1,25 +1,25 @@ -{ - "short_name": "React App", - "name": "Create React App Sample", - "icons": [ - { - "src": "favicon.ico", - "sizes": "64x64 32x32 24x24 16x16", - "type": "image/x-icon" - }, - { - "src": "logo192.png", - "type": "image/png", - "sizes": "192x192" - }, - { - "src": "logo512.png", - "type": "image/png", - "sizes": "512x512" - } - ], - "start_url": ".", - "display": "standalone", - "theme_color": "#000000", - "background_color": "#ffffff" -} +{ + "short_name": "React App", + "name": "Create React App Sample", + "icons": [ + { + "src": "favicon.ico", + "sizes": "64x64 32x32 24x24 16x16", + "type": "image/x-icon" + }, + { + "src": "logo192.png", + "type": "image/png", + "sizes": "192x192" + }, + { + "src": "logo512.png", + "type": "image/png", + "sizes": "512x512" + } + ], + "start_url": ".", + "display": "standalone", + "theme_color": "#000000", + "background_color": "#ffffff" +} diff --git a/public/robots.txt b/public/robots.txt index fa06a75..e9e57dc 100644 --- a/public/robots.txt +++ b/public/robots.txt @@ -1,2 +1,3 @@ -# https://www.robotstxt.org/robotstxt.html -User-agent: * +# https://www.robotstxt.org/robotstxt.html +User-agent: * +Disallow: diff --git a/src/App.css b/src/App.css index 355c49b..74b5e05 100644 --- a/src/App.css +++ b/src/App.css @@ -1,39 +1,38 @@ -.App { - text-align: center; -} - -.App-logo { - height: 40vmin; - pointer-events: none; -} - -@media (prefers-reduced-motion: no-preference) { - .App-logo { - animation: App-logo-float infinite 3s ease-in-out; - } -} - -.App-header { - min-height: 100vh; - display: flex; - flex-direction: column; - align-items: center; - justify-content: center; - font-size: calc(10px + 2vmin); -} - -.App-link { - color: rgb(112, 76, 182); -} - -@keyframes App-logo-float { - 0% { - transform: translateY(0); - } - 50% { - transform: translateY(10px) - } - 100% { - transform: translateY(0px) - } -} +.App { + text-align: center; +} + +.App-logo { + height: 40vmin; + pointer-events: none; +} + +@media (prefers-reduced-motion: no-preference) { + .App-logo { + animation: App-logo-spin infinite 20s linear; + } +} + +.App-header { + background-color: #282c34; + min-height: 100vh; + display: flex; + flex-direction: column; + align-items: center; + justify-content: center; + font-size: calc(10px + 2vmin); + color: white; +} + +.App-link { + color: #61dafb; +} + +@keyframes App-logo-spin { + from { + transform: rotate(0deg); + } + to { + transform: rotate(360deg); + } +} diff --git a/src/App.js b/src/App.js deleted file mode 100644 index 7825dd2..0000000 --- a/src/App.js +++ /dev/null @@ -1,58 +0,0 @@ -import React from 'react'; -import logo from './logo.svg'; -import { Counter } from './features/counter/Counter'; -import './App.css'; - -function App() { - return ( -
-
- logo - -

- Edit src/App.js and save to reload. -

- - Learn - - React - - , - - Redux - - , - - Redux Toolkit - - , and - - React Redux - - -
-
- ); -} - -export default App; diff --git a/src/App.test.js b/src/App.test.js deleted file mode 100644 index cf703a4..0000000 --- a/src/App.test.js +++ /dev/null @@ -1,15 +0,0 @@ -import React from 'react'; -import { render } from '@testing-library/react'; -import { Provider } from 'react-redux'; -import store from './app/store'; -import App from './App'; - -test('renders learn react link', () => { - const { getByText } = render( - - - - ); - - expect(getByText(/learn/i)).toBeInTheDocument(); -}); diff --git a/src/App.test.tsx b/src/App.test.tsx new file mode 100644 index 0000000..4db7ebc --- /dev/null +++ b/src/App.test.tsx @@ -0,0 +1,9 @@ +import React from 'react'; +import { render } from '@testing-library/react'; +import App from './App'; + +test('renders learn react link', () => { + const { getByText } = render(); + const linkElement = getByText(/learn react/i); + expect(linkElement).toBeInTheDocument(); +}); diff --git a/src/App.tsx b/src/App.tsx new file mode 100644 index 0000000..a53698a --- /dev/null +++ b/src/App.tsx @@ -0,0 +1,26 @@ +import React from 'react'; +import logo from './logo.svg'; +import './App.css'; + +function App() { + return ( +
+
+ logo +

+ Edit src/App.tsx and save to reload. +

+ + Learn React + +
+
+ ); +} + +export default App; diff --git a/src/app/store.js b/src/app/store.js deleted file mode 100644 index b867c96..0000000 --- a/src/app/store.js +++ /dev/null @@ -1,8 +0,0 @@ -import { configureStore } from '@reduxjs/toolkit'; -import counterReducer from '../features/counter/counterSlice'; - -export default configureStore({ - reducer: { - counter: counterReducer, - }, -}); diff --git a/src/features/counter/Counter.js b/src/features/counter/Counter.js deleted file mode 100644 index 2ca6ed0..0000000 --- a/src/features/counter/Counter.js +++ /dev/null @@ -1,60 +0,0 @@ -import React, { useState } from 'react'; -import { useSelector, useDispatch } from 'react-redux'; -import { - decrement, - increment, - incrementByAmount, - incrementAsync, - selectCount, -} from './counterSlice'; -import styles from './Counter.module.css'; - -export function Counter() { - const count = useSelector(selectCount); - const dispatch = useDispatch(); - const [incrementAmount, setIncrementAmount] = useState('2'); - - return ( -
-
- - {count} - -
-
- setIncrementAmount(e.target.value)} - /> - - -
-
- ); -} diff --git a/src/features/counter/Counter.module.css b/src/features/counter/Counter.module.css deleted file mode 100644 index 6c2b58f..0000000 --- a/src/features/counter/Counter.module.css +++ /dev/null @@ -1,74 +0,0 @@ -.row { - display: flex; - align-items: center; - justify-content: center; -} - -.row:not(:last-child) { - margin-bottom: 16px; -} - -.value { - font-size: 78px; - padding-left: 16px; - padding-right: 16px; - margin-top: 2px; - font-family: 'Courier New', Courier, monospace; -} - -.button { - appearance: none; - background: none; - font-size: 32px; - padding-left: 12px; - padding-right: 12px; - outline: none; - border: 2px solid transparent; - color: rgb(112, 76, 182); - padding-bottom: 4px; - cursor: pointer; - background-color: rgba(112, 76, 182, 0.1); - border-radius: 2px; - transition: all 0.15s; -} - -.textbox { - font-size: 32px; - padding: 2px; - width: 64px; - text-align: center; - margin-right: 8px; -} - -.button:hover, .button:focus { - border: 2px solid rgba(112, 76, 182, 0.4); -} - -.button:active { - background-color: rgba(112, 76, 182, 0.2); -} - -.asyncButton { - composes: button; - position: relative; - margin-left: 8px; -} - -.asyncButton:after { - content: ""; - background-color: rgba(112, 76, 182, 0.15); - display: block; - position: absolute; - width: 100%; - height: 100%; - left: 0; - top: 0; - opacity: 0; - transition: width 1s linear, opacity 0.5s ease 1s; -} - -.asyncButton:active:after { - width: 0%; - opacity: 1; - transition: 0s -} diff --git a/src/features/counter/counterSlice.js b/src/features/counter/counterSlice.js deleted file mode 100644 index 01dcfe0..0000000 --- a/src/features/counter/counterSlice.js +++ /dev/null @@ -1,42 +0,0 @@ -import { createSlice } from '@reduxjs/toolkit'; - -export const counterSlice = createSlice({ - name: 'counter', - initialState: { - value: 0, - }, - reducers: { - increment: state => { - // Redux Toolkit allows us to write "mutating" logic in reducers. It - // doesn't actually mutate the state because it uses the Immer library, - // which detects changes to a "draft state" and produces a brand new - // immutable state based off those changes - state.value += 1; - }, - decrement: state => { - state.value -= 1; - }, - incrementByAmount: (state, action) => { - state.value += action.payload; - }, - }, -}); - -export const { increment, decrement, incrementByAmount } = counterSlice.actions; - -// The function below is called a thunk and allows us to perform async logic. It -// can be dispatched like a regular action: `dispatch(incrementAsync(10))`. This -// will call the thunk with the `dispatch` function as the first argument. Async -// code can then be executed and other actions can be dispatched -export const incrementAsync = amount => dispatch => { - setTimeout(() => { - dispatch(incrementByAmount(amount)); - }, 1000); -}; - -// The function below is called a selector and allows us to select a value from -// the state. Selectors can also be defined inline where they're used instead of -// in the slice file. For example: `useSelector((state) => state.counter.value)` -export const selectCount = state => state.counter.value; - -export default counterSlice.reducer; diff --git a/src/index.css b/src/index.css index bd5bd6d..ec2585e 100644 --- a/src/index.css +++ b/src/index.css @@ -1,13 +1,13 @@ -body { - margin: 0; - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', - 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', - sans-serif; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -code { - font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', - monospace; -} +body { + margin: 0; + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', + 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', + sans-serif; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; +} + +code { + font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', + monospace; +} diff --git a/src/index.js b/src/index.tsx similarity index 76% rename from src/index.js rename to src/index.tsx index 4a50d03..f5185c1 100644 --- a/src/index.js +++ b/src/index.tsx @@ -1,21 +1,17 @@ -import React from 'react'; -import ReactDOM from 'react-dom'; -import './index.css'; -import App from './App'; -import store from './app/store'; -import { Provider } from 'react-redux'; -import * as serviceWorker from './serviceWorker'; - -ReactDOM.render( - - - - - , - document.getElementById('root') -); - -// If you want your app to work offline and load faster, you can change -// unregister() to register() below. Note this comes with some pitfalls. -// Learn more about service workers: https://bit.ly/CRA-PWA -serviceWorker.unregister(); +import React from 'react'; +import ReactDOM from 'react-dom'; +import './index.css'; +import App from './App'; +import * as serviceWorker from './serviceWorker'; + +ReactDOM.render( + + + , + document.getElementById('root') +); + +// If you want your app to work offline and load faster, you can change +// unregister() to register() below. Note this comes with some pitfalls. +// Learn more about service workers: https://bit.ly/CRA-PWA +serviceWorker.unregister(); diff --git a/src/logo.svg b/src/logo.svg index 9e96334..6b60c10 100644 --- a/src/logo.svg +++ b/src/logo.svg @@ -1 +1,7 @@ - + + + + + + + diff --git a/src/react-app-env.d.ts b/src/react-app-env.d.ts new file mode 100644 index 0000000..6431bc5 --- /dev/null +++ b/src/react-app-env.d.ts @@ -0,0 +1 @@ +/// diff --git a/src/serviceWorker.js b/src/serviceWorker.ts similarity index 87% rename from src/serviceWorker.js rename to src/serviceWorker.ts index dbd1383..b09523f 100644 --- a/src/serviceWorker.js +++ b/src/serviceWorker.ts @@ -1,137 +1,149 @@ -// This optional code is used to register a service worker. -// register() is not called by default. - -// This lets the app load faster on subsequent visits in production, and gives -// it offline capabilities. However, it also means that developers (and users) -// will only see deployed updates on subsequent visits to a page, after all the -// existing tabs open on the page have been closed, since previously cached -// resources are updated in the background. - -// To learn more about the benefits of this model and instructions on how to -// opt-in, read https://bit.ly/CRA-PWA - -const isLocalhost = Boolean( - window.location.hostname === 'localhost' || - // [::1] is the IPv6 localhost address. - window.location.hostname === '[::1]' || - // 127.0.0.0/8 are considered localhost for IPv4. - window.location.hostname.match( - /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/ - ) -); - -export function register(config) { - if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) { - // The URL constructor is available in all browsers that support SW. - const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href); - if (publicUrl.origin !== window.location.origin) { - // Our service worker won't work if PUBLIC_URL is on a different origin - // from what our page is served on. This might happen if a CDN is used to - // serve assets; see https://github.com/facebook/create-react-app/issues/2374 - return; - } - - window.addEventListener('load', () => { - const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`; - - if (isLocalhost) { - // This is running on localhost. Let's check if a service worker still exists or not. - checkValidServiceWorker(swUrl, config); - - // Add some additional logging to localhost, pointing developers to the - // service worker/PWA documentation. - navigator.serviceWorker.ready.then(() => { - console.log( - 'This web app is being served cache-first by a service ' + - 'worker. To learn more, visit https://bit.ly/CRA-PWA' - ); - }); - } else { - // Is not localhost. Just register service worker - registerValidSW(swUrl, config); - } - }); - } -} - -function registerValidSW(swUrl, config) { - navigator.serviceWorker - .register(swUrl) - .then(registration => { - registration.onupdatefound = () => { - const installingWorker = registration.installing; - if (installingWorker == null) { - return; - } - installingWorker.onstatechange = () => { - if (installingWorker.state === 'installed') { - if (navigator.serviceWorker.controller) { - // At this point, the updated precached content has been fetched, - // but the previous service worker will still serve the older - // content until all client tabs are closed. - console.log( - 'New content is available and will be used when all ' + - 'tabs for this page are closed. See https://bit.ly/CRA-PWA.' - ); - - // Execute callback - if (config && config.onUpdate) { - config.onUpdate(registration); - } - } else { - // At this point, everything has been precached. - // It's the perfect time to display a - // "Content is cached for offline use." message. - console.log('Content is cached for offline use.'); - - // Execute callback - if (config && config.onSuccess) { - config.onSuccess(registration); - } - } - } - }; - }; - }) - .catch(error => { - console.error('Error during service worker registration:', error); - }); -} - -function checkValidServiceWorker(swUrl, config) { - // Check if the service worker can be found. If it can't reload the page. - fetch(swUrl, { - headers: { 'Service-Worker': 'script' }, - }) - .then(response => { - // Ensure service worker exists, and that we really are getting a JS file. - const contentType = response.headers.get('content-type'); - if ( - response.status === 404 || - (contentType != null && contentType.indexOf('javascript') === -1) - ) { - // No service worker found. Probably a different app. Reload the page. - navigator.serviceWorker.ready.then(registration => { - registration.unregister().then(() => { - window.location.reload(); - }); - }); - } else { - // Service worker found. Proceed as normal. - registerValidSW(swUrl, config); - } - }) - .catch(() => { - console.log( - 'No internet connection found. App is running in offline mode.' - ); - }); -} - -export function unregister() { - if ('serviceWorker' in navigator) { - navigator.serviceWorker.ready.then(registration => { - registration.unregister(); - }); - } -} +// This optional code is used to register a service worker. +// register() is not called by default. + +// This lets the app load faster on subsequent visits in production, and gives +// it offline capabilities. However, it also means that developers (and users) +// will only see deployed updates on subsequent visits to a page, after all the +// existing tabs open on the page have been closed, since previously cached +// resources are updated in the background. + +// To learn more about the benefits of this model and instructions on how to +// opt-in, read https://bit.ly/CRA-PWA + +const isLocalhost = Boolean( + window.location.hostname === 'localhost' || + // [::1] is the IPv6 localhost address. + window.location.hostname === '[::1]' || + // 127.0.0.0/8 are considered localhost for IPv4. + window.location.hostname.match( + /^127(?:\.(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)){3}$/ + ) +); + +type Config = { + onSuccess?: (registration: ServiceWorkerRegistration) => void; + onUpdate?: (registration: ServiceWorkerRegistration) => void; +}; + +export function register(config?: Config) { + if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) { + // The URL constructor is available in all browsers that support SW. + const publicUrl = new URL( + process.env.PUBLIC_URL, + window.location.href + ); + if (publicUrl.origin !== window.location.origin) { + // Our service worker won't work if PUBLIC_URL is on a different origin + // from what our page is served on. This might happen if a CDN is used to + // serve assets; see https://github.com/facebook/create-react-app/issues/2374 + return; + } + + window.addEventListener('load', () => { + const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`; + + if (isLocalhost) { + // This is running on localhost. Let's check if a service worker still exists or not. + checkValidServiceWorker(swUrl, config); + + // Add some additional logging to localhost, pointing developers to the + // service worker/PWA documentation. + navigator.serviceWorker.ready.then(() => { + console.log( + 'This web app is being served cache-first by a service ' + + 'worker. To learn more, visit https://bit.ly/CRA-PWA' + ); + }); + } else { + // Is not localhost. Just register service worker + registerValidSW(swUrl, config); + } + }); + } +} + +function registerValidSW(swUrl: string, config?: Config) { + navigator.serviceWorker + .register(swUrl) + .then(registration => { + registration.onupdatefound = () => { + const installingWorker = registration.installing; + if (installingWorker == null) { + return; + } + installingWorker.onstatechange = () => { + if (installingWorker.state === 'installed') { + if (navigator.serviceWorker.controller) { + // At this point, the updated precached content has been fetched, + // but the previous service worker will still serve the older + // content until all client tabs are closed. + console.log( + 'New content is available and will be used when all ' + + 'tabs for this page are closed. See https://bit.ly/CRA-PWA.' + ); + + // Execute callback + if (config && config.onUpdate) { + config.onUpdate(registration); + } + } else { + // At this point, everything has been precached. + // It's the perfect time to display a + // "Content is cached for offline use." message. + console.log('Content is cached for offline use.'); + + // Execute callback + if (config && config.onSuccess) { + config.onSuccess(registration); + } + } + } + }; + }; + }) + .catch(error => { + console.error('Error during service worker registration:', error); + }); +} + +function checkValidServiceWorker(swUrl: string, config?: Config) { + // Check if the service worker can be found. If it can't reload the page. + fetch(swUrl, { + headers: { 'Service-Worker': 'script' } + }) + .then(response => { + // Ensure service worker exists, and that we really are getting a JS file. + const contentType = response.headers.get('content-type'); + if ( + response.status === 404 || + (contentType != null && contentType.indexOf('javascript') === -1) + ) { + // No service worker found. Probably a different app. Reload the page. + navigator.serviceWorker.ready.then(registration => { + registration.unregister().then(() => { + window.location.reload(); + }); + }); + } else { + // Service worker found. Proceed as normal. + registerValidSW(swUrl, config); + } + }) + .catch(() => { + console.log( + 'No internet connection found. App is running in offline mode.' + ); + }); +} + +export function unregister() { + if ('serviceWorker' in navigator) { + navigator.serviceWorker.ready + .then(registration => { + registration.unregister(); + }) + .catch(error => { + console.error(error.message); + }); + } +} diff --git a/src/setupTests.js b/src/setupTests.ts similarity index 98% rename from src/setupTests.js rename to src/setupTests.ts index 35417dc..74b1a27 100644 --- a/src/setupTests.js +++ b/src/setupTests.ts @@ -1,5 +1,5 @@ -// jest-dom adds custom jest matchers for asserting on DOM nodes. -// allows you to do things like: -// expect(element).toHaveTextContent(/react/i) -// learn more: https://github.com/testing-library/jest-dom -import '@testing-library/jest-dom/extend-expect'; +// jest-dom adds custom jest matchers for asserting on DOM nodes. +// allows you to do things like: +// expect(element).toHaveTextContent(/react/i) +// learn more: https://github.com/testing-library/jest-dom +import '@testing-library/jest-dom/extend-expect'; diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 0000000..f2850b7 --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,25 @@ +{ + "compilerOptions": { + "target": "es5", + "lib": [ + "dom", + "dom.iterable", + "esnext" + ], + "allowJs": true, + "skipLibCheck": true, + "esModuleInterop": true, + "allowSyntheticDefaultImports": true, + "strict": true, + "forceConsistentCasingInFileNames": true, + "module": "esnext", + "moduleResolution": "node", + "resolveJsonModule": true, + "isolatedModules": true, + "noEmit": true, + "jsx": "react" + }, + "include": [ + "src" + ] +} diff --git a/yarn.lock b/yarn.lock index c8fd980..9d168f8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -956,7 +956,7 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.5.1", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.4": +"@babel/runtime@^7.5.1", "@babel/runtime@^7.7.4": version "7.9.6" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.6.tgz#a9102eb5cadedf3f31d08a9ecf294af7827ea29f" integrity sha512-64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ== @@ -1241,16 +1241,6 @@ resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b" integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw== -"@reduxjs/toolkit@^1.1.0": - version "1.3.6" - resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-1.3.6.tgz#306171fce2ab7423931736c34fa82190959dcd62" - integrity sha512-eNYURfoJa6mRNU5YtBVbmE5+nDoc4lpjZ181PBwRC6nIFYZdNR3GcoQ4uomFt8eHpXAUAdpCdxBlDsmwyXOt9Q== - dependencies: - immer "^6.0.1" - redux "^4.0.0" - redux-thunk "^2.3.0" - reselect "^4.0.0" - "@sheerun/mutationobserver-shim@^0.3.2": version "0.3.3" resolved "https://registry.yarnpkg.com/@sheerun/mutationobserver-shim/-/mutationobserver-shim-0.3.3.tgz#5405ee8e444ed212db44e79351f0c70a582aae25" @@ -1478,6 +1468,13 @@ "@types/istanbul-lib-coverage" "*" "@types/istanbul-lib-report" "*" +"@types/jest@^24.0.0": + version "24.9.1" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-24.9.1.tgz#02baf9573c78f1b9974a5f36778b366aa77bd534" + integrity sha512-Fb38HkXSVA4L8fGKEZ6le5bB8r6MRWlOCZbVuWZcmOMSCd2wCYOwN1ibj8daIoV9naq7aaOZjrLCoCMptKU/4Q== + dependencies: + jest-diff "^24.3.0" + "@types/json-schema@^7.0.3": version "7.0.4" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz#38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339" @@ -1493,6 +1490,11 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-13.9.2.tgz#ace1880c03594cc3e80206d96847157d8e7fa349" integrity sha512-bnoqK579sAYrQbp73wwglccjJ4sfRdKU7WNEZ5FW4K2U6Kc0/eZ5kvXG0JKsEKFB50zrFmfFt52/cvBbZa7eXg== +"@types/node@^12.0.0": + version "12.12.38" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.38.tgz#58841a382f231ad005dbb935c36d44aa1118a26b" + integrity sha512-75eLjX0pFuTcUXnnWmALMzzkYorjND0ezNEycaKesbUBg9eGZp4GHPuDmkRc4mQQvIpe29zrzATNRA6hkYqwmA== + "@types/parse-json@^4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" @@ -1508,14 +1510,14 @@ resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz#690a1475b84f2a884fd07cd797c00f5f31356ea8" integrity sha512-ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw== -"@types/react-dom@*": +"@types/react-dom@*", "@types/react-dom@^16.9.0": version "16.9.8" resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.8.tgz#fe4c1e11dfc67155733dfa6aa65108b4971cb423" integrity sha512-ykkPQ+5nFknnlU6lDd947WbQ6TE3NNzbQAkInC2EKY1qeYdTKp7onFusmYZb+ityzx2YviqT6BXSu+LyWWJwcA== dependencies: "@types/react" "*" -"@types/react@*": +"@types/react@*", "@types/react@^16.9.0": version "16.9.35" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.35.tgz#a0830d172e8aadd9bd41709ba2281a3124bbd368" integrity sha512-q0n0SsWcGc8nDqH2GJfWQWUOmZSJhXV64CjVN5SvcNti3TdEaA3AH0D8DwNmMdzjMAC/78tB8nAZIlV8yTz+zQ== @@ -4927,13 +4929,6 @@ hmac-drbg@^1.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.1" -hoist-non-react-statics@^3.3.0: - version "3.3.2" - resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45" - integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw== - dependencies: - react-is "^16.7.0" - hosted-git-info@^2.1.4: version "2.8.8" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" @@ -5139,11 +5134,6 @@ immer@1.10.0: resolved "https://registry.yarnpkg.com/immer/-/immer-1.10.0.tgz#bad67605ba9c810275d91e1c2a47d4582e98286d" integrity sha512-O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg== -immer@^6.0.1: - version "6.0.5" - resolved "https://registry.yarnpkg.com/immer/-/immer-6.0.5.tgz#77187d13b71c6cee40dde3b8e87a50a7a636d630" - integrity sha512-Q2wd90qrgFieIpLzAO2q9NLEdmyp/sr76Ml4Vm5peUKgyTa2CQa3ey8zuzwSKOlKH7grCeGBGUcLLVCVW1aguA== - import-cwd@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9" @@ -5741,7 +5731,7 @@ jest-config@^24.9.0: pretty-format "^24.9.0" realpath-native "^1.1.0" -jest-diff@^24.0.0, jest-diff@^24.9.0: +jest-diff@^24.0.0, jest-diff@^24.3.0, jest-diff@^24.9.0: version "24.9.0" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-24.9.0.tgz#931b7d0d5778a1baf7452cb816e325e3724055da" integrity sha512-qMfrTs8AdJE2iqrTp0hzh7kTd2PQWrsFyj9tORoKmu32xjPjeE4NyjVRDz8ybYwqS2ik8N4hsIpiVTyFeo2lBQ== @@ -8548,22 +8538,11 @@ react-error-overlay@^6.0.7: resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.7.tgz#1dcfb459ab671d53f660a991513cb2f0a0553108" integrity sha512-TAv1KJFh3RhqxNvhzxj6LeT5NWklP6rDr2a0jaTfsZ5wSZWHOGeqQyejUp3xxLfPt2UpyJEcVQB/zyPcmonNFA== -react-is@^16.12.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.9.0: +react-is@^16.12.0, react-is@^16.8.1, react-is@^16.8.4: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== -react-redux@^7.1.3: - version "7.2.0" - resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.0.tgz#f970f62192b3981642fec46fd0db18a074fe879d" - integrity sha512-EvCAZYGfOLqwV7gh849xy9/pt55rJXPwmYvI4lilPM5rUT/1NxuuN59ipdBksRVSvz0KInbPnp4IfoXJXCqiDA== - dependencies: - "@babel/runtime" "^7.5.5" - hoist-non-react-statics "^3.3.0" - loose-envify "^1.4.0" - prop-types "^15.7.2" - react-is "^16.9.0" - react-scripts@3.4.1: version "3.4.1" resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.4.1.tgz#f551298b5c71985cc491b9acf3c8e8c0ae3ada0a" @@ -8727,19 +8706,6 @@ redent@^3.0.0: indent-string "^4.0.0" strip-indent "^3.0.0" -redux-thunk@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622" - integrity sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw== - -redux@^4.0.0: - version "4.0.5" - resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.5.tgz#4db5de5816e17891de8a80c424232d06f051d93f" - integrity sha512-VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w== - dependencies: - loose-envify "^1.4.0" - symbol-observable "^1.2.0" - regenerate-unicode-properties@^8.2.0: version "8.2.0" resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz#e5de7111d655e7ba60c057dbe9ff37c87e65cdec" @@ -8918,11 +8884,6 @@ requires-port@^1.0.0: resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8= -reselect@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.0.0.tgz#f2529830e5d3d0e021408b246a206ef4ea4437f7" - integrity sha512-qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA== - resolve-cwd@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a" @@ -9850,11 +9811,6 @@ svgo@^1.0.0, svgo@^1.2.2: unquote "~1.1.1" util.promisify "~1.0.0" -symbol-observable@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" - integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== - symbol-tree@^3.2.2: version "3.2.4" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" @@ -10112,6 +10068,11 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= +typescript@~3.7.2: + version "3.7.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.7.5.tgz#0692e21f65fd4108b9330238aac11dd2e177a1ae" + integrity sha512-/P5lkRXkWHNAbcJIiHPfRoKqyd7bsyCma1hZNUGfn20qm64T6ZBlrzprymeu918H+mB/0rIg2gGK/BXkhhYgBw== + unicode-canonical-property-names-ecmascript@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz#2619800c4c825800efdd8343af7dd9933cbe2818"