Merge branch 'develop' into fix-telemetry-dialog-selection

README.md

@@ -1,9 +1,6 @@
 # scratch-gui
 #### Scratch GUI is a set of React components that comprise the interface for creating and running Scratch 3.0 projects
 
-[![Build Status](https://travis-ci.com/LLK/scratch-gui.svg?token=Yfq2ryN1BwaxDME69Lnc&branch=master)](https://travis-ci.com/LLK/scratch-gui)
-[![Greenkeeper badge](https://badges.greenkeeper.io/LLK/scratch-gui.svg)](https://greenkeeper.io/)
-
 ## Installation
 This requires you to have Git and Node.js installed.
 
@@ -51,7 +48,7 @@ Here's how to link your local `scratch-gui` code to another project's `node_modu
 2. From the top level of each repository (such as `scratch-www`) that depends on `scratch-gui`:
     1. Make sure you have run `npm install`
     2. Run `npm link scratch-gui`
-    3. Build or run the repositoriy
+    3. Build or run the repository
 
 #### Using `npm run watch`
 

package.json

@@ -74,13 +74,14 @@
     "redux": "3.7.2",
     "redux-throttle": "0.1.1",
     "scratch-audio": "0.1.0-prerelease.20200528195344",
-    "scratch-blocks": "0.1.0-prerelease.20210224033746",
-    "scratch-l10n": "3.11.20210224031506",
-    "scratch-storage": "1.3.3",
-    "scratch-vm": "0.2.0-prerelease.20210224111250",
-    "scratch-paint": "0.2.0-prerelease.20210224033041",
-    "scratch-render": "0.1.0-prerelease.20210219213024",
-    "scratch-svg-renderer": "0.2.0-prerelease.20210219193204",
+    "scratch-blocks": "0.1.0-prerelease.20210429032711",
+    "scratch-l10n": "3.11.20210429031539",
+    "scratch-paint": "0.2.0-prerelease.20210407203313",
+    "scratch-render": "0.1.0-prerelease.20210325231800",
+    "scratch-render-fonts": "1.0.0-prerelease.20210401210003",
+    "scratch-storage": "1.3.4",
+    "scratch-svg-renderer": "0.2.0-prerelease.20210408171934",
+    "scratch-vm": "0.2.0-prerelease.20210412181234",
     "startaudiocontext": "1.2.1",
     "style-loader": "^0.23.0",
     "text-encoding": "0.7.0",
@@ -103,7 +104,7 @@
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "^10.0.1",
     "babel-loader": "^8.0.4",
-    "chromedriver": "87.0.7",
+    "chromedriver": "89.0.0",
     "enzyme": "^3.5.0",
     "enzyme-adapter-react-16": "1.3.0",
     "eslint": "^5.7.0",

src/containers/stage.jsx

@@ -8,7 +8,7 @@ import {connect} from 'react-redux';
 import {STAGE_DISPLAY_SIZES} from '../lib/layout-constants';
 import {getEventXY} from '../lib/touch-utils';
 import VideoProvider from '../lib/video/video-provider';
-import {SVGRenderer as V2SVGAdapter, BitmapAdapter as V2BitmapAdapter} from 'scratch-svg-renderer';
+import {BitmapAdapter as V2BitmapAdapter} from 'scratch-svg-renderer';
 
 import StageComponent from '../components/stage/stage.jsx';
 
@@ -68,7 +68,6 @@ class Stage extends React.Component {
             // default color
             this.props.vm.renderer.draw();
         }
-        this.props.vm.attachV2SVGAdapter(new V2SVGAdapter());
         this.props.vm.attachV2BitmapAdapter(new V2BitmapAdapter());
     }
     componentDidMount () {