Merge #1759

1759: Release next v14.x r=ZauberNerd a=hops-release-bot[bot]

 # Next v14.x release

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: bors[bot] <26634292+bors[bot]@users.noreply.github.com>
Co-authored-by: Emanuel Kluge <emanuel.kluge@new-work.se>
Co-authored-by: Jonas Holland <mail@jhio.de>
Co-authored-by: Markus Wolf <mail@markus-wolf.de>

.github/release-bot.yml

@@ -12,3 +12,5 @@ labels:
 release-pr-branch-pattern: 'release-bot/next-%s'
 
 prepare-release-command: 'yarn release:prepare'
+
+rollback-release-command: 'yarn release:rollback'

CHANGELOG.md

@@ -3,6 +3,40 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [14.2.0](https://github.com/xing/hops/compare/v14.1.0...v14.2.0) (2021-06-14)
+
+
+### Bug Fixes
+
+* **jest-preset:** use correct import of babel-jest package ([20f6ed3](https://github.com/xing/hops/commit/20f6ed3f2b87e752f56eb02404c26fdea8d78dd4))
+* allow custom apollo cache ([e1b89af](https://github.com/xing/hops/commit/e1b89af9a869eb0aa843d73afa04edec46bc596d))
+* update dependency dotenv to v10 ([8e206ed](https://github.com/xing/hops/commit/8e206ed06a06ed0779afd165a6931be210be1a28))
+* update dependency dotenv to v9 ([467ae09](https://github.com/xing/hops/commit/467ae09c8f356209a50f88e6b80a46e0939d3b3d))
+* update dependency fs-extra to v10 ([5a82bc9](https://github.com/xing/hops/commit/5a82bc909d9b16511d1761d6b3673aedfbe79088))
+* update dependency http-proxy-middleware to v2 ([dfaa00b](https://github.com/xing/hops/commit/dfaa00b31fc798b3f2caf0b057b10646705cac6d))
+* update dependency import-from to v4 ([07ffb06](https://github.com/xing/hops/commit/07ffb06b6c132b247d0ce6ca2807d28677827bff))
+* update dependency nocache to v3 ([bffb53f](https://github.com/xing/hops/commit/bffb53f2cfd85f5977db5d871b8b703a29f4860b))
+* update dependency optimize-css-assets-webpack-plugin to v6 ([2defe26](https://github.com/xing/hops/commit/2defe2627163632ca1195ee05c71bc619b3b1912))
+* update dependency puppeteer to v10 ([8fe3351](https://github.com/xing/hops/commit/8fe3351c5220255358005d3b60fe1e9d7a325e88))
+* update dependency web-vitals to v2 ([8bc5a64](https://github.com/xing/hops/commit/8bc5a64a2617d1e50a973bf8fbb33baf8d58dcd5))
+* update dependency webpack-dev-middleware to v5 ([7c2164c](https://github.com/xing/hops/commit/7c2164cc3f04e510cdffc9e6e09145ce5400aeb5))
+* **apollo-mock-server:** update package graphql-tag ([9d1816a](https://github.com/xing/hops/commit/9d1816aa250cdefbe84f523bd6577b2f69808023))
+* **debug:** provide method extend in the browser ([d657fda](https://github.com/xing/hops/commit/d657fdaa0616a401d4935302c42b3fbd1dfcae25))
+* **jest-preset:** set Jest test environment explicitly ([1847985](https://github.com/xing/hops/commit/1847985e41d152788db447aad878a1b56246906d))
+* update dependency puppeteer to v9 ([aafcdec](https://github.com/xing/hops/commit/aafcdec798cbcb9a58f7a824be3ff13c3d3ba9f4))
+* update dependency yargs to v17 ([99fb4c6](https://github.com/xing/hops/commit/99fb4c6c52ff20722b169cfc7d2d23eedde07f11))
+
+
+### Features
+
+* **jest-preset:** enable ESM support for Typescript ([4a8cf18](https://github.com/xing/hops/commit/4a8cf183f9eab34f72b4daf568ed3108b20ba238))
+* update Jest to version 27 ([31fd69b](https://github.com/xing/hops/commit/31fd69b23fd5f1dd0e0cfce46d7a8db173eb9361)), closes [#1838](https://github.com/xing/hops/issues/1838) [#1839](https://github.com/xing/hops/issues/1839) [#1761](https://github.com/xing/hops/issues/1761)
+* **react:** switch to the new JSX transform ([8c3acfb](https://github.com/xing/hops/commit/8c3acfbb9791b7b83122cea61edd1dab7057d8cb))
+
+
+
+
+
 # [14.1.0](https://github.com/xing/hops/compare/v14.0.1...v14.1.0) (2021-04-20)
 
 

DOCUMENTATION.md

@@ -123,7 +123,6 @@ The main export of the entry file must be the result of `hops`'s [`render()`](#r
 
 ```javascript
 import { render } from 'hops';
-import React from 'react';
 
 export default render(<h1>Hello World!</h1>);
 ```
@@ -136,7 +135,6 @@ Hops ships with [`react-router`](https://reacttraining.com/react-router/web/guid
 
 ```javascript
 import { render, Miss } from 'hops';
-import React from 'react';
 import { Route, Switch } from 'react-router-dom';
 
 const Home = () => <h1>Home</h1>;
@@ -174,7 +172,6 @@ And when we now import this file we will have access to all its class names whic
 **`src/app.js`**
 
 ```javascript
-import React from 'react';
 import { render } from 'hops';
 import styles from './styles.css';
 
@@ -190,15 +187,13 @@ You can use code-splitting (or bundle-splitting) to reduce the size of the asset
 **`src/my-component.js`**
 
 ```javascript
-import React from 'react';
 export default () => <p>This has been loaded lazily</p>;
 ```
 
 **`src/app.js`**
 
 ```javascript
 import { render, importComponent } from 'hops';
-import React from 'react';
 
 const MyLazyComponent = importComponent(() => import('./my-component'));
 
@@ -350,7 +345,6 @@ The above example demonstrates how you can pass the value of the environment var
 
 ```javascript
 import { render, withConfig } from 'hops';
-import React from 'react';
 
 const Config = withConfig(({ config }) => <div>{config.myApiUrl}</div>);
 
@@ -493,7 +487,6 @@ It is commonly used in an application's routing config as the last route:
 
 ```javascript
 import { render, Miss } from 'hops';
-import React from 'react';
 import { Route, Switch } from 'react-router-dom';
 
 const Home = () => <h1>Home</h1>;
@@ -514,7 +507,6 @@ With this component you can declaratively change the status code of the HTTP res
 
 ```javascript
 import { render, Status } from 'hops';
-import React from 'react';
 
 export default render(<Status code={418} />);
 ```
@@ -525,7 +517,6 @@ With this component you can specify additional HTTP headers to be sent in the se
 
 ```javascript
 import { render, Header } from 'hops';
-import React from 'react';
 
 export default render(<Header name="X-Foo" value="my-value" />);
 ```
@@ -592,7 +583,6 @@ During tests `importComponent` simply outputs the referenced component. If you'd
 **Example: check the loading state**
 
 ```javascript
-import React from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import testRenderer from 'react-test-renderer';
 import App from '../';
@@ -779,7 +769,6 @@ At the end they will be combined to a single CSS file and loaded automatically.
 
 ```javascript
 import { render } from 'hops';
-import React from 'react';
 import styles from './styles.css';
 
 export default render(<h1 className={styles.headline}>hello world</h1>);
@@ -805,7 +794,6 @@ Now you can use styled-components in your app and it will work out of the box wi
 
 ```javascript
 import { render } from 'hops';
-import React from 'react';
 import styled from 'styled-components';
 
 const H1 = styled.h1`
@@ -864,7 +852,6 @@ Now you can `import`/`require` your web app manifest and render a `<link />` tag
 
 ```javascript
 import { render } from 'hops';
-import React from 'react';
 import { Helmet } from 'react-helmet-async';
 import manifest from './manifest.webmanifest';
 
@@ -894,7 +881,6 @@ And then register the service worker in your main entry file:
 
 ```javascript
 import { render } from 'hops';
-import React from 'react';
 import installServiceWorker from 'hops-pwa';
 
 installServiceWorker();
@@ -1226,7 +1212,6 @@ module.exports = MyExpressMixin;
 **`my-component.js`**
 
 ```javascript
-import React from 'react';
 import { withServerData } from 'hops';
 
 const MyComponent = ({ serverData }) => <div>{serverData.someKey}</div>;
@@ -1271,7 +1256,6 @@ And then, once [activated](#activating-presets), you can use it like this in you
 import { render } from 'hops';
 import { action, observable } from 'mobx';
 import { inject, observer } from 'mobx-react';
-import React from 'react';
 
 const theme = observable(
   {

lerna.json

@@ -1,7 +1,7 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "14.1.0",
+  "version": "14.2.0",
   "registry": "https://registry.npmjs.org/",
   "command": {
     "version": {

package.json

@@ -32,9 +32,11 @@
     "template-graphql": "yarn workspace hops-template-graphql run",
     "template-react": "yarn workspace hops-template-react run",
     "template-redux": "yarn workspace hops-template-redux run",
+    "is-release-bot-commit": "node -e \"process.exit(child_process.execSync('git show -s --format=\\'%an\\' HEAD').toString().trim() == 'Hops release bot' ? 0 : 1)\"",
     "prerelease": "node -e \"process.exit(process.env.GH_TOKEN === undefined)\"",
     "release": "lerna publish",
     "release:prepare": "lerna version --no-push --yes",
+    "release:rollback": "yarn is-release-bot-commit && git reset --hard HEAD^",
     "release:create-nightly": "yarn release premajor --conventional-prerelease --preid nightly",
     "release:rc": "yarn release --conventional-prerelease --preid rc",
     "release:graduate": "yarn release --conventional-graduate"
@@ -54,7 +56,12 @@
             "url": "enc:r6BTklZr+axySHpOBj0JysOusV4S8o7YtSxZ9fi66rL5grn3vMkHUbMdb3OY5+tv",
             "directory": "internal-hops"
           }
-        ]
+        ],
+        "rootManifest": {
+          "resolutions": {
+            "graphql-tag": "^2.12"
+          }
+        }
       },
       {
         "name": "internal-workshop",
@@ -224,9 +231,9 @@
     "jest-runner-eslint": "0.10.0",
     "jest-runner-prettier": "0.3.6",
     "jest-watch-select-projects": "2.0.0",
-    "jest-watch-typeahead": "0.6.2",
+    "jest-watch-typeahead": "0.6.3",
     "lerna": "^4.0.0",
-    "lint-staged": "^10.0.0",
+    "lint-staged": "^11.0.0",
     "prettier": "^2.0.0"
   }
 }

packages/apollo-mock-server/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [14.2.0](https://github.com/xing/hops/compare/v14.1.0...v14.2.0) (2021-06-14)
+
+
+### Bug Fixes
+
+* **apollo-mock-server:** update package graphql-tag ([9d1816a](https://github.com/xing/hops/commit/9d1816aa250cdefbe84f523bd6577b2f69808023))
+
+
+
+
+
 # [14.1.0](https://github.com/xing/hops/compare/v14.0.1...v14.1.0) (2021-04-20)
 
 **Note:** Version bump only for package hops-apollo-mock-server

packages/apollo-mock-server/mixin.core.js

@@ -58,15 +58,13 @@ class GraphQLMixin extends Mixin {
     }
 
     if (exists(this.config.graphqlMockSchemaFile)) {
-      webpackConfig.resolve.alias[
-        'hops-apollo-mock-server/schema'
-      ] = require.resolve(this.config.graphqlMockSchemaFile);
+      webpackConfig.resolve.alias['hops-apollo-mock-server/schema'] =
+        require.resolve(this.config.graphqlMockSchemaFile);
     }
 
     if (exists(this.config.graphqlMockContextExtenderFile)) {
-      webpackConfig.resolve.alias[
-        'hops-apollo-mock-server/context-extender'
-      ] = require.resolve(this.config.graphqlMockContextExtenderFile);
+      webpackConfig.resolve.alias['hops-apollo-mock-server/context-extender'] =
+        require.resolve(this.config.graphqlMockContextExtenderFile);
     }
 
     if (target === 'graphql-mock-server') {

packages/apollo-mock-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hops-apollo-mock-server",
-  "version": "14.1.0",
+  "version": "14.2.0",
   "description": "Apollo based mock server for Hops",
   "keywords": [
     "hops",
@@ -27,10 +27,10 @@
     "cross-fetch": "^3.0.4",
     "express": "^4.17.1",
     "graphql": "^15.0.0",
-    "graphql-tag": "^2.11.0",
-    "hops-config": "14.1.0",
-    "hops-mixin": "14.1.0",
-    "hops-webpack": "14.1.0"
+    "graphql-tag": "^2.12.3",
+    "hops-config": "14.2.0",
+    "hops-mixin": "14.2.0",
+    "hops-webpack": "14.2.0"
   },
   "homepage": "https://github.com/xing/hops/tree/master/packages/graphql#readme"
 }

packages/bootstrap/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [14.2.0](https://github.com/xing/hops/compare/v14.1.0...v14.2.0) (2021-06-14)
+
+
+### Bug Fixes
+
+* update dependency dotenv to v10 ([8e206ed](https://github.com/xing/hops/commit/8e206ed06a06ed0779afd165a6931be210be1a28))
+* update dependency dotenv to v9 ([467ae09](https://github.com/xing/hops/commit/467ae09c8f356209a50f88e6b80a46e0939d3b3d))
+
+
+
+
+
 # [14.1.0](https://github.com/xing/hops/compare/v14.0.1...v14.1.0) (2021-04-20)
 
 

packages/bootstrap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hops-bootstrap",
-  "version": "14.1.0",
+  "version": "14.2.0",
   "description": "Hops bootstrap",
   "repository": {
     "type": "git",
@@ -16,12 +16,12 @@
     "ajv-formats": "^2.0.0",
     "check-error": "^1.0.2",
     "cosmiconfig": "^7.0.0",
-    "dotenv": "^8.1.0",
+    "dotenv": "^10.0.0",
     "enhanced-resolve": "^5.0.0",
     "escape-string-regexp": "^4.0.0",
     "find-up": "^5.0.0",
     "flat": "^5.0.0",
-    "hops-debug": "14.1.0",
+    "hops-debug": "14.2.0",
     "is-plain-obj": "^3.0.0",
     "mixinable": "^5.0.1",
     "supports-color": "^8.0.0"

packages/config/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [14.2.0](https://github.com/xing/hops/compare/v14.1.0...v14.2.0) (2021-06-14)
+
+**Note:** Version bump only for package hops-config
+
+
+
+
+
 # [14.1.0](https://github.com/xing/hops/compare/v14.0.1...v14.1.0) (2021-04-20)
 
 **Note:** Version bump only for package hops-config

packages/config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hops-config",
-  "version": "14.1.0",
+  "version": "14.2.0",
   "description": "Hops core configuration",
   "keywords": [
     "hops",
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "depd": "^2.0.0",
-    "hops-bootstrap": "14.1.0"
+    "hops-bootstrap": "14.2.0"
   },
   "homepage": "https://github.com/xing/hops/tree/master/packages/config#readme"
 }

packages/create-hops-app/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [14.2.0](https://github.com/xing/hops/compare/v14.1.0...v14.2.0) (2021-06-14)
+
+
+### Bug Fixes
+
+* update dependency yargs to v17 ([99fb4c6](https://github.com/xing/hops/commit/99fb4c6c52ff20722b169cfc7d2d23eedde07f11))
+
+
+
+
+
 # [14.1.0](https://github.com/xing/hops/compare/v14.0.1...v14.1.0) (2021-04-20)
 
 

packages/create-hops-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-hops-app",
-  "version": "14.1.0",
+  "version": "14.2.0",
   "description": "CLI tool to create Hops applications",
   "keywords": [
     "hops",
@@ -25,7 +25,7 @@
     "tar": "^6.0.0",
     "validate-npm-package-name": "^3.0.0",
     "write-pkg": "^4.0.0",
-    "yargs": "^16.1.1"
+    "yargs": "^17.0.0"
   },
   "homepage": "https://github.com/xing/hops/tree/master/packages/create-hops-app#readme"
 }