From 58001d3092b0972232f9f3e55214def101e37520 Mon Sep 17 00:00:00 2001 From: Alec Thomas Date: Sat, 3 Feb 2024 10:37:44 +1100 Subject: [PATCH] chore: replace `ftl-dev` with `just dev` Also pinned the TS protoc tools so they don't randomly update. --- Justfile | 21 +++++++-------------- frontend/package-lock.json | 4 ++-- frontend/package.json | 4 ++-- scripts/ftl-dev | 13 ------------- 4 files changed, 11 insertions(+), 31 deletions(-) delete mode 100755 scripts/ftl-dev diff --git a/Justfile b/Justfile index 23cf3ac64f..cafe9cee11 100644 --- a/Justfile +++ b/Justfile @@ -1,17 +1,10 @@ -# Install all JARs to local Maven repository -install-jars: install-root-jar install-generator-jar install-runtime-jar +# Start a hot-reloading dev cluster +dev: install-jars + goreman -logtime=false start -# Install root JAR to local Maven repository -install-root-jar: - mvn -B install - -# Install ftl-generator JAR to local Maven repository -install-generator-jar: - mvn -B -pl :ftl-generator install - -# Install ftl-runtime JAR to local Maven repository -install-runtime-jar: - mvn -B -pl :ftl-runtime install +# Install all JARs to local Maven repository and local build directory +install-jars: + bit 'build/**/*.jar' # Deploy the Go time module deploy-time: @@ -27,4 +20,4 @@ regen-schema: # Run errtrace on Go files to add stacks errtrace: - git ls-files -z -- '*.go' | grep -zv /_ | xargs -0 errtrace -w && go mod tidy + git ls-files -z -- '*.go' | grep -zv /_ | xargs -0 errtrace -w && go mod tidy \ No newline at end of file diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 6bd4546b5a..0e1f9a2937 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -8,10 +8,10 @@ "name": "console", "version": "0.0.0", "dependencies": { - "@bufbuild/protoc-gen-es": "^1.5.0", + "@bufbuild/protoc-gen-es": "1.7.0", "@connectrpc/connect": "^1.1.2", "@connectrpc/connect-web": "^1.1.2", - "@connectrpc/protoc-gen-connect-es": "^1.1.4", + "@connectrpc/protoc-gen-connect-es": "1.3.0", "@headlessui/react": "1.7.18", "@heroicons/react": "2.1.1", "@monaco-editor/react": "4.6.0", diff --git a/frontend/package.json b/frontend/package.json index 24c0e36f7e..c4741c52bc 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -26,10 +26,10 @@ ], "source": "index.html", "dependencies": { - "@bufbuild/protoc-gen-es": "^1.5.0", + "@bufbuild/protoc-gen-es": "1.7.0", "@connectrpc/connect": "^1.1.2", "@connectrpc/connect-web": "^1.1.2", - "@connectrpc/protoc-gen-connect-es": "^1.1.4", + "@connectrpc/protoc-gen-connect-es": "1.3.0", "@headlessui/react": "1.7.18", "@heroicons/react": "2.1.1", "@monaco-editor/react": "4.6.0", diff --git a/scripts/ftl-dev b/scripts/ftl-dev deleted file mode 100755 index 2ae6aa8ef1..0000000000 --- a/scripts/ftl-dev +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -set -euo pipefail - -top="$(git rev-parse --show-toplevel)" -cd "${top}" - -prepare_template() ( - just install-jars -) - -prepare_template - -goreman -logtime=false start