Merge branch 'master' into test/statistics-clean

Author: Inuth0603

.github/workflows/linter.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Get changed JavaScript files
         id: get_files
         run: |
-          CHANGED_FILES=$(git diff --name-only ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }} -- '*.js')
+          CHANGED_FILES=$(git diff --diff-filter=ACMRT --name-only ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }} -- '*.js')
           echo "files<<EOF" >> $GITHUB_ENV
           echo "$CHANGED_FILES" >> $GITHUB_ENV
           echo "EOF" >> $GITHUB_ENV

electron-main.js

@@ -10,7 +10,10 @@ function createWindow() {
         title: "Music Blocks",
         webPreferences: {
             nodeIntegration: false,
-            contextIsolation: true
+            contextIsolation: true,
+            sandbox: true,
+            webSecurity: true,
+            enableRemoteModule: false
         }
     });
 

js/activity.js

@@ -7098,7 +7098,10 @@ class Activity {
             // Load any plugins saved in local storage.
             this.pluginData = this.storage.plugins;
             if (this.pluginData !== null && this.pluginData !== "null") {
-                updatePluginObj(this, processPluginData(this, this.pluginData));
+                updatePluginObj(
+                    this,
+                    processPluginData(this, this.pluginData, "localStorage:plugins")
+                );
             }
 
             // Load custom mode saved in local storage.
@@ -7399,6 +7402,7 @@ class Activity {
 
                     // Read file here.
                     const reader = new FileReader();
+                    const pluginFile = that.pluginChooser.files[0];
 
                     // eslint-disable-next-line no-unused-vars
                     reader.onload = theFile => {
@@ -7407,7 +7411,11 @@ class Activity {
                         //doLoadAnimation();
 
                         setTimeout(() => {
-                            const obj = processRawPluginData(that, reader.result);
+                            const obj = processRawPluginData(
+                                that,
+                                reader.result,
+                                pluginFile && pluginFile.name ? pluginFile.name : "local-file"
+                            );
                             // Save plugins to local storage.
                             if (obj !== null) {
                                 that.storage.plugins = preparePluginExports(that, obj);
@@ -7425,7 +7433,7 @@ class Activity {
                         }, 200);
                     };
 
-                    reader.readAsText(that.pluginChooser.files[0]);
+                    reader.readAsText(pluginFile);
                 },
                 false
             );

js/blocks/ActionBlocks.js

@@ -1543,3 +1543,7 @@ function setupActionBlocks(activity) {
     new NamedDoBlock().setup(activity);
     new Temperament1Block().setup(activity);
 }
+
+if (typeof module !== "undefined" && module.exports) {
+    module.exports = { setupActionBlocks };
+}

js/blocks/ProgramBlocks.js

@@ -1442,3 +1442,7 @@ function setupProgramBlocks(activity) {
     new LoadHeapBlock().setup(activity);
     new SetHeapBlock().setup(activity);
 }
+
+if (typeof module !== "undefined" && module.exports) {
+    module.exports = { setupProgramBlocks };
+}

js/blocks/RhythmBlocks.js

@@ -1251,3 +1251,7 @@ function setupRhythmBlocks(activity) {
     new DefineFrequencyBlock().setup(activity);
     new OctaveSpaceBlock().setup(activity);
 }
+
+if (typeof module !== "undefined" && module.exports) {
+    module.exports = { setupRhythmBlocks };
+}