Fix up most linting/merge errors

src/serialization/sb2.js

@@ -15,8 +15,8 @@ const specMap = require('./sb2_specmap');
 const Variable = require('../engine/variable');
 const List = require('../engine/list');
 
-const loadCostume = require('./load-costume.js');
-const loadSound = require('./load-sound.js');
+const loadCostume = require('../import/load-costume.js');
+const loadSound = require('../import/load-sound.js');
 
 /**
  * Convert a Scratch 2.0 procedure string (e.g., "my_procedure %s %b %n")

src/serialization/sb3.js

@@ -4,27 +4,26 @@
  * JSON and then generates all needed scratch-vm runtime structures.
  */
 
-var package = require('../../package.json');
-var Blocks = require('../engine/blocks');
-var RenderedTarget = require('../sprites/rendered-target');
-var Sprite = require('../sprites/sprite');
-var Variable = require('../engine/variable');
-var List = require('../engine/list');
+const vmPackage = require('../../package.json');
+const Blocks = require('../engine/blocks');
+const Sprite = require('../sprites/sprite');
+const Variable = require('../engine/variable');
+const List = require('../engine/list');
 
 /**
  * Serializes the specified VM runtime.
  * @param  {!Runtime} runtime VM runtime instance to be serialized.
  * @return {string}    Serialized runtime instance.
  */
-var serialize = function (runtime) {
+const serialize = function (runtime) {
     // Fetch targets
-    var obj = Object.create(null);
+    const obj = Object.create(null);
     obj.targets = runtime.targets;
 
     // Assemble metadata
-    var meta = Object.create(null);
+    const meta = Object.create(null);
     meta.semver = '3.0.0';
-    meta.vm = package.version;
+    meta.vm = vmPackage.version;
 
     // Attach full user agent string to metadata if available
     meta.agent = null;
@@ -37,36 +36,36 @@ var serialize = function (runtime) {
 
 /**
  * Parse a single "Scratch object" and create all its in-memory VM objects.
- * @param {!Object} object From-JSON "Scratch object:" sprite, stage, watcher.
+ * @param {!object} object From-JSON "Scratch object:" sprite, stage, watcher.
  * @param {!Runtime} runtime Runtime object to load all structures into.
  * @return {?Target} Target created (stage or sprite).
  */
-var parseScratchObject = function (object, runtime) {
+const parseScratchObject = function (object, runtime) {
     if (!object.hasOwnProperty('name')) {
         // Watcher/monitor - skip this object until those are implemented in VM.
         // @todo
         return;
     }
     // Blocks container for this object.
-    var blocks = new Blocks();
+    const blocks = new Blocks();
 
     // @todo: For now, load all Scratch objects (stage/sprites) as a Sprite.
-    var sprite = new Sprite(blocks, runtime);
+    const sprite = new Sprite(blocks, runtime);
 
     // Sprite/stage name from JSON.
     if (object.hasOwnProperty('name')) {
         sprite.name = object.name;
     }
     if (object.hasOwnProperty('blocks')) {
-        for (blockId in object.blocks) {
+        for (let blockId in object.blocks) {
             blocks.createBlock(object.blocks[blockId]);
         }
-        console.log(blocks);
+        // console.log(blocks);
     }
     // Costumes from JSON.
     if (object.hasOwnProperty('costumes') || object.hasOwnProperty('costume')) {
-        for (var i = 0; i < object.costumeCount; i++) {
-            var costume = object.costumes[i];
+        for (let i = 0; i < object.costumeCount; i++) {
+            const costume = object.costumes[i];
             // @todo: Make sure all the relevant metadata is being pulled out.
             sprite.costumes.push({
                 skin: costume.skin,
@@ -79,8 +78,8 @@ var parseScratchObject = function (object, runtime) {
     }
     // Sounds from JSON
     if (object.hasOwnProperty('sounds')) {
-        for (var s = 0; s < object.sounds.length; s++) {
-            var sound = object.sounds[s];
+        for (let s = 0; s < object.sounds.length; s++) {
+            const sound = object.sounds[s];
             sprite.sounds.push({
                 format: sound.format,
                 fileUrl: sound.fileUrl,
@@ -93,13 +92,13 @@ var parseScratchObject = function (object, runtime) {
         }
     }
     // Create the first clone, and load its run-state from JSON.
-    var target = sprite.createClone();
+    const target = sprite.createClone();
     // Add it to the runtime's list of targets.
     runtime.targets.push(target);
     // Load target properties from JSON.
     if (object.hasOwnProperty('variables')) {
-        for (var j = 0; j < object.variables.length; j++) {
-            var variable = object.variables[j];
+        for (let j = 0; j < object.variables.length; j++) {
+            const variable = object.variables[j];
             target.variables[variable.name] = new Variable(
                 variable.name,
                 variable.value,
@@ -108,8 +107,8 @@ var parseScratchObject = function (object, runtime) {
         }
     }
     if (object.hasOwnProperty('lists')) {
-        for (var k = 0; k < object.lists.length; k++) {
-            var list = object.lists[k];
+        for (let k = 0; k < object.lists.length; k++) {
+            const list = object.lists[k];
             // @todo: monitor properties.
             target.lists[list.listName] = new List(
                 list.listName,
@@ -143,8 +142,8 @@ var parseScratchObject = function (object, runtime) {
     }
     target.updateAllDrawableProperties();
 
-    console.log("returning target:");
-    console.log(target);
+    // console.log('returning target:');
+    // console.log(target);
     return target;
 };
 
@@ -154,8 +153,8 @@ var parseScratchObject = function (object, runtime) {
  * @param  {string}  json    Stringified JSON representation of a VM runtime.
  * @param  {Runtime} runtime Runtime instance
  */
-var deserialize = function (json, runtime) {
-    for (var i = 0; i < json.targets.length; i++) {
+const deserialize = function (json, runtime) {
+    for (let i = 0; i < json.targets.length; i++) {
         parseScratchObject(json.targets[i], runtime);
     }
 };