Use specific imports against protolib to prevent super big loading ti…

…mes while in dev mode, since protolib is not compiled while in dev

apps/electron/pages/[...name].tsx

@@ -1,4 +1,4 @@
-import { useSession } from 'protolib'
+import { useSession } from 'protolib/lib/Session'
 import Custom404 from './404'
 import { useSearchParams } from 'solito/navigation';
 import electronPages from 'app/bundles/electronPages'

apps/electron/pages/screen.tsx

@@ -1,5 +1,5 @@
 import Feature from 'app/bundles/custom/pages/screen'
-import { useSession } from 'protolib'
+import { useSession } from 'protolib/lib/Session'
 
 export default function IndexPage(props:any) {
   useSession(props.pageSession)

apps/next/pages/auth/login.tsx

@@ -1,6 +1,6 @@
 import { SignInPage } from 'app/features/auth/login'
 import Head from 'next/head'
-import { hasSessionCookie, SSR } from 'protolib'
+import { hasSessionCookie, SSR } from 'protolib/lib/Session'
 import { NextPageContext } from 'next'
 
 export default function Page(props:any) {

apps/next/pages/auth/register.tsx

@@ -1,6 +1,6 @@
 import { SignInPage } from 'app/features/auth/register'
 import Head from 'next/head'
-import { hasSessionCookie, SSR } from 'protolib'
+import { hasSessionCookie, SSR } from 'protolib/lib/Session'
 import { NextPageContext } from 'next'
 
 export default function Page(props:any) {

apps/next/pages/index.tsx

@@ -1,5 +1,5 @@
 import Feature from 'app/bundles/custom/pages/home'
-import { useSession } from 'protolib'
+import { useSession } from 'protolib/lib/Session'
 
 export default function IndexPage(props:any) {
   useSession(props.pageSession)

apps/next/pages/profile.tsx

@@ -1,7 +1,8 @@
 import { Profile } from 'app/features/profile'
 import Head from 'next/head'
 import { NextPageContext } from 'next'
-import { useSession, withSession, SSR} from 'protolib'
+import { useSession, withSession } from 'protolib/lib/Session'
+import {SSR} from 'protolib/lib/SSR'
 
 export default function ProfilePage(props:any) {
   useSession(props.pageSession)

apps/next/pages/workspace/[...page].tsx

@@ -1,7 +1,7 @@
 import { useEffect } from 'react';
 import { useRouter, useSearchParams } from 'solito/navigation';
 import { SiteConfig } from 'app/conf';
-import { getWorkspaceEnv } from 'protolib';
+import { getWorkspaceEnv } from 'protolib/lib/useWorkspaceEnv';
 import { getEnv } from 'protolib/base';
 
 const serviceEnv = getEnv()

apps/next/pages/workspace/apis.tsx

@@ -1,6 +1,6 @@
 import ApisPage from 'protolib/bundles/apis/adminPages'
 import Head from 'next/head'
-import { useRedirectToEnviron } from 'protolib'
+import { useRedirectToEnviron } from 'protolib/lib/useRedirectToEnviron'
 
 export default function Page(props:any) {
   useRedirectToEnviron()

apps/next/pages/workspace/deviceBoards.tsx

@@ -1,6 +1,6 @@
 import DevicesPages from 'protolib/bundles/devices/adminPages'
 import Head from 'next/head'
-import { useRedirectToEnviron } from 'protolib'
+import { useRedirectToEnviron } from 'protolib/lib/useRedirectToEnviron'
 
 export default function Page(props:any) {
   const PageComponent = DevicesPages['deviceBoards/**'].component

apps/next/pages/workspace/deviceCores.tsx

@@ -1,6 +1,6 @@
 import DevicesPages from 'protolib/bundles/devices/adminPages'
 import Head from 'next/head'
-import { useRedirectToEnviron } from 'protolib'
+import { useRedirectToEnviron } from 'protolib/lib/useRedirectToEnviron'
 
 export default function Page(props:any) {
   const PageComponent = DevicesPages['deviceCores/**'].component

apps/next/pages/workspace/deviceDefinitions.tsx

@@ -1,6 +1,6 @@
 import DevicesPages from 'protolib/bundles/devices/adminPages'
 import Head from 'next/head'
-import { useRedirectToEnviron } from 'protolib'
+import { useRedirectToEnviron } from 'protolib/lib/useRedirectToEnviron'
 
 export default function Page(props:any) {
   const PageComponent = DevicesPages['deviceDefinitions/**'].component

apps/next/pages/workspace/deviceSdks.tsx

@@ -1,6 +1,6 @@
 import DevicesPages from 'protolib/bundles/devices/adminPages'
 import Head from 'next/head'
-import { useRedirectToEnviron } from 'protolib'
+import { useRedirectToEnviron } from 'protolib/lib/useRedirectToEnviron'
 
 export default function Page(props:any) {
   const PageComponent = DevicesPages['deviceSdks/**'].component

apps/next/pages/workspace/devices.tsx

@@ -1,6 +1,6 @@
 import DevicesPages from 'protolib/bundles/devices/adminPages'
 import Head from 'next/head'
-import { useRedirectToEnviron } from 'protolib'
+import { useRedirectToEnviron } from 'protolib/lib/useRedirectToEnviron'
 
 export default function Page(props:any) {
   const PageComponent = DevicesPages['devices/**'].component

apps/next/pages/workspace/events.tsx

@@ -1,6 +1,6 @@
 import EventsPage from 'protolib/bundles/events/adminPages'
 import Head from 'next/head'
-import { useRedirectToEnviron } from 'protolib'
+import { useRedirectToEnviron } from 'protolib/lib/useRedirectToEnviron'
 
 export default function Page(props:any) {
   useRedirectToEnviron()

apps/next/pages/workspace/files.tsx

@@ -1,6 +1,6 @@
 import FilesPage from 'protolib/bundles/files/adminPages'
 import Head from 'next/head'
-import { useRedirectToEnviron } from 'protolib'
+import { useRedirectToEnviron } from 'protolib/lib/useRedirectToEnviron'
 
 export default function Page(props:any) {
   useRedirectToEnviron()

apps/next/pages/workspace/fsm.tsx

@@ -1,6 +1,6 @@
 import FSMPages from 'protolib/bundles/fsm/adminPages'
 import Head from 'next/head'
-import { useRedirectToEnviron } from 'protolib'
+import { useRedirectToEnviron } from 'protolib/lib/useRedirectToEnviron'
 
 export default function Page(props:any) {
   useRedirectToEnviron()

apps/next/pages/workspace/groups.tsx

@@ -1,6 +1,6 @@
 import GroupsPage from 'protolib/bundles/groups/adminPages'
 import Head from 'next/head'
-import { useRedirectToEnviron } from 'protolib'
+import { useRedirectToEnviron } from 'protolib/lib/useRedirectToEnviron'
 
 export default function Page(props:any) {
   useRedirectToEnviron()

apps/next/pages/workspace/keys.tsx

@@ -1,6 +1,6 @@
 import KeysPage from 'protolib/bundles/keys/adminPages'
 import Head from 'next/head'
-import { useRedirectToEnviron } from 'protolib'
+import { useRedirectToEnviron } from 'protolib/lib/useRedirectToEnviron'
 
 export default function Page(props:any) {
   useRedirectToEnviron()

apps/next/pages/workspace/messages.tsx

@@ -1,6 +1,6 @@
 import MessagesPage from 'protolib/bundles/messages/adminPages'
 import Head from 'next/head'
-import { useRedirectToEnviron } from 'protolib'
+import { useRedirectToEnviron } from 'protolib/lib/useRedirectToEnviron'
 
 export default function Page(props:any) {
   useRedirectToEnviron()

apps/next/pages/workspace/objects.tsx

@@ -1,6 +1,6 @@
 import ObjectsPage from 'protolib/bundles/objects/adminPages'
 import Head from 'next/head'
-import { useRedirectToEnviron } from 'protolib'
+import { useRedirectToEnviron } from 'protolib/lib/useRedirectToEnviron'
 
 export default function Page(props:any) {
   useRedirectToEnviron()

apps/next/pages/workspace/pages.tsx

@@ -1,6 +1,6 @@
 import PagesPage from 'protolib/bundles/pages/adminPages'
 import Head from 'next/head'
-import { useRedirectToEnviron } from 'protolib'
+import { useRedirectToEnviron } from 'protolib/lib/useRedirectToEnviron'
 
 export default function Page(props:any) {
   useRedirectToEnviron()

apps/next/pages/workspace/resources.tsx

@@ -1,6 +1,6 @@
 import ResourcesPage from 'protolib/bundles/resources/adminPages'
 import Head from 'next/head'
-import { useRedirectToEnviron } from 'protolib'
+import { useRedirectToEnviron } from 'protolib/lib/useRedirectToEnviron'
 
 export default function Page(props:any) {
   useRedirectToEnviron()

apps/next/pages/workspace/services.tsx

@@ -1,6 +1,6 @@
 import ServicesPage from 'protolib/bundles/services/adminPages'
 import Head from 'next/head'
-import { useRedirectToEnviron } from 'protolib'
+import { useRedirectToEnviron } from 'protolib/lib/useRedirectToEnviron'
 
 export default function Page(props:any) {
   useRedirectToEnviron()

apps/next/pages/workspace/users.tsx

@@ -1,6 +1,6 @@
 import UsersPage from 'protolib/bundles/users/adminPages'
 import Head from 'next/head'
-import { useRedirectToEnviron } from 'protolib'
+import { useRedirectToEnviron } from 'protolib/lib/useRedirectToEnviron'
 
 export default function Page(props:any) {
   useRedirectToEnviron()

packages/app/bundles/custom/menu.tsx

@@ -1,4 +1,4 @@
-import { clearSession } from 'protolib'
+import { clearSession } from 'protolib/lib/Session'
 
 const logout = (setSession, setSessionContext) => {
     clearSession(setSession, setSessionContext)

packages/app/bundles/custom/pages/home.tsx

@@ -1,6 +1,17 @@
 import React, { useState } from "react";
 import { Theme } from "@my/ui";
-import { UIWrapLib, UIWrap, withSession, Page, useEditor, API, SSR, useComposedState, Text, Pressable, Icon, VStack, HStack, Image } from "protolib";
+import {Page} from 'protolib/components/Page'
+import {Text} from 'protolib/components/Text'
+import {Pressable} from 'protolib/components/Pressable'
+import {Icon} from 'protolib/components/Icon'
+import VStack from 'protolib/components/VStack'
+import HStack from 'protolib/components/HStack'
+import Image from 'protolib/components/Image'
+import {useComposedState} from 'protolib/lib/useComposedState'
+import {withSession } from "protolib/lib/Session"
+import {useEditor} from 'protolib/visualui/useEdit'
+import {SSR} from 'protolib/lib/SSR'
+import {UIWrapLib, UIWrap} from 'protolib/visualui/visualuiWrapper'
 import { DefaultLayout } from "../../../layout/DefaultLayout";
 import { Protofy } from "protolib/base";
 import { context } from "app/bundles/uiContext";

packages/app/bundles/custom/pages/notFound.tsx

@@ -1,10 +1,13 @@
 import { DefaultLayout } from 'app/layout/DefaultLayout'
 import { AlertTriangle } from '@tamagui/lucide-icons'
-import {Page} from 'protolib'
+import {Page} from 'protolib/components/Page'
 import { Protofy } from 'protolib/base'
 import { Theme, YStack, Text, XStack, Paragraph,H2 } from "@my/ui"
 import React, { useState } from 'react'
-import { UIWrapLib, UIWrap, withSession, useEditor, SSR } from "protolib"
+import {withSession } from "protolib/lib/Session"
+import {useEditor} from 'protolib/visualui/useEdit'
+import {SSR} from 'protolib/lib/SSR'
+import {UIWrapLib, UIWrap} from 'protolib/visualui/visualuiWrapper'
 
 const isProtected = Protofy("protected", false)
 

packages/app/bundles/intents.ts

@@ -1,4 +1,4 @@
-import {IntentType} from 'protolib'
+import {IntentType} from 'protolib/lib/Intent'
 import {processFilesIntent} from 'protolib/bundles/files/intents'
 import { useMemo } from 'react';
 

packages/protolib/bundles/apis/masks/ApiMask.tsx

@@ -1,5 +1,5 @@
 import { Node, Field, FlowPort, NodeParams, FallbackPort, Button, getFieldValue } from 'protoflow';
-import { API } from 'protolib'
+import { API } from 'protolib/base/Api'
 import { Plug } from 'lucide-react';
 import { filterCallback, restoreCallback } from 'protoflow';
 import { SiteConfig} from 'app/conf'

packages/protolib/bundles/apis/masks/Automation.tsx

@@ -1,5 +1,5 @@
 import { Node, getFieldValue, FlowPort, NodeParams, FallbackPort, Button, filterCallback, restoreCallback } from 'protoflow';
-import { API } from 'protolib'
+import { API } from 'protolib/base/Api'
 import { Plug } from 'lucide-react';
 import { useColorFromPalette } from 'protoflow/src/diagram/Theme'
 import React from 'react';

packages/protolib/bundles/apis/masks/ExecuteAutomation.tsx

@@ -3,7 +3,7 @@ import { Send } from 'lucide-react';
 import { useColorFromPalette } from 'protoflow/src/diagram/Theme'
 import { filterCallback, restoreCallback } from 'protoflow';
 import { useEffect, useState } from 'react';
-import { API } from 'protolib'
+import { API } from 'protolib/base/Api'
 
 const ExecuteAutomation = (node: any = {}, nodeData = {}) => {
     const color = useColorFromPalette(20)

packages/protolib/bundles/apis/masks/Fetch.tsx

@@ -3,7 +3,7 @@ import { Send } from 'lucide-react';
 import { useColorFromPalette } from 'protoflow/src/diagram/Theme'
 import { filterCallback, restoreCallback } from 'protoflow';
 import { useEffect, useState } from 'react';
-import { API } from 'protolib'
+import { API } from 'protolib/base/Api'
 
 const Fetch = (node: any = {}, nodeData = {}) => {
     const color = useColorFromPalette(20)

packages/protolib/bundles/automations/masks/Automation.tsx

@@ -3,7 +3,7 @@ import { useColorFromPalette } from 'protoflow/src/diagram/Theme';
 import { Plug } from 'lucide-react';
 import React from 'react';
 import { SizableText, Spinner, XStack } from 'tamagui';
-import { API } from 'protolib'
+import { API } from 'protolib/base/Api'
 import { SiteConfig} from 'app/conf'
 import { useWorkspaceEnv } from 'protolib';
 

packages/protolib/bundles/keys/adminPages.tsx

@@ -1,5 +1,6 @@
 import { KeyModel } from '.'
-import { DataView, AdminPage } from 'protolib'
+import { DataView } from '../../components/DataView'
+import { AdminPage } from '../../components/AdminPage'
 import { Key } from '@tamagui/lucide-icons';
 import { usePrompt } from '../../context/PromptAtom'
 import { PaginatedData } from '../../lib/SSR';

packages/protolib/bundles/pages/templates/electronPage.tpl

@@ -1,5 +1,5 @@
 import Feature from 'app/bundles/custom/pages/{{name}}'
-import { useSession } from 'protolib'
+import { useSession } from 'protolib/lib/Session'
 import { useRouter } from "solito/navigation";
 
 export default function {{upperName}}Page(props:any) {

packages/protolib/bundles/pages/templates/nextPage.tpl

@@ -1,5 +1,5 @@
 import Feature from 'app/bundles/custom/pages/{{name}}'
-import { useSession } from 'protolib'
+import { useSession } from 'protolib/lib/Session'
 
 export default function {{upperName}}Page(props:any) {
   useSession(props.pageSession)

packages/protolib/components/Page.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect } from "react";
 import { StackProps, YStack, useTheme } from "tamagui";
-import { useIsEditing } from "protolib"
+import { useIsEditing } from "protolib/visualui/useIsEditing"
 import Head from 'next/head'
 import { useSession, useSessionContext, useSessionGroup, useWorkspaces } from "../lib/Session";
 import { useUpdateEffect } from "usehooks-ts";

packages/protolib/components/SearchAndSelect.tsx

@@ -1,6 +1,6 @@
 import { Input, InputProps, ListItem, YGroup, YStack } from "@my/ui"
 import { useEffect, useRef, useState } from "react"
-import { API } from 'protolib'
+import { API } from 'protolib/base/Api'
 
 type SearchAndSelectProps = {
     getDisplayField?: Function

packages/protolib/lib/SSR.ts

@@ -2,7 +2,8 @@
 import {SiteConfig} from 'app/conf'
 export * from '../components/AdminPage'
 import { NextPageContext } from 'next'
-import { API, withSession, getURLWithToken, AdminPage } from 'protolib'
+import {API} from '../base/Api'
+import {withSession, getURLWithToken} from './Session'
 
 export const SSR = (fn) => SiteConfig.SSR ? fn : undefined
 

packages/protolib/lib/Session.ts

@@ -4,7 +4,7 @@ import * as cookie from 'cookie'
 import { createSession, validateSession, SessionDataType, getSessionContext } from '../api/lib/session';
 import { NextPageContext } from 'next'
 import { parse } from 'cookie';
-import { getLogger } from "protolib/base"
+import { getLogger } from "protolib/base/logger"
 
 const logger = getLogger()
 

packages/protolib/lib/useRedirectToEnviron.ts

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

packages/protolib/visualui/useEdit.tsx

@@ -1,11 +1,12 @@
 import { useState, useEffect } from 'react'
-import { API, Tinted } from 'protolib'
+import { API } from 'protolib/base/Api'
+import {Tinted} from 'protolib/components/Tinted'
 import { Pencil } from '@tamagui/lucide-icons'
 import { getTokens } from '@tamagui/core'
 import { Button } from 'tamagui'
 import dynamic from 'next/dynamic';
 import { palettes } from 'app/bundles/palettes'
-import { Session } from 'protolib'
+import { Session } from 'protolib/lib/Session'
 import { useAtom } from 'jotai'
 import { useIsEditing } from './useIsEditing'
 import { useToastController } from '@my/ui'