Move manifest to the root

code-asher · code-asher · commit 45f70e741ffa · 2020-01-16T11:36:17.000-06:00
Fixes #1278.
diff --git a/src/browser/login.html b/src/browser/login.html
@@ -5,7 +5,7 @@
 		<meta http-equiv="Content-Security-Policy" content="default-src 'none'; style-src 'self' 'unsafe-inline'; script-src 'unsafe-inline'; manifest-src 'self'; img-src 'self';">
 		<title>Authenticate: code-server</title>
 		<link rel="icon" href="./static/out/vs/server/src/media/favicon.ico" type="image/x-icon" />
-		<link rel="manifest" href="./static/out/vs/server/src/media/manifest.json" crossorigin="use-credentials">
+		<link rel="manifest" href="./manifest.json" crossorigin="use-credentials">
 		<link rel="apple-touch-icon" href="./static/out/vs/server/src/media/code-server.png" />
 		<meta name="apple-mobile-web-app-capable" content="yes">
 		<link href="./static/out/vs/server/src/media/login.css" rel="stylesheet">
diff --git a/src/browser/workbench-build.html b/src/browser/workbench-build.html
@@ -20,7 +20,7 @@
 
 		<!-- Workbench Icon/Manifest/CSS -->
 		<link rel="icon" href="./static-{{COMMIT}}/out/vs/server/src/media/favicon.ico" type="image/x-icon" />
-		<link rel="manifest" href="./static-{{COMMIT}}/out/vs/server/src/media/manifest.json" crossorigin="use-credentials">
+		<link rel="manifest" href="./manifest.json" crossorigin="use-credentials">
 		<link data-name="vs/workbench/workbench.web.api" rel="stylesheet" href="./static-{{COMMIT}}/out/vs/workbench/workbench.web.api.css">
 		<link rel="apple-touch-icon" href="./static-{{COMMIT}}/out/vs/server/src/media/code-server.png" />
 		<meta name="apple-mobile-web-app-capable" content="yes">
diff --git a/src/browser/workbench.html b/src/browser/workbench.html
@@ -20,7 +20,7 @@
 
 		<!-- Workbench Icon/Manifest/CSS -->
 		<link rel="icon" href="./static/out/vs/server/src/media/favicon.ico" type="image/x-icon" />
-		<link rel="manifest" href="./static/out/vs/server/src/media/manifest.json" crossorigin="use-credentials">
+		<link rel="manifest" href="./manifest.json" crossorigin="use-credentials">
 	</head>
 
 	<body aria-label="">
diff --git a/src/node/server.ts b/src/node/server.ts
@@ -296,6 +296,12 @@ export abstract class Server {
 
 		switch (base) {
 			case "/":
+				switch (requestPath) {
+					case "/manifest.json":
+						const response = await this.getResource(this.serverRoot, "media", requestPath);
+						response.cache = true;
+						return response;
+				}
 				if (!this.authenticate(request)) {
 					return { redirect: "/login" };
 				}
