Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
afd725c
Bump @octokit/webhooks from 13.3.0 to 13.4.1 in the octokit group
dependabot[bot] Dec 9, 2024
9fc1f41
Merge pull request #455 from shapehq/dependabot/npm_and_yarn/octokit-…
ulrikandersen Dec 11, 2024
6048ea7
Bump next from 14.2.13 to 14.2.20
dependabot[bot] Dec 18, 2024
3e99ab2
Bump the typescript-eslint group across 1 directory with 2 updates
dependabot[bot] Jan 20, 2025
ff5c085
Bump undici from 6.19.7 to 6.21.1
dependabot[bot] Jan 21, 2025
fa7f7ec
Merge pull request #478 from shapehq/dependabot/npm_and_yarn/undici-6…
simonbs Jan 22, 2025
3f566ab
Merge branch 'develop' into dependabot/npm_and_yarn/typescript-eslint…
simonbs Jan 22, 2025
073a54a
Merge branch 'develop' into dependabot/npm_and_yarn/next-14.2.20
simonbs Jan 22, 2025
0fefa95
Merge pull request #476 from shapehq/dependabot/npm_and_yarn/typescri…
simonbs Jan 22, 2025
70224c2
Bump yaml from 2.6.0 to 2.7.0
dependabot[bot] Jan 22, 2025
69ba582
Merge branch 'develop' into dependabot/npm_and_yarn/next-14.2.20
simonbs Jan 22, 2025
57f9077
Merge pull request #472 from shapehq/dependabot/npm_and_yarn/yaml-2.7.0
simonbs Jan 22, 2025
65a7771
Merge branch 'develop' into dependabot/npm_and_yarn/next-14.2.20
simonbs Jan 22, 2025
10af04b
Merge pull request #463 from shapehq/dependabot/npm_and_yarn/next-14.…
simonbs Jan 22, 2025
02d6e4c
Bump nanoid from 3.3.7 to 3.3.8
dependabot[bot] Jan 22, 2025
903a20a
Bump the mui group across 1 directory with 2 updates
dependabot[bot] Jan 22, 2025
3235e5d
Merge pull request #480 from shapehq/dependabot/npm_and_yarn/mui-6e2b…
simonbs Jan 22, 2025
68ac3cf
Merge branch 'develop' into dependabot/npm_and_yarn/nanoid-3.3.8
simonbs Jan 22, 2025
383f7b1
Merge pull request #479 from shapehq/dependabot/npm_and_yarn/nanoid-3…
simonbs Jan 22, 2025
fb3c968
Bump the typescript-eslint group with 2 updates
dependabot[bot] Jan 27, 2025
a25c468
Merge pull request #483 from shapehq/dependabot/npm_and_yarn/typescri…
simonbs Jan 27, 2025
2646888
Bump the octokit group with 3 updates
dependabot[bot] Jan 27, 2025
83b4768
Merge pull request #482 from shapehq/dependabot/npm_and_yarn/octokit-…
simonbs Jan 27, 2025
b1b5c8b
Bump the fontawesome group with 4 updates
dependabot[bot] Jan 27, 2025
e35bae0
Merge pull request #481 from shapehq/dependabot/npm_and_yarn/fontawes…
simonbs Jan 27, 2025
b61e06c
Bump the mui group with 2 updates
dependabot[bot] Feb 3, 2025
fae89fb
Merge pull request #486 from shapehq/dependabot/npm_and_yarn/mui-9885…
simonbs Feb 3, 2025
d5fdb97
Bump the typescript-eslint group with 2 updates
dependabot[bot] Feb 3, 2025
3f7f877
Merge pull request #487 from shapehq/dependabot/npm_and_yarn/typescri…
simonbs Feb 3, 2025
0fecb35
Updates node and npm
simonbs Feb 3, 2025
20a826d
Updates Octokit
simonbs Feb 3, 2025
bfc402a
Removes dependency on Stoplight
simonbs Feb 3, 2025
541f93d
Removes dependency on Stoplight
simonbs Feb 3, 2025
b902563
Removes Stoplight dependency
simonbs Feb 3, 2025
a26da74
Installs dependencies
simonbs Feb 3, 2025
bfe9792
Updates Octokit
simonbs Feb 3, 2025
57e7b4a
Installs dependencies
simonbs Feb 3, 2025
8f0df10
Merge branch 'enhancement/pin-octokit' into enhancement/remove-stopli…
simonbs Feb 3, 2025
1dad9d1
Fixes build errors
simonbs Feb 3, 2025
895abb2
Merge branch 'enhancement/remove-stoplight-dependency' into update
simonbs Feb 3, 2025
c376d4b
Updates Next
simonbs Feb 3, 2025
d2afe2b
Pins version of Elements fetched through unpkg
simonbs Feb 3, 2025
ffb6241
Compiles with Next 15
simonbs Feb 3, 2025
a696544
Merge pull request #489 from shapehq/enhancement/remove-stoplight-dep…
simonbs Feb 3, 2025
cb7f89b
Reverts engine
simonbs Feb 3, 2025
4f63348
Merge branch 'develop' into enhancement/next15
simonbs Feb 3, 2025
8cc5d71
Updates ESLint
simonbs Feb 3, 2025
4ff363e
Merge branch 'enhancement/next15' of github.com:shapehq/framna-docs i…
simonbs Feb 3, 2025
bbb7c81
Uses Node v22
simonbs Feb 3, 2025
20d564d
Merge pull request #490 from shapehq/enhancement/next15
simonbs Feb 3, 2025
40d8a3b
Merge branch 'develop' into enhancement/node22
ulrikandersen Feb 3, 2025
3798a44
Merge pull request #492 from shapehq/enhancement/node22
ulrikandersen Feb 3, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22
- name: Setup Environment
run: cp .env.example .env.local
- name: Install Dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20
node-version: 22
- name: Install Dependencies
run: npm install
- name: Run Unit Tests
Expand Down
18,840 changes: 6,744 additions & 12,096 deletions package-lock.json

