improvement of residual-chart hover info

.env.embed

@@ -0,0 +1,12 @@
+GOOGLE_CLIENT_ID=""
+GOOGLE_CLIENT_SECRET=""
+GOOGLE_API_KEY=""
+GOOGLE_SERVER_API_KEY=""
+GOOGLE_APP_ID=""
+BASE_URL="."
+CURRENT_PYRET_RELEASE=""
+PYRET="./js/cpo-main.jarr.js"
+POSTMESSAGE_ORIGIN="*"
+SHARED_FETCH_SERVER="https://code.pyret.org"
+URL_FILE_MODE="all-remote"
+IMAGE_PROXY_BYPASS="true"

.env.example

@@ -13,4 +13,6 @@ PYRET="http://localhost:4999/js/cpo-main.jarr"
 PORT=4999
 NODE_ENV=development
 POSTMESSAGE_ORIGIN="http://localhost:3000"
-
+SHARED_FETCH_SERVER="https://code.pyret.org"
+URL_FILE_MODE="all-remote"
+IMAGE_PROXY_BYPASS="set to true to avoid image proxying through BASE_URL/downloadImg (the default)"

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "src/web/js/snap"]
-	path = src/web/js/snap
-	url = https://github.com/jmoenig/Snap.git
-	shallow = true

.travis.yml

@@ -1,4 +1,3 @@
-language: ruby
 dist: jammy
 sudo: required
 env:
@@ -16,6 +15,8 @@ env:
   - PORT=5000
   - SAUCE_TEST_TARGET="http://localhost:5000"
   - SAUCE_USERNAME="pyret-lang"
