Merge 79302b2 into 83ca12c

.all-contributorsrc

@@ -45,7 +45,7 @@
     {
       "login": "lourensdev",
       "name": "Lourens de Villiers",
-      "avatar_url": "https://avatars.githubusercontent.com/u/5746141?v=4",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5746141",
       "profile": "https://github.com/lourensdev",
       "contributions": [
         "doc"
@@ -54,14 +54,26 @@
     {
       "login": "rejochandran",
       "name": "Rejo Chandran",
-      "avatar_url": "https://avatars.githubusercontent.com/u/4696985?v=4",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4696985",
       "profile": "https://github.com/rejochandran",
       "contributions": [
         "code",
         "doc",
         "test"
       ]
-    }
+    },
+    {
+      "login": "qeleb",
+      "name": "Caleb Hoff",
+      "avatar_url": "https://avatars.githubusercontent.com/u/15345696",
+      "profile": "https://github.com/qeleb",
+      "contributions": [
+        "code",
+        "doc",
+        "ideas",
+        "test"
+      ]
+    },
   ],
   "contributorsPerLine": 8,
   "commitConvention": "none"

.gitignore

@@ -9,9 +9,19 @@ stats.json
 # misc
 .DS_Store
 npm-debug.log*
+
+# yarn
 yarn-debug.log*
 yarn-error.log*
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
 
+# env
 .env.development.local
 .env.test.local
 .env.production.local

.yarnrc.yml

@@ -0,0 +1,7 @@
+nodeLinker: node-modules
+
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
+    spec: "@yarnpkg/plugin-typescript"
+
+yarnPath: .yarn/releases/yarn-3.2.3.cjs

README.md

@@ -135,7 +135,8 @@ But wait... there's more!
     <td align="center"><a href="https://github.com/receptiryaki"><img src="https://avatars0.githubusercontent.com/u/3495307?s=80" width="80px;" alt=""/><br /><sub><b>Recep Tiryaki</b></sub></a><br /><a href="https://github.com/react-boilerplate/react-boilerplate-cra-template/commits?author=receptiryaki" title="Code">💻</a> <a href="#ideas-receptiryaki" title="Ideas, Planning, & Feedback">🤔</a> <a href="#design-receptiryaki" title="Design">🎨</a></td>
     <td align="center"><a href="https://github.com/mogsdad"><img src="https://avatars3.githubusercontent.com/u/1707731?s=80" width="80px;" alt=""/><br /><sub><b>David Bingham</b></sub></a><br /><a href="https://github.com/react-boilerplate/react-boilerplate-cra-template/commits?author=mogsdad" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/lourensdev"><img src="https://avatars.githubusercontent.com/u/5746141?v=4?s=80" width="80px;" alt=""/><br /><sub><b>Lourens de Villiers</b></sub></a><br /><a href="https://github.com/react-boilerplate/react-boilerplate-cra-template/commits?author=lourensdev" title="Documentation">📖</a></td>
-    <td align="center"><a href="https://github.com/rejochandran"><img src="https://avatars.githubusercontent.com/u/4696985?v=4?s=80" width="80px;" alt=""/><br /><sub><b>Rejo Chandran</b></sub></a><br /><a href="https://github.com/react-boilerplate/react-boilerplate-cra-template/commits?author=rejochandran" title="Code">💻</a> <a href="https://github.com/react-boilerplate/react-boilerplate-cra-template/commits?author=rejochandran" title="Documentation">📖</a> <a href="https://github.com/react-boilerplate/react-boilerplate-cra-template/commits?author=rejochandran" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/rejochandran"><img src="https://avatars.githubusercontent.com/u/4696985?s=80" width="80px;" alt=""/><br /><sub><b>Rejo Chandran</b></sub></a><br /><a href="https://github.com/react-boilerplate/react-boilerplate-cra-template/commits?author=rejochandran" title="Code">💻</a> <a href="https://github.com/react-boilerplate/react-boilerplate-cra-template/commits?author=rejochandran" title="Documentation">📖</a> <a href="https://github.com/react-boilerplate/react-boilerplate-cra-template/commits?author=rejochandran" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://github.com/qeleb"><img src="https://avatars.githubusercontent.com/u/15345696?s=80" width="80px;" alt=""/><br /><sub><b>Caleb Hoff</b></sub></a><br /><a href="https://github.com/react-boilerplate/react-boilerplate-cra-template/commits?author=qeleb" title="Code">💻</a> <a href="https://github.com/react-boilerplate/react-boilerplate-cra-template/commits?author=qeleb" title="Documentation">📖</a> <a href="#ideas-qeleb" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/react-boilerplate/react-boilerplate-cra-template/commits?author=qeleb" title="Tests">⚠️</a></td>
   </tr>
 </table>
 

docs/building-blocks/testing.md