Large diffs are not rendered by default.

35 changes: 17 additions & 18 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"version": "1.0.0",
"private": true,
"engines": {
"node": "20.8.1",
"npm": "10.1.0"
"node": "22.13.1",
"npm": "11.1.0"
},
"scripts": {
"dev": "next dev",
Expand All @@ -18,28 +18,27 @@
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@fontsource/poppins": "^5.1.0",
"@fortawesome/fontawesome-svg-core": "^6.7.1",
"@fortawesome/free-brands-svg-icons": "^6.7.1",
"@fortawesome/free-regular-svg-icons": "^6.7.1",
"@fortawesome/free-solid-svg-icons": "^6.7.1",
"@fortawesome/fontawesome-svg-core": "^6.7.2",
"@fortawesome/free-brands-svg-icons": "^6.7.2",
"@fortawesome/free-regular-svg-icons": "^6.7.2",
"@fortawesome/free-solid-svg-icons": "^6.7.2",
"@fortawesome/react-fontawesome": "^0.2.2",
"@mui/icons-material": "^6.1.8",
"@mui/icons-material": "^6.4.2",
"@mui/material": "^6.0.1",
"@octokit/auth-app": "^7.1.3",
"@octokit/core": "^6.1.2",
"@octokit/webhooks": "^13.3.0",
"@stoplight/elements": "^8.4.5",
"@octokit/auth-app": "^7.1.4",
"@octokit/core": "^6.1.3",
"@octokit/webhooks": "~13.4.3",
"core-js": "^3.39.0",
"encoding": "^0.1.13",
"figma-squircle": "^1.1.0",
"install": "^0.13.0",
"ioredis": "^5.4.1",
"mobx": "^6.13.5",
"next": "^14.2.13",
"next": "^15.1.6",
"next-auth": "^5.0.0-beta.25",
"npm": "^10.9.0",
"nprogress": "^0.2.0",
"octokit": "^4.0.2",
"octokit": "^4.1.0",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"redis-semaphore": "^5.6.0",
Expand All @@ -49,7 +48,7 @@
"swagger-ui-react": "^5.17.14",
"swr": "^2.2.5",
"usehooks-ts": "^3.1.0",
"yaml": "^2.6.0",
"yaml": "^2.7.0",
"zod": "^3.23.8"
},
"devDependencies": {
Expand All @@ -61,11 +60,11 @@
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.0",
"@types/swagger-ui-react": "^4.18.3",
"@typescript-eslint/eslint-plugin": "^8.15.0",
"@typescript-eslint/parser": "^8.15.0",
"@typescript-eslint/eslint-plugin": "^8.22.0",
"@typescript-eslint/parser": "^8.22.0",
"autoprefixer": "^10.4.20",
"eslint": "^8.57.1",
"eslint-config-next": "^14.2.14",
"eslint": "^9.19.0",
"eslint-config-next": "^15.1.6",
"pg": "^8.13.1",
"postcss": "^8.4.41",
"tailwindcss": "^3.4.13",
Expand Down
9 changes: 5 additions & 4 deletions src/app/api/blob/[owner]/[repository]/[...path]/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,16 @@ interface GetBlobParams {
path: [string]
}

export async function GET(req: NextRequest, { params }: { params: GetBlobParams }) {
export async function GET(req: NextRequest, { params }: { params: Promise<GetBlobParams> }) {
const isAuthenticated = await session.getIsAuthenticated()
if (!isAuthenticated) {
return makeUnauthenticatedAPIErrorResponse()
}
const path = params.path.join("/")
const { path: paramsPath, owner, repository } = await params
const path = paramsPath.join("/")
const item = await userGitHubClient.getRepositoryContent({
repositoryOwner: params.owner,
repositoryName: params.repository,
repositoryOwner: owner,
repositoryName: repository,
path: path,
ref: req.nextUrl.searchParams.get("ref") ?? undefined
})
Expand Down
5 changes: 3 additions & 2 deletions src/app/api/remotes/[encodedRemoteConfig]/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,14 @@ interface RemoteSpecificationParams {
encodedRemoteConfig: string
}

export async function GET(_req: NextRequest, { params }: { params: RemoteSpecificationParams }) {
export async function GET(_req: NextRequest, { params }: { params: Promise<RemoteSpecificationParams> }) {
const isAuthenticated = await session.getIsAuthenticated()
if (!isAuthenticated) {
return makeUnauthenticatedAPIErrorResponse()
}

const remoteConfig = remoteConfigEncoder.decode(params.encodedRemoteConfig)
const { encodedRemoteConfig } = await params
const remoteConfig = remoteConfigEncoder.decode(encodedRemoteConfig)

let url: URL
try {
Expand Down
7 changes: 4 additions & 3 deletions src/app/documentation-viewer/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ type SearchParams = { visualizer: string, url: string }
export default async function Page({
searchParams
}: {
searchParams: SearchParams
searchParams: Promise<SearchParams>
}) {
const { visualizer, url } = await searchParams
return (
<DocumentationViewer
visualizer={parseInt(searchParams.visualizer)}
url={searchParams.url}
visualizer={parseInt(visualizer)}
url={url}
/>
)
}
48 changes: 33 additions & 15 deletions src/features/docs/view/Stoplight.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { useEffect, useState } from "react"
import { useEffect, useState, createElement } from "react"
import { Box } from "@mui/material"
import { API } from "@stoplight/elements"
import "@stoplight/elements/styles.min.css"
import LoadingWrapper from "./LoadingWrapper"

const Stoplight = ({ url }: { url: string }) => {
Expand All @@ -27,7 +25,21 @@ const Stoplight = ({ url }: { url: string }) => {
)
}

const ResponsiveStoplight = ({ document }: { document: string }) => {
const ResponsiveStoplight = ({ document: apiDescriptionDocument }: { document: string }) => {
useEffect(() => {
const script = document.createElement("script")
script.src = "https://unpkg.com/@stoplight/[email protected]/web-components.min.js"
script.async = true
document.body.appendChild(script)
const link = document.createElement("link")
link.rel = "stylesheet"
link.href = "https://unpkg.com/@stoplight/[email protected]/styles.min.css"
document.head.appendChild(link)
return () => {
document.body.removeChild(script)
document.head.removeChild(link)
}
}, [])
return (
<>
<Box sx={{
Expand All @@ -36,25 +48,31 @@ const ResponsiveStoplight = ({ document }: { document: string }) => {
height: "100%",
padding: 2
}}>
<API
apiDescriptionDocument={document}
router="hash"
layout="stacked"
/>
<ElementsAPI document={apiDescriptionDocument} layout="stacked" />
</Box>
<Box sx={{
display: { xs: "none", sm: "block" },
width: "100%",
height: "100%",
}}>
<API
apiDescriptionDocument={document}
router="hash"
layout="sidebar"
/>
<ElementsAPI document={apiDescriptionDocument} layout="sidebar" />
</Box>
</>
)
}
}

const ElementsAPI = ({
document: apiDescriptionDocument,
layout
}: {
document: string,
layout: "sidebar" | "stacked"
}) => {
return createElement("elements-api", {
apiDescriptionDocument,
router: "hash",
layout: layout
})
}

export default Stoplight
11 changes: 0 additions & 11 deletions types/@stoplight-elements.d.ts

This file was deleted.