chore(deps): Fix transitive dependencies (#5796)

aws-amplify · Sep 24, 2024 · bf9dbc3 · bf9dbc3
1 parent 3a677a1
commit bf9dbc3
Show file tree

Hide file tree

Showing 29 changed files with 334 additions and 762 deletions.
diff --git a/.changeset/early-donuts-invent.md b/.changeset/early-donuts-invent.md
@@ -0,0 +1,16 @@
+---
+"@aws-amplify/ui-react-ai": patch
+"@aws-amplify/ui-react-core-notifications": patch
+"@aws-amplify/ui-react-core": patch
+"@aws-amplify/ui-react-geo": patch
+"@aws-amplify/ui-react-liveness": patch
+"@aws-amplify/ui-react-native": patch
+"@aws-amplify/ui-react-notifications": patch
+"@aws-amplify/ui-react-storage": patch
+"@aws-amplify/ui-react": patch
+"@aws-amplify/ui": patch
+"@aws-amplify/ui-vue": patch
+"@aws-amplify/ui-angular": patch
+---
+
+chore(deps): Fix transitive dependencies.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+  "eslint.workingDirectories": [
+    { "pattern": "./packages/*", "changeProcessCWD": true }
+  ]
+}
diff --git a/package.json b/package.json
@@ -122,7 +122,7 @@
     "@types/jest": "^29.5.5",
     "@types/react-test-renderer": "^18.0.2",
     "@vitejs/plugin-vue": "^2.3.4",
-    "aws-amplify": "6.4.3",
+    "aws-amplify": "^6.6.0",
     "esbuild-register": "^3.5.0",
     "eslint": "^8.44.0",
     "fs-extra": "^11.1.1",

diff --git a/packages/angular/.eslintrc.js b/packages/angular/.eslintrc.js
@@ -39,7 +39,22 @@ module.exports = {
     },
     {
       extends: ['@aws-amplify/amplify-ui/jest'],
-      files: ['**/__mocks__/**', '**/__tests__/**'],
+      files: [
+        '**/__tests__/**',
+        // this file doesn't fit the typical pattern of being in a __tests__ directory
+        './projects/ui-angular/src/lib/components/authenticator/components/setup-totp/setup-totp.component.spec.ts',
+      ],
+    },
+    {
+      rules: {
+        'import/no-extraneous-dependencies': [
+          'error',
+          {
+            packageDir: ['.', '../..', './projects/ui-angular'],
+          },
+        ],
+      },
+      files: ['**/*.ts'],
     },
   ],
 };
diff --git a/packages/angular/package.json b/packages/angular/package.json
@@ -9,7 +9,8 @@
     "build": "ng build --configuration production",
     "test": "jest",
     "test:watch": "yarn test --watch",
-    "lint": "ng lint"
+    "lint": "yarn typecheck && ng lint",
+    "typecheck": "tsc --noEmit"
   },
   "license": "Apache-2.0",
   "devDependencies": {
@@ -21,7 +22,6 @@
     "@angular-eslint/template-parser": "~14.4.0",
     "@angular/animations": "^14.3.0",
     "@angular/cli": "^14.2.13",
-    "@angular/common": "^14.3.0",
     "@angular/compiler": "^14.3.0",
     "@angular/compiler-cli": "^14.3.0",
     "@angular/core": "^14.3.0",
@@ -36,7 +36,6 @@
     "jest-preset-angular": "^13.1.1",
     "ng-mocks": "^14.10.1",
     "ng-packagr": "^14.2.2",
-    "rxjs": "^7.8.1",
     "ts-node": "^10.9.1",
     "tslib": "^2.5.2",
     "typescript": "~4.6.4",

diff --git a/packages/angular/projects/ui-angular/ng-package.json b/packages/angular/projects/ui-angular/ng-package.json
@@ -6,9 +6,11 @@
     "entryFile": "src/index.ts"
   },
   "allowedNonPeerDependencies": [
+    "@angular/common",
     "@aws-amplify/ui",
     "classnames",
     "nanoid",
+    "rxjs",
     "qrcode",
     "xstate"
   ]

