[pull] master from styleguidist:master

.github/FUNDING.yml

@@ -1 +1,4 @@
 open_collective: styleguidist
+github: sapegin
+ko_fi: sapegin
+custom: https://www.buymeacoffee.com/sapegin

.github/workflows/coverage.yml

@@ -17,6 +17,7 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: '16'
+          cache: npm
 
       - run: npm ci
       - run: npm run test:coverage -- --runInBand

.github/workflows/danger-js.yml

@@ -17,6 +17,7 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: '16'
+          cache: npm
       - uses: danger/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/node.js.yml

@@ -17,6 +17,7 @@ jobs:
       - uses: actions/setup-node@v2
         with:
           node-version: '16'
+          cache: npm
 
       - run: npm ci
       - run: npm run lint

.github/workflows/release.yml

@@ -13,7 +13,8 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: '20'
+          cache: npm
 
       - run: npm ci
 

Readme.md

@@ -13,6 +13,8 @@ React Styleguidist is a component development environment with hot reloaded dev
 
 ![React Styleguidist in action](https://user-images.githubusercontent.com/1703219/74945569-51c6ad00-543b-11ea-8351-f4d86860893a.gif)
 
+[![Washing your code. A book on clean code for frontend developers](https://sapegin.me/images/washing-code-github.jpg)](https://sapegin.me/book/)
+
 ## Usage
 
 - **[Getting Started](https://react-styleguidist.js.org/docs/getting-started): install and run Styleguidist**

docs/Development.md

@@ -101,7 +101,7 @@ Because of isolation and theming you need to explicitly declare `fontFamily`, `f
 
 ## Testing
 
-We’re using [Jest with Enzyme](http://blog.sapegin.me/all/react-jest) for testing. Put your component tests into `Component.spec.js` file in the same folder and all other tests into `__tests__/filename.spec.js`.
+We’re using [Jest with React Test Renderer](https://reactjs.org/docs/test-renderer.html) for testing. Put your component tests into `Component.spec.js` file in the same folder and all other tests into `__tests__/filename.spec.js`.
 
 To test particular class names use `classes` function (available in the global namespace in tests):
 
@@ -113,11 +113,12 @@ const props = {
 }
 
 it('should render active styles', () => {
-  const actual = shallow(
+  const renderer = createRenderer()
+  renderer.render(
     <TabButtonRenderer {...props} active>
       pizza
     </TabButtonRenderer>
   )
-  expect(actual).toMatchSnapshot()
+  expect(actual.toJson()).toMatchSnapshot()
 })
 ```

docs/Maintenance.md

@@ -15,7 +15,7 @@ Help us develop and maintain Styleguidist:
 
 ## Commit message conventions
 
-We use a simplified [Angular commit message conventions](https://github.com/angular/angular/blob/master/CONTRIBUTING.md#commit). This makes automated releases with [semantic-release](https://github.com/semantic-release/semantic-release) possible.
+We use a simplified [Angular commit message conventions](https://docs.google.com/document/d/1QrDFcIiPjSLDn3EL15IJygNPiHORgU1_OOAqWjiDU5Y/edit). This makes automated releases with [semantic-release](https://github.com/semantic-release/semantic-release) possible.
 
 \*\*The main differences with the Angular convention is that all messages are capitalized. Commit messages are written for humans to read, so we should use text convention for humans, not for machines.
 
@@ -120,15 +120,15 @@ export default function renderExtra(prop: PropDescriptorWithFlow): React.ReactNo
   if (!prop.type || !type) {
     return null;
   }
-````
+```
 
 Unfortunately, this extra condition has resulted in this method always returning `null` for a Flow typed prop as `prop.type` is always `null` as `prop.type` is never set.
 
 This commit reverts the condition to what it was before the migration to TypeScript.
 
 Fixes #1234
 
-```
+````
 
 ## Pull requests
 
@@ -178,4 +178,4 @@ Here’s a [good example of a changelog](https://github.com/styleguidist/react-s
 
 - Information about pull request authors:<br> `(#1040 by @rafaesc)`
 - Open Collective link at the very top:<br> `👋 **[Support Styleguidist](https://opencollective.com/styleguidist) on Open Collective** 👋`
-```
+

examples/basic/package.json

@@ -24,20 +24,20 @@
     "dog-names": "^2.0.0",
     "lodash": "^4.17.19",
     "prop-types": "^15.7.2",
-    "react": "^16.13.0",
-    "react-dom": "^16.13.0",
-    "react-styleguidist": "^11.0.0"
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "react-styleguidist": "^12.0.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.6.4",
-    "@babel/plugin-proposal-class-properties": "^7.5.5",
-    "@babel/preset-env": "^7.6.3",
-    "@babel/preset-react": "^7.6.3",
-    "babel-loader": "^8.0.6",
-    "css-loader": "^3.2.0",
-    "file-loader": "^4.2.0",
-    "style-loader": "^1.0.0",
-    "url-loader": "^2.2.0",
-    "webpack": "^4.41.1"
+    "@babel/core": "^7.9.0",
+    "@babel/plugin-proposal-class-properties": "^7.8.3",
+    "@babel/preset-env": "^7.9.0",
+    "@babel/preset-react": "^7.18.6",
+    "babel-loader": "^8.1.0",
+    "css-loader": "^6.7.1",
+    "file-loader": "^6.2.0",
+    "style-loader": "^3.3.1",
+    "url-loader": "^4.1.1",
+    "webpack": "^5.72.0"
   }
 }