+  - POSTMESSAGE_ORIGIN="*"
+  - SHARED_FETCH_SERVER="https://code.pyret.org"
   - secure: e0vpQGmW0d69Ql72Mw6gsGsMxAKgt61ZNqsfQEtNlAGtx7CbTKe3xg8kF1ygwFVEB7GDmTaojTcSGbRwqqZ5GAa8dsTAkefhOtfCDV5KUjvXXbpo9J/8YLiZiIy7ksHyh1yhByvvWmZZpjmdxWwcH8gUqtpae3bGtz7rQX3jLf2v3OR5uVFt8vKRMSR9imCWmq6tpnu+GVoaCFOHjq3U7LS1h78R2LJz+MnTuCbDtYFlxp/sAyS7vSXssFScl6wqOsgH5PHlj+kaHhFWLhzsAzG1RoHftqqIeinXzDcYo8EC/c6O3hMf2KtHm/Hsh1dPR8GnE6WClxPw0xNbh10jVf7b1CXuzKGF8a1JlmtsVztiujsMswZGGLpTkqBvBAiuDsMOwKFNk7UrR5FA/0bVMMsluKxW/0UBzVPN9QyMKAs19ca1t/qT3abxYFyvXrDibKMLuS1uCCsZbwTkjkPwfWBzin8ohK2gLi+y24eQFSd27XWcmk+fJHfgJ458OgvczubK0CsyPAaJtCvRBYKvLQaEtkc4RkoM0yx6NhYYLCZqH1DRneam40rVSrVO41yT/PUnA5U64q16ptbn90Vgw/yKlp9OLtWKheBDTinwbst1kegbCSj4qZtORFLIQIUsZQN6SUm9tCACqFosDpRXAzURc2IOdsSUmtJEqvkijsc=
   - secure: "E19TyEFE1iQSRrZI4w6ahWgFGEFZBiUgxn/Pqq5sQwHlMNpai+bVydDRVlcQ0NsrdPmyXY/4+29wMjsAHbSaiBuqgG5PbtpChJK7a+8583G6CrbkWdZgwkMDpqPQ2IBEWVYeybvl36wuXJ4HNCqImPODWvX1Wxzk5RCK/gM4PNu3OdmQm3+6O8y1N6r0Y/lnqeAxhaZ5wv01/6EE3I3rAbnFxnu0wIJ7AfNV64VRk+tqwYuM5fLXrl6yhelSwp9q5CLEwvvYknBkklHAXbvxc2qo8XfZb6Zb701NyGvFW86Acgo1dytqV+BNmxNj4FfnXj+rxi/SDpiKEifzj5UYLIAgAx/qbxWSHD8SHiOL1WMa7N3vN2Dh+O+9vCLDwtpzbC0kJqxVMei8buAR4pLReZO0OsmHGXDPApoqOdxvQ0Z2VtEWojIWaJSIl0gTaWKAPAE6GMT0zRQcmm6GPXmLpWGc/9MZKJ5lTXQloucRaStRhPYV4x2HNF4vVZmJ0RWQexAX4qsUiaVFs0jdnJTDvgyPWj+f7qJaaqNFfXz9TyP2N8LSjPdGBYfkWIbkv8dXjJCufXX29BbOD5Yq1NcRQxgTnQO1cvXs1/MJOrK8tCAQ/rZUqQakBMg71fhznOm2lejiiingfnq846C1v27KxZzFLnGIOfDUbMAgS1sbGUU="
   - secure: "W74n+StLe0w+Lm6KNQN3lLzj4BFCy7vVSRCOQ3t5e3uSXDyLubqgRTXTXPoeypzcztbnMsd8Y57FyjJEaUydb2LPATEoJ9VbBy0ohXV/c3bucJSa4ZJxvb/8L62cepsZkRmoMl1HpW2kLWle50UdCLRqE0aGNHwM9FXfBAd279vmjmvPhFtGEiKkDek/ckroebG0n0xAox56ZmnuJM4boG3o0oUNjSE4U4W/RKMoApLJlUcEcdmWzJvOILeNvydFrHzQcSeHx6uH5LJg/N6RCHb++MI+BiUrAeGa0jm0YXFH0mdDmjCACAcRUzlyAGuadb2dAPcgKPV7xGyDJIn6+OD9dhwEGTGzyKr622fUcCa5+t4PERBFq7nYj7BU1CoqWUsYN6jArkH0ye7lA9usNZsHNXoykZkhpJYEoygYQg6mGnO0v0sRiUbv0BFQ4tN+l/ejvLfCiczjhuBgHlm7m0TUsH94dzeHFqGPlNGy75Rq9PM+0kxvN/TLY3udymKzpTJlbcaDvwQ37unBU2h7DpAYzscxyMcPbHo/F2lnmK/vlpSAsSjkdnpVp4Av+urn8G2eVJw+XnLWCQb4GIRsFzLfXOAPdhcQIZHfhiQTUXgFl+ahC2hEdC1sjho0yWWOHIhRoQ/5sLenB4hFTozxhbIKZTlyWI7FwuPnpWnhvAY="
@@ -46,6 +47,8 @@ before_install:
 - . $HOME/.nvm/nvm.sh
 - nvm install 18
 - nvm use 18
+- gem install nokogiri
+- gem install logger
 - export CHROME_VERSION=`curl https://googlechromelabs.github.io/chrome-for-testing/LATEST_RELEASE_STABLE `
 - curl https://storage.googleapis.com/chrome-for-testing-public/$CHROME_VERSION/linux64/chrome-linux64.zip -o chrome-linux64.zip
 - curl https://storage.googleapis.com/chrome-for-testing-public/$CHROME_VERSION/linux64/chromedriver-linux64.zip -o chromedriver-linux64.zip
@@ -62,12 +65,13 @@ before_deploy:
 install:
 - git submodule init
 - git submodule update
-- npm update # to update Pyret to the newest version
+- npm update pyret-lang # to update Pyret to the newest version
 - npm ci --ignore-scripts
 - make web
 - make deploy-cpo-main
 deploy:
   - provider: s3
