Update imports in protolib to use relative imports instead of protoli…

…b import alias (since its dependent on the app where protolib is inserted, since protolib is not used as a library)

packages/protolib/src/bundles/devices/deviceSdks/deviceSdksPage.tsx

@@ -1,9 +1,9 @@
 import { Layers, Tag, Code } from '@tamagui/lucide-icons';
 import { DeviceSdkModel } from './deviceSdksSchema';
-import { PaginatedDataSSR } from 'protolib/lib/SSR'
-import { DataTable2 } from 'protolib/components/DataTable2'
-import { DataView } from 'protolib/components/DataView'
-import { AdminPage } from 'protolib/components/AdminPage'
+import { PaginatedDataSSR } from '../../../lib/SSR'
+import { DataTable2 } from '../../../components/DataTable2'
+import { DataView } from '../../../components/DataView'
+import { AdminPage } from '../../../components/AdminPage'
 
 const DeviceSdkIcons = { name: Tag, sdk: Layers }
 const sourceUrl = '/adminapi/v1/devicesdks'

packages/protolib/src/bundles/files/adminPages/index.tsx

@@ -1,13 +1,13 @@
-import { withSession } from 'protolib/lib/Session';
-import { Tinted } from 'protolib/components/Tinted';
-import { Center } from 'protolib/components/Center';
-import { SSR } from 'protolib/lib/SSR';
-import { AdminPage } from 'protolib/components/AdminPage';
+import { withSession } from '../../../lib/Session';
+import { Tinted } from '../../../components/Tinted';
+import { Center } from '../../../components/Center';
+import { SSR } from '../../../lib/SSR';
+import { AdminPage } from '../../../components/AdminPage';
 import dynamic from 'next/dynamic'
 import { Spinner } from 'tamagui'
 
 const FileBrowser = dynamic<any>(() =>
-    import('protolib/adminpanel/next/components/FileBrowser').then(module => module.FileBrowser),
+    import('../../../adminpanel/next/components/FileBrowser').then(module => module.FileBrowser),
     { ssr: false, loading:() => <Tinted><Center><Spinner size='small' color="$color7" scale={4} /></Center></Tinted>}
 );
 

packages/protolib/src/bundles/files/fileActions.tsx

@@ -1,7 +1,7 @@
 import { Stack, Text, Input, Button, YStack } from '@my/ui';
 import { ChonkyIconName } from 'chonky';
-import { NextLink } from 'protolib/components/NextLink';
-import { CopyBubble } from 'protolib/components/CopyBubble';
+import { NextLink } from '../../components/NextLink';
+import { CopyBubble } from '../../components/CopyBubble';
 import { API } from 'protobase';
 import { useState } from 'react';
 

packages/protolib/src/bundles/files/intents.tsx

@@ -21,7 +21,7 @@ import { getDefinition, toSourceFile } from 'protonode/dist/lib/code'
 import { ArrowFunction } from 'ts-morph';
 import parserTypeScript from "prettier/parser-typescript.js";
 import prettier from "prettier/standalone.js";
