Merge branch 'dev' into remove-connected-react-router

.versionrc.js

@@ -29,6 +29,6 @@ module.exports = {
     { type: 'style', section: internalSection, hidden: false },
   ],
   skip: {
-    commit: true,
+    changelog: true,
   },
 };

README.md

@@ -15,12 +15,14 @@ with a focus on
   <a href="https://github.com/react-boilerplate/react-boilerplate-cra-template/actions?query=workflow%3Atests">
     <img src="https://github.com/react-boilerplate/react-boilerplate-cra-template/workflows/test/badge.svg" alt="Tests Status" />
   </a>
+  <a href="https://github.com/react-boilerplate/react-boilerplate-cra-template/actions?query=workflow%release">
+    <img src="https://github.com/react-boilerplate/react-boilerplate-cra-template/workflows/release/badge.svg" alt="Release Status" />
+  </a>
   <a href="https://coveralls.io/github/react-boilerplate/react-boilerplate-cra-template">
     <img src="https://coveralls.io/repos/github/react-boilerplate/react-boilerplate-cra-template/badge.svg?branch=master" alt="Coverage" />
   </a>
-
-</a>
 </div>
+
 <div align="center">
   <a href="https://david-dm.org/react-boilerplate/react-boilerplate-cra-template">
     <img src="https://david-dm.org/react-boilerplate/react-boilerplate-cra-template.svg" alt="Dependency Status" />
@@ -31,7 +33,6 @@ with a focus on
   <a href="https://opencollective.com/react-boilerplate/">
     <img src="https://opencollective.com/react-boilerplate/sponsors/badge.svg" alt="Sponsors" />
   </a>
-  <img src="https://img.shields.io/github/license/react-boilerplate/react-boilerplate-cra-template" alt="License" />
 </div>
 
 <br />
@@ -44,15 +45,19 @@ The official [Create React App](https://github.com/facebook/create-react-app) te
 
 Start your `create-react-app` projects in seconds with the best, industry-standard tools and practices made ready for you.
 
-**📝 Documentation:** [Gitbook](https://cansahin.gitbook.io/react-boilerplate-cra-template/)
+**📚Documentation:** [Gitbook](https://cansahin.gitbook.io/react-boilerplate-cra-template/)
+
+**🎨Explore the Example Application:** [Example Application](https://react-boilerplate.github.io/react-boilerplate-cra-template/)
+
+**💡Examples & Tutorials of commonly needed **`'How to'`**'s:** [Collection of examples & tutorials](https://github.com/react-boilerplate/cra-template-examples)
+
+> Feel free to contribute with your `how to do this and that` examples and guides.
 
 **📦 Package:** [npm](https://www.npmjs.com/package/cra-template-rb)
 
 ![version](https://img.shields.io/npm/v/cra-template-rb)
 ![version](https://img.shields.io/npm/dm/cra-template-rb)
 
-**👁️ Explore the Example Application:** [Example Application](https://react-boilerplate.github.io/react-boilerplate-cra-template/)
-
 ---
 
 ## Install & Start

internals/scripts/create-changelog.script.ts

@@ -0,0 +1,21 @@
+import shell from 'shelljs';
+
+interface Options {}
+
+export function createChangeLog(opts: Options = {}) {
+  const changes1 = shell.exec(`git diff package.json`, { silent: true });
+  const changes2 = shell.exec(`git diff package-lock.json`, { silent: true });
+  if (changes1.stdout.length > 0 || changes2.stdout.length > 0) {
+    console.error('Error: Unstaged files');
+    process.exit(1);
+  }
+  shell.exec(`npx standard-version --skip.commit --skip.tag`, {
+    silent: false,
+  });
+
+  // Revert the bumbped version
+  shell.exec(`git checkout -- package-lock.json`, { silent: true });
+  shell.exec(`git checkout -- package.json`, { silent: true });
+}
+
+createChangeLog();

internals/startingTemplate/src/locales/i18n.ts

@@ -13,7 +13,7 @@ const translationsJson = {
 };
 
 export type TranslationResource = typeof en;
-export type LanguageKeys = keyof TranslationResource;
+export type LanguageKey = keyof TranslationResource;
 
 export const translations: ConvertedToFunctionsType<TranslationResource> = {} as any;
 

package.json

@@ -56,6 +56,7 @@
     "create:cra-app": "rm -rf generated-cra-app && npm run create:npm-package && npx create-react-app generated-cra-app --template file:.cra-template-rb && rm -rf .cra-template-rb",
     "// ---PUBLISHING---": "",
     "publish:github": "cross-env PUBLIC_URL='/react-boilerplate-cra-template' npm run build && gh-pages -d build",
+    "changelog": "ts-node --project=./internals/ts-node.tsconfig.json ./internals/scripts/create-changelog.script.ts",
     "release": "standard-version",
     "publish:npm": "npm run create:npm-package && npm publish .cra-template-rb"
   },