Skip to content

Commit bfd5471

Browse files
cgsimmonscgsimmons
authored
Merge pull request #80 from lukas-reineke/alpha
2.0.0-alpha.1
2 parents 99211d5 + ca6772e commit bfd5471

File tree

4 files changed

+40
-36
lines changed

4 files changed

+40
-36
lines changed

‎.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,15 @@ jobs:
9090
- run:
9191
name: Set branch environemnt variable
9292
command: |
93-
echo '(echo "$CIRCLE_TAG" | grep -Eq ^.*-rc.*$) && export BRANCH=$(echo "$CIRCLE_TAG" | sed "s/^v//" | sed "s/-rc.*//") || export BRANCH="master"' >> $BASH_ENV
93+
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
9494
source $BASH_ENV
9595
- run: npm version --no-git-tag-version ${CIRCLE_TAG}
9696
- run: git add package.json package-lock.json
9797
- run: git commit -m "Automatic NPM version bump ${CIRCLE_TAG}"
9898
- run: git checkout -b temp
9999
- run: git push origin temp:$BRANCH
100100
- run: npm config set '//registry.npmjs.org/:_authToken' '${NPM_TOKEN}'
101-
- run: npm publish --access public
101+
- run: npm publish --access public $([ ! -z "$ALPHA" ] && echo '--preid=alpha')
102102

