Merge branch 'central-logger' of github.com:aws-amplify/amplify-js in…

…to console-logger-poc
ashwinkumar6 · Jan 2, 2024 · 263684b · 263684b
2 parents 0967c1b + 07be7d2
commit 263684b
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 2 deletions.
diff --git a/.github/dependency-review/dependecy-review-config.yml b/.github/dependency-review/dependecy-review-config.yml
@@ -1,5 +1,6 @@
 allow-licenses:
   - 'Apache-2.0'
+  - '0BSD'
   - 'BSL-1.0'
   - 'BSD-1-Clause'
   - 'BSD-2-Clause-FreeBSD'

diff --git a/.github/integ-config/integ-all.yml b/.github/integ-config/integ-all.yml
@@ -734,6 +734,15 @@ tests:
     spec: multi-part-copy
     browser: *minimal_browser_list
 
+  # INAPPMESSAGING
+  - test_name: integ_in_app_messaging
+    desc: 'React InApp Messaging'
+    framework: react
+    category: in-app-messaging
+    sample_name: [in-app-messaging-app]
+    spec: in-app-messaging
+    browser: *minimal_browser_list
+
   # - test_name: integ_duplicate_packages
   #   desc: 'Duplicate Package Errors'
   #   framework: react

diff --git a/packages/api/__tests__/API.test.ts b/packages/api/__tests__/API.test.ts
@@ -1,6 +1,6 @@
 import { ResourcesConfig } from 'aws-amplify';
 import { InternalGraphQLAPIClass } from '@aws-amplify/api-graphql/internals';
-import { generateClient } from '@aws-amplify/api';
+import { generateClient, CONNECTION_STATE_CHANGE } from '@aws-amplify/api';
 import { AmplifyClassV6 } from '@aws-amplify/core';
 // import { runWithAmplifyServerContext } from 'aws-amplify/internals/adapter-core';
 
@@ -38,6 +38,9 @@ describe('API generateClient', () => {
 		);
 	});
 
+	test('CONNECTION_STATE_CHANGE importable as a value, not a type', async () => {
+		expect(CONNECTION_STATE_CHANGE).toBe('ConnectionStateChange');
+	})
 	// test('server-side client.graphql', async () => {
 	// 	const config: ResourcesConfig = {
 	// 		API: {

diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts
@@ -9,9 +9,10 @@ export { GraphQLAuthError, ConnectionState } from '@aws-amplify/api-graphql';
 export type {
 	GraphQLResult,
 	GraphQLReturnType,
-	CONNECTION_STATE_CHANGE,
 } from '@aws-amplify/api-graphql';
 
+export { CONNECTION_STATE_CHANGE } from '@aws-amplify/api-graphql';
+
 import type { V6Client } from '@aws-amplify/api-graphql';
 
 // explicitly defaulting to `never` here resolves

diff --git a/packages/aws-amplify/__tests__/exports.test.ts b/packages/aws-amplify/__tests__/exports.test.ts
@@ -51,6 +51,7 @@ describe('aws-amplify Exports', () => {
 		it('should only export expected symbols from the top level', () => {
 			expect(Object.keys(apiTopLevelExports).sort()).toEqual(
 				[
+					'CONNECTION_STATE_CHANGE',
 					'ConnectionState',
 					'GraphQLAuthError',
 					'del',