Skip to content

Commit 0700a8e

Browse files
authored
Merge branch 'master' into refactor/normalize-package-manager-usage
2 parents 5deff99 + c0314ab commit 0700a8e

File tree

8 files changed

+3776
-302
lines changed

8 files changed

+3776
-302
lines changed

.circleci/config.yml

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,10 @@ jobs:
1111
- image: cimg/node:18.19-browsers
1212
steps:
1313
- checkout
14-
- browser-tools/install-chrome
15-
- browser-tools/install-chromedriver
14+
- vault/get-secrets: # Loads vault secrets
15+
template-preset: 'packages-read'
16+
- run: echo "//npm.pkg.github.com/:_authToken=${GITHUB_PACKAGES_READ_TOKEN}" > ~/.npmrc
17+
- run: echo "@contentful:registry=https://npm.pkg.github.com" >> ~/.npmrc
1618
- node/install-packages
1719
- run: npm run lint
1820
- run: npm run prettier:check
@@ -25,6 +27,12 @@ jobs:
2527
- image: cimg/node:18.19
2628
steps:
2729
- checkout
30+
- node/install:
31+
node-version: '18.17'
32+
- vault/get-secrets: # Loads vault secrets
33+
template-preset: 'packages-read'
34+
- run: echo "//npm.pkg.github.com/:_authToken=${GITHUB_PACKAGES_READ_TOKEN}" > ~/.npmrc
35+
- run: echo "@contentful:registry=https://npm.pkg.github.com" >> ~/.npmrc
2836
- node/install-packages
2937
- run: npm run test:unit
3038

@@ -33,6 +41,12 @@ jobs:
3341
- image: cimg/node:18.19
3442
steps:
3543
- checkout
44+
- node/install:
45+
node-version: '18.17'
46+
- vault/get-secrets: # Loads vault secrets
47+
template-preset: 'packages-read'
48+
- run: echo "//npm.pkg.github.com/:_authToken=${GITHUB_PACKAGES_READ_TOKEN}" > ~/.npmrc
49+
- run: echo "@contentful:registry=https://npm.pkg.github.com" >> ~/.npmrc
3650
- node/install-packages
3751
- run: npm run test:integration
3852

@@ -45,6 +59,8 @@ jobs:
4559
- browser-tools/install-chromedriver
4660
- vault/get-secrets: # Loads vault secrets
4761
template-preset: 'semantic-release-ecosystem'
62+
- run: echo "//npm.pkg.github.com/:_authToken=${GITHUB_PACKAGES_WRITE_TOKEN}" > ~/.npmrc
63+
- run: echo "@contentful:registry=https://npm.pkg.github.com" >> ~/.npmrc
4864
- node/install-packages
4965
- run: npm run build
5066
- run: npm run semantic-release
@@ -53,9 +69,12 @@ workflows:
5369
version: 2
5470
build_and_test:
5571
jobs:
56-
- lint
57-
- unit
58-
- integration
72+
- lint:
73+
context: vault
74+
- unit:
75+
context: vault
76+
- integration:
77+
context: vault
5978
- release:
6079
context: vault
6180
requires:

.github/dependabot.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
version: 2
2-
2+
registries:
3+
npm-github:
4+
type: npm-registry
5+
url: https://npm.pkg.github.com
6+
token: ${{secrets.NPM_REGISTRY_REGISTRY_GH_ORG_TOKEN}}
37
updates:
48
- package-ecosystem: npm
9+
registries:
10+
- npm-github
511
directory: "/"
612
schedule:
713
interval: daily

lib/types/query/query.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ export type MetadataTagsQueries =
6666
| ConditionalFixedQueries<Pick<Metadata, 'tags'>, any, boolean, 'metadata', '[exists]'>
6767
| ConditionalListQueries<Pick<TagLink, 'id'>, any, 'metadata.tags.sys', '[all]'>
6868
| ConditionalListQueries<Pick<TagLink, 'id'>, any, 'metadata.tags.sys', '[in]'>
69+
| ConditionalListQueries<Pick<TagLink, 'id'>, any, 'metadata.tags.sys', '[nin]'>
6970

7071
/**
7172
* All queries appliable to entry fields

0 commit comments

Comments
 (0)