diff --git a/packages/adapter-nextjs/package.json b/packages/adapter-nextjs/package.json index bc0fe7d3c60..6453a8f92fa 100644 --- a/packages/adapter-nextjs/package.json +++ b/packages/adapter-nextjs/package.json @@ -61,7 +61,7 @@ "build:esm-cjs": "rollup --forceExit -c rollup.config.mjs", "build:watch": "npm run build:esm-cjs -- --watch", "clean": "npm run clean:size && rimraf dist", - "clean:size": "rimraf dual-publish-tmp tmp*", + "clean:size": "rimraf --glob dual-publish-tmp tmp*", "format": "echo \"Not implemented\"", "lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage", "lint:fix": "eslint '**/*.{ts,tsx}' --fix", diff --git a/packages/analytics/package.json b/packages/analytics/package.json index 7d5de04ee81..623fd6dada1 100644 --- a/packages/analytics/package.json +++ b/packages/analytics/package.json @@ -18,7 +18,7 @@ "build:watch": "npm run build:esm-cjs -- --watch", "build": "npm run clean && npm run build:esm-cjs && npm run build:umd", "clean": "npm run clean:size && rimraf dist lib lib-esm", - "clean:size": "rimraf dual-publish-tmp tmp*", + "clean:size": "rimraf --glob dual-publish-tmp tmp*", "format": "echo \"Not implemented\"", "lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage", "lint:fix": "eslint '**/*.{ts,tsx}' --fix", diff --git a/packages/api-graphql/package.json b/packages/api-graphql/package.json index c396b91a253..c8208fe5900 100644 --- a/packages/api-graphql/package.json +++ b/packages/api-graphql/package.json @@ -22,7 +22,7 @@ "build:watch": "npm run build:esm-cjs -- --watch", "build": "npm run clean && npm run build:esm-cjs && npm run build:umd", "clean": "npm run clean:size && rimraf dist lib lib-esm", - "clean:size": "rimraf dual-publish-tmp tmp*", + "clean:size": "rimraf --glob dual-publish-tmp tmp*", "format": "echo \"Not implemented\"", "lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage", "lint:fix": "eslint '**/*.{ts,tsx}' --fix", diff --git a/packages/api-rest/package.json b/packages/api-rest/package.json index 2740d80c7db..196a990ca7e 100644 --- a/packages/api-rest/package.json +++ b/packages/api-rest/package.json @@ -19,7 +19,7 @@ "build:watch": "npm run build:esm-cjs -- --watch", "build": "npm run clean && npm run build:esm-cjs && npm run build:umd", "clean": "npm run clean:size && rimraf dist lib lib-esm", - "clean:size": "rimraf dual-publish-tmp tmp*", + "clean:size": "rimraf --glob dual-publish-tmp tmp*", "format": "echo \"Not implemented\"", "lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage", "lint:fix": "eslint '**/*.{ts,tsx}' --fix", diff --git a/packages/api/package.json b/packages/api/package.json index 107df88f461..724cf9cf2b6 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -21,7 +21,7 @@ "build:watch": "npm run build:esm-cjs -- --watch", "build": "npm run clean && npm run build:esm-cjs && npm run build:umd", "clean": "npm run clean:size && rimraf dist lib lib-esm", - "clean:size": "rimraf dual-publish-tmp tmp*", + "clean:size": "rimraf --glob dual-publish-tmp tmp*", "format": "echo \"Not implemented\"", "lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage", "lint:fix": "eslint '**/*.{ts,tsx}' --fix", diff --git a/packages/auth/package.json b/packages/auth/package.json index 00bf5a651a9..acdf815b74e 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -23,7 +23,7 @@ "build:watch": "npm run build:esm-cjs -- --watch", "build": "npm run clean && npm run build:esm-cjs && npm run build:umd", "clean": "npm run clean:size && rimraf lib-esm lib dist", - "clean:size": "rimraf dual-publish-tmp tmp*", + "clean:size": "rimraf --glob dual-publish-tmp tmp*", "format": "echo \"Not implemented\"", "lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage", "lint:fix": "eslint '**/*.{ts,tsx}' --fix", diff --git a/packages/aws-amplify/__tests__/initSingleton.test.ts b/packages/aws-amplify/__tests__/initSingleton.test.ts index 5d021b36743..0e8c439b673 100644 --- a/packages/aws-amplify/__tests__/initSingleton.test.ts +++ b/packages/aws-amplify/__tests__/initSingleton.test.ts @@ -324,6 +324,7 @@ describe('initSingleton (DefaultAmplify)', () => { it('should preserve current auth providers (default or otherwise) and configure provider with a new CookieStorage instance', () => { const libraryOptions = { ssr: true }; + const authLibraryOptions = AmplifySingleton.libraryOptions.Auth; Amplify.configure(mockResourceConfig, libraryOptions); expect( @@ -336,7 +337,7 @@ describe('initSingleton (DefaultAmplify)', () => { expect(mockAmplifySingletonConfigure).toHaveBeenCalledWith( mockResourceConfig, { - Auth: AmplifySingleton.libraryOptions.Auth, + Auth: authLibraryOptions, ...libraryOptions, }, ); @@ -344,6 +345,7 @@ describe('initSingleton (DefaultAmplify)', () => { it('should preserve current auth providers (default or otherwise) and configure provider with defaultStorage', () => { const libraryOptions = { ssr: false }; + const authLibraryOptions = AmplifySingleton.libraryOptions.Auth; Amplify.configure(mockResourceConfig, libraryOptions); expect( @@ -355,7 +357,7 @@ describe('initSingleton (DefaultAmplify)', () => { expect(mockAmplifySingletonConfigure).toHaveBeenCalledWith( mockResourceConfig, { - Auth: AmplifySingleton.libraryOptions.Auth, + Auth: authLibraryOptions, ...libraryOptions, }, ); @@ -365,6 +367,7 @@ describe('initSingleton (DefaultAmplify)', () => { const libraryOptions = { Storage: { S3: { isObjectLockEnabled: true } }, }; + const authLibraryOptions = AmplifySingleton.libraryOptions.Auth; Amplify.configure(mockResourceConfig, libraryOptions); expect( @@ -376,12 +379,37 @@ describe('initSingleton (DefaultAmplify)', () => { expect(mockAmplifySingletonConfigure).toHaveBeenCalledWith( mockResourceConfig, { - Auth: AmplifySingleton.libraryOptions.Auth, + Auth: authLibraryOptions, ...libraryOptions, }, ); }); + it('should preserve non-Auth library options when reconfiguring with partial libraryOptions', () => { + const storageLibraryOptions = { + S3: { defaultAccessLevel: 'private' as const }, + }; + AmplifySingleton.libraryOptions = { + Auth: { + tokenProvider: cognitoUserPoolsTokenProvider, + credentialsProvider: cognitoCredentialsProvider, + }, + Storage: storageLibraryOptions, + }; + const authLibraryOptions = AmplifySingleton.libraryOptions.Auth; + + Amplify.configure(mockResourceConfig, { ssr: true }); + + expect(mockAmplifySingletonConfigure).toHaveBeenCalledWith( + mockResourceConfig, + { + Auth: authLibraryOptions, + Storage: storageLibraryOptions, + ssr: true, + }, + ); + }); + it('should just configure without touching libraryOptions', () => { Amplify.configure(mockResourceConfig); diff --git a/packages/aws-amplify/src/initSingleton.ts b/packages/aws-amplify/src/initSingleton.ts index 6168cc25b51..596a8c7859a 100644 --- a/packages/aws-amplify/src/initSingleton.ts +++ b/packages/aws-amplify/src/initSingleton.ts @@ -98,8 +98,9 @@ export const DefaultAmplify = { } Amplify.configure(resolvedResourceConfig, { - Auth: authLibraryOptions, + ...Amplify.libraryOptions, ...libraryOptions, + Auth: authLibraryOptions, }); return; diff --git a/packages/core/package.json b/packages/core/package.json index 0d3c751da09..617afa4ccc3 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -25,7 +25,7 @@ "build": "npm run clean && npm run generate-version && npm run build:esm-cjs && npm run build:umd", "generate-version": "genversion src/Platform/version.ts --es6 --semi --source ../aws-amplify", "clean": "npm run clean:size && rimraf dist lib lib-esm", - "clean:size": "rimraf dual-publish-tmp tmp*", + "clean:size": "rimraf --glob dual-publish-tmp tmp*", "format": "echo \"Not implemented\"", "lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage", "lint:fix": "eslint '**/*.{ts,tsx}' --fix", diff --git a/packages/datastore/package.json b/packages/datastore/package.json index 0a4c6cce328..2cf8e3e532b 100644 --- a/packages/datastore/package.json +++ b/packages/datastore/package.json @@ -22,7 +22,7 @@ "build:watch": "npm run build:esm-cjs -- --watch", "build": "npm run clean && npm run build:esm-cjs && npm run build:umd", "clean": "npm run clean:size && rimraf dist lib lib-esm", - "clean:size": "rimraf dual-publish-tmp tmp*", + "clean:size": "rimraf --glob dual-publish-tmp tmp*", "format": "echo \"Not implemented\" && npm run ts-coverage", "lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage", "lint:fix": "eslint '**/*.{ts,tsx}' --fix", diff --git a/packages/geo/package.json b/packages/geo/package.json index 3611de23614..32cf1b59fec 100644 --- a/packages/geo/package.json +++ b/packages/geo/package.json @@ -22,7 +22,7 @@ "build:watch": "npm run build:esm-cjs -- --watch", "build": "npm run clean && npm run build:esm-cjs && npm run build:umd", "clean": "npm run clean:size && rimraf dist lib lib-esm", - "clean:size": "rimraf dual-publish-tmp tmp*", + "clean:size": "rimraf --glob dual-publish-tmp tmp*", "format": "echo \"Not implemented\"", "lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage", "lint:fix": "eslint '**/*.{ts,tsx}' --fix", diff --git a/packages/interactions/package.json b/packages/interactions/package.json index 834caa06552..6fe36c80989 100644 --- a/packages/interactions/package.json +++ b/packages/interactions/package.json @@ -19,7 +19,7 @@ "build:watch": "npm run build:esm-cjs -- --watch", "build": "npm run clean && npm run build:esm-cjs && npm run build:umd", "clean": "npm run clean:size && rimraf dist lib lib-esm", - "clean:size": "rimraf dual-publish-tmp tmp*", + "clean:size": "rimraf --glob dual-publish-tmp tmp*", "format": "echo \"Not implemented\"", "lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage", "lint:fix": "eslint '**/*.{ts,tsx}' --fix", diff --git a/packages/notifications/package.json b/packages/notifications/package.json index 49325533bc5..f93bd78056d 100644 --- a/packages/notifications/package.json +++ b/packages/notifications/package.json @@ -19,7 +19,7 @@ "build:watch": "npm run build:esm-cjs -- --watch", "build": "npm run clean && npm run build:esm-cjs && npm run build:umd", "clean": "npm run clean:size && rimraf dist lib lib-esm", - "clean:size": "rimraf dual-publish-tmp tmp*", + "clean:size": "rimraf --glob dual-publish-tmp tmp*", "format": "echo \"Not implemented\"", "lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage", "lint:fix": "eslint '**/*.{ts,tsx}' --fix", diff --git a/packages/predictions/package.json b/packages/predictions/package.json index 1967b01032c..4d2a714c754 100644 --- a/packages/predictions/package.json +++ b/packages/predictions/package.json @@ -19,7 +19,7 @@ "build:watch": "npm run build:esm-cjs -- --watch", "build": "npm run clean && npm run build:esm-cjs && npm run build:umd", "clean": "npm run clean:size && rimraf dist lib lib-esm", - "clean:size": "rimraf dual-publish-tmp tmp*", + "clean:size": "rimraf --glob dual-publish-tmp tmp*", "format": "echo \"Not implemented\"", "lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage", "lint:fix": "eslint '**/*.{ts,tsx}' --fix", diff --git a/packages/pubsub/package.json b/packages/pubsub/package.json index 051a853639c..b88a3d4f9c5 100644 --- a/packages/pubsub/package.json +++ b/packages/pubsub/package.json @@ -19,7 +19,7 @@ "build:watch": "mkdirp dist/esm/vendor && mkdirp dist/cjs/vendor && cp -R src/vendor dist/cjs/vendor && rollup --forceExit -c rollup.config.mjs --watch", "build": "npm run clean && npm run build:esm-cjs && npm run build:umd", "clean": "npm run clean:size && rimraf dist lib lib-esm", - "clean:size": "rimraf dual-publish-tmp tmp*", + "clean:size": "rimraf --glob dual-publish-tmp tmp*", "format": "echo \"Not implemented\"", "lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage", "lint:fix": "eslint '**/*.{ts,tsx}' --fix", diff --git a/packages/storage/package.json b/packages/storage/package.json index a4a2ba9fdf7..b11a08add3f 100644 --- a/packages/storage/package.json +++ b/packages/storage/package.json @@ -29,7 +29,7 @@ "build:watch": "npm run build:esm-cjs -- --watch", "build": "npm run clean && npm run build:esm-cjs && npm run build:umd", "clean": "npm run clean:size && rimraf lib-esm lib dist", - "clean:size": "rimraf dual-publish-tmp tmp*", + "clean:size": "rimraf --glob dual-publish-tmp tmp*", "format": "echo \"Not implemented\"", "lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage", "lint:fix": "eslint '**/*.{ts,tsx}' --fix",