Skip to content

Commit 069c523

Browse files
code-ashercode-asher
committed
Move VS Code to the root
1 parent c146457 commit 069c523

File tree

20 files changed

+297
-266
lines changed

20 files changed

+297
-266
lines changed

‎ci/build.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ class Builder {
353353
hmr: false,
354354
logLevel: 1,
355355
outDir: path.join(this.rootPath, out),
356-
publicUrl: `/static-${commit || "development"}/dist`,
356+
publicUrl: `/static/${commit || "development"}/dist`,
357357
target: "browser",
358358
},
359359
)

‎ci/vscode.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2968,7 +2968,7 @@ index bbb72e9511..0785d3391d 100644
29682968
-registerSingleton(IExtensionStoragePaths, class extends NotImplementedProxy(IExtensionStoragePaths) { whenReady = Promise.resolve(); });
29692969
+registerSingleton(IExtensionStoragePaths, ExtensionStoragePaths);
29702970
diff --git a/src/vs/workbench/services/extensions/worker/extensionHostWorkerMain.ts b/src/vs/workbench/services/extensions/worker/extensionHostWorkerMain.ts
2971-
index 79455414c0..5ba66b2d83 100644
2971+
index 79455414c0..a407593b4d 100644
29722972
--- a/src/vs/workbench/services/extensions/worker/extensionHostWorkerMain.ts
29732973
+++ b/src/vs/workbench/services/extensions/worker/extensionHostWorkerMain.ts
29742974
@@ -14,7 +14,11 @@
@@ -2978,8 +2978,8 @@ index 79455414c0..5ba66b2d83 100644
29782978
- catchError: true
29792979
+ catchError: true,
29802980
+ paths: {
2981-
+ '@coder/node-browser': `../../static-{{COMMIT}}/node_modules/@coder/node-browser/out/client/client.js`,
2982-
+ '@coder/requirefs': `../../static-{{COMMIT}}/node_modules/@coder/requirefs/out/requirefs.js`,
2981+
+ '@coder/node-browser': `../node_modules/@coder/node-browser/out/client/client.js`,
2982+
+ '@coder/requirefs': `../node_modules/@coder/requirefs/out/requirefs.js`,
29832983
+ }
29842984
});
29852985

