Skip to content

Commit 591f989

Browse files
bobborbobbor
committed
chore: align cross-package version references after rebase
Update internal dependency versions to match local workspace versions after rebasing onto main. Removes stale registry entries from yarn.lock. Also removes leftover server/uploadData.ts from conflict resolution.
1 parent 3f669f4 commit 591f989

19 files changed

Lines changed: 1034 additions & 1150 deletions

File tree

‎packages/adapter-nextjs/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"version": "1.7.3",
55
"description": "The adapter for the supporting of using Amplify APIs in Next.js.",
66
"peerDependencies": {
7-
"aws-amplify": "^6.16.4",
7+
"aws-amplify": "^6.17.0",
88
"next": ">=13.5.0 <17.0.0"
99
},
1010
"dependencies": {

‎packages/analytics/__tests__/testUtils/mockAmplifyContext.ts‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,29 @@ import {
77
setGlobalContext,
88
} from '@aws-amplify/core/internals/utils';
99

10-
export const mockAmplifyCtx: AmplifyContext = {
11-
[AMPLIFY_CONTEXT_BRAND]: true,
12-
resourcesConfig: {},
13-
libraryOptions: {},
14-
fetchAuthSession: jest.fn().mockResolvedValue({
15-
credentials: {
16-
accessKeyId: 'access-key-id',
17-
secretAccessKey: 'secret-access-key',
18-
sessionToken: 'session-token',
19-
},
20-
identityId: 'identity-id',
21-
}),
22-
clearCredentials: jest.fn(),
23-
getTokens: jest.fn(),
24-
};
10+
export const mockAmplifyCtx: AmplifyContext = (() => {
11+
const ctx: AmplifyContext = {
12+
resourcesConfig: {},
13+
libraryOptions: {},
14+
fetchAuthSession: jest.fn().mockResolvedValue({
15+
credentials: {
16+
accessKeyId: 'access-key-id',
17+
secretAccessKey: 'secret-access-key',
18+
sessionToken: 'session-token',
19+
},
20+
identityId: 'identity-id',
21+
}),
22+
clearCredentials: jest.fn(),
23+
getTokens: jest.fn(),
24+
};
25+
26+
Object.defineProperty(ctx, AMPLIFY_CONTEXT_BRAND, {
27+
value: true,
28+
enumerable: false,
29+
});
30+
31+
return ctx;
32+
})();
2533

2634
export function setupGlobalContext() {
2735
setGlobalContext(mockAmplifyCtx);

‎packages/analytics/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
"tslib": "^2.5.0"
102102
},
103103
"peerDependencies": {
104-
"@aws-amplify/core": "^6.16.2"
104+
"@aws-amplify/core": "^6.16.3"
105105
},
106106
"devDependencies": {
107107
"@aws-amplify/core": "6.16.3",

‎packages/api-graphql/package.json‎

Lines changed: 95 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -1,97 +1,97 @@
11
{
2-
"name": "@aws-amplify/api-graphql",
3-
"version": "4.8.7",
4-
"description": "Api-graphql category of aws-amplify",
5-
"main": "./dist/cjs/index.js",
6-
"module": "./dist/esm/index.mjs",
7-
"typings": "./dist/esm/index.d.ts",
8-
"react-native": "./dist/cjs/index.js",
9-
"sideEffects": [
10-
"./dist/cjs/GraphQLAPI.js",
11-
"./dist/esm/GraphQLAPI.mjs"
12-
],
13-
"publishConfig": {
14-
"access": "public"
15-
},
16-
"scripts": {
17-
"test": "npm run lint && jest -w 1 --coverage --logHeapUsage",
18-
"test:watch": "jest -w 1 --watch",
19-
"build-with-test": "npm test && npm build",
20-
"build:umd": "webpack && webpack --config ./webpack.config.dev.js",
21-
"build:esm-cjs": "rollup --forceExit -c rollup.config.mjs",
22-
"build:watch": "npm run build:esm-cjs -- --watch",
23-
"build": "npm run clean && npm run build:esm-cjs && npm run build:umd",
24-
"clean": "npm run clean:size && rimraf dist lib lib-esm",
25-
"clean:size": "rimraf dual-publish-tmp tmp*",
26-
"format": "echo \"Not implemented\"",
27-
"lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage",
28-
"lint:fix": "eslint '**/*.{ts,tsx}' --fix",
29-
"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 70.0"
30-
},
31-
"exports": {
32-
".": {
33-
"react-native": "./dist/cjs/index.js",
34-
"types": "./dist/esm/index.d.ts",
35-
"import": "./dist/esm/index.mjs",
36-
"require": "./dist/cjs/index.js"
37-
},
38-
"./internals": {
39-
"react-native": "./dist/cjs/internals/index.js",
40-
"types": "./dist/esm/internals/index.d.ts",
41-
"import": "./dist/esm/internals/index.mjs",
42-
"require": "./dist/cjs/internals/index.js"
43-
},
44-
"./server": {
45-
"types": "./dist/esm/server/index.d.ts",
46-
"import": "./dist/esm/server/index.mjs",
47-
"require": "./dist/cjs/server/index.js"
48-
},
49-
"./internals/server": {
50-
"types": "./dist/esm/internals/server/index.d.ts",
51-
"import": "./dist/esm/internals/server/index.mjs",
52-
"require": "./dist/cjs/internals/server/index.js"
53-
},
54-
"./package.json": "./package.json"
55-
},
56-
"typesVersions": {
57-
">=4.2": {
58-
"internals": [
59-
"./dist/esm/internals/index.d.ts"
60-
]
61-
}
62-
},
63-
"repository": {
64-
"type": "git",
65-
"url": "https://github.com/aws-amplify/amplify-js.git"
66-
},
67-
"author": "Amazon Web Services",
68-
"license": "Apache-2.0",
69-
"bugs": {
70-
"url": "https://github.com/aws/aws-amplify/issues"
71-
},
72-
"homepage": "https://aws-amplify.github.io/",
73-
"files": [
74-
"dist/cjs",
75-
"dist/esm",
76-
"src",
77-
"internals"
78-
],
79-
"dependencies": {
80-
"@aws-amplify/api-rest": "4.6.4",
81-
"@aws-amplify/core": "6.16.2",
82-
"@aws-amplify/data-schema": "^1.7.0",
83-
"@aws-sdk/types": "^3.973.6",
84-
"graphql": "15.8.0",
85-
"rxjs": "^7.8.1",
86-
"tslib": "^2.5.0",
87-
"uuid": "^11.0.0"
88-
},
89-
"size-limit": [
90-
{
91-
"name": "API (GraphQL client)",
92-
"path": "./dist/esm/index.mjs",
93-
"import": "{ Amplify, GraphQLAPI }",
94-
"limit": "91.7 kB"
95-
}
96-
]
2+
"name": "@aws-amplify/api-graphql",
3+
"version": "4.8.7",
4+
"description": "Api-graphql category of aws-amplify",
5+
"main": "./dist/cjs/index.js",
6+
"module": "./dist/esm/index.mjs",
7+
"typings": "./dist/esm/index.d.ts",
8+
"react-native": "./dist/cjs/index.js",
9+
"sideEffects": [
10+
"./dist/cjs/GraphQLAPI.js",
11+
"./dist/esm/GraphQLAPI.mjs"
12+
],
13+
"publishConfig": {
14+
"access": "public"
15+
},
16+
"scripts": {
17+
"test": "npm run lint && jest -w 1 --coverage --logHeapUsage",
18+
"test:watch": "jest -w 1 --watch",
19+
"build-with-test": "npm test && npm build",
20+
"build:umd": "webpack && webpack --config ./webpack.config.dev.js",
21+
"build:esm-cjs": "rollup --forceExit -c rollup.config.mjs",
22+
"build:watch": "npm run build:esm-cjs -- --watch",
23+
"build": "npm run clean && npm run build:esm-cjs && npm run build:umd",
24+
"clean": "npm run clean:size && rimraf dist lib lib-esm",
25+
"clean:size": "rimraf dual-publish-tmp tmp*",
26+
"format": "echo \"Not implemented\"",
27+
"lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage",
28+
"lint:fix": "eslint '**/*.{ts,tsx}' --fix",
29+
"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 70.0"
30+
},
31+
"exports": {
32+
".": {
33+
"react-native": "./dist/cjs/index.js",
34+
"types": "./dist/esm/index.d.ts",
35+
"import": "./dist/esm/index.mjs",
36+
"require": "./dist/cjs/index.js"
37+
},
38+
"./internals": {
39+
"react-native": "./dist/cjs/internals/index.js",
40+
"types": "./dist/esm/internals/index.d.ts",
41+
"import": "./dist/esm/internals/index.mjs",
42+
"require": "./dist/cjs/internals/index.js"
43+
},
44+
"./server": {
45+
"types": "./dist/esm/server/index.d.ts",
46+
"import": "./dist/esm/server/index.mjs",
47+
"require": "./dist/cjs/server/index.js"
48+
},
49+
"./internals/server": {
50+
"types": "./dist/esm/internals/server/index.d.ts",
51+
"import": "./dist/esm/internals/server/index.mjs",
52+
"require": "./dist/cjs/internals/server/index.js"
53+
},
54+
"./package.json": "./package.json"
55+
},
56+
"typesVersions": {
57+
">=4.2": {
58+
"internals": [
59+
"./dist/esm/internals/index.d.ts"
60+
]
61+
}
62+
},
63+
"repository": {
64+
"type": "git",
65+
"url": "https://github.com/aws-amplify/amplify-js.git"
66+
},
67+
"author": "Amazon Web Services",
68+
"license": "Apache-2.0",
69+
"bugs": {
70+
"url": "https://github.com/aws/aws-amplify/issues"
71+
},
72+
"homepage": "https://aws-amplify.github.io/",
73+
"files": [
74+
"dist/cjs",
75+
"dist/esm",
76+
"src",
77+
"internals"
78+
],
79+
"dependencies": {
80+
"@aws-amplify/api-rest": "4.6.4",
81+
"@aws-amplify/core": "6.16.3",
82+
"@aws-amplify/data-schema": "^1.7.0",
83+
"@aws-sdk/types": "^3.973.6",
84+
"graphql": "15.8.0",
85+
"rxjs": "^7.8.1",
86+
"tslib": "^2.5.0",
87+
"uuid": "^11.0.0"
88+
},
89+
"size-limit": [
90+
{
91+
"name": "API (GraphQL client)",
92+
"path": "./dist/esm/index.mjs",
93+
"import": "{ Amplify, GraphQLAPI }",
94+
"limit": "91.7 kB"
95+
}
96+
]
9797
}

0 commit comments

Comments
 (0)