Remove old scratch code

apps/Gruntfile.js

@@ -83,7 +83,6 @@ describe('entry tests', () => {
     'netsim',
     'studio',
     'turtle',
-    'scratch',
     'weblab'
   ];
 
@@ -180,12 +179,7 @@ describe('entry tests', () => {
           src: ['**'],
           dest: 'build/package/media/skins/fish'
         },
-        {
-          expand: true,
-          cwd: 'node_modules/scratch-blocks/media',
-          src: ['**'],
-          dest: 'build/package/media/scratch-blocks'
-        },
+
         // We have to do some weird stuff to get our fallback video player working.
         // video.js expects some of its own files to be served by the application, so
         // we include them in our build and access them via static (non-fingerprinted)
@@ -426,12 +420,6 @@ describe('entry tests', () => {
           included: false,
           nocache: true
         },
-        {
-          pattern: 'test/scratch/**/*',
-          watched: false,
-          included: false,
-          nocache: true
-        },
         {
           pattern: 'test/storybook/**/*',
           watched: false,
@@ -479,15 +467,6 @@ describe('entry tests', () => {
       }),
       files: [{src: ['test/integration-tests.js'], watched: false}]
     },
-    scratch: {
-      coverageIstanbulReporter: {
-        dir: 'coverage/scratch'
-      },
-      junitReporter: Object.assign({}, junitReporterBaseConfig, {
-        outputFile: 'scratch.xml'
-      }),
-      files: [{src: ['test/scratch-tests.js'], watched: false}]
-    },
     storybook: {
       coverageIstanbulReporter: {
         dir: 'coverage/storybook'
@@ -1266,8 +1245,5 @@ describe('entry tests', () => {
 
   grunt.registerTask('integrationTest', ['preconcat', 'karma:integration']);
 
-  // Run Scratch tests in a separate target so `window.Blockly` doesn't collide.
-  grunt.registerTask('scratchTest', ['preconcat', 'karma:scratch']);
-
   grunt.registerTask('default', ['rebuild', 'test']);
 };

apps/karma.conf.js

@@ -49,8 +49,7 @@ module.exports = function(config) {
       'test/integration-tests.js': ['webpack', 'sourcemap'],
       'test/unit-tests.js': ['webpack'],
       'test/code-studio-tests.js': ['webpack', 'sourcemap'],
-      'test/storybook-tests.js': ['webpack', 'sourcemap'],
-      'test/scratch-tests.js': ['webpack']
+      'test/storybook-tests.js': ['webpack', 'sourcemap']
     },
 
     webpack: {...webpackConfig, optimization: undefined, mode: 'development'},

apps/package.json

@@ -196,11 +196,6 @@
     "sanitize-html": "^1.11.3",
     "sass-loader": "6.0.7",
     "save-csv": "^4.0.6",
-    "scratch-audio": "v0.1.0-prerelease.1501163867",
-    "scratch-blocks": " v0.1.0-prerelease.1501101334",
-    "scratch-render": "v0.1.0-prerelease.1500038694",
-    "scratch-storage": "^0.2.0",
-    "scratch-vm": "v0.1.0-prerelease.1501105826-prerelease.1501105849",
     "script-loader": "^0.7.0",
     "seedrandom": "2.4.2",
     "sinon": "^5.0.0",

apps/script/checkEntryPoints.js

@@ -57,7 +57,6 @@ const SILENCED = [
   'netsim',
   'studio',
   'turtle',
-  'scratch',
   'weblab',
   'spritelab',
 

apps/src/StudioApp.js

@@ -205,8 +205,7 @@ StudioApp.prototype.configure = function(options) {
   // NOTE: editCode (which currently implies droplet) and usingBlockly_ are
   // currently mutually exclusive.
   this.editCode = options.level && options.level.editCode;
-  this.scratch = options.level && options.level.scratch;
-  this.usingBlockly_ = !this.editCode && !this.scratch;
+  this.usingBlockly_ = !this.editCode;
 
   if (options.isEditorless) {
     this.editCode = false;
@@ -731,12 +730,6 @@ StudioApp.prototype.handleClearPuzzle = function(config) {
     this.editor.setValue(resetValue);
 
     annotationList.clearRuntimeAnnotations();
-  } else if (this.scratch) {
-    const workspace = Blockly.getMainWorkspace();
-    workspace.clear();
-
-    const dom = Blockly.Xml.textToDom(config.level.startBlocks);
-    Blockly.Xml.domToWorkspace(dom, workspace);
   }
   if (config.afterClearPuzzle) {
     promise = config.afterClearPuzzle(config);
@@ -1497,8 +1490,6 @@ StudioApp.prototype.resizeToolboxHeader = function() {
     toolboxWidth = categories.getBoundingClientRect().width;
   } else if (this.isUsingBlockly()) {
     toolboxWidth = Blockly.mainBlockSpaceEditor.getToolboxWidth();
-  } else if (this.scratch) {
-    toolboxWidth = Blockly.getMainWorkspace().getMetrics().toolboxWidth;
   }
   document.getElementById('toolbox-header').style.width = toolboxWidth + 'px';
 };

apps/src/code-studio/initApp/loadApp.js

@@ -491,9 +491,7 @@ const sourceHandler = {
     return new Promise((resolve, reject) => {
       let source;
       let appOptions = getAppOptions();
-      if (appOptions.level && appOptions.level.scratch) {
-        resolve(appOptions.getCode());
-      } else if (window.Blockly) {
+      if (window.Blockly) {
         // If we're readOnly, source hasn't changed at all
         source = Blockly.mainBlockSpace.isReadOnly()
           ? currentLevelSource

apps/src/code-studio/initApp/project.js

@@ -829,7 +829,6 @@ var projects = (module.exports = {
       case 'dance':
       case 'eval':
       case 'flappy':
-      case 'scratch':
       case 'weblab':
       case 'gamelab':
       case 'spritelab':