Update deps (#320)

* Update deps * Fix one error * Fix conflict * Fix path * Adjust paths
pwrdrvr · Mar 5, 2023 · 638ddc5 · 638ddc5
1 parent a1c4387
commit 638ddc5
Show file tree

Hide file tree

Showing 18 changed files with 1,125 additions and 1,273 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -80,10 +80,10 @@ jobs:
         id: appVersions
         run: |
           # find . -type d -name microapps-app-nextjs-demo-cdk
-          echo 'NEXTJS_DEMO_APP_PACKAGE_VERSION='$(node -p -e "(require('./packages/cdk/node_modules/@pwrdrvr/microapps-app-nextjs-demo-cdk/package.json')).version") >> $GITHUB_ENV
-          echo 'RELEASE_APP_PACKAGE_VERSION='$(node -p -e "(require('./packages/cdk/node_modules/@pwrdrvr/microapps-app-release-cdk/package.json')).version") >> $GITHUB_ENV
-          echo "::set-output name=nextjsDemoAppPackageVersion::$(node -p -e "(require('./packages/cdk/node_modules/@pwrdrvr/microapps-app-nextjs-demo-cdk/package.json')).version")"
-          echo "::set-output name=releaseAppPackageVersion::$(node -p -e "(require('./packages/cdk/node_modules/@pwrdrvr/microapps-app-release-cdk/package.json')).version")"
+          echo 'NEXTJS_DEMO_APP_PACKAGE_VERSION='$(node -p -e "(require('./node_modules/@pwrdrvr/microapps-app-nextjs-demo-cdk/package.json')).version") >> $GITHUB_ENV
+          echo 'RELEASE_APP_PACKAGE_VERSION='$(node -p -e "(require('./node_modules/@pwrdrvr/microapps-app-release-cdk/package.json')).version") >> $GITHUB_ENV
+          echo "::set-output name=nextjsDemoAppPackageVersion::$(node -p -e "(require('./node_modules/@pwrdrvr/microapps-app-nextjs-demo-cdk/package.json')).version")"
+          echo "::set-output name=releaseAppPackageVersion::$(node -p -e "(require('./node_modules/@pwrdrvr/microapps-app-release-cdk/package.json')).version")"
 
       - name: Versions
         run: |
@@ -430,7 +430,7 @@ jobs:
             -n ${{ needs.build.outputs.nextjsDemoAppPackageVersion }} \
             -d ${DEPLOYER_LAMBDA_NAME} \
             -l ${NEXTJS_DEMO_APP_LAMBDA_VERSION_ARN} \
-            -s packages/cdk/node_modules/@pwrdrvr/microapps-app-nextjs-demo-cdk/lib/microapps-app-nextjs-demo/static_files/ \
+            -s node_modules/@pwrdrvr/microapps-app-nextjs-demo-cdk/lib/microapps-app-nextjs-demo/static_files/ \
             --overwrite
 
       - name: Nextjs Demo App URL
@@ -462,7 +462,7 @@ jobs:
             -n ${{ needs.build.outputs.releaseAppPackageVersion }} \
             -d ${DEPLOYER_LAMBDA_NAME} \
             -l ${RELEASE_APP_LAMBDA_VERSION_ARN} \
-            -s packages/cdk/node_modules/@pwrdrvr/microapps-app-release-cdk/lib/microapps-app-release/static_files/ \
+            -s node_modules/@pwrdrvr/microapps-app-release-cdk/lib/microapps-app-release/static_files/ \
             --overwrite
 
       - name: Release App URL

diff --git a/.nextjs-demo-replace.config.js b/.nextjs-demo-replace.config.js
@@ -1,5 +1,5 @@
 // https://www.npmjs.com/package/replace-in-file
 module.exports = {
   files:
-    'packages/cdk/node_modules/@pwrdrvr/microapps-app-nextjs-demo-cdk/lib/microapps-app-nextjs-demo/server/.next/**/*,packages/cdk/node_modules/@pwrdrvr/microapps-app-nextjs-demo-cdk/lib/microapps-app-nextjs-demo/static_files/**/*',
+    'node_modules/@pwrdrvr/microapps-app-nextjs-demo-cdk/lib/microapps-app-nextjs-demo/server/.next/**/*,node_modules/@pwrdrvr/microapps-app-nextjs-demo-cdk/lib/microapps-app-nextjs-demo/static_files/**/*',
 };
diff --git a/.release-replace.config.js b/.release-replace.config.js
@@ -1,4 +1,5 @@
 // https://www.npmjs.com/package/replace-in-file
 module.exports = {
-  files: 'packages/cdk/node_modules/@pwrdrvr/microapps-app-release-cdk/lib/microapps-app-release/.next/**/*,packages/cdk/node_modules/@pwrdrvr/microapps-app-release-cdk/lib/microapps-app-release/next.config.js,packages/cdk/node_modules/@pwrdrvr/microapps-app-release-cdk/lib/microapps-app-release/.static_files/**/*',
-};
+  files:
+    'node_modules/@pwrdrvr/microapps-app-release-cdk/lib/microapps-app-release/.next/**/*,node_modules/@pwrdrvr/microapps-app-release-cdk/lib/microapps-app-release/next.config.js,node_modules/@pwrdrvr/microapps-app-release-cdk/lib/microapps-app-release/.static_files/**/*',
+};
diff --git a/DockerfileDeployer b/DockerfileDeployer
diff --git a/DockerfileRouter b/DockerfileRouter
diff --git a/package.json b/package.json
@@ -19,9 +19,8 @@
     "nohoist": [
       "**/@types/convict-format-with-validator",
       "**/@types/convict-format-with-validator/**",
-      "**/aws-cdk-lib",
-      "**/aws-cdk-lib/**",
-      "**/constructs"
+      "packages/microapps-cdk/aws-cdk-lib/**",
+      "packages/microapps-cdk/constructs/**"
     ]
   },
   "private": true,
