Revert earlier changes

Author: CarlosNZ

demo/package.json

@@ -40,9 +40,7 @@
   "scripts": {
     "serve": "vite preview",
     "type-check": "tsc --noEmit",
-    "dev:local": "cross-env VITE_USE_LOCAL_SRC=true vite",
-    "dev:package": "vite",
-    "start": "yarn dev:local",
+    "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\"",
     "build": "tsc && vite build",
     "prebuild": "node ./scripts/getVersion.cjs",
     "predeploy": "yarn build",
@@ -54,6 +52,13 @@
       "react-app/jest"
     ]
   },
+  "nodemonConfig": {
+    "watch": [
+      "../src"
+    ],
+    "ext": "js, json, ts, tsx, css",
+    "delay": 200
+  },
   "browserslist": {
     "production": [
       ">0.2%",
@@ -68,9 +73,10 @@
   },
   "devDependencies": {
     "@vitejs/plugin-react": "^4.3.4",
-    "cross-env": "^7.0.3",
+    "concurrently": "^8.2.2",
     "gh-pages": "^6.1.1",
     "node-fetch": "^3.3.2",
+    "nodemon": "^3.0.3",
     "source-map-explorer": "^2.5.3",
     "vite": "^6.2.5"
   }

demo/src/App.tsx

@@ -1,4 +1,4 @@
-import { useState, useEffect, useRef, lazy, Suspense } from 'react'
+import React, { useEffect, useRef, lazy, Suspense } from 'react'
 import { useSearch, useLocation } from 'wouter'
 import JSON5 from 'json5'
 import 'react-datepicker/dist/react-datepicker.css'
@@ -18,10 +18,11 @@ import {
   psychedelicTheme,
   // ExternalTriggers,
   // type CollapseState
-} from 'json-edit-react-import'
+} from './_imports'
 import { FaNpm, FaExternalLinkAlt, FaGithub } from 'react-icons/fa'
 import { BiReset } from 'react-icons/bi'
 import { AiOutlineCloudUpload } from 'react-icons/ai'
+import { useState } from 'react'
 import useUndo from 'use-undo'
 import {
   Box,
@@ -48,14 +49,12 @@ import {
   useToast,
   Tooltip,
 } from '@chakra-ui/react'
-// @ts-ignore
 import logo from './image/logo_400.png'
 import { ArrowBackIcon, ArrowForwardIcon, InfoIcon } from '@chakra-ui/icons'
 import { demoDataDefinitions } from './demoData'
 import { useDatabase } from './useDatabase'
 import './style.css'
 import { timestamp, version } from './version'
-import SourceIndicator from './SourceIndicator'
 
 const CodeEditor = lazy(() => import('./CodeEditor'))
 
@@ -290,7 +289,6 @@ function App() {
         minH="100%"
       >
         <HStack w="100%" justify="space-between" align="flex-start">
-          <SourceIndicator />
           <VStack align="flex-start" gap={3}>
             <HStack align="flex-end" mt={2} gap={4} flexWrap="wrap">
               <Flex gap={4} align="center">

demo/src/CodeEditor.tsx

@@ -1,14 +1,14 @@
 import React from 'react'
-import { TextEditorProps } from 'json-edit-react-import'
-import CodeMirror, { Extension } from '@uiw/react-codemirror'
+import CodeMirror from '@uiw/react-codemirror'
 import { json } from '@codemirror/lang-json'
+import { TextEditorProps } from './_imports'
 import { githubLight, githubDark } from '@uiw/codemirror-theme-github'
 import { consoleDark } from '@uiw/codemirror-theme-console/dark'
 import { consoleLight } from '@uiw/codemirror-theme-console/light'
 import { quietlight } from '@uiw/codemirror-theme-quietlight'
 import { monokai } from '@uiw/codemirror-theme-monokai'
 
-const themeMap: Record<string, Extension | undefined> = {
+const themeMap = {
   Default: undefined,
   'Github Light': githubLight,
   'Github Dark': githubDark,

demo/src/_imports.ts

@@ -0,0 +1,14 @@
+/**
+ * Quickly switch between importing from local src or published package
+ */
+
+/* Installed package */
+export * from 'json-edit-react'
+
+/* Local src */
+// export * from './json-edit-react/src'
+
+/* Compiled local package */
+// export * from './package/build'
+
+// export * from './json-edit-react/src/additionalThemes/themes'

demo/src/customComponents/DateTimePicker.tsx

@@ -11,7 +11,7 @@
 import React from 'react'
 import DatePicker from 'react-datepicker'
 import { Button } from '@chakra-ui/react'
-import { CustomNodeProps, CustomNodeDefinition } from 'json-edit-react-import'
+import { CustomNodeProps, CustomNodeDefinition } from '../_imports'
 
 // Styles
 import 'react-datepicker/dist/react-datepicker.css'

demo/src/customComponents/Undefined.tsx

@@ -3,7 +3,7 @@
 // type selector
 
 import React from 'react'
-import { CustomNodeProps, CustomNodeDefinition } from 'json-edit-react-import'
+import { CustomNodeProps, CustomNodeDefinition } from 'json-edit-react'
 
 export const Undefined: React.FC<CustomNodeProps> = ({ children }) => {
   return <>{children}</>

demo/src/demoData/dataDefinitions.tsx

@@ -12,17 +12,21 @@ import {
   StringDisplay,
   StringEdit,
   toPathString,
+} from '../_imports'
+import {
   DefaultValueFunction,
+  ErrorString,
   NewKeyOptionsFunction,
   OnChangeFunction,
   OnErrorFunction,
   SearchFilterFunction,
   standardDataTypes,
   ThemeStyles,
   TypeFilterFunction,
+  TypeOptions,
   UpdateFunction,
-} from 'json-edit-react-import'
-import { ErrorString, TypeOptions, UpdateFunctionProps } from '../../../src/types'
+  UpdateFunctionProps,
+} from '../json-edit-react/src/types'
 import { type Input } from 'object-property-assigner'
 import jsonSchema from './jsonSchema.json'
 import customNodesSchema from './customNodesSchema.json'

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

@@ -0,0 +1 @@
+/// <reference types="react-scripts" />

demo/tsconfig.json

@@ -15,12 +15,8 @@
     "isolatedModules": true,
     "noEmit": true,
     "jsx": "react-jsx",
-    "baseUrl": ".",
-    "paths": {
-      "json-edit-react-import/*": ["../src/*"],
-      "json-edit-react-import": ["../src/index"]
-    }
+    "baseUrl": "."
   },
-  "include": ["src"],
-  "references": [{ "path": "./tsconfig.node.json" }, { "path": "../" }]
+  "include": ["demo/src"],
+  "references": [{ "path": "./tsconfig.node.json" }]
 }