From 7a8d16aeef00b20842e3a5d74891299f582ec7b8 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Tue, 13 Apr 2021 09:44:53 -0700
Subject: [PATCH 1/2] Reverts #4573 (#4775)

---
 package.json                 | 2 +-
 scripts/package/node/core.js | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index ecd03607c..b1491d69c 100644
--- a/package.json
+++ b/package.json
@@ -92,6 +92,6 @@
     "yargs": "^16.0.3"
   },
   "dependencies": {
-    "jsdom": "16.5.0"
+    "jsdom": "15.2.1"
   }
 }
diff --git a/scripts/package/node/core.js b/scripts/package/node/core.js
index 70e1f9078..8f7745304 100644
--- a/scripts/package/node/core.js
+++ b/scripts/package/node/core.js
@@ -23,10 +23,8 @@ Blockly.setLocale = function (locale) {
 // Override textToDomDocument and provide Node.js alternatives to DOMParser and
 // XMLSerializer.
 if (typeof Blockly.utils.global.document !== 'object') {
-  var JSDOM = require('jsdom').JSDOM;
-  var dom = new JSDOM();
-  Blockly.utils.global.DOMParser = dom.window.DOMParser;
-  Blockly.utils.global.XMLSerializer = dom.window.XMLSerializer;
+  Blockly.utils.global.DOMParser = require("jsdom/lib/jsdom/living").DOMParser;
+  Blockly.utils.global.XMLSerializer = require("jsdom/lib/jsdom/living").XMLSerializer;
   var doc = Blockly.utils.xml.textToDomDocument(
     '<xml xmlns="https://developers.google.com/blockly/xml"></xml>');
   Blockly.utils.xml.document = function() {

From c30e0831e76687467958dca3290d341c39085796 Mon Sep 17 00:00:00 2001
From: alschmiedt <aschmiedt@google.com>
Date: Tue, 13 Apr 2021 10:22:25 -0700
Subject: [PATCH 2/2] Rebuild for patch release

---
 blockly_compressed.js | 2 +-
 package.json          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/blockly_compressed.js b/blockly_compressed.js
index 304bacf1b..ae1bd1303 100644
--- a/blockly_compressed.js
+++ b/blockly_compressed.js
@@ -803,7 +803,7 @@ Blockly.Variables.renameVariable=function(a,b,c){var d=function(e){var f=Blockly
 Blockly.Variables.promptName=function(a,b,c){Blockly.prompt(a,b,function(d){d&&(d=d.replace(/[\s\xa0]+/g," ").trim(),d==Blockly.Msg.RENAME_VARIABLE||d==Blockly.Msg.NEW_VARIABLE)&&(d=null);c(d)})};Blockly.Variables.nameUsedWithOtherType_=function(a,b,c){c=c.getVariableMap().getAllVariables();a=a.toLowerCase();for(var d=0,e;e=c[d];d++)if(e.name.toLowerCase()==a&&e.type!=b)return e;return null};
 Blockly.Variables.nameUsedWithAnyType=function(a,b){b=b.getVariableMap().getAllVariables();a=a.toLowerCase();for(var c=0,d;d=b[c];c++)if(d.name.toLowerCase()==a)return d;return null};Blockly.Variables.generateVariableFieldDom=function(a){var b=Blockly.utils.xml.createElement("field");b.setAttribute("name","VAR");b.setAttribute("id",a.getId());b.setAttribute("variabletype",a.type);a=Blockly.utils.xml.createTextNode(a.name);b.appendChild(a);return b};
 Blockly.Variables.getOrCreateVariablePackage=function(a,b,c,d){var e=Blockly.Variables.getVariable(a,b,c,d);e||(e=Blockly.Variables.createVariable_(a,b,c,d));return e};Blockly.Variables.getVariable=function(a,b,c,d){var e=a.getPotentialVariableMap(),f=null;if(b&&(f=a.getVariableById(b),!f&&e&&(f=e.getVariableById(b)),f))return f;if(c){if(void 0==d)throw Error("Tried to look up a variable by name without a type");f=a.getVariable(c,d);!f&&e&&(f=e.getVariable(c,d))}return f};
-Blockly.Variables.createVariable_=function(a,b,c,d){var e=a.getPotentialVariableMap();c||(c=Blockly.Variables.generateUniqueName(a.isFlyout?a.targetWorkspace:a));return e?e.createVariable(c,d,b):a.createVariable(c,d,b)};Blockly.Variables.getAddedVariables=function(a,b){a=a.getAllVariables();var c=[];if(b.length!=a.length)for(var d=0;d<a.length;d++){var e=a[d];-1==b.indexOf(e)&&c.push(e)}return c};Blockly.VERSION="5.20210325.0";Blockly.mainWorkspace=null;Blockly.selected=null;Blockly.draggingConnections=[];Blockly.clipboardXml_=null;Blockly.clipboardSource_=null;Blockly.clipboardTypeCounts_=null;Blockly.cache3dSupported_=null;Blockly.parentContainer=null;Blockly.svgSize=function(a){Blockly.utils.deprecation.warn("Blockly.svgSize","March 2021","March 2022","workspace.getCachedParentSvgSize");return new Blockly.utils.Size(a.cachedWidth_,a.cachedHeight_)};Blockly.resizeSvgContents=function(a){a.resizeContents()};
+Blockly.Variables.createVariable_=function(a,b,c,d){var e=a.getPotentialVariableMap();c||(c=Blockly.Variables.generateUniqueName(a.isFlyout?a.targetWorkspace:a));return e?e.createVariable(c,d,b):a.createVariable(c,d,b)};Blockly.Variables.getAddedVariables=function(a,b){a=a.getAllVariables();var c=[];if(b.length!=a.length)for(var d=0;d<a.length;d++){var e=a[d];-1==b.indexOf(e)&&c.push(e)}return c};Blockly.VERSION="5.20210325.1";Blockly.mainWorkspace=null;Blockly.selected=null;Blockly.draggingConnections=[];Blockly.clipboardXml_=null;Blockly.clipboardSource_=null;Blockly.clipboardTypeCounts_=null;Blockly.cache3dSupported_=null;Blockly.parentContainer=null;Blockly.svgSize=function(a){Blockly.utils.deprecation.warn("Blockly.svgSize","March 2021","March 2022","workspace.getCachedParentSvgSize");return new Blockly.utils.Size(a.cachedWidth_,a.cachedHeight_)};Blockly.resizeSvgContents=function(a){a.resizeContents()};
 Blockly.svgResize=function(a){for(;a.options.parentWorkspace;)a=a.options.parentWorkspace;var b=a.getParentSvg(),c=a.getCachedParentSvgSize(),d=b.parentNode;if(d){var e=d.offsetWidth;d=d.offsetHeight;c.width!=e&&(b.setAttribute("width",e+"px"),a.setCachedParentSvgSize(e,null));c.height!=d&&(b.setAttribute("height",d+"px"),a.setCachedParentSvgSize(null,d));a.resize()}};
 Blockly.onKeyDown=function(a){var b=Blockly.mainWorkspace;if(b&&!(Blockly.utils.isTargetInput(a)||b.rendered&&!b.isVisible()))Blockly.ShortcutRegistry.registry.onKeyDown(b,a)};Blockly.deleteBlock=function(a){a.workspace.isFlyout||(Blockly.Events.setGroup(!0),Blockly.hideChaff(),a.dispose(!0,!0),Blockly.Events.setGroup(!1))};Blockly.copy=function(a){if(a=a.toCopyData())Blockly.clipboardXml_=a.xml,Blockly.clipboardSource_=a.source,Blockly.clipboardTypeCounts_=a.typeCounts};
 Blockly.paste=function(){if(!Blockly.clipboardXml_)return!1;var a=Blockly.clipboardSource_;a.isFlyout&&(a=a.targetWorkspace);return Blockly.clipboardTypeCounts_&&a.isCapacityAvailable(Blockly.clipboardTypeCounts_)?(Blockly.Events.setGroup(!0),a.paste(Blockly.clipboardXml_),Blockly.Events.setGroup(!1),!0):!1};
diff --git a/package.json b/package.json
index b1491d69c..2e3402aa8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "blockly",
-  "version": "5.20210325.0",
+  "version": "5.20210325.1",
   "description": "Blockly is a library for building visual programming editors.",
   "keywords": [
     "blockly"