Merge #1938

1938: Release next v14.x r=ZauberNerd a=hops-release-bot[bot] # Next v14.x release Co-authored-by: Robert Kowalski <[email protected]> Co-authored-by: Renovate Bot <[email protected]> Co-authored-by: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Co-authored-by: Björn Brauer <[email protected]> Co-authored-by: Robert Kowalski <[email protected]> Co-authored-by: Hops release bot <77399080+hops-release-bot[bot]@users.noreply.github.com>
xing · Sep 2, 2021 · f3f7747 · f3f7747
2 parents f37b3de + c840047
commit f3f7747
Show file tree

Hide file tree

Showing 75 changed files with 1,602 additions and 1,273 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [14.4.0](https://github.com/xing/hops/compare/v14.3.2...v14.4.0) (2021-09-02)
+
+
+### Bug Fixes
+
+* always use this.getLogger instead of console.* methods ([ebde9f7](https://github.com/xing/hops/commit/ebde9f7b1d0233c3f7619b026dbb73971a16b0ea))
+* **bootstrap:** fix object whitelisting for environmentalize ([1b4c577](https://github.com/xing/hops/commit/1b4c57765b6053ff514464813ce8703becb885b0)), closes [#1156](https://github.com/xing/hops/issues/1156)
+* exit Hops on unrecovrable webpack errors ([1e13ef2](https://github.com/xing/hops/commit/1e13ef2bafa950c401d1f3ddb1664f90ef14e3db))
+* **jest-preset:** use require instead of import ([f701f11](https://github.com/xing/hops/commit/f701f116570702fc5d2de61a49d0fc1811bc7186))
+* **msw:** prepend msw service worker path with basePath ([7833b55](https://github.com/xing/hops/commit/7833b55a3decd468de1eff910d3c6e04dd640ba5))
+* **msw:** remove `enableMockServiceWorker` configuration option ([e8ac8af](https://github.com/xing/hops/commit/e8ac8af3a23bec265a02e0c47ffa777ef9fb268f))
+* update dependency msw to ^0.35.0 ([cd104ae](https://github.com/xing/hops/commit/cd104ae8cecbbdd53da6fa504a37d006a874bca4))
+
+
+### Features
+
+* **info:** optionally log into hops-log.txt ([1d9a875](https://github.com/xing/hops/commit/1d9a875737ae25c19155c0c9f9fadae446155577))
+
+
+
+
+
 ## [14.3.2](https://github.com/xing/hops/compare/v14.3.1...v14.3.2) (2021-08-02)
 
 

diff --git a/lerna.json b/lerna.json
@@ -1,7 +1,7 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "14.3.2",
+  "version": "14.4.0",
   "registry": "https://registry.npmjs.org/",
   "command": {
     "version": {

diff --git a/package.json b/package.json
@@ -239,7 +239,7 @@
     "jest-runner-eslint": "0.10.1",
     "jest-runner-prettier": "0.3.6",
     "jest-watch-select-projects": "2.0.0",
-    "jest-watch-typeahead": "0.6.3",
+    "jest-watch-typeahead": "0.6.4",
     "lerna": "^4.0.0",
     "lint-staged": "^11.0.0",
     "prettier": "^2.0.0"

diff --git a/packages/apollo-mock-server/CHANGELOG.md b/packages/apollo-mock-server/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.4.0](https://github.com/xing/hops/compare/v14.3.2...v14.4.0) (2021-09-02)
+
+**Note:** Version bump only for package hops-apollo-mock-server
+
+
+
+
+
 ## [14.3.2](https://github.com/xing/hops/compare/v14.3.1...v14.3.2) (2021-08-02)
 
 **Note:** Version bump only for package hops-apollo-mock-server

diff --git a/packages/apollo-mock-server/package.json b/packages/apollo-mock-server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hops-apollo-mock-server",
-  "version": "14.3.2",
+  "version": "14.4.0",
   "description": "Apollo based mock server for Hops",
   "keywords": [
     "hops",
@@ -28,9 +28,9 @@
     "express": "^4.17.1",
     "graphql": "^15.0.0",
     "graphql-tag": "^2.12.3",
-    "hops-config": "14.3.2",
-    "hops-mixin": "14.3.2",
-    "hops-webpack": "14.3.2"
+    "hops-config": "14.4.0",
+    "hops-mixin": "14.4.0",
+    "hops-webpack": "14.4.0"
   },
   "homepage": "https://github.com/xing/hops/tree/master/packages/graphql#readme"
 }
diff --git a/packages/bootstrap/CHANGELOG.md b/packages/bootstrap/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.4.0](https://github.com/xing/hops/compare/v14.3.2...v14.4.0) (2021-09-02)
+
+
+### Bug Fixes
+
+* **bootstrap:** fix object whitelisting for environmentalize ([1b4c577](https://github.com/xing/hops/commit/1b4c57765b6053ff514464813ce8703becb885b0)), closes [#1156](https://github.com/xing/hops/issues/1156)
+
+
+
+
+
 ## [14.3.2](https://github.com/xing/hops/compare/v14.3.1...v14.3.2) (2021-08-02)
 
 **Note:** Version bump only for package hops-bootstrap

diff --git a/packages/bootstrap/__tests__/environmentalize.test.js b/packages/bootstrap/__tests__/environmentalize.test.js
@@ -0,0 +1,104 @@
+/* eslint-env node, jest */
+// eslint-disable-next-line node/no-missing-require
+const { environmentalize } = require('..').internal;
+
+test('Should allow env-vars in the configuration which are resolved', () => {
+  global._env = {
+    FOOBAR: 'TEST',
+  };
+
+  const res = environmentalize(
+    {
+      foo: {
+        bar: '[FOOBAR]',
+        baz: '[SECOND]',
+      },
+    },
+    { 'foo.bar': true }
+  );
+
+  delete global._env;
+  expect(res._env.FOOBAR).toBe('TEST');
+  expect(res._env.SECOND).toBe(undefined);
+});
+
+test('Should allow Object whitelisting', () => {
+  global._env = {
+    FOOBAR: 'TEST',
+    SECOND: 'BANANA',
+  };
+
+  const res = environmentalize(
+    {
+      foo: {
+        bar: '[FOOBAR]',
+        baz: '[SECOND]',
+      },
+    },
+    { foo: true }
+  );
+
+  delete global._env;
+  expect(res._env.FOOBAR).toBe('TEST');
+  expect(res._env.SECOND).toBe('BANANA');
+});
+
+test('Should handle Arrays', () => {
+  global._env = {
+    FOOBAR: 'TEST',
+    SECOND: 'PINEAPPLE',
+  };
+
+  const res = environmentalize(
+    {
+      foo: [
+        {
+          bar: '[FOOBAR]',
+          baz: '[SECOND]',
+        },
+      ],
+    },
+    { foo: true }
+  );
+
+  delete global._env;
+  expect(res._env.FOOBAR).toBe('TEST');
+  expect(res._env.SECOND).toBe('PINEAPPLE');
+});
+
+test('Should support fallbacks', () => {
+  global._env = {};
+
+  const res = environmentalize(
+    {
+      foo: {
+        bar: '[FOOBAR=apple]',
+      },
+    },
+    { 'foo.bar': true }
+  );
+
+  delete global._env;
+  expect(res._env.FOOBAR).toBe('apple');
+  expect(res._env.SECOND).toBe(undefined);
+});
+
+test('Should ignore other props', () => {
+  global._env = {
+    FOOBAR: 'onion',
+    SECOND: 'cheese',
+  };
+
+  const res = environmentalize(
+    {
+      foo: {
+        bar: '[FOOBAR]',
+      },
+    },
+    { 'foo.bar': true }
+  );
+
+  delete global._env;
+  expect(res._env.FOOBAR).toBe('onion');
+  expect(res._env.SECOND).toBe(undefined);
+});
diff --git a/packages/bootstrap/__tests__/index.test.js b/packages/bootstrap/__tests__/index.test.js
@@ -93,11 +93,15 @@ test('Should allow placeholders in the configuration which are resolved', () =>
 test('Should allow env-vars in the configuration which are resolved', () => {
   process.env.HOPS_TEST_KEY = 'value';
   process.env.ENV_KEY_WITH_DEFAULT2 = 'value';
+  process.env.FOOBAR = 'TEST';
 
   const instance = initialize({
     result1: '[HOPS_TEST_KEY]',
     result2: '[ENV_KEY_WITH_DEFAULT1=default-value]',
     result3: '[ENV_KEY_WITH_DEFAULT2=default-value]',
+    result4: {
+      bar: '[FOOBAR]',
+    },
     mixins: [join(__dirname, 'fixtures', 'config-mixin')],
   });
 
@@ -106,6 +110,7 @@ test('Should allow env-vars in the configuration which are resolved', () => {
   expect(config.result1).toBe('value');
   expect(config.result2).toBe('default-value');
   expect(config.result3).toBe('value');
+  expect(config.result4.bar).toBe('TEST');
 });
 
 test('Should ignore non-string values when checking for placeholders', () => {

diff --git a/packages/bootstrap/lib/utils.js b/packages/bootstrap/lib/utils.js
@@ -118,7 +118,7 @@ exports.environmentalize = (_config, whitelist = {}) => {
     if (typeof item === 'string' && regExp.test(item)) {
       return item.replace(regExp, (_, key, fallback) => {
         const replaced = env[key] || fallback || '';
-        if (whitelist[path.join('.')]) {
+        if (whitelist[path.join('.')] || whitelist[path[0]]) {
           _env[key] = replaced;
         }
         return replaceRecursive(replaced);

diff --git a/packages/bootstrap/package.json b/packages/bootstrap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hops-bootstrap",
-  "version": "14.3.2",
+  "version": "14.4.0",
   "description": "Hops bootstrap",
   "repository": {
     "type": "git",
@@ -21,7 +21,7 @@
     "escape-string-regexp": "^4.0.0",
     "find-up": "^5.0.0",
     "flat": "^5.0.0",
-    "hops-debug": "14.3.2",
+    "hops-debug": "14.4.0",
     "is-plain-obj": "^3.0.0",
     "mixinable": "^5.0.1",
     "supports-color": "^8.0.0"

diff --git a/packages/config/CHANGELOG.md b/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.4.0](https://github.com/xing/hops/compare/v14.3.2...v14.4.0) (2021-09-02)
+
+**Note:** Version bump only for package hops-config
+
+
+
+
+
 ## [14.3.2](https://github.com/xing/hops/compare/v14.3.1...v14.3.2) (2021-08-02)
 
 **Note:** Version bump only for package hops-config

diff --git a/packages/config/package.json b/packages/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hops-config",
-  "version": "14.3.2",
+  "version": "14.4.0",
   "description": "Hops core configuration",
   "keywords": [
     "hops",
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "depd": "^2.0.0",
-    "hops-bootstrap": "14.3.2"
+    "hops-bootstrap": "14.4.0"
   },
   "homepage": "https://github.com/xing/hops/tree/master/packages/config#readme"
 }
diff --git a/packages/create-hops-app/CHANGELOG.md b/packages/create-hops-app/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.4.0](https://github.com/xing/hops/compare/v14.3.2...v14.4.0) (2021-09-02)
+
+**Note:** Version bump only for package create-hops-app
+
+
+
+
+
 ## [14.3.2](https://github.com/xing/hops/compare/v14.3.1...v14.3.2) (2021-08-02)
 
 **Note:** Version bump only for package create-hops-app

diff --git a/packages/create-hops-app/package.json b/packages/create-hops-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-hops-app",
-  "version": "14.3.2",
+  "version": "14.4.0",
   "description": "CLI tool to create Hops applications",
   "keywords": [
     "hops",

diff --git a/packages/debug/CHANGELOG.md b/packages/debug/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.4.0](https://github.com/xing/hops/compare/v14.3.2...v14.4.0) (2021-09-02)
+
+**Note:** Version bump only for package hops-debug
+
+
+
+
+
 ## [14.3.2](https://github.com/xing/hops/compare/v14.3.1...v14.3.2) (2021-08-02)
 
 **Note:** Version bump only for package hops-debug

diff --git a/packages/debug/package.json b/packages/debug/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hops-debug",
-  "version": "14.3.2",
+  "version": "14.4.0",
   "description": "Hops debug wrapper",
   "main": "node.js",
   "browser": "browser.js",

diff --git a/packages/development-proxy/CHANGELOG.md b/packages/development-proxy/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.4.0](https://github.com/xing/hops/compare/v14.3.2...v14.4.0) (2021-09-02)
+
+**Note:** Version bump only for package hops-development-proxy
+
+
+
+
+
 ## [14.3.2](https://github.com/xing/hops/compare/v14.3.1...v14.3.2) (2021-08-02)
 
 **Note:** Version bump only for package hops-development-proxy

diff --git a/packages/development-proxy/package.json b/packages/development-proxy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hops-development-proxy",
-  "version": "14.3.2",
+  "version": "14.4.0",
   "description": "Proxy",
   "keywords": [
     "hops"
@@ -17,8 +17,8 @@
     "displayName": "unit"
   },
   "dependencies": {
-    "hops-debug": "14.3.2",
-    "hops-mixin": "14.3.2",
+    "hops-debug": "14.4.0",
+    "hops-mixin": "14.4.0",
     "http-proxy-middleware": "^2.0.0"
   },
   "homepage": "https://github.com/xing/hops/tree/master/packages/development-proxy#readme"

diff --git a/packages/express/CHANGELOG.md b/packages/express/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.4.0](https://github.com/xing/hops/compare/v14.3.2...v14.4.0) (2021-09-02)
+
+**Note:** Version bump only for package hops-express
+
+
+
+
+
 ## [14.3.2](https://github.com/xing/hops/compare/v14.3.1...v14.3.2) (2021-08-02)
 
 **Note:** Version bump only for package hops-express