Skip to content

Commit b1d8a3b

Browse files
ortaorta
committed
The rest
1 parent 6a13414 commit b1d8a3b

File tree

3 files changed

+182
-6
lines changed

3 files changed

+182
-6
lines changed

‎packages/typescriptlang-org/src/templates/play.tsx

+8-4
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import "reflect-metadata"
1717

1818
import playgroundReleases from "../../../sandbox/src/releases.json"
1919
import { getPlaygroundUrls } from "../lib/playgroundURLs"
20+
import Helmet from "react-helmet"
2021

2122
// This gets set by the playground
2223
declare const playground: ReturnType<typeof import("@typescript/playground").setupPlayground>
@@ -134,16 +135,16 @@ const Play: React.FC<Props> = (props) => {
134135
}
135136
});
136137

137-
re(["vs/editor/editor.main", "vs/language/typescript/tsWorker", "typescript-sandbox/index", "typescript-playground/index"], async (main: typeof import("monaco-editor"), tsWorker: any, sandbox: typeof import("@typescript/sandbox"), playground: typeof import("@typescript/playground")) => {
138+
re(["vs/editor/editor.main", "vs/language/typescript/tsWorker", "typescript-sandbox/index"], async (main: typeof import("monaco-editor"), tsWorker: any, sandbox: typeof import("@typescript/sandbox")) => {
138139
// Importing "vs/language/typescript/tsWorker" will set ts as a global
139140
const ts = (global as any).ts
140-
const isOK = main && ts && sandbox && playground
141+
const isOK = main && ts && sandbox
141142

142143
if (isOK) {
143144
document.getElementById("loader")!.parentNode?.removeChild(document.getElementById("loader")!)
144145
} else {
145146
console.error("Errr")
146-
console.error("main", !!main, "ts", !!ts, "sandbox", !!sandbox, "playground", !!playground)
147+
console.error("main", !!main, "ts", !!ts, "sandbox", !!sandbox)
147148
}
148149

149150
// Set the height of monaco to be either your window height or 600px - whichever is smallest
@@ -172,7 +173,7 @@ const Play: React.FC<Props> = (props) => {
172173
supportCustomPlugins: true
173174
}
174175

175-
playground.setupPlayground(sandboxEnv, main, playgroundConfig, i as any, React)
176+
window.setupPlayground(sandboxEnv, main, playgroundConfig, i as any, React)
176177

177178
// Dark mode faff
178179
const darkModeEnabled = document.documentElement.classList.contains("dark-theme")
@@ -191,6 +192,9 @@ const Play: React.FC<Props> = (props) => {
191192

192193
return (
193194
<Layout title={i("head_playground_title")} description={i("head_playground_description")} lang={props.pageContext.lang}>
195+
<Helmet>
196+
<script src="/js/playground/2/index.js"/>
197+
</Helmet>
194198
{/** This is the top nav, which is outside of the editor */}
195199
<nav className="navbar-sub">
196200
<ul className="nav">

‎watcher.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ function watcher(error, resp) {
121121
const packageJSON = JSON.parse(readFileSync(packageJSONPath, "utf8"))
122122
if (!packageJSON.scripts || !packageJSON.scripts.build) return
123123

124-
const buildCommand = `workspace ${packageJSON.name} run build`
125-
return buildCommand
124+
if (packageJSON.scripts["build-fast"]) return `workspace ${packageJSON.name} run build-fast`
125+
return `workspace ${packageJSON.name} run build`
126126
})
127127

128128
if (commandToRun[0]) {

‎yarn.lock

+172
Original file line numberDiff line numberDiff line change
@@ -5376,6 +5376,7 @@ __metadata:
53765376
dependencies:
53775377
"@types/jest": ^25.1.3
53785378
"@typescript/sandbox": 0.1.0
5379+
esbuild: ^0.13.4
53795380
jest: "*"
53805381
monaco-editor: ~0.20.0
53815382
monaco-typescript: ^3.7.0
@@ -11323,6 +11324,177 @@ __metadata:
1132311324
languageName: node
1132411325
linkType: hard
1132511326

11327+
"esbuild-android-arm64@npm:0.13.4":
11328+
version: 0.13.4
11329+
resolution: "esbuild-android-arm64@npm:0.13.4"
11330+
checksum: fe8fae42cc118891f798e57cfc0ca635debe8743a851ec687d4fead603ca273af0f8e00cbe5578aa2a29e87c5048ed96b84cdce6f6b0c742580f013abb7f005e
11331+
languageName: node
11332+
linkType: hard
11333+
11334+
"esbuild-darwin-64@npm:0.13.4":
11335+
version: 0.13.4
11336+
resolution: "esbuild-darwin-64@npm:0.13.4"
11337+
checksum: 0af8951ea816d48cdadb44ae25ca45cc411948e666850c20c7e1c429b10388c2eeff233ed32a09cc45b3ab19ec39dc359653f387e5756c62fc7a528efbed45aa
11338+
languageName: node
11339+
linkType: hard
11340+
11341+
"esbuild-darwin-arm64@npm:0.13.4":
11342+
version: 0.13.4
11343+
resolution: "esbuild-darwin-arm64@npm:0.13.4"
11344+
checksum: 78ef1e008b8374b5460b49ce434115338899806e8ffe80b29ffd12c9efd7e0f9c25e9c7448a168fc7e8a7baf2f0adf79a71f4078aecfa9461d69bef18ec1b28e
11345+
languageName: node
11346+
linkType: hard
11347+
11348+
"esbuild-freebsd-64@npm:0.13.4":
11349+
version: 0.13.4
11350+
resolution: "esbuild-freebsd-64@npm:0.13.4"
11351+
checksum: 1af815b638a101ad2c1919fda480e58be16071010d0f897f650263deb690027371aa434790e986e3a2a4586dba61aa03652a36f36d61d4526ca5f149222059e5
11352+
languageName: node
11353+
linkType: hard
11354+
11355+
"esbuild-freebsd-arm64@npm:0.13.4":
11356+
version: 0.13.4
11357+
resolution: "esbuild-freebsd-arm64@npm:0.13.4"
11358+
checksum: d904c71c81cf5ce62a1a605f630fa0a9001d26507c4560c9058a3c36f3ca0f0554f2f0284f72fabe9f7c9f91b241f4a80992203226bae261fd7b7a14becdb9a0
11359+
languageName: node
11360+
linkType: hard
11361+
11362+
"esbuild-linux-32@npm:0.13.4":
11363+
version: 0.13.4
11364+
resolution: "esbuild-linux-32@npm:0.13.4"
11365+
checksum: b2259163fbe9fd8fff297b6b48558f56edd5cc42f0b441bb998b421aac229511d4580a739bf1426dace322b08649da3b3bbc15743b0da094f7e3618aa9d872e0
11366+
languageName: node
11367+
linkType: hard
11368+
11369+
"esbuild-linux-64@npm:0.13.4":
11370+
version: 0.13.4
11371+
resolution: "esbuild-linux-64@npm:0.13.4"
11372+
checksum: c50ec9b20d9a6c19f11bc96d49aa17a900d5e76ffd65677a3595177f474cb6c9d37e6acc944957f01ed8b4721d140d0ebfffa8bb1957576bd68751f7abc19065
11373+
languageName: node
11374+
linkType: hard
11375+
11376+
"esbuild-linux-arm64@npm:0.13.4":
11377+
version: 0.13.4
11378+
resolution: "esbuild-linux-arm64@npm:0.13.4"
11379+
checksum: 7ee5f90cfd0db68752266c9b77ff5306e394247120dd45feaa67d772deea2659ef8c7844a6b8d0d682b19e69b69434a0f6df6624405b7e84787141c398154854
11380+
languageName: node
11381+
linkType: hard
11382+
11383+
"esbuild-linux-arm@npm:0.13.4":
11384+
version: 0.13.4
11385+
resolution: "esbuild-linux-arm@npm:0.13.4"
11386+
checksum: 74ad54da2535c6bb0fc20af356be8c3edc11c1f7d7a3cef06fb02bf0e4a94c508b8242a1e7cbbfe3ff7a6587efa3bb40300034d73099a87f98a03de3d9b88d3c
11387+
languageName: node
11388+
linkType: hard
11389+
11390+
"esbuild-linux-mips64le@npm:0.13.4":
11391+
version: 0.13.4
11392+
resolution: "esbuild-linux-mips64le@npm:0.13.4"
11393+
checksum: d7e750313414abb77470180b246c2236171ba405c6093ef33fbba5019df6ae3f7b6cbd465e8af89ea9b2f56588057ce32a2a77d597cbf90ee80041599d65cb15
11394+
languageName: node
11395+
linkType: hard
11396+
11397+
"esbuild-linux-ppc64le@npm:0.13.4":
11398+
version: 0.13.4
11399+
resolution: "esbuild-linux-ppc64le@npm:0.13.4"
11400+
checksum: 643d44618d6dc734ca19953a70ec60491564f764fa5a091c9786eb070a99ee9a429d3c2271a467fa09ff4b4859a02f506974f069d6c4ef0e9d22c5e74a57a0c5
11401+
languageName: node
11402+
linkType: hard
11403+
11404+
"esbuild-openbsd-64@npm:0.13.4":
11405+
version: 0.13.4
11406+
resolution: "esbuild-openbsd-64@npm:0.13.4"
11407+
checksum: 76e3378f7f523a85f86d8df4363b6409ebeb57b3bd60f337eb7662428f937f4a214ebe87e2b2f8e44ba34328cff2b460218778175a2ac06ca5eada204c132a64
11408+
languageName: node
11409+
linkType: hard
11410+
11411+
"esbuild-sunos-64@npm:0.13.4":
11412+
version: 0.13.4
11413+
resolution: "esbuild-sunos-64@npm:0.13.4"
11414+
checksum: 6b0b93b268b5e8b9cf041104c94ba2cbb8ac5c6bbd7ff254a147c105a930023b2c9c8299dc6deeec15f06b8ea052015f7c05fd7e1d298c8dd7ac7c8470c62fc0
11415+
languageName: node
11416+
linkType: hard
11417+
11418+
"esbuild-windows-32@npm:0.13.4":
11419+
version: 0.13.4
11420+
resolution: "esbuild-windows-32@npm:0.13.4"
11421+
checksum: 7b23a8c4341ddc0217bf83d53935c114645a86459a7c1545919dfc6a4e34627803a9791c03e61cc6b756c3827b844a877793a8e65186d7603b591ee75b6c40c1
11422+
languageName: node
11423+
linkType: hard
11424+
11425+
"esbuild-windows-64@npm:0.13.4":
11426+
version: 0.13.4
11427+
resolution: "esbuild-windows-64@npm:0.13.4"
11428+
checksum: c591f43f5a9f44c3e55d93dbfc66b55d7186292009de1ed5a6ea0fb7c0ef3d1c3e5ef9a80959a850ea4918df5eddb3c10b86d2ae032e93f77f6667ab882933ae
11429+
languageName: node
11430+
linkType: hard
11431+
11432+
"esbuild-windows-arm64@npm:0.13.4":
11433+
version: 0.13.4
11434+
resolution: "esbuild-windows-arm64@npm:0.13.4"
11435+
checksum: 1fa11db147a2036a49abea32c5379db05420e185ed09a715af09073a08fe5d810d39991b60f154e593513fbcc33bc7b5167028d846de847bc8fcb3a4ab0cfe8b
11436+
languageName: node
11437+
linkType: hard
11438+
11439+
"esbuild@npm:^0.13.4":
11440+
version: 0.13.4
11441+
resolution: "esbuild@npm:0.13.4"
11442+
dependencies:
11443+
esbuild-android-arm64: 0.13.4
11444+
esbuild-darwin-64: 0.13.4
11445+
esbuild-darwin-arm64: 0.13.4
11446+
esbuild-freebsd-64: 0.13.4
11447+
esbuild-freebsd-arm64: 0.13.4
11448+
esbuild-linux-32: 0.13.4
11449+
esbuild-linux-64: 0.13.4
11450+
esbuild-linux-arm: 0.13.4
11451+
esbuild-linux-arm64: 0.13.4
11452+
esbuild-linux-mips64le: 0.13.4
11453+
esbuild-linux-ppc64le: 0.13.4
11454+
esbuild-openbsd-64: 0.13.4
11455+
esbuild-sunos-64: 0.13.4
11456+
esbuild-windows-32: 0.13.4
11457+
esbuild-windows-64: 0.13.4
11458+
esbuild-windows-arm64: 0.13.4
11459+
dependenciesMeta:
11460+
esbuild-android-arm64:
11461+
optional: true
11462+
esbuild-darwin-64:
11463+
optional: true
11464+
esbuild-darwin-arm64:
11465+
optional: true
11466+
esbuild-freebsd-64:
11467+
optional: true
11468+
esbuild-freebsd-arm64:
11469+
optional: true
11470+
esbuild-linux-32:
11471+
optional: true
11472+
esbuild-linux-64:
11473+
optional: true
11474+
esbuild-linux-arm:
11475+
optional: true
11476+
esbuild-linux-arm64:
11477+
optional: true
11478+
esbuild-linux-mips64le:
11479+
optional: true
11480+
esbuild-linux-ppc64le:
11481+
optional: true
11482+
esbuild-openbsd-64:
11483+
optional: true
11484+
esbuild-sunos-64:
11485+
optional: true
11486+
esbuild-windows-32:
11487+
optional: true
11488+
esbuild-windows-64:
11489+
optional: true
11490+
esbuild-windows-arm64:
11491+
optional: true
11492+
bin:
11493+
esbuild: bin/esbuild
11494+
checksum: 0bde4a312a0a2f2da83254f2bb4c716bd75c18eb7351733c0b3039f54a90e28e1777d89dc0abeccb1f102a31e3bfd35751458bed669d5cb8439cf2d8d514de7f
11495+
languageName: node
11496+
linkType: hard
11497+
1132611498
"escalade@npm:^3.0.2, escalade@npm:^3.1.1":
1132711499
version: 3.1.1
1132811500
resolution: "escalade@npm:3.1.1"

0 commit comments

Comments
 (0)