From ca6772e0bfee425d44f1b668d65d783726858706 Mon Sep 17 00:00:00 2001 From: Lukas Reineke Date: Fri, 29 May 2020 11:36:15 +0900 Subject: [PATCH 1/2] 2.0.0-alpha.1 --- .circleci/config.yml | 6 +++--- README.md | 2 +- src/generated/graphql.d.ts | 32 ++++++++++++++++---------------- src/generated/graphql.ts | 36 ++++++++++++++++++++---------------- 4 files changed, 40 insertions(+), 36 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e4c0cd0..c34de64 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -90,7 +90,7 @@ jobs: - run: name: Set branch environemnt variable command: | - echo '(echo "$CIRCLE_TAG" | grep -Eq ^.*-rc.*$) && export BRANCH=$(echo "$CIRCLE_TAG" | sed "s/^v//" | sed "s/-rc.*//") || export BRANCH="master"' >> $BASH_ENV + echo '(echo "$CIRCLE_TAG" | grep -Eq ^.*-alpha.*$) && export BRANCH=$(echo "$CIRCLE_TAG" | sed "s/^v//" | sed "s/-alpha.*//") export ALPHA=true || export BRANCH="master"' >> $BASH_ENV source $BASH_ENV - run: npm version --no-git-tag-version ${CIRCLE_TAG} - run: git add package.json package-lock.json @@ -98,7 +98,7 @@ jobs: - run: git checkout -b temp - run: git push origin temp:$BRANCH - run: npm config set '//registry.npmjs.org/:_authToken' '${NPM_TOKEN}' - - run: npm publish --access public + - run: npm publish --access public $([ ! -z "$ALPHA" ] && echo '--preid=alpha') publish-hot: docker: @@ -135,7 +135,7 @@ workflows: - check-build filters: tags: - only: /^v[0-9]+(\.[0-9]+)*(-rc\.[0-9]*)*/ + only: /^v[0-9]+(\.[0-9]+)*(-alpha\.[0-9]*)*/ branches: ignore: /.*/ - publish-hot: diff --git a/README.md b/README.md index 324ace7..e75c0ac 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ need to hotfix the hotfix, create a new branch from the hotfix branch (eg. `1.0. To publish a pre-release, create a new branch that is called like the version the pre-release is for (eg. `2.0.0`). Don't add `v` in branchnames. Make a new GitHub pre-release from that branch. The GitHub tag will become the npm version. -Make sure the tag includes `-rc.X` where `X` is a semversion (eg. `1.2.3`) so CircleCI knows +Make sure the tag includes `-alpha.X` where `X` is a semversion (eg. `1.2.3`) so CircleCI knows that this is a pre-release. CircleCI will update the pre-release branch with the new version. You can use the same branch to publish multiple pre-release versions before releasing the actual release. diff --git a/src/generated/graphql.d.ts b/src/generated/graphql.d.ts index ae40150..9d3c558 100644 --- a/src/generated/graphql.d.ts +++ b/src/generated/graphql.d.ts @@ -194,7 +194,7 @@ export declare type CampaignTemplate = { /** The custom key performance indicator used to derive results data */ kpi?: Maybe; /** Marketplace the campaign template was created for */ - marketplace: Marketplace; + marketplace?: Maybe; /** Marketing campaigns that are using this campaign template */ marketingCampaigns: MarketingCampaignConnection; /** Historical list of GCPX rates */ @@ -250,15 +250,15 @@ export declare type Catalog = { /** Date and time of last updated */ lastChangeDate: Scalars['DateISO']; /** Name of the product catalog */ - name: Scalars['NonEmptyString']; + name?: Maybe; /** Category of the products referenced by the product catalog */ - catalogType: CatalogType; + catalogType?: Maybe; /** Id of the product catalog on the related platform */ remoteId?: Maybe; /** System status of the product catalog */ systemStatus: SystemStatus; /** Data related to the product catalog stored on the remote platform */ - remoteState: Scalars['JSONObject']; + remoteState?: Maybe; /** Facebook data feed id referenced by the product catalog */ dataFeedId?: Maybe; /** Facebook app and pixel ids associated to the product catalog */ @@ -876,7 +876,7 @@ export declare type MarketingCampaign = ResultResource & NotificationResource & /** Marketing campaign scheduling data. [Run Time Specification](https://docs.adgo.io/API/MarketingCampaign#marketingcampaign-run-time-specification-runtimespec) */ runTimeSpec?: Maybe; /** Marketing campaign location data. [Location Specification](https://docs.adgo.io/API/MarketingCampaign#marketingcampaign-location-specification-locationspec) */ - locationSpec: Scalars['JSONObject']; + locationSpec?: Maybe; /** Marketing campaign GCPX data. [Conversion Specification](https://docs.adgo.io/API/MarketingCampaign#marketingcampaign-conversion-specification-conversionspec) */ conversionSpec?: Maybe; /** Start date of the campaign */ @@ -1014,7 +1014,7 @@ export declare type MarketingCampaignSnapshot = { /** Marketing campaign scheduling data. [Run Time Specification](https://docs.adgo.io/API/MarketingCampaign#marketingcampaign-run-time-specification-runtimespec) */ runTimeSpec?: Maybe; /** Marketing campaign location data. [Location Specification](https://docs.adgo.io/API/MarketingCampaign#marketingcampaign-location-specification-locationspec) */ - locationSpec: Scalars['JSONObject']; + locationSpec?: Maybe; /** The key performance indicator used to determine analytics results */ kpi?: Maybe; /** Product ids */ @@ -1233,7 +1233,7 @@ export declare type MediaChannel = EntitlementResource & { /** Id of the media channel on the corresponding platform */ remoteId?: Maybe; /** Data related to the media channel stored on the remote platform */ - remoteState: Scalars['JSONObject']; + remoteState?: Maybe; /** Currency code of the media channel */ currency?: Maybe; /** Currency code of the media channel */ @@ -1937,7 +1937,7 @@ export declare type Product = ResultResource & { /** Data related to the product stored on the remote platform */ remoteState?: Maybe; /** Data related to the product. [Product Metadata](https://docs.adgo.io/API/ProductMetadata) */ - metadata: Scalars['JSONObject']; + metadata?: Maybe; /** True if the product was created externally and imported */ imported: Scalars['Boolean']; /** Results related to the product */ @@ -2995,7 +2995,7 @@ export declare type CampaignTemplateResolvers>, ParentType, ContextType>; warnings?: Resolver>, ParentType, ContextType>; kpi?: Resolver, ParentType, ContextType>; - marketplace?: Resolver; + marketplace?: Resolver, ParentType, ContextType>; marketingCampaigns?: Resolver>; GCPXHistory?: Resolver; currentGCPX?: Resolver, ParentType, ContextType>; @@ -3013,11 +3013,11 @@ export declare type CatalogResolvers; creationDate?: Resolver; lastChangeDate?: Resolver; - name?: Resolver; - catalogType?: Resolver; + name?: Resolver, ParentType, ContextType>; + catalogType?: Resolver, ParentType, ContextType>; remoteId?: Resolver, ParentType, ContextType>; systemStatus?: Resolver; - remoteState?: Resolver; + remoteState?: Resolver, ParentType, ContextType>; dataFeedId?: Resolver, ParentType, ContextType>; externalEventSourceIds?: Resolver, ParentType, ContextType>; productSource?: Resolver; @@ -3228,7 +3228,7 @@ export declare type MarketingCampaignResolvers; creativeSpec?: Resolver; runTimeSpec?: Resolver, ParentType, ContextType>; - locationSpec?: Resolver; + locationSpec?: Resolver, ParentType, ContextType>; conversionSpec?: Resolver, ParentType, ContextType>; startDate?: Resolver; endDate?: Resolver, ParentType, ContextType>; @@ -3262,7 +3262,7 @@ export declare type MarketingCampaignSnapshotResolvers; creativeSpec?: Resolver; runTimeSpec?: Resolver, ParentType, ContextType>; - locationSpec?: Resolver; + locationSpec?: Resolver, ParentType, ContextType>; kpi?: Resolver, ParentType, ContextType>; productIds?: Resolver>, ParentType, ContextType>; }; @@ -3319,7 +3319,7 @@ export declare type MediaChannelResolvers>, ParentType, ContextType>; platform?: Resolver; remoteId?: Resolver, ParentType, ContextType>; - remoteState?: Resolver; + remoteState?: Resolver, ParentType, ContextType>; currency?: Resolver, ParentType, ContextType>; currencyCode?: Resolver, ParentType, ContextType>; currencySymbol?: Resolver, ParentType, ContextType>; @@ -3481,7 +3481,7 @@ export declare type ProductResolvers; sku?: Resolver; remoteState?: Resolver, ParentType, ContextType>; - metadata?: Resolver; + metadata?: Resolver, ParentType, ContextType>; imported?: Resolver; results?: Resolver>; marketingCampaigns?: Resolver>; diff --git a/src/generated/graphql.ts b/src/generated/graphql.ts index 319c426..be1bebf 100644 --- a/src/generated/graphql.ts +++ b/src/generated/graphql.ts @@ -200,7 +200,7 @@ export type CampaignTemplate = { /** The custom key performance indicator used to derive results data */ kpi?: Maybe; /** Marketplace the campaign template was created for */ - marketplace: Marketplace; + marketplace?: Maybe; /** Marketing campaigns that are using this campaign template */ marketingCampaigns: MarketingCampaignConnection; /** Historical list of GCPX rates */ @@ -261,15 +261,15 @@ export type Catalog = { /** Date and time of last updated */ lastChangeDate: Scalars['DateISO']; /** Name of the product catalog */ - name: Scalars['NonEmptyString']; + name?: Maybe; /** Category of the products referenced by the product catalog */ - catalogType: CatalogType; + catalogType?: Maybe; /** Id of the product catalog on the related platform */ remoteId?: Maybe; /** System status of the product catalog */ systemStatus: SystemStatus; /** Data related to the product catalog stored on the remote platform */ - remoteState: Scalars['JSONObject']; + remoteState?: Maybe; /** Facebook data feed id referenced by the product catalog */ dataFeedId?: Maybe; /** Facebook app and pixel ids associated to the product catalog */ @@ -937,7 +937,7 @@ export type MarketingCampaign = ResultResource & /** Marketing campaign scheduling data. [Run Time Specification](https://docs.adgo.io/API/MarketingCampaign#marketingcampaign-run-time-specification-runtimespec) */ runTimeSpec?: Maybe; /** Marketing campaign location data. [Location Specification](https://docs.adgo.io/API/MarketingCampaign#marketingcampaign-location-specification-locationspec) */ - locationSpec: Scalars['JSONObject']; + locationSpec?: Maybe; /** Marketing campaign GCPX data. [Conversion Specification](https://docs.adgo.io/API/MarketingCampaign#marketingcampaign-conversion-specification-conversionspec) */ conversionSpec?: Maybe; /** Start date of the campaign */ @@ -1083,7 +1083,7 @@ export type MarketingCampaignSnapshot = { /** Marketing campaign scheduling data. [Run Time Specification](https://docs.adgo.io/API/MarketingCampaign#marketingcampaign-run-time-specification-runtimespec) */ runTimeSpec?: Maybe; /** Marketing campaign location data. [Location Specification](https://docs.adgo.io/API/MarketingCampaign#marketingcampaign-location-specification-locationspec) */ - locationSpec: Scalars['JSONObject']; + locationSpec?: Maybe; /** The key performance indicator used to determine analytics results */ kpi?: Maybe; /** Product ids */ @@ -1320,7 +1320,7 @@ export type MediaChannel = EntitlementResource & { /** Id of the media channel on the corresponding platform */ remoteId?: Maybe; /** Data related to the media channel stored on the remote platform */ - remoteState: Scalars['JSONObject']; + remoteState?: Maybe; /** Currency code of the media channel */ currency?: Maybe; /** Currency code of the media channel */ @@ -2115,7 +2115,7 @@ export type Product = ResultResource & { /** Data related to the product stored on the remote platform */ remoteState?: Maybe; /** Data related to the product. [Product Metadata](https://docs.adgo.io/API/ProductMetadata) */ - metadata: Scalars['JSONObject']; + metadata?: Maybe; /** True if the product was created externally and imported */ imported: Scalars['Boolean']; /** Results related to the product */ @@ -3367,7 +3367,7 @@ export type CampaignTemplateResolvers< >; kpi?: Resolver, ParentType, ContextType>; marketplace?: Resolver< - ResolversTypes['Marketplace'], + Maybe, ParentType, ContextType >; @@ -3426,9 +3426,9 @@ export type CatalogResolvers< ParentType, ContextType >; - name?: Resolver; + name?: Resolver, ParentType, ContextType>; catalogType?: Resolver< - ResolversTypes['CatalogType'], + Maybe, ParentType, ContextType >; @@ -3443,7 +3443,7 @@ export type CatalogResolvers< ContextType >; remoteState?: Resolver< - ResolversTypes['JSONObject'], + Maybe, ParentType, ContextType >; @@ -4057,7 +4057,7 @@ export type MarketingCampaignResolvers< ContextType >; locationSpec?: Resolver< - ResolversTypes['JSONObject'], + Maybe, ParentType, ContextType >; @@ -4175,7 +4175,7 @@ export type MarketingCampaignSnapshotResolvers< ContextType >; locationSpec?: Resolver< - ResolversTypes['JSONObject'], + Maybe, ParentType, ContextType >; @@ -4366,7 +4366,7 @@ export type MediaChannelResolvers< ContextType >; remoteState?: Resolver< - ResolversTypes['JSONObject'], + Maybe, ParentType, ContextType >; @@ -5064,7 +5064,11 @@ export type ProductResolvers< ParentType, ContextType >; - metadata?: Resolver; + metadata?: Resolver< + Maybe, + ParentType, + ContextType + >; imported?: Resolver; results?: Resolver< ResolversTypes['ResultConnection'], From 86c500812a61b94784d36cf6a638e6e85e4cc66b Mon Sep 17 00:00:00 2001 From: Lukas Reineke Date: Fri, 29 May 2020 13:55:14 +0900 Subject: [PATCH 2/2] NO-TICKET Deletion id type change --- src/generated/graphql.d.ts | 4 ++-- src/generated/graphql.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/generated/graphql.d.ts b/src/generated/graphql.d.ts index 9d3c558..cfdc87f 100644 --- a/src/generated/graphql.d.ts +++ b/src/generated/graphql.d.ts @@ -659,7 +659,7 @@ export declare type CreativeTemplateUpdateInput = { /** Object deletion operation result */ export declare type Deletion = { /** Id of the deleted object */ - id: Scalars['String']; + id: Scalars['ObjectId']; }; /** A set of user permissions related to a resource */ export declare type Entitlement = { @@ -3130,7 +3130,7 @@ export interface DateIsoScalarConfig extends GraphQLScalarTypeConfig = { - id?: Resolver; + id?: Resolver; }; export declare type EntitlementResolvers = { id?: Resolver; diff --git a/src/generated/graphql.ts b/src/generated/graphql.ts index be1bebf..9440442 100644 --- a/src/generated/graphql.ts +++ b/src/generated/graphql.ts @@ -702,7 +702,7 @@ export type CreativeTemplateUpdateInput = { /** Object deletion operation result */ export type Deletion = { /** Id of the deleted object */ - id: Scalars['String']; + id: Scalars['ObjectId']; }; /** A set of user permissions related to a resource */ @@ -3780,7 +3780,7 @@ export type DeletionResolvers< ContextType = any, ParentType extends ResolversParentTypes['Deletion'] = ResolversParentTypes['Deletion'] > = { - id?: Resolver; + id?: Resolver; }; export type EntitlementResolvers<