+    edge: true
     access_key_id: AKIAIFY44WM3LGA4OQSQ
     secret_access_key:
       secure: X50U/xTxW1OOBL5rQ6k764xAitKS77+NZfzAGgOKbk/0REUJEg3BHCYCqhr6/AtThh42HKBNNuG029Xu/0wQYOJq9JNWms61g25/1ig6HbeeaJbbpRLdRDWp59UAeB8tUQmPgI34DxREe2zcJJpNErepbkQ0XXx2tULF3HWBLD7PPOv4Ylb78bfhteIGKNX8+Ipag0gCGmJiTr9OPp6FCQh7kWzG1DBfT8t6gZJM9rhvE1y0Myv1OmcT2zs5ZCvd/uJWz7iiGjs4VvOJVTTFYs733B1NX3Inv3vlbgNny46JT7vT5M0RMgulb8ypkkzLham43yuQyn3eIGKVLd3AcTUtdNTB1TP4be50wT/FAoj195Ec1JAsO9LCKz79JPbUvoxdh9C+k+H0B0SHbL+VXqIhZGWLYq0GE/LZfBESYKAeNq/WfoNtfFXIv1VO0rgbX2FU/jxoM7uROagDhfeLBdmYhQVj3O4rXpcUDHcebBEycXlmC5zOaqmANZ37Pc3QIoR1is2+hkNzeP1/NV4huYOmJFlrD7dADKXIsh6vSyp6uZ49tabMfqSe9oKbl41Yc+uHEBm2vPXUF9vmm0SLOZScjFNyvd04EOXxTCBCww+qlFeIeHTyw9NgEIsOgUWUX44ZNZJATLnxCE9EZ+Sp5MHGDH7Wz5ceR5tZh68P7kw=
@@ -81,6 +85,7 @@ deploy:
       repo: brownplt/code.pyret.org
       branch: horizon
   - provider: heroku
+    edge: true
     app: pyret-horizon
     api_key:
       secure: "S40lZzhfFnaBbSYTP1+1w/MkyPmsbUX2n/t1DSDBBi938PvE5ZjWHr+Ov7dgavpIDq+uxFazUH5tGSBkZHDAok1KwhUck1U6REQVpV7UCx1wJ0wNqrfEKIqFj2PqarBzTe+YMftHodQeQParhhqVwf0+qBJBZOeMXIUm6jUoTgV/uY7QPRLKHr3MR771kIffdGnzZSSFS+k2GYuQkdK8nIEFstBH8+r8nlcxc71Spw4ey62h3ybOxc2ilhLqw2E++cx89u7WF0XFisLv0iQzpuXAOkwpxe4YGX9pk3gnd3G4BzSU1baOgF35YD0QlyZ2xqB6bTu1GRPIL+dIgl1pauzJXS/DUywzrpINnN/TmW6j051V1as35F3EnjYxOxoFx7GfEleM/0sJLNkB0UKSm03hA9Y7zF194t2CBI+ebCpxgEO4e4hEUDaTfQkrLHBDWd/W4st8cblpizt+ozdnvi4d40x9y1+MB0o3lLw6U0qO/z98RS05bIBYxwLl1/dtUg4GjRe2gtbhOz9A1O+MDCDYono1eP8I4aIXFsYB2VqU6XCoxDLHKhnnec8930pxlyrWQmUTvOetnluZzGdxio/q0pOB2gnwjU7jFtMGT/yb85XDfXxCQZyD4dBArDdRmQhf3yjrRcyeLuCP+y7kiOfkVI38bOZf6lg1Z3K2YLM="

Makefile

@@ -14,12 +14,26 @@ else
 	RM = rm -f $1
 endif
 
-CM=node_modules/codemirror
-PYRET_MODE=node_modules/pyret-codemirror-mode
+NODE_MODULE = $(shell node -e "console.log(require('node:path').dirname(require.resolve('$1')))")
+
+
+# These paths get special treatment: their import paths have
+# trailing lib/ or mode/ or build/something at the end, but we need files from
+# other paths in them
+CM=$(call NODE_MODULE,codemirror)/..
+PYRET_MODE=$(call NODE_MODULE,pyret-codemirror-mode)/..
+PYRET=$(call NODE_MODULE,pyret-lang)/../..
+
 CPOMAIN=build/web/js/cpo-main.jarr
 CPOGZ=build/web/js/cpo-main.jarr.gz.js
 PHASEA=pyret/build/phaseA/pyret.jarr
 
