Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/adapter-nextjs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/analytics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/api-graphql/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/api-rest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/auth/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
34 changes: 31 additions & 3 deletions packages/aws-amplify/__tests__/initSingleton.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -336,14 +337,15 @@ describe('initSingleton (DefaultAmplify)', () => {
expect(mockAmplifySingletonConfigure).toHaveBeenCalledWith(
mockResourceConfig,
{
Auth: AmplifySingleton.libraryOptions.Auth,
Auth: authLibraryOptions,
...libraryOptions,
},
);
});

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(
Expand All @@ -355,7 +357,7 @@ describe('initSingleton (DefaultAmplify)', () => {
expect(mockAmplifySingletonConfigure).toHaveBeenCalledWith(
mockResourceConfig,
{
Auth: AmplifySingleton.libraryOptions.Auth,
Auth: authLibraryOptions,
...libraryOptions,
},
);
Expand All @@ -365,6 +367,7 @@ describe('initSingleton (DefaultAmplify)', () => {
const libraryOptions = {
Storage: { S3: { isObjectLockEnabled: true } },
};
const authLibraryOptions = AmplifySingleton.libraryOptions.Auth;
Amplify.configure(mockResourceConfig, libraryOptions);

expect(
Expand All @@ -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);

Expand Down
3 changes: 2 additions & 1 deletion packages/aws-amplify/src/initSingleton.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,9 @@ export const DefaultAmplify = {
}

Amplify.configure(resolvedResourceConfig, {
Auth: authLibraryOptions,
...Amplify.libraryOptions,
...libraryOptions,
Auth: authLibraryOptions,
});

return;
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/datastore/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/geo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/interactions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/notifications/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/predictions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/pubsub/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/storage/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down