diff --git a/packages/angular/projects/ui-angular/package.json b/packages/angular/projects/ui-angular/package.json
@@ -15,11 +15,13 @@
   },
   "peerDependencies": {
     "@angular/core": ">= 14.0.0",
-    "aws-amplify": "^6.3.2"
+    "aws-amplify": "^6.6.0"
   },
   "dependencies": {
+    "@angular/common": "^14.3.0",
     "@aws-amplify/ui": "6.6.0",
     "nanoid": "3.1.31",
+    "rxjs": "^7.8.1",
     "qrcode": "1.5.0",
     "tslib": "^2.5.2",
     "xstate": "^4.33.6"

diff --git a/packages/configs/eslint/configs/index.js b/packages/configs/eslint/configs/index.js
@@ -1,6 +1,6 @@
 module.exports = {
   env: { node: true },
-  plugins: ['@typescript-eslint', 'index'],
+  plugins: ['@typescript-eslint', 'import', 'index'],
   extends: [
     'eslint:recommended',
     'plugin:@typescript-eslint/recommended-requiring-type-checking',
@@ -45,6 +45,12 @@ module.exports = {
     'generator-star-spacing': 'off',
     'global-require': 'off',
     'implicit-arrow-linebreak': 'off',
+    'import/no-extraneous-dependencies': [
+      'error',
+      {
+        packageDir: ['.', '../..'],
+      },
+    ],
     'index/only-import-export': 'error',
     'max-params': 2,
     'no-alert': 'error',

diff --git a/packages/react-ai/package.json b/packages/react-ai/package.json
@@ -42,7 +42,8 @@
     "typecheck": "tsc --noEmit"
   },
   "peerDependencies": {
-    "aws-amplify": "^6.3.2",
+    "@aws-amplify/api-graphql": "^4.3.0",
+    "aws-amplify": "^6.6.0",
     "react": "^16.14.0 || ^17.0 || ^18.0",
     "react-dom": "^16.14.0 || ^17.0 || ^18.0"
   },

diff --git a/packages/react-auth/package.json b/packages/react-auth/package.json
@@ -49,7 +49,7 @@
     "tslib": "^2.5.2"
   },
   "peerDependencies": {
-    "aws-amplify": "^6.3.2",
+    "aws-amplify": "^6.6.0",
     "react": "^16.14.0 || ^17.0 || ^18.0",
     "react-dom": "^16.14.0 || ^17.0 || ^18.0"
   },

diff --git a/packages/react-core-auth/package.json b/packages/react-core-auth/package.json
@@ -37,10 +37,12 @@
     "@aws-amplify/ui-react-core": "3.0.24",
     "@xstate/react": "3.2.2",
     "lodash": "4.17.21",
+    "qrcode": "1.5.0",
     "xstate": "^4.33.6"
   },
   "peerDependencies": {
-    "aws-amplify": "^6.3.2",
+    "@aws-amplify/core": "^6.4.0",
+    "aws-amplify": "^6.6.0",
     "react": "^16.14.0 || ^17.0 || ^18.0"
   },
   "sideEffects": false

diff --git a/packages/react-core-notifications/package.json b/packages/react-core-notifications/package.json
@@ -39,7 +39,7 @@
     "@aws-amplify/ui-react-core": "3.0.24"
   },
   "peerDependencies": {
-    "aws-amplify": "^6.3.2",
+    "aws-amplify": "^6.6.0",
     "react": "^16.14.0 || ^17.0 || ^18.0"
   },
   "sideEffects": false

diff --git a/packages/react-core/package.json b/packages/react-core/package.json
@@ -46,8 +46,11 @@
     "react-hook-form": "^7.43.5",
     "xstate": "^4.33.6"
   },
+  "devDependencies": {
+    "@aws-amplify/core": "^6.4.0"
+  },
   "peerDependencies": {
-    "aws-amplify": "^6.3.2",
+    "aws-amplify": "^6.6.0",
     "react": "^16.14.0 || ^17.0 || ^18.0"
   },
   "sideEffects": false

diff --git a/packages/react-geo/package.json b/packages/react-geo/package.json
@@ -47,8 +47,8 @@
     "tslib": "^2.5.2"
   },
   "peerDependencies": {
-    "@aws-amplify/geo": "^3.0.40",
-    "aws-amplify": "^6.3.2",
+    "@aws-amplify/geo": "^3.0.47",
+    "aws-amplify": "^6.6.0",
     "react": "^16.14.0 || ^17.0 || ^18.0",
     "react-dom": "^16.14.0 || ^17.0 || ^18.0"
   },