-import { useEventEffect } from 'protolib/bundles/events/hooks'
+import { useEventEffect } from '../../bundles/events/hooks'
 import { useTint } from '../../lib/Tints'
 
 const GLTFViewer = dynamic(() => import('../../adminpanel/features/components/ModelViewer'), {

packages/protolib/src/bundles/fsm/adminPages.tsx

@@ -1,7 +1,7 @@
 import { FSMModel } from './FSMSchema'
-import { DataTable2 } from 'protolib/components/DataTable2'
-import { DataView } from 'protolib/components/DataView'
-import { AdminPage } from 'protolib/components/AdminPage'
+import { DataTable2 } from '../../components/DataTable2'
+import { DataView } from '../../components/DataView'
+import { AdminPage } from '../../components/AdminPage'
 import { InteractiveIcon } from '../../components/InteractiveIcon'
 import { ExternalLink, Link } from '@tamagui/lucide-icons'
 import { PaginatedData } from '../../lib/SSR'

packages/protolib/src/bundles/groups/adminPages.tsx

@@ -1,7 +1,7 @@
 import { GroupModel } from '.'
 import { z } from 'protobase'
-import { DataView } from 'protolib/components/DataView'
-import { AdminPage } from 'protolib/components/AdminPage'
+import { DataView } from '../../components/DataView'
+import { AdminPage } from '../../components/AdminPage'
 import { Users } from '@tamagui/lucide-icons';
 import { API } from 'protobase'
 import { usePrompt } from '../../context/PromptAtom'

packages/protolib/src/bundles/messages/adminPages.tsx

@@ -1,12 +1,12 @@
 
-import { withSession } from 'protolib/lib/Session';
-import { Tinted } from 'protolib/components/Tinted';
-import { useTint } from 'protolib/lib/Tints';
-import { JSONViewer } from 'protolib/components/jsonui';
-import { Center } from 'protolib/components/Center';
-import { SSR } from 'protolib/lib/SSR';
-import { AdminPage } from 'protolib/components/AdminPage';
-import { useSubscription } from 'protolib/lib/mqtt';
+import { withSession } from '../../lib/Session';
+import { Tinted } from '../../components/Tinted';
+import { useTint } from '../../lib/Tints';
+import { JSONViewer } from '../../components/jsonui';
+import { Center } from '../../components/Center';
+import { SSR } from '../../lib/SSR';
+import { AdminPage } from '../../components/AdminPage';
+import { useSubscription } from '../../lib/mqtt';
 import { H2, XStack, YStack, Text, Paragraph } from '@my/ui';
 import { useState } from 'react';
 import { useInterval, useUpdateEffect } from 'usehooks-ts';

packages/protolib/src/bundles/objects/adminPages.tsx

@@ -1,10 +1,10 @@
 
 import { ObjectModel } from './objectsSchemas'
-import { DataView } from 'protolib/components/DataView';
-import { DataTable2 } from 'protolib/components/DataTable2';
-import { Chip } from 'protolib/components/Chip';
-import { AdminPage } from 'protolib/components/AdminPage';
-import { useWorkspaceEnv } from 'protolib/lib/useWorkspaceEnv';
+import { DataView } from '../../components/DataView';
+import { DataTable2 } from '../../components/DataTable2';
+import { Chip } from '../../components/Chip';
+import { AdminPage } from '../../components/AdminPage';
+import { useWorkspaceEnv } from '../../lib/useWorkspaceEnv';
 import { Pencil, Boxes } from '@tamagui/lucide-icons';
 import { usePageParams } from '../../next';
 import { XStack, Text } from "@my/ui";

packages/protolib/src/bundles/pages/TemplatePreview.tsx

@@ -1,4 +1,4 @@
-import { NextLink } from 'protolib/components/NextLink'
+import { NextLink } from '../../components/NextLink'
 import { Paragraph, XStack, YStack } from '@my/ui'
 import { useState } from 'react'
 import { Tinted } from '../../components/Tinted'

packages/protolib/src/bundles/pages/adminPages.tsx

@@ -1,11 +1,11 @@
 import { PageModel } from '.'
-import { DataView } from 'protolib/components/DataView'
-import { DataTable2 } from 'protolib/components/DataTable2'
-import { Chip } from 'protolib/components/Chip'
+import { DataView } from '../../components/DataView'
+import { DataTable2 } from '../../components/DataTable2'
+import { Chip } from '../../components/Chip'
 import { API, z } from 'protobase'
-import { InteractiveIcon } from 'protolib/components/InteractiveIcon'
-import { AdminPage } from 'protolib/components/AdminPage'
-import { useWorkspaceEnv } from 'protolib/lib/useWorkspaceEnv'
+import { InteractiveIcon } from '../../components/InteractiveIcon'
+import { AdminPage } from '../../components/AdminPage'
+import { useWorkspaceEnv } from '../../lib/useWorkspaceEnv'
 import { XStack, YStack, useThemeName, useToastController, ScrollView, Spacer, Text } from '@my/ui'
 import { ExternalLink, Pencil } from '@tamagui/lucide-icons'
 import { usePageParams } from '../../next';

packages/protolib/src/bundles/resources/adminPages.tsx

@@ -1,9 +1,9 @@
 
 import { ResourceModel } from '.'
-import { DataTable2 } from 'protolib/components/DataTable2'
-import { Chip } from 'protolib/components/Chip'
-import { DataView } from 'protolib/components/DataView'
-import { AdminPage } from 'protolib/components/AdminPage'
+import { DataTable2 } from '../../components/DataTable2'
+import { Chip } from '../../components/Chip'
+import { DataView } from '../../components/DataView'
+import { AdminPage } from '../../components/AdminPage'
 import { InteractiveIcon } from '../../components/InteractiveIcon'
 import { ExternalLink, Link } from '@tamagui/lucide-icons'
 import { PaginatedData } from '../../lib/SSR'

packages/protolib/src/bundles/services/adminPages.tsx

@@ -1,6 +1,6 @@
-import { DataView } from 'protolib/components/DataView';
-import { AdminPage } from 'protolib/components/AdminPage';
-import { CardBody } from 'protolib/components/CardBody';
+import { DataView } from '../../components/DataView';
+import { AdminPage } from '../../components/AdminPage';
+import { CardBody } from '../../components/CardBody';
 import { Cog, ScrollText, LineChart, RotateCw, Cpu, Activity} from '@tamagui/lucide-icons';
 import { ServiceModel } from './servicesSchema';
 import { YStack, Stack, SizableText, XStack } from '@my/ui'

packages/protolib/src/bundles/users/adminPages.tsx

@@ -1,11 +1,11 @@
 import { UserModel } from '.'
 import { z } from 'protobase'
-import { usePrompt } from 'protolib/context/PromptAtom';
-import { DataTable2 } from 'protolib/components/DataTable2';
-import { Chip } from 'protolib/components/Chip';
-import { DataView } from 'protolib/components/DataView';
-import { AdminPage } from 'protolib/components/AdminPage';
-import { useWorkspaceEnv } from 'protolib/lib/useWorkspaceEnv';
+import { usePrompt } from '../../context/PromptAtom';
+import { DataTable2 } from '../../components/DataTable2';
+import { Chip } from '../../components/Chip';
+import { DataView } from '../../components/DataView';
+import { AdminPage } from '../../components/AdminPage';
+import { useWorkspaceEnv } from '../../lib/useWorkspaceEnv';
 import moment from 'moment';
 import { Mail, Tag, Key, User } from '@tamagui/lucide-icons';
 import { API } from 'protobase'

packages/protolib/src/components/AdminPage.tsx

@@ -1,16 +1,16 @@
-import { useSession } from 'protolib/lib/Session';
-import { Page } from 'protolib/components/Page';
-import { Tinted } from 'protolib/components/Tinted';
-import { usePrompt } from 'protolib/context/PromptAtom';
-import { SearchContext } from 'protolib/context/SearchContext';
-import { AdminPanel } from 'protolib/components/AdminPanel';
+import { useSession } from '../lib/Session';
+import { Page } from './Page';
+import { Tinted } from './Tinted';
+import { usePrompt } from '../context/PromptAtom';
+import { SearchContext } from '../context/SearchContext';
+import { AdminPanel } from './AdminPanel';
 import dynamic from 'next/dynamic';
 import { forwardRef, useState } from 'react';
 import { AppState } from './AdminPanel'
 import { useAtom } from 'jotai';
 import { SiteConfig } from 'app/conf'
 
-const Chat = dynamic(() => import('protolib/components/Chat'), { ssr: false })
+const Chat = dynamic(() => import('./Chat'), { ssr: false })
 
 export const AdminPage = forwardRef(({ pageSession, title, children, integratedChat = true }: any, ref) => {
   useSession(pageSession)

packages/protolib/src/components/AdminPanel.tsx

@@ -1,9 +1,9 @@
 import { XStack } from 'tamagui'
 import { PanelLayout } from 'app/layout/PanelLayout'
-import { SelectList } from 'protolib/components/SelectList';
-import { useWorkspaces, useUserSettings } from 'protolib/lib/Session';
-import { PanelMenu } from 'protolib/components/PanelMenu';
-import { MainPanel } from 'protolib/components/MainPanel';
+import { SelectList } from './SelectList';
+import { useWorkspaces, useUserSettings } from '../lib/Session';
+import { PanelMenu } from './PanelMenu';
+import { MainPanel } from './MainPanel';
 import Workspaces from 'app/bundles/workspaces'
 import { InteractiveIcon } from './InteractiveIcon'
 import { Activity } from '@tamagui/lucide-icons'

packages/protolib/src/components/AnounceBubble.tsx

@@ -1,4 +1,4 @@
-import { ThemeTintAlt } from 'protolib/lib/Tints'
+import { ThemeTintAlt } from '../lib/Tints'
 import Link from 'next/link'
 import {
   Button,

packages/protolib/src/components/Chat.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 import { addResponseMessage, Widget, toggleMsgLoader } from 'react-chat-widget'
 import { useEffect, useRef, useState } from 'react';
-import { Tinted } from 'protolib/components/Tinted';
+import { Tinted } from './Tinted';
 import { API } from 'protobase';
-import { PromptAtom, PromptResponseAtom } from 'protolib/context/PromptAtom';
+import { PromptAtom, PromptResponseAtom } from '../context/PromptAtom';
 import { useTimeout, useWindowSize, useClickAnyWhere } from 'usehooks-ts';
 import { Paperclip, Sparkles, X } from 'lucide-react';
 import ReactDOM from 'react-dom/client';

packages/protolib/src/components/ConnectionIndicator.tsx

@@ -1,4 +1,4 @@
-import { useMqttState  } from 'protolib/lib/mqtt/useMqttState';
+import { useMqttState  } from '../lib/mqtt/useMqttState';
 import { CloudOff } from '@tamagui/lucide-icons';
 import { useInterval } from 'usehooks-ts';
 import { useState } from 'react';

packages/protolib/src/components/DataTableList.tsx

@@ -3,7 +3,7 @@ import { DataTable2 } from "./DataTable2";
 import { Tinted } from "./Tinted";
 import { CheckCheck, Check, Pencil } from '@tamagui/lucide-icons'
 import { ItemMenu } from "./ItemMenu";
-import { usePageParams } from 'protolib/next'
+import { usePageParams } from '../next'
 import { InteractiveIcon } from "./InteractiveIcon";
 import { Chip } from "./Chip";
 

packages/protolib/src/components/EditableObject/ArrayComponent.tsx

@@ -1,6 +1,6 @@
 import { Button, Stack, XStack } from "tamagui";
 import { Pencil, Tags, Layers } from '@tamagui/lucide-icons';
-import { Tinted } from 'protolib/components/Tinted';
+import { Tinted } from '../Tinted';
 import { DeleteButton, FormGroup, getDefaultValue, iconStyle } from ".";
 
 export const ArrayComp = ({ ele, elementDef, icon, path, arrData, getElement, setFormData, data, setData, mode, customFields, URLTransform }) => {

packages/protolib/src/components/EditableObject/RecordComponent.tsx

@@ -1,7 +1,7 @@
 import { useContext, useEffect, useRef, useState } from "react";
 import { Button, Input, Stack, XStack, YStack } from "tamagui";
 import { List } from '@tamagui/lucide-icons';
-import { AlertDialog } from 'protolib/components/AlertDialog'
+import { AlertDialog } from '../AlertDialog'
 import { DeleteButton, FormGroup, OpenedSectionsContext, getDefaultValue } from ".";
 import { getElement } from "./Element";
 

packages/protolib/src/components/EditableObject/index.tsx

@@ -1,13 +1,13 @@
 import { Button, Fieldset, Label, Stack, XStack, H3, YStack, Paragraph, Spinner, StackProps, Accordion, Square, Spacer } from "tamagui";
 import { Pencil, Tag, ChevronDown, X } from '@tamagui/lucide-icons';
-import { Center } from 'protolib/components/Center';
-import { Grid } from 'protolib/components/Grid';
-import { AsyncView } from 'protolib/components/AsyncView';
-import { usePendingEffect } from 'protolib/lib/usePendingEffect';
+import { Center } from '../Center';
+import { Grid } from '../Grid';
+import { AsyncView } from '../AsyncView';
+import { usePendingEffect } from '../../lib/usePendingEffect';
 import { API, ProtoSchema, getPendingResult } from 'protobase';
-import { Tinted } from 'protolib/components/Tinted';
-import { Notice } from 'protolib/components/Notice';
-import { AlertDialog } from 'protolib/components/AlertDialog';
+import { Tinted } from '../Tinted';
+import { Notice } from '../Notice';
+import { AlertDialog } from '../AlertDialog';
 import React, { createContext, useContext, useEffect, useMemo, useRef, useState } from "react";
 import { getErrorMessage } from "@my/ui";
 import { Schema } from "protobase";

packages/protolib/src/components/FilePicker.tsx

@@ -1,8 +1,8 @@
 import { useState } from "react"
 import { Button, Input, XStack, Spinner, Dialog, Text } from "tamagui"
 import { Folder } from 'lucide-react'
-import { Tinted, } from 'protolib/components/Tinted'
-import { Center } from 'protolib/components/Center'
+import { Tinted, } from './Tinted'
+import { Center } from './Center'
 import dynamic from 'next/dynamic'
 import { useRouter, useSearchParams, usePathname } from 'solito/navigation';
 

packages/protolib/src/components/ItemMenu.tsx

@@ -1,5 +1,5 @@
 import { Popover, Stack, XStack, YStack, Text, StackProps } from "tamagui"
-import { AlertDialog } from 'protolib/components/AlertDialog'
+import { AlertDialog } from './AlertDialog'
 import { useState } from "react";
 import { Tinted } from "./Tinted";
 import { MoreVertical, Trash2, FilePlus } from '@tamagui/lucide-icons'

packages/protolib/src/components/LogPanel.tsx

@@ -1,9 +1,9 @@
 
 import { XStack, YStack, Text, ScrollView, Popover, Input } from 'tamagui'
-import { JSONViewer } from 'protolib/components/jsonui'
-import { useTint } from 'protolib/lib/Tints'
-import { GroupButton } from 'protolib/components/GroupButton'
-import { ButtonGroup } from 'protolib/components/ButtonGroup'
+import { JSONViewer } from './jsonui'
+import { useTint } from '../lib/Tints'
+import { GroupButton } from './GroupButton'
+import { ButtonGroup } from './ButtonGroup'
 import { InteractiveIcon } from './InteractiveIcon'
 import { Ban, Microscope, Bug, Info, AlertCircle, XCircle, Bomb, Filter } from '@tamagui/lucide-icons'
 import { Tinted } from './Tinted'

packages/protolib/src/components/Monaco.tsx

@@ -3,8 +3,8 @@ import Editor, { EditorProps, useMonaco, loader } from '@monaco-editor/react';
 import useKeypress from 'react-use-keypress';
 import { useThemeSetting } from '@tamagui/next-theme';
 import { useTheme } from '@my/ui';
-import { useTint } from 'protolib/lib/Tints'
-import { Tinted } from 'protolib/components/Tinted'
+import { useTint } from '../lib/Tints'
+import { Tinted } from './Tinted'
 
 type Props = {
     sourceCode: string,

packages/protolib/src/components/Page.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect } from "react";
 import { StackProps, YStack, useTheme } from "tamagui";
-import { useIsEditing } from "protolib/visualui/useIsEditing"
+import { useIsEditing } from "../visualui/useIsEditing"
 import Head from 'next/head'
 import { useSession, useSessionContext } from "../lib/Session";
 import { getSessionContext } from "protonode/dist/lib/session";

packages/protolib/src/components/PanelMenu.tsx

@@ -39,15 +39,15 @@ import { Accordion, Input, Paragraph, SizableText, Square, ScrollView } from '@m
 import { usePathname, useSearchParams } from 'solito/navigation';
 import { useContext, useEffect, useState } from 'react';
 import { API, getPendingResult } from 'protobase';
-import { useWorkspaceRoot } from 'protolib/lib/useWorkspaceRoot';
-import { AppConfContext, SiteConfigType } from 'protolib/providers/AppConf';
-import { AlertDialog } from 'protolib/components/AlertDialog';
-import { Link } from 'protolib/components/Link';
-import { Tinted } from 'protolib/components/Tinted';
-import { PanelMenuItem } from 'protolib/components/PanelMenuItem';
+import { useWorkspaceRoot } from '../lib/useWorkspaceRoot';
+import { AppConfContext, SiteConfigType } from '../providers/AppConf';
+import { AlertDialog } from './AlertDialog';
+import { Link } from './Link';
+import { Tinted } from './Tinted';
+import { PanelMenuItem } from './PanelMenuItem';
 import { useThemeSetting } from '@tamagui/next-theme'
 import { SelectList } from './SelectList';
-import { useQueryState } from 'protolib/next'
+import { useQueryState } from '../next'
 import { useWorkspaceEnv } from '../lib/useWorkspaceEnv';
 
 const opacity = 0.8

packages/protolib/src/components/layout/DefaultLayout.tsx

@@ -1,4 +1,4 @@
-import { Tinted } from 'protolib/components/Tinted'
+import { Tinted } from '../Tinted'
 import { ToastProvider, ToastViewport } from '@tamagui/toast'
 import { NextSeo } from 'next-seo'
 import React from 'react'

packages/protolib/src/components/layout/Footer.tsx

@@ -1,5 +1,5 @@
-import { ContainerLarge } from 'protolib/components/Container'
-import { ParagraphLink } from 'protolib/components/Link'
+import { ContainerLarge } from '../Container'
+import { ParagraphLink } from '../Link'
 import { H4, XStack, YStack, YStackProps } from 'tamagui'
 
 export const FooterLink = ({href, children}) => <ParagraphLink href={href}>{children}</ParagraphLink>

packages/protolib/src/components/layout/HeaderContents.tsx

@@ -1,6 +1,6 @@
-import { ThemeToggle} from 'protolib/components/ThemeToggle'
-import { NextLink} from 'protolib/components/NextLink'
-import { ColorToggleButton} from 'protolib/components/ColorToggleButton'
+import { ThemeToggle} from '../ThemeToggle'
+import { NextLink} from '../NextLink'
+import { ColorToggleButton} from '../ColorToggleButton'
 import * as React from 'react'
 import {
   TooltipGroup,

packages/protolib/src/components/layout/PanelLayout.tsx

@@ -1,5 +1,5 @@
 import { YStack, ScrollView, XStack, getTokens } from 'tamagui'
-import { AppBar } from 'protolib/components/AppBar'
+import { AppBar } from '../AppBar'
 
 export const PanelLayout = ({ panelBgColor = undefined, menuContent, children, SideMenu, Layout, headerContents, HeaderMenu }) => {
   const appBarHeight = 55

packages/protolib/src/lib/useRedirectToEnviron.ts

@@ -1,4 +1,4 @@
-import { AppConfContext } from 'protolib/providers/AppConf';
+import { AppConfContext } from '../providers/AppConf';
 import { getWorkspaceEnv } from './useWorkspaceEnv';
 import { useContext, useEffect } from 'react';
 import { useRouter, usePathname } from 'solito/navigation';