update template with react 18

amirfakhrullah · amirfakhrullah · commit 386b5b9f0c2a · 2022-06-03T00:54:01.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -1 +1,6 @@
-/node_modules
+/node_modules
+
+template/package.json
+template/package-lock.json
+template/node_modules
+template/.husky
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     }
   },
   "lint-staged": {
-    "./**/*.{js,ts,tsx,css,md,json}": [
+    "./**/*.{js,ts,tsx}": [
       "prettier --write",
       "eslint --fix"
     ]
diff --git a/template.json b/template.json
@@ -3,10 +3,28 @@
     "scripts": {
       "postinstall": "husky install && npx husky add .husky/pre-commit \"npx lint-staged\"",
       "husky:prepare": "husky install && npx husky add .husky/pre-commit \"npx lint-staged\"",
+      "start": "react-scripts start",
+      "build": "react-scripts build",
+      "eject": "react-scripts eject",
       "lint": "eslint .",
       "lint:fix": "eslint --fix",
       "format": "prettier --write \"./**/*.{js,ts,tsx,css,json}\" --config ./.prettierrc"
     },
+    "dependencies": {
+        "@types/node": "^16.11.37",
+        "@types/react": "^18.0.10",
+        "@types/react-dom": "^18.0.5",
+        "autoprefixer": "^10.4.7",
+        "postcss": "^8.4.14",
+        "postcss-cli": "^9.1.0",
+        "postcss-preset-env": "^7.7.0",
+        "react": "^18.1.0",
+        "react-dom": "^18.1.0",
+        "react-scripts": "5.0.1",
+        "tailwindcss": "^3.0.24",
+        "typescript": "^4.7.2",
+        "web-vitals": "^2.1.4"
+      },
     "devDependencies": {
       "@typescript-eslint/eslint-plugin": "^5.27.0",
       "@typescript-eslint/parser": "^5.27.0",
@@ -21,6 +39,23 @@
       "husky": "^8.0.1",
       "prettier": "^2.6.2"
     },
+    "eslintConfig": {
+      "extends": [
+        "react-app"
+      ]
+    },
+    "browserslist": {
+      "production": [
+        ">0.2%",
+        "not dead",
+        "not op_mini all"
+      ],
+      "development": [
+        "last 1 chrome version",
+        "last 1 firefox version",
+        "last 1 safari version"
+      ]
+    },
     "husky": {
       "hooks": {
         "pre-commit": "lint-staged"
diff --git a/template/.gitignore b/template/.gitignore
diff --git a/template/README.md b/template/README.md
@@ -9,10 +9,10 @@ In the project directory, you can run:
 ### `npm start`
 
 Runs the app in the development mode.\
-Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
+Open [http://localhost:3000](http://localhost:3000) to view it in your browser.
 
-The page will reload if you make edits.\
-You will also see any lint errors in the console.
+The page will reload when you make changes.\
+You may also see any lint errors in the console.
 
 ### `npm test`
 
@@ -31,16 +31,40 @@ See the section about [deployment](https://facebook.github.io/create-react-app/d
 
 ### `npm run eject`
 
-**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
+**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.
+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.
+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.
+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](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](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](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](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](https://facebook.github.io/create-react-app/docs/deployment)
+
+### `npm run build` fails to minify
+
+This section has moved here: [https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify](https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify)
diff --git a/template/postcss.config.js b/template/postcss.config.js
diff --git a/template/src/App.tsx b/template/src/App.tsx
@@ -1,21 +1,19 @@
-import React from "react";
-import logo from "./logo.svg";
-
 function App() {
   return (
-    <div className="App">
-      <header className="App-header">
-        <img src={logo} className="App-logo" alt="logo" />
-        <p>
-          Edit <code>src/App.tsx</code> and save to reload.
+    <div className="w-screen min-h-screen flex flex-col items-center justify-center bg-gray-800">
+      <header className="border border-gray-600 rounded-lg p-10">
+        <h1 className="text-center text-2xl font-bold text-gray-300 mb-5">
+          CRA-TEMPLATE-REACT-TS-TW
+        </h1>
+        <p className="text-gray-400">
+          Edit{" "}
+          <code className="bg-blue-900 p-1 mx-2 rounded-md">'src/App.tsx'</code>{" "}
+          and save to reload.
         </p>
-        <a
-          className="App-link"
-          href="https://reactjs.org"
-          target="_blank"
-          rel="noopener noreferrer"
-        >
-          Learn React
+        <a href="https://reactjs.org" target="_blank" rel="noopener noreferrer">
+          <div className="bg-gray-600 hover:bg-gray-700 py-2 px-3 text-center mt-5 rounded-md text-gray-300 font-bold">
+            Learn React
+          </div>
         </a>
       </header>
     </div>
diff --git a/template/src/index.css b/template/src/index.css
@@ -1,15 +1,17 @@
-/* @tailwind base; */
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
 
-/* Your own custom base styles */
+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;
+}
 
-/* Start purging... */
-/* @tailwind components; */
-/* Stop purging. */
-
-/* Your own custom component styles */
-
-/* Start purging... */
-/* @tailwind utilities; */
-/* Stop purging. */
-
-/* Your own custom utilities */
+code {
+  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
+    monospace;
+}
diff --git a/template/src/index.tsx b/template/src/index.tsx
@@ -1,13 +1,18 @@
 import React from "react";
-import ReactDOM from "react-dom/client";
+import { createRoot } from "react-dom/client";
 import "./index.css";
 import App from "./App";
+import reportWebVitals from "./reportWebVitals";
 
-const root = ReactDOM.createRoot(
-  document.getElementById("root") as HTMLElement,
-);
+const container = document.getElementById("root");
+const root = createRoot(container!); // createRoot(container!) if you use TypeScript
 root.render(
   <React.StrictMode>
     <App />
   </React.StrictMode>,
 );
+
+// If you want to start measuring performance in your app, pass a function
+// to log results (for example: reportWebVitals(console.log))
+// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
+reportWebVitals();
diff --git a/template/src/logo.svg b/template/src/logo.svg
diff --git a/template/src/reportWebVitals.js b/template/src/reportWebVitals.js
@@ -0,0 +1,13 @@
+const reportWebVitals = (onPerfEntry) => {
+  if (onPerfEntry && onPerfEntry instanceof Function) {
+    import("web-vitals").then(({ getCLS, getFID, getFCP, getLCP, getTTFB }) => {
+      getCLS(onPerfEntry);
+      getFID(onPerfEntry);
+      getFCP(onPerfEntry);
+      getLCP(onPerfEntry);
+      getTTFB(onPerfEntry);
+    });
+  }
+};
+
+export default reportWebVitals;
diff --git a/template/tailwind.config.js b/template/tailwind.config.js
@@ -1,7 +1,5 @@
 module.exports = {
-  theme: {
-    extend: {},
-  },
-  plugins: ["postcss-preset-env"],
-  content: ["./src/**/*.{js,jsx,ts,tsx,html}", "./public/index.html"],
+  content: ["./src/**/*.{js,jsx,ts,tsx}"],
+  theme: {},
+  plugins: [],
 };
diff --git a/template/tsconfig.json b/template/tsconfig.json

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`}`
`37`	`37`	`},`
`38`	`38`	`"lint-staged": {`
`39`		`- "./*/.{js,ts,tsx,css,md,json}": [`
	`39`	`+ "./*/.{js,ts,tsx}": [`
`40`	`40`	`"prettier --write",`
`41`	`41`	`"eslint --fix"`
`42`	`42`	`]`