Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
docker pull ${NGINX_IMAGE_LATEST} || true
- name: Build images
run: |
docker-compose -f docker-compose.yml -f docker-compose.prod.yml build
docker compose -f docker-compose.yml -f docker-compose.prod.yml build
- name: Push images
run: |
docker push ${AUTH_IMAGE}
Expand Down Expand Up @@ -105,5 +105,5 @@ jobs:
docker pull $AUTH_IMAGE
docker pull $MIGRATION_IMAGE
docker pull $NGINX_IMAGE
docker-compose -f docker-compose.yml -f docker-compose.prod.yml up --no-build -d
ENDSSH
docker compose -f docker-compose.yml -f docker-compose.prod.yml up --no-build -d
ENDSSH
76,222 changes: 76,222 additions & 0 deletions client/public/toplevel_5_3_0.js

Large diffs are not rendered by default.

12 changes: 8 additions & 4 deletions client/src_editor/CompilerVersion.re
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
type t =
| V4_06
| V4_13_1;
| V4_13_1
| V5_3_0;

let current = V4_13_1;
let current = V5_3_0;

let ofDbString =
fun
| "4.06" => V4_06
| "4.13.1" => V4_13_1
| "5.3.0" => V5_3_0
| _ => V4_06;

let toDbString =
fun
| V4_06 => "4.06"
| V4_13_1 => "4.13.1";
| V4_13_1 => "4.13.1"
| V5_3_0 => "5.3.0";

let toUiString =
fun
| V4_06 => "4.06"
| V4_13_1 => "4.13.1";
| V4_13_1 => "4.13.1"
| V5_3_0 => "5.3.0";
4 changes: 4 additions & 0 deletions client/src_worker/Toplevel.re
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,14 @@ module Types = {
[@bs.new] [@bs.module]
external make_413: unit => Worker.worker = "./Toplevel_Worker_4_13.bs.js";

[@bs.new] [@bs.module]
external make_5_3_0: unit => Worker.worker = "./Toplevel_Worker_5_3_0.bs.js";

let make = (~compilerVersion) => {
switch (compilerVersion) {
| CompilerVersion.V4_06 => make_406()
| V4_13_1 => make_413()
| V5_3_0 => make_5_3_0()
};
};
};
Expand Down
2 changes: 2 additions & 0 deletions client/src_worker/Toplevel_Consumer.re
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ open Toplevel.Types;
let timeoutSeconds = ref(180);
let toplevelWorker406 = ref(None);
let toplevelWorker413 = ref(None);
let toplevelWorker5_3_0 = ref(None);

module MapStr = Belt.MutableMap.String;

Expand Down Expand Up @@ -70,6 +71,7 @@ let getWorkerRef = (~compilerVersion) =>
switch (compilerVersion) {
| CompilerVersion.V4_06 => toplevelWorker406
| V4_13_1 => toplevelWorker413
| V5_3_0 => toplevelWorker5_3_0
};

let getWorker = (~compilerVersion) => {
Expand Down
32 changes: 32 additions & 0 deletions client/src_worker/Toplevel_Worker_5_3_0.re
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
open Toplevel.Types;
open Toplevel.Worker;

[@bs.module] external toplevelPath: string = "../public/toplevel_5_3_0.js";
importScripts(toplevelPath);

postMessageFromWorker({w_id: "ready", w_message: Ready});

module Analyze = Worker_Analyze.Make(Worker_BrowserEvaluator);
module Refmt = Worker_Refmt.Make(Worker_BrowserEvaluator);

self->onMessageFromTop(event => {
let {t_id, t_message} = event##data;
let result =
switch (t_message) {
| Execute(lang, blocks, links) =>
ExecuteResult(
Belt.Result.Ok(Analyze.executeMany(. lang, blocks, links)),
)
| Refmt(lang, blocks) =>
RefmtResult(Belt.Result.Ok(Refmt.refmtMany(lang, blocks)))
| ExecuteEmbed(lang, code) =>
let result = Analyze.executeEmbed(. lang, code);
ExecuteEmbedResult(Belt.Result.Ok(result));
| LoadScript(string) =>
try(importScripts(string)) {
| Js.Exn.Error(exn) => Js.log(exn)
};
LoadScriptResult;
};
postMessageFromWorker({w_id: t_id, w_message: result});
});
5 changes: 3 additions & 2 deletions client/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ const base = {
file.endsWith(".worker.js") ||
file.endsWith("Worker_Index.bs.js") ||
file.endsWith("Toplevel_Worker_4_06.bs.js") ||
file.endsWith("Toplevel_Worker_4_13.bs.js"),
file.endsWith("Toplevel_Worker_4_13.bs.js") ||
file.endsWith("Toplevel_Worker_5_3_0.bs.js"),
exclude: ["public"],
use: { loader: "worker-loader" },
},
Expand Down Expand Up @@ -121,7 +122,7 @@ const base = {
],
},
{
test: /\.(png|jpg|gif)$|toplevel_4_06.js|toplevel_4_13.js$/,
test: /\.(png|jpg|gif)$|toplevel_4_06.js|toplevel_4_13.js|toplevel_5_3_0.js$/,
loader: "file-loader?name=[name].[hash].[ext]",
},
],
Expand Down