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

Jump to bottom

release: Amplify JS release #13173

Merged
merged 15 commits into from
Mar 25, 2024
Merged

release: Amplify JS release #13173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
80e029c
chore(deps): bump follow-redirects from 1.15.5 to 1.15.6 (#13134)
dependabot[bot] Mar 19, 2024
d4e0623
chore(aws-amplify): rename adapterCore to adapter-core (#13149)
HuiSF Mar 19, 2024
57feb5b
chore: enable eslint for geo interactions and predictions packages (#…
HuiSF Mar 19, 2024
22d042d
chore: Refactor setConflictHandler to avoid directly exporting let (#…
cshfang Mar 19, 2024
828b9a2
Merge branch 'main' into temp/release-merge-1710875499
jimblanc Mar 19, 2024
0e0c496
chore: enable eslint and remove tslint for react-native packages (#13…
HuiSF Mar 19, 2024
c4f2fe8
Merge branch 'main' into temp/release-merge-1710875499
jimblanc Mar 19, 2024
bd1fefd
chore: Merge release into main (#13151)
ashwinkumar6 Mar 19, 2024
f6055cb
chore(api-graphql): enable eslint and remove tslint (#13101)
HuiSF Mar 20, 2024
1a6d358
chore(notifications): enable eslint and remove telint (#13091)
HuiSF Mar 20, 2024
1aafa48
fix(auth): add signInDetails on refreshTokens action (#13153)
israx Mar 21, 2024
2b71e29
feat(api-graphql): custom subscriptions (#13154)
iartemiev Mar 21, 2024
1820354
feat: implicit group auth fields in selection sets (#13161)
svidgen Mar 25, 2024
472fdf4
Merge branch 'main' into temp/release-merge-1711393041
israx Mar 25, 2024
701f219
chore: Merge release into main (#13172)
israx Mar 25, 2024
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
16 changes: 8 additions & 8 deletions .eslintrc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,21 @@ module.exports = {
// 'adapter-nextjs',
// 'packages/analytics',
// 'packages/api',
'packages/api-graphql',
// 'packages/api-graphql',
// 'packages/api-rest',
// 'packages/auth',
// 'packages/aws-amplify',
// 'packages/core',
'packages/datastore',
'packages/datastore-storage-adapter',
'packages/geo',
'packages/interactions',
'packages/notifications',
'packages/predictions',
// 'packages/geo',
// 'packages/interactions',
// 'packages/notifications',
// 'packages/predictions',
// 'packages/pubsub',
'packages/react-native',
'packages/rtn-push-notification',
'packages/rtn-web-browser',
// 'packages/react-native',
// 'packages/rtn-push-notification',
// 'packages/rtn-web-browser',
// 'packages/storage',
],
rules: {
Expand Down
1 change: 0 additions & 1 deletion .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"editor.detectIndentation": false,
"editor.insertSpaces": false,
"editor.tabSize": 4,
"prettier.requireConfig": true,
"typescript.tsdk": "node_modules/typescript/lib",
"formattingToggle.affects": [
Expand Down
321 changes: 321 additions & 0 deletions packages/api-graphql/__tests__/fixtures/modeled/amplifyconfiguration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1361,6 +1361,301 @@ const amplifyConfig = {
sortKeyFieldNames: ['factoryId', 'warehouseId'],
},
},
ImplicitOwner: {
name: 'ImplicitOwner',
fields: {
id: {
name: 'id',
isArray: false,
type: 'ID',
isRequired: true,
attributes: [],
},
description: {
name: 'description',
isArray: false,
type: 'String',
isRequired: false,
attributes: [],
},
owner: {
name: 'owner',
isArray: false,
type: 'String',
isRequired: false,
attributes: [],
},
createdAt: {
name: 'createdAt',
isArray: false,
type: 'AWSDateTime',
isRequired: true,
attributes: [],
},
updatedAt: {
name: 'updatedAt',
isArray: false,
type: 'AWSDateTime',
isRequired: true,
attributes: [],
},
},
syncable: true,
pluralName: 'ImplicitOwners',
attributes: [
{
type: 'model',
properties: {},
},
{
type: 'key',
properties: {
fields: ['id'],
},
},
{
type: 'auth',
properties: {
rules: [
{
provider: 'userPools',
ownerField: 'owner',
allow: 'owner',
identityClaim: 'cognito:username',
operations: ['create', 'update', 'delete', 'read'],
},
],
},
},
],
primaryKeyInfo: {
isCustomPrimaryKey: false,
primaryKeyFieldName: 'id',
sortKeyFieldNames: [],
},
},
CustomImplicitOwner: {
name: 'CustomImplicitOwner',
fields: {
id: {
name: 'id',
isArray: false,
type: 'ID',
isRequired: true,
attributes: [],
},
description: {
name: 'description',
isArray: false,
type: 'String',
isRequired: false,
attributes: [],
},
customOwner: {
name: 'customOwner',
isArray: false,
type: 'String',
isRequired: false,
attributes: [],
},
createdAt: {
name: 'createdAt',
isArray: false,
type: 'AWSDateTime',
isRequired: true,
attributes: [],
},
updatedAt: {
name: 'updatedAt',
isArray: false,
type: 'AWSDateTime',
isRequired: true,
attributes: [],
},
},
syncable: true,
pluralName: 'CustomImplicitOwners',
attributes: [
{
type: 'model',
properties: {},
},
{
type: 'key',
properties: {
fields: ['id'],
},
},
{
type: 'auth',
properties: {
rules: [
{
provider: 'userPools',
ownerField: 'customOwner',
allow: 'owner',
identityClaim: 'cognito:username',
operations: ['create', 'update', 'delete', 'read'],
},
],
},
},
],
primaryKeyInfo: {
isCustomPrimaryKey: false,
primaryKeyFieldName: 'id',
sortKeyFieldNames: [],
},
},
ModelGroupDefinedIn: {
name: 'ModelGroupDefinedIn',
fields: {
id: {
name: 'id',
isArray: false,
type: 'ID',
isRequired: true,
attributes: [],
},
description: {
name: 'description',
isArray: false,
type: 'String',
isRequired: false,
attributes: [],
},
groupField: {
name: 'groupField',
isArray: false,
type: 'String',
isRequired: false,
attributes: [],
},
createdAt: {
name: 'createdAt',
isArray: false,
type: 'AWSDateTime',
isRequired: true,
attributes: [],
},
updatedAt: {
name: 'updatedAt',
isArray: false,
type: 'AWSDateTime',
isRequired: true,
attributes: [],
},
},
syncable: true,
pluralName: 'ModelGroupDefinedIns',
attributes: [
{
type: 'model',
properties: {},
},
{
type: 'key',
properties: {
fields: ['id'],
},
},
{
type: 'auth',
properties: {
rules: [
{
groupClaim: 'cognito:groups',
provider: 'userPools',
allow: 'groups',
groupsField: 'groupField',
groupField: 'groups',
operations: ['create', 'update', 'delete', 'read'],
},
],
},
},
],
primaryKeyInfo: {
isCustomPrimaryKey: false,
primaryKeyFieldName: 'id',
sortKeyFieldNames: [],
},
},
ModelGroupsDefinedIn: {
name: 'ModelGroupsDefinedIn',
fields: {
id: {
name: 'id',
isArray: false,
type: 'ID',
isRequired: true,
attributes: [],
},
description: {
name: 'description',
isArray: false,
type: 'String',
isRequired: false,
attributes: [],
},
groupsField: {
name: 'groupsField',
isArray: true,
type: 'String',
isRequired: false,
attributes: [],
isArrayNullable: true,
},
createdAt: {
name: 'createdAt',
isArray: false,
type: 'AWSDateTime',
isRequired: true,
attributes: [],
},
updatedAt: {
name: 'updatedAt',
isArray: false,
type: 'AWSDateTime',
isRequired: true,
attributes: [],
},
},
syncable: true,
pluralName: 'ModelGroupsDefinedIns',
attributes: [
{
type: 'model',
properties: {},
},
{
type: 'key',
properties: {
fields: ['id'],
},
},
{
type: 'auth',
properties: {
rules: [
{
groupClaim: 'cognito:groups',
provider: 'userPools',
allow: 'groups',
groupsField: 'groupsField',
groupField: 'groups',
operations: ['create', 'update', 'delete', 'read'],
},
],
},
},
],
primaryKeyInfo: {
isCustomPrimaryKey: false,
primaryKeyFieldName: 'id',
sortKeyFieldNames: [],
},
},
},
enums: {
Status: {
Expand Down Expand Up @@ -1580,6 +1875,32 @@ const amplifyConfig = {
},
},
},
subscriptions: {
onPostLiked: {
name: 'onPostLiked',
isArray: false,
type: {
model: 'Post',
},
isRequired: false,
},
onPostUpdated: {
name: 'onPostUpdated',
isArray: false,
type: {
model: 'Post',
},
isRequired: false,
arguments: {
postId: {
name: 'postId',
isArray: false,
type: 'String',
isRequired: false,
},
},
},
},
},
};
export default amplifyConfig;
Loading
Loading