Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump data dependency version #12834

Merged
merged 4 commits into from
Jun 20, 2023
Merged

chore: bump data dependency version #12834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
353cc73
chore: bump data dependency version
AaronZyLee Jun 20, 2023
1667d39
fix: feature flag in mock package
AaronZyLee Jun 20, 2023
d490008
fix mock test
AaronZyLee Jun 20, 2023
f1b7c29
fix unit test
AaronZyLee Jun 20, 2023
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/amplify-category-function/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"folder-hash": "^4.0.2",
"fs-extra": "^8.1.0",
"globby": "^11.0.3",
"graphql-transformer-core": "^8.1.2",
"graphql-transformer-core": "^8.1.3",
"inquirer": "^7.3.3",
"inquirer-datepicker": "^2.0.0",
"jstreemap": "^1.28.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-cli-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"dependencies": {
"@aws-amplify/amplify-cli-logger": "1.3.3",
"@aws-amplify/amplify-prompts": "2.8.0",
"@aws-amplify/graphql-transformer-interfaces": "^2.2.1",
"@aws-amplify/graphql-transformer-interfaces": "^2.2.2",
"@yarnpkg/lockfile": "^1.1.0",
"ajv": "^6.12.6",
"aws-cdk-lib": "~2.68.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/amplify-cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"dependencies": {
"@aws-amplify/amplify-app": "5.0.9",
"@aws-amplify/amplify-category-analytics": "5.0.11",
"@aws-amplify/amplify-category-api": "^5.4.1",
"@aws-amplify/amplify-category-api": "^5.4.2",
"@aws-amplify/amplify-category-auth": "3.3.0",
"@aws-amplify/amplify-category-custom": "3.0.9",
"@aws-amplify/amplify-category-function": "5.3.4",
Expand Down Expand Up @@ -66,7 +66,7 @@
"@aws-amplify/amplify-util-mock": "5.3.1",
"@aws-amplify/amplify-util-uibuilder": "1.8.4",
"@aws-cdk/cloudformation-diff": "~2.68.0",
"amplify-codegen": "^4.1.1",
"amplify-codegen": "^4.1.2",
"amplify-dotnet-function-runtime-provider": "2.0.4",
"amplify-go-function-runtime-provider": "2.3.22",
"amplify-java-function-runtime-provider": "2.3.22",
Expand All @@ -87,7 +87,7 @@
"fs-extra": "^8.1.0",
"glob": "^7.2.0",
"graphql": "^15.5.0",
"graphql-transformer-core": "^8.1.2",
"graphql-transformer-core": "^8.1.3",
"gunzip-maybe": "^1.4.2",
"hidefile": "^3.0.0",
"ini": "^1.3.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-container-hosting/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"extract-api": "ts-node ../../scripts/extract-api.ts"
},
"dependencies": {
"@aws-amplify/amplify-category-api": "^5.4.1",
"@aws-amplify/amplify-category-api": "^5.4.2",
"@aws-amplify/amplify-cli-core": "4.1.0",
"@aws-amplify/amplify-environment-parameters": "1.6.4",
"fs-extra": "^8.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-dotnet-function-template-provider/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"dependencies": {
"@aws-amplify/amplify-cli-core": "4.1.0",
"@aws-amplify/amplify-function-plugin-interface": "1.10.3",
"graphql-transformer-core": "^8.1.2"
"graphql-transformer-core": "^8.1.3"
},
"devDependencies": {
"@types/inquirer": "^6.5.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-e2e-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"dotenv": "^8.2.0",
"execa": "^5.1.1",
"fs-extra": "^8.1.0",
"graphql-transformer-core": "^8.1.2",
"graphql-transformer-core": "^8.1.3",
"ini": "^1.3.5",
"jest-circus": "^27.0.0",
"jest-environment-node": "^26.6.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/amplify-e2e-tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"@aws-amplify/amplify-cli-core": "4.1.0",
"@aws-amplify/amplify-e2e-core": "5.0.4",
"@aws-amplify/amplify-opensearch-simulator": "1.4.4",
"@aws-amplify/graphql-transformer-core": "^1.3.2",
"@aws-amplify/graphql-transformer-core": "^1.3.3",
"@aws-sdk/client-appsync": "^3.303.0",
"@aws-sdk/client-dynamodb": "^3.303.0",
"@aws-sdk/client-ssm": "^3.303.0",
Expand All @@ -50,7 +50,7 @@
"fs-extra": "^8.1.0",
"glob": "^8.0.3",
"graphql-tag": "^2.10.1",
"graphql-transformer-core": "^8.1.2",
"graphql-transformer-core": "^8.1.3",
"isomorphic-fetch": "^3.0.0",
"lodash": "^4.17.21",
"node-fetch": "^2.6.7",
Expand Down
44 changes: 22 additions & 22 deletions packages/amplify-graphql-migration-tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,30 +44,30 @@
},
"devDependencies": {
"@aws-amplify/amplify-prompts": "2.8.0",
"@aws-amplify/graphql-auth-transformer": "^2.1.6",
"@aws-amplify/graphql-default-value-transformer": "^1.1.6",
"@aws-amplify/graphql-function-transformer": "^1.2.4",
"@aws-amplify/graphql-http-transformer": "^1.2.4",
"@aws-amplify/graphql-index-transformer": "^1.2.2",
"@aws-amplify/graphql-model-transformer": "^1.3.2",
"@aws-amplify/graphql-predictions-transformer": "^1.2.4",
"@aws-amplify/graphql-relational-transformer": "^1.2.2",
"@aws-amplify/graphql-searchable-transformer": "^1.2.4",
"@aws-amplify/graphql-transformer-core": "^1.3.2",
"@aws-amplify/graphql-transformer-interfaces": "2.2.1",
"@aws-amplify/graphql-transformer-migrator": "^2.1.6",
"@aws-amplify/graphql-auth-transformer": "^2.1.7",
"@aws-amplify/graphql-default-value-transformer": "^1.1.7",
"@aws-amplify/graphql-function-transformer": "^1.2.5",
"@aws-amplify/graphql-http-transformer": "^1.2.5",
"@aws-amplify/graphql-index-transformer": "^1.2.3",
"@aws-amplify/graphql-model-transformer": "^1.3.3",
"@aws-amplify/graphql-predictions-transformer": "^1.2.5",
"@aws-amplify/graphql-relational-transformer": "^1.2.3",
"@aws-amplify/graphql-searchable-transformer": "^1.2.5",
"@aws-amplify/graphql-transformer-core": "^1.3.3",
"@aws-amplify/graphql-transformer-interfaces": "2.2.2",
"@aws-amplify/graphql-transformer-migrator": "^2.1.7",
"@aws-cdk/cloudformation-diff": "~2.68.0",
"fs-extra": "^8.1.0",
"graphql-auth-transformer": "^7.2.56",
"graphql-connection-transformer": "^5.2.55",
"graphql-dynamodb-transformer": "^7.2.55",
"graphql-elasticsearch-transformer": "^5.2.56",
"graphql-function-transformer": "^3.3.46",
"graphql-http-transformer": "^5.2.55",
"graphql-key-transformer": "^3.2.55",
"graphql-predictions-transformer": "^3.2.55",
"graphql-transformer-core": "^8.1.2",
"graphql-versioned-transformer": "^5.2.55"
"graphql-auth-transformer": "^7.2.57",
"graphql-connection-transformer": "^5.2.56",
"graphql-dynamodb-transformer": "^7.2.56",
"graphql-elasticsearch-transformer": "^5.2.57",
"graphql-function-transformer": "^3.3.47",
"graphql-http-transformer": "^5.2.56",
"graphql-key-transformer": "^3.2.56",
"graphql-predictions-transformer": "^3.2.56",
"graphql-transformer-core": "^8.1.3",
"graphql-versioned-transformer": "^5.2.56"
},
"berry": {
"plugins": [
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-migration-tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"aws-cdk-lib": "~2.68.0",
"constructs": "^10.0.5",
"fs-extra": "^8.1.0",
"graphql-transformer-core": "^8.1.2",
"graphql-transformer-core": "^8.1.3",
"lodash": "^4.17.21",
"semver": "^7.3.5",
"strip-ansi": "^6.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/amplify-nodejs-function-template-provider/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"@aws-amplify/amplify-cli-core": "4.1.0",
"@aws-amplify/amplify-function-plugin-interface": "1.10.3",
"@aws-amplify/amplify-prompts": "2.8.0",
"graphql-transformer-core": "^8.1.2",
"graphql-transformer-core": "^8.1.3",
"lodash": "^4.17.21"
},
"devDependencies": {
Expand Down
10 changes: 5 additions & 5 deletions packages/amplify-provider-awscloudformation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
"@aws-amplify/amplify-prompts": "2.8.0",
"@aws-amplify/amplify-util-import": "2.6.1",
"@aws-amplify/cli-extensibility-helper": "3.0.9",
"@aws-amplify/graphql-transformer-core": "^1.3.2",
"@aws-amplify/graphql-transformer-interfaces": "^2.2.1",
"amplify-codegen": "^4.1.1",
"@aws-amplify/graphql-transformer-core": "^1.3.3",
"@aws-amplify/graphql-transformer-interfaces": "^2.2.2",
"amplify-codegen": "^4.1.2",
"archiver": "^5.3.0",
"aws-cdk-lib": "~2.68.0",
"aws-sdk": "^2.1354.0",
Expand All @@ -53,7 +53,7 @@
"fs-extra": "^8.1.0",
"glob": "^7.2.0",
"graphql": "^15.5.0",
"graphql-transformer-core": "^8.1.2",
"graphql-transformer-core": "^8.1.3",
"ignore": "^5.2.0",
"ini": "^1.3.5",
"inquirer": "^7.3.3",
Expand All @@ -72,7 +72,7 @@
"xstate": "^4.14.0"
},
"devDependencies": {
"@aws-amplify/graphql-transformer-interfaces": "^2.2.1",
"@aws-amplify/graphql-transformer-interfaces": "^2.2.2",
"@types/columnify": "^1.5.0",
"@types/deep-diff": "^1.0.0",
"@types/folder-hash": "^4.0.1",
Expand Down
42 changes: 21 additions & 21 deletions packages/amplify-util-mock/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@aws-amplify/amplify-prompts": "2.8.0",
"@aws-amplify/amplify-provider-awscloudformation": "8.2.5",
"@hapi/topo": "^5.0.0",
"amplify-codegen": "^4.1.1",
"amplify-codegen": "^4.1.2",
"amplify-dynamodb-simulator": "2.7.4",
"amplify-storage-simulator": "1.9.1",
"chokidar": "^3.5.3",
Expand All @@ -55,19 +55,19 @@
},
"devDependencies": {
"@aws-amplify/amplify-function-plugin-interface": "1.10.3",
"@aws-amplify/graphql-auth-transformer": "^2.1.6",
"@aws-amplify/graphql-default-value-transformer": "^1.1.6",
"@aws-amplify/graphql-function-transformer": "^1.2.4",
"@aws-amplify/graphql-http-transformer": "1.2.4",
"@aws-amplify/graphql-index-transformer": "^1.2.2",
"@aws-amplify/graphql-maps-to-transformer": "^2.1.6",
"@aws-amplify/graphql-model-transformer": "^1.3.2",
"@aws-amplify/graphql-predictions-transformer": "^1.2.4",
"@aws-amplify/graphql-relational-transformer": "^1.2.2",
"@aws-amplify/graphql-searchable-transformer": "^1.2.4",
"@aws-amplify/graphql-transformer-core": "^1.3.2",
"@aws-amplify/graphql-transformer-interfaces": "^2.2.1",
"@aws-amplify/graphql-transformer-migrator": "^2.1.6",
"@aws-amplify/graphql-auth-transformer": "^2.1.7",
"@aws-amplify/graphql-default-value-transformer": "^1.1.7",
"@aws-amplify/graphql-function-transformer": "^1.2.5",
"@aws-amplify/graphql-http-transformer": "1.2.5",
"@aws-amplify/graphql-index-transformer": "^1.2.3",
"@aws-amplify/graphql-maps-to-transformer": "^2.1.7",
"@aws-amplify/graphql-model-transformer": "^1.3.3",
"@aws-amplify/graphql-predictions-transformer": "^1.2.5",
"@aws-amplify/graphql-relational-transformer": "^1.2.3",
"@aws-amplify/graphql-searchable-transformer": "^1.2.5",
"@aws-amplify/graphql-transformer-core": "^1.3.3",
"@aws-amplify/graphql-transformer-interfaces": "^2.2.2",
"@aws-amplify/graphql-transformer-migrator": "^2.1.7",
"@types/detect-port": "^1.3.0",
"@types/jest": "^29.0.0",
"@types/lodash": "^4.14.149",
Expand All @@ -80,14 +80,14 @@
"aws-sdk-mock": "^5.8.0",
"axios": "^0.26.0",
"graphql": "^15.5.0",
"graphql-auth-transformer": "^7.2.56",
"graphql-connection-transformer": "^5.2.55",
"graphql-dynamodb-transformer": "^7.2.55",
"graphql-function-transformer": "^3.3.46",
"graphql-key-transformer": "^3.2.55",
"graphql-auth-transformer": "^7.2.57",
"graphql-connection-transformer": "^5.2.56",
"graphql-dynamodb-transformer": "^7.2.56",
"graphql-function-transformer": "^3.3.47",
"graphql-key-transformer": "^3.2.56",
"graphql-tag": "^2.10.1",
"graphql-transformer-core": "^8.1.2",
"graphql-versioned-transformer": "^5.2.55",
"graphql-transformer-core": "^8.1.3",
"graphql-versioned-transformer": "^5.2.56",
"isomorphic-fetch": "^3.0.0",
"jest": "^29.0.0",
"jsonwebtoken": "^9.0.0",
Expand Down
11 changes: 2 additions & 9 deletions packages/amplify-util-mock/src/__e2e__/model-with-maps-to.e2e.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,8 @@ beforeAll(async () => {
try {
const transformer = new GraphQLTransform({
transformers: [new ModelTransformer(), new AuthTransformer(), new MapsToTransformer()],
featureFlags: {
getBoolean: (value: string, defaultValue?: boolean): boolean => {
if (value === 'userSubUsernameForDefaultIdentityClaim') {
return false;
}
return defaultValue;
},
getNumber: jest.fn(),
getObject: jest.fn(),
transformParameters: {
useSubUsernameForDefaultIdentityClaim: false,
},
});
const out = transformer.transform(validSchema);
Expand Down
4 changes: 0 additions & 4 deletions packages/amplify-util-mock/src/__e2e_v2__/function-transformer.e2e.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { ModelTransformer } from '@aws-amplify/graphql-model-transformer';
import { FunctionTransformer } from '@aws-amplify/graphql-function-transformer';
import { GraphQLTransform } from '@aws-amplify/graphql-transformer-core';
import { FeatureFlagProvider } from '@aws-amplify/graphql-transformer-interfaces';
import { deploy, logDebug, GraphQLClient } from '../__e2e__/utils';
import { AmplifyAppSyncSimulator } from '@aws-amplify/amplify-appsync-simulator';

Expand Down Expand Up @@ -35,9 +34,6 @@ describe('@function transformer', () => {
try {
const transformer = new GraphQLTransform({
transformers: [new ModelTransformer(), new FunctionTransformer()],
featureFlags: {
getBoolean: (name) => (name === 'improvePluralization' ? true : false),
} as FeatureFlagProvider,
});
const out = transformer.transform(validSchema);
const result = await deploy(out);
Expand Down
4 changes: 0 additions & 4 deletions packages/amplify-util-mock/src/__e2e_v2__/index-transformer.e2e.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { deploy, launchDDBLocal, logDebug, terminateDDB, GraphQLClient } from '../__e2e__/utils';
import { ModelTransformer } from '@aws-amplify/graphql-model-transformer';
import { GraphQLTransform } from '@aws-amplify/graphql-transformer-core';
import { FeatureFlagProvider } from '@aws-amplify/graphql-transformer-interfaces';
import { PrimaryKeyTransformer, IndexTransformer } from '@aws-amplify/graphql-index-transformer';
import { AmplifyAppSyncSimulator } from '@aws-amplify/amplify-appsync-simulator';
import { AuthTransformer } from '@aws-amplify/graphql-auth-transformer';
Expand Down Expand Up @@ -63,9 +62,6 @@ describe('@index transformer', () => {

const transformer = new GraphQLTransform({
transformers: [new ModelTransformer(), new PrimaryKeyTransformer(), new IndexTransformer(), new AuthTransformer()],
featureFlags: {
getBoolean: (name) => (name === 'improvePluralization' ? true : false),
} as FeatureFlagProvider,
});
const out = transformer.transform(validSchema);
let ddbClient;
Expand Down
4 changes: 0 additions & 4 deletions packages/amplify-util-mock/src/__e2e_v2__/model-relational-transformer.e2e.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { IndexTransformer, PrimaryKeyTransformer } from '@aws-amplify/graphql-in
import { BelongsToTransformer, HasManyTransformer, HasOneTransformer } from '@aws-amplify/graphql-relational-transformer';
import { ModelTransformer } from '@aws-amplify/graphql-model-transformer';
import { GraphQLTransform } from '@aws-amplify/graphql-transformer-core';
import { FeatureFlagProvider } from '@aws-amplify/graphql-transformer-interfaces';
import { deploy, launchDDBLocal, terminateDDB, logDebug, GraphQLClient } from '../__e2e__/utils';
import { AuthTransformer } from '@aws-amplify/graphql-auth-transformer';
import { AmplifyAppSyncSimulator } from '@aws-amplify/amplify-appsync-simulator';
Expand Down Expand Up @@ -53,9 +52,6 @@ describe('@model with relational transformer', () => {
new BelongsToTransformer(),
new AuthTransformer(),
],
featureFlags: {
getBoolean: (name) => (name === 'improvePluralization' ? true : false),
} as FeatureFlagProvider,
});
const out = transformer.transform(validSchema);

Expand Down
7 changes: 3 additions & 4 deletions packages/amplify-util-mock/src/__e2e_v2__/model-relational-with-key-transformer.e2e.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { ModelTransformer } from '@aws-amplify/graphql-model-transformer';
import { HasManyTransformer, BelongsToTransformer, HasOneTransformer } from '@aws-amplify/graphql-relational-transformer';
import { PrimaryKeyTransformer, IndexTransformer } from '@aws-amplify/graphql-index-transformer';
import { GraphQLTransform } from '@aws-amplify/graphql-transformer-core';
import { FeatureFlagProvider } from '@aws-amplify/graphql-transformer-interfaces';
import { deploy, launchDDBLocal, terminateDDB, logDebug, GraphQLClient } from '../__e2e__/utils';
import { AuthTransformer } from '@aws-amplify/graphql-auth-transformer';
import { AmplifyAppSyncSimulator } from '@aws-amplify/amplify-appsync-simulator';
Expand Down Expand Up @@ -75,9 +74,9 @@ describe('@model with relational transformers', () => {
new BelongsToTransformer(),
new AuthTransformer(),
],
featureFlags: {
getBoolean: (name) => (name === 'improvePluralization' ? true : false),
} as FeatureFlagProvider,
transformParameters: {
respectPrimaryKeyAttributesOnConnectionField: false,
},
});
const out = transformer.transform(validSchema);

Expand Down
4 changes: 0 additions & 4 deletions packages/amplify-util-mock/src/__e2e_v2__/model-transformer.e2e.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { AuthTransformer } from '@aws-amplify/graphql-auth-transformer';
import { ModelTransformer } from '@aws-amplify/graphql-model-transformer';
import { GraphQLTransform } from '@aws-amplify/graphql-transformer-core';
import { FeatureFlagProvider } from '@aws-amplify/graphql-transformer-interfaces';
import { AmplifyAppSyncSimulator } from '@aws-amplify/amplify-appsync-simulator';
import { deploy, launchDDBLocal, terminateDDB, logDebug, GraphQLClient } from '../__e2e__/utils';

Expand Down Expand Up @@ -56,9 +55,6 @@ describe('@model transformer', () => {
try {
const transformer = new GraphQLTransform({
transformers: [new ModelTransformer(), new AuthTransformer()],
featureFlags: {
getBoolean: (name) => (name === 'improvePluralization' ? true : false),
} as FeatureFlagProvider,
});
const out = await transformer.transform(validSchema);
let ddbClient;
Expand Down
4 changes: 0 additions & 4 deletions packages/amplify-util-mock/src/__e2e_v2__/util-method.e2e.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { AmplifyAppSyncSimulator } from '@aws-amplify/amplify-appsync-simulator';
import { ModelTransformer } from '@aws-amplify/graphql-model-transformer';
import { GraphQLTransform } from '@aws-amplify/graphql-transformer-core';
import { FeatureFlagProvider } from '@aws-amplify/graphql-transformer-interfaces';
import { deploy, launchDDBLocal, terminateDDB, logDebug, reDeploy, GraphQLClient } from '../__e2e__/utils';

let GRAPHQL_ENDPOINT: string;
Expand All @@ -15,9 +14,6 @@ jest.setTimeout(2000000);
const runTransformer = async (validSchema: string) => {
const transformer = new GraphQLTransform({
transformers: [new ModelTransformer()],
featureFlags: {
getBoolean: (name) => (name === 'improvePluralization' ? true : false),
} as FeatureFlagProvider,
sandboxModeEnabled: true,
});
const out = await transformer.transform(validSchema);
Expand Down
Loading