@@ -48,38 +47,30 @@
     "postinstall": "npx patch-package"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^17.1.0",
-    "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^10.0.0",
-    "@tsconfig/node14": "^1.0.0",
     "@types/jest": "29.4.0",
     "@types/node": "16.9.2",
-    "@typescript-eslint/eslint-plugin": "^4.9.0",
-    "@typescript-eslint/parser": "^4.9.0",
+    "@typescript-eslint/eslint-plugin": "5.54.0",
+    "@typescript-eslint/parser": "5.54.0",
     "aws-cdk": "^2.24.1",
-    "aws-cdk-lib": "^2.24.1",
+    "aws-cdk-lib": "2.24.1",
     "constructs": "10.0.5",
-    "cross-env": "^7.0.3",
-    "esbuild": "^0.14.39",
-    "eslint": "^7.15.0",
-    "eslint-config-prettier": "^7.0.0",
-    "eslint-import-resolver-node": "^0.3.6",
-    "eslint-import-resolver-typescript": "^2.5.0",
-    "eslint-plugin-import": "^2.25.3",
-    "eslint-plugin-prettier": "^3.2.0",
-    "husky": "^4.2.5",
+    "cross-env": "7.0.3",
+    "esbuild": "0.17.11",
+    "eslint": "8.35.0",
+    "eslint-config-prettier": "8.6.0",
+    "eslint-import-resolver-node": "0.3.7",
+    "eslint-import-resolver-typescript": "3.5.3",
+    "eslint-plugin-import": "2.27.5",
+    "eslint-plugin-prettier": "4.2.1",
+    "husky": "8.0.3",
     "jest": "29.4.3",
     "jest-dynalite": "3.6.1",
-    "lint-staged": "^10.2.11",
-    "patch-package": "^6.4.7",
-    "prettier": "^2.6.2",
-    "projen": "~0.56.19",
-    "replace-in-file": "^6.3.2",
-    "rimraf": "^3.0.2",
-    "rollup": "^2.39.0",
-    "rollup-plugin-node-externals": "^2.2.0",
-    "rollup-plugin-terser": "^7.0.2",
-    "rollup-plugin-typescript2": "^0.30.0",
+    "lint-staged": "12.1.2",
+    "patch-package": "6.5.1",
+    "prettier": "2.8.4",
+    "projen": "0.56.19",
+    "replace-in-file": "6.3.5",
+    "rimraf": "4.3.0",
     "start-server-and-test": "^1.14.0",
     "ts-jest": "29.0.5",
     "ts-node": "10.9.1",

