diff --git a/packages/expo-atlas-ui/fixture/expo-51-default-windows.jsonl b/packages/expo-atlas-ui/_fixtures/expo-51-default-windows.jsonl similarity index 100% rename from packages/expo-atlas-ui/fixture/expo-51-default-windows.jsonl rename to packages/expo-atlas-ui/_fixtures/expo-51-default-windows.jsonl diff --git a/packages/expo-atlas-ui/fixture/expo-51-default.jsonl b/packages/expo-atlas-ui/_fixtures/expo-51-default.jsonl similarity index 100% rename from packages/expo-atlas-ui/fixture/expo-51-default.jsonl rename to packages/expo-atlas-ui/_fixtures/expo-51-default.jsonl diff --git a/packages/expo-atlas-ui/src/app/(atlas)/[bundle].tsx b/packages/expo-atlas-ui/app/(atlas)/[bundle].tsx similarity index 100% rename from packages/expo-atlas-ui/src/app/(atlas)/[bundle].tsx rename to packages/expo-atlas-ui/app/(atlas)/[bundle].tsx diff --git a/packages/expo-atlas-ui/src/app/(atlas)/[bundle]/folders/[path].tsx b/packages/expo-atlas-ui/app/(atlas)/[bundle]/folders/[path].tsx similarity index 100% rename from packages/expo-atlas-ui/src/app/(atlas)/[bundle]/folders/[path].tsx rename to packages/expo-atlas-ui/app/(atlas)/[bundle]/folders/[path].tsx diff --git a/packages/expo-atlas-ui/src/app/(atlas)/[bundle]/modules/[path].tsx b/packages/expo-atlas-ui/app/(atlas)/[bundle]/modules/[path].tsx similarity index 100% rename from packages/expo-atlas-ui/src/app/(atlas)/[bundle]/modules/[path].tsx rename to packages/expo-atlas-ui/app/(atlas)/[bundle]/modules/[path].tsx diff --git a/packages/expo-atlas-ui/src/app/+html.tsx b/packages/expo-atlas-ui/app/+html.tsx similarity index 100% rename from packages/expo-atlas-ui/src/app/+html.tsx rename to packages/expo-atlas-ui/app/+html.tsx diff --git a/packages/expo-atlas-ui/src/app/--/bundles/[bundle]/hmr+api.ts b/packages/expo-atlas-ui/app/--/bundles/[bundle]/hmr+api.ts similarity index 100% rename from packages/expo-atlas-ui/src/app/--/bundles/[bundle]/hmr+api.ts rename to packages/expo-atlas-ui/app/--/bundles/[bundle]/hmr+api.ts diff --git a/packages/expo-atlas-ui/src/app/--/bundles/[bundle]/index+api.ts b/packages/expo-atlas-ui/app/--/bundles/[bundle]/index+api.ts similarity index 100% rename from packages/expo-atlas-ui/src/app/--/bundles/[bundle]/index+api.ts rename to packages/expo-atlas-ui/app/--/bundles/[bundle]/index+api.ts diff --git a/packages/expo-atlas-ui/src/app/--/bundles/[bundle]/modules/graph+api.ts b/packages/expo-atlas-ui/app/--/bundles/[bundle]/modules/graph+api.ts similarity index 100% rename from packages/expo-atlas-ui/src/app/--/bundles/[bundle]/modules/graph+api.ts rename to packages/expo-atlas-ui/app/--/bundles/[bundle]/modules/graph+api.ts diff --git a/packages/expo-atlas-ui/src/app/--/bundles/[bundle]/modules/index+api.ts b/packages/expo-atlas-ui/app/--/bundles/[bundle]/modules/index+api.ts similarity index 100% rename from packages/expo-atlas-ui/src/app/--/bundles/[bundle]/modules/index+api.ts rename to packages/expo-atlas-ui/app/--/bundles/[bundle]/modules/index+api.ts diff --git a/packages/expo-atlas-ui/src/app/--/bundles/[bundle]/reload+api.ts b/packages/expo-atlas-ui/app/--/bundles/[bundle]/reload+api.ts similarity index 100% rename from packages/expo-atlas-ui/src/app/--/bundles/[bundle]/reload+api.ts rename to packages/expo-atlas-ui/app/--/bundles/[bundle]/reload+api.ts diff --git a/packages/expo-atlas-ui/src/app/--/bundles/index+api.ts b/packages/expo-atlas-ui/app/--/bundles/index+api.ts similarity index 100% rename from packages/expo-atlas-ui/src/app/--/bundles/index+api.ts rename to packages/expo-atlas-ui/app/--/bundles/index+api.ts diff --git a/packages/expo-atlas-ui/src/app/--/bundles/reload+api.ts b/packages/expo-atlas-ui/app/--/bundles/reload+api.ts similarity index 100% rename from packages/expo-atlas-ui/src/app/--/bundles/reload+api.ts rename to packages/expo-atlas-ui/app/--/bundles/reload+api.ts diff --git a/packages/expo-atlas-ui/src/app/_layout.tsx b/packages/expo-atlas-ui/app/_layout.tsx similarity index 98% rename from packages/expo-atlas-ui/src/app/_layout.tsx rename to packages/expo-atlas-ui/app/_layout.tsx index 5210a2b..5060dd3 100644 --- a/packages/expo-atlas-ui/src/app/_layout.tsx +++ b/packages/expo-atlas-ui/app/_layout.tsx @@ -1,4 +1,3 @@ -import '~/styles-expo.css'; import '~/styles.css'; import { Slot } from 'expo-router'; diff --git a/packages/expo-atlas-ui/src/app/index.tsx b/packages/expo-atlas-ui/app/index.tsx similarity index 100% rename from packages/expo-atlas-ui/src/app/index.tsx rename to packages/expo-atlas-ui/app/index.tsx diff --git a/packages/expo-atlas-ui/src/components/BreadcrumbLinks.tsx b/packages/expo-atlas-ui/components/BreadcrumbLinks.tsx similarity index 100% rename from packages/expo-atlas-ui/src/components/BreadcrumbLinks.tsx rename to packages/expo-atlas-ui/components/BreadcrumbLinks.tsx diff --git a/packages/expo-atlas-ui/src/components/BundleGraph.tsx b/packages/expo-atlas-ui/components/BundleGraph.tsx similarity index 100% rename from packages/expo-atlas-ui/src/components/BundleGraph.tsx rename to packages/expo-atlas-ui/components/BundleGraph.tsx diff --git a/packages/expo-atlas-ui/src/components/BundleSelectForm.tsx b/packages/expo-atlas-ui/components/BundleSelectForm.tsx similarity index 100% rename from packages/expo-atlas-ui/src/components/BundleSelectForm.tsx rename to packages/expo-atlas-ui/components/BundleSelectForm.tsx diff --git a/packages/expo-atlas-ui/src/components/BundleTag.tsx b/packages/expo-atlas-ui/components/BundleTag.tsx similarity index 100% rename from packages/expo-atlas-ui/src/components/BundleTag.tsx rename to packages/expo-atlas-ui/components/BundleTag.tsx diff --git a/packages/expo-atlas-ui/src/components/EnvironmentIcon.tsx b/packages/expo-atlas-ui/components/EnvironmentIcon.tsx similarity index 100% rename from packages/expo-atlas-ui/src/components/EnvironmentIcon.tsx rename to packages/expo-atlas-ui/components/EnvironmentIcon.tsx diff --git a/packages/expo-atlas-ui/src/components/EnvironmentName.tsx b/packages/expo-atlas-ui/components/EnvironmentName.tsx similarity index 100% rename from packages/expo-atlas-ui/src/components/EnvironmentName.tsx rename to packages/expo-atlas-ui/components/EnvironmentName.tsx diff --git a/packages/expo-atlas-ui/src/components/FilePathMenu.tsx b/packages/expo-atlas-ui/components/FilePathMenu.tsx similarity index 100% rename from packages/expo-atlas-ui/src/components/FilePathMenu.tsx rename to packages/expo-atlas-ui/components/FilePathMenu.tsx diff --git a/packages/expo-atlas-ui/src/components/FileSize.tsx b/packages/expo-atlas-ui/components/FileSize.tsx similarity index 100% rename from packages/expo-atlas-ui/src/components/FileSize.tsx rename to packages/expo-atlas-ui/components/FileSize.tsx diff --git a/packages/expo-atlas-ui/src/components/ModuleCode.tsx b/packages/expo-atlas-ui/components/ModuleCode.tsx similarity index 100% rename from packages/expo-atlas-ui/src/components/ModuleCode.tsx rename to packages/expo-atlas-ui/components/ModuleCode.tsx diff --git a/packages/expo-atlas-ui/src/components/ModuleFilterForm.tsx b/packages/expo-atlas-ui/components/ModuleFilterForm.tsx similarity index 100% rename from packages/expo-atlas-ui/src/components/ModuleFilterForm.tsx rename to packages/expo-atlas-ui/components/ModuleFilterForm.tsx diff --git a/packages/expo-atlas-ui/src/components/ModuleReference.tsx b/packages/expo-atlas-ui/components/ModuleReference.tsx similarity index 100% rename from packages/expo-atlas-ui/src/components/ModuleReference.tsx rename to packages/expo-atlas-ui/components/ModuleReference.tsx diff --git a/packages/expo-atlas-ui/src/components/ModuleReferenceList.tsx b/packages/expo-atlas-ui/components/ModuleReferenceList.tsx similarity index 100% rename from packages/expo-atlas-ui/src/components/ModuleReferenceList.tsx rename to packages/expo-atlas-ui/components/ModuleReferenceList.tsx diff --git a/packages/expo-atlas-ui/src/components/PlatformName.tsx b/packages/expo-atlas-ui/components/PlatformName.tsx similarity index 100% rename from packages/expo-atlas-ui/src/components/PlatformName.tsx rename to packages/expo-atlas-ui/components/PlatformName.tsx diff --git a/packages/expo-atlas-ui/src/components/PropertySummary.tsx b/packages/expo-atlas-ui/components/PropertySummary.tsx similarity index 100% rename from packages/expo-atlas-ui/src/components/PropertySummary.tsx rename to packages/expo-atlas-ui/components/PropertySummary.tsx diff --git a/packages/expo-atlas-ui/src/components/StateInfo.tsx b/packages/expo-atlas-ui/components/StateInfo.tsx similarity index 100% rename from packages/expo-atlas-ui/src/components/StateInfo.tsx rename to packages/expo-atlas-ui/components/StateInfo.tsx diff --git a/packages/expo-atlas-ui/src/styles-expo.css b/packages/expo-atlas-ui/global.css similarity index 95% rename from packages/expo-atlas-ui/src/styles-expo.css rename to packages/expo-atlas-ui/global.css index 790dfd8..e2483d4 100644 --- a/packages/expo-atlas-ui/src/styles-expo.css +++ b/packages/expo-atlas-ui/global.css @@ -1,3 +1,37 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; + +body { + background-color: var(--expo-theme-background-screen); + color: var(--expo-theme-text-default); +} + +html, body, #root { + height: auto; + min-height: 100vh; + margin: 0; + padding: 0; +} + +#root { + display: flex; +} + +@layer components { + .shiki code { + @apply grid grid-cols-[auto,1fr]; + } + + .shiki .line-number { + @apply px-4 text-right select-none; + } + + .shiki .line { + @apply pr-4; + } +} + /* This is a copy without the radix imports, which are not supported in Expo Router */ :root { --expo-color-white: #fff; diff --git a/packages/expo-atlas-ui/src/hooks/useModuleFilters.ts b/packages/expo-atlas-ui/hooks/useModuleFilters.ts similarity index 100% rename from packages/expo-atlas-ui/src/hooks/useModuleFilters.ts rename to packages/expo-atlas-ui/hooks/useModuleFilters.ts diff --git a/packages/expo-atlas-ui/metro.config.js b/packages/expo-atlas-ui/metro.config.js index 189fc6e..66f2068 100644 --- a/packages/expo-atlas-ui/metro.config.js +++ b/packages/expo-atlas-ui/metro.config.js @@ -5,7 +5,7 @@ const path = require('path'); // Load Expo's default config, with NativeWind support const config = withNativeWind(getDefaultConfig(__dirname, { isCSSEnabled: true }), { - input: './src/styles.css', + input: './global.css', }); // Move the Metro cache to `node_modules/.cache` @@ -38,7 +38,7 @@ config.resolver.resolveRequest = (context, moduleName, platform) => { // Initialize the Expo Atlas global data source in development if (process.env.NODE_ENV === 'development') { const { AtlasFileSource } = require('expo-atlas/build/src/data/AtlasFileSource'); - const filePath = path.resolve(__dirname, './fixture/expo-51-default.jsonl'); + const filePath = path.resolve(__dirname, './_fixtures/expo-51-default.jsonl'); // To test the example app, use this instead after exporting the apps/example // const filePath = path.resolve(__dirname, '../../apps/example/.expo/atlas.jsonl'); diff --git a/packages/expo-atlas-ui/package.json b/packages/expo-atlas-ui/package.json index dc47a9f..4275ca2 100644 --- a/packages/expo-atlas-ui/package.json +++ b/packages/expo-atlas-ui/package.json @@ -1,8 +1,8 @@ { "private": true, "name": "expo-atlas-ui", - "version": "0.0.1-private", - "main": "src/index.ts", + "version": "0.0.0", + "main": "expo-router/entry", "scripts": { "build": "expo export --platform web --output-dir ../expo-atlas/build/atlas-ui", "clean": "git clean -xdf build", diff --git a/packages/expo-atlas-ui/src/providers/bundle.tsx b/packages/expo-atlas-ui/providers/bundle.tsx similarity index 100% rename from packages/expo-atlas-ui/src/providers/bundle.tsx rename to packages/expo-atlas-ui/providers/bundle.tsx diff --git a/packages/expo-atlas-ui/src/providers/hmr/hmr-client.ts b/packages/expo-atlas-ui/providers/hmr/hmr-client.ts similarity index 100% rename from packages/expo-atlas-ui/src/providers/hmr/hmr-client.ts rename to packages/expo-atlas-ui/providers/hmr/hmr-client.ts diff --git a/packages/expo-atlas-ui/src/providers/hmr/hmr-provider.tsx b/packages/expo-atlas-ui/providers/hmr/hmr-provider.tsx similarity index 100% rename from packages/expo-atlas-ui/src/providers/hmr/hmr-provider.tsx rename to packages/expo-atlas-ui/providers/hmr/hmr-provider.tsx diff --git a/packages/expo-atlas-ui/src/providers/hmr/index.ts b/packages/expo-atlas-ui/providers/hmr/index.ts similarity index 100% rename from packages/expo-atlas-ui/src/providers/hmr/index.ts rename to packages/expo-atlas-ui/providers/hmr/index.ts diff --git a/packages/expo-atlas-ui/src/providers/query.tsx b/packages/expo-atlas-ui/providers/query.tsx similarity index 100% rename from packages/expo-atlas-ui/src/providers/query.tsx rename to packages/expo-atlas-ui/providers/query.tsx diff --git a/packages/expo-atlas-ui/src/providers/theme.tsx b/packages/expo-atlas-ui/providers/theme.tsx similarity index 100% rename from packages/expo-atlas-ui/src/providers/theme.tsx rename to packages/expo-atlas-ui/providers/theme.tsx diff --git a/packages/expo-atlas-ui/src/index.ts b/packages/expo-atlas-ui/src/index.ts deleted file mode 100644 index 5b83418..0000000 --- a/packages/expo-atlas-ui/src/index.ts +++ /dev/null @@ -1 +0,0 @@ -import 'expo-router/entry'; diff --git a/packages/expo-atlas-ui/src/styles.css b/packages/expo-atlas-ui/src/styles.css deleted file mode 100644 index 52a9d87..0000000 --- a/packages/expo-atlas-ui/src/styles.css +++ /dev/null @@ -1,33 +0,0 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; - -body { - background-color: var(--expo-theme-background-screen); - color: var(--expo-theme-text-default); -} - -html, body, #root { - height: auto; - min-height: 100vh; - margin: 0; - padding: 0; -} - -#root { - display: flex; -} - -@layer components { - .shiki code { - @apply grid grid-cols-[auto,1fr]; - } - - .shiki .line-number { - @apply px-4 text-right select-none; - } - - .shiki .line { - @apply pr-4; - } -} diff --git a/packages/expo-atlas-ui/tailwind.config.js b/packages/expo-atlas-ui/tailwind.config.js index bff5758..4b769c0 100644 --- a/packages/expo-atlas-ui/tailwind.config.js +++ b/packages/expo-atlas-ui/tailwind.config.js @@ -3,7 +3,7 @@ const expoTheme = require('@expo/styleguide/tailwind'); /** @type {import('tailwindcss').Config} */ module.exports = { ...expoTheme, - content: ['./src/**/*.{js,jsx,ts,tsx}'], + content: ['./{app,components,providers,ui}**/*.{js,jsx,ts,tsx}'], presets: [require('nativewind/preset')], plugins: [require('tailwindcss-animate'), require('tailwind-gradient-mask-image')], }; diff --git a/packages/expo-atlas-ui/src/ui/Breadcrumb.tsx b/packages/expo-atlas-ui/ui/Breadcrumb.tsx similarity index 100% rename from packages/expo-atlas-ui/src/ui/Breadcrumb.tsx rename to packages/expo-atlas-ui/ui/Breadcrumb.tsx diff --git a/packages/expo-atlas-ui/src/ui/Button.tsx b/packages/expo-atlas-ui/ui/Button.tsx similarity index 100% rename from packages/expo-atlas-ui/src/ui/Button.tsx rename to packages/expo-atlas-ui/ui/Button.tsx diff --git a/packages/expo-atlas-ui/src/ui/Checkbox.tsx b/packages/expo-atlas-ui/ui/Checkbox.tsx similarity index 100% rename from packages/expo-atlas-ui/src/ui/Checkbox.tsx rename to packages/expo-atlas-ui/ui/Checkbox.tsx diff --git a/packages/expo-atlas-ui/src/ui/Code.tsx b/packages/expo-atlas-ui/ui/Code.tsx similarity index 100% rename from packages/expo-atlas-ui/src/ui/Code.tsx rename to packages/expo-atlas-ui/ui/Code.tsx diff --git a/packages/expo-atlas-ui/src/ui/Collapsible.tsx b/packages/expo-atlas-ui/ui/Collapsible.tsx similarity index 100% rename from packages/expo-atlas-ui/src/ui/Collapsible.tsx rename to packages/expo-atlas-ui/ui/Collapsible.tsx diff --git a/packages/expo-atlas-ui/src/ui/Input.tsx b/packages/expo-atlas-ui/ui/Input.tsx similarity index 100% rename from packages/expo-atlas-ui/src/ui/Input.tsx rename to packages/expo-atlas-ui/ui/Input.tsx diff --git a/packages/expo-atlas-ui/src/ui/Label.tsx b/packages/expo-atlas-ui/ui/Label.tsx similarity index 100% rename from packages/expo-atlas-ui/src/ui/Label.tsx rename to packages/expo-atlas-ui/ui/Label.tsx diff --git a/packages/expo-atlas-ui/src/ui/Layout.tsx b/packages/expo-atlas-ui/ui/Layout.tsx similarity index 100% rename from packages/expo-atlas-ui/src/ui/Layout.tsx rename to packages/expo-atlas-ui/ui/Layout.tsx diff --git a/packages/expo-atlas-ui/src/ui/Menu.tsx b/packages/expo-atlas-ui/ui/Menu.tsx similarity index 100% rename from packages/expo-atlas-ui/src/ui/Menu.tsx rename to packages/expo-atlas-ui/ui/Menu.tsx diff --git a/packages/expo-atlas-ui/src/ui/Panel.tsx b/packages/expo-atlas-ui/ui/Panel.tsx similarity index 100% rename from packages/expo-atlas-ui/src/ui/Panel.tsx rename to packages/expo-atlas-ui/ui/Panel.tsx diff --git a/packages/expo-atlas-ui/src/ui/Select.tsx b/packages/expo-atlas-ui/ui/Select.tsx similarity index 100% rename from packages/expo-atlas-ui/src/ui/Select.tsx rename to packages/expo-atlas-ui/ui/Select.tsx diff --git a/packages/expo-atlas-ui/src/ui/Sheet.tsx b/packages/expo-atlas-ui/ui/Sheet.tsx similarity index 100% rename from packages/expo-atlas-ui/src/ui/Sheet.tsx rename to packages/expo-atlas-ui/ui/Sheet.tsx diff --git a/packages/expo-atlas-ui/src/ui/Skeleton.tsx b/packages/expo-atlas-ui/ui/Skeleton.tsx similarity index 100% rename from packages/expo-atlas-ui/src/ui/Skeleton.tsx rename to packages/expo-atlas-ui/ui/Skeleton.tsx diff --git a/packages/expo-atlas-ui/src/ui/Spinner.tsx b/packages/expo-atlas-ui/ui/Spinner.tsx similarity index 100% rename from packages/expo-atlas-ui/src/ui/Spinner.tsx rename to packages/expo-atlas-ui/ui/Spinner.tsx diff --git a/packages/expo-atlas-ui/src/ui/Tag.tsx b/packages/expo-atlas-ui/ui/Tag.tsx similarity index 100% rename from packages/expo-atlas-ui/src/ui/Tag.tsx rename to packages/expo-atlas-ui/ui/Tag.tsx diff --git a/packages/expo-atlas-ui/src/ui/Toast.tsx b/packages/expo-atlas-ui/ui/Toast.tsx similarity index 100% rename from packages/expo-atlas-ui/src/ui/Toast.tsx rename to packages/expo-atlas-ui/ui/Toast.tsx diff --git a/packages/expo-atlas-ui/src/ui/Tooltip.tsx b/packages/expo-atlas-ui/ui/Tooltip.tsx similarity index 100% rename from packages/expo-atlas-ui/src/ui/Tooltip.tsx rename to packages/expo-atlas-ui/ui/Tooltip.tsx diff --git a/packages/expo-atlas-ui/src/utils/api.ts b/packages/expo-atlas-ui/utils/api.ts similarity index 100% rename from packages/expo-atlas-ui/src/utils/api.ts rename to packages/expo-atlas-ui/utils/api.ts diff --git a/packages/expo-atlas-ui/src/utils/atlas.ts b/packages/expo-atlas-ui/utils/atlas.ts similarity index 100% rename from packages/expo-atlas-ui/src/utils/atlas.ts rename to packages/expo-atlas-ui/utils/atlas.ts diff --git a/packages/expo-atlas-ui/src/utils/bundle.ts b/packages/expo-atlas-ui/utils/bundle.ts similarity index 100% rename from packages/expo-atlas-ui/src/utils/bundle.ts rename to packages/expo-atlas-ui/utils/bundle.ts diff --git a/packages/expo-atlas-ui/src/utils/debounce.ts b/packages/expo-atlas-ui/utils/debounce.ts similarity index 100% rename from packages/expo-atlas-ui/src/utils/debounce.ts rename to packages/expo-atlas-ui/utils/debounce.ts diff --git a/packages/expo-atlas-ui/src/utils/filters.ts b/packages/expo-atlas-ui/utils/filters.ts similarity index 100% rename from packages/expo-atlas-ui/src/utils/filters.ts rename to packages/expo-atlas-ui/utils/filters.ts diff --git a/packages/expo-atlas-ui/src/utils/prettier.ts b/packages/expo-atlas-ui/utils/prettier.ts similarity index 100% rename from packages/expo-atlas-ui/src/utils/prettier.ts rename to packages/expo-atlas-ui/utils/prettier.ts diff --git a/packages/expo-atlas-ui/src/utils/shiki-theme.ts b/packages/expo-atlas-ui/utils/shiki-theme.ts similarity index 100% rename from packages/expo-atlas-ui/src/utils/shiki-theme.ts rename to packages/expo-atlas-ui/utils/shiki-theme.ts diff --git a/packages/expo-atlas-ui/src/utils/shiki.ts b/packages/expo-atlas-ui/utils/shiki.ts similarity index 100% rename from packages/expo-atlas-ui/src/utils/shiki.ts rename to packages/expo-atlas-ui/utils/shiki.ts diff --git a/packages/expo-atlas-ui/src/utils/treemap.ts b/packages/expo-atlas-ui/utils/treemap.ts similarity index 100% rename from packages/expo-atlas-ui/src/utils/treemap.ts rename to packages/expo-atlas-ui/utils/treemap.ts