103103
publish-hot:
104104
docker:
@@ -135,7 +135,7 @@ workflows:
135135
- check-build
136136
filters:
137137
tags:
138-
only: /^v[0-9]+(\.[0-9]+)*(-rc\.[0-9]*)*/
138+
only: /^v[0-9]+(\.[0-9]+)*(-alpha\.[0-9]*)*/
139139
branches:
140140
ignore: /.*/
141141
- publish-hot:

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ need to hotfix the hotfix, create a new branch from the hotfix branch (eg. `1.0.
5353
To publish a pre-release, create a new branch that is called like the version
5454
the pre-release is for (eg. `2.0.0`). Don't add `v` in branchnames.
5555
Make a new GitHub pre-release from that branch. The GitHub tag will become the npm version.
56-
Make sure the tag includes `-rc.X` where `X` is a semversion (eg. `1.2.3`) so CircleCI knows
56+
Make sure the tag includes `-alpha.X` where `X` is a semversion (eg. `1.2.3`) so CircleCI knows
5757
that this is a pre-release.
5858
CircleCI will update the pre-release branch with the new version. You can use
5959
the same branch to publish multiple pre-release versions before releasing the actual release.

‎src/generated/graphql.d.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ export declare type CampaignTemplate = {
194194
/** The custom key performance indicator used to derive results data */
195195
kpi?: Maybe<Scalars['String']>;
196196
/** Marketplace the campaign template was created for */
197-
marketplace: Marketplace;
197+
marketplace?: Maybe<Marketplace>;
198198
/** Marketing campaigns that are using this campaign template */
199199
marketingCampaigns: MarketingCampaignConnection;
200200
/** Historical list of GCPX rates */
@@ -250,15 +250,15 @@ export declare type Catalog = {
250250
/** Date and time of last updated */
251251
lastChangeDate: Scalars['DateISO'];
252252
/** Name of the product catalog */
253-
name: Scalars['NonEmptyString'];
253+
name?: Maybe<Scalars['String']>;
254254
/** Category of the products referenced by the product catalog */
255-
catalogType: CatalogType;
255+
catalogType?: Maybe<CatalogType>;
256256
/** Id of the product catalog on the related platform */
257257
remoteId?: Maybe<Scalars['String']>;
258258
/** System status of the product catalog */
259259
systemStatus: SystemStatus;
260260
/** Data related to the product catalog stored on the remote platform */
261-
remoteState: Scalars['JSONObject'];
261+
remoteState?: Maybe<Scalars['JSONObject']>;
262262
/** Facebook data feed id referenced by the product catalog */
263263
dataFeedId?: Maybe<Scalars['String']>;
264264
/** Facebook app and pixel ids associated to the product catalog */
@@ -876,7 +876,7 @@ export declare type MarketingCampaign = ResultResource & NotificationResource &
876876
/** Marketing campaign scheduling data. [Run Time Specification](https://docs.adgo.io/API/MarketingCampaign#marketingcampaign-run-time-specification-runtimespec) */
877877
runTimeSpec?: Maybe<Scalars['JSONObject']>;
878878
/** Marketing campaign location data. [Location Specification](https://docs.adgo.io/API/MarketingCampaign#marketingcampaign-location-specification-locationspec) */
879-
locationSpec: Scalars['JSONObject'];
879+
locationSpec?: Maybe<Scalars['JSONObject']>;
880880
/** Marketing campaign GCPX data. [Conversion Specification](https://docs.adgo.io/API/MarketingCampaign#marketingcampaign-conversion-specification-conversionspec) */
881881
conversionSpec?: Maybe<Scalars['JSONObject']>;
882882
/** Start date of the campaign */
@@ -1014,7 +1014,7 @@ export declare type MarketingCampaignSnapshot = {
10141014
/** Marketing campaign scheduling data. [Run Time Specification](https://docs.adgo.io/API/MarketingCampaign#marketingcampaign-run-time-specification-runtimespec) */
10151015
runTimeSpec?: Maybe<Scalars['JSONObject']>;
10161016
/** Marketing campaign location data. [Location Specification](https://docs.adgo.io/API/MarketingCampaign#marketingcampaign-location-specification-locationspec) */
1017-
locationSpec: Scalars['JSONObject'];
1017+
locationSpec?: Maybe<Scalars['JSONObject']>;
10181018
/** The key performance indicator used to determine analytics results */
10191019
kpi?: Maybe<Scalars['String']>;
10201020
/** Product ids */
@@ -1233,7 +1233,7 @@ export declare type MediaChannel = EntitlementResource & {
12331233
/** Id of the media channel on the corresponding platform */
12341234
remoteId?: Maybe<Scalars['String']>;
12351235
/** Data related to the media channel stored on the remote platform */
1236-
remoteState: Scalars['JSONObject'];
1236+
remoteState?: Maybe<Scalars['JSONObject']>;
12371237
/** Currency code of the media channel */
12381238
currency?: Maybe<Scalars['NonEmptyString']>;
12391239
/** Currency code of the media channel */
@@ -1937,7 +1937,7 @@ export declare type Product = ResultResource & {
19371937
/** Data related to the product stored on the remote platform */
19381938
remoteState?: Maybe<Scalars['JSONObject']>;
19391939
/** Data related to the product. [Product Metadata](https://docs.adgo.io/API/ProductMetadata) */
1940-
metadata: Scalars['JSONObject'];
1940+
metadata?: Maybe<Scalars['JSONObject']>;
19411941
/** True if the product was created externally and imported */
19421942
imported: Scalars['Boolean'];
19431943
/** Results related to the product */
@@ -2995,7 +2995,7 @@ export declare type CampaignTemplateResolvers<ContextType = any, ParentType exte
29952995
errors?: Resolver<Maybe<Array<ResolversTypes['JSONObject']>>, ParentType, ContextType>;
29962996
warnings?: Resolver<Maybe<Array<ResolversTypes['JSONObject']>>, ParentType, ContextType>;
29972997
kpi?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
2998-
marketplace?: Resolver<ResolversTypes['Marketplace'], ParentType, ContextType>;
2998+
marketplace?: Resolver<Maybe<ResolversTypes['Marketplace']>, ParentType, ContextType>;
29992999
marketingCampaigns?: Resolver<ResolversTypes['MarketingCampaignConnection'], ParentType, ContextType, RequireFields<CampaignTemplateMarketingCampaignsArgs, 'showDeleted'>>;
30003000
GCPXHistory?: Resolver<ResolversTypes['GCPXConnection'], ParentType, ContextType, CampaignTemplateGcpxHistoryArgs>;
30013001
currentGCPX?: Resolver<Maybe<ResolversTypes['GCPX']>, ParentType, ContextType>;
@@ -3013,11 +3013,11 @@ export declare type CatalogResolvers<ContextType = any, ParentType extends Resol
30133013
id?: Resolver<ResolversTypes['ObjectId'], ParentType, ContextType>;
30143014
creationDate?: Resolver<ResolversTypes['DateISO'], ParentType, ContextType>;
30153015
lastChangeDate?: Resolver<ResolversTypes['DateISO'], ParentType, ContextType>;
3016-
name?: Resolver<ResolversTypes['NonEmptyString'], ParentType, ContextType>;
3017-
catalogType?: Resolver<ResolversTypes['CatalogType'], ParentType, ContextType>;
3016+
name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
3017+
catalogType?: Resolver<Maybe<ResolversTypes['CatalogType']>, ParentType, ContextType>;
30183018
remoteId?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
30193019
systemStatus?: Resolver<ResolversTypes['SystemStatus'], ParentType, ContextType>;
3020-
remoteState?: Resolver<ResolversTypes['JSONObject'], ParentType, ContextType>;
3020+
remoteState?: Resolver<Maybe<ResolversTypes['JSONObject']>, ParentType, ContextType>;
30213021
dataFeedId?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
30223022
externalEventSourceIds?: Resolver<Array<ResolversTypes['String']>, ParentType, ContextType>;
30233023
productSource?: Resolver<ResolversTypes['PRODUCT_SOURCE'], ParentType, ContextType>;
@@ -3228,7 +3228,7 @@ export declare type MarketingCampaignResolvers<ContextType = any, ParentType ext
32283228
status?: Resolver<ResolversTypes['MarketingCampaignStatus'], ParentType, ContextType>;
32293229
creativeSpec?: Resolver<ResolversTypes['JSONObject'], ParentType, ContextType>;
32303230
runTimeSpec?: Resolver<Maybe<ResolversTypes['JSONObject']>, ParentType, ContextType>;
3231-
locationSpec?: Resolver<ResolversTypes['JSONObject'], ParentType, ContextType>;
3231+
locationSpec?: Resolver<Maybe<ResolversTypes['JSONObject']>, ParentType, ContextType>;
32323232
conversionSpec?: Resolver<Maybe<ResolversTypes['JSONObject']>, ParentType, ContextType>;
32333233
startDate?: Resolver<ResolversTypes['DateISO'], ParentType, ContextType>;
32343234
endDate?: Resolver<Maybe<ResolversTypes['DateISO']>, ParentType, ContextType>;
@@ -3262,7 +3262,7 @@ export declare type MarketingCampaignSnapshotResolvers<ContextType = any, Parent
32623262
status?: Resolver<ResolversTypes['MarketingCampaignStatus'], ParentType, ContextType>;
32633263
creativeSpec?: Resolver<ResolversTypes['JSONObject'], ParentType, ContextType>;
32643264
runTimeSpec?: Resolver<Maybe<ResolversTypes['JSONObject']>, ParentType, ContextType>;
3265-
locationSpec?: Resolver<ResolversTypes['JSONObject'], ParentType, ContextType>;
3265+
locationSpec?: Resolver<Maybe<ResolversTypes['JSONObject']>, ParentType, ContextType>;
32663266
kpi?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
32673267
productIds?: Resolver<Maybe<Array<ResolversTypes['ObjectId']>>, ParentType, ContextType>;
32683268
};
@@ -3319,7 +3319,7 @@ export declare type MediaChannelResolvers<ContextType = any, ParentType extends
33193319
warnings?: Resolver<Maybe<Array<ResolversTypes['JSONObject']>>, ParentType, ContextType>;
33203320
platform?: Resolver<ResolversTypes['Platform'], ParentType, ContextType>;
33213321
remoteId?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
3322-
remoteState?: Resolver<ResolversTypes['JSONObject'], ParentType, ContextType>;
3322+
remoteState?: Resolver<Maybe<ResolversTypes['JSONObject']>, ParentType, ContextType>;
33233323
currency?: Resolver<Maybe<ResolversTypes['NonEmptyString']>, ParentType, ContextType>;
33243324
currencyCode?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
33253325
currencySymbol?: Resolver<Maybe<ResolversTypes['NonEmptyString']>, ParentType, ContextType>;
@@ -3481,7 +3481,7 @@ export declare type ProductResolvers<ContextType = any, ParentType extends Resol
34813481
name?: Resolver<ResolversTypes['NonEmptyString'], ParentType, ContextType>;
34823482
sku?: Resolver<ResolversTypes['NonEmptyString'], ParentType, ContextType>;
34833483
remoteState?: Resolver<Maybe<ResolversTypes['JSONObject']>, ParentType, ContextType>;
3484-
metadata?: Resolver<ResolversTypes['JSONObject'], ParentType, ContextType>;
3484+
metadata?: Resolver<Maybe<ResolversTypes['JSONObject']>, ParentType, ContextType>;
34853485
imported?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType>;
34863486
results?: Resolver<ResolversTypes['ResultConnection'], ParentType, ContextType, RequireFields<ProductResultsArgs, 'breakdown'>>;
34873487
marketingCampaigns?: Resolver<ResolversTypes['MarketingCampaignConnection'], ParentType, ContextType, RequireFields<ProductMarketingCampaignsArgs, 'showDeleted'>>;

‎src/generated/graphql.ts

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ export type CampaignTemplate = {
200200
/** The custom key performance indicator used to derive results data */
201201
kpi?: Maybe<Scalars['String']>;
202202
/** Marketplace the campaign template was created for */
203-
marketplace: Marketplace;
203+
marketplace?: Maybe<Marketplace>;
204204
/** Marketing campaigns that are using this campaign template */
205205
marketingCampaigns: MarketingCampaignConnection;
206206
/** Historical list of GCPX rates */
@@ -261,15 +261,15 @@ export type Catalog = {
261261
/** Date and time of last updated */
262262
lastChangeDate: Scalars['DateISO'];
263263
/** Name of the product catalog */
264-
name: Scalars['NonEmptyString'];
264+
name?: Maybe<Scalars['String']>;
265265
/** Category of the products referenced by the product catalog */
266-
catalogType: CatalogType;
266+
catalogType?: Maybe<CatalogType>;
267267
/** Id of the product catalog on the related platform */
268268
remoteId?: Maybe<Scalars['String']>;
269269
/** System status of the product catalog */
270270
systemStatus: SystemStatus;
271271
/** Data related to the product catalog stored on the remote platform */
272-
remoteState: Scalars['JSONObject'];
272+
remoteState?: Maybe<Scalars['JSONObject']>;
273273
/** Facebook data feed id referenced by the product catalog */
274274
dataFeedId?: Maybe<Scalars['String']>;
275275
/** Facebook app and pixel ids associated to the product catalog */
@@ -937,7 +937,7 @@ export type MarketingCampaign = ResultResource &
937937
/** Marketing campaign scheduling data. [Run Time Specification](https://docs.adgo.io/API/MarketingCampaign#marketingcampaign-run-time-specification-runtimespec) */
938938
runTimeSpec?: Maybe<Scalars['JSONObject']>;
939939
/** Marketing campaign location data. [Location Specification](https://docs.adgo.io/API/MarketingCampaign#marketingcampaign-location-specification-locationspec) */
940-
locationSpec: Scalars['JSONObject'];
940+
locationSpec?: Maybe<Scalars['JSONObject']>;
941941
/** Marketing campaign GCPX data. [Conversion Specification](https://docs.adgo.io/API/MarketingCampaign#marketingcampaign-conversion-specification-conversionspec) */
942942
conversionSpec?: Maybe<Scalars['JSONObject']>;
943943
/** Start date of the campaign */
@@ -1083,7 +1083,7 @@ export type MarketingCampaignSnapshot = {
10831083
/** Marketing campaign scheduling data. [Run Time Specification](https://docs.adgo.io/API/MarketingCampaign#marketingcampaign-run-time-specification-runtimespec) */
10841084
runTimeSpec?: Maybe<Scalars['JSONObject']>;
10851085
/** Marketing campaign location data. [Location Specification](https://docs.adgo.io/API/MarketingCampaign#marketingcampaign-location-specification-locationspec) */
1086-
locationSpec: Scalars['JSONObject'];
1086+
locationSpec?: Maybe<Scalars['JSONObject']>;
10871087
/** The key performance indicator used to determine analytics results */
10881088
kpi?: Maybe<Scalars['String']>;
10891089
/** Product ids */
@@ -1320,7 +1320,7 @@ export type MediaChannel = EntitlementResource & {
13201320
/** Id of the media channel on the corresponding platform */
13211321
remoteId?: Maybe<Scalars['String']>;
13221322
/** Data related to the media channel stored on the remote platform */
1323-
remoteState: Scalars['JSONObject'];
1323+
remoteState?: Maybe<Scalars['JSONObject']>;
13241324
/** Currency code of the media channel */
13251325
currency?: Maybe<Scalars['NonEmptyString']>;
13261326
/** Currency code of the media channel */
@@ -2115,7 +2115,7 @@ export type Product = ResultResource & {
21152115
/** Data related to the product stored on the remote platform */
21162116
remoteState?: Maybe<Scalars['JSONObject']>;
21172117
/** Data related to the product. [Product Metadata](https://docs.adgo.io/API/ProductMetadata) */
2118-
metadata: Scalars['JSONObject'];
2118+
metadata?: Maybe<Scalars['JSONObject']>;
21192119
/** True if the product was created externally and imported */
21202120
imported: Scalars['Boolean'];
21212121
/** Results related to the product */
@@ -3367,7 +3367,7 @@ export type CampaignTemplateResolvers<
33673367
>;
33683368
kpi?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
33693369
marketplace?: Resolver<
3370-
ResolversTypes['Marketplace'],
3370+
Maybe<ResolversTypes['Marketplace']>,
33713371
ParentType,
33723372
ContextType
33733373
>;
@@ -3426,9 +3426,9 @@ export type CatalogResolvers<
34263426
ParentType,
34273427
ContextType
34283428
>;
3429-
name?: Resolver<ResolversTypes['NonEmptyString'], ParentType, ContextType>;
3429+
name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
34303430
catalogType?: Resolver<
3431-
ResolversTypes['CatalogType'],
3431+
Maybe<ResolversTypes['CatalogType']>,
34323432
ParentType,
34333433
ContextType
34343434
>;
@@ -3443,7 +3443,7 @@ export type CatalogResolvers<
34433443
ContextType
34443444
>;
34453445
remoteState?: Resolver<
3446-
ResolversTypes['JSONObject'],
3446+
Maybe<ResolversTypes['JSONObject']>,
34473447
ParentType,
34483448
ContextType
34493449
>;
@@ -4057,7 +4057,7 @@ export type MarketingCampaignResolvers<
40574057
ContextType
40584058
>;
40594059
locationSpec?: Resolver<
4060-
ResolversTypes['JSONObject'],
4060+
Maybe<ResolversTypes['JSONObject']>,
40614061
ParentType,
40624062
ContextType
40634063
>;
@@ -4175,7 +4175,7 @@ export type MarketingCampaignSnapshotResolvers<
41754175
ContextType
41764176
>;
41774177
locationSpec?: Resolver<
4178-
ResolversTypes['JSONObject'],
4178+
Maybe<ResolversTypes['JSONObject']>,
41794179
ParentType,
41804180
ContextType
41814181
>;
@@ -4366,7 +4366,7 @@ export type MediaChannelResolvers<
43664366
ContextType
43674367
>;
43684368
remoteState?: Resolver<
4369-
ResolversTypes['JSONObject'],
4369+
Maybe<ResolversTypes['JSONObject']>,
43704370
ParentType,
43714371
ContextType
43724372
>;
@@ -5064,7 +5064,11 @@ export type ProductResolvers<
50645064
ParentType,
50655065
ContextType
50665066
>;
5067-
metadata?: Resolver<ResolversTypes['JSONObject'], ParentType, ContextType>;
5067+
metadata?: Resolver<
5068+
Maybe<ResolversTypes['JSONObject']>,
5069+
ParentType,
5070+
ContextType
5071+
>;
50685072
imported?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType>;
50695073
results?: Resolver<
50705074
ResolversTypes['ResultConnection'],

0 commit comments

Comments
 (0)