Skip to content

Commit

Permalink
Merge pull request #2593 from Bedrock-Layouts/update-dependencies
Browse files Browse the repository at this point in the history
chore: this updates dependencies and fixes nx cloud issues
  • Loading branch information
Jarvis1010 authored Feb 7, 2025
2 parents a776927 + be07c23 commit 0399851
Show file tree
Hide file tree
Showing 31 changed files with 3,178 additions and 3,882 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
GH_TOKEN: ${{secrets.GH_TOKEN}}
strategy:
matrix:
node-version: [20.x]
node-version: [22.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lts/iron
lts/jod
41 changes: 26 additions & 15 deletions nx.json
Original file line number Diff line number Diff line change
@@ -1,19 +1,30 @@
{
"tasksRunnerOptions": {
"default": {
"runner": "@nrwl/nx-cloud",
"options": {
"cacheableOperations": [
"test",
"test:coverage",
"verify",
"check-types",
"lint",
"check-format",
"knip"
],
"accessToken": "NzI4NTdmYmYtMTMyZS00YjE4LWE4OTEtMDcyZjUxZDVmNmVifHJlYWQtd3JpdGU="
}
"nxCloudAccessToken": "NzI4NTdmYmYtMTMyZS00YjE4LWE4OTEtMDcyZjUxZDVmNmVifHJlYWQtd3JpdGU=",
"targetDefaults": {
"test": {
"cache": true
},
"test:coverage": {
"cache": true
},
"verify": {
"cache": true
},
"check-types": {
"cache": true
},
"lint": {
"cache": true
},
"check-format": {
"cache": true
},
"knip": {
"cache": true
},
"build": {
"cache": false,
"dependsOn": ["^build"]
}
}
}
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,11 @@
"@vitest/coverage-c8": "^0.33.0",
"dedent": "^1.3.0",
"highlight.js": "^11.10.0",
"nx": "^19.6.5",
"nx": "^20.4.1",
"open-props": "^1.7.5"
},
"devDependencies": {
"@chromaui/addon-visual-tests": "^1.0.0",
"@nrwl/nx-cloud": "^19.1.0",
"@solidjs/router": "^0.9.1",
"@storybook/addon-actions": "^8.2.9",
"@storybook/addon-essentials": "^8.2.9",
Expand Down
3 changes: 2 additions & 1 deletion packages/appboundary/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,6 @@
"bugs": {
"url": "https://github.com/Bedrock-Layouts/Bedrock/issues"
},
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10"
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10",
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/center/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,6 @@
"bugs": {
"url": "https://github.com/Bedrock-Layouts/Bedrock/issues"
},
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10"
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10",
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/column-drop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,6 @@
"bugs": {
"url": "https://github.com/Bedrock-Layouts/Bedrock/issues"
},
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10"
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10",
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/columns/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,6 @@
"bugs": {
"url": "https://github.com/Bedrock-Layouts/Bedrock/issues"
},
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10"
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10",
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/cover/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,6 @@
"bugs": {
"url": "https://github.com/Bedrock-Layouts/Bedrock/issues"
},
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10"
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10",
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/css/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@
},
"bugs": {
"url": "https://github.com/Bedrock-Layouts/Bedrock/issues"
}
},
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/frame/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,6 @@
"bugs": {
"url": "https://github.com/Bedrock-Layouts/Bedrock/issues"
},
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10"
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10",
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/grid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,6 @@
"bugs": {
"url": "https://github.com/Bedrock-Layouts/Bedrock/issues"
},
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10"
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10",
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/inline-cluster/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,6 @@
"bugs": {
"url": "https://github.com/Bedrock-Layouts/Bedrock/issues"
},
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10"
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10",
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/inline/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,6 @@
"bugs": {
"url": "https://github.com/Bedrock-Layouts/Bedrock/issues"
},
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10"
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10",
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/masonry-grid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,5 +62,6 @@
"bugs": {
"url": "https://github.com/Bedrock-Layouts/Bedrock/issues"
},
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10"
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10",
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/padbox/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,6 @@
"bugs": {
"url": "https://github.com/Bedrock-Layouts/Bedrock/issues"
},
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10"
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10",
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/primitives/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,5 +81,6 @@
"bugs": {
"url": "https://github.com/Bedrock-Layouts/Bedrock/issues"
},
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10"
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10",
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/reel/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,6 @@
"bugs": {
"url": "https://github.com/Bedrock-Layouts/Bedrock/issues"
},
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10"
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10",
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/register-resize-callback/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,6 @@
"bugs": {
"url": "https://github.com/Bedrock-Layouts/Bedrock/issues"
},
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10"
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10",
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/solid-doc-site/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,6 @@
},
"bugs": {
"url": "https://github.com/Bedrock-Layouts/Solid-Bedrock/issues"
}
},
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/solid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,6 @@
"bugs": {
"url": "https://github.com/Bedrock-Layouts/Solid-Bedrock/issues"
},
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10"
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10",
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/spacing-constants/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,6 @@
"bugs": {
"url": "https://github.com/Bedrock-Layouts/Bedrock/issues"
},
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10"
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10",
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/split/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,6 @@
"bugs": {
"url": "https://github.com/Bedrock-Layouts/Bedrock/issues"
},
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10"
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10",
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/stack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,6 @@
"bugs": {
"url": "https://github.com/Bedrock-Layouts/Bedrock/issues"
},
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10"
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10",
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/type-utils/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,6 @@
"peerDependencies": {
"react": "^16.8 || ^17 || ^18"
},
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10"
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10",
"nx": {}
}
5 changes: 4 additions & 1 deletion packages/type-utils/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,10 @@ export function forwardRefWithAs<C extends React.ElementType, Props = {}>(
ref: PolymorphicRef<C>,
) => React.ReactElement | null,
) {
return React.forwardRef(render) as PolymorphicForwardedRefComponent<C, Props>;
return React.forwardRef(render as any) as PolymorphicForwardedRefComponent<
C,
Props
>;
}

export type Maybe<T> = NonNullable<T> | undefined;
Expand Down
3 changes: 2 additions & 1 deletion packages/use-container-query/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,6 @@
"@bedrock-layout/use-forwarded-ref": "^2.0.15",
"@bedrock-layout/use-resize-observer": "^2.0.16"
},
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10"
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10",
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/use-forwarded-ref/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,6 @@
"dependencies": {
"@bedrock-layout/use-stateful-ref": "^2.0.15"
},
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10"
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10",
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/use-resize-observer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,6 @@
"@bedrock-layout/register-resize-callback": "^2.0.13",
"@bedrock-layout/use-stateful-ref": "^2.0.15"
},
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10"
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10",
"nx": {}
}
3 changes: 2 additions & 1 deletion packages/use-stateful-ref/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,5 +56,6 @@
"peerDependencies": {
"react": "^16.8 || ^17 || ^18"
},
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10"
"gitHead": "a3f85a5aebbd9681317b1c00c88765b2537f9b10",
"nx": {}
}
Loading

0 comments on commit 0399851

Please sign in to comment.