diff --git a/packages/cdk/lib/MicroApps.ts b/packages/cdk/lib/MicroApps.ts
@@ -289,7 +289,7 @@ export class MicroAppsStack extends Stack {
         removalPolicy,
       });
 
-      const appVersion = (app.lambdaFunction as lambda.Function).currentVersion;
+      const appVersion = (app.lambdaFunction as unknown as lambda.Function).currentVersion;
       appVersion.applyRemovalPolicy(RemovalPolicy.RETAIN);
 
       new CfnOutput(this, 'release-app-func-name', {

diff --git a/packages/cdk/package.json b/packages/cdk/package.json
@@ -15,15 +15,13 @@
   },
   "dependencies": {
     "@pwrdrvr/microapps-app-nextjs-demo-cdk": "0.6.3",
-    "@pwrdrvr/microapps-app-release-cdk": "0.5.2",
-    "source-map-support": "0.5.21"
+    "@pwrdrvr/microapps-app-release-cdk": "0.5.3",
+    "source-map-support": "0.5.21",
+    "aws-cdk-lib": "2.24.1",
+    "constructs": "10.0.5"
   },
   "devDependencies": {
     "@types/node": "16.9.2",
-    "aws-cdk-lib": "2.24.1",
-    "constructs": "10.0.5",
-    "ts-node": "^9.0.0",
-    "tslib": "^2.1.0",
-    "typescript": "^4.6.0"
+    "tslib": "2.5.0"
   }
 }
