From c117bb9ba88c2e501b5e68f20f4ae83e6a4f60a0 Mon Sep 17 00:00:00 2001 From: Sebastian Jeltsch Date: Sun, 5 Jan 2025 12:35:00 +0100 Subject: [PATCH] Move JS/TS client into trailbase-core/js/client to reduce the reliance on symlinks and fix windows builds. --- client/trailbase-ts | 1 + client/trailbase-ts/bindings | 1 - pnpm-lock.yaml | 120 +++++------ pnpm-workspace.yaml | 8 +- trailbase-core/build.rs | 10 +- trailbase-core/{ui => js}/admin/.gitignore | 0 .../{ui => js}/admin/.prettierignore | 0 .../{ui => js}/admin/.prettierrc.mjs | 0 trailbase-core/{ui => js}/admin/README.md | 0 trailbase-core/{ui => js}/admin/common | 0 .../{ui => js}/admin/eslint.config.mjs | 0 trailbase-core/{ui => js}/admin/index.html | 0 trailbase-core/{ui => js}/admin/package.json | 0 .../{ui => js}/admin/postcss.config.mjs | 0 .../{ui => js}/admin/proto/config.ts | 0 .../{ui => js}/admin/proto/config_api.ts | 0 .../admin/proto/google/protobuf/descriptor.ts | 0 .../{ui => js}/admin/proto/vault.ts | 0 trailbase-core/{ui => js}/admin/src/App.tsx | 0 .../admin/src/assets/countries-110m.json | 0 .../{ui => js}/admin/src/assets/favicon.svg | 0 .../{ui => js}/admin/src/assets/logo_104.webp | 0 .../components/DestructiveActionButton.tsx | 0 .../admin/src/components/ErrorBoundary.tsx | 0 .../admin/src/components/FilterBar.tsx | 0 .../admin/src/components/FormFields.tsx | 0 .../admin/src/components/IndexPage.tsx | 0 .../admin/src/components/NavBar.tsx | 0 .../admin/src/components/SafeSheet.tsx | 0 .../admin/src/components/SplitView.tsx | 0 .../{ui => js}/admin/src/components/Table.tsx | 0 .../src/components/auth/AccountsPage.tsx | 0 .../admin/src/components/auth/AddUser.tsx | 0 .../admin/src/components/auth/AuthButton.tsx | 0 .../admin/src/components/auth/LoginPage.tsx | 0 .../admin/src/components/auth/UserTable.tsx | 0 .../src/components/editor/EditorPage.tsx | 0 .../admin/src/components/logs/LogsPage.tsx | 0 .../src/components/settings/AuthSettings.tsx | 0 .../src/components/settings/EmailSettings.tsx | 0 .../components/settings/SchemaSettings.tsx | 0 .../src/components/settings/SettingsPage.tsx | 0 .../components/tables/CreateAlterIndex.tsx | 0 .../components/tables/CreateAlterTable.tsx | 0 .../src/components/tables/InsertAlterRow.tsx | 0 .../components/tables/RecordApiSettings.tsx | 0 .../src/components/tables/TablesPage.tsx | 0 .../admin/src/components/ui/accordion.tsx | 0 .../admin/src/components/ui/badge.tsx | 0 .../admin/src/components/ui/button.tsx | 0 .../admin/src/components/ui/card.tsx | 0 .../admin/src/components/ui/checkbox.tsx | 0 .../admin/src/components/ui/dialog.tsx | 0 .../admin/src/components/ui/hover-card.tsx | 0 .../admin/src/components/ui/label.tsx | 0 .../admin/src/components/ui/resizable.tsx | 0 .../admin/src/components/ui/select.tsx | 0 .../admin/src/components/ui/separator.tsx | 0 .../admin/src/components/ui/sheet.tsx | 0 .../admin/src/components/ui/switch.tsx | 0 .../admin/src/components/ui/table.tsx | 0 .../admin/src/components/ui/tabs.tsx | 0 .../admin/src/components/ui/text-field.tsx | 0 .../admin/src/components/ui/toast.tsx | 0 .../admin/src/components/ui/toggle.tsx | 0 .../admin/src/components/ui/tooltip.tsx | 0 trailbase-core/{ui => js}/admin/src/index.css | 0 trailbase-core/{ui => js}/admin/src/index.tsx | 0 .../{ui => js}/admin/src/lib/bindings.ts | 0 .../{ui => js}/admin/src/lib/config.ts | 0 .../{ui => js}/admin/src/lib/convert.ts | 0 .../{ui => js}/admin/src/lib/fetch.ts | 0 .../{ui => js}/admin/src/lib/name.ts | 0 .../{ui => js}/admin/src/lib/parse.ts | 0 .../{ui => js}/admin/src/lib/schema.ts | 0 .../{ui => js}/admin/src/lib/table.ts | 0 .../{ui => js}/admin/src/lib/user.ts | 0 .../{ui => js}/admin/src/lib/utils.ts | 0 .../{ui => js}/admin/tailwind.config.ts | 0 .../{ui => js}/admin/tests/util.test.ts | 0 trailbase-core/{ui => js}/admin/tsconfig.json | 0 .../{ui => js}/admin/ui.config.json | 0 .../{ui => js}/admin/vite.config.mts | 0 trailbase-core/{ui => js}/auth/.gitignore | 0 .../{ui => js}/auth/.prettierignore | 0 .../{ui => js}/auth/.prettierrc.mjs | 0 .../{ui => js}/auth/astro.config.mjs | 0 trailbase-core/{ui => js}/auth/common | 0 trailbase-core/{ui => js}/auth/package.json | 0 .../{ui => js}/auth/src/assets/favicon.svg | 0 .../auth/src/components/AlertBox.astro | 0 .../{ui => js}/auth/src/components/Card.astro | 0 .../auth/src/components/ErrorBoundary.tsx | 0 .../{ui => js}/auth/src/components/Form.astro | 0 .../src/components/ListOauthProviders.tsx | 0 .../auth/src/components/Profile.tsx | 0 .../auth/src/components/ui/button.tsx | 0 .../auth/src/components/ui/card.tsx | 0 .../auth/src/components/ui/dialog.tsx | 0 .../auth/src/components/ui/label.tsx | 0 .../auth/src/components/ui/text-field.tsx | 0 .../auth/src/components/ui/toast.tsx | 0 trailbase-core/{ui => js}/auth/src/env.d.ts | 0 .../auth/src/layouts/BaseLayout.astro | 0 .../{ui => js}/auth/src/lib/constants.ts | 0 .../{ui => js}/auth/src/lib/utils.ts | 0 .../auth/src/pages/change_email.astro | 0 .../auth/src/pages/change_password.astro | 0 .../{ui => js}/auth/src/pages/login.astro | 0 .../{ui => js}/auth/src/pages/profile.astro | 0 .../{ui => js}/auth/src/pages/register.astro | 0 .../src/pages/reset_password/request.astro | 0 .../src/pages/reset_password/update.astro | 0 .../{ui => js}/auth/tailwind.config.ts | 0 trailbase-core/{ui => js}/auth/tsconfig.json | 0 trailbase-core/{ui => js}/auth/ui.config.json | 0 trailbase-core/{ui => js}/auth/ui.preset.mjs | 0 .../js/client}/.gitignore | 0 .../js/client}/README.md | 0 trailbase-core/js/client/bindings | 1 + .../js/client}/eslint.config.mjs | 0 .../js/client}/package.json | 0 .../js/client}/src/index.ts | 0 .../js/client}/tests/base64.test.ts | 0 .../js/client}/tests/encoding.bench.ts | 0 .../tests/integration/integration.test.ts | 0 .../client}/tests/integration_test_runner.ts | 13 +- .../js/client}/tsconfig.json | 0 .../js/client}/vitest.config.ts | 0 .../{ui => js}/common/css/global.css | 0 .../{ui => js}/common/css/kobalte.css | 0 .../{ui => js}/common/tailwind.config.mjs | 0 .../{ui => js}/common/tsconfig.base.json | 0 trailbase-core/js/{ => runtime}/.gitignore | 0 trailbase-core/js/{ => runtime}/package.json | 0 trailbase-core/js/{ => runtime}/src/index.ts | 0 trailbase-core/js/{ => runtime}/tsconfig.json | 0 trailbase-core/pnpm-lock.yaml | 187 +++++++++++++++++- trailbase-core/pnpm-workspace.yaml | 7 +- trailbase-core/src/auth/ui/mod.rs | 2 +- trailbase-core/src/js/import_provider.rs | 2 +- trailbase-core/src/server/mod.rs | 2 +- trailbase-core/ui/trailbase-ts | 1 - 143 files changed, 270 insertions(+), 85 deletions(-) create mode 120000 client/trailbase-ts delete mode 120000 client/trailbase-ts/bindings rename trailbase-core/{ui => js}/admin/.gitignore (100%) rename trailbase-core/{ui => js}/admin/.prettierignore (100%) rename trailbase-core/{ui => js}/admin/.prettierrc.mjs (100%) rename trailbase-core/{ui => js}/admin/README.md (100%) rename trailbase-core/{ui => js}/admin/common (100%) rename trailbase-core/{ui => js}/admin/eslint.config.mjs (100%) rename trailbase-core/{ui => js}/admin/index.html (100%) rename trailbase-core/{ui => js}/admin/package.json (100%) rename trailbase-core/{ui => js}/admin/postcss.config.mjs (100%) rename trailbase-core/{ui => js}/admin/proto/config.ts (100%) rename trailbase-core/{ui => js}/admin/proto/config_api.ts (100%) rename trailbase-core/{ui => js}/admin/proto/google/protobuf/descriptor.ts (100%) rename trailbase-core/{ui => js}/admin/proto/vault.ts (100%) rename trailbase-core/{ui => js}/admin/src/App.tsx (100%) rename trailbase-core/{ui => js}/admin/src/assets/countries-110m.json (100%) rename trailbase-core/{ui => js}/admin/src/assets/favicon.svg (100%) rename trailbase-core/{ui => js}/admin/src/assets/logo_104.webp (100%) rename trailbase-core/{ui => js}/admin/src/components/DestructiveActionButton.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/ErrorBoundary.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/FilterBar.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/FormFields.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/IndexPage.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/NavBar.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/SafeSheet.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/SplitView.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/Table.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/auth/AccountsPage.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/auth/AddUser.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/auth/AuthButton.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/auth/LoginPage.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/auth/UserTable.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/editor/EditorPage.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/logs/LogsPage.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/settings/AuthSettings.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/settings/EmailSettings.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/settings/SchemaSettings.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/settings/SettingsPage.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/tables/CreateAlterIndex.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/tables/CreateAlterTable.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/tables/InsertAlterRow.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/tables/RecordApiSettings.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/tables/TablesPage.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/ui/accordion.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/ui/badge.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/ui/button.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/ui/card.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/ui/checkbox.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/ui/dialog.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/ui/hover-card.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/ui/label.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/ui/resizable.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/ui/select.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/ui/separator.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/ui/sheet.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/ui/switch.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/ui/table.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/ui/tabs.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/ui/text-field.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/ui/toast.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/ui/toggle.tsx (100%) rename trailbase-core/{ui => js}/admin/src/components/ui/tooltip.tsx (100%) rename trailbase-core/{ui => js}/admin/src/index.css (100%) rename trailbase-core/{ui => js}/admin/src/index.tsx (100%) rename trailbase-core/{ui => js}/admin/src/lib/bindings.ts (100%) rename trailbase-core/{ui => js}/admin/src/lib/config.ts (100%) rename trailbase-core/{ui => js}/admin/src/lib/convert.ts (100%) rename trailbase-core/{ui => js}/admin/src/lib/fetch.ts (100%) rename trailbase-core/{ui => js}/admin/src/lib/name.ts (100%) rename trailbase-core/{ui => js}/admin/src/lib/parse.ts (100%) rename trailbase-core/{ui => js}/admin/src/lib/schema.ts (100%) rename trailbase-core/{ui => js}/admin/src/lib/table.ts (100%) rename trailbase-core/{ui => js}/admin/src/lib/user.ts (100%) rename trailbase-core/{ui => js}/admin/src/lib/utils.ts (100%) rename trailbase-core/{ui => js}/admin/tailwind.config.ts (100%) rename trailbase-core/{ui => js}/admin/tests/util.test.ts (100%) rename trailbase-core/{ui => js}/admin/tsconfig.json (100%) rename trailbase-core/{ui => js}/admin/ui.config.json (100%) rename trailbase-core/{ui => js}/admin/vite.config.mts (100%) rename trailbase-core/{ui => js}/auth/.gitignore (100%) rename trailbase-core/{ui => js}/auth/.prettierignore (100%) rename trailbase-core/{ui => js}/auth/.prettierrc.mjs (100%) rename trailbase-core/{ui => js}/auth/astro.config.mjs (100%) rename trailbase-core/{ui => js}/auth/common (100%) rename trailbase-core/{ui => js}/auth/package.json (100%) rename trailbase-core/{ui => js}/auth/src/assets/favicon.svg (100%) rename trailbase-core/{ui => js}/auth/src/components/AlertBox.astro (100%) rename trailbase-core/{ui => js}/auth/src/components/Card.astro (100%) rename trailbase-core/{ui => js}/auth/src/components/ErrorBoundary.tsx (100%) rename trailbase-core/{ui => js}/auth/src/components/Form.astro (100%) rename trailbase-core/{ui => js}/auth/src/components/ListOauthProviders.tsx (100%) rename trailbase-core/{ui => js}/auth/src/components/Profile.tsx (100%) rename trailbase-core/{ui => js}/auth/src/components/ui/button.tsx (100%) rename trailbase-core/{ui => js}/auth/src/components/ui/card.tsx (100%) rename trailbase-core/{ui => js}/auth/src/components/ui/dialog.tsx (100%) rename trailbase-core/{ui => js}/auth/src/components/ui/label.tsx (100%) rename trailbase-core/{ui => js}/auth/src/components/ui/text-field.tsx (100%) rename trailbase-core/{ui => js}/auth/src/components/ui/toast.tsx (100%) rename trailbase-core/{ui => js}/auth/src/env.d.ts (100%) rename trailbase-core/{ui => js}/auth/src/layouts/BaseLayout.astro (100%) rename trailbase-core/{ui => js}/auth/src/lib/constants.ts (100%) rename trailbase-core/{ui => js}/auth/src/lib/utils.ts (100%) rename trailbase-core/{ui => js}/auth/src/pages/change_email.astro (100%) rename trailbase-core/{ui => js}/auth/src/pages/change_password.astro (100%) rename trailbase-core/{ui => js}/auth/src/pages/login.astro (100%) rename trailbase-core/{ui => js}/auth/src/pages/profile.astro (100%) rename trailbase-core/{ui => js}/auth/src/pages/register.astro (100%) rename trailbase-core/{ui => js}/auth/src/pages/reset_password/request.astro (100%) rename trailbase-core/{ui => js}/auth/src/pages/reset_password/update.astro (100%) rename trailbase-core/{ui => js}/auth/tailwind.config.ts (100%) rename trailbase-core/{ui => js}/auth/tsconfig.json (100%) rename trailbase-core/{ui => js}/auth/ui.config.json (100%) rename trailbase-core/{ui => js}/auth/ui.preset.mjs (100%) rename {client/trailbase-ts => trailbase-core/js/client}/.gitignore (100%) rename {client/trailbase-ts => trailbase-core/js/client}/README.md (100%) create mode 120000 trailbase-core/js/client/bindings rename {client/trailbase-ts => trailbase-core/js/client}/eslint.config.mjs (100%) rename {client/trailbase-ts => trailbase-core/js/client}/package.json (100%) rename {client/trailbase-ts => trailbase-core/js/client}/src/index.ts (100%) rename {client/trailbase-ts => trailbase-core/js/client}/tests/base64.test.ts (100%) rename {client/trailbase-ts => trailbase-core/js/client}/tests/encoding.bench.ts (100%) rename {client/trailbase-ts => trailbase-core/js/client}/tests/integration/integration.test.ts (100%) rename {client/trailbase-ts => trailbase-core/js/client}/tests/integration_test_runner.ts (82%) rename {client/trailbase-ts => trailbase-core/js/client}/tsconfig.json (100%) rename {client/trailbase-ts => trailbase-core/js/client}/vitest.config.ts (100%) rename trailbase-core/{ui => js}/common/css/global.css (100%) rename trailbase-core/{ui => js}/common/css/kobalte.css (100%) rename trailbase-core/{ui => js}/common/tailwind.config.mjs (100%) rename trailbase-core/{ui => js}/common/tsconfig.base.json (100%) rename trailbase-core/js/{ => runtime}/.gitignore (100%) rename trailbase-core/js/{ => runtime}/package.json (100%) rename trailbase-core/js/{ => runtime}/src/index.ts (100%) rename trailbase-core/js/{ => runtime}/tsconfig.json (100%) delete mode 120000 trailbase-core/ui/trailbase-ts diff --git a/client/trailbase-ts b/client/trailbase-ts new file mode 120000 index 0000000..51dede5 --- /dev/null +++ b/client/trailbase-ts @@ -0,0 +1 @@ +../trailbase-core/js/client \ No newline at end of file diff --git a/client/trailbase-ts/bindings b/client/trailbase-ts/bindings deleted file mode 120000 index 6dfaded..0000000 --- a/client/trailbase-ts/bindings +++ /dev/null @@ -1 +0,0 @@ -../../trailbase-core/bindings \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 082d88e..d0a1045 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,52 +6,6 @@ settings: importers: - client/trailbase-ts: - dependencies: - jwt-decode: - specifier: ^4.0.0 - version: 4.0.0 - uuid: - specifier: ^11.0.3 - version: 11.0.3 - devDependencies: - '@eslint/js': - specifier: ^9.17.0 - version: 9.17.0 - eslint: - specifier: ^9.17.0 - version: 9.17.0(jiti@2.4.2) - execa: - specifier: ^9.5.2 - version: 9.5.2 - globals: - specifier: ^15.14.0 - version: 15.14.0 - http-status: - specifier: ^2.0.0 - version: 2.0.0 - jsdom: - specifier: ^25.0.1 - version: 25.0.1 - prettier: - specifier: ^3.4.2 - version: 3.4.2 - tinybench: - specifier: ^3.1.0 - version: 3.1.0 - typescript: - specifier: ^5.7.2 - version: 5.7.2 - typescript-eslint: - specifier: ^8.18.2 - version: 8.18.2(eslint@9.17.0(jiti@2.4.2))(typescript@5.7.2) - vite-node: - specifier: ^2.1.8 - version: 2.1.8(@types/node@22.10.2) - vitest: - specifier: ^2.1.8 - version: 2.1.8(@types/node@22.10.2)(happy-dom@15.11.7)(jsdom@25.0.1) - docs: dependencies: '@astrojs/check': @@ -227,7 +181,7 @@ importers: version: 5.6.0 trailbase: specifier: workspace:* - version: link:../../../client/trailbase-ts + version: link:../../../trailbase-core/js/client devDependencies: '@eslint/js': specifier: ^9.17.0 @@ -251,16 +205,7 @@ importers: specifier: ^8.18.2 version: 8.18.2(eslint@9.17.0(jiti@2.4.2))(typescript@5.7.2) - trailbase-core/js: - devDependencies: - prettier: - specifier: ^3.4.2 - version: 3.4.2 - typescript: - specifier: ^5.7.2 - version: 5.7.2 - - trailbase-core/ui/admin: + trailbase-core/js/admin: dependencies: '@bufbuild/protobuf': specifier: ^2.2.3 @@ -357,7 +302,7 @@ importers: version: 1.0.7(tailwindcss@3.4.17(ts-node@10.9.2(@types/node@22.10.2)(typescript@5.7.2))) trailbase: specifier: workspace:* - version: link:../../../client/trailbase-ts + version: link:../client uuid: specifier: ^11.0.3 version: 11.0.3 @@ -420,7 +365,7 @@ importers: specifier: ^2.1.8 version: 2.1.8(@types/node@22.10.2)(happy-dom@15.11.7)(jsdom@25.0.1) - trailbase-core/ui/auth: + trailbase-core/js/auth: dependencies: '@astrojs/check': specifier: ^0.9.4 @@ -463,7 +408,7 @@ importers: version: 1.0.7(tailwindcss@3.4.17(ts-node@10.9.2(@types/node@22.10.2)(typescript@5.7.2))) trailbase: specifier: workspace:* - version: link:../../../client/trailbase-ts + version: link:../client devDependencies: '@iconify-json/tabler': specifier: ^1.2.13 @@ -484,6 +429,61 @@ importers: specifier: ^5.7.2 version: 5.7.2 + trailbase-core/js/client: + dependencies: + jwt-decode: + specifier: ^4.0.0 + version: 4.0.0 + uuid: + specifier: ^11.0.3 + version: 11.0.3 + devDependencies: + '@eslint/js': + specifier: ^9.17.0 + version: 9.17.0 + eslint: + specifier: ^9.17.0 + version: 9.17.0(jiti@2.4.2) + execa: + specifier: ^9.5.2 + version: 9.5.2 + globals: + specifier: ^15.14.0 + version: 15.14.0 + http-status: + specifier: ^2.0.0 + version: 2.0.0 + jsdom: + specifier: ^25.0.1 + version: 25.0.1 + prettier: + specifier: ^3.4.2 + version: 3.4.2 + tinybench: + specifier: ^3.1.0 + version: 3.1.0 + typescript: + specifier: ^5.7.2 + version: 5.7.2 + typescript-eslint: + specifier: ^8.18.2 + version: 8.18.2(eslint@9.17.0(jiti@2.4.2))(typescript@5.7.2) + vite-node: + specifier: ^2.1.8 + version: 2.1.8(@types/node@22.10.2) + vitest: + specifier: ^2.1.8 + version: 2.1.8(@types/node@22.10.2)(happy-dom@15.11.7)(jsdom@25.0.1) + + trailbase-core/js/runtime: + devDependencies: + prettier: + specifier: ^3.4.2 + version: 3.4.2 + typescript: + specifier: ^5.7.2 + version: 5.7.2 + packages: '@alloc/quick-lru@5.2.0': diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index c6e699d..9fd2569 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,12 +1,12 @@ packages: - - 'client/trailbase-ts' - 'docs' - - 'trailbase-core/ui/admin' - - 'trailbase-core/ui/auth' + - 'trailbase-core/js/admin' + - 'trailbase-core/js/auth' + - 'trailbase-core/js/client' - 'examples/blog/web' - 'examples/coffeesearch' - 'examples/tutorial/scripts' - - 'trailbase-core/js' + - 'trailbase-core/js/runtime' options: prefer-workspace-packages: true strict-peer-dependencies: true diff --git a/trailbase-core/build.rs b/trailbase-core/build.rs index 7c9ad7f..8adfea6 100644 --- a/trailbase-core/build.rs +++ b/trailbase-core/build.rs @@ -95,17 +95,17 @@ fn main() -> Result<()> { build_protos()?; // WARN: watching non-existent paths will also trigger rebuilds. - println!("cargo::rerun-if-changed=../client/trailbase-ts/src/"); + println!("cargo::rerun-if-changed=js/client/src/"); { - let path = "ui/admin"; + let path = "js/admin"; println!("cargo::rerun-if-changed={path}/src/components/"); println!("cargo::rerun-if-changed={path}/src/lib/"); build_js(path)?; } { - let path = "ui/auth"; + let path = "js/auth"; println!("cargo::rerun-if-changed={path}/src/components/"); println!("cargo::rerun-if-changed={path}/src/lib/"); println!("cargo::rerun-if-changed={path}/src/pages/"); @@ -114,8 +114,8 @@ fn main() -> Result<()> { } { - println!("cargo::rerun-if-changed=js/src/"); - build_js("js")?; + println!("cargo::rerun-if-changed=js/runtime/src/"); + build_js("js/runtime")?; } return Ok(()); diff --git a/trailbase-core/ui/admin/.gitignore b/trailbase-core/js/admin/.gitignore similarity index 100% rename from trailbase-core/ui/admin/.gitignore rename to trailbase-core/js/admin/.gitignore diff --git a/trailbase-core/ui/admin/.prettierignore b/trailbase-core/js/admin/.prettierignore similarity index 100% rename from trailbase-core/ui/admin/.prettierignore rename to trailbase-core/js/admin/.prettierignore diff --git a/trailbase-core/ui/admin/.prettierrc.mjs b/trailbase-core/js/admin/.prettierrc.mjs similarity index 100% rename from trailbase-core/ui/admin/.prettierrc.mjs rename to trailbase-core/js/admin/.prettierrc.mjs diff --git a/trailbase-core/ui/admin/README.md b/trailbase-core/js/admin/README.md similarity index 100% rename from trailbase-core/ui/admin/README.md rename to trailbase-core/js/admin/README.md diff --git a/trailbase-core/ui/admin/common b/trailbase-core/js/admin/common similarity index 100% rename from trailbase-core/ui/admin/common rename to trailbase-core/js/admin/common diff --git a/trailbase-core/ui/admin/eslint.config.mjs b/trailbase-core/js/admin/eslint.config.mjs similarity index 100% rename from trailbase-core/ui/admin/eslint.config.mjs rename to trailbase-core/js/admin/eslint.config.mjs diff --git a/trailbase-core/ui/admin/index.html b/trailbase-core/js/admin/index.html similarity index 100% rename from trailbase-core/ui/admin/index.html rename to trailbase-core/js/admin/index.html diff --git a/trailbase-core/ui/admin/package.json b/trailbase-core/js/admin/package.json similarity index 100% rename from trailbase-core/ui/admin/package.json rename to trailbase-core/js/admin/package.json diff --git a/trailbase-core/ui/admin/postcss.config.mjs b/trailbase-core/js/admin/postcss.config.mjs similarity index 100% rename from trailbase-core/ui/admin/postcss.config.mjs rename to trailbase-core/js/admin/postcss.config.mjs diff --git a/trailbase-core/ui/admin/proto/config.ts b/trailbase-core/js/admin/proto/config.ts similarity index 100% rename from trailbase-core/ui/admin/proto/config.ts rename to trailbase-core/js/admin/proto/config.ts diff --git a/trailbase-core/ui/admin/proto/config_api.ts b/trailbase-core/js/admin/proto/config_api.ts similarity index 100% rename from trailbase-core/ui/admin/proto/config_api.ts rename to trailbase-core/js/admin/proto/config_api.ts diff --git a/trailbase-core/ui/admin/proto/google/protobuf/descriptor.ts b/trailbase-core/js/admin/proto/google/protobuf/descriptor.ts similarity index 100% rename from trailbase-core/ui/admin/proto/google/protobuf/descriptor.ts rename to trailbase-core/js/admin/proto/google/protobuf/descriptor.ts diff --git a/trailbase-core/ui/admin/proto/vault.ts b/trailbase-core/js/admin/proto/vault.ts similarity index 100% rename from trailbase-core/ui/admin/proto/vault.ts rename to trailbase-core/js/admin/proto/vault.ts diff --git a/trailbase-core/ui/admin/src/App.tsx b/trailbase-core/js/admin/src/App.tsx similarity index 100% rename from trailbase-core/ui/admin/src/App.tsx rename to trailbase-core/js/admin/src/App.tsx diff --git a/trailbase-core/ui/admin/src/assets/countries-110m.json b/trailbase-core/js/admin/src/assets/countries-110m.json similarity index 100% rename from trailbase-core/ui/admin/src/assets/countries-110m.json rename to trailbase-core/js/admin/src/assets/countries-110m.json diff --git a/trailbase-core/ui/admin/src/assets/favicon.svg b/trailbase-core/js/admin/src/assets/favicon.svg similarity index 100% rename from trailbase-core/ui/admin/src/assets/favicon.svg rename to trailbase-core/js/admin/src/assets/favicon.svg diff --git a/trailbase-core/ui/admin/src/assets/logo_104.webp b/trailbase-core/js/admin/src/assets/logo_104.webp similarity index 100% rename from trailbase-core/ui/admin/src/assets/logo_104.webp rename to trailbase-core/js/admin/src/assets/logo_104.webp diff --git a/trailbase-core/ui/admin/src/components/DestructiveActionButton.tsx b/trailbase-core/js/admin/src/components/DestructiveActionButton.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/DestructiveActionButton.tsx rename to trailbase-core/js/admin/src/components/DestructiveActionButton.tsx diff --git a/trailbase-core/ui/admin/src/components/ErrorBoundary.tsx b/trailbase-core/js/admin/src/components/ErrorBoundary.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/ErrorBoundary.tsx rename to trailbase-core/js/admin/src/components/ErrorBoundary.tsx diff --git a/trailbase-core/ui/admin/src/components/FilterBar.tsx b/trailbase-core/js/admin/src/components/FilterBar.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/FilterBar.tsx rename to trailbase-core/js/admin/src/components/FilterBar.tsx diff --git a/trailbase-core/ui/admin/src/components/FormFields.tsx b/trailbase-core/js/admin/src/components/FormFields.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/FormFields.tsx rename to trailbase-core/js/admin/src/components/FormFields.tsx diff --git a/trailbase-core/ui/admin/src/components/IndexPage.tsx b/trailbase-core/js/admin/src/components/IndexPage.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/IndexPage.tsx rename to trailbase-core/js/admin/src/components/IndexPage.tsx diff --git a/trailbase-core/ui/admin/src/components/NavBar.tsx b/trailbase-core/js/admin/src/components/NavBar.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/NavBar.tsx rename to trailbase-core/js/admin/src/components/NavBar.tsx diff --git a/trailbase-core/ui/admin/src/components/SafeSheet.tsx b/trailbase-core/js/admin/src/components/SafeSheet.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/SafeSheet.tsx rename to trailbase-core/js/admin/src/components/SafeSheet.tsx diff --git a/trailbase-core/ui/admin/src/components/SplitView.tsx b/trailbase-core/js/admin/src/components/SplitView.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/SplitView.tsx rename to trailbase-core/js/admin/src/components/SplitView.tsx diff --git a/trailbase-core/ui/admin/src/components/Table.tsx b/trailbase-core/js/admin/src/components/Table.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/Table.tsx rename to trailbase-core/js/admin/src/components/Table.tsx diff --git a/trailbase-core/ui/admin/src/components/auth/AccountsPage.tsx b/trailbase-core/js/admin/src/components/auth/AccountsPage.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/auth/AccountsPage.tsx rename to trailbase-core/js/admin/src/components/auth/AccountsPage.tsx diff --git a/trailbase-core/ui/admin/src/components/auth/AddUser.tsx b/trailbase-core/js/admin/src/components/auth/AddUser.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/auth/AddUser.tsx rename to trailbase-core/js/admin/src/components/auth/AddUser.tsx diff --git a/trailbase-core/ui/admin/src/components/auth/AuthButton.tsx b/trailbase-core/js/admin/src/components/auth/AuthButton.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/auth/AuthButton.tsx rename to trailbase-core/js/admin/src/components/auth/AuthButton.tsx diff --git a/trailbase-core/ui/admin/src/components/auth/LoginPage.tsx b/trailbase-core/js/admin/src/components/auth/LoginPage.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/auth/LoginPage.tsx rename to trailbase-core/js/admin/src/components/auth/LoginPage.tsx diff --git a/trailbase-core/ui/admin/src/components/auth/UserTable.tsx b/trailbase-core/js/admin/src/components/auth/UserTable.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/auth/UserTable.tsx rename to trailbase-core/js/admin/src/components/auth/UserTable.tsx diff --git a/trailbase-core/ui/admin/src/components/editor/EditorPage.tsx b/trailbase-core/js/admin/src/components/editor/EditorPage.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/editor/EditorPage.tsx rename to trailbase-core/js/admin/src/components/editor/EditorPage.tsx diff --git a/trailbase-core/ui/admin/src/components/logs/LogsPage.tsx b/trailbase-core/js/admin/src/components/logs/LogsPage.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/logs/LogsPage.tsx rename to trailbase-core/js/admin/src/components/logs/LogsPage.tsx diff --git a/trailbase-core/ui/admin/src/components/settings/AuthSettings.tsx b/trailbase-core/js/admin/src/components/settings/AuthSettings.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/settings/AuthSettings.tsx rename to trailbase-core/js/admin/src/components/settings/AuthSettings.tsx diff --git a/trailbase-core/ui/admin/src/components/settings/EmailSettings.tsx b/trailbase-core/js/admin/src/components/settings/EmailSettings.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/settings/EmailSettings.tsx rename to trailbase-core/js/admin/src/components/settings/EmailSettings.tsx diff --git a/trailbase-core/ui/admin/src/components/settings/SchemaSettings.tsx b/trailbase-core/js/admin/src/components/settings/SchemaSettings.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/settings/SchemaSettings.tsx rename to trailbase-core/js/admin/src/components/settings/SchemaSettings.tsx diff --git a/trailbase-core/ui/admin/src/components/settings/SettingsPage.tsx b/trailbase-core/js/admin/src/components/settings/SettingsPage.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/settings/SettingsPage.tsx rename to trailbase-core/js/admin/src/components/settings/SettingsPage.tsx diff --git a/trailbase-core/ui/admin/src/components/tables/CreateAlterIndex.tsx b/trailbase-core/js/admin/src/components/tables/CreateAlterIndex.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/tables/CreateAlterIndex.tsx rename to trailbase-core/js/admin/src/components/tables/CreateAlterIndex.tsx diff --git a/trailbase-core/ui/admin/src/components/tables/CreateAlterTable.tsx b/trailbase-core/js/admin/src/components/tables/CreateAlterTable.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/tables/CreateAlterTable.tsx rename to trailbase-core/js/admin/src/components/tables/CreateAlterTable.tsx diff --git a/trailbase-core/ui/admin/src/components/tables/InsertAlterRow.tsx b/trailbase-core/js/admin/src/components/tables/InsertAlterRow.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/tables/InsertAlterRow.tsx rename to trailbase-core/js/admin/src/components/tables/InsertAlterRow.tsx diff --git a/trailbase-core/ui/admin/src/components/tables/RecordApiSettings.tsx b/trailbase-core/js/admin/src/components/tables/RecordApiSettings.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/tables/RecordApiSettings.tsx rename to trailbase-core/js/admin/src/components/tables/RecordApiSettings.tsx diff --git a/trailbase-core/ui/admin/src/components/tables/TablesPage.tsx b/trailbase-core/js/admin/src/components/tables/TablesPage.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/tables/TablesPage.tsx rename to trailbase-core/js/admin/src/components/tables/TablesPage.tsx diff --git a/trailbase-core/ui/admin/src/components/ui/accordion.tsx b/trailbase-core/js/admin/src/components/ui/accordion.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/ui/accordion.tsx rename to trailbase-core/js/admin/src/components/ui/accordion.tsx diff --git a/trailbase-core/ui/admin/src/components/ui/badge.tsx b/trailbase-core/js/admin/src/components/ui/badge.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/ui/badge.tsx rename to trailbase-core/js/admin/src/components/ui/badge.tsx diff --git a/trailbase-core/ui/admin/src/components/ui/button.tsx b/trailbase-core/js/admin/src/components/ui/button.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/ui/button.tsx rename to trailbase-core/js/admin/src/components/ui/button.tsx diff --git a/trailbase-core/ui/admin/src/components/ui/card.tsx b/trailbase-core/js/admin/src/components/ui/card.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/ui/card.tsx rename to trailbase-core/js/admin/src/components/ui/card.tsx diff --git a/trailbase-core/ui/admin/src/components/ui/checkbox.tsx b/trailbase-core/js/admin/src/components/ui/checkbox.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/ui/checkbox.tsx rename to trailbase-core/js/admin/src/components/ui/checkbox.tsx diff --git a/trailbase-core/ui/admin/src/components/ui/dialog.tsx b/trailbase-core/js/admin/src/components/ui/dialog.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/ui/dialog.tsx rename to trailbase-core/js/admin/src/components/ui/dialog.tsx diff --git a/trailbase-core/ui/admin/src/components/ui/hover-card.tsx b/trailbase-core/js/admin/src/components/ui/hover-card.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/ui/hover-card.tsx rename to trailbase-core/js/admin/src/components/ui/hover-card.tsx diff --git a/trailbase-core/ui/admin/src/components/ui/label.tsx b/trailbase-core/js/admin/src/components/ui/label.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/ui/label.tsx rename to trailbase-core/js/admin/src/components/ui/label.tsx diff --git a/trailbase-core/ui/admin/src/components/ui/resizable.tsx b/trailbase-core/js/admin/src/components/ui/resizable.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/ui/resizable.tsx rename to trailbase-core/js/admin/src/components/ui/resizable.tsx diff --git a/trailbase-core/ui/admin/src/components/ui/select.tsx b/trailbase-core/js/admin/src/components/ui/select.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/ui/select.tsx rename to trailbase-core/js/admin/src/components/ui/select.tsx diff --git a/trailbase-core/ui/admin/src/components/ui/separator.tsx b/trailbase-core/js/admin/src/components/ui/separator.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/ui/separator.tsx rename to trailbase-core/js/admin/src/components/ui/separator.tsx diff --git a/trailbase-core/ui/admin/src/components/ui/sheet.tsx b/trailbase-core/js/admin/src/components/ui/sheet.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/ui/sheet.tsx rename to trailbase-core/js/admin/src/components/ui/sheet.tsx diff --git a/trailbase-core/ui/admin/src/components/ui/switch.tsx b/trailbase-core/js/admin/src/components/ui/switch.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/ui/switch.tsx rename to trailbase-core/js/admin/src/components/ui/switch.tsx diff --git a/trailbase-core/ui/admin/src/components/ui/table.tsx b/trailbase-core/js/admin/src/components/ui/table.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/ui/table.tsx rename to trailbase-core/js/admin/src/components/ui/table.tsx diff --git a/trailbase-core/ui/admin/src/components/ui/tabs.tsx b/trailbase-core/js/admin/src/components/ui/tabs.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/ui/tabs.tsx rename to trailbase-core/js/admin/src/components/ui/tabs.tsx diff --git a/trailbase-core/ui/admin/src/components/ui/text-field.tsx b/trailbase-core/js/admin/src/components/ui/text-field.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/ui/text-field.tsx rename to trailbase-core/js/admin/src/components/ui/text-field.tsx diff --git a/trailbase-core/ui/admin/src/components/ui/toast.tsx b/trailbase-core/js/admin/src/components/ui/toast.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/ui/toast.tsx rename to trailbase-core/js/admin/src/components/ui/toast.tsx diff --git a/trailbase-core/ui/admin/src/components/ui/toggle.tsx b/trailbase-core/js/admin/src/components/ui/toggle.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/ui/toggle.tsx rename to trailbase-core/js/admin/src/components/ui/toggle.tsx diff --git a/trailbase-core/ui/admin/src/components/ui/tooltip.tsx b/trailbase-core/js/admin/src/components/ui/tooltip.tsx similarity index 100% rename from trailbase-core/ui/admin/src/components/ui/tooltip.tsx rename to trailbase-core/js/admin/src/components/ui/tooltip.tsx diff --git a/trailbase-core/ui/admin/src/index.css b/trailbase-core/js/admin/src/index.css similarity index 100% rename from trailbase-core/ui/admin/src/index.css rename to trailbase-core/js/admin/src/index.css diff --git a/trailbase-core/ui/admin/src/index.tsx b/trailbase-core/js/admin/src/index.tsx similarity index 100% rename from trailbase-core/ui/admin/src/index.tsx rename to trailbase-core/js/admin/src/index.tsx diff --git a/trailbase-core/ui/admin/src/lib/bindings.ts b/trailbase-core/js/admin/src/lib/bindings.ts similarity index 100% rename from trailbase-core/ui/admin/src/lib/bindings.ts rename to trailbase-core/js/admin/src/lib/bindings.ts diff --git a/trailbase-core/ui/admin/src/lib/config.ts b/trailbase-core/js/admin/src/lib/config.ts similarity index 100% rename from trailbase-core/ui/admin/src/lib/config.ts rename to trailbase-core/js/admin/src/lib/config.ts diff --git a/trailbase-core/ui/admin/src/lib/convert.ts b/trailbase-core/js/admin/src/lib/convert.ts similarity index 100% rename from trailbase-core/ui/admin/src/lib/convert.ts rename to trailbase-core/js/admin/src/lib/convert.ts diff --git a/trailbase-core/ui/admin/src/lib/fetch.ts b/trailbase-core/js/admin/src/lib/fetch.ts similarity index 100% rename from trailbase-core/ui/admin/src/lib/fetch.ts rename to trailbase-core/js/admin/src/lib/fetch.ts diff --git a/trailbase-core/ui/admin/src/lib/name.ts b/trailbase-core/js/admin/src/lib/name.ts similarity index 100% rename from trailbase-core/ui/admin/src/lib/name.ts rename to trailbase-core/js/admin/src/lib/name.ts diff --git a/trailbase-core/ui/admin/src/lib/parse.ts b/trailbase-core/js/admin/src/lib/parse.ts similarity index 100% rename from trailbase-core/ui/admin/src/lib/parse.ts rename to trailbase-core/js/admin/src/lib/parse.ts diff --git a/trailbase-core/ui/admin/src/lib/schema.ts b/trailbase-core/js/admin/src/lib/schema.ts similarity index 100% rename from trailbase-core/ui/admin/src/lib/schema.ts rename to trailbase-core/js/admin/src/lib/schema.ts diff --git a/trailbase-core/ui/admin/src/lib/table.ts b/trailbase-core/js/admin/src/lib/table.ts similarity index 100% rename from trailbase-core/ui/admin/src/lib/table.ts rename to trailbase-core/js/admin/src/lib/table.ts diff --git a/trailbase-core/ui/admin/src/lib/user.ts b/trailbase-core/js/admin/src/lib/user.ts similarity index 100% rename from trailbase-core/ui/admin/src/lib/user.ts rename to trailbase-core/js/admin/src/lib/user.ts diff --git a/trailbase-core/ui/admin/src/lib/utils.ts b/trailbase-core/js/admin/src/lib/utils.ts similarity index 100% rename from trailbase-core/ui/admin/src/lib/utils.ts rename to trailbase-core/js/admin/src/lib/utils.ts diff --git a/trailbase-core/ui/admin/tailwind.config.ts b/trailbase-core/js/admin/tailwind.config.ts similarity index 100% rename from trailbase-core/ui/admin/tailwind.config.ts rename to trailbase-core/js/admin/tailwind.config.ts diff --git a/trailbase-core/ui/admin/tests/util.test.ts b/trailbase-core/js/admin/tests/util.test.ts similarity index 100% rename from trailbase-core/ui/admin/tests/util.test.ts rename to trailbase-core/js/admin/tests/util.test.ts diff --git a/trailbase-core/ui/admin/tsconfig.json b/trailbase-core/js/admin/tsconfig.json similarity index 100% rename from trailbase-core/ui/admin/tsconfig.json rename to trailbase-core/js/admin/tsconfig.json diff --git a/trailbase-core/ui/admin/ui.config.json b/trailbase-core/js/admin/ui.config.json similarity index 100% rename from trailbase-core/ui/admin/ui.config.json rename to trailbase-core/js/admin/ui.config.json diff --git a/trailbase-core/ui/admin/vite.config.mts b/trailbase-core/js/admin/vite.config.mts similarity index 100% rename from trailbase-core/ui/admin/vite.config.mts rename to trailbase-core/js/admin/vite.config.mts diff --git a/trailbase-core/ui/auth/.gitignore b/trailbase-core/js/auth/.gitignore similarity index 100% rename from trailbase-core/ui/auth/.gitignore rename to trailbase-core/js/auth/.gitignore diff --git a/trailbase-core/ui/auth/.prettierignore b/trailbase-core/js/auth/.prettierignore similarity index 100% rename from trailbase-core/ui/auth/.prettierignore rename to trailbase-core/js/auth/.prettierignore diff --git a/trailbase-core/ui/auth/.prettierrc.mjs b/trailbase-core/js/auth/.prettierrc.mjs similarity index 100% rename from trailbase-core/ui/auth/.prettierrc.mjs rename to trailbase-core/js/auth/.prettierrc.mjs diff --git a/trailbase-core/ui/auth/astro.config.mjs b/trailbase-core/js/auth/astro.config.mjs similarity index 100% rename from trailbase-core/ui/auth/astro.config.mjs rename to trailbase-core/js/auth/astro.config.mjs diff --git a/trailbase-core/ui/auth/common b/trailbase-core/js/auth/common similarity index 100% rename from trailbase-core/ui/auth/common rename to trailbase-core/js/auth/common diff --git a/trailbase-core/ui/auth/package.json b/trailbase-core/js/auth/package.json similarity index 100% rename from trailbase-core/ui/auth/package.json rename to trailbase-core/js/auth/package.json diff --git a/trailbase-core/ui/auth/src/assets/favicon.svg b/trailbase-core/js/auth/src/assets/favicon.svg similarity index 100% rename from trailbase-core/ui/auth/src/assets/favicon.svg rename to trailbase-core/js/auth/src/assets/favicon.svg diff --git a/trailbase-core/ui/auth/src/components/AlertBox.astro b/trailbase-core/js/auth/src/components/AlertBox.astro similarity index 100% rename from trailbase-core/ui/auth/src/components/AlertBox.astro rename to trailbase-core/js/auth/src/components/AlertBox.astro diff --git a/trailbase-core/ui/auth/src/components/Card.astro b/trailbase-core/js/auth/src/components/Card.astro similarity index 100% rename from trailbase-core/ui/auth/src/components/Card.astro rename to trailbase-core/js/auth/src/components/Card.astro diff --git a/trailbase-core/ui/auth/src/components/ErrorBoundary.tsx b/trailbase-core/js/auth/src/components/ErrorBoundary.tsx similarity index 100% rename from trailbase-core/ui/auth/src/components/ErrorBoundary.tsx rename to trailbase-core/js/auth/src/components/ErrorBoundary.tsx diff --git a/trailbase-core/ui/auth/src/components/Form.astro b/trailbase-core/js/auth/src/components/Form.astro similarity index 100% rename from trailbase-core/ui/auth/src/components/Form.astro rename to trailbase-core/js/auth/src/components/Form.astro diff --git a/trailbase-core/ui/auth/src/components/ListOauthProviders.tsx b/trailbase-core/js/auth/src/components/ListOauthProviders.tsx similarity index 100% rename from trailbase-core/ui/auth/src/components/ListOauthProviders.tsx rename to trailbase-core/js/auth/src/components/ListOauthProviders.tsx diff --git a/trailbase-core/ui/auth/src/components/Profile.tsx b/trailbase-core/js/auth/src/components/Profile.tsx similarity index 100% rename from trailbase-core/ui/auth/src/components/Profile.tsx rename to trailbase-core/js/auth/src/components/Profile.tsx diff --git a/trailbase-core/ui/auth/src/components/ui/button.tsx b/trailbase-core/js/auth/src/components/ui/button.tsx similarity index 100% rename from trailbase-core/ui/auth/src/components/ui/button.tsx rename to trailbase-core/js/auth/src/components/ui/button.tsx diff --git a/trailbase-core/ui/auth/src/components/ui/card.tsx b/trailbase-core/js/auth/src/components/ui/card.tsx similarity index 100% rename from trailbase-core/ui/auth/src/components/ui/card.tsx rename to trailbase-core/js/auth/src/components/ui/card.tsx diff --git a/trailbase-core/ui/auth/src/components/ui/dialog.tsx b/trailbase-core/js/auth/src/components/ui/dialog.tsx similarity index 100% rename from trailbase-core/ui/auth/src/components/ui/dialog.tsx rename to trailbase-core/js/auth/src/components/ui/dialog.tsx diff --git a/trailbase-core/ui/auth/src/components/ui/label.tsx b/trailbase-core/js/auth/src/components/ui/label.tsx similarity index 100% rename from trailbase-core/ui/auth/src/components/ui/label.tsx rename to trailbase-core/js/auth/src/components/ui/label.tsx diff --git a/trailbase-core/ui/auth/src/components/ui/text-field.tsx b/trailbase-core/js/auth/src/components/ui/text-field.tsx similarity index 100% rename from trailbase-core/ui/auth/src/components/ui/text-field.tsx rename to trailbase-core/js/auth/src/components/ui/text-field.tsx diff --git a/trailbase-core/ui/auth/src/components/ui/toast.tsx b/trailbase-core/js/auth/src/components/ui/toast.tsx similarity index 100% rename from trailbase-core/ui/auth/src/components/ui/toast.tsx rename to trailbase-core/js/auth/src/components/ui/toast.tsx diff --git a/trailbase-core/ui/auth/src/env.d.ts b/trailbase-core/js/auth/src/env.d.ts similarity index 100% rename from trailbase-core/ui/auth/src/env.d.ts rename to trailbase-core/js/auth/src/env.d.ts diff --git a/trailbase-core/ui/auth/src/layouts/BaseLayout.astro b/trailbase-core/js/auth/src/layouts/BaseLayout.astro similarity index 100% rename from trailbase-core/ui/auth/src/layouts/BaseLayout.astro rename to trailbase-core/js/auth/src/layouts/BaseLayout.astro diff --git a/trailbase-core/ui/auth/src/lib/constants.ts b/trailbase-core/js/auth/src/lib/constants.ts similarity index 100% rename from trailbase-core/ui/auth/src/lib/constants.ts rename to trailbase-core/js/auth/src/lib/constants.ts diff --git a/trailbase-core/ui/auth/src/lib/utils.ts b/trailbase-core/js/auth/src/lib/utils.ts similarity index 100% rename from trailbase-core/ui/auth/src/lib/utils.ts rename to trailbase-core/js/auth/src/lib/utils.ts diff --git a/trailbase-core/ui/auth/src/pages/change_email.astro b/trailbase-core/js/auth/src/pages/change_email.astro similarity index 100% rename from trailbase-core/ui/auth/src/pages/change_email.astro rename to trailbase-core/js/auth/src/pages/change_email.astro diff --git a/trailbase-core/ui/auth/src/pages/change_password.astro b/trailbase-core/js/auth/src/pages/change_password.astro similarity index 100% rename from trailbase-core/ui/auth/src/pages/change_password.astro rename to trailbase-core/js/auth/src/pages/change_password.astro diff --git a/trailbase-core/ui/auth/src/pages/login.astro b/trailbase-core/js/auth/src/pages/login.astro similarity index 100% rename from trailbase-core/ui/auth/src/pages/login.astro rename to trailbase-core/js/auth/src/pages/login.astro diff --git a/trailbase-core/ui/auth/src/pages/profile.astro b/trailbase-core/js/auth/src/pages/profile.astro similarity index 100% rename from trailbase-core/ui/auth/src/pages/profile.astro rename to trailbase-core/js/auth/src/pages/profile.astro diff --git a/trailbase-core/ui/auth/src/pages/register.astro b/trailbase-core/js/auth/src/pages/register.astro similarity index 100% rename from trailbase-core/ui/auth/src/pages/register.astro rename to trailbase-core/js/auth/src/pages/register.astro diff --git a/trailbase-core/ui/auth/src/pages/reset_password/request.astro b/trailbase-core/js/auth/src/pages/reset_password/request.astro similarity index 100% rename from trailbase-core/ui/auth/src/pages/reset_password/request.astro rename to trailbase-core/js/auth/src/pages/reset_password/request.astro diff --git a/trailbase-core/ui/auth/src/pages/reset_password/update.astro b/trailbase-core/js/auth/src/pages/reset_password/update.astro similarity index 100% rename from trailbase-core/ui/auth/src/pages/reset_password/update.astro rename to trailbase-core/js/auth/src/pages/reset_password/update.astro diff --git a/trailbase-core/ui/auth/tailwind.config.ts b/trailbase-core/js/auth/tailwind.config.ts similarity index 100% rename from trailbase-core/ui/auth/tailwind.config.ts rename to trailbase-core/js/auth/tailwind.config.ts diff --git a/trailbase-core/ui/auth/tsconfig.json b/trailbase-core/js/auth/tsconfig.json similarity index 100% rename from trailbase-core/ui/auth/tsconfig.json rename to trailbase-core/js/auth/tsconfig.json diff --git a/trailbase-core/ui/auth/ui.config.json b/trailbase-core/js/auth/ui.config.json similarity index 100% rename from trailbase-core/ui/auth/ui.config.json rename to trailbase-core/js/auth/ui.config.json diff --git a/trailbase-core/ui/auth/ui.preset.mjs b/trailbase-core/js/auth/ui.preset.mjs similarity index 100% rename from trailbase-core/ui/auth/ui.preset.mjs rename to trailbase-core/js/auth/ui.preset.mjs diff --git a/client/trailbase-ts/.gitignore b/trailbase-core/js/client/.gitignore similarity index 100% rename from client/trailbase-ts/.gitignore rename to trailbase-core/js/client/.gitignore diff --git a/client/trailbase-ts/README.md b/trailbase-core/js/client/README.md similarity index 100% rename from client/trailbase-ts/README.md rename to trailbase-core/js/client/README.md diff --git a/trailbase-core/js/client/bindings b/trailbase-core/js/client/bindings new file mode 120000 index 0000000..3a63fd7 --- /dev/null +++ b/trailbase-core/js/client/bindings @@ -0,0 +1 @@ +../../bindings \ No newline at end of file diff --git a/client/trailbase-ts/eslint.config.mjs b/trailbase-core/js/client/eslint.config.mjs similarity index 100% rename from client/trailbase-ts/eslint.config.mjs rename to trailbase-core/js/client/eslint.config.mjs diff --git a/client/trailbase-ts/package.json b/trailbase-core/js/client/package.json similarity index 100% rename from client/trailbase-ts/package.json rename to trailbase-core/js/client/package.json diff --git a/client/trailbase-ts/src/index.ts b/trailbase-core/js/client/src/index.ts similarity index 100% rename from client/trailbase-ts/src/index.ts rename to trailbase-core/js/client/src/index.ts diff --git a/client/trailbase-ts/tests/base64.test.ts b/trailbase-core/js/client/tests/base64.test.ts similarity index 100% rename from client/trailbase-ts/tests/base64.test.ts rename to trailbase-core/js/client/tests/base64.test.ts diff --git a/client/trailbase-ts/tests/encoding.bench.ts b/trailbase-core/js/client/tests/encoding.bench.ts similarity index 100% rename from client/trailbase-ts/tests/encoding.bench.ts rename to trailbase-core/js/client/tests/encoding.bench.ts diff --git a/client/trailbase-ts/tests/integration/integration.test.ts b/trailbase-core/js/client/tests/integration/integration.test.ts similarity index 100% rename from client/trailbase-ts/tests/integration/integration.test.ts rename to trailbase-core/js/client/tests/integration/integration.test.ts diff --git a/client/trailbase-ts/tests/integration_test_runner.ts b/trailbase-core/js/client/tests/integration_test_runner.ts similarity index 82% rename from client/trailbase-ts/tests/integration_test_runner.ts rename to trailbase-core/js/client/tests/integration_test_runner.ts index 2c8efe2..ee13d35 100644 --- a/client/trailbase-ts/tests/integration_test_runner.ts +++ b/trailbase-core/js/client/tests/integration_test_runner.ts @@ -1,7 +1,8 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ import { createVitest } from "vitest/node"; -import { cwd } from "node:process"; +import { cwd, chdir } from "node:process"; +import { join } from "node:path"; import { execa, type Subprocess } from "execa"; const sleep = (ms: number) => new Promise((r) => setTimeout(r, ms)); @@ -9,18 +10,22 @@ const port: number = 4005; async function initTrailBase(): Promise<{ subprocess: Subprocess }> { const pwd = cwd(); - if (!pwd.endsWith("trailbase-ts")) { + if (!pwd.endsWith("client")) { throw Error(`Unxpected CWD: ${pwd}`); } - const build = await execa`cargo build`; + const root = join(pwd, "..", "..", ".."); + + const build = await execa({ cwd: root })`cargo build`; if (build.failed) { console.error("STDOUT:", build.stdout); console.error("STDERR:", build.stderr); throw Error("cargo build failed"); } - const subprocess = execa`cargo run -- --data-dir ../testfixture run -a 127.0.0.1:${port} --js-runtime-threads 1`; + const subprocess = execa({ + cwd: root, + })`cargo run -- --data-dir client/testfixture run -a 127.0.0.1:${port} --js-runtime-threads 1`; for (let i = 0; i < 100; ++i) { if ((subprocess.exitCode ?? 0) > 0) { diff --git a/client/trailbase-ts/tsconfig.json b/trailbase-core/js/client/tsconfig.json similarity index 100% rename from client/trailbase-ts/tsconfig.json rename to trailbase-core/js/client/tsconfig.json diff --git a/client/trailbase-ts/vitest.config.ts b/trailbase-core/js/client/vitest.config.ts similarity index 100% rename from client/trailbase-ts/vitest.config.ts rename to trailbase-core/js/client/vitest.config.ts diff --git a/trailbase-core/ui/common/css/global.css b/trailbase-core/js/common/css/global.css similarity index 100% rename from trailbase-core/ui/common/css/global.css rename to trailbase-core/js/common/css/global.css diff --git a/trailbase-core/ui/common/css/kobalte.css b/trailbase-core/js/common/css/kobalte.css similarity index 100% rename from trailbase-core/ui/common/css/kobalte.css rename to trailbase-core/js/common/css/kobalte.css diff --git a/trailbase-core/ui/common/tailwind.config.mjs b/trailbase-core/js/common/tailwind.config.mjs similarity index 100% rename from trailbase-core/ui/common/tailwind.config.mjs rename to trailbase-core/js/common/tailwind.config.mjs diff --git a/trailbase-core/ui/common/tsconfig.base.json b/trailbase-core/js/common/tsconfig.base.json similarity index 100% rename from trailbase-core/ui/common/tsconfig.base.json rename to trailbase-core/js/common/tsconfig.base.json diff --git a/trailbase-core/js/.gitignore b/trailbase-core/js/runtime/.gitignore similarity index 100% rename from trailbase-core/js/.gitignore rename to trailbase-core/js/runtime/.gitignore diff --git a/trailbase-core/js/package.json b/trailbase-core/js/runtime/package.json similarity index 100% rename from trailbase-core/js/package.json rename to trailbase-core/js/runtime/package.json diff --git a/trailbase-core/js/src/index.ts b/trailbase-core/js/runtime/src/index.ts similarity index 100% rename from trailbase-core/js/src/index.ts rename to trailbase-core/js/runtime/src/index.ts diff --git a/trailbase-core/js/tsconfig.json b/trailbase-core/js/runtime/tsconfig.json similarity index 100% rename from trailbase-core/js/tsconfig.json rename to trailbase-core/js/runtime/tsconfig.json diff --git a/trailbase-core/pnpm-lock.yaml b/trailbase-core/pnpm-lock.yaml index 9ae71e7..26b4cf5 100644 --- a/trailbase-core/pnpm-lock.yaml +++ b/trailbase-core/pnpm-lock.yaml @@ -6,7 +6,7 @@ settings: importers: - ui/admin: + js/admin: dependencies: '@bufbuild/protobuf': specifier: ^2.2.3 @@ -103,7 +103,7 @@ importers: version: 1.0.7(tailwindcss@3.4.17) trailbase: specifier: workspace:* - version: link:../trailbase-ts + version: link:../client uuid: specifier: ^11.0.3 version: 11.0.3 @@ -166,7 +166,7 @@ importers: specifier: ^2.1.8 version: 2.1.8(@types/node@22.10.5)(jsdom@25.0.1) - ui/auth: + js/auth: dependencies: '@astrojs/check': specifier: ^0.9.4 @@ -209,7 +209,7 @@ importers: version: 1.0.7(tailwindcss@3.4.17) trailbase: specifier: workspace:* - version: link:../trailbase-ts + version: link:../client devDependencies: '@iconify-json/tabler': specifier: ^1.2.13 @@ -230,6 +230,61 @@ importers: specifier: ^5.7.2 version: 5.7.2 + js/client: + dependencies: + jwt-decode: + specifier: ^4.0.0 + version: 4.0.0 + uuid: + specifier: ^11.0.3 + version: 11.0.3 + devDependencies: + '@eslint/js': + specifier: ^9.17.0 + version: 9.17.0 + eslint: + specifier: ^9.17.0 + version: 9.17.0(jiti@1.21.7) + execa: + specifier: ^9.5.2 + version: 9.5.2 + globals: + specifier: ^15.14.0 + version: 15.14.0 + http-status: + specifier: ^2.0.0 + version: 2.1.0 + jsdom: + specifier: ^25.0.1 + version: 25.0.1 + prettier: + specifier: ^3.4.2 + version: 3.4.2 + tinybench: + specifier: ^3.1.0 + version: 3.1.0 + typescript: + specifier: ^5.7.2 + version: 5.7.2 + typescript-eslint: + specifier: ^8.18.2 + version: 8.19.0(eslint@9.17.0(jiti@1.21.7))(typescript@5.7.2) + vite-node: + specifier: ^2.1.8 + version: 2.1.8(@types/node@22.10.5) + vitest: + specifier: ^2.1.8 + version: 2.1.8(@types/node@22.10.5)(jsdom@25.0.1) + + js/runtime: + devDependencies: + prettier: + specifier: ^3.4.2 + version: 3.4.2 + typescript: + specifier: ^5.7.2 + version: 5.7.2 + packages: '@alloc/quick-lru@5.2.0': @@ -1118,6 +1173,9 @@ packages: cpu: [x64] os: [win32] + '@sec-ant/readable-stream@0.4.1': + resolution: {integrity: sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==} + '@shikijs/core@1.26.1': resolution: {integrity: sha512-yeo7sG+WZQblKPclUOKRPwkv1PyoHYkJ4gP9DzhFJbTdueKR7wYTI1vfF/bFi1NTgc545yG/DzvVhZgueVOXMA==} @@ -1139,6 +1197,10 @@ packages: '@shikijs/vscode-textmate@10.0.1': resolution: {integrity: sha512-fTIQwLF+Qhuws31iw7Ncl1R3HUDtGwIipiJ9iU+UsDUwMhegFcQKQHd51nZjb7CArq0MvON8rbgCGQYWHUKAdg==} + '@sindresorhus/merge-streams@4.0.0': + resolution: {integrity: sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==} + engines: {node: '>=18'} + '@solid-primitives/event-listener@2.3.3': resolution: {integrity: sha512-DAJbl+F0wrFW2xmcV8dKMBhk9QLVLuBSW+TR4JmIfTaObxd13PuL7nqaXnaYKDWOYa6otB00qcCUIGbuIhSUgQ==} peerDependencies: @@ -1943,6 +2005,10 @@ packages: eventemitter3@5.0.1: resolution: {integrity: sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==} + execa@9.5.2: + resolution: {integrity: sha512-EHlpxMCpHWSAh1dgS6bVeoLAXGnJNdR93aabr4QCGbzOM73o5XmRfM/e5FUqsw3aagP8S8XEWUWFAxnRBnAF0Q==} + engines: {node: ^18.19.0 || >=20.5.0} + expect-type@1.1.0: resolution: {integrity: sha512-bFi65yM+xZgk+u/KRIpekdSYkTB5W1pEf0Lt8Q8Msh7b+eQ7LXVtIB1Bkm4fvclDEL1b2CZkMhv2mOeF8tMdkA==} engines: {node: '>=12.0.0'} @@ -1977,6 +2043,10 @@ packages: fd-slicer@1.1.0: resolution: {integrity: sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==} + figures@6.1.0: + resolution: {integrity: sha512-d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg==} + engines: {node: '>=18'} + file-entry-cache@8.0.0: resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==} engines: {node: '>=16.0.0'} @@ -2063,6 +2133,10 @@ packages: resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==} engines: {node: '>=8'} + get-stream@9.0.1: + resolution: {integrity: sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==} + engines: {node: '>=18'} + github-slugger@2.0.0: resolution: {integrity: sha512-IaOQ9puYtjrkq7Y0Ygl9KDZnrf/aiUJYUpVf89y8kyaxbRG7Y1SrX/jaumrv81vc61+kiMempujsM3Yw7w5qcw==} @@ -2163,10 +2237,18 @@ packages: resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==} engines: {node: '>= 14'} + http-status@2.1.0: + resolution: {integrity: sha512-O5kPr7AW7wYd/BBiOezTwnVAnmSNFY+J7hlZD2X5IOxVBetjcHAiTXhzj0gMrnojQlwy+UT1/Y3H3vJ3UlmvLA==} + engines: {node: '>= 0.4.0'} + https-proxy-agent@7.0.6: resolution: {integrity: sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==} engines: {node: '>= 14'} + human-signals@8.0.0: + resolution: {integrity: sha512-/1/GPCpDUCCYwlERiYjxoczfP0zfvZMU/OWgQPMya9AbAE24vseigFdhAMObpc8Q4lc/kjutPfUddDYyAmejnA==} + engines: {node: '>=18.18.0'} + i18n-iso-countries@7.13.0: resolution: {integrity: sha512-pVh4CjdgAHZswI98hzG+1BItQlsQfR+yGDsjDISoWIV/jHDAvCmSyZ5vj2YWwAjfVZ8/BhBDqWcFvuGOyHe4vg==} engines: {node: '>= 12'} @@ -2237,6 +2319,14 @@ packages: is-potential-custom-element-name@1.0.1: resolution: {integrity: sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==} + is-stream@4.0.1: + resolution: {integrity: sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==} + engines: {node: '>=18'} + + is-unicode-supported@2.1.0: + resolution: {integrity: sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==} + engines: {node: '>=18'} + is-what@4.1.16: resolution: {integrity: sha512-ZhMwEosbFJkA0YhFnNDgTM4ZxDRsS6HqTo7qsZM08fehyRYIYa0yHu5R6mgo1n/8MgaPBXiPimPD77baVFYg+A==} engines: {node: '>=12.13'} @@ -2303,6 +2393,10 @@ packages: jsonc-parser@3.3.1: resolution: {integrity: sha512-HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==} + jwt-decode@4.0.0: + resolution: {integrity: sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==} + engines: {node: '>=18'} + keyv@4.5.4: resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==} @@ -2618,6 +2712,10 @@ packages: resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==} engines: {node: '>=0.10.0'} + npm-run-path@6.0.0: + resolution: {integrity: sha512-9qny7Z9DsQU8Ou39ERsPU4OZQlSTP47ShQzuKZ6PRXpYLtIFgl/DEBYEXKlvcEa+9tHVcK8CF81Y2V72qaZhWA==} + engines: {node: '>=18'} + nth-check@2.1.1: resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==} @@ -2693,6 +2791,10 @@ packages: parse-latin@7.0.0: resolution: {integrity: sha512-mhHgobPPua5kZ98EF4HWiH167JWBfl4pvAIXXdbaVohtK7a6YBOy56kvhCqduqyo/f3yrHFWmqmiMg/BkBkYYQ==} + parse-ms@4.0.0: + resolution: {integrity: sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==} + engines: {node: '>=18'} + parse5-htmlparser2-tree-adapter@7.1.0: resolution: {integrity: sha512-ruw5xyKs6lrpo9x9rCZqZZnIUntICjQAd0Wsmp396Ul9lN/h+ifgVV1x1gZHi8euej6wTfpqX8j+BFQxF0NS/g==} @@ -2713,6 +2815,10 @@ packages: resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==} engines: {node: '>=8'} + path-key@4.0.0: + resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==} + engines: {node: '>=12'} + path-parse@1.0.7: resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==} @@ -2827,6 +2933,10 @@ packages: engines: {node: '>=14'} hasBin: true + pretty-ms@9.2.0: + resolution: {integrity: sha512-4yf0QO/sllf/1zbZWYnvWw3NxCQwLXKzIj0G849LSufP15BXKM0rbD2Z3wVnkMfjdn/CB0Dpp444gYAACdsplg==} + engines: {node: '>=18'} + prismjs@1.29.0: resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==} engines: {node: '>=6'} @@ -3082,6 +3192,10 @@ packages: resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==} engines: {node: '>=4'} + strip-final-newline@4.0.0: + resolution: {integrity: sha512-aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw==} + engines: {node: '>=18'} + strip-json-comments@3.1.1: resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} engines: {node: '>=8'} @@ -3140,6 +3254,10 @@ packages: tinybench@2.9.0: resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==} + tinybench@3.1.0: + resolution: {integrity: sha512-Km+oMh2xqNCxuyoUsqbRmHgFSd8sATh7v7xreP+kHN6x67w28Pawr83WmBxcaORvxkc0Ex6zgqK951yBnTFaaQ==} + engines: {node: '>=18.0.0'} + tinyexec@0.3.2: resolution: {integrity: sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==} @@ -3257,6 +3375,10 @@ packages: unenv@1.10.0: resolution: {integrity: sha512-wY5bskBQFL9n3Eca5XnhH6KbUo/tfvkwm9OpcdCvLaeA7piBNbavbOKJySEwQ1V0RH6HvNlSAFRTpvTqgKRQXQ==} + unicorn-magic@0.3.0: + resolution: {integrity: sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==} + engines: {node: '>=18'} + unified@11.0.5: resolution: {integrity: sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==} @@ -4590,6 +4712,8 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.29.1': optional: true + '@sec-ant/readable-stream@0.4.1': {} + '@shikijs/core@1.26.1': dependencies: '@shikijs/engine-javascript': 1.26.1 @@ -4625,6 +4749,8 @@ snapshots: '@shikijs/vscode-textmate@10.0.1': {} + '@sindresorhus/merge-streams@4.0.0': {} + '@solid-primitives/event-listener@2.3.3(solid-js@1.9.3)': dependencies: '@solid-primitives/utils': 6.2.3(solid-js@1.9.3) @@ -5645,6 +5771,21 @@ snapshots: eventemitter3@5.0.1: {} + execa@9.5.2: + dependencies: + '@sindresorhus/merge-streams': 4.0.0 + cross-spawn: 7.0.6 + figures: 6.1.0 + get-stream: 9.0.1 + human-signals: 8.0.0 + is-plain-obj: 4.1.0 + is-stream: 4.0.1 + npm-run-path: 6.0.0 + pretty-ms: 9.2.0 + signal-exit: 4.1.0 + strip-final-newline: 4.0.0 + yoctocolors: 2.1.1 + expect-type@1.1.0: {} extend@3.0.2: {} @@ -5683,6 +5824,10 @@ snapshots: dependencies: pend: 1.2.0 + figures@6.1.0: + dependencies: + is-unicode-supported: 2.1.0 + file-entry-cache@8.0.0: dependencies: flat-cache: 4.0.1 @@ -5753,6 +5898,11 @@ snapshots: dependencies: pump: 3.0.2 + get-stream@9.0.1: + dependencies: + '@sec-ant/readable-stream': 0.4.1 + is-stream: 4.0.1 + github-slugger@2.0.0: {} glob-parent@5.1.2: @@ -5916,6 +6066,8 @@ snapshots: transitivePeerDependencies: - supports-color + http-status@2.1.0: {} + https-proxy-agent@7.0.6: dependencies: agent-base: 7.1.3 @@ -5923,6 +6075,8 @@ snapshots: transitivePeerDependencies: - supports-color + human-signals@8.0.0: {} + i18n-iso-countries@7.13.0: dependencies: diacritics: 1.3.0 @@ -5974,6 +6128,10 @@ snapshots: is-potential-custom-element-name@1.0.1: {} + is-stream@4.0.1: {} + + is-unicode-supported@2.1.0: {} + is-what@4.1.16: {} is-wsl@3.1.0: @@ -6045,6 +6203,8 @@ snapshots: jsonc-parser@3.3.1: {} + jwt-decode@4.0.0: {} + keyv@4.5.4: dependencies: json-buffer: 3.0.1 @@ -6516,6 +6676,11 @@ snapshots: normalize-range@0.1.2: {} + npm-run-path@6.0.0: + dependencies: + path-key: 4.0.0 + unicorn-magic: 0.3.0 + nth-check@2.1.1: dependencies: boolbase: 1.0.0 @@ -6599,6 +6764,8 @@ snapshots: unist-util-visit-children: 3.0.0 vfile: 6.0.3 + parse-ms@4.0.0: {} + parse5-htmlparser2-tree-adapter@7.1.0: dependencies: domhandler: 5.0.3 @@ -6618,6 +6785,8 @@ snapshots: path-key@3.1.1: {} + path-key@4.0.0: {} + path-parse@1.0.7: {} path-scurry@1.11.1: @@ -6714,6 +6883,10 @@ snapshots: prettier@3.4.2: {} + pretty-ms@9.2.0: + dependencies: + parse-ms: 4.0.0 + prismjs@1.29.0: {} prompts@2.4.2: @@ -7059,6 +7232,8 @@ snapshots: strip-bom@3.0.0: {} + strip-final-newline@4.0.0: {} + strip-json-comments@3.1.1: {} style-mod@4.1.2: {} @@ -7147,6 +7322,8 @@ snapshots: tinybench@2.9.0: {} + tinybench@3.1.0: {} + tinyexec@0.3.2: {} tinypool@1.0.2: {} @@ -7246,6 +7423,8 @@ snapshots: node-fetch-native: 1.6.4 pathe: 1.1.2 + unicorn-magic@0.3.0: {} + unified@11.0.5: dependencies: '@types/unist': 3.0.3 diff --git a/trailbase-core/pnpm-workspace.yaml b/trailbase-core/pnpm-workspace.yaml index 6607603..dea1172 100644 --- a/trailbase-core/pnpm-workspace.yaml +++ b/trailbase-core/pnpm-workspace.yaml @@ -1,7 +1,8 @@ packages: - - 'ui/trailbase-ts' - - 'ui/admin' - - 'ui/auth' + - 'js/runtime' + - 'js/client' + - 'js/admin' + - 'js/auth' options: prefer-workspace-packages: true strict-peer-dependencies: true diff --git a/trailbase-core/src/auth/ui/mod.rs b/trailbase-core/src/auth/ui/mod.rs index bae51ec..64a1ed0 100644 --- a/trailbase-core/src/auth/ui/mod.rs +++ b/trailbase-core/src/auth/ui/mod.rs @@ -257,5 +257,5 @@ fn hidden_input(name: &str, value: Option<&String>) -> String { } #[derive(RustEmbed, Clone)] -#[folder = "ui/auth/dist/"] +#[folder = "js/auth/dist/"] struct AuthAssets; diff --git a/trailbase-core/src/js/import_provider.rs b/trailbase-core/src/js/import_provider.rs index 9db1e1d..b0687e2 100644 --- a/trailbase-core/src/js/import_provider.rs +++ b/trailbase-core/src/js/import_provider.rs @@ -55,5 +55,5 @@ impl ImportProvider for ImportProviderImpl { } #[derive(RustEmbed, Clone)] -#[folder = "js/dist/"] +#[folder = "js/runtime/dist/"] pub(crate) struct JsRuntimeAssets; diff --git a/trailbase-core/src/server/mod.rs b/trailbase-core/src/server/mod.rs index 09402f3..4c86c5b 100644 --- a/trailbase-core/src/server/mod.rs +++ b/trailbase-core/src/server/mod.rs @@ -410,5 +410,5 @@ async fn shutdown_signal() { } #[derive(RustEmbed, Clone)] -#[folder = "ui/admin/dist/"] +#[folder = "js/admin/dist/"] struct AdminAssets; diff --git a/trailbase-core/ui/trailbase-ts b/trailbase-core/ui/trailbase-ts deleted file mode 120000 index ef190db..0000000 --- a/trailbase-core/ui/trailbase-ts +++ /dev/null @@ -1 +0,0 @@ -../../client/trailbase-ts \ No newline at end of file