diff --git a/Docs/QuickStart.md b/Docs/QuickStart.md index dfcc538ec..2cd4d230d 100644 --- a/Docs/QuickStart.md +++ b/Docs/QuickStart.md @@ -15,7 +15,7 @@ Building/Running: * 1.1\) For step 2 in the module, go with the first option (ie. step 2.1); it's faster and easier. * 1.2\) For step 3 in the module, choose whether you want your locally-served frontend to connect to a local backend, or the public production backend (since a middle-ground "staging" server has not been set up yet). * 1.3.1\) If you're only interested in doing frontend code-changes for now, and the issues you're working on are "limited to the frontend" (ie. unlikely to trigger flawed commands sent to the server or the like), you can simply have your webpack-served frontend connect directly to the production backend; this lets you avoid setup of a local backend (eg. installing docker and a local kubernetes cluster). In this case, when you get to step 3 in the [run-frontend-local](https://github.com/debate-map/app#run-frontend-local) module, use `localhost:5101/?db=prod` as the url opened in your browser. - * 1.3.2\) If instead you plan to be making backend changes alongside frontend changes (or if you just want to be able to fiddle with things maximally without worry of sending flawed commands to the production backend), then in step 3 of the module above, use just `localhost:5101` as the url opened in your browser. This will cause the frontend to try to connect to a local backend served (mainly) from `localhost:5110`. + * 1.3.2\) If instead you plan to be making backend changes alongside frontend changes (or if you just want to be able to fiddle with things maximally without worry of sending flawed commands to the production backend), then in step 3 of the module above, use just `localhost:5101` (or `localhost:5101/?db=null` to reset) as the url opened in your browser. This will cause the frontend to try to connect to a local backend served (mainly) from `localhost:5100/app-server`. * 1.3.1.1\) For this to work, you'll of course need to follow the steps in the "Backend" section below, to get a local instance set up in Docker/Kubernetes. ## Backend diff --git a/README.md b/README.md index 515c59644..aebf2bc08 100644 --- a/README.md +++ b/README.md @@ -141,7 +141,7 @@ Remote (private port-forwards/proxies): * `localhost:5240`: remote (k8s), hyperknowledge server (experimental backend) (`backend.[forward/tiltUp]_local` must be running) * `localhost:5241`: remote (k8s), hyperknowledge postgres (`backend.[forward/tiltUp]_local` must be running) -Remote (public): \[note: the new version of debate-map is not yet served at these endpoints; these are the target urls, however, for when it's ready for public access] +Remote (public): * `debatemap.app`: remote (k8s), web-server * `debatemap.app/app-server`: remote (k8s), app-server * `debatemap.app/monitor`: remote (k8s), monitor-backend (with web-serving of monitor-client's files) diff --git a/Tilt/@Extensions/helm_remote.star b/Tilt/@Extensions/helm_remote.star index 27f29ca29..7b096e694 100644 --- a/Tilt/@Extensions/helm_remote.star +++ b/Tilt/@Extensions/helm_remote.star @@ -25,6 +25,10 @@ def _find_root_tiltfile_dir(): if os.path.exists(os.path.join(current, 'tilt_modules')): return current + # v-added (fix for infinite traverse-up loop when no tilt_modules folder is found, as is true for the fresh-from-clone state) + if os.path.exists(os.path.join(current, '.env.template')): + return current + current = os.path.dirname(current) fail('Could not find root Tiltfile') diff --git a/package.json b/package.json index d0534e6b4..9d5648868 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "patch-package": "^6.4.7", "postinstall-postinstall": "^2.1.0", "sync-directory": "^2.2.22", - "tree-grapher": "0.0.11", + "tree-grapher": "0.0.12", "ui-debug-kit": "0.0.7", "wavesurfer.js": "7.6.0", "web-vcore": "0.0.104" diff --git a/yarn.lock b/yarn.lock index b36666921..a75189cc8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1702,7 +1702,7 @@ __metadata: typescript: "npm:5.3.3" ui-debug-kit: "npm:0.0.7" wavesurfer.js: "npm:7.6.0" - web-vcore: "npm:0.0.103" + web-vcore: "npm:0.0.104" languageName: unknown linkType: soft @@ -12678,9 +12678,9 @@ __metadata: languageName: node linkType: hard -"tree-grapher@npm:0.0.11": - version: 0.0.11 - resolution: "tree-grapher@npm:0.0.11" +"tree-grapher@npm:0.0.11, tree-grapher@workspace:.yalc/tree-grapher": + version: 0.0.0-use.local + resolution: "tree-grapher@workspace:.yalc/tree-grapher" dependencies: "@types/d3-hierarchy": "npm:^3.0.2" d3-hierarchy: "npm:^3.1.1" @@ -12695,9 +12695,8 @@ __metadata: peerDependencies: react: ^17.0.2 react-dom: ^17.0.2 - checksum: dd797f61d187a956aa1d8f973e7356a75d3fa669c478d6465d4785d1f52e11a041f03beae51614b9ce681ae685f6c40c7385585b8016399bbe61a06703b51110 - languageName: node - linkType: hard + languageName: unknown + linkType: soft "tree-kill@npm:^1.2.2": version: 1.2.2 @@ -13649,7 +13648,7 @@ __metadata: languageName: node linkType: hard -"web-vcore@npm:0.0.103, web-vcore@workspace:.yalc/web-vcore": +"web-vcore@npm:0.0.104, web-vcore@workspace:.yalc/web-vcore": version: 0.0.0-use.local resolution: "web-vcore@workspace:.yalc/web-vcore" dependencies: @@ -13741,7 +13740,7 @@ __metadata: webpack-cli: "npm:5.1.4" webpack-dependency-tools: "npm:0.0.1" webpack-dev-middleware: "npm:7.0.0" - webpack-runtime-require: "npm:1.0.0" + webpack-runtime-require: "npm:2.0.0" webpack-string-replacer: "npm:0.0.20" peerDependencies: firebase: ^9.0.0 @@ -13832,7 +13831,7 @@ __metadata: languageName: node linkType: hard -"webpack-runtime-require@npm:1.0.0, webpack-runtime-require@workspace:.yalc/web-vcore/.yalc/webpack-runtime-require": +"webpack-runtime-require@npm:2.0.0, webpack-runtime-require@workspace:.yalc/web-vcore/.yalc/webpack-runtime-require": version: 0.0.0-use.local resolution: "webpack-runtime-require@workspace:.yalc/web-vcore/.yalc/webpack-runtime-require" languageName: unknown