diff --git a/packages/react-liveness/package.json b/packages/react-liveness/package.json
@@ -42,7 +42,8 @@
     "typecheck": "tsc --noEmit"
   },
   "peerDependencies": {
-    "aws-amplify": "^6.3.2",
+    "@aws-amplify/core": "^6.4.0",
+    "aws-amplify": "^6.6.0",
     "react": "^16.14.0 || ^17.0 || ^18.0",
     "react-dom": "^16.14.0 || ^17.0 || ^18.0"
   },
@@ -55,6 +56,7 @@
     "@smithy/fetch-http-handler": "^2.1.3",
     "@smithy/protocol-http": "^3.0.3",
     "@smithy/signature-v4": "2.1.4",
+    "@smithy/types": "^3.3.0",
     "@mediapipe/face_detection": "~0.4.0",
     "@tensorflow-models/face-detection": "1.0.2",
     "@tensorflow/tfjs-backend-cpu": "4.11.0",

diff --git a/...s/FaceLivenessDetector/service/utils/createStreamingClient/CustomWebSocketFetchHandler.ts b/...s/FaceLivenessDetector/service/utils/createStreamingClient/CustomWebSocketFetchHandler.ts
@@ -15,11 +15,7 @@ import {
 } from '@smithy/eventstream-serde-browser';
 import { FetchHttpHandler } from '@smithy/fetch-http-handler';
 import { HttpRequest, HttpResponse } from '@smithy/protocol-http';
-import {
-  Provider,
-  RequestHandler,
-  RequestHandlerMetadata,
-} from '@smithy/types';
+import { Provider, RequestHandler, RequestHandlerMetadata } from './types';
 import { WS_CLOSURE_CODE } from '../constants';
 
 const DEFAULT_WS_CONNECTION_TIMEOUT_MS = 2000;

diff --git a/...iveness/src/components/FaceLivenessDetector/service/utils/createStreamingClient/Signer.ts b/...iveness/src/components/FaceLivenessDetector/service/utils/createStreamingClient/Signer.ts
@@ -2,7 +2,7 @@ import { SignatureV4 } from '@smithy/signature-v4';
 import {
   HttpRequest as HttpRequest,
   RequestPresigningArguments,
-} from '@smithy/types';
+} from './types';
 
 // override aws sdk default value of 60
 export const REQUEST_EXPIRY = 299;

diff --git a/...liveness/src/components/FaceLivenessDetector/service/utils/createStreamingClient/types.ts b/...liveness/src/components/FaceLivenessDetector/service/utils/createStreamingClient/types.ts
@@ -0,0 +1,8 @@
+// eslint-disable-next-line import/no-extraneous-dependencies -- types can't be added as a dependency
+export {
+  HttpRequest,
+  Provider,
+  RequestHandler,
+  RequestHandlerMetadata,
+  RequestPresigningArguments,
+} from '@smithy/types';
diff --git a/packages/react-native-auth/package.json b/packages/react-native-auth/package.json
@@ -34,7 +34,7 @@
     "qrcode": "1.5.0"
   },
   "peerDependencies": {
-    "aws-amplify": "^6.3.2",
+    "aws-amplify": "^6.6.0",
     "react": "^18",
     "react-native": "^0.70 || ^0.71 || ^0.72"
   },

diff --git a/packages/react-native/package.json b/packages/react-native/package.json
@@ -24,6 +24,7 @@
     "@babel/core": "^7.23.2",
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.23.2",
+    "@react-native-async-storage/async-storage": "*",
     "@testing-library/react-native": "^12.3.0",
     "metro-react-native-babel-preset": "^0.77.0",
     "react-native-safe-area-context": "^4.7.3"
@@ -35,7 +36,8 @@
     "style-dictionary": "3.9.1"
   },
   "peerDependencies": {
-    "aws-amplify": "^6.3.2",
+    "aws-amplify": "^6.6.0",
+    "react": "*",
     "react-native": "^0.70 || ^0.71 || ^0.72 || ^0.73 || ^0.74 || ^0.75",
     "react-native-safe-area-context": "^4.2.5"
   },