‎src/browser/media/manifest.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,32 @@
77
"description": "Run editors on a remote server.",
88
"icons": [
99
{
10-
"src": "{{BASE}}/static-{{COMMIT}}/src/browser/media/pwa-icon-96.png",
10+
"src": "{{BASE}}/static/{{COMMIT}}/src/browser/media/pwa-icon-96.png",
1111
"type": "image/png",
1212
"sizes": "96x96"
1313
},
1414
{
15-
"src": "{{BASE}}/static-{{COMMIT}}/src/browser/media/pwa-icon-128.png",
15+
"src": "{{BASE}}/static/{{COMMIT}}/src/browser/media/pwa-icon-128.png",
1616
"type": "image/png",
1717
"sizes": "128x128"
1818
},
1919
{
20-
"src": "{{BASE}}/static-{{COMMIT}}/src/browser/media/pwa-icon-192.png",
20+
"src": "{{BASE}}/static/{{COMMIT}}/src/browser/media/pwa-icon-192.png",
2121
"type": "image/png",
2222
"sizes": "192x192"
2323
},
2424
{
25-
"src": "{{BASE}}/static-{{COMMIT}}/src/browser/media/pwa-icon-256.png",
25+
"src": "{{BASE}}/static/{{COMMIT}}/src/browser/media/pwa-icon-256.png",
2626
"type": "image/png",
2727
"sizes": "256x256"
2828
},
2929
{
30-
"src": "{{BASE}}/static-{{COMMIT}}/src/browser/media/pwa-icon-384.png",
30+
"src": "{{BASE}}/static/{{COMMIT}}/src/browser/media/pwa-icon-384.png",
3131
"type": "image/png",
3232
"sizes": "384x384"
3333
},
3434
{
35-
"src": "{{BASE}}/static-{{COMMIT}}/src/browser/media/pwa-icon-512.png",
35+
"src": "{{BASE}}/static/{{COMMIT}}/src/browser/media/pwa-icon-512.png",
3636
"type": "image/png",
3737
"sizes": "512x512"
3838
}

‎src/browser/pages/app.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
/>
99
<meta http-equiv="Content-Security-Policy" content="style-src 'self'; manifest-src 'self'; img-src 'self' data:;" />
1010
<title>code-server — {{APP_NAME}}</title>
11-
<link rel="icon" href="{{BASE}}/static-{{COMMIT}}/src/browser/media/favicon.ico" type="image/x-icon" />
11+
<link rel="icon" href="{{BASE}}/static/{{COMMIT}}/src/browser/media/favicon.ico" type="image/x-icon" />
1212
<link
1313
rel="manifest"
14-
href="{{BASE}}/static-{{COMMIT}}/src/browser/media/manifest.json"
14+
href="{{BASE}}/static/{{COMMIT}}/src/browser/media/manifest.json"
1515
crossorigin="use-credentials"
1616
/>
17-
<link rel="apple-touch-icon" href="{{BASE}}/static-{{COMMIT}}/src/browser/media/code-server.png" />
18-
<link href="{{BASE}}/static-{{COMMIT}}/dist/app.css" rel="stylesheet" />
17+
<link rel="apple-touch-icon" href="{{BASE}}/static/{{COMMIT}}/src/browser/media/code-server.png" />
18+
<link href="{{BASE}}/static/{{COMMIT}}/dist/app.css" rel="stylesheet" />
1919
<meta id="coder-options" data-settings="{{OPTIONS}}" />
2020
</head>
2121
<body>
22-
<script src="{{BASE}}/static-{{COMMIT}}/dist/register.js"></script>
23-
<script src="{{BASE}}/static-{{COMMIT}}/dist/app.js"></script>
22+
<script src="{{BASE}}/static/{{COMMIT}}/dist/register.js"></script>
23+
<script src="{{BASE}}/static/{{COMMIT}}/dist/app.js"></script>
2424
</body>
2525
</html>

‎src/browser/pages/error.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
/>
99
<meta http-equiv="Content-Security-Policy" content="style-src 'self'; manifest-src 'self'; img-src 'self' data:;" />
1010
<title>{{ERROR_TITLE}} - code-server</title>
11-
<link rel="icon" href="{{BASE}}/static-{{COMMIT}}/src/browser/media/favicon.ico" type="image/x-icon" />
11+
<link rel="icon" href="{{BASE}}/static/{{COMMIT}}/src/browser/media/favicon.ico" type="image/x-icon" />
1212
<link
1313
rel="manifest"
14-
href="{{BASE}}/static-{{COMMIT}}/src/browser/media/manifest.json"
14+
href="{{BASE}}/static/{{COMMIT}}/src/browser/media/manifest.json"
1515
crossorigin="use-credentials"
1616
/>
17-
<link rel="apple-touch-icon" href="{{BASE}}/static-{{COMMIT}}/src/browser/media/code-server.png" />
18-
<link href="{{BASE}}/static-{{COMMIT}}/dist/app.css" rel="stylesheet" />
17+
<link rel="apple-touch-icon" href="{{BASE}}/static/{{COMMIT}}/src/browser/media/code-server.png" />
18+
<link href="{{BASE}}/static/{{COMMIT}}/dist/app.css" rel="stylesheet" />
1919
<meta id="coder-options" data-settings="{{OPTIONS}}" />
2020
</head>
2121
<body>
@@ -30,6 +30,6 @@ <h2 class="header">{{ERROR_HEADER}}</h2>
3030
</div>
3131
</div>
3232
</div>
33-
<script src="{{BASE}}/static-{{COMMIT}}/dist/register.js"></script>
33+
<script src="{{BASE}}/static/{{COMMIT}}/dist/register.js"></script>
3434
</body>
3535
</html>

‎src/browser/pages/home.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
/>
99
<meta http-equiv="Content-Security-Policy" content="style-src 'self'; manifest-src 'self'; img-src 'self' data:;" />
1010
<title>code-server</title>
11-
<link rel="icon" href="{{BASE}}/static-{{COMMIT}}/src/browser/media/favicon.ico" type="image/x-icon" />
11+
<link rel="icon" href="{{BASE}}/static/{{COMMIT}}/src/browser/media/favicon.ico" type="image/x-icon" />
1212
<link
1313
rel="manifest"
14-
href="{{BASE}}/static-{{COMMIT}}/src/browser/media/manifest.json"
14+
href="{{BASE}}/static/{{COMMIT}}/src/browser/media/manifest.json"
1515
crossorigin="use-credentials"
1616
/>
17-
<link rel="apple-touch-icon" href="{{BASE}}/static-{{COMMIT}}/src/browser/media/code-server.png" />
18-
<link href="{{BASE}}/static-{{COMMIT}}/dist/app.css" rel="stylesheet" />
17+
<link rel="apple-touch-icon" href="{{BASE}}/static/{{COMMIT}}/src/browser/media/code-server.png" />
18+
<link href="{{BASE}}/static/{{COMMIT}}/dist/app.css" rel="stylesheet" />
1919
<meta id="coder-options" data-settings="{{OPTIONS}}" />
2020
</head>
2121
<body>
@@ -70,6 +70,6 @@ <h2 class="main">Version</h2>
7070
</div>
7171
</div>
7272
</div>
73-
<script src="{{BASE}}/static-{{COMMIT}}/dist/register.js"></script>
73+
<script src="{{BASE}}/static/{{COMMIT}}/dist/register.js"></script>
7474
</body>
7575
</html>

‎src/browser/pages/login.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
content="style-src 'self'; script-src 'self' 'unsafe-inline'; manifest-src 'self'; img-src 'self' data:;"
1212
/>
1313
<title>code-server login</title>
14-
<link rel="icon" href="{{BASE}}/static-{{COMMIT}}/src/browser/media/favicon.ico" type="image/x-icon" />
14+
<link rel="icon" href="{{BASE}}/static/{{COMMIT}}/src/browser/media/favicon.ico" type="image/x-icon" />
1515
<link
1616
rel="manifest"
17-
href="{{BASE}}/static-{{COMMIT}}/src/browser/media/manifest.json"
17+
href="{{BASE}}/static/{{COMMIT}}/src/browser/media/manifest.json"
1818
crossorigin="use-credentials"
1919
/>
20-
<link rel="apple-touch-icon" href="{{BASE}}/static-{{COMMIT}}/src/browser/media/code-server.png" />
21-
<link href="{{BASE}}/static-{{COMMIT}}/dist/app.css" rel="stylesheet" />
20+
<link rel="apple-touch-icon" href="{{BASE}}/static/{{COMMIT}}/src/browser/media/code-server.png" />
21+
<link href="{{BASE}}/static/{{COMMIT}}/dist/app.css" rel="stylesheet" />
2222
<meta id="coder-options" data-settings="{{OPTIONS}}" />
2323
</head>
2424
<body>
@@ -50,7 +50,7 @@ <h1 class="main">Welcome to code-server</h1>
5050
</div>
5151
</div>
5252
</body>
53-
<script src="{{BASE}}/static-{{COMMIT}}/dist/register.js"></script>
53+
<script src="{{BASE}}/static/{{COMMIT}}/dist/register.js"></script>
5454
<script>
5555
const parts = window.location.pathname.replace(/^\//g, "").split("/")
5656
parts[parts.length - 1] = "{{BASE}}"

‎src/browser/pages/update.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
/>
99
<meta http-equiv="Content-Security-Policy" content="style-src 'self'; manifest-src 'self'; img-src 'self' data:;" />
1010
<title>code-server</title>
11-
<link rel="icon" href="{{BASE}}/static-{{COMMIT}}/src/browser/media/favicon.ico" type="image/x-icon" />
11+
<link rel="icon" href="{{BASE}}/static/{{COMMIT}}/src/browser/media/favicon.ico" type="image/x-icon" />
1212
<link
1313
rel="manifest"
14-
href="{{BASE}}/static-{{COMMIT}}/src/browser/media/manifest.json"
14+
href="{{BASE}}/static/{{COMMIT}}/src/browser/media/manifest.json"
1515
crossorigin="use-credentials"
1616
/>
17-
<link rel="apple-touch-icon" href="{{BASE}}/static-{{COMMIT}}/src/browser/media/code-server.png" />
18-
<link href="{{BASE}}/static-{{COMMIT}}/dist/app.css" rel="stylesheet" />
17+
<link rel="apple-touch-icon" href="{{BASE}}/static/{{COMMIT}}/src/browser/media/code-server.png" />
18+
<link href="{{BASE}}/static/{{COMMIT}}/dist/app.css" rel="stylesheet" />
1919
<meta id="coder-options" data-settings="{{OPTIONS}}" />
2020
</head>
2121
<body>
@@ -33,6 +33,6 @@ <h1 class="main">Update</h1>
3333
</div>
3434
</div>
3535
</div>
36-
<script src="{{BASE}}/static-{{COMMIT}}/dist/register.js"></script>
36+
<script src="{{BASE}}/static/{{COMMIT}}/dist/register.js"></script>
3737
</body>
3838
</html>

‎src/browser/pages/vscode.html

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,21 @@
2525
<meta id="vscode-remote-nls-configuration" data-settings="{{NLS_CONFIGURATION}}" />
2626

2727
<!-- Workbench Icon/Manifest/CSS -->
28-
<link rel="icon" href="{{BASE}}/static-{{COMMIT}}/src/browser/media/favicon.ico" type="image/x-icon" />
28+
<link rel="icon" href="{{BASE}}/static/{{COMMIT}}/src/browser/media/favicon.ico" type="image/x-icon" />
2929
<link
3030
rel="manifest"
31-
href="{{BASE}}/static-{{COMMIT}}/src/browser/media/manifest.json"
31+
href="{{BASE}}/static/{{COMMIT}}/src/browser/media/manifest.json"
3232
crossorigin="use-credentials"
3333
/>
3434
<!-- PROD_ONLY
35-
<link data-name="vs/workbench/workbench.web.api" rel="stylesheet" href="{{VS_BASE}}/static-{{COMMIT}}/out/vs/workbench/workbench.web.api.css">
35+
<link data-name="vs/workbench/workbench.web.api" rel="stylesheet" href="{{BASE}}/static/{{COMMIT}}/lib/vscode/out/vs/workbench/workbench.web.api.css">
3636
END_PROD_ONLY -->
37-
<link rel="apple-touch-icon" href="{{BASE}}/static-{{COMMIT}}/src/browser/media/code-server.png" />
37+
<link rel="apple-touch-icon" href="{{BASE}}/static/{{COMMIT}}/src/browser/media/code-server.png" />
3838
<meta name="apple-mobile-web-app-capable" content="yes" />
3939

4040
<!-- Prefetch to avoid waterfall -->
4141
<!-- PROD_ONLY
42-
<link rel="prefetch" href="{{VS_BASE}}/static-{{COMMIT}}/node_modules/semver-umd/lib/semver-umd.js">
42+
<link rel="prefetch" href="{{BASE}}/static/{{COMMIT}}/lib/vscode/node_modules/semver-umd/lib/semver-umd.js">
4343
END_PROD_ONLY -->
4444

4545
<meta id="coder-options" data-settings="{{OPTIONS}}" />
@@ -50,11 +50,11 @@
5050
<!-- Startup (do not modify order of script tags!) -->
5151
<script>
5252
const parts = window.location.pathname.replace(/^\//g, "").split("/")
53-
parts[parts.length - 1] = "{{VS_BASE}}"
53+
parts[parts.length - 1] = "{{BASE}}"
5454
const url = new URL(window.location.origin + "/" + parts.join("/"))
5555
const el = document.getElementById("vscode-remote-commit")
5656
const commit = el ? el.getAttribute("data-settings") : ""
57-
const staticBase = url.href + "/static-" + commit
57+
const staticBase = url.href + "/static/" + commit + "/lib/vscode"
5858
let nlsConfig
5959
try {
6060
nlsConfig = JSON.parse(document.getElementById("vscode-remote-nls-configuration").getAttribute("data-settings"))
@@ -93,11 +93,11 @@
9393
"vs/nls": nlsConfig,
9494
}
9595
</script>
96-
<script src="{{BASE}}/static-{{COMMIT}}/dist/register.js"></script>
97-
<script src="{{VS_BASE}}/static-{{COMMIT}}/out/vs/loader.js"></script>
96+
<script src="{{BASE}}/static/{{COMMIT}}/dist/register.js"></script>
97+
<script src="{{BASE}}/static/{{COMMIT}}/lib/vscode/out/vs/loader.js"></script>
9898
<!-- PROD_ONLY
99-
<script src="{{VS_BASE}}/static-{{COMMIT}}/out/vs/workbench/workbench.web.api.nls.js"></script>
100-
<script src="{{VS_BASE}}/static-{{COMMIT}}/out/vs/workbench/workbench.web.api.js"></script>
99+
<script src="{{BASE}}/static/{{COMMIT}}/lib/vscode/out/vs/workbench/workbench.web.api.nls.js"></script>
100+
<script src="{{BASE}}/static/{{COMMIT}}/lib/vscode/out/vs/workbench/workbench.web.api.js"></script>
101101
END_PROD_ONLY -->
102102
<script>
103103
require(["vs/code/browser/workbench/workbench"], function() {})

‎src/browser/register.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { getOptions, normalize } from "../common/util"
33
const options = getOptions()
44

55
if ("serviceWorker" in navigator) {
6-
const path = normalize(`${options.base}/static-${options.commit}/dist/serviceWorker.js`)
6+
const path = normalize(`${options.base}/static/${options.commit}/dist/serviceWorker.js`)
77
navigator.serviceWorker
88
.register(path, {
99
scope: options.base || "/",

0 commit comments

Comments
 (0)