+.PHONY : test_node_module
+test_node_module:
+	@echo $(call NODE_MODULE,codemirror)
+	@echo $(CM)
+
+
 BUNDLED_DEPS=build/web/js/bundled-npm-deps.js
 
 .PHONY : post-install
@@ -36,6 +50,11 @@ selenium-test-local:
 selenium-test-sauce:
 	TEST_LOC="sauce" node test/test.js test/browser/pyret
 
+build/web/editor.embed.html: src/web/editor.html .env.embed
+	node make-template.js $< .env.embed > $@
+build/web/editor.html: src/web/editor.html
+	cp $< $@
+
 OUT_HTML := $(patsubst src/web/%.template.html,build/web/views/%.html,$(wildcard src/web/*.template.html))
 
 build/web/views/%.html: src/web/%.template.html
@@ -52,10 +71,21 @@ build/web/css/%.css: src/web/css/%.template.css
 	node make-template.js $< > $@
 
 COPY_CSS := $(patsubst src/web/%.css,build/web/%.css,$(wildcard src/web/css/*.css))
-
 build/web/css/%.css: src/web/css/%.css
 	cp $< $@
 
+COPY_LIB_CSS := $(patsubst lib/css/%.css,build/web/css/%.css,$(wildcard lib/css/*.css))
+build/web/css/%.css: lib/css/%.css
+	cp $< $@
+
+COPY_LIB_CSS := $(patsubst lib/css/%.css,build/web/css/%.css,$(wildcard lib/css/*.css))
+build/web/css/%.css: lib/css/%.css
+	cp $< $@
+
+COPY_LIB_IMAGES := $(patsubst lib/css/images/%.png,build/web/css/images/%.png,$(wildcard lib/css/images/*.png))
+build/web/css/images/%.png: lib/css/images/%.png
+	cp $< $@
+
 COPY_THEMES := $(patsubst src/web/%.css,build/web/%.css,$(wildcard src/web/css/themes/*.css))
 
 build/web/css/themes/%.css: src/web/css/themes/%.css
@@ -103,6 +133,11 @@ COPY_JS := $(patsubst src/web/js/%.js,build/web/js/%.js,$(wildcard src/web/js/*.
 build/web/js/%.js: src/web/js/%.js
 	cp $< $@
 
+COPY_LIB_JS := $(patsubst lib/js/%.js,build/web/js/%.js,$(wildcard lib/js/*.js))
+
+build/web/js/%.js: lib/js/%.js
+	cp $< $@
+
 COPY_GOOGLE_JS := $(patsubst src/web/js/google-apis/%.js,build/web/js/google-apis/%.js,$(wildcard src/web/js/google-apis/*.js))
 
 build/web/js/google-apis/%.js: src/web/js/google-apis/%.js
@@ -111,7 +146,7 @@ build/web/js/google-apis/%.js: src/web/js/google-apis/%.js
 build/web/js/events.js: src/web/js/events.js
 	cp $< $@
 
-build/web/js/snap: src/web/js/snap
+build/web/js/snap: $(call NODE_MODULE,snap)
 	mkdir -p build/web/js/snap
 	cp -r $</src build/web/js/snap
 	cp -r $</pyret build/web/js/snap
@@ -126,28 +161,29 @@ build/web/js/beforePyret.js: src/web/js/beforePyret.js
 build/web/js/beforeBlocks.js: src/web/js/beforeBlocks.js
 	npx webpack
 
-build/web/js/q.js: node_modules/q/q.js
+
+build/web/js/q.js: $(call NODE_MODULE,q)/q.js
 	cp $< $@
 
-build/web/js/s-expression-lib.js: node_modules/s-expression/index.js
+build/web/js/s-expression-lib.js: $(call NODE_MODULE,s-expression)/index.js
 	cp $< $@
 
-build/web/js/colorspaces.js: node_modules/colorspaces/colorspaces.js
+build/web/js/colorspaces.js: $(call NODE_MODULE,colorspaces)/colorspaces.js
 	cp $< $@
 
-build/web/js/es6-shim.js: node_modules/es6-shim/es6-shim.min.js
+build/web/js/es6-shim.js: $(call NODE_MODULE,es6-shim)/es6-shim.min.js
 	cp $< $@
 
-build/web/js/seedrandom.js: node_modules/seedrandom/seedrandom.js
+build/web/js/seedrandom.js: $(call NODE_MODULE,seedrandom)/seedrandom.js
 	cp $< $@
 
-build/web/js/source-map.js: node_modules/source-map/dist/source-map.js
+build/web/js/source-map.js: $(call NODE_MODULE,source-map)/dist/source-map.js
 	cp $< $@
 
-build/web/js/url.js: node_modules/url.js/url.js
+build/web/js/url.js: $(call NODE_MODULE,url.js)/url.js
 	cp $< $@
 
-build/web/js/require.js: node_modules/requirejs/require.js
+build/web/js/require.js: $(call NODE_MODULE,requirejs)/r.js
 	cp $< $@
 
 build/web/js/codemirror.js: $(CM)/lib/codemirror.js
@@ -201,10 +237,10 @@ build/web/js/jump-to-line.js: $(CM)/addon/search/jump-to-line.js
 build/web/js/pyret-mode.js: $(PYRET_MODE)/mode/pyret.js
 	cp $< $@
 
-build/web/js/mousetrap.min.js: node_modules/mousetrap/mousetrap.min.js
+build/web/js/mousetrap.min.js: $(call NODE_MODULE,mousetrap)/mousetrap.min.js
 	cp $< $@
 
-build/web/js/mousetrap-global-bind.min.js: node_modules/mousetrap/plugins/global-bind/mousetrap-global-bind.min.js
+build/web/js/mousetrap-global-bind.min.js: $(call NODE_MODULE,mousetrap)/plugins/global-bind/mousetrap-global-bind.min.js
 	cp $< $@
 
 MISC_JS = build/web/js/q.js \
@@ -265,11 +301,11 @@ EDITOR_MISC_JS = build/web/js/q.js \
 		  build/web/js/authenticate-storage.js
 
 build/web/js/editor-misc.min.js: $(EDITOR_MISC_JS)
-	npm exec -- uglifyjs --compress -o $@ -- $^
+	npx uglifyjs --compress -o $@ -- $^
 
 MISC_IMG = build/web/img/pyret-icon.png build/web/img/pyret-logo.png build/web/img/pyret-spin.gif build/web/img/up-arrow.png build/web/img/down-arrow.png
 
-build/web/img/%: node_modules/pyret-lang/img/%
+build/web/img/%: $(PYRET)/img/%
 	cp $< $@
 
 COPY_ARR := $(patsubst ./pyret/src/arr/trove/%.arr,build/web/arr/%.arr,$(wildcard ./pyret/src/arr/trove/*.arr))
@@ -285,6 +321,7 @@ WEBJS = build/web/js
 WEBJSGOOG = build/web/js/google-apis
 WEBCSS = build/web/css
 WEBTHEMES = build/web/css/themes
+WEBIMAGES = build/web/css/images
 WEBFONTS = $(WEBCSS)/fonts
 WEBIMG = build/web/img
 WEBARR = build/web/arr
@@ -304,6 +341,9 @@ $(WEBJSGOOG):
 $(WEBCSS):
 	@$(call MKDIR,$(WEBCSS))
 
+$(WEBIMAGES):
+	@$(call MKDIR,$(WEBIMAGES))
+
 $(WEBTHEMES):
 	@$(call MKDIR,$(WEBTHEMES))
 
@@ -316,13 +356,13 @@ $(WEBIMG):
 $(WEBARR):
 	@$(call MKDIR,$(WEBARR))
 
-web-local: $(WEB) $(WEBV) $(WEBJS) $(WEBJSGOOG) $(WEBCSS) $(WEBTHEMES) $(WEBFONTS) $(WEBIMG) $(WEBARR) $(OUT_HTML) $(COPY_HTML) $(OUT_CSS) $(COPY_CSS) $(COPY_THEMES) $(COPY_FONTS) $(COPY_JS) $(COPY_ARR) $(COPY_GIF) $(COPY_SVG) $(COPY_PNG) $(MISC_JS) $(MISC_CSS) $(MISC_IMG) $(COPY_NEW_CSS) $(COPY_NEW_JS) $(COPY_GOOGLE_JS) $(CPOMAIN) $(CPOGZ) build/web/js/editor-misc.min.js build/web/js/snap build/web/js/transpile.xml
+web-local: $(WEB) $(WEBV) $(WEBJS) $(WEBJSGOOG) $(WEBCSS) $(WEBTHEMES) $(WEBFONTS) $(WEBIMG) $(WEBIMAGES) $(WEBARR) $(OUT_HTML) $(COPY_HTML) $(OUT_CSS) $(COPY_CSS) $(COPY_LIB_CSS) $(COPY_THEMES) $(COPY_FONTS) $(COPY_JS) $(COPY_LIB_JS) $(COPY_LIB_IMAGES) $(COPY_ARR) $(COPY_GIF) $(COPY_SVG) $(COPY_PNG) $(MISC_JS) $(MISC_CSS) $(MISC_IMG) $(COPY_NEW_CSS) $(COPY_NEW_JS) $(COPY_GOOGLE_JS) $(CPOMAIN) $(CPOGZ) build/web/js/editor-misc.min.js build/web/js/snap build/web/js/transpile.xml build/web/editor.html build/web/editor.embed.html 
 
-web: $(WEB) $(WEBV) $(WEBJS) $(WEBJSGOOG) $(WEBCSS) $(WEBTHEMES) $(WEBFONTS) $(WEBIMG) $(WEBARR) $(OUT_HTML) $(COPY_HTML) $(OUT_CSS) $(COPY_CSS) $(COPY_THEMES) $(COPY_FONTS) $(COPY_JS) $(COPY_ARR) $(COPY_GIF) $(COPY_SVG) $(COPY_PNG) $(MISC_JS) $(MISC_CSS) $(MISC_IMG) $(COPY_NEW_CSS) $(COPY_NEW_JS) $(COPY_GOOGLE_JS) build/web/js/editor-misc.min.js build/web/js/snap build/web/js/transpile.xml
+web: $(WEB) $(WEBV) $(WEBJS) $(WEBJSGOOG) $(WEBCSS) $(WEBTHEMES) $(WEBFONTS) $(WEBIMG) $(WEBIMAGES) $(WEBARR) $(OUT_HTML) $(COPY_HTML) $(OUT_CSS) $(COPY_CSS) $(COPY_LIB_CSS) $(COPY_THEMES) $(COPY_FONTS) $(COPY_JS) $(COPY_LIB_JS) $(COPY_LIB_IMAGES) $(COPY_ARR) $(COPY_GIF) $(COPY_SVG) $(COPY_PNG) $(MISC_JS) $(MISC_CSS) $(MISC_IMG) $(COPY_NEW_CSS) $(COPY_NEW_JS) $(COPY_GOOGLE_JS) build/web/js/editor-misc.min.js build/web/js/snap build/web/js/transpile.xml build/web/editor.html build/web/editor.embed.html
 
 link-pyret:
-	ln -s node_modules/pyret-lang pyret
-	(cd node_modules/pyret-lang && $(MAKE) phaseA-deps)
+	ln -s $(PYRET) pyret
+	(cd $(PYRET) && $(MAKE) phaseA-deps)
 
 deploy-cpo-main: link-pyret $(CPOMAIN) $(CPOGZ)
 
@@ -337,7 +377,7 @@ libpyret:
 
 $(BUNDLED_DEPS): src/scripts/npm-dependencies.js
 	# Explicitly exclude crypto, buffer, and stylus, nested npm dependencies that aren't needed
-	node_modules/.bin/browserify src/scripts/npm-dependencies.js -x crypto -x buffer -x stylus -o $(BUNDLED_DEPS)
+	npx browserify src/scripts/npm-dependencies.js -x crypto -x stylus -o $(BUNDLED_DEPS)
 
 $(CPOMAIN): $(BUNDLED_DEPS) $(TROVE_JS) $(TROVE_ARR) $(WEBJS) src/web/js/*.js src/web/arr/*.arr cpo-standalone.js cpo-config.json src/web/arr/cpo-main.arr $(PHASEA)
 	mkdir -p compiled/;
@@ -358,7 +398,8 @@ $(CPOMAIN): $(BUNDLED_DEPS) $(TROVE_JS) $(TROVE_ARR) $(WEBJS) src/web/js/*.js sr
 # NOTE(joe): Need to do .gz.js because Firefox doesn't like gzipped JS having a
 # non-.js extension.
 $(CPOGZ): $(CPOMAIN)
-	npm exec -- uglifyjs --compress -o $(CPOMAIN).min -- $(CPOMAIN)
+	cp $(CPOMAIN) $(CPOMAIN).js
+	npx uglifyjs --compress -o $(CPOMAIN).min -- $(CPOMAIN)
 	gzip -c -f $(CPOMAIN).min > $(CPOGZ)
 
 clean:

app.json

@@ -4,84 +4,13 @@
   "scripts": {
   },
   "env": {
-    "BASE_URL": {
-      "required": true
-    },
-    "BUILDPACK_URL": {
-      "required": true
-    },
-    "CLIENT_ID": {
-      "required": true
-    },
-    "CLIENT_SECRET": {
-      "required": true
-    },
-    "CSRF_TOKEN": {
-      "required": true
-    },
-    "CURRENT_PYRET_DOCS": {
-      "required": true
-    },
-    "CURRENT_PYRET_RELEASE": {
-      "required": true
-    },
-    "GIT_BRANCH": {
-      "required": true
-    },
-    "GIT_REV": {
-      "required": true
-    },
-    "google_api_key": {
-      "required": true
-    },
-    "GOOGLE_API_KEY": {
-      "required": true
-    },
-    "google_client_id": {
-      "required": true
-    },
-    "GOOGLE_CLIENT_ID": {
-      "required": true
-    },
-    "GOOGLE_CLIENT_SECRET": {
-      "required": true
-    },
-    "GOOGLE_SERVER_KEY": {
-      "required": true
-    },
-    "LOG_URL": {
-      "required": true
-    },
-    "NODE_ENV": {
-      "required": true
-    },
-    "OK_GOOGLE_IDS": {
-      "required": true
-    },
-    "PORT": {
-      "required": true
-    },
-    "PYRET": {
-      "required": true
-    },
-    "PYRET_BACKUP": {
-      "required": true
-    },
-    "PYRET_RELEASE_BASE": {
-      "required": true
-    },
-    "REDISCLOUD_CRIMSON_URL": {
-      "required": true
-    },
-    "REDISCLOUD_URL": {
-      "required": true
-    },
-    "SESSION_SECRET": {
-      "required": true
-    },
-    "USE_STANDALONE_PYRET": {
-      "required": true
-    }
+    "PYRET": "https://s3.amazonaws.com/pyret-horizon/on-raw-key/cpo-main.jarr.gz.js",
+    "REDISCLOUD_URL": "",
+    "GIT_BRANCH": "on-raw-key",
+    "GIT_REV": "on-raw-key-HEAD",
+    "PORT": "80",
+    "SESSION_SECRET": { "required": true },
+    "GOOGLE_CLIENT_ID": { "required": true }
   },
   "formation": {
     "web": {

cpo-config.json

@@ -21,6 +21,7 @@
     "pyret-base/js/post-load-hooks": "pyret/build/phaseA/js/post-load-hooks.js",
 
     "cpo/gdrive-locators": "src/web/js/gdrive-locators.js",
+    "cpo/file-locator": "src/web/js/file-locator.js",
     "cpo/http-imports": "src/web/js/http-imports.js",
     "cpo/guess-gas": "src/web/js/guess-gas.js",
     "cpo/cpo-builtin-modules": "src/web/js/cpo-builtin-modules.js",