@@ -51,7 +51,7 @@ function HomePage() {
 
 _Note: This is a [state**ful** (or "smart") component](../understanding-react-boilerplate.md#src-app)_
 
-When rendered normally with the standard `ReactDOMClient.createRoot` function, this will be the HTML output
+When rendered normally with the standard `ReactDOMClient.createRoot().render()` function, this will be the HTML output
 (_Comments added in parallel to compare structures in HTML from JSX source_):
 
 ```html

docs/tools/editors.md

@@ -8,11 +8,10 @@ We provide a `.vscode` folder out-of-the-box which includes the **recommended ex
 
 They are highly suggested for the best Developer Experience. Extensions are responsible for:
 
-- Eslint
-- Prettier
-- Chrome debugger
-- Jest
-- Styled Components
+- [Eslint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint)
+- [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)
+- [Styled Components](https://marketplace.visualstudio.com/items?itemName=styled-components.vscode-styled-components)
+- [Jest](https://marketplace.visualstudio.com/items?itemName=Orta.vscode-jest)
 
 These are the basic building blocks in the boilerplate.
 

internals/generators/component/index.ts

@@ -10,7 +10,7 @@ import { baseGeneratorPath } from '../paths';
 
 inquirer.registerPrompt('directory', require('inquirer-directory'));
 
-export enum ComponentProptNames {
+export const enum ComponentProptNames {
   componentName = 'componentName',
   path = 'path',
   wantMemo = 'wantMemo',

internals/generators/slice/index.ts

@@ -11,7 +11,7 @@ import { baseGeneratorPath } from '../paths';
 
 inquirer.registerPrompt('directory', require('inquirer-directory'));
 
-export enum SliceProptNames {
+export const enum SliceProptNames {
   'sliceName' = 'sliceName',
   'path' = 'path',
   'wantSaga' = 'wantSaga',

internals/scripts/create-npm-package.ts

@@ -26,12 +26,6 @@ export function createNpmPackage(opts: Options = {}) {
 
   removeTemplateFolder();
 
-  // Rename the files that NPM has special conditions back
-  shell.mv(
-    `${packageFolder}/template/npmrc`,
-    `${packageFolder}/template/.npmrc`,
-  );
-
   if (abortOnFailEnabled) shellDisableAbortOnFail();
   return packageFolder;
 }

internals/scripts/create-template-folder.ts

@@ -60,6 +60,11 @@ export function createTemplateFolder(opts: Options = {}) {
   copyToTemplate('internals/startingTemplate', true);
   copyToTemplate('internals/testing', true);
 
+  shell.mkdir('template/.yarn');
+  copyToTemplate('.yarn/releases', true);
+  copyToTemplate('.yarn/plugins', true);
+  copyToTemplate('.yarnrc.yml');
+
   copyToTemplate('.vscode', true);
   copyToTemplate('public', true);
   copyToTemplate('src', true);
@@ -69,7 +74,6 @@ export function createTemplateFolder(opts: Options = {}) {
   copyToTemplate('.eslintrc.js');
   copyToTemplate('.gitattributes');
   copyToTemplate('.gitignore');
-  copyToTemplate('.npmrc');
   copyToTemplate('.nvmrc');
   copyToTemplate('.prettierignore');
   copyToTemplate('.prettierrc');
@@ -79,7 +83,6 @@ export function createTemplateFolder(opts: Options = {}) {
 
   // Rename some specific files so they won't be discarded in 'yarn pack'
   shell.mv('template/.gitignore', 'template/gitignore');
-  shell.mv('template/.npmrc', 'template/npmrc');
 
   if (abortOnFailEnabled) shellDisableAbortOnFail();
 }

package.json

@@ -97,7 +97,7 @@
     "react-app-polyfill": "3.0.0",
     "react-dom": "18.2.0",
     "react-helmet-async": "1.3.0",
-    "react-i18next": "11.18.4",
+    "react-i18next": "11.18.5",
     "react-is": "18.2.0",
     "react-redux": "7.2.8",
     "react-router-dom": "6.3.0",
@@ -112,23 +112,24 @@
     "@commitlint/config-conventional": "13.2.0",
     "@testing-library/jest-dom": "5.16.5",
     "@testing-library/react": "13.4.0",
-    "@types/fontfaceobserver": "2.1.0",
-    "@types/jest": "27.5.2",
-    "@types/node": "14.14.31",
-    "@types/react": "18.0.17",
-    "@types/react-dom": "18.0.6",
-    "@types/react-redux": "7.1.24",
-    "@types/react-router-dom": "5.3.3",
-    "@types/react-test-renderer": "18.0.0",
-    "@types/rimraf": "3.0.2",
-    "@types/shelljs": "0.8.11",
-    "@types/styled-components": "5.1.26",
-    "@types/testing-library__jest-dom": "5.14.5",
-    "@types/webpack": "5.28.0",
-    "@types/webpack-env": "1.18.0",
+    "@types/fontfaceobserver": "^2.1.0",
+    "@types/jest": "^27.5.2",
+    "@types/node": "^14.18.27",
+    "@types/react": "^18.0.18",
+    "@types/react-dom": "^18.0.6",
+    "@types/react-redux": "^7.1.24",
+    "@types/react-router-dom": "^5.3.3",
+    "@types/react-test-renderer": "^18.0.0",
+    "@types/rimraf": "^3.0.2",
+    "@types/shelljs": "^0.8.11",
+    "@types/styled-components": "^5.1.26",
+    "@types/testing-library__jest-dom": "^5.14.5",
+    "@types/webpack": "^5.28.0",
+    "@types/webpack-env": "^1.18.0",
     "chalk": "4.1.2",
     "cross-env": "7.0.3",
     "devmoji": "2.3.0",
+    "eslint": "8.23.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-prettier": "4.2.1",
     "eslint-plugin-react-hooks": "4.6.0",
@@ -138,6 +139,7 @@
     "i18next-scanner": "4.0.0",
     "inquirer": "7.3.3",
     "inquirer-directory": "2.2.0",
+    "jest": "27.5.1",
     "jest-styled-components": "7.1.1",
     "lint-staged": "13.0.3",
     "node-plop": "0.26.3",
@@ -169,5 +171,6 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
-  }
+  },
+  "packageManager": "yarn@3.2.3"
 }

src/app/pages/HomePage/Features/GithubRepoForm/slice/types.ts

@@ -8,7 +8,7 @@ export interface GithubRepoFormState {
   repositories: Repo[];
 }
 
-export enum RepoErrorType {
+export const enum RepoErrorType {
   RESPONSE_ERROR = 1,
   USER_NOT_FOUND = 2,
   USERNAME_EMPTY = 3,

src/styles/StyleConstants.ts

@@ -1,3 +1,3 @@
-export enum StyleConstants {
+export const enum StyleConstants {
   NAV_BAR_HEIGHT = '4rem',
 }

template.json

@@ -47,7 +47,7 @@
       "react-app-polyfill": "3.0.0",
       "react-dom": "18.2.0",
       "react-helmet-async": "1.3.0",
-      "react-i18next": "11.18.4",
+      "react-i18next": "11.18.5",
       "react-is": "18.2.0",
       "react-redux": "7.2.8",
       "react-router-dom": "6.3.0",
@@ -59,29 +59,31 @@
 
       "@testing-library/jest-dom": "5.16.5",
       "@testing-library/react": "13.4.0",
-      "@types/fontfaceobserver": "2.1.0",
-      "@types/jest": "27.5.2",
-      "@types/node": "14.14.31",
-      "@types/react": "18.0.17",
-      "@types/react-dom": "18.0.6",
-      "@types/react-redux": "7.1.24",
-      "@types/react-router-dom": "5.3.3",
-      "@types/react-test-renderer": "18.0.0",
-      "@types/rimraf": "3.0.2",
-      "@types/shelljs": "0.8.11",
-      "@types/styled-components": "5.1.26",
-      "@types/testing-library__jest-dom": "5.14.5",
-      "@types/webpack": "5.28.0",
-      "@types/webpack-env": "1.18.0",
+      "@types/fontfaceobserver": "^2.1.0",
+      "@types/jest": "^27.5.2",
+      "@types/node": "^14.18.27",
+      "@types/react": "^18.0.18",
+      "@types/react-dom": "^18.0.6",
+      "@types/react-redux": "^7.1.24",
+      "@types/react-router-dom": "^5.3.3",
+      "@types/react-test-renderer": "^18.0.0",
+      "@types/rimraf": "^3.0.2",
+      "@types/shelljs": "^0.8.11",
+      "@types/styled-components": "^5.1.26",
+      "@types/testing-library__jest-dom": "^5.14.5",
+      "@types/webpack": "^5.28.0",
+      "@types/webpack-env": "^1.18.0",
       "chalk": "4.1.2",
       "cross-env": "7.0.3",
+      "eslint": "8.23.0",
       "eslint-config-prettier": "8.5.0",
       "eslint-plugin-prettier": "4.2.1",
       "eslint-plugin-react-hooks": "4.6.0",
       "husky": "8.0.1",
       "i18next-scanner": "4.0.0",
       "inquirer": "7.3.3",
       "inquirer-directory": "2.2.0",
+      "jest": "27.5.1",
       "jest-styled-components": "7.1.1",
       "lint-staged": "13.0.3",
       "node-plop": "0.26.3",
@@ -98,5 +100,6 @@
       "ts-node": "10.9.1",
       "typescript": "4.6.4"
     }
-  }
+  },
+  "packageManager": "yarn@3.2.3"
 }