Merge branch 'main' into wait-to-run

fonsp · Sep 18, 2023 · 3d6637b · 3d6637b
2 parents 6ac699b + a7908dd
commit 3d6637b
Show file tree

Hide file tree

Showing 59 changed files with 2,219 additions and 701 deletions.
diff --git a/.github/workflows/Bundle.yml b/.github/workflows/Bundle.yml
@@ -13,7 +13,7 @@ on:
             - release
 
 concurrency:
-    group: bundle
+    group: bundle-${{ github.ref }}
     cancel-in-progress: false
 
 jobs:

diff --git a/.github/workflows/FrontendTest.yml b/.github/workflows/FrontendTest.yml
@@ -63,17 +63,19 @@ jobs:
             - name: Run tests
               working-directory: ./test/frontend
               run: |
-                  julia -e "import Pkg; Pkg.add(path=\"$GITHUB_WORKSPACE\"); Pkg.instantiate(); import Pluto; Pluto.run(port=$PLUTO_PORT, require_secret_for_access=false)" & # Run Pluto.jl server in the background
+                julia --project=$GITHUB_WORKSPACE -e 'import Pluto
+                  # Run Pluto.jl server in the background
+                  options = Pluto.Configuration.from_flat_kwargs(; 
+                    port=parse(Int, ENV["PLUTO_PORT"]), 
+                    require_secret_for_access=false,
+                  )
+                  🍭 = Pluto.ServerSession(; options)
+                  server = Pluto.run!(🍭)
 
-                  # Wait for Pluto to initialize
-                  TIMES_TRIED=0
-                  until [ $TIMES_TRIED -eq 60 ] || $(curl --output /dev/null --silent --fail "http://localhost:$PLUTO_PORT/"); do
-                      printf '.'
-                      TIMES_TRIED=$((TIMES_TRIED+1))
-                      sleep 1
-                  done
+                  run(`npm run test`)
+                  
+                  close(server)'
 
-                  npm run test
               env:
                   PLUTO_PORT: 1235
                   PLUTO_TEST_OFFLINE: ${{ github.ref_name == 'release' }}

diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml
@@ -27,14 +27,14 @@ on:
 jobs:
     test:
         runs-on: ${{ matrix.os }}
-        timeout-minutes: 40
+        timeout-minutes: 50
 
         strategy:
             # Without setting this, a failing test cancels all others
             fail-fast: false
             matrix:
                 # We test quite a lot of versions because we do some OS and version specific things unfortunately
-                julia-version: ["1.6", "1.7", "1.8", "1.9"] #, "nightly"]
+                julia-version: ["1.6", "1.8", "1.9", "~1.10.0-0"]
                 os: [ubuntu-latest, macOS-latest, windows-latest]
 
         steps:

diff --git a/.github/workflows/TypeScriptCheck.yml b/.github/workflows/TypeScriptCheck.yml
@@ -26,7 +26,7 @@ jobs:
         with:
           node-version: "18.x"
 
-      - run: npm install typescript -g
+      - run: npm install typescript@5.0.4 -g
 
       - run: npm install
         working-directory: frontend

diff --git a/Project.toml b/Project.toml
@@ -2,13 +2,12 @@ name = "Pluto"
 uuid = "c3e4b0f8-55cb-11ea-2926-15256bba5781"
 license = "MIT"
 authors = ["Fons van der Plas <[email protected]>"]
-version = "0.19.25"
+version = "0.19.27"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 Configurations = "5218b696-f38b-4ac9-8b61-a12ec717816d"
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
-Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
 FileWatching = "7b1f6079-737a-58dc-b8bc-7a2ca5c1b5ee"
 FuzzyCompletions = "fb4132e2-a121-4a70-b8a1-d5b831dcdcc2"
 HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
@@ -17,6 +16,7 @@ InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
 LoggingExtras = "e6f89c97-d47a-5376-807f-9c37f3926c36"
 MIMEs = "6c6e2e6c-3030-632d-7369-2d6c69616d65"
+Malt = "36869731-bdee-424d-aa32-cab38c994e3b"
 Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
 MsgPack = "99f44e22-a591-53d1-9472-aa23ef4bd671"
 Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
@@ -25,6 +25,7 @@ PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
 REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
 RegistryInstances = "2792f1a3-b283-48e8-9a74-f99dce5104f3"
 RelocatableFolders = "05181044-ff0b-4ac5-8273-598c1e38db00"
+Scratch = "6c6a2e73-6563-6170-7368-637461726353"
 Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
 TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
 Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
@@ -38,11 +39,13 @@ HTTP = "^1.5.2"
 HypertextLiteral = "0.7, 0.8, 0.9"
 LoggingExtras = "0.4, 1"
 MIMEs = "0.1"
+Malt = "1.0.3"
 MsgPack = "1.1"
 PrecompileSignatures = "3"
 PrecompileTools = "1"
 RegistryInstances = "0.1"
 RelocatableFolders = "0.1, 0.2, 0.3, 1"
+Scratch = "1.1"
 Tables = "1"
 URIs = "1.3"
 julia = "^1.6"