diff --git a/packages/react-notifications/package.json b/packages/react-notifications/package.json
@@ -39,13 +39,14 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@aws-amplify/ui": "6.6.0",
-    "@aws-amplify/ui-react": "6.5.0",
-    "@aws-amplify/ui-react-core-notifications": "2.0.24",
+    "@aws-amplify/ui": "6.5.0",
+    "@aws-amplify/ui-react": "6.4.0",
+    "@aws-amplify/ui-react-core": "3.0.24",
+    "@aws-amplify/ui-react-core-notifications": "2.0.23",
     "tinycolor2": "1.4.2"
   },
   "peerDependencies": {
-    "aws-amplify": "^6.3.2",
+    "aws-amplify": "^6.6.0",
     "react": "^16.14.0 || ^17.0 || ^18.0",
     "react-dom": "^16.14.0 || ^17.0 || ^18.0"
   },

diff --git a/packages/react-storage/package.json b/packages/react-storage/package.json
@@ -46,7 +46,8 @@
     "tslib": "^2.5.2"
   },
   "peerDependencies": {
-    "aws-amplify": "^6.3.2",
+    "@aws-amplify/core": "^6.4.0",
+    "aws-amplify": "^6.6.0",
     "react": "^16.14.0 || ^17.0 || ^18.0",
     "react-dom": "^16.14.0 || ^17.0 || ^18.0"
   },

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -66,7 +66,8 @@
     "tslib": "^2.5.2"
   },
   "peerDependencies": {
-    "aws-amplify": "^6.3.2",
+    "@aws-amplify/core": "^6.4.0",
+    "aws-amplify": "^6.6.0",
     "react": "^16.14.0 || ^17.0 || ^18.0",
     "react-dom": "^16.14.0 || ^17.0 || ^18.0"
   },

diff --git a/...rc/primitives/Card/__test__/Card.test.tsx → ...c/primitives/Card/__tests__/Card.test.tsx b/...rc/primitives/Card/__test__/Card.test.tsx → ...c/primitives/Card/__tests__/Card.test.tsx
diff --git a/packages/ui/.eslintrc.js b/packages/ui/.eslintrc.js
@@ -11,7 +11,14 @@ module.exports = {
     sourceType: 'module',
     allowImportExportEverywhere: true,
   },
+  plugins: ['import'],
   rules: {
+    'import/no-extraneous-dependencies': [
+      'error',
+      {
+        packageDir: ['.', '../..'],
+      },
+    ],
     'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
     'no-undef': 'off',

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -37,7 +37,7 @@
     "check:esm": "node --input-type=module --eval 'import \"@aws-amplify/ui\"'",
     "clean": "rimraf dist node_modules",
     "dev": "yarn build --watch",
-    "lint": "yarn typecheck",
+    "lint": "yarn typecheck && eslint src --ext .js,.ts,.tsx",
     "prebuild": "rimraf dist",
     "test": "jest",
     "test:watch": "yarn test --watch",
@@ -49,7 +49,8 @@
     "tslib": "^2.5.2"
   },
   "peerDependencies": {
-    "aws-amplify": "^6.3.2",
+    "@aws-amplify/core": "^6.4.0",
+    "aws-amplify": "^6.6.0",
     "xstate": "^4.33.6"
   },
   "peerDependenciesMeta": {

diff --git a/packages/vue/.eslintrc.cjs b/packages/vue/.eslintrc.cjs
@@ -3,6 +3,7 @@ require('@rushstack/eslint-patch/modern-module-resolution');
 
 module.exports = {
   root: true,
+  plugins: ['import'],
   extends: [
     'plugin:vue/vue3-essential',
     'eslint:recommended',
@@ -19,6 +20,12 @@ module.exports = {
   },
   ignorePatterns: ['dist'],
   rules: {
+    'import/no-extraneous-dependencies': [
+      'error',
+      {
+        packageDir: ['.', '../..'],
+      },
+    ],
     'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
     '@typescript-eslint/ban-ts-comment': 'off',

diff --git a/packages/vue/package.json b/packages/vue/package.json
@@ -65,7 +65,8 @@
     "vite-jest": "^0.1.4"
   },
   "peerDependencies": {
-    "aws-amplify": "^6.3.2",
+    "@aws-amplify/core": "^6.4.0",
+    "aws-amplify": "^6.6.0",
     "vue": "^3.0"
   }
 }