Set version v0.3.1

r-wasm · Mar 22, 2024 · cc95727 · cc95727
1 parent 9e02552
commit cc95727
Show file tree

Hide file tree

Showing 12 changed files with 40 additions and 23 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,9 @@
 # webR (development version)
 
+# webR 0.3.1
+
+Hotfix release to manage incompatible WebAssembly binary R packages due to ABI changes in Emscripten.
+
 # webR 0.3.0
 
 ## New features

diff --git a/flake.nix b/flake.nix
@@ -26,7 +26,7 @@
             #     cd src; prefetch-npm-deps package-lock.json
             srcNpmDeps = pkgs.fetchNpmDeps {
               src = "${self}/src";
-              hash = "sha256-xCAcEegU6q4QWkfaI7xz2JZ6u4nsx4KOlaPQU1M7ZiQ=";
+              hash = "sha256-Zpbt9QY9tO/jb0UAWzU2w+C5JN0Oa4SQPN65zGFZJiE=";
             };
 
             inherit system;

diff --git a/packages/webr/DESCRIPTION b/packages/webr/DESCRIPTION
@@ -1,7 +1,7 @@
 Type: Package
 Package: webr
 Title: WebR Support Package
-Version: 0.3.0
+Version: 0.3.1
 Authors@R: c(
     person("George", "Stagg", , "george.stagg@posit.co", role = c("aut", "cre")),
     person("Lionel", "Henry", , "lionel@posit.co", role = "aut"),

diff --git a/packages/webr/R/install.R b/packages/webr/R/install.R
@@ -29,6 +29,15 @@ install <- function(packages,
   repos <- gsub("/$", "", repos)
   contrib <- sprintf("%s/bin/emscripten/contrib/%s", repos, ver)
 
+  # Handle webR 0.3.x - R 4.3.3 on repo.r-wasm.org
+  # TODO: Once R 4.4.0 is released this can be removed from future webR builds
+  contrib <- gsub(
+    "repo.r-wasm.org/bin/emscripten/contrib/4.3",
+    "repo.r-wasm.org/bin/emscripten/contrib/4.3.3",
+    contrib,
+    fixed = TRUE
+  )
+
   if (is.null(info)) {
     info <- utils::available.packages(contriburl = contrib)
   }

diff --git a/src/docs/_quarto.yml b/src/docs/_quarto.yml
@@ -15,7 +15,7 @@ website:
   favicon: images/webR.png
   page-navigation: true
   sidebar:
-    title: "WebR 0.3.0 Documentation"
+    title: "WebR 0.3.1 Documentation"
     logo: images/webR.png
     contents:
       - index.qmd

diff --git a/src/docs/examples.qmd b/src/docs/examples.qmd
@@ -388,7 +388,7 @@ After loading, the resulting web page should present an interactive R console si
   </div>
 </div>
 <script type="module">
-  import { Console } from 'https://webr.r-wasm.org/v0.3.0/webr.mjs';
+  import { Console } from 'https://webr.r-wasm.org/v0.3.1/webr.mjs';
   const webRConsole = new Console({
     stdout: line => document.getElementById('out').append(line + '\n'),
     stderr: line => document.getElementById('out').append(line + '\n'),

diff --git a/src/docs/index.qmd b/src/docs/index.qmd
@@ -39,7 +39,7 @@ summary(fit)</div>
   editor.setOptions({ fontSize: "11pt", maxLines: Infinity });
   editor.session.setMode("ace/mode/r");
 
-  import { WebR } from 'https://webr.r-wasm.org/v0.3.0/webr.mjs';
+  import { WebR } from 'https://webr.r-wasm.org/v0.3.1/webr.mjs';
   const webR = new WebR();
   await webR.init();
   await webR.evalRVoid('options(device=webr::canvas)');

diff --git a/src/docs/plotting.qmd b/src/docs/plotting.qmd
@@ -82,7 +82,7 @@ text(4, -4, "זה כתוב בעברית")</div>
   editor.setOptions({ fontSize: "11pt", maxLines: Infinity });
   editor.session.setMode("ace/mode/r");
 
-  import { WebR } from 'https://webr.r-wasm.org/v0.3.0/webr.mjs';
+  import { WebR } from 'https://webr.r-wasm.org/v0.3.1/webr.mjs';
   const webR = new WebR();
   await webR.init();
   await webR.evalRVoid('options(device=function(...){webr::canvas(width=500, height=300)})');
@@ -207,7 +207,7 @@ Click the button below to see the output of this demo,
 <button id="plot-button" class="btn btn-success btn-sm" disabled="true">Run graphics demo</button>
 <div style="text-align: center" id="plot-container"></div>
 <script type="module">
-    import { WebR } from 'https://webr.r-wasm.org/v0.3.0/webr.mjs';
+    import { WebR } from 'https://webr.r-wasm.org/v0.3.1/webr.mjs';
     const webR = new WebR();
     let canvas = null;
     let container = document.getElementById('plot-container');

diff --git a/src/docs/webr-serviceworker.js b/src/docs/webr-serviceworker.js
@@ -1 +1 @@
-importScripts('https://webr.r-wasm.org/v0.3.0/webr-serviceworker.js');
+importScripts('https://webr.r-wasm.org/v0.3.1/webr-serviceworker.js');
diff --git a/src/docs/webr-worker.js b/src/docs/webr-worker.js
@@ -1 +1 @@
-importScripts('https://webr.r-wasm.org/v0.3.0/webr-worker.js');
+importScripts('https://webr.r-wasm.org/v0.3.1/webr-worker.js');
diff --git a/src/package-lock.json b/src/package-lock.json
diff --git a/src/package.json b/src/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webr",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "The statistical programming language R compiled into WASM for use in a web browser and node.",
   "keywords": [
     "webR",