fix inline static replacements for code

Author: akosyakov

components/ide/code/leeway.Dockerfile

@@ -73,13 +73,14 @@ RUN yarn --cwd extensions compile \
     && yarn gulp vscode-reh-linux-x64-min
 
 # config for first layer needed by blobserve
-# we also remove `static/` from resource urls as that's needed by blobserve,
-# this custom urls will be then replaced by blobserve.
+# we also parametrize IDE and supervisors urls,
+# these urls will be then inlined by blobserve.
 # Check pkg/blobserve/blobserve.go, `inlineVars` method
 RUN cp /vscode-web/out/vs/gitpod/browser/workbench/workbench.html /vscode-web/index.html \
     && cp /vscode-web/out/vs/gitpod/browser/workbench/callback.html /vscode-web/callback.html \
-    && sed -i -e 's#baseUrl =.*;#baseUrl = window.location.origin;#g' /vscode-web/index.html \
-    && sed -i -e 's#{{WORKBENCH_WEB_BASE_URL}}#.#g' /vscode-web/index.html \
+    && sed -i -e 's#baseUrl =.*;#baseUrl = "${ide}";#g' /vscode-web/index.html \
+    && sed -i -e 's#{{WORKBENCH_WEB_BASE_URL}}#${ide}#g' /vscode-web/index.html \
+    && sed -i -e 's#/_supervisor/frontend#${supervisor}#g' /vscode-web/index.html \
     && sed -i -e "s/{{VERSION}}/$CODE_QUALITY-$CODE_COMMIT/g" /vscode-web/index.html
 
 # cli config: alises to gitpod-code

install/installer/pkg/components/blobserve/configmap.go

@@ -74,22 +74,24 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 						Replacement: fmt.Sprintf("ide.%s/code/marketplace.json", ctx.Config.Domain),
 						Path:        "/ide/out/vs/workbench/workbench.web.main.js",
 					}},
-					InlineStatic: []blobserve.InlineReplacement{{
-						Search:      "${window.location.origin}",
-						Replacement: ".",
-					}, {
-						Search:      "value.startsWith(window.location.origin)",
-						Replacement: "value.startsWith(window.location.origin) || value.startsWith('${ide}')",
-					}, {
-						Search:      "./out",
-						Replacement: "${ide}/out",
-					}, {
-						Search:      "./node_modules",
-						Replacement: "${ide}/node_modules",
-					}, {
-						Search:      "/_supervisor/frontend",
-						Replacement: "${supervisor}",
-					}},
+					InlineStatic: []blobserve.InlineReplacement{
+						// deprecated, instead replacement happens in the code image
+						{
+							Search:      "${window.location.origin}",
+							Replacement: ".",
+						}, {
+							Search:      "value.startsWith(window.location.origin)",
+							Replacement: "value.startsWith(window.location.origin) || value.startsWith('${ide}')",
+						}, {
+							Search:      "./out",
+							Replacement: "${ide}/out",
+						}, {
+							Search:      "./node_modules",
+							Replacement: "${ide}/node_modules",
+						}, {
+							Search:      "/_supervisor/frontend",
+							Replacement: "${supervisor}",
+						}},
 				},
 				ctx.RepoName(ctx.Config.Repository, workspace.SupervisorImage): {
 					PrePull: []string{},