Skip to content

Commit 306e35f

Browse files
authored
Merge branch 'json-schema-org:main' into timezone
2 parents 8f0dbcc + 718dab5 commit 306e35f

31 files changed

+1460
-107
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ All types of contributions are encouraged and valued. See the [Table of Contents
66

77
If you don't have time to contribute, that's fine. There are other easy ways to support the project and show your appreciation:
88
- Star the project on Github
9-
- Post on Twitter or Linkedin about JSON Schema `#jsonschema
9+
- Post on X or Linkedin about JSON Schema `#jsonschema
1010

1111
## Table of Contents
1212

INSTALLATION.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ git submodule update
4949

5050
### Setting Up Environment Variables
5151

52+
This step is optional. Environment variables are not required to run the website on your local development server.
53+
5254
1. Create a new `.env` file by copying the contents of the `.env.example` into `.env` file. Use this command:
5355
```
5456
cp .env.example .env

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ Thanks goes to these wonderful people who contributed to this website:
8989

9090
<p align="left">
9191
<a href="https://json-schema.org/slack" target="blank" style="margin-right: 5px;"><img align="center" src="https://img.icons8.com/color/48/null/slack-new.png" alt="JSON Schema Slack" height="30" width="40" /></a>
92-
<a href="https://twitter.com/jsonschema" target="blank" style="margin-right: 5px;"><img align="center" src="https://raw.githubusercontent.com/rahuldkjain/github-profile-readme-generator/master/src/images/icons/Social/twitter.svg" alt="JSON Schema Twitter" height="30" width="40" /></a>
92+
<a href="https://x.com/jsonschema" target="blank" style="margin-right: 5px;"><img align="center" src="https://raw.githubusercontent.com/rahuldkjain/github-profile-readme-generator/master/src/images/icons/Social/twitter.svg" alt="JSON Schema Twitter" height="30" width="40" /></a>
9393
<a href="https://www.linkedin.com/company/jsonschema" target="blank" style="margin-right: 5px;"><img align="center" src="https://raw.githubusercontent.com/rahuldkjain/github-profile-readme-generator/master/src/images/icons/Social/linked-in-alt.svg" alt="JSON Schema LinkedIn" height="30" width="40" /></a>
9494
<a href="https://www.youtube.com/@JSONSchemaOrgOfficial" target="blank"><img align="center" src="https://raw.githubusercontent.com/rahuldkjain/github-profile-readme-generator/master/src/images/icons/Social/youtube.svg" alt="JSON Schema YouTube" height="30" width="40" /></a>
9595
</p>

components/Layout.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -345,11 +345,10 @@ const Footer = () => (
345345
</div>
346346
<div className=''>
347347
<a
348-
href='https://twitter.com/jsonschema'
348+
href='https://x.com/jsonschema'
349349
className='flex items-center text-white'
350350
>
351-
<img src='/img/logos/x-twitter.svg' className='w-4 h-4 mr-2' />
352-
Twitter
351+
<img src='/img/logos/x-twitter.svg' className='w-4 h-4 mr-2' />X
353352
</a>
354353
</div>
355354
<div className=''>

data/keywords.yml

Lines changed: 56 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
title: Pattern Properties
175175
- url: 'https://json-schema.org/draft/2020-12/json-schema-core#name-patternproperties'
176176
title: Draft 2020-12
177-
- name: prefixitems
177+
- name: prefixItems
178178
vocabulary: [Applicator]
179179
learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/applicator/prefixitems'
180180
links:
@@ -192,7 +192,7 @@
192192
title: Schema Defination
193193
- url: 'https://json-schema.org/draft/2020-12/json-schema-core#name-properties'
194194
title: Draft 2020-12
195-
- name: propertynames
195+
- name: propertyNames
196196
vocabulary: [Applicator]
197197
learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/applicator/propertynames'
198198
links:
@@ -280,6 +280,22 @@
280280
title: Range
281281
- url: 'https://json-schema.org/draft/2020-12/json-schema-validation#name-maximum'
282282
title: Draft 2020-12
283+
- name: maxItems
284+
vocabulary: [Validation]
285+
learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/validation/maxitems/'
286+
links:
287+
- url: 'https://json-schema.org/understanding-json-schema/reference/array#length'
288+
title: Length
289+
- url: 'https://json-schema.org/draft/2020-12/json-schema-validation#name-maxitems'
290+
title: Draft 2020-12
291+
- name: maxLength
292+
vocabulary: [Validation]
293+
learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/validation/maxlength'
294+
links:
295+
- url: 'https://json-schema.org/understanding-json-schema/reference/string#length'
296+
title: Length
297+
- url: 'https://json-schema.org/draft/2020-12/json-schema-validation#name-maxlength'
298+
title: Draft 2020-12
283299
- name: maxProperties
284300
vocabulary: [Validation]
285301
learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/validation/maxproperties'
@@ -290,7 +306,25 @@
290306
title: maxProperties
291307
- url: 'https://json-schema.org/draft/2020-12/json-schema-validation#name-maxproperties'
292308
title: Draft 2020-12
293-
- name: minitems
309+
- name: minContains
310+
vocabulary: [Validation]
311+
learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/validation/mincontains'
312+
links:
313+
- url: 'https://json-schema.org/understanding-json-schema/reference/array#mincontains-maxcontains'
314+
title: Mincontains / Maxcontains
315+
- url: 'https://json-schema.org/draft/2020-12/json-schema-validation#name-mincontains'
316+
title: Draft 2020-12
317+
- name: minimum
318+
vocabulary: [Validation]
319+
learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/validation/minimum'
320+
links:
321+
- url: 'https://json-schema.org/learn/file-system#modeling-a-file-system-with-json-schema'
322+
title: Modeling a file system with JSON Schema
323+
- url: 'https://json-schema.org/understanding-json-schema/reference/numeric#range'
324+
title: Range
325+
- url: 'https://json-schema.org/draft/2020-12/json-schema-validation#name-minimum'
326+
title: Draft 2020-12
327+
- name: minItems
294328
vocabulary: [Validation]
295329
learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/validation/minitems'
296330
links:
@@ -368,6 +402,14 @@
368402
title: Uniqueness
369403
- url: 'https://json-schema.org/draft/2020-12/json-schema-validation#name-uniqueitems'
370404
title: Draft 2020-12
405+
- name: format
406+
vocabulary: [Format Annotation]
407+
learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/format-annotation/format/'
408+
links:
409+
- url: 'https://json-schema.org/draft/2020-12/draft-bhutton-json-schema-validation-00#rfc.section.7.2.1'
410+
title: Draft 2020-12
411+
- url: 'https://www.learnjsonschema.com/2020-12/format-annotation/'
412+
title: Format Annotation
371413
- name: contentEncoding
372414
vocabulary: [Content]
373415
learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/content/contentencoding'
@@ -384,7 +426,7 @@
384426
title: contentMediaType
385427
- url: 'https://json-schema.org/draft/2020-12/json-schema-validation#name-contentmediatype'
386428
title: Draft 2020-12
387-
- name: contentschema
429+
- name: contentSchema
388430
vocabulary: [Content]
389431
learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/content/contentschema'
390432
links:
@@ -452,19 +494,27 @@
452494
title: Annotations
453495
- url: 'https://json-schema.org/draft/2020-12/json-schema-validation#name-readonly-and-writeonly'
454496
title: Draft 2020-12
455-
- name: unevaluateditems
497+
- name: unevaluatedItems
456498
vocabulary: [Unevaluated]
457499
learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/unevaluated/unevaluateditems'
458500
links:
459501
- url: 'https://json-schema.org/understanding-json-schema/reference/array#unevaluateditems'
460502
title: Unevaluated Items
461503
- url: 'https://json-schema.org/draft/2020-12/json-schema-core#name-unevaluateditems'
462504
title: Draft 2020-12
463-
- name: unevaluatedproperties
505+
- name: unevaluatedProperties
464506
vocabulary: [Unevaluated]
465507
learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/unevaluated/unevaluatedproperties'
466508
links:
467509
- url: 'https://json-schema.org/understanding-json-schema/reference/object#unevaluatedproperties'
468510
title: Unevaluated Properties
469511
- url: 'https://json-schema.org/draft/2020-12/json-schema-core#name-unevaluatedproperties'
470512
title: Draft 2020-12
513+
- name: format
514+
vocabulary: [Format Assertion]
515+
learnjsonschemalink: 'https://www.learnjsonschema.com/2020-12/format-assertion/format/'
516+
links:
517+
- url: 'https://json-schema.org/draft/2020-12/draft-bhutton-json-schema-validation-00#rfc.section.7.2.2'
518+
title: Draft 2020-12
519+
- url: 'https://www.learnjsonschema.com/2020-12/format-assertion/'
520+
title: Format Assertion

data/tooling-data.yaml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -625,8 +625,8 @@
625625
source: 'https://github.com/karenetheridge/JSON-Schema-Modern'
626626
homepage: 'https://metacpan.org/dist/JSON-Schema-Modern'
627627
supportedDialects:
628-
draft: ['7', '2019-09', '2020-12']
629-
lastUpdated: '2022-08-31'
628+
draft: ['4', '6', '7', '2019-09', '2020-12']
629+
lastUpdated: '2024-11-08'
630630

631631
- name: JSON::Schema::Tiny
632632
description: 'Validate data against a schema, minimally'
@@ -2420,3 +2420,18 @@
24202420
supportedDialects:
24212421
draft: ['4', '6', '7']
24222422
lastUpdated: '2024-08-23'
2423+
2424+
- name: Svelte JSON Schema Form
2425+
description: 'Svelte 5 library for creating forms based on JSON Schema.'
2426+
toolingTypes: ['schema-to-web-UI']
2427+
languages: ['TypeScript']
2428+
maintainers:
2429+
- name: 'Roman Krasilnikov'
2430+
username: 'x0k'
2431+
platform: 'github'
2432+
license: '(MIT AND Apache-2.0)'
2433+
source: 'https://github.com/x0k/svelte-jsonschema-form'
2434+
homepage: 'https://x0k.github.io/svelte-jsonschema-form/'
2435+
supportedDialects:
2436+
draft: ['7']
2437+
lastUpdated: '2024-10-24'

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"dependencies": {
2929
"@docsearch/react": "3.6.1",
3030
"@types/jsonpath": "^0.2.4",
31-
"axios": "1.7.4",
31+
"axios": "1.7.7",
3232
"babel-loader": "^9.1.3",
3333
"classnames": "^2.5.1",
3434
"feed": "^4.2.2",
@@ -46,7 +46,7 @@
4646
"node-ical": "0.19.0",
4747
"react": "18.3.1",
4848
"react-dom": "18.3.1",
49-
"react-syntax-highlighter": "^15.5.0",
49+
"react-syntax-highlighter": "^15.6.1",
5050
"react-text-truncate": "^0.19.0",
5151
"reading-time": "^1.5.0",
5252
"slate": "^0.103.0",
@@ -58,7 +58,7 @@
5858
},
5959
"devDependencies": {
6060
"@babel/core": "^7.25.2",
61-
"@babel/preset-env": "^7.25.3",
61+
"@babel/preset-env": "^7.26.0",
6262
"@cypress/code-coverage": "^3.13.2",
6363
"@next/eslint-plugin-next": "^14.0.1",
6464
"@svgr/webpack": "^8.1.0",
@@ -88,7 +88,7 @@
8888
"eslint-plugin-react": "^7.35.0",
8989
"eslint-plugin-react-hooks": "^4.4.0",
9090
"husky": "^9.1.6",
91-
"nyc": "^17.0.0",
91+
"nyc": "^17.1.0",
9292
"postcss": "^8.4.41",
9393
"prettier": "3.3.3",
9494
"tailwindcss": "^3.3.5",

pages/blog/generateRssFeed.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export default async function generateRssFeed(blogPosts: any) {
2727
const authors: Author[] = post.frontmatter.authors.map(
2828
(author: any): Author => {
2929
const link = author.twitter
30-
? `https://twitter.com/${author.twitter}`
30+
? `https://x.com/${author.twitter}`
3131
: undefined;
3232
return {
3333
name: author.name,

pages/blog/index.page.tsx

Lines changed: 66 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ import { useRouter } from 'next/router';
1212
import useSetUrlParam from '~/lib/useSetUrlParam';
1313
import { SectionContext } from '~/context';
1414

15+
type Author = {
16+
name: string;
17+
photo?: string;
18+
link?: string;
19+
byline?: string;
20+
};
1521
export type blogCategories =
1622
| 'All'
1723
| 'Community'
@@ -286,14 +292,40 @@ export default function StaticMarkdownPage({
286292
/>
287293
</div>
288294
</div>
289-
<div className='flex flex-row items-center'>
290-
<div className='flex flex-row pl-2 mr-2'>
295+
<div
296+
className={`
297+
flex
298+
flex-row
299+
items-center
300+
`}
301+
>
302+
<div
303+
className={`
304+
flex
305+
flex-row
306+
pl-2
307+
mr-2
308+
`}
309+
>
291310
{(frontmatter.authors || []).map(
292-
(author: any, index: number) => {
311+
(author: Author, index: number) => {
312+
const sizeClass =
313+
frontmatter.authors.length > 2
314+
? 'h-8 w-8'
315+
: 'h-11 w-11';
293316
return (
294317
<div
295318
key={index}
296-
className='bg-slate-50 h-[44px] w-[44px] rounded-full -ml-3 bg-cover bg-center border-2 border-white'
319+
className={[
320+
'bg-slate-50',
321+
sizeClass,
322+
'rounded-full',
323+
'-ml-3',
324+
'bg-cover',
325+
'bg-center',
326+
'border-2',
327+
'border-white',
328+
].join(' ')}
297329
style={{
298330
backgroundImage: `url(${author.photo})`,
299331
zIndex: 10 - index,
@@ -304,11 +336,37 @@ export default function StaticMarkdownPage({
304336
)}
305337
</div>
306338

307-
<div className='flex flex-col items-start'>
339+
<div
340+
className={`
341+
flex
342+
flex-col
343+
items-start
344+
`}
345+
>
308346
<div className='text-sm font-semibold'>
309-
{frontmatter.authors
310-
.map((author: any) => author.name)
311-
.join(' & ')}
347+
{frontmatter.authors.length > 2 ? (
348+
<>
349+
{frontmatter.authors
350+
.slice(0, 2)
351+
.map((author: Author, index: number) => (
352+
<span key={author.name}>
353+
{author.name}
354+
{index === 0 && ' & '}
355+
</span>
356+
))}
357+
{'...'}
358+
</>
359+
) : (
360+
frontmatter.authors.map(
361+
(author: Author, index: number) => (
362+
<span key={author.name}>
363+
{author.name}
364+
{index < frontmatter.authors.length - 1 &&
365+
' & '}
366+
</span>
367+
),
368+
)
369+
)}
312370
</div>
313371

314372
<div className='text-slate-500 text-sm dark:text-slate-300'>

0 commit comments

Comments
 (0)