Skip to content

Commit d46d18b

Browse files
CarlosNZCarlosNZ
committed
Squashed commit of the following:
commit bac79a2 Author: Carl Smith <5456533+CarlosNZ@users.noreply.github.com> Date: Sun Apr 13 13:04:23 2025 +1200 Update commit 5435df6 Author: Carl Smith <5456533+CarlosNZ@users.noreply.github.com> Date: Sun Apr 13 10:27:41 2025 +1200 Revert earlier changes
1 parent 34af2f3 commit d46d18b

17 files changed

+261
-96
lines changed

‎demo/package.json‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"ajv": "^8.16.0",
2626
"firebase": "^10.13.0",
2727
"framer-motion": "^11.0.3",
28-
"json-edit-react": "1.25.0",
28+
"json-edit-react": "1.25.4",
2929
"json5": "^2.2.3",
3030
"react": "^18.2.0",
3131
"react-datepicker": "^7.5.0",
@@ -40,9 +40,7 @@
4040
"scripts": {
4141
"serve": "vite preview",
4242
"type-check": "tsc --noEmit",
43-
"dev:local": "cross-env VITE_USE_LOCAL_SRC=true vite",
44-
"dev:package": "vite",
45-
"start": "yarn dev:local",
43+
"start": "rimraf ./src/json-edit-react && mkdir ./src/json-edit-react && mkdir ./src/json-edit-react/src && concurrently --kill-others-on-fail \"vite\" \"nodemon watch.cjs\"",
4644
"build": "tsc && vite build",
4745
"prebuild": "node ./scripts/getVersion.cjs",
4846
"predeploy": "yarn build",
@@ -54,6 +52,13 @@
5452
"react-app/jest"
5553
]
5654
},
55+
"nodemonConfig": {
56+
"watch": [
57+
"../src"
58+
],
59+
"ext": "js, json, ts, tsx, css",
60+
"delay": 200
61+
},
5762
"browserslist": {
5863
"production": [
5964
">0.2%",
@@ -68,9 +73,10 @@
6873
},
6974
"devDependencies": {
7075
"@vitejs/plugin-react": "^4.3.4",
71-
"cross-env": "^7.0.3",
76+
"concurrently": "^8.2.2",
7277
"gh-pages": "^6.1.1",
7378
"node-fetch": "^3.3.2",
79+
"nodemon": "^3.0.3",
7480
"source-map-explorer": "^2.5.3",
7581
"vite": "^6.2.5"
7682
}

‎demo/src/App.tsx‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { useState, useEffect, useRef, lazy, Suspense } from 'react'
1+
import React, { useEffect, useRef, lazy, Suspense } from 'react'
22
import { useSearch, useLocation } from 'wouter'
33
import JSON5 from 'json5'
44
import 'react-datepicker/dist/react-datepicker.css'
@@ -18,10 +18,11 @@ import {
1818
psychedelicTheme,
1919
// ExternalTriggers,
2020
// type CollapseState
21-
} from 'json-edit-react-import'
21+
} from './_imports'
2222
import { FaNpm, FaExternalLinkAlt, FaGithub } from 'react-icons/fa'
2323
import { BiReset } from 'react-icons/bi'
2424
import { AiOutlineCloudUpload } from 'react-icons/ai'
25+
import { useState } from 'react'
2526
import useUndo from 'use-undo'
2627
import {
2728
Box,
@@ -48,14 +49,12 @@ import {
4849
useToast,
4950
Tooltip,
5051
} from '@chakra-ui/react'
51-
// @ts-ignore
5252
import logo from './image/logo_400.png'
5353
import { ArrowBackIcon, ArrowForwardIcon, InfoIcon } from '@chakra-ui/icons'
5454
import { demoDataDefinitions } from './demoData'
5555
import { useDatabase } from './useDatabase'
5656
import './style.css'
5757
import { timestamp, version } from './version'
58-
import SourceIndicator from './SourceIndicator'
5958

6059
const CodeEditor = lazy(() => import('./CodeEditor'))
6160

@@ -290,7 +289,6 @@ function App() {
290289
minH="100%"
291290
>
292291
<HStack w="100%" justify="space-between" align="flex-start">
293-
<SourceIndicator />
294292
<VStack align="flex-start" gap={3}>
295293
<HStack align="flex-end" mt={2} gap={4} flexWrap="wrap">
296294
<Flex gap={4} align="center">

‎demo/src/CodeEditor.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import React from 'react'
2-
import { TextEditorProps } from 'json-edit-react-import'
3-
import CodeMirror, { Extension } from '@uiw/react-codemirror'
2+
import CodeMirror from '@uiw/react-codemirror'
43
import { json } from '@codemirror/lang-json'
4+
import { TextEditorProps } from './_imports'
55
import { githubLight, githubDark } from '@uiw/codemirror-theme-github'
66
import { consoleDark } from '@uiw/codemirror-theme-console/dark'
77
import { consoleLight } from '@uiw/codemirror-theme-console/light'
88
import { quietlight } from '@uiw/codemirror-theme-quietlight'
99
import { monokai } from '@uiw/codemirror-theme-monokai'
1010

11-
const themeMap: Record<string, Extension | undefined> = {
11+
const themeMap = {
1212
Default: undefined,
1313
'Github Light': githubLight,
1414
'Github Dark': githubDark,

‎demo/src/_imports.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/**
2+
* Quickly switch between importing from local src or published package
3+
*/
4+
5+
/* Installed package */
6+
// export * from 'json-edit-react'
7+
8+
/* Local src */
9+
export * from './json-edit-react/src'
10+
11+
/* Compiled local package */
12+
// export * from './package/build'
13+
14+
// export * from './json-edit-react/src/additionalThemes/themes'

‎demo/src/customComponents/DateTimePicker.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import React from 'react'
1212
import DatePicker from 'react-datepicker'
1313
import { Button } from '@chakra-ui/react'
14-
import { CustomNodeProps, CustomNodeDefinition } from 'json-edit-react-import'
14+
import { CustomNodeProps, CustomNodeDefinition } from '../_imports'
1515

1616
// Styles
1717
import 'react-datepicker/dist/react-datepicker.css'

‎demo/src/customComponents/Undefined.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// type selector
44

55
import React from 'react'
6-
import { CustomNodeProps, CustomNodeDefinition } from 'json-edit-react-import'
6+
import { CustomNodeProps, CustomNodeDefinition } from 'json-edit-react'
77

88
export const Undefined: React.FC<CustomNodeProps> = ({ children }) => {
99
return <>{children}</>

‎demo/src/demoData/dataDefinitions.tsx‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,21 @@ import {
1212
StringDisplay,
1313
StringEdit,
1414
toPathString,
15+
} from '../_imports'
16+
import {
1517
DefaultValueFunction,
18+
ErrorString,
1619
NewKeyOptionsFunction,
1720
OnChangeFunction,
1821
OnErrorFunction,
1922
SearchFilterFunction,
2023
standardDataTypes,
2124
ThemeStyles,
2225
TypeFilterFunction,
26+
TypeOptions,
2327
UpdateFunction,
24-
} from 'json-edit-react-import'
25-
import { ErrorString, TypeOptions, UpdateFunctionProps } from '../../../src/types'
28+
UpdateFunctionProps,
29+
} from '../json-edit-react/src/types'
2630
import { type Input } from 'object-property-assigner'
2731
import jsonSchema from './jsonSchema.json'
2832
import customNodesSchema from './customNodesSchema.json'

‎demo/src/react-app-env.d.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/// <reference types="react-scripts" />

‎demo/src/version.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
export const version = '1.25.4'
2-
export const timestamp = '13/04/2025, 12:56:05 am'
2+
export const timestamp = '13/04/2025, 1:02:31 pm'

‎demo/tsconfig.json‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,8 @@
1515
"isolatedModules": true,
1616
"noEmit": true,
1717
"jsx": "react-jsx",
18-
"baseUrl": ".",
19-
"paths": {
20-
"json-edit-react-import/*": ["../src/*"],
21-
"json-edit-react-import": ["../src/index"]
22-
}
18+
"baseUrl": "."
2319
},
24-
"include": ["src"],
25-
"references": [{ "path": "./tsconfig.node.json" }, { "path": "../" }]
20+
"include": ["demo/src"],
21+
"references": [{ "path": "./tsconfig.node.json" }]
2622
}

0 commit comments

Comments
 (0)