diff --git a/packages/microapps-cdk/.projenrc.js b/packages/microapps-cdk/.projenrc.js
@@ -50,7 +50,7 @@ const project = new awscdk.AwsCdkConstructLibrary({
   devDeps: [
     'esbuild',
     '@types/yargs@^16.0.0', // This is a dummy to prevent jsii from failing
-    '@types/jest@^26.0.24', // This is a dummy to prevent jsii from failing
+    '@types/jest@29.4.0', // This is a dummy to prevent jsii from failing
     // '@aws-cdk/[email protected]',
     // '@aws-cdk/[email protected]',
     // 'patch-package@^6.4.7',

diff --git a/packages/microapps-datalib/package.json b/packages/microapps-datalib/package.json
@@ -24,13 +24,15 @@
   },
   "homepage": "https://github.com/pwrdrvr/microapps-core#readme",
   "peerDependencies": {
-    "@aws-sdk/client-dynamodb": "^3.20.0",
-    "@aws-sdk/lib-dynamodb": "^3.20.0",
-    "class-transformer": "^0.5.1",
-    "tslib": "^2.1.0"
+    "@aws-sdk/client-dynamodb": "^3.78.0",
+    "@aws-sdk/lib-dynamodb": "^3.78.0",
+    "class-transformer": "0.5.1",
+    "tslib": "2.5.0"
   },
   "dependencies": {
-    "class-transformer": "^0.5.1"
+    "@aws-sdk/client-dynamodb": "3.78.0",
+    "@aws-sdk/lib-dynamodb": "3.78.0",
+    "class-transformer": "0.5.1"
   },
   "devDependencies": {
     "@types/node-fetch": "^2.5.8",

diff --git a/packages/microapps-deployer/package.json b/packages/microapps-deployer/package.json
@@ -20,13 +20,13 @@
   },
   "homepage": "https://github.com/pwrdrvr/microapps-core#readme",
   "dependencies": {
-    "@aws-sdk/client-apigatewayv2": "^3.20.0",
-    "@aws-sdk/client-dynamodb": "^3.20.0",
-    "@aws-sdk/client-iam": "^3.20.0",
-    "@aws-sdk/client-lambda": "^3.20.0",
-    "@aws-sdk/client-s3": "^3.20.0",
-    "@aws-sdk/client-sts": "^3.20.0",
-    "@aws-sdk/lib-dynamodb": "^3.20.0",
+    "@aws-sdk/client-apigatewayv2": "3.78.0",
+    "@aws-sdk/client-dynamodb": "3.78.0",
+    "@aws-sdk/client-iam": "3.78.0",
+    "@aws-sdk/client-lambda": "3.78.0",
+    "@aws-sdk/client-s3": "3.78.0",
+    "@aws-sdk/client-sts": "3.78.0",
+    "@aws-sdk/lib-dynamodb": "3.78.0",
     "convict": "^6.1.0",
     "convict-format-with-validator": "^6.0.1",
     "fs-extra": "^9.1.0",
@@ -36,14 +36,13 @@
     "reflect-metadata": "^0.1.13",
     "source-map-support": "0.5.21",
     "ts-convict": "^1.1.0",
-    "tslib": "^2.1.0"
+    "tslib": "2.5.0"
   },
   "devDependencies": {
     "@types/aws-lambda": "8.10.110",
     "@types/convict": "^6.0.2",
     "@types/convict-format-with-validator": "^6.0.2",
     "@types/fs-extra": "^9.0.11",
-    "@types/jest": "^26.0.24",
     "@types/js-yaml": "^4.0.1",
     "@types/lambda-log": "^2.2.0",
     "@types/node": "16.9.2",

diff --git a/packages/microapps-edge-to-origin/package.json b/packages/microapps-edge-to-origin/package.json
@@ -15,12 +15,12 @@
     "aws-sdk-client-mock": "^0.6.2"
   },
   "dependencies": {
-    "@aws-crypto/sha256-browser": "^2.0.1",
-    "@aws-sdk/client-secrets-manager": "~3.78.0",
-    "@aws-sdk/credential-provider-node": "~3.78.0",
-    "@aws-sdk/signature-v4": "~3.78.0",
-    "@aws-sdk/protocol-http": "~3.78.0",
-    "@aws-sdk/node-http-handler": "~3.78.0",
+    "@aws-crypto/sha256-browser": "4.0.0",
+    "@aws-sdk/client-secrets-manager": "3.78.0",
+    "@aws-sdk/credential-provider-node": "3.78.0",
+    "@aws-sdk/signature-v4": "3.78.0",
+    "@aws-sdk/protocol-http": "3.78.0",
+    "@aws-sdk/node-http-handler": "3.78.0",
     "convict": "^6.1.0",
     "convict-format-with-validator": "^6.0.1",
     "fs-extra": "^9.1.0",

diff --git a/packages/microapps-publish/package.json b/packages/microapps-publish/package.json
@@ -35,10 +35,10 @@
   },
   "homepage": "https://github.com/pwrdrvr/microapps-core#readme",
   "dependencies": {
-    "@aws-sdk/client-lambda": "^3.20.0",
-    "@aws-sdk/client-s3": "^3.20.0",
-    "@aws-sdk/client-sts": "^3.20.0",
-    "@aws-sdk/lib-storage": "^3.20.0",
+    "@aws-sdk/client-lambda": "3.78.0",
+    "@aws-sdk/client-s3": "3.78.0",
+    "@aws-sdk/client-sts": "3.78.0",
+    "@aws-sdk/lib-storage": "3.78.0",
     "@oclif/command": "^1.8.4",
     "@oclif/config": "^1.17.1",
     "@oclif/core": "^1.0.4",

diff --git a/packages/microapps-router-lib/package.json b/packages/microapps-router-lib/package.json
@@ -18,7 +18,7 @@
   },
   "homepage": "https://github.com/pwrdrvr/microapps-core#readme",
   "dependencies": {
-    "@aws-sdk/client-dynamodb": "^3.21.0",
+    "@aws-sdk/client-dynamodb": "3.78.0",
     "fs-extra": "^9.1.0",
     "lambda-log": "^3.1.0",
     "source-map-support": "0.5.21",

diff --git a/packages/microapps-router/package.json b/packages/microapps-router/package.json
@@ -18,7 +18,7 @@
   },
   "homepage": "https://github.com/pwrdrvr/microapps-core#readme",
   "dependencies": {
-    "@aws-sdk/client-dynamodb": "^3.21.0",
+    "@aws-sdk/client-dynamodb": "3.78.0",
     "convict": "^6.1.0",
     "convict-format-with-validator": "^6.0.1",
     "fs-extra": "^9.1.0",

diff --git a/rollup.deployer.js b/rollup.deployer.js