From 262b5c8f937d49a47be29a97ab39ff1efcfe02fd Mon Sep 17 00:00:00 2001
From: Sanket Dharwadkar <sdharwad@amazon.com>
Date: Tue, 6 Apr 2021 12:51:11 -0400
Subject: [PATCH] Hard-code pnpm version (#426)

* fix: adding updated deps in lock file

* fix: decrementing pnpm version

* docs: updating changelog for v2.1.4
---
 CHANGELOG.md    |   8 +-
 pnpm-lock.yaml  | 675 ++++++++++++++++++++++++------------------------
 scripts/util.sh |   2 +-
 3 files changed, 340 insertions(+), 345 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c34ff008a..d2b44b4402 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
-## [2.1.3] - 2021-04-05
+
+## [2.1.4] - 2021-04-06
+
+### Added
+- fix: managing pnpm version for nodejs compatibility
+
+## [2.1.3] - 2021-04-06
 
 ### Added
 - fix: adding required AppDeployer permissions
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f54c1b41d6..0970db268d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,9 +1,9 @@
 importers:
   addons/addon-base-post-deployment/packages/base-post-deployment:
     dependencies:
-      '@aws-ee/base-api-services': 'link:../../../addon-base-rest-api/packages/services'
-      '@aws-ee/base-services': 'link:../../../addon-base/packages/services'
-      '@aws-ee/base-services-container': 'link:../../../addon-base/packages/services-container'
+      '@aws-ee/base-api-services': link:../../../addon-base-rest-api/packages/services
+      '@aws-ee/base-services': link:../../../addon-base/packages/services
+      '@aws-ee/base-services-container': link:../../../addon-base/packages/services-container
       aws-sdk: 2.656.0
       generate-password: 1.5.1
       lodash: 4.17.21
@@ -21,9 +21,9 @@ importers:
       prettier: 1.19.1
       source-map-support: 0.5.16
     specifiers:
-      '@aws-ee/base-api-services': 'workspace:*'
-      '@aws-ee/base-services': 'workspace:*'
-      '@aws-ee/base-services-container': 'workspace:*'
+      '@aws-ee/base-api-services': workspace:*
+      '@aws-ee/base-services': workspace:*
+      '@aws-ee/base-services-container': workspace:*
       aws-sdk: ^2.647.0
       eslint: ^6.8.0
       eslint-config-airbnb-base: ^14.0.0
@@ -42,9 +42,9 @@ importers:
   addons/addon-base-raas-ui/packages/base-raas-ui:
     dependencies:
       '@auth0/auth0-spa-js': 1.6.5
-      '@aws-ee/base-services': 'link:../../../addon-base/packages/services'
-      '@aws-ee/base-ui': 'link:../../../addon-base-ui/packages/base-ui'
-      '@aws-ee/key-pair-mgmt-ui': 'link:../../../addon-key-pair-mgmt-ui/packages/key-pair-mgmt-ui'
+      '@aws-ee/base-services': link:../../../addon-base/packages/services
+      '@aws-ee/base-ui': link:../../../addon-base-ui/packages/base-ui
+      '@aws-ee/key-pair-mgmt-ui': link:../../../addon-key-pair-mgmt-ui/packages/key-pair-mgmt-ui
       aws-sdk: 2.721.0
       chart.js: 2.9.3
       classnames: 2.2.6
@@ -111,12 +111,12 @@ importers:
       serverless: 1.67.3
       serverless-deployment-bucket: 1.1.1
       typescript: 3.8.3
-      webpack: 4.41.2_webpack@4.41.2
+      webpack: 4.41.2
     specifiers:
       '@auth0/auth0-spa-js': ^1.2.3
-      '@aws-ee/base-services': 'workspace:*'
-      '@aws-ee/base-ui': 'workspace:*'
-      '@aws-ee/key-pair-mgmt-ui': 'workspace:*'
+      '@aws-ee/base-services': workspace:*
+      '@aws-ee/base-ui': workspace:*
+      '@aws-ee/key-pair-mgmt-ui': workspace:*
       '@babel/cli': ^7.8.4
       '@babel/core': ^7.8.6
       '@babel/plugin-proposal-class-properties': ^7.8.3
@@ -218,9 +218,9 @@ importers:
       source-map-support: ^0.5.16
   addons/addon-base-raas/packages/base-raas-post-deployment:
     dependencies:
-      '@aws-ee/base-raas-services': 'link:../base-raas-services'
-      '@aws-ee/base-services': 'link:../../../addon-base/packages/services'
-      '@aws-ee/base-services-container': 'link:../../../addon-base/packages/services-container'
+      '@aws-ee/base-raas-services': link:../base-raas-services
+      '@aws-ee/base-services': link:../../../addon-base/packages/services
+      '@aws-ee/base-services-container': link:../../../addon-base/packages/services-container
       lodash: 4.17.21
     devDependencies:
       eslint: 6.8.0
@@ -238,9 +238,9 @@ importers:
       pretty-quick: 1.11.1_prettier@1.19.1
       source-map-support: 0.5.16
     specifiers:
-      '@aws-ee/base-raas-services': 'workspace:*'
-      '@aws-ee/base-services': 'workspace:*'
-      '@aws-ee/base-services-container': 'workspace:*'
+      '@aws-ee/base-raas-services': workspace:*
+      '@aws-ee/base-services': workspace:*
+      '@aws-ee/base-services-container': workspace:*
       eslint: ^6.8.0
       eslint-config-airbnb: ^18.1.0
       eslint-config-airbnb-base: ^14.1.0
@@ -258,10 +258,10 @@ importers:
       source-map-support: ^0.5.16
   addons/addon-base-raas/packages/base-raas-rest-api:
     dependencies:
-      '@aws-ee/base-api-services': 'link:../../../addon-base-rest-api/packages/services'
-      '@aws-ee/base-controllers': 'link:../../../addon-base-rest-api/packages/base-controllers'
-      '@aws-ee/base-raas-services': 'link:../base-raas-services'
-      '@aws-ee/base-services': 'link:../../../addon-base/packages/services'
+      '@aws-ee/base-api-services': link:../../../addon-base-rest-api/packages/services
+      '@aws-ee/base-controllers': link:../../../addon-base-rest-api/packages/base-controllers
+      '@aws-ee/base-raas-services': link:../base-raas-services
+      '@aws-ee/base-services': link:../../../addon-base/packages/services
       lodash: 4.17.21
     devDependencies:
       eslint: 6.8.0
@@ -278,10 +278,10 @@ importers:
       pretty-quick: 1.11.1_prettier@1.19.1
       source-map-support: 0.5.16
     specifiers:
-      '@aws-ee/base-api-services': 'workspace:*'
-      '@aws-ee/base-controllers': 'workspace:*'
-      '@aws-ee/base-raas-services': 'workspace:*'
-      '@aws-ee/base-services': 'workspace:*'
+      '@aws-ee/base-api-services': workspace:*
+      '@aws-ee/base-controllers': workspace:*
+      '@aws-ee/base-raas-services': workspace:*
+      '@aws-ee/base-services': workspace:*
       eslint: ^6.8.0
       eslint-config-airbnb-base: ^14.1.0
       eslint-config-prettier: ^6.10.0
@@ -298,10 +298,10 @@ importers:
       source-map-support: ^0.5.16
   addons/addon-base-raas/packages/base-raas-services:
     dependencies:
-      '@aws-ee/base-api-services': 'link:../../../addon-base-rest-api/packages/services'
-      '@aws-ee/base-services': 'link:../../../addon-base/packages/services'
-      '@aws-ee/base-services-container': 'link:../../../addon-base/packages/services-container'
-      '@aws-ee/key-pair-mgmt-services': 'link:../../../addon-key-pair-mgmt-api/packages/key-pair-mgmt-services'
+      '@aws-ee/base-api-services': link:../../../addon-base-rest-api/packages/services
+      '@aws-ee/base-services': link:../../../addon-base/packages/services
+      '@aws-ee/base-services-container': link:../../../addon-base/packages/services-container
+      '@aws-ee/key-pair-mgmt-services': link:../../../addon-key-pair-mgmt-api/packages/key-pair-mgmt-services
       is-cidr: 3.1.0
       js-yaml: 4.0.0
       lodash: 4.17.21
@@ -314,8 +314,8 @@ importers:
       uuid: 3.4.0
       xml: 1.0.1
     devDependencies:
-      '@aws-ee/base-workflow-core': 'link:../../../addon-base-workflow/packages/base-workflow-core'
-      '@aws-ee/environment-type-mgmt-services': 'link:../../../addon-environment-sc-api/packages/environment-type-mgmt-services'
+      '@aws-ee/base-workflow-core': link:../../../addon-base-workflow/packages/base-workflow-core
+      '@aws-ee/environment-type-mgmt-services': link:../../../addon-environment-sc-api/packages/environment-type-mgmt-services
       aws-sdk-mock: 5.1.0
       eslint: 6.8.0
       eslint-config-airbnb-base: 14.1.0_8cdb6d8c18c3319a1365bd5afa0063a3
@@ -332,12 +332,12 @@ importers:
       sinon: 9.0.3
       source-map-support: 0.5.16
     specifiers:
-      '@aws-ee/base-api-services': 'workspace:*'
-      '@aws-ee/base-services': 'workspace:*'
-      '@aws-ee/base-services-container': 'workspace:*'
-      '@aws-ee/base-workflow-core': 'workspace:*'
-      '@aws-ee/environment-type-mgmt-services': 'workspace:*'
-      '@aws-ee/key-pair-mgmt-services': 'workspace:*'
+      '@aws-ee/base-api-services': workspace:*
+      '@aws-ee/base-services': workspace:*
+      '@aws-ee/base-services-container': workspace:*
+      '@aws-ee/base-workflow-core': workspace:*
+      '@aws-ee/environment-type-mgmt-services': workspace:*
+      '@aws-ee/key-pair-mgmt-services': workspace:*
       aws-sdk-mock: ^5.1.0
       eslint: ^6.8.0
       eslint-config-airbnb-base: ^14.1.0
@@ -366,13 +366,13 @@ importers:
       xml: ^1.0.1
   addons/addon-base-raas/packages/base-raas-workflow-steps:
     dependencies:
-      '@aws-ee/base-services': 'link:../../../addon-base/packages/services'
-      '@aws-ee/base-workflow-core': 'link:../../../addon-base-workflow/packages/base-workflow-core'
+      '@aws-ee/base-services': link:../../../addon-base/packages/services
+      '@aws-ee/base-workflow-core': link:../../../addon-base-workflow/packages/base-workflow-core
       lodash: 4.17.21
       slugify: 1.4.0
     devDependencies:
-      '@aws-ee/base-services-container': 'link:../../../addon-base/packages/services-container'
-      '@aws-ee/workflow-engine': 'link:../../../addon-base-workflow/packages/workflow-engine'
+      '@aws-ee/base-services-container': link:../../../addon-base/packages/services-container
+      '@aws-ee/workflow-engine': link:../../../addon-base-workflow/packages/workflow-engine
       aws-sdk-mock: 5.1.0
       eslint: 6.8.0
       eslint-config-airbnb: 18.1.0_8cdb6d8c18c3319a1365bd5afa0063a3
@@ -389,10 +389,10 @@ importers:
       pretty-quick: 1.11.1_prettier@1.19.1
       source-map-support: 0.5.16
     specifiers:
-      '@aws-ee/base-services': 'workspace:*'
-      '@aws-ee/base-services-container': 'workspace:*'
-      '@aws-ee/base-workflow-core': 'workspace:*'
-      '@aws-ee/workflow-engine': 'workspace:*'
+      '@aws-ee/base-services': workspace:*
+      '@aws-ee/base-services-container': workspace:*
+      '@aws-ee/base-workflow-core': workspace:*
+      '@aws-ee/workflow-engine': workspace:*
       aws-sdk-mock: ^5.1.0
       eslint: ^6.8.0
       eslint-config-airbnb: ^18.1.0
@@ -412,7 +412,7 @@ importers:
       source-map-support: ^0.5.16
   addons/addon-base-raas/packages/base-raas-workflows:
     dependencies:
-      '@aws-ee/base-workflow-core': 'link:../../../addon-base-workflow/packages/base-workflow-core'
+      '@aws-ee/base-workflow-core': link:../../../addon-base-workflow/packages/base-workflow-core
       lodash: 4.17.21
       slugify: 1.4.0
     devDependencies:
@@ -431,7 +431,7 @@ importers:
       pretty-quick: 1.11.1_prettier@1.19.1
       source-map-support: 0.5.16
     specifiers:
-      '@aws-ee/base-workflow-core': 'workspace:*'
+      '@aws-ee/base-workflow-core': workspace:*
       eslint: ^6.8.0
       eslint-config-airbnb: ^18.1.0
       eslint-config-airbnb-base: ^14.1.0
@@ -482,7 +482,7 @@ importers:
       source-map-support: ^0.5.16
   addons/addon-base-rest-api/packages/api-handler-factory:
     dependencies:
-      '@aws-ee/base-services-container': 'link:../../../addon-base/packages/services-container'
+      '@aws-ee/base-services-container': link:../../../addon-base/packages/services-container
       body-parser: 1.19.0
       compression: 1.7.4
       cors: 2.8.5
@@ -504,7 +504,7 @@ importers:
       pretty-quick: 1.11.1_prettier@1.19.1
       source-map-support: 0.5.16
     specifiers:
-      '@aws-ee/base-services-container': 'workspace:*'
+      '@aws-ee/base-services-container': workspace:*
       body-parser: ^1.19.0
       compression: ^1.7.4
       cors: ^2.8.5
@@ -526,9 +526,9 @@ importers:
       source-map-support: ^0.5.16
   addons/addon-base-rest-api/packages/base-api-handler:
     dependencies:
-      '@aws-ee/base-api-services': 'link:../services'
-      '@aws-ee/base-services': 'link:../../../addon-base/packages/services'
-      '@aws-ee/base-services-container': 'link:../../../addon-base/packages/services-container'
+      '@aws-ee/base-api-services': link:../services
+      '@aws-ee/base-services': link:../../../addon-base/packages/services
+      '@aws-ee/base-services-container': link:../../../addon-base/packages/services-container
       aws-sdk: 2.656.0
       generate-password: 1.5.1
       lodash: 4.17.21
@@ -546,9 +546,9 @@ importers:
       prettier: 1.19.1
       source-map-support: 0.5.16
     specifiers:
-      '@aws-ee/base-api-services': 'workspace:*'
-      '@aws-ee/base-services': 'workspace:*'
-      '@aws-ee/base-services-container': 'workspace:*'
+      '@aws-ee/base-api-services': workspace:*
+      '@aws-ee/base-services': workspace:*
+      '@aws-ee/base-services-container': workspace:*
       aws-sdk: ^2.647.0
       eslint: ^6.8.0
       eslint-config-airbnb-base: ^14.0.0
@@ -566,9 +566,9 @@ importers:
       source-map-support: ^0.5.16
   addons/addon-base-rest-api/packages/base-authn-handler:
     dependencies:
-      '@aws-ee/base-api-services': 'link:../services'
-      '@aws-ee/base-services': 'link:../../../addon-base/packages/services'
-      '@aws-ee/base-services-container': 'link:../../../addon-base/packages/services-container'
+      '@aws-ee/base-api-services': link:../services
+      '@aws-ee/base-services': link:../../../addon-base/packages/services
+      '@aws-ee/base-services-container': link:../../../addon-base/packages/services-container
       aws-sdk: 2.656.0
       generate-password: 1.5.1
       lodash: 4.17.21
@@ -586,9 +586,9 @@ importers:
       prettier: 1.19.1
       source-map-support: 0.5.16
     specifiers:
-      '@aws-ee/base-api-services': 'workspace:*'
-      '@aws-ee/base-services': 'workspace:*'
-      '@aws-ee/base-services-container': 'workspace:*'
+      '@aws-ee/base-api-services': workspace:*
+      '@aws-ee/base-services': workspace:*
+      '@aws-ee/base-services-container': workspace:*
       aws-sdk: ^2.647.0
       eslint: ^6.8.0
       eslint-config-airbnb-base: ^14.0.0
@@ -606,9 +606,9 @@ importers:
       source-map-support: ^0.5.16
   addons/addon-base-rest-api/packages/base-controllers:
     dependencies:
-      '@aws-ee/base-api-services': 'link:../services'
-      '@aws-ee/base-services': 'link:../../../addon-base/packages/services'
-      '@aws-ee/base-services-container': 'link:../../../addon-base/packages/services-container'
+      '@aws-ee/base-api-services': link:../services
+      '@aws-ee/base-services': link:../../../addon-base/packages/services
+      '@aws-ee/base-services-container': link:../../../addon-base/packages/services-container
       lodash: 4.17.21
     devDependencies:
       eslint: 6.8.0
@@ -624,9 +624,9 @@ importers:
       prettier: 1.19.1
       source-map-support: 0.5.16
     specifiers:
-      '@aws-ee/base-api-services': 'workspace:*'
-      '@aws-ee/base-services': 'workspace:*'
-      '@aws-ee/base-services-container': 'workspace:*'
+      '@aws-ee/base-api-services': workspace:*
+      '@aws-ee/base-services': workspace:*
+      '@aws-ee/base-services-container': workspace:*
       eslint: ^6.8.0
       eslint-config-airbnb-base: ^14.0.0
       eslint-config-prettier: ^6.10.0
@@ -642,8 +642,8 @@ importers:
       source-map-support: ^0.5.16
   addons/addon-base-rest-api/packages/services:
     dependencies:
-      '@aws-ee/base-services': 'link:../../../addon-base/packages/services'
-      '@aws-ee/base-services-container': 'link:../../../addon-base/packages/services-container'
+      '@aws-ee/base-services': link:../../../addon-base/packages/services
+      '@aws-ee/base-services-container': link:../../../addon-base/packages/services-container
       ajv: 6.12.0
       aws-sdk: 2.656.0
       jsonwebtoken: 8.5.1
@@ -669,8 +669,8 @@ importers:
       prettier: 1.19.1
       source-map-support: 0.5.16
     specifiers:
-      '@aws-ee/base-services': 'workspace:*'
-      '@aws-ee/base-services-container': 'workspace:*'
+      '@aws-ee/base-services': workspace:*
+      '@aws-ee/base-services-container': workspace:*
       ajv: ^6.11.0
       aws-sdk: ^2.647.0
       aws-sdk-mock: ^5.1.0
@@ -724,8 +724,8 @@ importers:
       typeface-lato: 0.0.75
       validatorjs: 3.18.1
     devDependencies:
-      '@aws-ee/base-serverless-settings-helper': 'link:../../../addon-base/packages/serverless-settings-helper'
-      '@aws-ee/base-serverless-ui-tools': 'link:../serverless-ui-tools'
+      '@aws-ee/base-serverless-settings-helper': link:../../../addon-base/packages/serverless-settings-helper
+      '@aws-ee/base-serverless-ui-tools': link:../serverless-ui-tools
       '@babel/cli': 7.8.4_@babel+core@7.9.0
       '@babel/core': 7.9.0
       '@babel/plugin-proposal-class-properties': 7.8.3_@babel+core@7.9.0
@@ -755,10 +755,10 @@ importers:
       serverless: 1.67.3
       serverless-deployment-bucket: 1.1.1
       typescript: 3.8.3
-      webpack: 4.41.2_webpack@4.41.2
+      webpack: 4.41.2
     specifiers:
-      '@aws-ee/base-serverless-settings-helper': 'workspace:*'
-      '@aws-ee/base-serverless-ui-tools': 'workspace:*'
+      '@aws-ee/base-serverless-settings-helper': workspace:*
+      '@aws-ee/base-serverless-ui-tools': workspace:*
       '@babel/cli': ^7.8.4
       '@babel/core': ^7.8.6
       '@babel/plugin-proposal-class-properties': ^7.8.3
@@ -854,8 +854,8 @@ importers:
       pretty-quick: ^1.11.1
   addons/addon-base-workflow-api/packages/base-worklfow-api:
     dependencies:
-      '@aws-ee/base-controllers': 'link:../../../addon-base-rest-api/packages/base-controllers'
-      '@aws-ee/base-workflow-core': 'link:../../../addon-base-workflow/packages/base-workflow-core'
+      '@aws-ee/base-controllers': link:../../../addon-base-rest-api/packages/base-controllers
+      '@aws-ee/base-workflow-core': link:../../../addon-base-workflow/packages/base-workflow-core
       lodash: 4.17.21
     devDependencies:
       eslint: 6.8.0
@@ -873,8 +873,8 @@ importers:
       pretty-quick: 1.11.1_prettier@1.19.1
       source-map-support: 0.5.16
     specifiers:
-      '@aws-ee/base-controllers': 'workspace:*'
-      '@aws-ee/base-workflow-core': 'workspace:*'
+      '@aws-ee/base-controllers': workspace:*
+      '@aws-ee/base-workflow-core': workspace:*
       eslint: ^6.8.0
       eslint-config-airbnb: ^18.1.0
       eslint-config-airbnb-base: ^14.1.0
@@ -892,7 +892,7 @@ importers:
       source-map-support: ^0.5.16
   addons/addon-base-workflow-ui/packages/base-workflow-ui:
     dependencies:
-      '@aws-ee/base-ui': 'link:../../../addon-base-ui/packages/base-ui'
+      '@aws-ee/base-ui': link:../../../addon-base-ui/packages/base-ui
       aws-sdk: 2.656.0
       chart.js: 2.9.3
       classnames: 2.2.6
@@ -946,9 +946,9 @@ importers:
       serverless: 1.67.3
       serverless-deployment-bucket: 1.1.1
       typescript: 3.8.3
-      webpack: 4.41.2_webpack@4.41.2
+      webpack: 4.41.2
     specifiers:
-      '@aws-ee/base-ui': 'workspace:*'
+      '@aws-ee/base-ui': workspace:*
       '@babel/cli': ^7.8.4
       '@babel/core': ^7.8.6
       '@babel/plugin-proposal-class-properties': ^7.8.3
@@ -1004,9 +1004,9 @@ importers:
       webpack: 4.41.2
   addons/addon-base-workflow/packages/base-workflow-core:
     dependencies:
-      '@aws-ee/base-services': 'link:../../../addon-base/packages/services'
-      '@aws-ee/base-services-container': 'link:../../../addon-base/packages/services-container'
-      '@aws-ee/workflow-engine': 'link:../workflow-engine'
+      '@aws-ee/base-services': link:../../../addon-base/packages/services
+      '@aws-ee/base-services-container': link:../../../addon-base/packages/services-container
+      '@aws-ee/workflow-engine': link:../workflow-engine
       lodash: 4.17.21
       slugify: 1.4.0
     devDependencies:
@@ -1025,9 +1025,9 @@ importers:
       pretty-quick: 1.11.1_prettier@1.19.1
       source-map-support: 0.5.16
     specifiers:
-      '@aws-ee/base-services': 'workspace:*'
-      '@aws-ee/base-services-container': 'workspace:*'
-      '@aws-ee/workflow-engine': 'workspace:*'
+      '@aws-ee/base-services': workspace:*
+      '@aws-ee/base-services-container': workspace:*
+      '@aws-ee/workflow-engine': workspace:*
       eslint: ^6.8.0
       eslint-config-airbnb: ^18.1.0
       eslint-config-airbnb-base: ^14.1.0
@@ -1046,7 +1046,7 @@ importers:
       source-map-support: ^0.5.16
   addons/addon-base-workflow/packages/base-workflow-templates:
     dependencies:
-      '@aws-ee/base-workflow-core': 'link:../base-workflow-core'
+      '@aws-ee/base-workflow-core': link:../base-workflow-core
       lodash: 4.17.21
       slugify: 1.4.0
     devDependencies:
@@ -1065,7 +1065,7 @@ importers:
       pretty-quick: 1.11.1_prettier@1.19.1
       source-map-support: 0.5.16
     specifiers:
-      '@aws-ee/base-workflow-core': 'workspace:*'
+      '@aws-ee/base-workflow-core': workspace:*
       eslint: ^6.8.0
       eslint-config-airbnb: ^18.1.0
       eslint-config-airbnb-base: ^14.1.0
@@ -1084,7 +1084,7 @@ importers:
       source-map-support: ^0.5.16
   addons/addon-base-workflow/packages/base-worklfow-steps:
     dependencies:
-      '@aws-ee/base-workflow-core': 'link:../base-workflow-core'
+      '@aws-ee/base-workflow-core': link:../base-workflow-core
       lodash: 4.17.21
       slugify: 1.4.0
     devDependencies:
@@ -1103,7 +1103,7 @@ importers:
       pretty-quick: 1.11.1_prettier@1.19.1
       source-map-support: 0.5.16
     specifiers:
-      '@aws-ee/base-workflow-core': 'workspace:*'
+      '@aws-ee/base-workflow-core': workspace:*
       eslint: ^6.8.0
       eslint-config-airbnb: ^18.1.0
       eslint-config-airbnb-base: ^14.1.0
@@ -1268,7 +1268,7 @@ importers:
       serverless: ^1.63.0
   addons/addon-base/packages/services:
     dependencies:
-      '@aws-ee/base-services-container': 'link:../services-container'
+      '@aws-ee/base-services-container': link:../services-container
       ajv: 6.12.0
       aws-sdk: 2.847.0
       aws-xray-sdk: 3.2.0
@@ -1296,7 +1296,7 @@ importers:
       prettier: 1.19.1
       source-map-support: 0.5.16
     specifiers:
-      '@aws-ee/base-services-container': 'workspace:*'
+      '@aws-ee/base-services-container': workspace:*
       ajv: ^6.11.0
       aws-sdk: ^2.647.0
       aws-xray-sdk: ^3.2.0
@@ -1360,14 +1360,14 @@ importers:
       toposort: ^2.0.2
   addons/addon-environment-sc-api/packages/environment-sc-workflow-steps:
     dependencies:
-      '@aws-ee/base-services': 'link:../../../addon-base/packages/services'
-      '@aws-ee/base-workflow-core': 'link:../../../addon-base-workflow/packages/base-workflow-core'
-      '@aws-ee/environment-type-mgmt-services': 'link:../environment-type-mgmt-services'
+      '@aws-ee/base-services': link:../../../addon-base/packages/services
+      '@aws-ee/base-workflow-core': link:../../../addon-base-workflow/packages/base-workflow-core
+      '@aws-ee/environment-type-mgmt-services': link:../environment-type-mgmt-services
       lodash: 4.17.21
       slugify: 1.4.0
       uuid: 8.2.0
     devDependencies:
-      '@aws-ee/workflow-engine': 'link:../../../addon-base-workflow/packages/workflow-engine'
+      '@aws-ee/workflow-engine': link:../../../addon-base-workflow/packages/workflow-engine
       eslint: 6.8.0
       eslint-config-airbnb: 18.1.0_8cdb6d8c18c3319a1365bd5afa0063a3
       eslint-config-airbnb-base: 14.1.0_8cdb6d8c18c3319a1365bd5afa0063a3
@@ -1383,10 +1383,10 @@ importers:
       pretty-quick: 1.11.1_prettier@1.19.1
       source-map-support: 0.5.16
     specifiers:
-      '@aws-ee/base-services': 'workspace:*'
-      '@aws-ee/base-workflow-core': 'workspace:*'
-      '@aws-ee/environment-type-mgmt-services': 'workspace:*'
-      '@aws-ee/workflow-engine': 'workspace:*'
+      '@aws-ee/base-services': workspace:*
+      '@aws-ee/base-workflow-core': workspace:*
+      '@aws-ee/environment-type-mgmt-services': workspace:*
+      '@aws-ee/workflow-engine': workspace:*
       eslint: ^6.8.0
       eslint-config-airbnb: ^18.1.0
       eslint-config-airbnb-base: ^14.1.0
@@ -1406,7 +1406,7 @@ importers:
       uuid: ^8.2.0
   addons/addon-environment-sc-api/packages/environment-sc-workflows:
     dependencies:
-      '@aws-ee/base-workflow-core': 'link:../../../addon-base-workflow/packages/base-workflow-core'
+      '@aws-ee/base-workflow-core': link:../../../addon-base-workflow/packages/base-workflow-core
       lodash: 4.17.21
       slugify: 1.4.0
     devDependencies:
@@ -1425,7 +1425,7 @@ importers:
       pretty-quick: 1.11.1_prettier@1.19.1
       source-map-support: 0.5.16
     specifiers:
-      '@aws-ee/base-workflow-core': 'workspace:*'
+      '@aws-ee/base-workflow-core': workspace:*
       eslint: ^6.8.0
       eslint-config-airbnb: ^18.1.0
       eslint-config-airbnb-base: ^14.1.0
@@ -1444,8 +1444,8 @@ importers:
       source-map-support: ^0.5.16
   addons/addon-environment-sc-api/packages/environment-type-mgmt-api:
     dependencies:
-      '@aws-ee/base-controllers': 'link:../../../addon-base-rest-api/packages/base-controllers'
-      '@aws-ee/environment-type-mgmt-services': 'link:../environment-type-mgmt-services'
+      '@aws-ee/base-controllers': link:../../../addon-base-rest-api/packages/base-controllers
+      '@aws-ee/environment-type-mgmt-services': link:../environment-type-mgmt-services
       lodash: 4.17.21
       uuid: 3.4.0
     devDependencies:
@@ -1463,8 +1463,8 @@ importers:
       pretty-quick: 1.11.1_prettier@1.19.1
       source-map-support: 0.5.16
     specifiers:
-      '@aws-ee/base-controllers': 'workspace:*'
-      '@aws-ee/environment-type-mgmt-services': 'workspace:*'
+      '@aws-ee/base-controllers': workspace:*
+      '@aws-ee/environment-type-mgmt-services': workspace:*
       eslint: ^6.8.0
       eslint-config-airbnb-base: ^14.1.0
       eslint-config-prettier: ^6.10.0
@@ -1482,8 +1482,8 @@ importers:
       uuid: ^3.4.0
   addons/addon-environment-sc-api/packages/environment-type-mgmt-services:
     dependencies:
-      '@aws-ee/base-services': 'link:../../../addon-base/packages/services'
-      '@aws-ee/base-services-container': 'link:../../../addon-base/packages/services-container'
+      '@aws-ee/base-services': link:../../../addon-base/packages/services
+      '@aws-ee/base-services-container': link:../../../addon-base/packages/services-container
       lodash: 4.17.21
       uuid: 3.4.0
     devDependencies:
@@ -1501,8 +1501,8 @@ importers:
       pretty-quick: 1.11.1_prettier@1.19.1
       source-map-support: 0.5.16
     specifiers:
-      '@aws-ee/base-services': 'workspace:*'
-      '@aws-ee/base-services-container': 'workspace:*'
+      '@aws-ee/base-services': workspace:*
+      '@aws-ee/base-services-container': workspace:*
       eslint: ^6.8.0
       eslint-config-airbnb-base: ^14.1.0
       eslint-config-prettier: ^6.10.0
@@ -1520,7 +1520,7 @@ importers:
       uuid: ^3.4.0
   addons/addon-environment-sc-ui/packages/environment-type-mgmt-ui:
     dependencies:
-      '@aws-ee/base-ui': 'link:../../../addon-base-ui/packages/base-ui'
+      '@aws-ee/base-ui': link:../../../addon-base-ui/packages/base-ui
       lodash: 4.17.21
       mobx: 5.15.4
       mobx-react: 6.2.2_mobx@5.15.4+react@16.13.1
@@ -1561,7 +1561,7 @@ importers:
       pretty-quick: 1.11.1_prettier@1.19.1
       regenerator-runtime: 0.13.5
     specifiers:
-      '@aws-ee/base-ui': 'workspace:*'
+      '@aws-ee/base-ui': workspace:*
       '@babel/cli': ^7.8.4
       '@babel/core': ^7.8.6
       '@babel/plugin-proposal-class-properties': ^7.8.3
@@ -1602,8 +1602,8 @@ importers:
       semantic-ui-react: ^0.88.2
   addons/addon-key-pair-mgmt-api/packages/key-pair-mgmt-api:
     dependencies:
-      '@aws-ee/base-controllers': 'link:../../../addon-base-rest-api/packages/base-controllers'
-      '@aws-ee/key-pair-mgmt-services': 'link:../key-pair-mgmt-services'
+      '@aws-ee/base-controllers': link:../../../addon-base-rest-api/packages/base-controllers
+      '@aws-ee/key-pair-mgmt-services': link:../key-pair-mgmt-services
       lodash: 4.17.21
       uuid: 3.4.0
     devDependencies:
@@ -1621,8 +1621,8 @@ importers:
       pretty-quick: 1.11.1_prettier@1.19.1
       source-map-support: 0.5.16
     specifiers:
-      '@aws-ee/base-controllers': 'workspace:*'
-      '@aws-ee/key-pair-mgmt-services': 'workspace:*'
+      '@aws-ee/base-controllers': workspace:*
+      '@aws-ee/key-pair-mgmt-services': workspace:*
       eslint: ^6.8.0
       eslint-config-airbnb-base: ^14.1.0
       eslint-config-prettier: ^6.10.0
@@ -1640,8 +1640,8 @@ importers:
       uuid: ^3.4.0
   addons/addon-key-pair-mgmt-api/packages/key-pair-mgmt-services:
     dependencies:
-      '@aws-ee/base-services': 'link:../../../addon-base/packages/services'
-      '@aws-ee/base-services-container': 'link:../../../addon-base/packages/services-container'
+      '@aws-ee/base-services': link:../../../addon-base/packages/services
+      '@aws-ee/base-services-container': link:../../../addon-base/packages/services-container
       lodash: 4.17.21
       node-forge: 0.9.1
       uuid: 3.4.0
@@ -1660,8 +1660,8 @@ importers:
       pretty-quick: 1.11.1_prettier@1.19.1
       source-map-support: 0.5.16
     specifiers:
-      '@aws-ee/base-services': 'workspace:*'
-      '@aws-ee/base-services-container': 'workspace:*'
+      '@aws-ee/base-services': workspace:*
+      '@aws-ee/base-services-container': workspace:*
       eslint: ^6.8.0
       eslint-config-airbnb-base: ^14.1.0
       eslint-config-prettier: ^6.10.0
@@ -1680,7 +1680,7 @@ importers:
       uuid: ^3.4.0
   addons/addon-key-pair-mgmt-ui/packages/key-pair-mgmt-ui:
     dependencies:
-      '@aws-ee/base-ui': 'link:../../../addon-base-ui/packages/base-ui'
+      '@aws-ee/base-ui': link:../../../addon-base-ui/packages/base-ui
       lodash: 4.17.21
       mobx: 5.15.4
       mobx-react: 6.2.2_mobx@5.15.4+react@16.13.1
@@ -1717,7 +1717,7 @@ importers:
       prettier: 1.19.1
       pretty-quick: 1.11.1_prettier@1.19.1
     specifiers:
-      '@aws-ee/base-ui': 'workspace:*'
+      '@aws-ee/base-ui': workspace:*
       '@babel/cli': ^7.8.4
       '@babel/core': ^7.8.6
       '@babel/plugin-proposal-class-properties': ^7.8.3
@@ -1756,13 +1756,13 @@ importers:
     specifiers: {}
   addons/addon-user-id-upgrade/packages/user-id-upgrade-post-deployment:
     dependencies:
-      '@aws-ee/base-services': 'link:../../../addon-base/packages/services'
-      '@aws-ee/base-services-container': 'link:../../../addon-base/packages/services-container'
+      '@aws-ee/base-services': link:../../../addon-base/packages/services
+      '@aws-ee/base-services-container': link:../../../addon-base/packages/services-container
       aws-sdk: 2.721.0
       lodash: 4.17.21
     devDependencies:
-      '@aws-ee/base-api-handler': 'link:../../../addon-base-rest-api/packages/base-api-handler'
-      '@aws-ee/base-post-deployment': 'link:../../../addon-base-post-deployment/packages/base-post-deployment'
+      '@aws-ee/base-api-handler': link:../../../addon-base-rest-api/packages/base-api-handler
+      '@aws-ee/base-post-deployment': link:../../../addon-base-post-deployment/packages/base-post-deployment
       eslint: 6.8.0
       eslint-config-airbnb-base: 14.1.0_8cdb6d8c18c3319a1365bd5afa0063a3
       eslint-config-prettier: 6.10.1_eslint@6.8.0
@@ -1776,10 +1776,10 @@ importers:
       prettier: 1.19.1
       source-map-support: 0.5.16
     specifiers:
-      '@aws-ee/base-api-handler': 'workspace:*'
-      '@aws-ee/base-post-deployment': 'workspace:*'
-      '@aws-ee/base-services': 'workspace:*'
-      '@aws-ee/base-services-container': 'workspace:*'
+      '@aws-ee/base-api-handler': workspace:*
+      '@aws-ee/base-post-deployment': workspace:*
+      '@aws-ee/base-services': workspace:*
+      '@aws-ee/base-services-container': workspace:*
       aws-sdk: ^2.647.0
       eslint: ^6.8.0
       eslint-config-airbnb-base: ^14.0.0
@@ -1796,28 +1796,28 @@ importers:
       source-map-support: ^0.5.16
   main/cicd/cicd-pipeline:
     devDependencies:
-      '@aws-ee/base-serverless-settings-helper': 'link:../../../addons/addon-base/packages/serverless-settings-helper'
+      '@aws-ee/base-serverless-settings-helper': link:../../../addons/addon-base/packages/serverless-settings-helper
       serverless: 1.67.3
       serverless-deployment-bucket: 1.1.1
       serverless-hooks-plugin: 1.1.0
     optionalDependencies:
       fsevents: 2.1.2
     specifiers:
-      '@aws-ee/base-serverless-settings-helper': 'workspace:*'
+      '@aws-ee/base-serverless-settings-helper': workspace:*
       fsevents: '*'
       serverless: ^1.63.0
       serverless-deployment-bucket: ^1.1.0
       serverless-hooks-plugin: ^1.1.0
   main/cicd/cicd-source:
     devDependencies:
-      '@aws-ee/base-serverless-settings-helper': 'link:../../../addons/addon-base/packages/serverless-settings-helper'
+      '@aws-ee/base-serverless-settings-helper': link:../../../addons/addon-base/packages/serverless-settings-helper
       aws-sdk: 2.656.0
       serverless: 1.67.3
       serverless-deployment-bucket: 1.1.1
     optionalDependencies:
       fsevents: 2.1.2
     specifiers:
-      '@aws-ee/base-serverless-settings-helper': 'workspace:*'
+      '@aws-ee/base-serverless-settings-helper': workspace:*
       aws-sdk: ^2.647.0
       fsevents: '*'
       serverless: ^1.63.0
@@ -1853,14 +1853,14 @@ importers:
       pretty-quick: ^1.11.1
   main/integration-tests:
     dependencies:
-      '@aws-ee/base-services': 'link:../../addons/addon-base/packages/services'
+      '@aws-ee/base-services': link:../../addons/addon-base/packages/services
       aws-sdk: 2.847.0
       axios: 0.21.1
       chance: 1.1.7
       fs-extra: 9.1.0
       js-yaml: 4.0.0
       lodash: 4.17.21
-      services: 'link:../packages/services'
+      services: link:../packages/services
       yargs-parser: 20.2.5
     devDependencies:
       eslint: 6.8.0
@@ -1881,7 +1881,7 @@ importers:
       request: 2.88.2
       request-promise-native: 1.0.8_request@2.88.2
     specifiers:
-      '@aws-ee/base-services': 'workspace:*'
+      '@aws-ee/base-services': workspace:*
       aws-sdk: ^2.847.0
       axios: ^0.21.1
       chance: ^1.1.7
@@ -1905,13 +1905,13 @@ importers:
       pretty-quick: ^1.11.1
       request: ^2.88.0
       request-promise-native: ^1.0.8
-      services: 'workspace:*'
+      services: workspace:*
       yargs-parser: ^20.2.5
   main/packages/controllers:
     dependencies:
-      '@aws-ee/base-controllers': 'link:../../../addons/addon-base-rest-api/packages/base-controllers'
+      '@aws-ee/base-controllers': link:../../../addons/addon-base-rest-api/packages/base-controllers
       lodash: 4.17.21
-      services: 'link:../services'
+      services: link:../services
     devDependencies:
       eslint: 6.8.0
       eslint-config-airbnb: 18.1.0_8cdb6d8c18c3319a1365bd5afa0063a3
@@ -1928,7 +1928,7 @@ importers:
       pretty-quick: 1.11.1_prettier@1.19.1
       source-map-support: 0.5.16
     specifiers:
-      '@aws-ee/base-controllers': 'workspace:*'
+      '@aws-ee/base-controllers': workspace:*
       eslint: ^6.8.0
       eslint-config-airbnb: ^18.1.0
       eslint-config-airbnb-base: ^14.1.0
@@ -1943,12 +1943,12 @@ importers:
       lodash: ^4.17.21
       prettier: ^1.19.1
       pretty-quick: ^1.11.1
-      services: 'workspace:*'
+      services: workspace:*
       source-map-support: ^0.5.16
   main/packages/services:
     dependencies:
-      '@aws-ee/base-services': 'link:../../../addons/addon-base/packages/services'
-      '@aws-ee/base-services-container': 'link:../../../addons/addon-base/packages/services-container'
+      '@aws-ee/base-services': link:../../../addons/addon-base/packages/services
+      '@aws-ee/base-services-container': link:../../../addons/addon-base/packages/services-container
       lodash: 4.17.21
     devDependencies:
       eslint: 6.8.0
@@ -1966,8 +1966,8 @@ importers:
       pretty-quick: 1.11.1_prettier@1.19.1
       source-map-support: 0.5.16
     specifiers:
-      '@aws-ee/base-services': 'workspace:*'
-      '@aws-ee/base-services-container': 'workspace:*'
+      '@aws-ee/base-services': workspace:*
+      '@aws-ee/base-services-container': workspace:*
       eslint: ^6.8.0
       eslint-config-airbnb: ^18.1.0
       eslint-config-airbnb-base: ^14.1.0
@@ -1985,37 +1985,37 @@ importers:
       source-map-support: ^0.5.16
   main/solution/backend:
     dependencies:
-      '@aws-ee/base-api-handler': 'link:../../../addons/addon-base-rest-api/packages/base-api-handler'
-      '@aws-ee/base-api-handler-factory': 'link:../../../addons/addon-base-rest-api/packages/api-handler-factory'
-      '@aws-ee/base-api-services': 'link:../../../addons/addon-base-rest-api/packages/services'
-      '@aws-ee/base-authn-handler': 'link:../../../addons/addon-base-rest-api/packages/base-authn-handler'
-      '@aws-ee/base-controllers': 'link:../../../addons/addon-base-rest-api/packages/base-controllers'
-      '@aws-ee/base-raas-cfn-templates': 'link:../../../addons/addon-base-raas/packages/base-raas-cfn-templates'
-      '@aws-ee/base-raas-rest-api': 'link:../../../addons/addon-base-raas/packages/base-raas-rest-api'
-      '@aws-ee/base-raas-services': 'link:../../../addons/addon-base-raas/packages/base-raas-services'
-      '@aws-ee/base-raas-workflow-steps': 'link:../../../addons/addon-base-raas/packages/base-raas-workflow-steps'
-      '@aws-ee/base-raas-workflows': 'link:../../../addons/addon-base-raas/packages/base-raas-workflows'
-      '@aws-ee/base-services': 'link:../../../addons/addon-base/packages/services'
-      '@aws-ee/base-services-container': 'link:../../../addons/addon-base/packages/services-container'
-      '@aws-ee/base-workflow-api': 'link:../../../addons/addon-base-workflow-api/packages/base-worklfow-api'
-      '@aws-ee/base-workflow-core': 'link:../../../addons/addon-base-workflow/packages/base-workflow-core'
-      '@aws-ee/base-workflow-steps': 'link:../../../addons/addon-base-workflow/packages/base-worklfow-steps'
-      '@aws-ee/environment-sc-workflow-steps': 'link:../../../addons/addon-environment-sc-api/packages/environment-sc-workflow-steps'
-      '@aws-ee/environment-sc-workflows': 'link:../../../addons/addon-environment-sc-api/packages/environment-sc-workflows'
-      '@aws-ee/environment-type-mgmt-api': 'link:../../../addons/addon-environment-sc-api/packages/environment-type-mgmt-api'
-      '@aws-ee/environment-type-mgmt-services': 'link:../../../addons/addon-environment-sc-api/packages/environment-type-mgmt-services'
-      '@aws-ee/key-pair-mgmt-api': 'link:../../../addons/addon-key-pair-mgmt-api/packages/key-pair-mgmt-api'
-      '@aws-ee/key-pair-mgmt-services': 'link:../../../addons/addon-key-pair-mgmt-api/packages/key-pair-mgmt-services'
+      '@aws-ee/base-api-handler': link:../../../addons/addon-base-rest-api/packages/base-api-handler
+      '@aws-ee/base-api-handler-factory': link:../../../addons/addon-base-rest-api/packages/api-handler-factory
+      '@aws-ee/base-api-services': link:../../../addons/addon-base-rest-api/packages/services
+      '@aws-ee/base-authn-handler': link:../../../addons/addon-base-rest-api/packages/base-authn-handler
+      '@aws-ee/base-controllers': link:../../../addons/addon-base-rest-api/packages/base-controllers
+      '@aws-ee/base-raas-cfn-templates': link:../../../addons/addon-base-raas/packages/base-raas-cfn-templates
+      '@aws-ee/base-raas-rest-api': link:../../../addons/addon-base-raas/packages/base-raas-rest-api
+      '@aws-ee/base-raas-services': link:../../../addons/addon-base-raas/packages/base-raas-services
+      '@aws-ee/base-raas-workflow-steps': link:../../../addons/addon-base-raas/packages/base-raas-workflow-steps
+      '@aws-ee/base-raas-workflows': link:../../../addons/addon-base-raas/packages/base-raas-workflows
+      '@aws-ee/base-services': link:../../../addons/addon-base/packages/services
+      '@aws-ee/base-services-container': link:../../../addons/addon-base/packages/services-container
+      '@aws-ee/base-workflow-api': link:../../../addons/addon-base-workflow-api/packages/base-worklfow-api
+      '@aws-ee/base-workflow-core': link:../../../addons/addon-base-workflow/packages/base-workflow-core
+      '@aws-ee/base-workflow-steps': link:../../../addons/addon-base-workflow/packages/base-worklfow-steps
+      '@aws-ee/environment-sc-workflow-steps': link:../../../addons/addon-environment-sc-api/packages/environment-sc-workflow-steps
+      '@aws-ee/environment-sc-workflows': link:../../../addons/addon-environment-sc-api/packages/environment-sc-workflows
+      '@aws-ee/environment-type-mgmt-api': link:../../../addons/addon-environment-sc-api/packages/environment-type-mgmt-api
+      '@aws-ee/environment-type-mgmt-services': link:../../../addons/addon-environment-sc-api/packages/environment-type-mgmt-services
+      '@aws-ee/key-pair-mgmt-api': link:../../../addons/addon-key-pair-mgmt-api/packages/key-pair-mgmt-api
+      '@aws-ee/key-pair-mgmt-services': link:../../../addons/addon-key-pair-mgmt-api/packages/key-pair-mgmt-services
       aws-sdk: 2.847.0
-      controllers: 'link:../../packages/controllers'
+      controllers: link:../../packages/controllers
       js-yaml: 3.13.1
       jwt-decode: 2.2.0
       lodash: 4.17.21
       node-fetch: 2.6.0
-      services: 'link:../../packages/services'
+      services: link:../../packages/services
     devDependencies:
-      '@aws-ee/base-serverless-backend-tools': 'link:../../../addons/addon-base/packages/serverless-backend-tools'
-      '@aws-ee/base-serverless-settings-helper': 'link:../../../addons/addon-base/packages/serverless-settings-helper'
+      '@aws-ee/base-serverless-backend-tools': link:../../../addons/addon-base/packages/serverless-backend-tools
+      '@aws-ee/base-serverless-settings-helper': link:../../../addons/addon-base/packages/serverless-settings-helper
       '@babel/core': 7.9.0
       '@babel/plugin-transform-runtime': 7.9.0_@babel+core@7.9.0
       '@babel/preset-env': 7.9.5_@babel+core@7.9.0
@@ -2042,35 +2042,35 @@ importers:
       serverless-s3-sync: 1.12.0
       serverless-webpack: 5.3.1_webpack@4.42.1
       source-map-support: 0.5.16
-      webpack: 4.42.1_webpack@4.42.1
+      webpack: 4.42.1
       webpack-cli: 3.3.11_webpack@4.42.1
       webpack-node-externals: 1.7.2
     optionalDependencies:
       fsevents: 2.1.2
     specifiers:
-      '@aws-ee/base-api-handler': 'workspace:*'
-      '@aws-ee/base-api-handler-factory': 'workspace:*'
-      '@aws-ee/base-api-services': 'workspace:*'
-      '@aws-ee/base-authn-handler': 'workspace:*'
-      '@aws-ee/base-controllers': 'workspace:*'
-      '@aws-ee/base-raas-cfn-templates': 'workspace:*'
-      '@aws-ee/base-raas-rest-api': 'workspace:*'
-      '@aws-ee/base-raas-services': 'workspace:*'
-      '@aws-ee/base-raas-workflow-steps': 'workspace:*'
-      '@aws-ee/base-raas-workflows': 'workspace:*'
-      '@aws-ee/base-serverless-backend-tools': 'workspace:*'
-      '@aws-ee/base-serverless-settings-helper': 'workspace:*'
-      '@aws-ee/base-services': 'workspace:*'
-      '@aws-ee/base-services-container': 'workspace:*'
-      '@aws-ee/base-workflow-api': 'workspace:*'
-      '@aws-ee/base-workflow-core': 'workspace:*'
-      '@aws-ee/base-workflow-steps': 'workspace:*'
-      '@aws-ee/environment-sc-workflow-steps': 'workspace:*'
-      '@aws-ee/environment-sc-workflows': 'workspace:*'
-      '@aws-ee/environment-type-mgmt-api': 'workspace:*'
-      '@aws-ee/environment-type-mgmt-services': 'workspace:*'
-      '@aws-ee/key-pair-mgmt-api': 'workspace:*'
-      '@aws-ee/key-pair-mgmt-services': 'workspace:*'
+      '@aws-ee/base-api-handler': workspace:*
+      '@aws-ee/base-api-handler-factory': workspace:*
+      '@aws-ee/base-api-services': workspace:*
+      '@aws-ee/base-authn-handler': workspace:*
+      '@aws-ee/base-controllers': workspace:*
+      '@aws-ee/base-raas-cfn-templates': workspace:*
+      '@aws-ee/base-raas-rest-api': workspace:*
+      '@aws-ee/base-raas-services': workspace:*
+      '@aws-ee/base-raas-workflow-steps': workspace:*
+      '@aws-ee/base-raas-workflows': workspace:*
+      '@aws-ee/base-serverless-backend-tools': workspace:*
+      '@aws-ee/base-serverless-settings-helper': workspace:*
+      '@aws-ee/base-services': workspace:*
+      '@aws-ee/base-services-container': workspace:*
+      '@aws-ee/base-workflow-api': workspace:*
+      '@aws-ee/base-workflow-core': workspace:*
+      '@aws-ee/base-workflow-steps': workspace:*
+      '@aws-ee/environment-sc-workflow-steps': workspace:*
+      '@aws-ee/environment-sc-workflows': workspace:*
+      '@aws-ee/environment-type-mgmt-api': workspace:*
+      '@aws-ee/environment-type-mgmt-services': workspace:*
+      '@aws-ee/key-pair-mgmt-api': workspace:*
+      '@aws-ee/key-pair-mgmt-services': workspace:*
       '@babel/core': ^7.8.4
       '@babel/plugin-transform-runtime': ^7.8.3
       '@babel/preset-env': ^7.8.4
@@ -2078,7 +2078,7 @@ importers:
       babel-jest: ^24.9.0
       babel-loader: ^8.0.6
       babel-plugin-source-map-support: ^2.1.1
-      controllers: 'workspace:*'
+      controllers: workspace:*
       copy-webpack-plugin: ^5.1.1
       eslint: ^6.8.0
       eslint-config-airbnb-base: ^14.0.0
@@ -2103,74 +2103,74 @@ importers:
       serverless-offline: ^5.12.1
       serverless-s3-sync: ^1.12.0
       serverless-webpack: ^5.3.1
-      services: 'workspace:*'
+      services: workspace:*
       source-map-support: ^0.5.16
       webpack: ^4.41.5
       webpack-cli: ^3.3.10
       webpack-node-externals: ^1.7.2
   main/solution/edge-lambda:
     devDependencies:
-      '@aws-ee/base-serverless-settings-helper': 'link:../../../addons/addon-base/packages/serverless-settings-helper'
+      '@aws-ee/base-serverless-settings-helper': link:../../../addons/addon-base/packages/serverless-settings-helper
       serverless: 1.67.3
       serverless-deployment-bucket: 1.1.1
     specifiers:
-      '@aws-ee/base-serverless-settings-helper': 'workspace:*'
+      '@aws-ee/base-serverless-settings-helper': workspace:*
       serverless: ^1.63.0
       serverless-deployment-bucket: ^1.1.0
   main/solution/environment-tools:
     devDependencies:
-      '@aws-ee/base-serverless-settings-helper': 'link:../../../addons/addon-base/packages/serverless-settings-helper'
-      '@aws-ee/s3-synchronizer': 'link:../../../addons/addon-raas-s3-copy/packages/s3-synchronizer'
-      '@aws-ee/serverless-go-build-tools': 'link:../../../addons/addon-base/packages/serverless-go-build-tools'
+      '@aws-ee/base-serverless-settings-helper': link:../../../addons/addon-base/packages/serverless-settings-helper
+      '@aws-ee/s3-synchronizer': link:../../../addons/addon-raas-s3-copy/packages/s3-synchronizer
+      '@aws-ee/serverless-go-build-tools': link:../../../addons/addon-base/packages/serverless-go-build-tools
       serverless: 1.67.3
     specifiers:
-      '@aws-ee/base-serverless-settings-helper': 'workspace:*'
-      '@aws-ee/s3-synchronizer': 'workspace:*'
-      '@aws-ee/serverless-go-build-tools': 'workspace:*'
+      '@aws-ee/base-serverless-settings-helper': workspace:*
+      '@aws-ee/s3-synchronizer': workspace:*
+      '@aws-ee/serverless-go-build-tools': workspace:*
       serverless: ^1.63.0
   main/solution/infrastructure:
     devDependencies:
-      '@aws-ee/base-serverless-settings-helper': 'link:../../../addons/addon-base/packages/serverless-settings-helper'
+      '@aws-ee/base-serverless-settings-helper': link:../../../addons/addon-base/packages/serverless-settings-helper
       serverless: 1.67.3
       serverless-deployment-bucket: 1.1.1
     specifiers:
-      '@aws-ee/base-serverless-settings-helper': 'workspace:*'
+      '@aws-ee/base-serverless-settings-helper': workspace:*
       serverless: ^1.63.0
       serverless-deployment-bucket: ^1.1.0
   main/solution/machine-images:
     devDependencies:
-      '@aws-ee/base-serverless-settings-helper': 'link:../../../addons/addon-base/packages/serverless-settings-helper'
-      '@aws-ee/serverless-packer': 'link:../../../addons/addon-base-raas/packages/serverless-packer'
+      '@aws-ee/base-serverless-settings-helper': link:../../../addons/addon-base/packages/serverless-settings-helper
+      '@aws-ee/serverless-packer': link:../../../addons/addon-base-raas/packages/serverless-packer
       serverless: 1.67.3
     specifiers:
-      '@aws-ee/base-serverless-settings-helper': 'workspace:*'
-      '@aws-ee/serverless-packer': 'workspace:*'
+      '@aws-ee/base-serverless-settings-helper': workspace:*
+      '@aws-ee/serverless-packer': workspace:*
       serverless: ^1.63.0
   main/solution/post-deployment:
     dependencies:
-      '@aws-ee/base-post-deployment': 'link:../../../addons/addon-base-post-deployment/packages/base-post-deployment'
-      '@aws-ee/base-raas-post-deployment': 'link:../../../addons/addon-base-raas/packages/base-raas-post-deployment'
-      '@aws-ee/base-raas-rest-api': 'link:../../../addons/addon-base-raas/packages/base-raas-rest-api'
-      '@aws-ee/base-raas-services': 'link:../../../addons/addon-base-raas/packages/base-raas-services'
-      '@aws-ee/base-raas-workflow-steps': 'link:../../../addons/addon-base-raas/packages/base-raas-workflow-steps'
-      '@aws-ee/base-raas-workflows': 'link:../../../addons/addon-base-raas/packages/base-raas-workflows'
-      '@aws-ee/base-services': 'link:../../../addons/addon-base/packages/services'
-      '@aws-ee/base-services-container': 'link:../../../addons/addon-base/packages/services-container'
-      '@aws-ee/base-workflow-core': 'link:../../../addons/addon-base-workflow/packages/base-workflow-core'
-      '@aws-ee/base-workflow-steps': 'link:../../../addons/addon-base-workflow/packages/base-worklfow-steps'
-      '@aws-ee/base-workflow-templates': 'link:../../../addons/addon-base-workflow/packages/base-workflow-templates'
-      '@aws-ee/environment-sc-workflow-steps': 'link:../../../addons/addon-environment-sc-api/packages/environment-sc-workflow-steps'
-      '@aws-ee/environment-sc-workflows': 'link:../../../addons/addon-environment-sc-api/packages/environment-sc-workflows'
-      '@aws-ee/environment-type-mgmt-api': 'link:../../../addons/addon-environment-sc-api/packages/environment-type-mgmt-api'
-      '@aws-ee/environment-type-mgmt-services': 'link:../../../addons/addon-environment-sc-api/packages/environment-type-mgmt-services'
-      '@aws-ee/key-pair-mgmt-services': 'link:../../../addons/addon-key-pair-mgmt-api/packages/key-pair-mgmt-services'
-      '@aws-ee/user-id-upgrade-post-deployment': 'link:../../../addons/addon-user-id-upgrade/packages/user-id-upgrade-post-deployment'
+      '@aws-ee/base-post-deployment': link:../../../addons/addon-base-post-deployment/packages/base-post-deployment
+      '@aws-ee/base-raas-post-deployment': link:../../../addons/addon-base-raas/packages/base-raas-post-deployment
+      '@aws-ee/base-raas-rest-api': link:../../../addons/addon-base-raas/packages/base-raas-rest-api
+      '@aws-ee/base-raas-services': link:../../../addons/addon-base-raas/packages/base-raas-services
+      '@aws-ee/base-raas-workflow-steps': link:../../../addons/addon-base-raas/packages/base-raas-workflow-steps
+      '@aws-ee/base-raas-workflows': link:../../../addons/addon-base-raas/packages/base-raas-workflows
+      '@aws-ee/base-services': link:../../../addons/addon-base/packages/services
+      '@aws-ee/base-services-container': link:../../../addons/addon-base/packages/services-container
+      '@aws-ee/base-workflow-core': link:../../../addons/addon-base-workflow/packages/base-workflow-core
+      '@aws-ee/base-workflow-steps': link:../../../addons/addon-base-workflow/packages/base-worklfow-steps
+      '@aws-ee/base-workflow-templates': link:../../../addons/addon-base-workflow/packages/base-workflow-templates
+      '@aws-ee/environment-sc-workflow-steps': link:../../../addons/addon-environment-sc-api/packages/environment-sc-workflow-steps
+      '@aws-ee/environment-sc-workflows': link:../../../addons/addon-environment-sc-api/packages/environment-sc-workflows
+      '@aws-ee/environment-type-mgmt-api': link:../../../addons/addon-environment-sc-api/packages/environment-type-mgmt-api
+      '@aws-ee/environment-type-mgmt-services': link:../../../addons/addon-environment-sc-api/packages/environment-type-mgmt-services
+      '@aws-ee/key-pair-mgmt-services': link:../../../addons/addon-key-pair-mgmt-api/packages/key-pair-mgmt-services
+      '@aws-ee/user-id-upgrade-post-deployment': link:../../../addons/addon-user-id-upgrade/packages/user-id-upgrade-post-deployment
       aws-sdk: 2.721.0
       lodash: 4.17.21
-      services: 'link:../../packages/services'
+      services: link:../../packages/services
     devDependencies:
-      '@aws-ee/base-serverless-backend-tools': 'link:../../../addons/addon-base/packages/serverless-backend-tools'
-      '@aws-ee/base-serverless-settings-helper': 'link:../../../addons/addon-base/packages/serverless-settings-helper'
+      '@aws-ee/base-serverless-backend-tools': link:../../../addons/addon-base/packages/serverless-backend-tools
+      '@aws-ee/base-serverless-settings-helper': link:../../../addons/addon-base/packages/serverless-settings-helper
       '@babel/core': 7.9.0
       '@babel/preset-env': 7.9.5_@babel+core@7.9.0
       babel-loader: 8.1.0_@babel+core@7.9.0+webpack@4.42.1
@@ -2194,27 +2194,27 @@ importers:
       serverless-s3-sync: 1.12.0
       serverless-webpack: 5.3.4_webpack@4.42.1
       source-map-support: 0.5.16
-      webpack: 4.42.1_webpack@4.42.1
+      webpack: 4.42.1
     specifiers:
-      '@aws-ee/base-post-deployment': 'workspace:*'
-      '@aws-ee/base-raas-post-deployment': 'workspace:*'
-      '@aws-ee/base-raas-rest-api': 'workspace:*'
-      '@aws-ee/base-raas-services': 'workspace:*'
-      '@aws-ee/base-raas-workflow-steps': 'workspace:*'
-      '@aws-ee/base-raas-workflows': 'workspace:*'
-      '@aws-ee/base-serverless-backend-tools': 'workspace:*'
-      '@aws-ee/base-serverless-settings-helper': 'workspace:*'
-      '@aws-ee/base-services': 'workspace:*'
-      '@aws-ee/base-services-container': 'workspace:*'
-      '@aws-ee/base-workflow-core': 'workspace:*'
-      '@aws-ee/base-workflow-steps': 'workspace:*'
-      '@aws-ee/base-workflow-templates': 'workspace:*'
-      '@aws-ee/environment-sc-workflow-steps': 'workspace:*'
-      '@aws-ee/environment-sc-workflows': 'workspace:*'
-      '@aws-ee/environment-type-mgmt-api': 'workspace:*'
-      '@aws-ee/environment-type-mgmt-services': 'workspace:*'
-      '@aws-ee/key-pair-mgmt-services': 'workspace:*'
-      '@aws-ee/user-id-upgrade-post-deployment': 'workspace:*'
+      '@aws-ee/base-post-deployment': workspace:*
+      '@aws-ee/base-raas-post-deployment': workspace:*
+      '@aws-ee/base-raas-rest-api': workspace:*
+      '@aws-ee/base-raas-services': workspace:*
+      '@aws-ee/base-raas-workflow-steps': workspace:*
+      '@aws-ee/base-raas-workflows': workspace:*
+      '@aws-ee/base-serverless-backend-tools': workspace:*
+      '@aws-ee/base-serverless-settings-helper': workspace:*
+      '@aws-ee/base-services': workspace:*
+      '@aws-ee/base-services-container': workspace:*
+      '@aws-ee/base-workflow-core': workspace:*
+      '@aws-ee/base-workflow-steps': workspace:*
+      '@aws-ee/base-workflow-templates': workspace:*
+      '@aws-ee/environment-sc-workflow-steps': workspace:*
+      '@aws-ee/environment-sc-workflows': workspace:*
+      '@aws-ee/environment-type-mgmt-api': workspace:*
+      '@aws-ee/environment-type-mgmt-services': workspace:*
+      '@aws-ee/key-pair-mgmt-services': workspace:*
+      '@aws-ee/user-id-upgrade-post-deployment': workspace:*
       '@babel/core': ^7.8.4
       '@babel/preset-env': ^7.8.4
       aws-sdk: ^2.713.0
@@ -2239,25 +2239,25 @@ importers:
       serverless-deployment-bucket: ^1.1.0
       serverless-s3-sync: ^1.10.2
       serverless-webpack: ^5.3.3
-      services: 'workspace:*'
+      services: workspace:*
       source-map-support: ^0.5.16
       webpack: ^4.41.5
   main/solution/prepare-master-acc:
     devDependencies:
-      '@aws-ee/base-serverless-settings-helper': 'link:../../../addons/addon-base/packages/serverless-settings-helper'
+      '@aws-ee/base-serverless-settings-helper': link:../../../addons/addon-base/packages/serverless-settings-helper
       serverless: 1.67.3
       serverless-deployment-bucket: 1.1.1
     specifiers:
-      '@aws-ee/base-serverless-settings-helper': 'workspace:*'
+      '@aws-ee/base-serverless-settings-helper': workspace:*
       serverless: ^1.63.0
       serverless-deployment-bucket: ^1.1.0
   main/solution/ui:
     dependencies:
-      '@aws-ee/base-raas-ui': 'link:../../../addons/addon-base-raas-ui/packages/base-raas-ui'
-      '@aws-ee/base-ui': 'link:../../../addons/addon-base-ui/packages/base-ui'
-      '@aws-ee/base-workflow-ui': 'link:../../../addons/addon-base-workflow-ui/packages/base-workflow-ui'
-      '@aws-ee/environment-type-mgmt-ui': 'link:../../../addons/addon-environment-sc-ui/packages/environment-type-mgmt-ui'
-      '@aws-ee/key-pair-mgmt-ui': 'link:../../../addons/addon-key-pair-mgmt-ui/packages/key-pair-mgmt-ui'
+      '@aws-ee/base-raas-ui': link:../../../addons/addon-base-raas-ui/packages/base-raas-ui
+      '@aws-ee/base-ui': link:../../../addons/addon-base-ui/packages/base-ui
+      '@aws-ee/base-workflow-ui': link:../../../addons/addon-base-workflow-ui/packages/base-workflow-ui
+      '@aws-ee/environment-type-mgmt-ui': link:../../../addons/addon-environment-sc-ui/packages/environment-type-mgmt-ui
+      '@aws-ee/key-pair-mgmt-ui': link:../../../addons/addon-key-pair-mgmt-ui/packages/key-pair-mgmt-ui
       animate.css: 3.7.0
       aws-sdk: 2.802.0
       classnames: 2.2.6
@@ -2277,8 +2277,8 @@ importers:
       typeface-lato: 0.0.75
       uuid: 3.4.0
     devDependencies:
-      '@aws-ee/base-serverless-settings-helper': 'link:../../../addons/addon-base/packages/serverless-settings-helper'
-      '@aws-ee/base-serverless-ui-tools': 'link:../../../addons/addon-base-ui/packages/serverless-ui-tools'
+      '@aws-ee/base-serverless-settings-helper': link:../../../addons/addon-base/packages/serverless-settings-helper
+      '@aws-ee/base-serverless-ui-tools': link:../../../addons/addon-base-ui/packages/serverless-ui-tools
       babel-eslint: 10.1.0_eslint@6.8.0
       eslint: 6.8.0
       eslint-config-airbnb: 18.2.1_89debf8fda32fbe99f1ba8ab582a8be5
@@ -2299,13 +2299,13 @@ importers:
       serverless: 1.83.2
       serverless-deployment-bucket: 1.3.0
     specifiers:
-      '@aws-ee/base-raas-ui': 'workspace:*'
-      '@aws-ee/base-serverless-settings-helper': 'workspace:*'
-      '@aws-ee/base-serverless-ui-tools': 'workspace:*'
-      '@aws-ee/base-ui': 'workspace:*'
-      '@aws-ee/base-workflow-ui': 'workspace:*'
-      '@aws-ee/environment-type-mgmt-ui': 'workspace:*'
-      '@aws-ee/key-pair-mgmt-ui': 'workspace:*'
+      '@aws-ee/base-raas-ui': workspace:*
+      '@aws-ee/base-serverless-settings-helper': workspace:*
+      '@aws-ee/base-serverless-ui-tools': workspace:*
+      '@aws-ee/base-ui': workspace:*
+      '@aws-ee/base-workflow-ui': workspace:*
+      '@aws-ee/environment-type-mgmt-ui': workspace:*
+      '@aws-ee/key-pair-mgmt-ui': workspace:*
       animate.css: 3.7.0
       aws-sdk: ^2.802.0
       babel-eslint: ^10.1.0
@@ -2343,7 +2343,7 @@ importers:
       toastr: ^2.1.4
       typeface-lato: 0.0.75
       uuid: ^3.4.0
-lockfileVersion: 5.1
+lockfileVersion: 5.2
 packages:
   /2-thenable/1.0.0:
     dependencies:
@@ -5017,7 +5017,7 @@ packages:
       jest-haste-map: 24.9.0
       jest-message-util: 24.9.0
       jest-regex-util: 24.9.0
-      jest-resolve: 24.9.0_jest-resolve@24.9.0
+      jest-resolve: 24.9.0
       jest-resolve-dependencies: 24.9.0
       jest-runner: 24.9.0
       jest-runtime: 24.9.0
@@ -5053,7 +5053,7 @@ packages:
       jest-haste-map: 26.6.2
       jest-message-util: 26.6.2
       jest-regex-util: 26.0.0
-      jest-resolve: 26.6.2_jest-resolve@26.6.2
+      jest-resolve: 26.6.2
       jest-resolve-dependencies: 26.6.3
       jest-runner: 26.6.3
       jest-runtime: 26.6.3
@@ -5141,7 +5141,7 @@ packages:
       istanbul-lib-source-maps: 3.0.6
       istanbul-reports: 2.2.7
       jest-haste-map: 24.9.0
-      jest-resolve: 24.9.0_jest-resolve@24.9.0
+      jest-resolve: 24.9.0
       jest-runtime: 24.9.0
       jest-util: 24.9.0
       jest-worker: 24.9.0
@@ -5172,7 +5172,7 @@ packages:
       istanbul-lib-source-maps: 4.0.0
       istanbul-reports: 3.0.2
       jest-haste-map: 26.6.2
-      jest-resolve: 26.6.2_jest-resolve@26.6.2
+      jest-resolve: 26.6.2
       jest-util: 26.6.2
       jest-worker: 26.6.2
       slash: 3.0.0
@@ -6090,7 +6090,7 @@ packages:
   /@types/chalk/2.2.0:
     dependencies:
       chalk: 4.1.0
-    deprecated: 'This is a stub types definition for chalk (https://github.com/chalk/chalk). chalk provides its own type definitions, so you don''t need @types/chalk installed!'
+    deprecated: This is a stub types definition for chalk (https://github.com/chalk/chalk). chalk provides its own type definitions, so you don't need @types/chalk installed!
     dev: true
     resolution:
       integrity: sha512-1zzPV9FDe1I/WHhRkf9SNgqtRJWZqrBWgu7JGveuHmmyR9CnAPCie2N/x+iHrgnpYBIcCJWHBoMRv2TRWktsvw==
@@ -7725,7 +7725,7 @@ packages:
       mkdirp: 0.5.5
       pify: 4.0.1
       schema-utils: 2.6.5
-      webpack: 4.41.2_webpack@4.41.2
+      webpack: 4.41.2
     dev: true
     engines:
       node: '>= 6.9'
@@ -7742,7 +7742,7 @@ packages:
       mkdirp: 0.5.5
       pify: 4.0.1
       schema-utils: 2.6.5
-      webpack: 4.42.0_webpack@4.42.0
+      webpack: 4.42.0
     dev: true
     engines:
       node: '>= 6.9'
@@ -7759,7 +7759,7 @@ packages:
       mkdirp: 0.5.5
       pify: 4.0.1
       schema-utils: 2.6.5
-      webpack: 4.42.1_webpack@4.42.1
+      webpack: 4.42.1
     dev: true
     engines:
       node: '>= 6.9'
@@ -9317,7 +9317,7 @@ packages:
       p-limit: 2.3.0
       schema-utils: 1.0.0
       serialize-javascript: 2.1.2
-      webpack: 4.42.1_webpack@4.42.1
+      webpack: 4.42.1
       webpack-log: 2.0.0
     dev: true
     engines:
@@ -9346,13 +9346,13 @@ packages:
     resolution:
       integrity: sha512-fRjhg3NeouotRoIV0L1FdchA6CK7ZD+lyINyMoz19SyV+ROpC4noS1xItWHFtwZdlqfMfVPJEyEGdfri2bD1pA==
   /core-js/2.6.11:
-    deprecated: 'core-js@<3 is no longer maintained and not recommended for usage due to the number of issues. Please, upgrade your dependencies to the actual version of core-js@3.'
+    deprecated: core-js@<3 is no longer maintained and not recommended for usage due to the number of issues. Please, upgrade your dependencies to the actual version of core-js@3.
     dev: false
     requiresBuild: true
     resolution:
       integrity: sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
   /core-js/2.6.12:
-    deprecated: 'core-js@<3 is no longer maintained and not recommended for usage due to the number of issues. Please, upgrade your dependencies to the actual version of core-js@3.'
+    deprecated: core-js@<3 is no longer maintained and not recommended for usage due to the number of issues. Please, upgrade your dependencies to the actual version of core-js@3.
     dev: true
     requiresBuild: true
     resolution:
@@ -9596,7 +9596,7 @@ packages:
       postcss-modules-values: 3.0.0
       postcss-value-parser: 4.1.0
       schema-utils: 2.7.1
-      webpack: 4.42.0_webpack@4.42.0
+      webpack: 4.42.0
     dev: true
     engines:
       node: '>= 8.9.0'
@@ -9852,7 +9852,7 @@ packages:
       is-ci: 2.0.0
       is-installed-globally: 0.3.2
       lazy-ass: 1.6.0
-      listr: 0.14.3_listr@0.14.3
+      listr: 0.14.3
       lodash: 4.17.20
       log-symbols: 3.0.0
       minimist: 1.2.5
@@ -11222,7 +11222,7 @@ packages:
       loader-utils: 1.4.0
       object-hash: 2.0.3
       schema-utils: 2.7.1
-      webpack: 4.42.0_webpack@4.42.0
+      webpack: 4.42.0
     deprecated: This loader has been deprecated. Please use eslint-webpack-plugin
     dev: true
     engines:
@@ -12079,7 +12079,7 @@ packages:
     dependencies:
       loader-utils: 1.4.0
       schema-utils: 2.7.1
-      webpack: 4.42.0_webpack@4.42.0
+      webpack: 4.42.0
     dev: true
     engines:
       node: '>= 8.9.0'
@@ -12340,7 +12340,7 @@ packages:
   /flat/5.0.0:
     dependencies:
       is-buffer: 2.0.4
-    deprecated: 'Fixed a prototype pollution security issue in 5.0.0, please upgrade to ^5.0.1.'
+    deprecated: Fixed a prototype pollution security issue in 5.0.0, please upgrade to ^5.0.1.
     dev: true
     hasBin: true
     resolution:
@@ -12592,7 +12592,6 @@ packages:
       integrity: sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
   /fsevents/2.1.2:
     deprecated: Please update to latest version
-    dev: true
     engines:
       node: ^8.16.0 || ^10.6.0 || >=11.0.0
     optional: true
@@ -13307,7 +13306,7 @@ packages:
       pretty-error: 2.1.2
       tapable: 1.1.3
       util.promisify: 1.0.0
-      webpack: 4.42.0_webpack@4.42.0
+      webpack: 4.42.0
     dev: true
     engines:
       node: '>=6.9'
@@ -14610,7 +14609,7 @@ packages:
       jest-get-type: 24.9.0
       jest-jasmine2: 24.9.0
       jest-regex-util: 24.9.0
-      jest-resolve: 24.9.0_jest-resolve@24.9.0
+      jest-resolve: 24.9.0
       jest-util: 24.9.0
       jest-validate: 24.9.0
       micromatch: 3.1.10
@@ -14636,7 +14635,7 @@ packages:
       jest-get-type: 26.3.0
       jest-jasmine2: 26.6.3
       jest-regex-util: 26.0.0
-      jest-resolve: 26.6.2_jest-resolve@26.6.2
+      jest-resolve: 26.6.2
       jest-util: 26.6.2
       jest-validate: 26.6.2
       micromatch: 4.0.2
@@ -14980,7 +14979,7 @@ packages:
       integrity: sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==
   /jest-pnp-resolver/1.2.2_jest-resolve@24.9.0:
     dependencies:
-      jest-resolve: 24.9.0_jest-resolve@24.9.0
+      jest-resolve: 24.9.0
     dev: true
     engines:
       node: '>=6'
@@ -14993,7 +14992,7 @@ packages:
       integrity: sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
   /jest-pnp-resolver/1.2.2_jest-resolve@26.6.2:
     dependencies:
-      jest-resolve: 26.6.2_jest-resolve@26.6.2
+      jest-resolve: 26.6.2
     dev: true
     engines:
       node: '>=6'
@@ -15036,7 +15035,7 @@ packages:
       node: '>= 10.14.2'
     resolution:
       integrity: sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==
-  /jest-resolve/24.9.0_jest-resolve@24.9.0:
+  /jest-resolve/24.9.0:
     dependencies:
       '@jest/types': 24.9.0
       browser-resolve: 1.11.3
@@ -15046,11 +15045,9 @@ packages:
     dev: true
     engines:
       node: '>= 6'
-    peerDependencies:
-      jest-resolve: '*'
     resolution:
       integrity: sha512-TaLeLVL1l08YFZAt3zaPtjiVvyy4oSA6CRe+0AFPPVX3Q/VI0giIWWoAvoS5L96vj9Dqxj4fB5p2qrHCmTU/MQ==
-  /jest-resolve/26.6.2_jest-resolve@26.6.2:
+  /jest-resolve/26.6.2:
     dependencies:
       '@jest/types': 26.6.2
       chalk: 4.1.0
@@ -15063,8 +15060,6 @@ packages:
     dev: true
     engines:
       node: '>= 10.14.2'
-    peerDependencies:
-      jest-resolve: '*'
     resolution:
       integrity: sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==
   /jest-runner/24.9.0:
@@ -15082,7 +15077,7 @@ packages:
       jest-jasmine2: 24.9.0
       jest-leak-detector: 24.9.0
       jest-message-util: 24.9.0
-      jest-resolve: 24.9.0_jest-resolve@24.9.0
+      jest-resolve: 24.9.0
       jest-runtime: 24.9.0
       jest-util: 24.9.0
       jest-worker: 24.9.0
@@ -15109,7 +15104,7 @@ packages:
       jest-haste-map: 26.6.2
       jest-leak-detector: 26.6.2
       jest-message-util: 26.6.2
-      jest-resolve: 26.6.2_jest-resolve@26.6.2
+      jest-resolve: 26.6.2
       jest-runtime: 26.6.3
       jest-util: 26.6.2
       jest-worker: 26.6.2
@@ -15137,7 +15132,7 @@ packages:
       jest-message-util: 24.9.0
       jest-mock: 24.9.0
       jest-regex-util: 24.9.0
-      jest-resolve: 24.9.0_jest-resolve@24.9.0
+      jest-resolve: 24.9.0
       jest-snapshot: 24.9.0
       jest-util: 24.9.0
       jest-validate: 24.9.0
@@ -15173,7 +15168,7 @@ packages:
       jest-message-util: 26.6.2
       jest-mock: 26.6.2
       jest-regex-util: 26.0.0
-      jest-resolve: 26.6.2_jest-resolve@26.6.2
+      jest-resolve: 26.6.2
       jest-snapshot: 26.6.2
       jest-util: 26.6.2
       jest-validate: 26.6.2
@@ -15211,7 +15206,7 @@ packages:
       jest-get-type: 24.9.0
       jest-matcher-utils: 24.9.0
       jest-message-util: 24.9.0
-      jest-resolve: 24.9.0_jest-resolve@24.9.0
+      jest-resolve: 24.9.0
       mkdirp: 0.5.5
       natural-compare: 1.4.0
       pretty-format: 24.9.0
@@ -15235,7 +15230,7 @@ packages:
       jest-haste-map: 26.6.2
       jest-matcher-utils: 26.6.2
       jest-message-util: 26.6.2
-      jest-resolve: 26.6.2_jest-resolve@26.6.2
+      jest-resolve: 26.6.2
       natural-compare: 1.4.0
       pretty-format: 26.6.2
       semver: 7.3.4
@@ -15970,7 +15965,7 @@ packages:
       elegant-spinner: 1.0.1
       figures: 1.7.0
       indent-string: 3.2.0
-      listr: 0.14.3_listr@0.14.3
+      listr: 0.14.3
       log-symbols: 1.0.2
       log-update: 2.3.0
       strip-ansi: 3.0.1
@@ -15992,7 +15987,7 @@ packages:
       node: '>=4'
     resolution:
       integrity: sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==
-  /listr/0.14.3_listr@0.14.3:
+  /listr/0.14.3:
     dependencies:
       '@samverschueren/stream-to-observable': 0.3.1_rxjs@6.5.5
       is-observable: 1.1.0
@@ -16006,8 +16001,6 @@ packages:
     dev: true
     engines:
       node: '>=6'
-    peerDependencies:
-      listr: '*'
     resolution:
       integrity: sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA==
   /load-json-file/2.0.0:
@@ -16631,7 +16624,7 @@ packages:
       loader-utils: 1.4.0
       normalize-url: 1.9.1
       schema-utils: 1.0.0
-      webpack: 4.42.0_webpack@4.42.0
+      webpack: 4.42.0
       webpack-sources: 1.4.3
     dev: true
     engines:
@@ -17560,7 +17553,7 @@ packages:
     dependencies:
       cssnano: 4.1.10
       last-call-webpack-plugin: 3.0.0
-      webpack: 4.42.0_webpack@4.42.0
+      webpack: 4.42.0
     dev: true
     peerDependencies:
       webpack: ^4.0.0
@@ -18152,7 +18145,7 @@ packages:
     resolution:
       integrity: sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==
   /popper.js/1.16.1:
-    deprecated: 'You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1'
+    deprecated: You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1
     dev: false
     resolution:
       integrity: sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==
@@ -19480,6 +19473,7 @@ packages:
       prop-types: 15.7.2
       react: 16.13.1
       scheduler: 0.19.1
+    dev: false
     peerDependencies:
       react: ^16.13.1
     resolution:
@@ -19731,7 +19725,7 @@ packages:
       identity-obj-proxy: 3.0.0
       jest: 24.9.0
       jest-environment-jsdom-fourteen: 1.0.1
-      jest-resolve: 24.9.0_jest-resolve@24.9.0
+      jest-resolve: 24.9.0
       jest-watch-typeahead: 0.4.2
       mini-css-extract-plugin: 0.9.0_webpack@4.42.0
       optimize-css-assets-webpack-plugin: 5.0.3_webpack@4.42.0
@@ -19751,7 +19745,7 @@ packages:
       terser-webpack-plugin: 2.3.8_webpack@4.42.0
       ts-pnp: 1.1.6
       url-loader: 2.3.0_file-loader@4.3.0+webpack@4.42.0
-      webpack: 4.42.0_webpack@4.42.0
+      webpack: 4.42.0
       webpack-dev-server: 3.11.0_webpack@4.42.0
       webpack-manifest-plugin: 2.2.0_webpack@4.42.0
       workbox-webpack-plugin: 4.3.1_webpack@4.42.0
@@ -19893,6 +19887,7 @@ packages:
       loose-envify: 1.4.0
       object-assign: 4.1.1
       prop-types: 15.7.2
+    dev: false
     engines:
       node: '>=0.10.0'
     resolution:
@@ -20275,7 +20270,7 @@ packages:
       request-promise-core: 1.1.4_request@2.88.2
       stealthy-require: 1.1.1
       tough-cookie: 2.5.0
-    deprecated: 'request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142'
+    deprecated: request-promise-native has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142
     dev: true
     engines:
       node: '>=0.12.0'
@@ -20305,7 +20300,7 @@ packages:
       tough-cookie: 2.5.0
       tunnel-agent: 0.6.0
       uuid: 3.4.0
-    deprecated: 'request has been deprecated, see https://github.com/request/request/issues/3142'
+    deprecated: request has been deprecated, see https://github.com/request/request/issues/3142
     engines:
       node: '>= 6'
     resolution:
@@ -20415,7 +20410,7 @@ packages:
     resolution:
       integrity: sha512-QEb4A76c8Mi7I3xNKXlRKQSlLBwjUV/ULFMP+G7n3/7tJZ8MG5wsZ3ucxP1Jz8Vevn6fnJsxDx9cIls+utGzPQ==
   /resolve-url/0.2.1:
-    deprecated: 'https://github.com/lydell/resolve-url#deprecated'
+    deprecated: https://github.com/lydell/resolve-url#deprecated
     dev: true
     resolution:
       integrity: sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
@@ -20642,7 +20637,7 @@ packages:
       neo-async: 2.6.2
       schema-utils: 2.7.1
       semver: 6.3.0
-      webpack: 4.42.0_webpack@4.42.0
+      webpack: 4.42.0
     dev: true
     engines:
       node: '>= 8.9.0'
@@ -20977,7 +20972,7 @@ packages:
       lodash: 4.17.15
       semver: 5.7.1
       ts-node: 3.3.0
-      webpack: 4.42.1_webpack@4.42.1
+      webpack: 4.42.1
     dev: true
     peerDependencies:
       webpack: '>= 3.0.0 < 6'
@@ -20993,7 +20988,7 @@ packages:
       lodash: 4.17.20
       semver: 6.3.0
       ts-node: 8.10.2
-      webpack: 4.42.1_webpack@4.42.1
+      webpack: 4.42.1
     dev: true
     peerDependencies:
       webpack: '>= 3.0.0 < 6'
@@ -22133,7 +22128,7 @@ packages:
       serialize-javascript: 2.1.2
       source-map: 0.6.1
       terser: 4.6.11
-      webpack: 4.41.2_webpack@4.41.2
+      webpack: 4.41.2
       webpack-sources: 1.4.3
       worker-farm: 1.7.0
     dev: true
@@ -22152,7 +22147,7 @@ packages:
       serialize-javascript: 2.1.2
       source-map: 0.6.1
       terser: 4.6.11
-      webpack: 4.42.1_webpack@4.42.1
+      webpack: 4.42.1
       webpack-sources: 1.4.3
       worker-farm: 1.7.0
     dev: true
@@ -22171,7 +22166,7 @@ packages:
       serialize-javascript: 4.0.0
       source-map: 0.6.1
       terser: 4.8.0
-      webpack: 4.42.0_webpack@4.42.0
+      webpack: 4.42.0
       webpack-sources: 1.4.3
       worker-farm: 1.7.0
     dev: true
@@ -22191,7 +22186,7 @@ packages:
       serialize-javascript: 4.0.0
       source-map: 0.6.1
       terser: 4.8.0
-      webpack: 4.42.0_webpack@4.42.0
+      webpack: 4.42.0
       webpack-sources: 1.4.3
     dev: true
     engines:
@@ -22859,7 +22854,7 @@ packages:
     resolution:
       integrity: sha512-s/UIq9ap4JPZ7H1EB5ULo/aOUbWqfDi7FKzMC2Nz+0Si8GiT1rIEaprt8hy3Vy2Ex2aJPpOQv4P4DuOZ+K1c6w==
   /urix/0.1.0:
-    deprecated: 'Please see https://github.com/lydell/urix#deprecated'
+    deprecated: Please see https://github.com/lydell/urix#deprecated
     dev: true
     resolution:
       integrity: sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
@@ -22869,7 +22864,7 @@ packages:
       loader-utils: 1.4.0
       mime: 2.4.6
       schema-utils: 2.7.1
-      webpack: 4.42.0_webpack@4.42.0
+      webpack: 4.42.0
     dev: true
     engines:
       node: '>= 8.9.0'
@@ -23186,7 +23181,7 @@ packages:
       loader-utils: 1.2.3
       supports-color: 6.1.0
       v8-compile-cache: 2.0.3
-      webpack: 4.42.1_webpack@4.42.1
+      webpack: 4.42.1
       yargs: 13.2.4
     dev: true
     engines:
@@ -23202,7 +23197,7 @@ packages:
       mime: 2.4.6
       mkdirp: 0.5.5
       range-parser: 1.2.1
-      webpack: 4.42.0_webpack@4.42.0
+      webpack: 4.42.0
       webpack-log: 2.0.0
     dev: true
     engines:
@@ -23242,7 +23237,7 @@ packages:
       strip-ansi: 3.0.1
       supports-color: 6.1.0
       url: 0.11.0
-      webpack: 4.42.0_webpack@4.42.0
+      webpack: 4.42.0
       webpack-dev-middleware: 3.7.2_webpack@4.42.0
       webpack-log: 2.0.0
       ws: 6.2.1
@@ -23274,7 +23269,7 @@ packages:
       lodash: 4.17.20
       object.entries: 1.1.3
       tapable: 1.1.3
-      webpack: 4.42.0_webpack@4.42.0
+      webpack: 4.42.0
     dev: true
     engines:
       node: '>=6.11.5'
@@ -23293,7 +23288,7 @@ packages:
     dev: true
     resolution:
       integrity: sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
-  /webpack/4.41.2_webpack@4.41.2:
+  /webpack/4.41.2:
     dependencies:
       '@webassemblyjs/ast': 1.8.5
       '@webassemblyjs/helper-module-context': 1.8.5
@@ -23322,11 +23317,9 @@ packages:
     engines:
       node: '>=6.11.5'
     hasBin: true
-    peerDependencies:
-      webpack: '*'
     resolution:
       integrity: sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A==
-  /webpack/4.42.0_webpack@4.42.0:
+  /webpack/4.42.0:
     dependencies:
       '@webassemblyjs/ast': 1.8.5
       '@webassemblyjs/helper-module-context': 1.8.5
@@ -23355,11 +23348,9 @@ packages:
     engines:
       node: '>=6.11.5'
     hasBin: true
-    peerDependencies:
-      webpack: '*'
     resolution:
       integrity: sha512-EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w==
-  /webpack/4.42.1_webpack@4.42.1:
+  /webpack/4.42.1:
     dependencies:
       '@webassemblyjs/ast': 1.9.0
       '@webassemblyjs/helper-module-context': 1.9.0
@@ -23388,8 +23379,6 @@ packages:
     engines:
       node: '>=6.11.5'
     hasBin: true
-    peerDependencies:
-      webpack: '*'
     resolution:
       integrity: sha512-SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg==
   /websocket-driver/0.6.5:
@@ -23636,7 +23625,7 @@ packages:
     dependencies:
       '@babel/runtime': 7.12.5
       json-stable-stringify: 1.0.1
-      webpack: 4.42.0_webpack@4.42.0
+      webpack: 4.42.0
       workbox-build: 4.3.1
     dev: true
     engines:
diff --git a/scripts/util.sh b/scripts/util.sh
index 441bb2b2e6..7e8bd7ea06 100755
--- a/scripts/util.sh
+++ b/scripts/util.sh
@@ -30,7 +30,7 @@ popd > /dev/null
 function init_package_manager() {
   PACKAGE_MANAGER=pnpm
   if ! command -v $PACKAGE_MANAGER; then
-    npm install -g pnpm
+    npm install -g pnpm@5.18.9
   fi
   case "$PACKAGE_MANAGER" in
     yarn)