From 81b0616ddd099b4e4e3f094c0ed91e60b6d732ad Mon Sep 17 00:00:00 2001 From: "guillem.cordoba" Date: Wed, 11 Dec 2024 02:15:35 +0100 Subject: [PATCH] Fixes --- package.json | 65 +++++++++++++++++++++++++------------------------ pnpm-lock.yaml | 46 +++------------------------------- ui/package.json | 3 +-- 3 files changed, 37 insertions(+), 77 deletions(-) diff --git a/package.json b/package.json index 4523cdb..b1479d5 100644 --- a/package.json +++ b/package.json @@ -1,33 +1,34 @@ { - "name": "messenger-demo-dev", - "private": true, - "scripts": { - "start": "AGENTS=2 pnpm network", - "network": "pnpm build:happ && concurrently -k \"UI_PORT=1420 pnpm -F ui start\" \"pnpm launch\"", - "launch": "concurrently-repeat \"pnpm tauri dev --no-watch\" $AGENTS", - "launch:pilot": "concurrently-repeat \"hc-pilot workdir/messenger-demo.happ --ui-port 1420\" $AGENTS", - "test": "pnpm package && pnpm -F tests test", - "build:happ": "nix build -L .#messenger_demo_happ -o workdir/messenger-demo.happ", - "package": "nix build -L .#messenger_demo_happ -o workdir/messenger-demo.happ && pnpm -F ui package && hc web-app pack workdir", - "network:android": "pnpm build:happ && concurrently -k \"UI_PORT=1420 pnpm -F ui start\" \"pnpm tauri dev\" \"pnpm tauri android dev --release\"", - "tauri": "tauri" - }, - "devDependencies": { - "@eslint/js": "^9.16.0", - "@tauri-apps/cli": "^2.1.0", - "@trivago/prettier-plugin-sort-imports": "^4.3.0", - "concurrently": "^8.2.2", - "concurrently-repeat": "^0.0.1", - "eslint": "^9.16.0", - "eslint-config-prettier": "^9.1.0", - "internal-ip-cli": "^2.0.0", - "new-port-cli": "^1.0.0", - "prettier": "^3.4.2", - "typescript": "^5.7.2", - "typescript-eslint": "^8.17.0" - }, - "type": "module", - "engines": { - "pnpm": ">=9.0.0" - } -} + "name": "messenger-demo-dev", + "private": true, + "scripts": { + "start": "AGENTS=2 pnpm network", + "network": "pnpm build:happ && concurrently -k \"UI_PORT=1420 pnpm -F ui start\" \"pnpm launch\"", + "launch": "concurrently-repeat \"pnpm tauri dev --no-watch\" $AGENTS", + "launch:pilot": "concurrently-repeat \"hc-pilot workdir/messenger-demo.happ --ui-port 1420\" $AGENTS", + "test": "pnpm package && pnpm -F tests test", + "build:happ": "nix build -L .#messenger_demo_happ -o workdir/messenger-demo.happ", + "package": "nix build -L .#messenger_demo_happ -o workdir/messenger-demo.happ && pnpm -F ui package && hc web-app pack workdir", + "network:android": "pnpm build:happ && concurrently -k \"UI_PORT=1420 pnpm -F ui start\" \"pnpm tauri dev\" \"pnpm tauri android dev --release\"", + "tauri": "tauri" + }, + "devDependencies": { + "@eslint/js": "^9.16.0", + "@tauri-apps/cli": "^2.1.0", + "@trivago/prettier-plugin-sort-imports": "^4.3.0", + "concurrently": "^8.2.2", + "concurrently-repeat": "^0.0.1", + "eslint": "^9.16.0", + "eslint-config-prettier": "^9.1.0", + "internal-ip-cli": "^2.0.0", + "new-port-cli": "^1.0.0", + "prettier": "^3.4.2", + "typescript": "^5.7.2", + "typescript-eslint": "^8.17.0", + "vite": "^4.0.0" + }, + "type": "module", + "engines": { + "pnpm": ">=9.0.0" + } +} \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d7b1c9c..4411ed6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -44,6 +44,9 @@ importers: typescript-eslint: specifier: ^8.17.0 version: 8.18.0(eslint@9.16.0)(typescript@5.7.2) + vite: + specifier: ^4.0.0 + version: 4.5.5 tests: dependencies: @@ -144,9 +147,6 @@ importers: vite: specifier: ^4.0.0 version: 4.5.5 - vite-plugin-static-copy: - specifier: ^0.13.0 - version: 0.13.1(vite@4.5.5) packages: @@ -1133,10 +1133,6 @@ packages: resolution: {integrity: sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==} engines: {node: '>= 8.10.0'} - chokidar@3.6.0: - resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==} - engines: {node: '>= 8.10.0'} - cliui@7.0.4: resolution: {integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==} @@ -1430,10 +1426,6 @@ packages: resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==} engines: {node: '>=12'} - fs-extra@11.2.0: - resolution: {integrity: sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==} - engines: {node: '>=14.14'} - fs.realpath@1.0.0: resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==} @@ -2299,12 +2291,6 @@ packages: engines: {node: ^18.0.0 || >=20.0.0} hasBin: true - vite-plugin-static-copy@0.13.1: - resolution: {integrity: sha512-KwIcGBT1aOxSq+laK3VmSngoEa3HXWj/6ZEXdv+y59eZ7p/XSuPahoDo+CfYW22JjTdnstgeKWiX+78KNgDu6g==} - engines: {node: ^14.18.0 || >=16.0.0} - peerDependencies: - vite: ^3.0.0 || ^4.0.0 - vite@4.5.5: resolution: {integrity: sha512-ifW3Lb2sMdX+WU91s3R0FyQlAyLxOzCSCP37ujw0+r5POeHPwe6udWVIElKQq8gk3t7b8rkmvqC6IHBpCff4GQ==} engines: {node: ^14.18.0 || >=16.0.0} @@ -3512,18 +3498,6 @@ snapshots: optionalDependencies: fsevents: 2.3.3 - chokidar@3.6.0: - dependencies: - anymatch: 3.1.3 - braces: 3.0.3 - glob-parent: 5.1.2 - is-binary-path: 2.1.0 - is-glob: 4.0.3 - normalize-path: 3.0.0 - readdirp: 3.6.0 - optionalDependencies: - fsevents: 2.3.3 - cliui@7.0.4: dependencies: string-width: 4.2.3 @@ -3898,12 +3872,6 @@ snapshots: jsonfile: 6.1.0 universalify: 2.0.1 - fs-extra@11.2.0: - dependencies: - graceful-fs: 4.2.11 - jsonfile: 6.1.0 - universalify: 2.0.1 - fs.realpath@1.0.0: {} fsevents@2.3.3: @@ -4700,14 +4668,6 @@ snapshots: - supports-color - terser - vite-plugin-static-copy@0.13.1(vite@4.5.5): - dependencies: - chokidar: 3.6.0 - fast-glob: 3.3.2 - fs-extra: 11.2.0 - picocolors: 1.1.1 - vite: 4.5.5 - vite@4.5.5: dependencies: esbuild: 0.18.20 diff --git a/ui/package.json b/ui/package.json index d88a466..ad44199 100644 --- a/ui/package.json +++ b/ui/package.json @@ -37,7 +37,6 @@ "bestzip": "^2.2.0", "tslib": "^2.6.2", "typescript": "^5.4.5", - "vite": "^4.0.0", - "vite-plugin-static-copy": "^0.13.0" + "vite": "^4.0.0" } } \ No newline at end of file