Skip to content

Commit ddb2fb6

Browse files
committed
Merge remote-tracking branch 'origin/main' into app-deployment-delta-adjustments
2 parents 20048f6 + 9708f71 commit ddb2fb6

File tree

2,004 files changed

+59533
-125369
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,004 files changed

+59533
-125369
lines changed

.changeset/bright-buses-say.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'hive': patch
3+
---
4+
5+
Update [`nodemailer`](https://github.com/nodemailer/nodemailer) to address vulnerability
6+
[GHSA-vvjj-xcjg-gr5g](https://github.com/advisories/GHSA-vvjj-xcjg-gr5g).

.changeset/deep-lies-happen.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
'hive': patch
3+
---
4+
5+
Fix schema contract composition applying `@inaccessible` on the federation types `ContextArgument` and `FieldValue` on the supergraph SDL.
6+
7+
This mitigates the following error in apollo-router upon processing the supergraph:
8+
9+
```
10+
could not create router: Api error(s): The supergraph schema failed to produce a valid API schema: The following errors occurred:
11+
- Core feature type `join__ContextArgument` cannot use @inaccessible.
12+
- Core feature type `join__FieldValue` cannot use @inaccessible.
13+
```

.changeset/fine-pens-lead.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/late-kiwis-dig.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

.changeset/slimy-trams-search.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

.changeset/stale-cooks-talk.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
'hive': patch
3+
---
4+
5+
Update [`opentelemetry-go`](https://github.com/open-telemetry/opentelemetry-go) to address vulnerability
6+
[CVE-2026-39883](https://github.com/advisories/GHSA-hfvc-g4fc-pqhx).

.eslintrc.cjs

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ module.exports = {
4646
'rules',
4747
'out',
4848
'.hive',
49+
'packages/web/app/.ladle/**',
4950
'public',
5051
'packages/web/app/src/graphql/index.ts',
5152
'packages/libraries/cli/src/sdk.ts',
@@ -54,6 +55,8 @@ module.exports = {
5455
'packages/web/app/src/gql/**/*',
5556
'codegen.cjs',
5657
'tsup',
58+
'packages/libraries/render-laboratory/src/laboratory.ts',
59+
'packages/web/app/vite.config.ts',
5760
],
5861
overrides: [
5962
{
@@ -65,6 +68,10 @@ module.exports = {
6568
schema: SCHEMA_PATH,
6669
operations: OPERATIONS_PATHS,
6770
},
71+
rules: {
72+
'@graphql-eslint/no-deprecated': 'error',
73+
'@graphql-eslint/require-id-when-available': 'error',
74+
},
6875
},
6976
{
7077
// Setup processor for operations/fragments definitions on code-files
@@ -75,8 +82,8 @@ module.exports = {
7582
files: ['packages/web/app/**/*.graphql'],
7683
plugins: ['@graphql-eslint'],
7784
rules: {
78-
'@graphql-eslint/require-id-when-available': 'error',
7985
'@graphql-eslint/no-deprecated': 'error',
86+
'@graphql-eslint/require-id-when-available': 'error',
8087
},
8188
},
8289
{
@@ -108,6 +115,8 @@ module.exports = {
108115
'packages/migrations/**',
109116
// We bundle it all anyway, so there are no node_modules
110117
'packages/web/app/**',
118+
// We bundle it all anyway, so there are no node_modules
119+
'packages/libraries/laboratory/**',
111120
'**/*.spec.ts',
112121
'**/*.test.ts',
113122
'**/*.e2e.ts',
@@ -141,6 +150,16 @@ module.exports = {
141150
'@typescript-eslint/no-empty-function': 'off',
142151
'@typescript-eslint/ban-types': 'off',
143152
'@typescript-eslint/triple-slash-reference': 'off',
153+
'@typescript-eslint/no-unused-vars': [
154+
'error',
155+
{
156+
argsIgnorePattern: '^_',
157+
caughtErrors: 'none',
158+
caughtErrorsIgnorePattern: '^_',
159+
destructuredArrayIgnorePattern: '^_',
160+
varsIgnorePattern: '^_',
161+
},
162+
],
144163
},
145164
},
146165
{
@@ -161,7 +180,7 @@ module.exports = {
161180
rules: {
162181
// conflicts with official prettier-plugin-tailwindcss and tailwind v3
163182
'better-tailwindcss/enforce-consistent-class-order': 'off',
164-
'better-tailwindcss/enforce-canonical-classes': 'warn',
183+
'better-tailwindcss/enforce-canonical-classes': 'off',
165184
// keeping classes in one line helps prettier-plugin-tailwindcss
166185
// enable wrapping in text editors to make classes human readable
167186
'better-tailwindcss/enforce-consistent-line-wrapping': 'off',
@@ -214,10 +233,6 @@ module.exports = {
214233
{
215234
ignore: [
216235
'drag-none',
217-
// Tailwind v4 semantic colors from @theme in index.css
218-
// Regex patterns to match all utility variants (bg-*, text-*, border-*, etc.)
219-
// Includes optional opacity modifier (/40, /60, etc.)
220-
'(bg|text|border|ring|outline|shadow|from|via|to|fill|stroke|caret|accent|divide|placeholder)-(background|foreground|card|card-foreground|popover|popover-foreground|primary|primary-foreground|secondary|secondary-foreground|muted|muted-foreground|accent|accent-foreground|destructive|destructive-foreground|border|input|ring|sidebar|sidebar-background|sidebar-foreground|sidebar-primary|sidebar-primary-foreground|sidebar-accent|sidebar-accent-foreground|sidebar-border|sidebar-ring|chart-1|chart-2)(/.*)?',
221236
// Animation utilities (from index.css, replaces tailwindcss-animate)
222237
'animate-in',
223238
'animate-out',

.github/actions/setup/action.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,15 @@ runs:
2525
- name: check pnpm version
2626
shell: bash
2727
id: pnpm
28+
env:
29+
INSTALL_DEPENDENCIES: ${{ inputs.installDependencies }}
2830
run: |
2931
PNPM_VERSION=$(cat package.json | jq -r '.packageManager' | awk -F@ '{print $2}')
3032
PNPM_VERSION=${PNPM_VERSION:-9}
3133
echo "Using PNPM version $PNPM_VERSION"
3234
echo "version=$PNPM_VERSION" >> $GITHUB_OUTPUT
3335
34-
if [ ${{ inputs.installDependencies }} = true ]; then
36+
if [ $INSTALL_DEPENDENCIES = true ]; then
3537
echo "cache=pnpm" >> $GITHUB_OUTPUT
3638
else
3739
echo "cache=" >> $GITHUB_OUTPUT
@@ -54,6 +56,12 @@ runs:
5456
working-directory: ${{ inputs.workingDirectory }}
5557
run: pnpm install --frozen-lockfile
5658

59+
- name: build laboratory
60+
shell: bash
61+
if: ${{ inputs.buildLaboratory == 'true' }}
62+
working-directory: ${{ inputs.workingDirectory }}
63+
run: pnpm turbo build --filter=./packages/libraries/laboratory --color
64+
5765
- name: generate graphql types
5866
if: ${{ inputs.codegen == 'true' }}
5967
shell: bash

.github/workflows/build-and-dockerize.yaml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,13 +220,18 @@ jobs:
220220
password: ${{ secrets.GITHUB_TOKEN }}
221221

222222
- name: 'publish docker multiarch manifest (tag: ${{ inputs.imageTag }})'
223+
env:
224+
TARGETS: ${{ inputs.targets }}
225+
REGISTRY: ${{ inputs.registry }}
226+
IMAGE_NAME: ${{ inputs.imageName }}
227+
IMAGE_TAG: ${{ inputs.imageTag }}
223228
run: |
224-
targets=$(docker buildx bake -f docker/docker.hcl --print "${{ inputs.targets }}" | jq -r '.group."${{ inputs.targets }}".targets[]')
229+
targets=$(docker buildx bake -f docker/docker.hcl --print "$TARGETS" | jq -r '.group."'"$TARGETS"'".targets[]')
225230
226231
for target in $targets
227232
do
228233
echo "publishing multi-arch manifest for $target"
229-
image_name="${{ inputs.registry }}/${{ inputs.imageName }}/$target:${{ inputs.imageTag }}"
234+
image_name="$REGISTRY/$IMAGE_NAME/$target:$IMAGE_TAG"
230235
echo "image name: $image_name"
231236
232237
docker manifest create $image_name --amend "$image_name-arm64" --amend "$image_name-amd64"
@@ -235,13 +240,17 @@ jobs:
235240
236241
- name: 'publish docker multiarch manifest (tag: latest)'
237242
if: ${{ inputs.publishLatest }}
243+
env:
244+
TARGETS: ${{ inputs.targets }}
245+
REGISTRY: ${{ inputs.registry }}
246+
IMAGE_NAME: ${{ inputs.imageName }}
238247
run: |
239-
targets=$(docker buildx bake -f docker/docker.hcl --print "${{ inputs.targets }}" | jq -r '.group."${{ inputs.targets }}".targets[]')
248+
targets=$(docker buildx bake -f docker/docker.hcl --print "$TARGETS" | jq -r '.group."'"$TARGETS"'".targets[]')
240249
241250
for target in $targets
242251
do
243252
echo "publishing multi-arch manifest for $target"
244-
image_name="${{ inputs.registry }}/${{ inputs.imageName }}/$target:latest"
253+
image_name="$REGISTRY/$IMAGE_NAME/$target:latest"
245254
echo "image name: $image_name"
246255
247256
docker manifest create $image_name --amend "$image_name-arm64" --amend "$image_name-amd64"

.github/workflows/main.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,6 @@ jobs:
7474
typescript:
7575
uses: ./.github/workflows/typescript-typecheck.yaml
7676

77-
# Deploy Website to CloudFlare Pages
78-
website:
79-
uses: ./.github/workflows/website.yaml
80-
secrets: inherit
81-
82-
# Deploy Storybook to CloudFlare Pages
83-
storybook:
84-
uses: ./.github/workflows/storybook.yaml
85-
secrets: inherit
86-
8777
# GraphQL Schema Publish
8878
graphql-schema:
8979
uses: ./.github/workflows/graphql-schema-publish.yaml

0 commit comments

Comments
 (0)