diff --git a/.gitmodules b/.gitmodules index 9c5bbc1..96060c9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "frontend/uikit-solid"] - path = frontend/uikit-solid +[submodule "frontend-uikit-solid"] + path = frontend-uikit-solid url = git@knot.ewsgit.uk:ewsgit.uk/uikit-solid diff --git a/frontend/uikit-solid b/frontend-uikit-solid similarity index 100% rename from frontend/uikit-solid rename to frontend-uikit-solid diff --git a/frontend/package.json b/frontend/package.json index 93fe4b0..05ed7c0 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -5,14 +5,12 @@ "dev": "vite dev --host", "build": "vite build", "start": "vite start", - "preview": "vite preview", - "preinstall": "git pull --recurse-submodules && git submodule update --recursive --remote" + "preview": "vite preview" }, "dependencies": { "@atproto/jwk-jose": "^0.1.11", "@atproto/oauth-client-node": "^0.3.17", "@biomejs/biome": "^2.4.15", - "@ewsgit/uikit-solid": "file:./uikit-solid", "@material-symbols/svg-700": "^0.44.6", "@solid-primitives/deep": "^0.3.5", "@solid-primitives/lifecycle": "^0.1.2", @@ -27,6 +25,7 @@ "solid-js": "^1.9.5", "vite": "^7.0.0", "typescript": "^6.0.3", + "@ewsgit/uikit-solid": "workspace:*", "@harmonychat/generalcommunicationinstance": "workspace:*" }, "engines": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 71a0a70..c671447 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -266,8 +266,8 @@ importers: specifier: ^2.4.15 version: 2.4.16 '@ewsgit/uikit-solid': - specifier: file:./uikit-solid - version: file:frontend/uikit-solid(@types/node@25.9.1)(esbuild@0.28.0)(jiti@2.7.0)(postcss@8.5.15)(sass@1.100.0)(terser@5.48.0)(tsx@4.22.3)(typescript@6.0.3)(yaml@2.9.0) + specifier: workspace:* + version: link:../frontend-uikit-solid '@harmonychat/generalcommunicationinstance': specifier: workspace:* version: link:../generalCommunicationInstance @@ -314,6 +314,52 @@ importers: specifier: ^7.0.0 version: 7.3.3(@types/node@25.9.1)(jiti@2.7.0)(lightningcss@1.32.0)(sass-embedded@1.100.0)(sass@1.100.0)(terser@5.48.0)(tsx@4.22.3)(yaml@2.9.0) + frontend-uikit-solid: + dependencies: + '@material-symbols/svg-700': + specifier: ^0.42.3 + version: 0.42.3 + '@solid-primitives/media': + specifier: ^2.3.3 + version: 2.3.5(solid-js@1.9.13) + '@solid-primitives/refs': + specifier: ^1.1.3 + version: 1.1.3(solid-js@1.9.13) + '@solid-primitives/upload': + specifier: ^0.1.3 + version: 0.1.4(solid-js@1.9.13) + clsx: + specifier: ^2.1.1 + version: 2.1.1 + esbuild-plugin-solid: + specifier: ^0.6.0 + version: 0.6.0(esbuild@0.28.0)(solid-js@1.9.13) + sass-embedded: + specifier: ^1.90.0 + version: 1.100.0 + solid-js: + specifier: ^1.9.9 + version: 1.9.13 + solid-styled-components: + specifier: ^0.28.5 + version: 0.28.5(solid-js@1.9.13) + tsup: + specifier: ^8.5.0 + version: 8.5.1(jiti@2.7.0)(postcss@8.5.15)(tsx@4.22.3)(typescript@5.9.3)(yaml@2.9.0) + vite: + specifier: ^8.0.1 + version: 8.0.14(@types/node@25.9.1)(esbuild@0.28.0)(jiti@2.7.0)(sass-embedded@1.100.0)(sass@1.100.0)(terser@5.48.0)(tsx@4.22.3)(yaml@2.9.0) + vite-plugin-solid: + specifier: ^2.11.8 + version: 2.11.12(solid-js@1.9.13)(vite@8.0.14(@types/node@25.9.1)(esbuild@0.28.0)(jiti@2.7.0)(sass-embedded@1.100.0)(sass@1.100.0)(terser@5.48.0)(tsx@4.22.3)(yaml@2.9.0)) + devDependencies: + prettier: + specifier: ^3.6.2 + version: 3.8.3 + typescript: + specifier: ^5.9.2 + version: 5.9.3 + generalCommunicationInstance: dependencies: '@biomejs/biome': @@ -1106,9 +1152,6 @@ packages: cpu: [x64] os: [win32] - '@ewsgit/uikit-solid@file:frontend/uikit-solid': - resolution: {directory: frontend/uikit-solid, type: directory} - '@fastify/ajv-compiler@4.0.5': resolution: {integrity: sha512-KoWKW+MhvfTRWL4qrhUwAAZoaChluo0m0vbiJlGMt2GXvL4LVPQEjt8kSpHI3IBq5Rez8fg+XeH3cneztq+C7A==} @@ -3025,6 +3068,11 @@ packages: resolution: {integrity: sha512-dM0jVuXJPsDN6DvRpea484tCUaMiXWjuCn++HGTqUWzGDjv5tZkEZldAJ/UMlqRYGFrD/etByo4/xOuC/snX2A==} engines: {node: '>=20'} + prettier@3.8.3: + resolution: {integrity: sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==} + engines: {node: '>=14'} + hasBin: true + pretty-bytes@7.1.0: resolution: {integrity: sha512-nODzvTiYVRGRqAOvE84Vk5JDPyyxsVk0/fbA/bq7RqlnhksGpset09XTxbpvLTIjoaF7K8Z8DG8yHtKGTPSYRw==} engines: {node: '>=20'} @@ -3609,6 +3657,11 @@ packages: resolution: {integrity: sha512-8ZiHFm91orbSAe2PSAiSVBVko18pbhbiB3U9GglSzF/zCGkR+rxpHx6sEMCUm4kxY4LjDIUGgCfUMtwfZfjfUA==} engines: {node: '>=20'} + typescript@5.9.3: + resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==} + engines: {node: '>=14.17'} + hasBin: true + typescript@6.0.3: resolution: {integrity: sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==} engines: {node: '>=14.17'} @@ -4592,39 +4645,6 @@ snapshots: '@esbuild/win32-x64@0.28.0': optional: true - '@ewsgit/uikit-solid@file:frontend/uikit-solid(@types/node@25.9.1)(esbuild@0.28.0)(jiti@2.7.0)(postcss@8.5.15)(sass@1.100.0)(terser@5.48.0)(tsx@4.22.3)(typescript@6.0.3)(yaml@2.9.0)': - dependencies: - '@material-symbols/svg-700': 0.42.3 - '@solid-primitives/media': 2.3.5(solid-js@1.9.13) - '@solid-primitives/refs': 1.1.3(solid-js@1.9.13) - '@solid-primitives/upload': 0.1.4(solid-js@1.9.13) - clsx: 2.1.1 - esbuild-plugin-solid: 0.6.0(esbuild@0.28.0)(solid-js@1.9.13) - sass-embedded: 1.100.0 - solid-js: 1.9.13 - solid-styled-components: 0.28.5(solid-js@1.9.13) - tsup: 8.5.1(jiti@2.7.0)(postcss@8.5.15)(tsx@4.22.3)(typescript@6.0.3)(yaml@2.9.0) - vite: 8.0.14(@types/node@25.9.1)(esbuild@0.28.0)(jiti@2.7.0)(sass-embedded@1.100.0)(sass@1.100.0)(terser@5.48.0)(tsx@4.22.3)(yaml@2.9.0) - vite-plugin-solid: 2.11.12(solid-js@1.9.13)(vite@8.0.14(@types/node@25.9.1)(esbuild@0.28.0)(jiti@2.7.0)(sass-embedded@1.100.0)(sass@1.100.0)(terser@5.48.0)(tsx@4.22.3)(yaml@2.9.0)) - transitivePeerDependencies: - - '@microsoft/api-extractor' - - '@swc/core' - - '@testing-library/jest-dom' - - '@types/node' - - '@vitejs/devtools' - - esbuild - - jiti - - less - - postcss - - sass - - stylus - - sugarss - - supports-color - - terser - - tsx - - typescript - - yaml - '@fastify/ajv-compiler@4.0.5': dependencies: ajv: 8.20.0 @@ -6605,6 +6625,8 @@ snapshots: powershell-utils@0.1.0: {} + prettier@3.8.3: {} + pretty-bytes@7.1.0: {} process-nextick-args@2.0.1: {} @@ -7173,7 +7195,7 @@ snapshots: tslib@2.8.1: {} - tsup@8.5.1(jiti@2.7.0)(postcss@8.5.15)(tsx@4.22.3)(typescript@6.0.3)(yaml@2.9.0): + tsup@8.5.1(jiti@2.7.0)(postcss@8.5.15)(tsx@4.22.3)(typescript@5.9.3)(yaml@2.9.0): dependencies: bundle-require: 5.1.0(esbuild@0.27.7) cac: 6.7.14 @@ -7194,7 +7216,7 @@ snapshots: tree-kill: 1.2.2 optionalDependencies: postcss: 8.5.15 - typescript: 6.0.3 + typescript: 5.9.3 transitivePeerDependencies: - jiti - supports-color @@ -7211,6 +7233,8 @@ snapshots: dependencies: tagged-tag: 1.0.0 + typescript@5.9.3: {} + typescript@6.0.3: {} ufo@1.6.4: {} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 8b1cabb..5b81c1c 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,6 +1,7 @@ packages: - centralUserBackend - frontend + - frontend-uikit-solid - generalCommunicationInstance allowBuilds: "@parcel/watcher": true