chore: refactor exports

jjarvisp · jjarvisp · commit 0d354c27ba24 · 2025-05-21T16:40:39.000-07:00
diff --git a/packages/auth/__tests__/client/utils/passkey/errors/handlePasskeyAuthenticationError.native.test.ts b/packages/auth/__tests__/client/utils/passkey/errors/handlePasskeyAuthenticationError.native.test.ts
@@ -1,4 +1,4 @@
-import { getIsNativeError } from '@aws-amplify/react-native/internals/utils';
+import { getIsNativeError } from '@aws-amplify/react-native';
 
 import {
 	PasskeyError,
@@ -12,7 +12,7 @@ import { MockNativeError } from '../../../../mockData';
 const mockHandlePasskeyError = jest.mocked(handlePasskeyError);
 jest.mock('../../../../../src/client/utils/passkey/errors/handlePasskeyError');
 
-jest.mock('@aws-amplify/react-native/internals/utils', () => ({
+jest.mock('@aws-amplify/react-native', () => ({
 	getIsNativeError: jest.fn(() => true),
 }));
 
diff --git a/packages/auth/__tests__/client/utils/passkey/errors/handlePasskeyError.native.test.ts b/packages/auth/__tests__/client/utils/passkey/errors/handlePasskeyError.native.test.ts
@@ -8,7 +8,7 @@ import { handlePasskeyError } from '../../../../../src/client/utils/passkey/erro
 import { passkeyErrorMap } from '../../../../../src/client/utils/passkey/errors/passkeyError';
 import { MockNativeError } from '../../../../mockData';
 
-jest.mock('@aws-amplify/react-native/internals/utils', () => ({
+jest.mock('@aws-amplify/react-native', () => ({
 	getIsNativeError: jest.fn(() => true),
 }));
 
diff --git a/packages/auth/__tests__/client/utils/passkey/errors/handlePasskeyRegistrationError.native.test.ts b/packages/auth/__tests__/client/utils/passkey/errors/handlePasskeyRegistrationError.native.test.ts
@@ -1,4 +1,4 @@
-import { getIsNativeError } from '@aws-amplify/react-native/internals/utils';
+import { getIsNativeError } from '@aws-amplify/react-native';
 
 import {
 	PasskeyError,
@@ -12,7 +12,7 @@ import { MockNativeError } from '../../../../mockData';
 const mockHandlePasskeyError = jest.mocked(handlePasskeyError);
 jest.mock('../../../../../src/client/utils/passkey/errors/handlePasskeyError');
 
-jest.mock('@aws-amplify/react-native/internals/utils', () => ({
+jest.mock('@aws-amplify/react-native', () => ({
 	getIsNativeError: jest.fn(() => true),
 }));
 
diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -96,7 +96,13 @@
 		"tslib": "^2.5.0"
 	},
 	"peerDependencies": {
-		"@aws-amplify/core": "^6.1.0"
+		"@aws-amplify/core": "^6.1.0",
+		"@aws-amplify/react-native": "^1.1.10"
+	},
+	"peerDependenciesMeta": {
+		"@aws-amplify/react-native": {
+			"optional": true
+		}
 	},
 	"devDependencies": {
 		"@aws-amplify/core": "6.11.4",
diff --git a/packages/auth/src/client/utils/passkey/errors/handlePasskeyAuthenticationError.native.ts b/packages/auth/src/client/utils/passkey/errors/handlePasskeyAuthenticationError.native.ts
@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { getIsNativeError } from '@aws-amplify/react-native/internals/utils';
+import { getIsNativeError } from '@aws-amplify/react-native';
 
 import { handlePasskeyError } from './handlePasskeyError';
 import {
diff --git a/packages/auth/src/client/utils/passkey/errors/handlePasskeyError.native.ts b/packages/auth/src/client/utils/passkey/errors/handlePasskeyError.native.ts
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { AmplifyErrorCode } from '@aws-amplify/core/internals/utils';
-import { getIsNativeError } from '@aws-amplify/react-native/internals/utils';
+import { getIsNativeError } from '@aws-amplify/react-native';
 
 import {
 	PasskeyError,
diff --git a/packages/auth/src/client/utils/passkey/errors/handlePasskeyRegistrationError.native.ts b/packages/auth/src/client/utils/passkey/errors/handlePasskeyRegistrationError.native.ts
@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { getIsNativeError } from '@aws-amplify/react-native/internals/utils';
+import { getIsNativeError } from '@aws-amplify/react-native';
 
 import { handlePasskeyError } from './handlePasskeyError';
 import {
diff --git a/packages/react-native/README.md b/packages/react-native/README.md
@@ -0,0 +1,3 @@
+> INTERNAL USE ONLY
+
+This package contains AWS Amplify React Native utilities and is intended for internal use only. Please ensure this package is installed alongside [aws-amplify](https://www.npmjs.com/package/aws-amplify). We do not advise using any exports from this package directly.
diff --git a/packages/react-native/internals/utils/package.json b/packages/react-native/internals/utils/package.json
diff --git a/packages/react-native/package.json b/packages/react-native/package.json
@@ -10,21 +10,6 @@
 	"publishConfig": {
 		"access": "public"
 	},
-	"exports": {
-		".": {
-			"react-native": "./dist/cjs/index.js",
-			"types": "./dist/esm/index.d.ts",
-			"import": "./dist/esm/index.mjs",
-			"require": "./dist/cjs/index.js"
-		},
-		"./internals/utils": {
-			"react-native": "./dist/cjs/utils/index.js",
-			"types": "./dist/esm/utils/index.d.ts",
-			"import": "./dist/esm/utils/index.mjs",
-			"require": "./dist/cjs/utils/index.js"
-		},
-		"./package.json": "./package.json"
-	},
 	"scripts": {
 		"prepare:ios": "cd example && npx pod-install",
 		"prepare:android": "echo 'no-op'",
@@ -48,7 +33,13 @@
 	},
 	"peerDependencies": {
 		"react-native": ">=0.70",
-		"react-native-get-random-values": ">=1.8.0"
+		"react-native-get-random-values": ">=1.8.0",
+		"@aws-amplify/rtn-passkeys": "^1.0.0"
+	},
+	"peerDependenciesMeta": {
+		"@aws-amplify/rtn-passkeys": {
+			"optional": true
+		}
 	},
 	"devDependencies": {
 		"@aws-amplify/rtn-passkeys": "*",
diff --git a/packages/react-native/src/apis/getIsNativeError.ts b/packages/react-native/src/apis/getIsNativeError.ts
@@ -0,0 +1,18 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+interface NativeError extends Error {
+	code: string;
+	domain?: string;
+	userInfo?: Record<string, unknown>;
+	nativeStackIOS?: never[];
+	nativeStackAndroid?: Record<string, unknown>[];
+}
+
+export const getIsNativeError = (err: unknown): err is NativeError => {
+	return (
+		err instanceof Error &&
+		'code' in err &&
+		('nativeStackIOS' in err || 'nativeStackAndroid' in err)
+	);
+};
diff --git a/packages/react-native/src/apis/index.ts b/packages/react-native/src/apis/index.ts
@@ -5,3 +5,4 @@ export { computeModPow } from './computeModPow';
 export { computeS } from './computeS';
 export { getOperatingSystem } from './getOperatingSystem';
 export { getDeviceName } from './getDeviceName';
+export { getIsNativeError } from './getIsNativeError';
diff --git a/packages/react-native/src/index.ts b/packages/react-native/src/index.ts
@@ -6,6 +6,7 @@ export {
 	computeS,
 	getOperatingSystem,
 	getDeviceName,
+	getIsNativeError,
 } from './apis';
 export {
 	loadAmplifyRtnPasskeys,
diff --git a/packages/rtn-passkeys/README.md b/packages/rtn-passkeys/README.md
@@ -0,0 +1,3 @@
+> INTERNAL USE ONLY
+
+This package contains AWS Amplify React Native utilities and is intended for internal use only. Please ensure this package is installed alongside [aws-amplify](https://www.npmjs.com/package/aws-amplify) and [@aws-amplify/react-native](https://www.npmjs.com/package/@aws-amplify/react-native). We do not advise using any exports from this package directly.
diff --git a/packages/rtn-passkeys/package.json b/packages/rtn-passkeys/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/rtn-passkeys",
-	"version": "0.1.0",
+	"version": "1.0.0",
 	"description": "React Native module for aws-amplify webauthn support",
 	"source": "./src/index.ts",
 	"main": "./dist/cjs/index.js",

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+> INTERNAL USE ONLY`
	`2`	`+`
	`3`	`+This package contains AWS Amplify React Native utilities and is intended for internal use only. Please ensure this package is installed alongside [aws-amplify](https://www.npmjs.com/package/aws-amplify). We do not advise using any exports from this package directly.`