From 7eafbe522b99bf9dbd7611646a3e2d1e61aad61d Mon Sep 17 00:00:00 2001 From: Azuki-bar <42642269+Azuki-bar@users.noreply.github.com> Date: Fri, 24 Nov 2023 12:00:38 +0900 Subject: [PATCH 01/14] =?UTF-8?q?backend/auto-operation=E3=82=92pnpm?= =?UTF-8?q?=E3=81=AE=E7=AE=A1=E7=90=86=E4=B8=8B=E3=81=AB=E3=81=84=E3=82=8C?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pnpm-lock.yaml | 327 ++++++++++++++++++++++++++++++++++++++++++-- pnpm-workspace.yaml | 1 + 2 files changed, 315 insertions(+), 13 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 63d5ff94..776d2fe5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -6,6 +6,42 @@ settings: importers: + backend/auto-operation: + dependencies: + '@bufbuild/buf': + specifier: ^1.28.1 + version: 1.28.1 + '@bufbuild/connect-web': + specifier: ^0.13.0 + version: 0.13.0(@bufbuild/protobuf@1.4.2) + '@bufbuild/protobuf': + specifier: ^1.4.2 + version: 1.4.2 + '@bufbuild/protoc-gen-es': + specifier: ^1.4.2 + version: 1.4.2(@bufbuild/protobuf@1.4.2) + '@connectrpc/connect': + specifier: ^1.1.3 + version: 1.1.3(@bufbuild/protobuf@1.4.2) + '@connectrpc/connect-node': + specifier: ^1.1.3 + version: 1.1.3(@bufbuild/protobuf@1.4.2)(@connectrpc/connect@1.1.3) + '@connectrpc/connect-web': + specifier: ^1.1.3 + version: 1.1.3(@bufbuild/protobuf@1.4.2)(@connectrpc/connect@1.1.3) + '@connectrpc/protoc-gen-connect-es': + specifier: ^1.1.3 + version: 1.1.3(@bufbuild/protoc-gen-es@1.4.2)(@connectrpc/connect@1.1.3) + install: + specifier: ^0.13.0 + version: 0.13.0 + tsx: + specifier: ^4.3.0 + version: 4.3.0 + typescript: + specifier: 5.2.2 + version: 5.2.2 + frontend/dashboard: dependencies: '@bufbuild/connect-web': @@ -1416,7 +1452,6 @@ packages: cpu: [arm64] os: [darwin] requiresBuild: true - dev: true optional: true /@bufbuild/buf-darwin-x64@1.28.1: @@ -1425,7 +1460,6 @@ packages: cpu: [x64] os: [darwin] requiresBuild: true - dev: true optional: true /@bufbuild/buf-linux-aarch64@1.28.1: @@ -1434,7 +1468,6 @@ packages: cpu: [arm64] os: [linux] requiresBuild: true - dev: true optional: true /@bufbuild/buf-linux-x64@1.28.1: @@ -1443,7 +1476,6 @@ packages: cpu: [x64] os: [linux] requiresBuild: true - dev: true optional: true /@bufbuild/buf-win32-arm64@1.28.1: @@ -1452,7 +1484,6 @@ packages: cpu: [arm64] os: [win32] requiresBuild: true - dev: true optional: true /@bufbuild/buf-win32-x64@1.28.1: @@ -1461,7 +1492,6 @@ packages: cpu: [x64] os: [win32] requiresBuild: true - dev: true optional: true /@bufbuild/buf@1.28.1: @@ -1476,7 +1506,6 @@ packages: '@bufbuild/buf-linux-x64': 1.28.1 '@bufbuild/buf-win32-arm64': 1.28.1 '@bufbuild/buf-win32-x64': 1.28.1 - dev: true /@bufbuild/connect-web@0.13.0(@bufbuild/protobuf@1.4.2): resolution: {integrity: sha512-Ys9VFDWYktD9yFQSLOlkpsD42LonDNMCysLCfjXFuxlupYuf4f7qg0zkT5bESyTfqk4xtRDSSGR3xygaj/ONIQ==} @@ -1535,7 +1564,6 @@ packages: '@bufbuild/protoplugin': 1.4.2 transitivePeerDependencies: - supports-color - dev: true /@bufbuild/protoplugin@1.4.2: resolution: {integrity: sha512-5IwGC1ZRD2A+KydGXeaSOErwfILLqVtvMH/RkN+cOoHcQd4EYXFStcF7g7aR+yICRDEEjQVi5tQF/qPGBSr9vg==} @@ -1545,7 +1573,18 @@ packages: typescript: 4.5.2 transitivePeerDependencies: - supports-color - dev: true + + /@connectrpc/connect-node@1.1.3(@bufbuild/protobuf@1.4.2)(@connectrpc/connect@1.1.3): + resolution: {integrity: sha512-oq7Uk8XlLzC2+eHaxZTX189dhujD0/tK9plizxofsFHUnLquMSmzQQ2GzvTv4u6U05eZYc/crySmf86Sqpi1bA==} + engines: {node: '>=16.0.0'} + peerDependencies: + '@bufbuild/protobuf': ^1.3.3 + '@connectrpc/connect': 1.1.3 + dependencies: + '@bufbuild/protobuf': 1.4.2 + '@connectrpc/connect': 1.1.3(@bufbuild/protobuf@1.4.2) + undici: 5.27.2 + dev: false /@connectrpc/connect-query@0.6.0(@bufbuild/protobuf@1.4.2)(@connectrpc/connect@1.1.3)(@tanstack/react-query@5.8.4)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-/qqQ1LRfxv+YCfK8DWzzo+sJyxctCwdBmwoTEB6tkNLhKBYn1xD8eGXi1rKCOjfOPWrQXHGCAjsYAJg3WCRl+w==} @@ -1600,7 +1639,6 @@ packages: '@connectrpc/connect': 1.1.3(@bufbuild/protobuf@1.4.2) transitivePeerDependencies: - supports-color - dev: true /@connectrpc/protoc-gen-connect-query@0.6.0(@bufbuild/protoc-gen-es@1.4.2): resolution: {integrity: sha512-Y8Zow5bK/WFVABbrIYpqDo5hVYzWyqRuXfGLqurhKthrbpDKgB/MGYaz8ly7k2B0SE28//62HKVKlM63w12S4g==} @@ -1624,6 +1662,204 @@ packages: engines: {node: '>=10.0.0'} dev: true + /@esbuild/android-arm64@0.18.20: + resolution: {integrity: sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: false + optional: true + + /@esbuild/android-arm@0.18.20: + resolution: {integrity: sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true + dev: false + optional: true + + /@esbuild/android-x64@0.18.20: + resolution: {integrity: sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true + dev: false + optional: true + + /@esbuild/darwin-arm64@0.18.20: + resolution: {integrity: sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: false + optional: true + + /@esbuild/darwin-x64@0.18.20: + resolution: {integrity: sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: false + optional: true + + /@esbuild/freebsd-arm64@0.18.20: + resolution: {integrity: sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true + dev: false + optional: true + + /@esbuild/freebsd-x64@0.18.20: + resolution: {integrity: sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + dev: false + optional: true + + /@esbuild/linux-arm64@0.18.20: + resolution: {integrity: sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: false + optional: true + + /@esbuild/linux-arm@0.18.20: + resolution: {integrity: sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: false + optional: true + + /@esbuild/linux-ia32@0.18.20: + resolution: {integrity: sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true + dev: false + optional: true + + /@esbuild/linux-loong64@0.18.20: + resolution: {integrity: sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + dev: false + optional: true + + /@esbuild/linux-mips64el@0.18.20: + resolution: {integrity: sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true + dev: false + optional: true + + /@esbuild/linux-ppc64@0.18.20: + resolution: {integrity: sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true + dev: false + optional: true + + /@esbuild/linux-riscv64@0.18.20: + resolution: {integrity: sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: false + optional: true + + /@esbuild/linux-s390x@0.18.20: + resolution: {integrity: sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: false + optional: true + + /@esbuild/linux-x64@0.18.20: + resolution: {integrity: sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: false + optional: true + + /@esbuild/netbsd-x64@0.18.20: + resolution: {integrity: sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true + dev: false + optional: true + + /@esbuild/openbsd-x64@0.18.20: + resolution: {integrity: sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true + dev: false + optional: true + + /@esbuild/sunos-x64@0.18.20: + resolution: {integrity: sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true + dev: false + optional: true + + /@esbuild/win32-arm64@0.18.20: + resolution: {integrity: sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: false + optional: true + + /@esbuild/win32-ia32@0.18.20: + resolution: {integrity: sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: false + optional: true + + /@esbuild/win32-x64@0.18.20: + resolution: {integrity: sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: false + optional: true + /@eslint-community/eslint-utils@4.4.0(eslint@8.54.0): resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -1661,6 +1897,11 @@ packages: engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} dev: true + /@fastify/busboy@2.1.0: + resolution: {integrity: sha512-+KpH+QxZU7O4675t3mnkQKcZZg56u+K/Ct2K+N2AZYNVK8kyeo/bI18tI8aPm3tvNNRyTWfj6s5tnGNlcbQRsA==} + engines: {node: '>=14'} + dev: false + /@humanwhocodes/config-array@0.11.13: resolution: {integrity: sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==} engines: {node: '>=10.10.0'} @@ -2212,7 +2453,6 @@ packages: debug: 4.3.4 transitivePeerDependencies: - supports-color - dev: true /@ungap/structured-clone@1.2.0: resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} @@ -3187,6 +3427,36 @@ packages: resolution: {integrity: sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==} dev: true + /esbuild@0.18.20: + resolution: {integrity: sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==} + engines: {node: '>=12'} + hasBin: true + requiresBuild: true + optionalDependencies: + '@esbuild/android-arm': 0.18.20 + '@esbuild/android-arm64': 0.18.20 + '@esbuild/android-x64': 0.18.20 + '@esbuild/darwin-arm64': 0.18.20 + '@esbuild/darwin-x64': 0.18.20 + '@esbuild/freebsd-arm64': 0.18.20 + '@esbuild/freebsd-x64': 0.18.20 + '@esbuild/linux-arm': 0.18.20 + '@esbuild/linux-arm64': 0.18.20 + '@esbuild/linux-ia32': 0.18.20 + '@esbuild/linux-loong64': 0.18.20 + '@esbuild/linux-mips64el': 0.18.20 + '@esbuild/linux-ppc64': 0.18.20 + '@esbuild/linux-riscv64': 0.18.20 + '@esbuild/linux-s390x': 0.18.20 + '@esbuild/linux-x64': 0.18.20 + '@esbuild/netbsd-x64': 0.18.20 + '@esbuild/openbsd-x64': 0.18.20 + '@esbuild/sunos-x64': 0.18.20 + '@esbuild/win32-arm64': 0.18.20 + '@esbuild/win32-ia32': 0.18.20 + '@esbuild/win32-x64': 0.18.20 + dev: false + /escalade@3.1.1: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} engines: {node: '>=6'} @@ -3561,6 +3831,12 @@ packages: engines: {node: '>=10'} dev: true + /get-tsconfig@4.7.2: + resolution: {integrity: sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==} + dependencies: + resolve-pkg-maps: 1.0.0 + dev: false + /glob-parent@5.1.2: resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} engines: {node: '>= 6'} @@ -3806,6 +4082,11 @@ packages: /inherits@2.0.4: resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} + /install@0.13.0: + resolution: {integrity: sha512-zDml/jzr2PKU9I8J/xyZBQn8rPCAY//UOYNmR01XwNwyfhEWObo2SWfSl1+0tm1u6PhxLwDnfsT/6jB7OUxqFA==} + engines: {node: '>= 0.10'} + dev: false + /interpret@3.1.1: resolution: {integrity: sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==} engines: {node: '>=10.13.0'} @@ -4712,6 +4993,10 @@ packages: engines: {node: '>=8'} dev: true + /resolve-pkg-maps@1.0.0: + resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==} + dev: false + /resolve@1.22.8: resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==} hasBin: true @@ -5263,6 +5548,17 @@ packages: /tslib@2.6.2: resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} + /tsx@4.3.0: + resolution: {integrity: sha512-zalfbBdr7tvYok5sSbnsv4uL+DhT1wRZwbWwuOXjhH8YtJxN2bpl6lpXMxuPThMAKzZ2qgrhuf5ckq/uSsm3CA==} + engines: {node: '>=18.0.0'} + hasBin: true + dependencies: + esbuild: 0.18.20 + get-tsconfig: 4.7.2 + optionalDependencies: + fsevents: 2.3.3 + dev: false + /type-check@0.4.0: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} engines: {node: '>= 0.8.0'} @@ -5287,13 +5583,11 @@ packages: resolution: {integrity: sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw==} engines: {node: '>=4.2.0'} hasBin: true - dev: true /typescript@5.2.2: resolution: {integrity: sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==} engines: {node: '>=14.17'} hasBin: true - dev: true /typescript@5.3.2: resolution: {integrity: sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==} @@ -5305,6 +5599,13 @@ packages: resolution: {integrity: sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==} dev: true + /undici@5.27.2: + resolution: {integrity: sha512-iS857PdOEy/y3wlM3yRp+6SNQQ6xU0mmZcwRSriqk+et/cwWAtwmIGf6WkoDN2EK/AMdCO/dfXzIwi+rFMrjjQ==} + engines: {node: '>=14.0'} + dependencies: + '@fastify/busboy': 2.1.0 + dev: false + /unicode-canonical-property-names-ecmascript@2.0.0: resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==} engines: {node: '>=4'} diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 3778eca8..aafa9621 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,2 +1,3 @@ packages: - 'frontend/*' + - 'backend/auto-operation/' \ No newline at end of file From 9f155b2646fd0aca533752e35074f7370c2449ec Mon Sep 17 00:00:00 2001 From: Azuki-bar <42642269+Azuki-bar@users.noreply.github.com> Date: Fri, 24 Nov 2023 12:27:06 +0900 Subject: [PATCH 02/14] =?UTF-8?q?build=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/auto-operation/.gitignore | 1 + backend/auto-operation/main.ts | 28 ++++++++++++++++++---------- backend/auto-operation/package.json | 3 ++- backend/auto-operation/tsconfig.json | 8 ++++---- 4 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 backend/auto-operation/.gitignore diff --git a/backend/auto-operation/.gitignore b/backend/auto-operation/.gitignore new file mode 100644 index 00000000..a9b203a6 --- /dev/null +++ b/backend/auto-operation/.gitignore @@ -0,0 +1 @@ +main.js diff --git a/backend/auto-operation/main.ts b/backend/auto-operation/main.ts index b02d74b1..b9aa4374 100644 --- a/backend/auto-operation/main.ts +++ b/backend/auto-operation/main.ts @@ -6,7 +6,15 @@ import { StopStateEnum } from "./proto/state/v1/stop_pb.js"; import { PointStateEnum } from "./proto/state/v1/point_pb.js"; import { Priority } from "./proto/state/v1/train_pb.js"; -let mapConfig; +type MapConfig = { + stopBlocks: { [key: string]: string }, + stations: { + [key: string]: { + capacity: number, + } + } +} +let mapConfig: MapConfig; const transport = createConnectTransport( { @@ -27,7 +35,7 @@ async function addTest() { train: { trainId: "test", positionId: "shinjuku_b1", - priority: Priority.PRIORITY_HIGH, + priority: Priority.HIGH, uuid: "test", destination: "hashimoto_up_s1" } @@ -36,7 +44,7 @@ async function addTest() { train: { trainId: "test2", positionId: "shinjuku_s1", - priority: Priority.PRIORITY_LOW, + priority: Priority.LOW, uuid: "test", destination: "hachioji_up_s1" } @@ -84,14 +92,14 @@ async function main() { // 通過待ちができるかどうか const stationName = train.positionId.split("_")[0] + "_" + train.positionId.split("_")[1]; const capacity = mapConfig.stations[stationName]; - if (capacity > 1 && train.Priority === Priority.PRIORITY_LOW) { + if (capacity.capacity > 1 && train.priority === Priority.LOW) { // 通過待ちが可能な駅で、PriorityがLOWの列車はPriorityがHIGHの列車が停車するまで待つ - const highPriorityTrains = trains.filter(t => (t.positionId.includes(stationName)) && t.Priority === Priority.PRIORITY_HIGH); + const highPriorityTrains = trains.filter(t => (t.positionId.includes(stationName)) && t.priority === Priority.HIGH); if (highPriorityTrains.length > 0) continue; } const stop = stops.find(s => s.id === train.positionId); // 問題ないならGOにする - if (stop.state !== StopStateEnum.STOP_STATE_GO) { + if (stop && stop.state !== StopStateEnum.STOP_STATE_GO) { await client.updateStopState({ "state": { "id": stop.id, @@ -108,8 +116,8 @@ async function main() { // 桜上水上りポイント // デフォルトではSTRAIGHTにして、sakurajosui_up_s1がONならREVERSEにする const sakurajosui_up_s1 = stops.find(s => s.id === "sakurajosui_up_s1"); - if (sakurajosui_up_s1.state === StopStateEnum.STOP_STATE_STOP) { - if (point.state !== StopStateEnum.STOP_STATE_REVERSE) { + if (sakurajosui_up_s1 && sakurajosui_up_s1.state === StopStateEnum.STOP_STATE_STOP) { + if (point.state !== PointStateEnum.POINT_STATE_REVERSE) { await client.updatePointState({ "state": { "id": point.id, @@ -118,7 +126,7 @@ async function main() { }) } } else { - if (point.state !== StopStateEnum.STOP_STATE_STRAIGHT) { + if (point.state !== PointStateEnum.POINT_STATE_NORMAL) { await client.updatePointState({ "state": { "id": point.id, @@ -130,7 +138,7 @@ async function main() { } if (point.id === "sakurajosui_down_p1") { const sakurajosui_down_s1 = stops.find(s => s.id === "sakurajosui_down_s1"); - if (sakurajosui_down_s1.state === StopStateEnum.STOP_STATE_STOP) { + if (sakurajosui_down_s1 && sakurajosui_down_s1.state === StopStateEnum.STOP_STATE_STOP) { if (point.state !== PointStateEnum.POINT_STATE_REVERSE) { await client.updatePointState({ "state": { diff --git a/backend/auto-operation/package.json b/backend/auto-operation/package.json index 6a6207d5..ec3fdeb0 100644 --- a/backend/auto-operation/package.json +++ b/backend/auto-operation/package.json @@ -4,7 +4,8 @@ "description": "", "main": "index.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" + "test": "echo \"Error: no test specified\" && exit 1", + "build": "npx tsc" }, "keywords": [], "author": "", diff --git a/backend/auto-operation/tsconfig.json b/backend/auto-operation/tsconfig.json index e075f973..614f58a3 100644 --- a/backend/auto-operation/tsconfig.json +++ b/backend/auto-operation/tsconfig.json @@ -11,7 +11,7 @@ // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ /* Language and Environment */ - "target": "es2016", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ + "target": "es2022", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ // "jsx": "preserve", /* Specify what JSX code is generated. */ // "experimentalDecorators": true, /* Enable experimental support for legacy experimental decorators. */ @@ -25,9 +25,9 @@ // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ /* Modules */ - "module": "commonjs", /* Specify what module code is generated. */ + "module": "es2022", /* Specify what module code is generated. */ // "rootDir": "./", /* Specify the root folder within your source files. */ - // "moduleResolution": "node10", /* Specify how TypeScript looks up a file from a given module specifier. */ + "moduleResolution": "bundler", /* Specify how TypeScript looks up a file from a given module specifier. */ // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ @@ -39,7 +39,7 @@ // "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */ // "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */ // "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */ - // "resolveJsonModule": true, /* Enable importing .json files. */ + "resolveJsonModule": true, /* Enable importing .json files. */ // "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */ // "noResolve": true, /* Disallow 'import's, 'require's or ''s from expanding the number of files TypeScript should add to a project. */ From 70be46f1e6751c65c55070bddb8fdb1533a74aef Mon Sep 17 00:00:00 2001 From: Azuki-bar <42642269+Azuki-bar@users.noreply.github.com> Date: Fri, 24 Nov 2023 12:59:48 +0900 Subject: [PATCH 03/14] =?UTF-8?q?=E3=82=A4=E3=83=A1=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E4=BD=9C=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/auto-operation/main.ts | 15 ++++--- backend/auto-operation/package.json | 5 ++- backend/auto-operation/tsconfig.json | 4 +- docker-bake.hcl | 8 ++++ docker/backend/auto-operation/Dockerfile | 24 ++++++++++ pnpm-lock.yaml | 57 +++++++++++++----------- 6 files changed, 78 insertions(+), 35 deletions(-) create mode 100644 docker/backend/auto-operation/Dockerfile diff --git a/backend/auto-operation/main.ts b/backend/auto-operation/main.ts index b9aa4374..b86af601 100644 --- a/backend/auto-operation/main.ts +++ b/backend/auto-operation/main.ts @@ -16,15 +16,16 @@ type MapConfig = { } let mapConfig: MapConfig; +const SERVER_ADDR = process.env['SERVER_ADDR'] ?? 'http://localhost:8080' const transport = createConnectTransport( { httpVersion: "2", - baseUrl: "http://localhost:8080", + baseUrl: SERVER_ADDR, }); const client = createPromiseClient(StateManagerService, transport); async function loadConfig() { - mapConfig = await import("./map/chofufes-2023.json"); + mapConfig = (await import("./map/chofufes-2023.json")).default; } loadConfig(); @@ -191,7 +192,9 @@ async function main() { addTest(); -while (true) { - main(); - await new Promise(resolve => setTimeout(resolve, 200)); -} \ No newline at end of file +(async () => { + while (true) { + main(); + await new Promise(resolve => setTimeout(resolve, 200)); + } +})() \ No newline at end of file diff --git a/backend/auto-operation/package.json b/backend/auto-operation/package.json index ec3fdeb0..f1e3c6b4 100644 --- a/backend/auto-operation/package.json +++ b/backend/auto-operation/package.json @@ -20,7 +20,10 @@ "@connectrpc/connect-node": "^1.1.3", "@connectrpc/connect-web": "^1.1.3", "@connectrpc/protoc-gen-connect-es": "^1.1.3", - "install": "^0.13.0", + "install": "^0.13.0" + }, + "devDependencies": { + "@types/node": "20.9.2", "tsx": "^4.3.0", "typescript": "5.2.2" } diff --git a/backend/auto-operation/tsconfig.json b/backend/auto-operation/tsconfig.json index 614f58a3..424dbd08 100644 --- a/backend/auto-operation/tsconfig.json +++ b/backend/auto-operation/tsconfig.json @@ -25,9 +25,9 @@ // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ /* Modules */ - "module": "es2022", /* Specify what module code is generated. */ + "module": "Node16", /* Specify what module code is generated. */ // "rootDir": "./", /* Specify the root folder within your source files. */ - "moduleResolution": "bundler", /* Specify how TypeScript looks up a file from a given module specifier. */ + "moduleResolution": "Node16", /* Specify how TypeScript looks up a file from a given module specifier. */ // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ diff --git a/docker-bake.hcl b/docker-bake.hcl index ac1c8895..73e715c7 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -1,6 +1,7 @@ group "default" { targets = [ "state-manager", + "autooperation", "dashboard" ] } @@ -29,6 +30,13 @@ target "state-manager" { ] } +target "autooperation" { + dockerfile = "docker/backend/auto-operation/Dockerfile" + tags = [ + GET_TAG("autooperation") + ] +} + target "dashboard" { dockerfile = "docker/frontend/dashboard/Dockerfile" tags = [ diff --git a/docker/backend/auto-operation/Dockerfile b/docker/backend/auto-operation/Dockerfile new file mode 100644 index 00000000..5524583d --- /dev/null +++ b/docker/backend/auto-operation/Dockerfile @@ -0,0 +1,24 @@ +FROM node:20.9-bookworm AS base +ENV PNPM_HOME="/pnpm" +ENV PATH="$PNPM_HOME:$PATH" +RUN corepack enable + +FROM base AS dep-resolver + +WORKDIR /auto-operation +COPY --chown=node:node pnpm-lock.yaml pnpm-workspace.yaml ./ +COPY backend/auto-operation ./backend/auto-operation +RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile + +FROM dep-resolver AS auto-operation-builder +RUN pnpm run --filter=./backend/auto-operation -r build +RUN pnpm deploy --filter=./backend/auto-operation --prod dist/auto-operation +RUN cp backend/auto-operation/main.js dist/auto-operation/main.js +WORKDIR /autooperation/dist/auto-operation + + +FROM gcr.io/distroless/nodejs20-debian12:nonroot AS dashboard-runner +COPY --from=auto-operation-builder --chown=nonroot:nonroot /auto-operation/dist/auto-operation /auto-operation +ENV SERVER_ADDR='' +CMD ["/auto-operation/main.js"] + diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 776d2fe5..e58cdbe2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -35,6 +35,10 @@ importers: install: specifier: ^0.13.0 version: 0.13.0 + devDependencies: + '@types/node': + specifier: 20.9.2 + version: 20.9.2 tsx: specifier: ^4.3.0 version: 4.3.0 @@ -1668,7 +1672,7 @@ packages: cpu: [arm64] os: [android] requiresBuild: true - dev: false + dev: true optional: true /@esbuild/android-arm@0.18.20: @@ -1677,7 +1681,7 @@ packages: cpu: [arm] os: [android] requiresBuild: true - dev: false + dev: true optional: true /@esbuild/android-x64@0.18.20: @@ -1686,7 +1690,7 @@ packages: cpu: [x64] os: [android] requiresBuild: true - dev: false + dev: true optional: true /@esbuild/darwin-arm64@0.18.20: @@ -1695,7 +1699,7 @@ packages: cpu: [arm64] os: [darwin] requiresBuild: true - dev: false + dev: true optional: true /@esbuild/darwin-x64@0.18.20: @@ -1704,7 +1708,7 @@ packages: cpu: [x64] os: [darwin] requiresBuild: true - dev: false + dev: true optional: true /@esbuild/freebsd-arm64@0.18.20: @@ -1713,7 +1717,7 @@ packages: cpu: [arm64] os: [freebsd] requiresBuild: true - dev: false + dev: true optional: true /@esbuild/freebsd-x64@0.18.20: @@ -1722,7 +1726,7 @@ packages: cpu: [x64] os: [freebsd] requiresBuild: true - dev: false + dev: true optional: true /@esbuild/linux-arm64@0.18.20: @@ -1731,7 +1735,7 @@ packages: cpu: [arm64] os: [linux] requiresBuild: true - dev: false + dev: true optional: true /@esbuild/linux-arm@0.18.20: @@ -1740,7 +1744,7 @@ packages: cpu: [arm] os: [linux] requiresBuild: true - dev: false + dev: true optional: true /@esbuild/linux-ia32@0.18.20: @@ -1749,7 +1753,7 @@ packages: cpu: [ia32] os: [linux] requiresBuild: true - dev: false + dev: true optional: true /@esbuild/linux-loong64@0.18.20: @@ -1758,7 +1762,7 @@ packages: cpu: [loong64] os: [linux] requiresBuild: true - dev: false + dev: true optional: true /@esbuild/linux-mips64el@0.18.20: @@ -1767,7 +1771,7 @@ packages: cpu: [mips64el] os: [linux] requiresBuild: true - dev: false + dev: true optional: true /@esbuild/linux-ppc64@0.18.20: @@ -1776,7 +1780,7 @@ packages: cpu: [ppc64] os: [linux] requiresBuild: true - dev: false + dev: true optional: true /@esbuild/linux-riscv64@0.18.20: @@ -1785,7 +1789,7 @@ packages: cpu: [riscv64] os: [linux] requiresBuild: true - dev: false + dev: true optional: true /@esbuild/linux-s390x@0.18.20: @@ -1794,7 +1798,7 @@ packages: cpu: [s390x] os: [linux] requiresBuild: true - dev: false + dev: true optional: true /@esbuild/linux-x64@0.18.20: @@ -1803,7 +1807,7 @@ packages: cpu: [x64] os: [linux] requiresBuild: true - dev: false + dev: true optional: true /@esbuild/netbsd-x64@0.18.20: @@ -1812,7 +1816,7 @@ packages: cpu: [x64] os: [netbsd] requiresBuild: true - dev: false + dev: true optional: true /@esbuild/openbsd-x64@0.18.20: @@ -1821,7 +1825,7 @@ packages: cpu: [x64] os: [openbsd] requiresBuild: true - dev: false + dev: true optional: true /@esbuild/sunos-x64@0.18.20: @@ -1830,7 +1834,7 @@ packages: cpu: [x64] os: [sunos] requiresBuild: true - dev: false + dev: true optional: true /@esbuild/win32-arm64@0.18.20: @@ -1839,7 +1843,7 @@ packages: cpu: [arm64] os: [win32] requiresBuild: true - dev: false + dev: true optional: true /@esbuild/win32-ia32@0.18.20: @@ -1848,7 +1852,7 @@ packages: cpu: [ia32] os: [win32] requiresBuild: true - dev: false + dev: true optional: true /@esbuild/win32-x64@0.18.20: @@ -1857,7 +1861,7 @@ packages: cpu: [x64] os: [win32] requiresBuild: true - dev: false + dev: true optional: true /@eslint-community/eslint-utils@4.4.0(eslint@8.54.0): @@ -3455,7 +3459,7 @@ packages: '@esbuild/win32-arm64': 0.18.20 '@esbuild/win32-ia32': 0.18.20 '@esbuild/win32-x64': 0.18.20 - dev: false + dev: true /escalade@3.1.1: resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==} @@ -3835,7 +3839,7 @@ packages: resolution: {integrity: sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==} dependencies: resolve-pkg-maps: 1.0.0 - dev: false + dev: true /glob-parent@5.1.2: resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} @@ -4995,7 +4999,7 @@ packages: /resolve-pkg-maps@1.0.0: resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==} - dev: false + dev: true /resolve@1.22.8: resolution: {integrity: sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==} @@ -5557,7 +5561,7 @@ packages: get-tsconfig: 4.7.2 optionalDependencies: fsevents: 2.3.3 - dev: false + dev: true /type-check@0.4.0: resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==} @@ -5588,6 +5592,7 @@ packages: resolution: {integrity: sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==} engines: {node: '>=14.17'} hasBin: true + dev: true /typescript@5.3.2: resolution: {integrity: sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==} From 7eed0305476b9db167b859d0e0ff6fb7847a36b0 Mon Sep 17 00:00:00 2001 From: Azuki-bar <42642269+Azuki-bar@users.noreply.github.com> Date: Fri, 24 Nov 2023 13:25:41 +0900 Subject: [PATCH 04/14] migrate connect-ewb to connect-es --- backend/auto-operation/main.ts | 2 +- backend/auto-operation/package.json | 7 +- ...ate_connectweb.d.ts => state_connect.d.ts} | 2 +- .../{state_connectweb.js => state_connect.js} | 2 +- backend/spec/state/v1/block.pb.go | 2 +- backend/spec/state/v1/point.pb.go | 2 +- backend/spec/state/v1/state.pb.go | 2 +- backend/spec/state/v1/stop.pb.go | 2 +- backend/spec/state/v1/train.pb.go | 2 +- frontend/dashboard/package.json | 4 +- frontend/dashboard/src/app/provider.tsx | 2 +- frontend/dashboard/src/app/test/page.tsx | 2 +- .../{state_connectweb.ts => state_connect.ts} | 2 +- pnpm-lock.yaml | 68 ++++--------------- proto/buf.gen.yaml | 4 +- 15 files changed, 29 insertions(+), 76 deletions(-) rename backend/auto-operation/proto/state/v1/{state_connectweb.d.ts => state_connect.d.ts} (97%) rename backend/auto-operation/proto/state/v1/{state_connectweb.js => state_connect.js} (97%) rename frontend/dashboard/src/proto/state/v1/{state_connectweb.ts => state_connect.ts} (97%) diff --git a/backend/auto-operation/main.ts b/backend/auto-operation/main.ts index b86af601..862bcf7d 100644 --- a/backend/auto-operation/main.ts +++ b/backend/auto-operation/main.ts @@ -1,6 +1,6 @@ import { createPromiseClient } from "@connectrpc/connect"; import { createConnectTransport } from "@connectrpc/connect-node"; -import { StateManagerService } from "./proto/state/v1/state_connectweb.js"; +import { StateManagerService } from "./proto/state/v1/state_connect.js"; import { BlockStateEnum } from "./proto/state/v1/block_pb.js"; import { StopStateEnum } from "./proto/state/v1/stop_pb.js"; import { PointStateEnum } from "./proto/state/v1/point_pb.js"; diff --git a/backend/auto-operation/package.json b/backend/auto-operation/package.json index f1e3c6b4..2fb07512 100644 --- a/backend/auto-operation/package.json +++ b/backend/auto-operation/package.json @@ -13,18 +13,17 @@ "license": "ISC", "dependencies": { "@bufbuild/buf": "^1.28.1", - "@bufbuild/connect-web": "^0.13.0", "@bufbuild/protobuf": "^1.4.2", - "@bufbuild/protoc-gen-es": "^1.4.2", "@connectrpc/connect": "^1.1.3", "@connectrpc/connect-node": "^1.1.3", "@connectrpc/connect-web": "^1.1.3", - "@connectrpc/protoc-gen-connect-es": "^1.1.3", "install": "^0.13.0" }, "devDependencies": { "@types/node": "20.9.2", "tsx": "^4.3.0", - "typescript": "5.2.2" + "typescript": "5.2.2", + "@connectrpc/protoc-gen-connect-es": "^1.1.3", + "@bufbuild/protoc-gen-es": "^1.4.2" } } \ No newline at end of file diff --git a/backend/auto-operation/proto/state/v1/state_connectweb.d.ts b/backend/auto-operation/proto/state/v1/state_connect.d.ts similarity index 97% rename from backend/auto-operation/proto/state/v1/state_connectweb.d.ts rename to backend/auto-operation/proto/state/v1/state_connect.d.ts index ce3b0613..f21a07b6 100644 --- a/backend/auto-operation/proto/state/v1/state_connectweb.d.ts +++ b/backend/auto-operation/proto/state/v1/state_connect.d.ts @@ -1,4 +1,4 @@ -// @generated by protoc-gen-connect-web v0.11.0 with parameter "target=dts+js" +// @generated by protoc-gen-connect-es v1.1.3 with parameter "target=dts+js" // @generated from file state/v1/state.proto (package state.v1, syntax proto3) /* eslint-disable */ // @ts-nocheck diff --git a/backend/auto-operation/proto/state/v1/state_connectweb.js b/backend/auto-operation/proto/state/v1/state_connect.js similarity index 97% rename from backend/auto-operation/proto/state/v1/state_connectweb.js rename to backend/auto-operation/proto/state/v1/state_connect.js index 1f4e198d..8da8b3e1 100644 --- a/backend/auto-operation/proto/state/v1/state_connectweb.js +++ b/backend/auto-operation/proto/state/v1/state_connect.js @@ -1,4 +1,4 @@ -// @generated by protoc-gen-connect-web v0.11.0 with parameter "target=dts+js" +// @generated by protoc-gen-connect-es v1.1.3 with parameter "target=dts+js" // @generated from file state/v1/state.proto (package state.v1, syntax proto3) /* eslint-disable */ // @ts-nocheck diff --git a/backend/spec/state/v1/block.pb.go b/backend/spec/state/v1/block.pb.go index 1300378c..c399a2be 100644 --- a/backend/spec/state/v1/block.pb.go +++ b/backend/spec/state/v1/block.pb.go @@ -4,7 +4,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.28.1 // protoc (unknown) // source: state/v1/block.proto diff --git a/backend/spec/state/v1/point.pb.go b/backend/spec/state/v1/point.pb.go index adde6dfb..c4ec999c 100644 --- a/backend/spec/state/v1/point.pb.go +++ b/backend/spec/state/v1/point.pb.go @@ -4,7 +4,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.28.1 // protoc (unknown) // source: state/v1/point.proto diff --git a/backend/spec/state/v1/state.pb.go b/backend/spec/state/v1/state.pb.go index ab887c4d..56af4a18 100644 --- a/backend/spec/state/v1/state.pb.go +++ b/backend/spec/state/v1/state.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.28.1 // protoc (unknown) // source: state/v1/state.proto diff --git a/backend/spec/state/v1/stop.pb.go b/backend/spec/state/v1/stop.pb.go index 79d2e172..cae6224b 100644 --- a/backend/spec/state/v1/stop.pb.go +++ b/backend/spec/state/v1/stop.pb.go @@ -4,7 +4,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.28.1 // protoc (unknown) // source: state/v1/stop.proto diff --git a/backend/spec/state/v1/train.pb.go b/backend/spec/state/v1/train.pb.go index 5a43a9f2..be9cca51 100644 --- a/backend/spec/state/v1/train.pb.go +++ b/backend/spec/state/v1/train.pb.go @@ -4,7 +4,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.28.1 // protoc (unknown) // source: state/v1/train.proto diff --git a/frontend/dashboard/package.json b/frontend/dashboard/package.json index 35d8a82f..dcb8d9d6 100644 --- a/frontend/dashboard/package.json +++ b/frontend/dashboard/package.json @@ -9,11 +9,10 @@ "lint": "next lint" }, "dependencies": { - "@bufbuild/connect-web": "^0.13.0", "@bufbuild/protobuf": "^1.4.2", "@connectrpc/connect": "^1.1.3", "@connectrpc/connect-query": "^0.6.0", - "@connectrpc/connect-web": "^1.1.3", + "@connectrpc/connect-web": "^1.1.2", "@tanstack/react-query": "^5.8.4", "clsx": "^2.0.0", "next": "14.0.3", @@ -22,7 +21,6 @@ }, "devDependencies": { "@bufbuild/buf": "^1.28.1", - "@bufbuild/protoc-gen-connect-web": "^0.11.0", "@bufbuild/protoc-gen-es": "^1.4.2", "@connectrpc/protoc-gen-connect-es": "^1.1.3", "@connectrpc/protoc-gen-connect-query": "^0.6.0", diff --git a/frontend/dashboard/src/app/provider.tsx b/frontend/dashboard/src/app/provider.tsx index a25b280b..453bf828 100644 --- a/frontend/dashboard/src/app/provider.tsx +++ b/frontend/dashboard/src/app/provider.tsx @@ -1,6 +1,6 @@ "use client"; -import {createConnectTransport} from "@bufbuild/connect-web"; +import {createConnectTransport} from "@connectrpc/connect-web"; import {TransportProvider} from "@connectrpc/connect-query"; import {QueryClient, QueryClientProvider} from "@tanstack/react-query"; diff --git a/frontend/dashboard/src/app/test/page.tsx b/frontend/dashboard/src/app/test/page.tsx index 1db5e65c..d1ef4498 100644 --- a/frontend/dashboard/src/app/test/page.tsx +++ b/frontend/dashboard/src/app/test/page.tsx @@ -1,7 +1,7 @@ "use client"; import { createPromiseClient } from "@connectrpc/connect"; import { StateManagerService } from "@/proto/state/v1/state_connectweb"; -import { createConnectTransport } from "@bufbuild/connect-web"; +import { createConnectTransport } from "@connectrpc/connect-web"; import { GetBlockStatesRequest } from "@/proto/state/v1/block_pb"; export default function Test() { diff --git a/frontend/dashboard/src/proto/state/v1/state_connectweb.ts b/frontend/dashboard/src/proto/state/v1/state_connect.ts similarity index 97% rename from frontend/dashboard/src/proto/state/v1/state_connectweb.ts rename to frontend/dashboard/src/proto/state/v1/state_connect.ts index abaa2421..48a431c0 100644 --- a/frontend/dashboard/src/proto/state/v1/state_connectweb.ts +++ b/frontend/dashboard/src/proto/state/v1/state_connect.ts @@ -1,4 +1,4 @@ -// @generated by protoc-gen-connect-web v0.11.0 with parameter "target=ts,import_extension=none" +// @generated by protoc-gen-connect-es v1.1.3 with parameter "target=ts,import_extension=none" // @generated from file state/v1/state.proto (package state.v1, syntax proto3) /* eslint-disable */ // @ts-nocheck diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e58cdbe2..13fdf356 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,15 +11,9 @@ importers: '@bufbuild/buf': specifier: ^1.28.1 version: 1.28.1 - '@bufbuild/connect-web': - specifier: ^0.13.0 - version: 0.13.0(@bufbuild/protobuf@1.4.2) '@bufbuild/protobuf': specifier: ^1.4.2 version: 1.4.2 - '@bufbuild/protoc-gen-es': - specifier: ^1.4.2 - version: 1.4.2(@bufbuild/protobuf@1.4.2) '@connectrpc/connect': specifier: ^1.1.3 version: 1.1.3(@bufbuild/protobuf@1.4.2) @@ -29,13 +23,16 @@ importers: '@connectrpc/connect-web': specifier: ^1.1.3 version: 1.1.3(@bufbuild/protobuf@1.4.2)(@connectrpc/connect@1.1.3) - '@connectrpc/protoc-gen-connect-es': - specifier: ^1.1.3 - version: 1.1.3(@bufbuild/protoc-gen-es@1.4.2)(@connectrpc/connect@1.1.3) install: specifier: ^0.13.0 version: 0.13.0 devDependencies: + '@bufbuild/protoc-gen-es': + specifier: ^1.4.2 + version: 1.4.2(@bufbuild/protobuf@1.4.2) + '@connectrpc/protoc-gen-connect-es': + specifier: ^1.1.3 + version: 1.1.3(@bufbuild/protoc-gen-es@1.4.2)(@connectrpc/connect@1.1.3) '@types/node': specifier: 20.9.2 version: 20.9.2 @@ -48,9 +45,6 @@ importers: frontend/dashboard: dependencies: - '@bufbuild/connect-web': - specifier: ^0.13.0 - version: 0.13.0(@bufbuild/protobuf@1.4.2) '@bufbuild/protobuf': specifier: ^1.4.2 version: 1.4.2 @@ -61,7 +55,7 @@ importers: specifier: ^0.6.0 version: 0.6.0(@bufbuild/protobuf@1.4.2)(@connectrpc/connect@1.1.3)(@tanstack/react-query@5.8.4)(react-dom@18.2.0)(react@18.2.0) '@connectrpc/connect-web': - specifier: ^1.1.3 + specifier: ^1.1.2 version: 1.1.3(@bufbuild/protobuf@1.4.2)(@connectrpc/connect@1.1.3) '@tanstack/react-query': specifier: ^5.8.4 @@ -82,9 +76,6 @@ importers: '@bufbuild/buf': specifier: ^1.28.1 version: 1.28.1 - '@bufbuild/protoc-gen-connect-web': - specifier: ^0.11.0 - version: 0.11.0(@bufbuild/protoc-gen-es@1.4.2) '@bufbuild/protoc-gen-es': specifier: ^1.4.2 version: 1.4.2(@bufbuild/protobuf@1.4.2) @@ -1511,49 +1502,9 @@ packages: '@bufbuild/buf-win32-arm64': 1.28.1 '@bufbuild/buf-win32-x64': 1.28.1 - /@bufbuild/connect-web@0.13.0(@bufbuild/protobuf@1.4.2): - resolution: {integrity: sha512-Ys9VFDWYktD9yFQSLOlkpsD42LonDNMCysLCfjXFuxlupYuf4f7qg0zkT5bESyTfqk4xtRDSSGR3xygaj/ONIQ==} - deprecated: Connect has moved to its own org @connectrpc and has a stable v1. Run `npx @connectrpc/connect-migrate@latest` to update. See https://github.com/connectrpc/connect-es/releases/tag/v0.13.1 for details. - peerDependencies: - '@bufbuild/protobuf': ^1.2.1 - dependencies: - '@bufbuild/connect': 0.13.0(@bufbuild/protobuf@1.4.2) - '@bufbuild/protobuf': 1.4.2 - dev: false - - /@bufbuild/connect@0.13.0(@bufbuild/protobuf@1.4.2): - resolution: {integrity: sha512-eZSMbVLyUFtXiZNORgCEvv580xKZeYQdMOWj2i/nxOcpXQcrEzTMTA7SZzWv4k4gveWCOSRoWmYDeOhfWXJv0g==} - deprecated: Connect has moved to its own org @connectrpc and has a stable v1. Run `npx @connectrpc/connect-migrate@latest` to update. See https://github.com/connectrpc/connect-es/releases/tag/v0.13.1 for details. - peerDependencies: - '@bufbuild/protobuf': ^1.2.1 - dependencies: - '@bufbuild/protobuf': 1.4.2 - dev: false - /@bufbuild/protobuf@1.4.2: resolution: {integrity: sha512-JyEH8Z+OD5Sc2opSg86qMHn1EM1Sa+zj/Tc0ovxdwk56ByVNONJSabuCUbLQp+eKN3rWNfrho0X+3SEqEPXIow==} - /@bufbuild/protoc-gen-connect-web@0.11.0(@bufbuild/protoc-gen-es@1.4.2): - resolution: {integrity: sha512-7GvYkQjN6LP/ixtosI4JBN8eph2kS5XNju9zFwBuJ6aHqfl1sNRkRWG8LEdtTJtyW2R3QypAUyLfpLQf/ZyRVw==} - engines: {node: '>=16.0.0'} - deprecated: This package is no longer supported. Please switch to use https://www.npmjs.com/package/@bufbuild/protoc-gen-connect-es. Details for switching can be found at https://github.com/bufbuild/connect-es/discussions/647 - hasBin: true - peerDependencies: - '@bufbuild/connect': 0.11.0 - '@bufbuild/protoc-gen-es': ^1.2.1 - peerDependenciesMeta: - '@bufbuild/connect': - optional: true - '@bufbuild/protoc-gen-es': - optional: true - dependencies: - '@bufbuild/protobuf': 1.4.2 - '@bufbuild/protoc-gen-es': 1.4.2(@bufbuild/protobuf@1.4.2) - '@bufbuild/protoplugin': 1.4.2 - transitivePeerDependencies: - - supports-color - dev: true - /@bufbuild/protoc-gen-es@1.4.2(@bufbuild/protobuf@1.4.2): resolution: {integrity: sha512-/It7M2s8H1zTDvUMJu6vhBmtnzeFL2VS6e78RYIY38602pNXDK/vbteKUo4KrG0O07lOPFu87hHZ0Y+w5Ib6iw==} engines: {node: '>=14'} @@ -1568,6 +1519,7 @@ packages: '@bufbuild/protoplugin': 1.4.2 transitivePeerDependencies: - supports-color + dev: true /@bufbuild/protoplugin@1.4.2: resolution: {integrity: sha512-5IwGC1ZRD2A+KydGXeaSOErwfILLqVtvMH/RkN+cOoHcQd4EYXFStcF7g7aR+yICRDEEjQVi5tQF/qPGBSr9vg==} @@ -1577,6 +1529,7 @@ packages: typescript: 4.5.2 transitivePeerDependencies: - supports-color + dev: true /@connectrpc/connect-node@1.1.3(@bufbuild/protobuf@1.4.2)(@connectrpc/connect@1.1.3): resolution: {integrity: sha512-oq7Uk8XlLzC2+eHaxZTX189dhujD0/tK9plizxofsFHUnLquMSmzQQ2GzvTv4u6U05eZYc/crySmf86Sqpi1bA==} @@ -1643,6 +1596,7 @@ packages: '@connectrpc/connect': 1.1.3(@bufbuild/protobuf@1.4.2) transitivePeerDependencies: - supports-color + dev: true /@connectrpc/protoc-gen-connect-query@0.6.0(@bufbuild/protoc-gen-es@1.4.2): resolution: {integrity: sha512-Y8Zow5bK/WFVABbrIYpqDo5hVYzWyqRuXfGLqurhKthrbpDKgB/MGYaz8ly7k2B0SE28//62HKVKlM63w12S4g==} @@ -2457,6 +2411,7 @@ packages: debug: 4.3.4 transitivePeerDependencies: - supports-color + dev: true /@ungap/structured-clone@1.2.0: resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} @@ -5587,6 +5542,7 @@ packages: resolution: {integrity: sha512-5BlMof9H1yGt0P8/WF+wPNw6GfctgGjXp5hkblpyT+8rkASSmkUKMXrxR0Xg8ThVCi/JnHQiKXeBaEwCeQwMFw==} engines: {node: '>=4.2.0'} hasBin: true + dev: true /typescript@5.2.2: resolution: {integrity: sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==} diff --git a/proto/buf.gen.yaml b/proto/buf.gen.yaml index fef570a2..8b658551 100644 --- a/proto/buf.gen.yaml +++ b/proto/buf.gen.yaml @@ -18,7 +18,7 @@ plugins: opt: - target=ts - plugin: connect-es - path: ../frontend/dashboard/node_modules/.bin/protoc-gen-connect-web + path: ../frontend/dashboard/node_modules/.bin/protoc-gen-connect-es out: ../frontend/dashboard/src/proto opt: - target=ts @@ -35,7 +35,7 @@ plugins: opt: - target=dts+js - plugin: connect-es - path: ../frontend/dashboard/node_modules/.bin/protoc-gen-connect-web + path: ../frontend/dashboard/node_modules/.bin/protoc-gen-connect-es out: ../backend/auto-operation/proto opt: - target=dts+js From d738391ed0cab30e18be14ac5043c4ce5fb819ad Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Nov 2023 04:26:32 +0000 Subject: [PATCH 05/14] Commit from GitHub Actions (compile_PB) --- backend/spec/state/v1/block.pb.go | 2 +- backend/spec/state/v1/point.pb.go | 2 +- backend/spec/state/v1/state.pb.go | 2 +- backend/spec/state/v1/stop.pb.go | 2 +- backend/spec/state/v1/train.pb.go | 2 +- frontend/dashboard/yarn.lock | 26 +++----------------------- 6 files changed, 8 insertions(+), 28 deletions(-) diff --git a/backend/spec/state/v1/block.pb.go b/backend/spec/state/v1/block.pb.go index c399a2be..1300378c 100644 --- a/backend/spec/state/v1/block.pb.go +++ b/backend/spec/state/v1/block.pb.go @@ -4,7 +4,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 +// protoc-gen-go v1.31.0 // protoc (unknown) // source: state/v1/block.proto diff --git a/backend/spec/state/v1/point.pb.go b/backend/spec/state/v1/point.pb.go index c4ec999c..adde6dfb 100644 --- a/backend/spec/state/v1/point.pb.go +++ b/backend/spec/state/v1/point.pb.go @@ -4,7 +4,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 +// protoc-gen-go v1.31.0 // protoc (unknown) // source: state/v1/point.proto diff --git a/backend/spec/state/v1/state.pb.go b/backend/spec/state/v1/state.pb.go index 56af4a18..ab887c4d 100644 --- a/backend/spec/state/v1/state.pb.go +++ b/backend/spec/state/v1/state.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 +// protoc-gen-go v1.31.0 // protoc (unknown) // source: state/v1/state.proto diff --git a/backend/spec/state/v1/stop.pb.go b/backend/spec/state/v1/stop.pb.go index cae6224b..79d2e172 100644 --- a/backend/spec/state/v1/stop.pb.go +++ b/backend/spec/state/v1/stop.pb.go @@ -4,7 +4,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 +// protoc-gen-go v1.31.0 // protoc (unknown) // source: state/v1/stop.proto diff --git a/backend/spec/state/v1/train.pb.go b/backend/spec/state/v1/train.pb.go index be9cca51..5a43a9f2 100644 --- a/backend/spec/state/v1/train.pb.go +++ b/backend/spec/state/v1/train.pb.go @@ -4,7 +4,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.28.1 +// protoc-gen-go v1.31.0 // protoc (unknown) // source: state/v1/train.proto diff --git a/frontend/dashboard/yarn.lock b/frontend/dashboard/yarn.lock index 0ede6640..ea0af22e 100644 --- a/frontend/dashboard/yarn.lock +++ b/frontend/dashboard/yarn.lock @@ -1071,31 +1071,11 @@ "@bufbuild/buf-win32-arm64" "1.28.1" "@bufbuild/buf-win32-x64" "1.28.1" -"@bufbuild/connect-web@^0.13.0": - version "0.13.0" - resolved "https://registry.yarnpkg.com/@bufbuild/connect-web/-/connect-web-0.13.0.tgz#87301c92d49d3c3f9acb99729c2f7505d739aa4a" - integrity sha512-Ys9VFDWYktD9yFQSLOlkpsD42LonDNMCysLCfjXFuxlupYuf4f7qg0zkT5bESyTfqk4xtRDSSGR3xygaj/ONIQ== - dependencies: - "@bufbuild/connect" "0.13.0" - -"@bufbuild/connect@0.13.0": - version "0.13.0" - resolved "https://registry.yarnpkg.com/@bufbuild/connect/-/connect-0.13.0.tgz#97a84a2cac747c7a52d4421a3382d8d165f61c99" - integrity sha512-eZSMbVLyUFtXiZNORgCEvv580xKZeYQdMOWj2i/nxOcpXQcrEzTMTA7SZzWv4k4gveWCOSRoWmYDeOhfWXJv0g== - -"@bufbuild/protobuf@1.4.2", "@bufbuild/protobuf@^1.2.1", "@bufbuild/protobuf@^1.3.3", "@bufbuild/protobuf@^1.4.2": +"@bufbuild/protobuf@1.4.2", "@bufbuild/protobuf@^1.3.3", "@bufbuild/protobuf@^1.4.2": version "1.4.2" resolved "https://registry.yarnpkg.com/@bufbuild/protobuf/-/protobuf-1.4.2.tgz#dc4faf21264a47b71a15806616043cb006e80ac8" integrity sha512-JyEH8Z+OD5Sc2opSg86qMHn1EM1Sa+zj/Tc0ovxdwk56ByVNONJSabuCUbLQp+eKN3rWNfrho0X+3SEqEPXIow== -"@bufbuild/protoc-gen-connect-web@^0.11.0": - version "0.11.0" - resolved "https://registry.yarnpkg.com/@bufbuild/protoc-gen-connect-web/-/protoc-gen-connect-web-0.11.0.tgz#985e12d0acc804a14033916bd2cebf3d88562dd1" - integrity sha512-7GvYkQjN6LP/ixtosI4JBN8eph2kS5XNju9zFwBuJ6aHqfl1sNRkRWG8LEdtTJtyW2R3QypAUyLfpLQf/ZyRVw== - dependencies: - "@bufbuild/protobuf" "^1.2.1" - "@bufbuild/protoplugin" "^1.2.1" - "@bufbuild/protoc-gen-es@^1.4.2": version "1.4.2" resolved "https://registry.yarnpkg.com/@bufbuild/protoc-gen-es/-/protoc-gen-es-1.4.2.tgz#00c8b09430dd1154e626da7c247fd6425a1cd41d" @@ -1104,7 +1084,7 @@ "@bufbuild/protobuf" "^1.4.2" "@bufbuild/protoplugin" "1.4.2" -"@bufbuild/protoplugin@1.4.2", "@bufbuild/protoplugin@^1.2.1", "@bufbuild/protoplugin@^1.3.3": +"@bufbuild/protoplugin@1.4.2", "@bufbuild/protoplugin@^1.3.3": version "1.4.2" resolved "https://registry.yarnpkg.com/@bufbuild/protoplugin/-/protoplugin-1.4.2.tgz#abf9b0e6a3dc8b52b1d6699d7a1ce5219fa82322" integrity sha512-5IwGC1ZRD2A+KydGXeaSOErwfILLqVtvMH/RkN+cOoHcQd4EYXFStcF7g7aR+yICRDEEjQVi5tQF/qPGBSr9vg== @@ -1120,7 +1100,7 @@ dependencies: stable-hash "^0.0.3" -"@connectrpc/connect-web@^1.1.3": +"@connectrpc/connect-web@^1.1.2": version "1.1.3" resolved "https://registry.yarnpkg.com/@connectrpc/connect-web/-/connect-web-1.1.3.tgz#027922b4f1537ecb1eaaa31ec3a59dd471a65320" integrity sha512-WfShOZt91duJngqivYF4wJFRbeRa4bF/fPMfDVN0MAYSX3VuaTMn8o9qgKN7tsg2H2ZClyOVQwMkZx6IdcP7Zw== From 546ae2e260df5f5b979a1ca79ece39188f0871f3 Mon Sep 17 00:00:00 2001 From: Azuki-bar <42642269+Azuki-bar@users.noreply.github.com> Date: Fri, 24 Nov 2023 13:27:00 +0900 Subject: [PATCH 06/14] =?UTF-8?q?CI=E8=B5=B0=E3=82=89=E3=81=9B=E3=82=8B?= =?UTF-8?q?=E3=81=9F=E3=82=81=E3=81=AB=E7=A9=BA=E3=82=B3=E3=83=9F=E3=83=83?= =?UTF-8?q?=E3=83=88=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From 93bfaaff180ff70fb43cf8ab0a63fee9fd075e58 Mon Sep 17 00:00:00 2001 From: Azuki-bar <42642269+Azuki-bar@users.noreply.github.com> Date: Fri, 24 Nov 2023 13:34:30 +0900 Subject: [PATCH 07/14] fix import path --- frontend/dashboard/src/app/test/page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/dashboard/src/app/test/page.tsx b/frontend/dashboard/src/app/test/page.tsx index d1ef4498..a02691d8 100644 --- a/frontend/dashboard/src/app/test/page.tsx +++ b/frontend/dashboard/src/app/test/page.tsx @@ -1,6 +1,6 @@ "use client"; import { createPromiseClient } from "@connectrpc/connect"; -import { StateManagerService } from "@/proto/state/v1/state_connectweb"; +import { StateManagerService } from "@/proto/state/v1/state_connect"; import { createConnectTransport } from "@connectrpc/connect-web"; import { GetBlockStatesRequest } from "@/proto/state/v1/block_pb"; From 432367f4095acaf9b5532bf1e2056413d7781647 Mon Sep 17 00:00:00 2001 From: Azuki-bar <42642269+Azuki-bar@users.noreply.github.com> Date: Fri, 24 Nov 2023 13:37:14 +0900 Subject: [PATCH 08/14] =?UTF-8?q?=E3=82=AD=E3=83=A3=E3=83=83=E3=82=B7?= =?UTF-8?q?=E3=83=A5=E3=82=92=E6=8E=B4=E3=81=BE=E3=81=AA=E3=81=84=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/frontend/dashboard/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/frontend/dashboard/Dockerfile b/docker/frontend/dashboard/Dockerfile index 3dd83c78..3d2ee283 100644 --- a/docker/frontend/dashboard/Dockerfile +++ b/docker/frontend/dashboard/Dockerfile @@ -8,7 +8,7 @@ FROM base AS dep-resolver WORKDIR /dashboard COPY --chown=node:node pnpm-lock.yaml pnpm-workspace.yaml ./ COPY frontend/ ./frontend -RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --frozen-lockfile +RUN pnpm install --frozen-lockfile FROM dep-resolver AS dashboard-builder RUN pnpm run --filter=./frontend/dashboard -r build From 74c5ff019474700a56566b485e0f7c0e0005069a Mon Sep 17 00:00:00 2001 From: Azuki-bar <42642269+Azuki-bar@users.noreply.github.com> Date: Fri, 24 Nov 2023 13:45:30 +0900 Subject: [PATCH 09/14] =?UTF-8?q?pnpm=E3=81=8C=E3=81=8A=E3=81=8B=E3=81=97?= =?UTF-8?q?=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/frontend/dashboard/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/frontend/dashboard/Dockerfile b/docker/frontend/dashboard/Dockerfile index 3d2ee283..43fe71b4 100644 --- a/docker/frontend/dashboard/Dockerfile +++ b/docker/frontend/dashboard/Dockerfile @@ -8,7 +8,7 @@ FROM base AS dep-resolver WORKDIR /dashboard COPY --chown=node:node pnpm-lock.yaml pnpm-workspace.yaml ./ COPY frontend/ ./frontend -RUN pnpm install --frozen-lockfile +RUN pnpm install --frozen-lockfile --no-optional FROM dep-resolver AS dashboard-builder RUN pnpm run --filter=./frontend/dashboard -r build From 317f576dabb10c4e3a56d55f93eed540e90fa9f7 Mon Sep 17 00:00:00 2001 From: Azuki-bar <42642269+Azuki-bar@users.noreply.github.com> Date: Fri, 24 Nov 2023 15:20:11 +0900 Subject: [PATCH 10/14] pin version --- backend/auto-operation/package.json | 3 ++- frontend/dashboard/package.json | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/auto-operation/package.json b/backend/auto-operation/package.json index 2fb07512..c394d15a 100644 --- a/backend/auto-operation/package.json +++ b/backend/auto-operation/package.json @@ -25,5 +25,6 @@ "typescript": "5.2.2", "@connectrpc/protoc-gen-connect-es": "^1.1.3", "@bufbuild/protoc-gen-es": "^1.4.2" - } + }, + "packageManager": "pnpm@8.6.11" } \ No newline at end of file diff --git a/frontend/dashboard/package.json b/frontend/dashboard/package.json index dcb8d9d6..7f677d6d 100644 --- a/frontend/dashboard/package.json +++ b/frontend/dashboard/package.json @@ -37,5 +37,6 @@ ".next/standalone", ".next/static", "public" - ] + ], + "packageManager": "pnpm@8.6.11" } \ No newline at end of file From 3e7074bc80611b01f0115e5b1074ca809f601244 Mon Sep 17 00:00:00 2001 From: Azuki-bar <42642269+Azuki-bar@users.noreply.github.com> Date: Fri, 24 Nov 2023 15:22:32 +0900 Subject: [PATCH 11/14] fix --- .github/workflows/create-proto.yaml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/workflows/create-proto.yaml b/.github/workflows/create-proto.yaml index 2aa19e36..70672c99 100644 --- a/.github/workflows/create-proto.yaml +++ b/.github/workflows/create-proto.yaml @@ -1,4 +1,4 @@ -name: compile_PB +name: compile PB on: push: @@ -18,19 +18,7 @@ jobs: uses: actions/setup-node@v4 with: node-version: 20 - - name: Get yarn cache directory path - id: yarn-cache-dir-path - run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT - working-directory: ./frontend/dashboard - - uses: actions/cache@v3 - id: yarn-cache - with: - path: ${{ steps.yarn-cache-dir-path.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-yarn- - - run: yarn install --immutable - working-directory: ./frontend/dashboard + - run: pnpm install --frozen-lockfile - name: Set up Go uses: actions/setup-go@v4 with: From c695ecb64432b44cc27e4f21dd7a90e33103dc32 Mon Sep 17 00:00:00 2001 From: Azuki-bar <42642269+Azuki-bar@users.noreply.github.com> Date: Fri, 24 Nov 2023 15:24:52 +0900 Subject: [PATCH 12/14] fix --- backend/auto-operation/package.json | 2 +- frontend/dashboard/package.json | 4 +-- pnpm-lock.yaml | 44 +++++++++++++++++++++++------ 3 files changed, 39 insertions(+), 11 deletions(-) diff --git a/backend/auto-operation/package.json b/backend/auto-operation/package.json index c394d15a..5c72e988 100644 --- a/backend/auto-operation/package.json +++ b/backend/auto-operation/package.json @@ -20,7 +20,7 @@ "install": "^0.13.0" }, "devDependencies": { - "@types/node": "20.9.2", + "@types/node": "20.9.3", "tsx": "^4.3.0", "typescript": "5.2.2", "@connectrpc/protoc-gen-connect-es": "^1.1.3", diff --git a/frontend/dashboard/package.json b/frontend/dashboard/package.json index 7f677d6d..8bd0406f 100644 --- a/frontend/dashboard/package.json +++ b/frontend/dashboard/package.json @@ -12,7 +12,7 @@ "@bufbuild/protobuf": "^1.4.2", "@connectrpc/connect": "^1.1.3", "@connectrpc/connect-query": "^0.6.0", - "@connectrpc/connect-web": "^1.1.2", + "@connectrpc/connect-web": "^1.1.3", "@tanstack/react-query": "^5.8.4", "clsx": "^2.0.0", "next": "14.0.3", @@ -38,5 +38,5 @@ ".next/static", "public" ], - "packageManager": "pnpm@8.6.11" + "packageManager": "pnpm@8.6.11" } \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 13fdf356..3abec340 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -34,8 +34,8 @@ importers: specifier: ^1.1.3 version: 1.1.3(@bufbuild/protoc-gen-es@1.4.2)(@connectrpc/connect@1.1.3) '@types/node': - specifier: 20.9.2 - version: 20.9.2 + specifier: 20.9.3 + version: 20.9.3 tsx: specifier: ^4.3.0 version: 4.3.0 @@ -55,7 +55,7 @@ importers: specifier: ^0.6.0 version: 0.6.0(@bufbuild/protobuf@1.4.2)(@connectrpc/connect@1.1.3)(@tanstack/react-query@5.8.4)(react-dom@18.2.0)(react@18.2.0) '@connectrpc/connect-web': - specifier: ^1.1.2 + specifier: ^1.1.3 version: 1.1.3(@bufbuild/protobuf@1.4.2)(@connectrpc/connect@1.1.3) '@tanstack/react-query': specifier: ^5.8.4 @@ -2329,8 +2329,14 @@ packages: resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} dev: false - /@types/node@20.9.5: - resolution: {integrity: sha512-Uq2xbNq0chGg+/WQEU0LJTSs/1nKxz6u1iemLcGomkSnKokbW1fbLqc3HOqCf2JP7KjlL4QkS7oZZTrOQHQYgQ==} + /@types/node@20.9.2: + resolution: {integrity: sha512-WHZXKFCEyIUJzAwh3NyyTHYSR35SevJ6mZ1nWwJafKtiQbqRTIKSRcw3Ma3acqgsent3RRDqeVwpHntMk+9irg==} + dependencies: + undici-types: 5.26.5 + dev: true + + /@types/node@20.9.3: + resolution: {integrity: sha512-nk5wXLAXGBKfrhLB0cyHGbSqopS+nz0BUgZkUQqSHSSgdee0kssp1IAqlQOu333bW+gMNs2QREx7iynm19Abxw==} dependencies: undici-types: 5.26.5 dev: true @@ -2346,8 +2352,14 @@ packages: resolution: {integrity: sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==} dev: true - /@types/react-dom@18.2.17: - resolution: {integrity: sha512-rvrT/M7Df5eykWFxn6MYt5Pem/Dbyc1N8Y0S9Mrkw2WFCRiqUgw9P7ul2NpwsXCSM1DVdENzdG9J5SreqfAIWg==} + /@types/react-dom@18.2.15: + resolution: {integrity: sha512-HWMdW+7r7MR5+PZqJF6YFNSCtjz1T0dsvo/f1BV6HkV+6erD/nA7wd9NM00KVG83zf2nJ7uATPO9ttdIPvi3gg==} + dependencies: + '@types/react': 18.2.38 + dev: true + + /@types/react-dom@18.2.16: + resolution: {integrity: sha512-766c37araZ9vxtYs25gvY2wNdFWsT2ZiUvOd0zMhTaoGj6B911N8CKQWgXXJoPMLF3J82thpRqQA7Rf3rBwyJw==} dependencies: '@types/react': 18.2.38 dev: true @@ -2358,6 +2370,14 @@ packages: '@types/react': 18.2.38 dev: false + /@types/react@18.2.37: + resolution: {integrity: sha512-RGAYMi2bhRgEXT3f4B92WTohopH6bIXw05FuGlmJEnv/omEn190+QYEIYxIAuIBdKgboYYdVved2p1AxZVQnaw==} + dependencies: + '@types/prop-types': 15.7.11 + '@types/scheduler': 0.16.7 + csstype: 3.1.2 + dev: true + /@types/react@18.2.38: resolution: {integrity: sha512-cBBXHzuPtQK6wNthuVMV6IjHAFkdl/FOPFIlkd81/Cd1+IqkHu/A+w4g43kaQQoYHik/ruaQBDL72HyCy1vuMw==} dependencies: @@ -2372,6 +2392,10 @@ packages: /@types/scheduler@0.16.7: resolution: {integrity: sha512-8g25Nl3AuB1KulTlSUsUhUo/oBgBU6XIXQ+XURpeioEbEJvkO7qI4vDfREv3vJYHHzqXjcAHvoJy4pTtSQNZtA==} + /@types/scheduler@0.16.8: + resolution: {integrity: sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==} + dev: true + /@types/send@0.17.4: resolution: {integrity: sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==} dependencies: @@ -2888,6 +2912,10 @@ packages: /caniuse-lite@1.0.30001563: resolution: {integrity: sha512-na2WUmOxnwIZtwnFI2CZ/3er0wdNzU7hN+cPYz/z2ajHThnkWjNBOpEPP4n+4r2WPM847JaMotaJE3bnfzjyKw==} + /caniuse-lite@1.0.30001564: + resolution: {integrity: sha512-DqAOf+rhof+6GVx1y+xzbFPeOumfQnhYzVnZD6LAXijR77yPtm9mfOcqOnT3mpnJiZVT+kwLAFnRlZcIz+c6bg==} + dev: false + /canvas@2.11.2: resolution: {integrity: sha512-ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==} engines: {node: '>=6'} @@ -4471,7 +4499,7 @@ packages: '@next/env': 14.0.3 '@swc/helpers': 0.5.2 busboy: 1.6.0 - caniuse-lite: 1.0.30001563 + caniuse-lite: 1.0.30001564 postcss: 8.4.31 react: 18.2.0 react-dom: 18.2.0(react@18.2.0) From 23d56c3ddfc702adbade694281843470266909f3 Mon Sep 17 00:00:00 2001 From: Azuki-bar <42642269+Azuki-bar@users.noreply.github.com> Date: Fri, 24 Nov 2023 15:25:52 +0900 Subject: [PATCH 13/14] corepack enable --- .github/workflows/create-proto.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/create-proto.yaml b/.github/workflows/create-proto.yaml index 70672c99..f7de4222 100644 --- a/.github/workflows/create-proto.yaml +++ b/.github/workflows/create-proto.yaml @@ -18,6 +18,8 @@ jobs: uses: actions/setup-node@v4 with: node-version: 20 + - name: Corepack Enable + run: corepack enable - run: pnpm install --frozen-lockfile - name: Set up Go uses: actions/setup-go@v4 From 806dd7a988240a7fde78a6afd756af5653a04e8f Mon Sep 17 00:00:00 2001 From: Azuki-bar <42642269+Azuki-bar@users.noreply.github.com> Date: Fri, 24 Nov 2023 15:30:57 +0900 Subject: [PATCH 14/14] fix nodejs version --- backend/auto-operation/package.json | 2 +- pnpm-lock.yaml | 36 +++++------------------------ 2 files changed, 7 insertions(+), 31 deletions(-) diff --git a/backend/auto-operation/package.json b/backend/auto-operation/package.json index 5c72e988..5e38e841 100644 --- a/backend/auto-operation/package.json +++ b/backend/auto-operation/package.json @@ -20,7 +20,7 @@ "install": "^0.13.0" }, "devDependencies": { - "@types/node": "20.9.3", + "@types/node": "20.9.5", "tsx": "^4.3.0", "typescript": "5.2.2", "@connectrpc/protoc-gen-connect-es": "^1.1.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3abec340..93a561b3 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -34,8 +34,8 @@ importers: specifier: ^1.1.3 version: 1.1.3(@bufbuild/protoc-gen-es@1.4.2)(@connectrpc/connect@1.1.3) '@types/node': - specifier: 20.9.3 - version: 20.9.3 + specifier: 20.9.5 + version: 20.9.5 tsx: specifier: ^4.3.0 version: 4.3.0 @@ -2329,14 +2329,8 @@ packages: resolution: {integrity: sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==} dev: false - /@types/node@20.9.2: - resolution: {integrity: sha512-WHZXKFCEyIUJzAwh3NyyTHYSR35SevJ6mZ1nWwJafKtiQbqRTIKSRcw3Ma3acqgsent3RRDqeVwpHntMk+9irg==} - dependencies: - undici-types: 5.26.5 - dev: true - - /@types/node@20.9.3: - resolution: {integrity: sha512-nk5wXLAXGBKfrhLB0cyHGbSqopS+nz0BUgZkUQqSHSSgdee0kssp1IAqlQOu333bW+gMNs2QREx7iynm19Abxw==} + /@types/node@20.9.5: + resolution: {integrity: sha512-Uq2xbNq0chGg+/WQEU0LJTSs/1nKxz6u1iemLcGomkSnKokbW1fbLqc3HOqCf2JP7KjlL4QkS7oZZTrOQHQYgQ==} dependencies: undici-types: 5.26.5 dev: true @@ -2352,14 +2346,8 @@ packages: resolution: {integrity: sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==} dev: true - /@types/react-dom@18.2.15: - resolution: {integrity: sha512-HWMdW+7r7MR5+PZqJF6YFNSCtjz1T0dsvo/f1BV6HkV+6erD/nA7wd9NM00KVG83zf2nJ7uATPO9ttdIPvi3gg==} - dependencies: - '@types/react': 18.2.38 - dev: true - - /@types/react-dom@18.2.16: - resolution: {integrity: sha512-766c37araZ9vxtYs25gvY2wNdFWsT2ZiUvOd0zMhTaoGj6B911N8CKQWgXXJoPMLF3J82thpRqQA7Rf3rBwyJw==} + /@types/react-dom@18.2.17: + resolution: {integrity: sha512-rvrT/M7Df5eykWFxn6MYt5Pem/Dbyc1N8Y0S9Mrkw2WFCRiqUgw9P7ul2NpwsXCSM1DVdENzdG9J5SreqfAIWg==} dependencies: '@types/react': 18.2.38 dev: true @@ -2370,14 +2358,6 @@ packages: '@types/react': 18.2.38 dev: false - /@types/react@18.2.37: - resolution: {integrity: sha512-RGAYMi2bhRgEXT3f4B92WTohopH6bIXw05FuGlmJEnv/omEn190+QYEIYxIAuIBdKgboYYdVved2p1AxZVQnaw==} - dependencies: - '@types/prop-types': 15.7.11 - '@types/scheduler': 0.16.7 - csstype: 3.1.2 - dev: true - /@types/react@18.2.38: resolution: {integrity: sha512-cBBXHzuPtQK6wNthuVMV6IjHAFkdl/FOPFIlkd81/Cd1+IqkHu/A+w4g43kaQQoYHik/ruaQBDL72HyCy1vuMw==} dependencies: @@ -2392,10 +2372,6 @@ packages: /@types/scheduler@0.16.7: resolution: {integrity: sha512-8g25Nl3AuB1KulTlSUsUhUo/oBgBU6XIXQ+XURpeioEbEJvkO7qI4vDfREv3vJYHHzqXjcAHvoJy4pTtSQNZtA==} - /@types/scheduler@0.16.8: - resolution: {integrity: sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==} - dev: true - /@types/send@0.17.4: resolution: {integrity: sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==} dependencies: