🐛 Fix regression with custom script typings: they were not loaded on …

…project load
dejan-stankovic · Aug 9, 2020 · f1d62ab · f1d62ab
1 parent dd4d70a
commit f1d62ab
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/js/loadProject.js b/src/js/loadProject.js
@@ -126,6 +126,14 @@
                 document.title = global.currentProject.settings.title + ' — ct.js';
             }
 
+            glob.scriptTypings = {};
+            for (const script of global.currentProject.scripts) {
+                glob.scriptTypings[script.name] = [
+                    monaco.languages.typescript.javascriptDefaults.addExtraLib(script.code),
+                    monaco.languages.typescript.typescriptDefaults.addExtraLib(script.code)
+                ];
+            }
+
             const {loadAllTypedefs, resetTypedefs} = require('./data/node_requires/resources/modules/typedefs');
             resetTypedefs();
             loadAllTypedefs();

diff --git a/src/riotTags/project-settings/scripts-setttings.tag b/src/riotTags/project-settings/scripts-setttings.tag
@@ -25,13 +25,6 @@ scripts-settings
         this.currentProject.scripts = this.currentProject.scripts || [];
 
         const glob = require('./data/node_requires/glob');
-        glob.scriptTypings = glob.scriptTypings || {};
-        for (const script of global.currentProject.scripts) {
-            glob.scriptTypings[script.name] = [
-                monaco.languages.typescript.javascriptDefaults.addExtraLib(script.code),
-                monaco.languages.typescript.typescriptDefaults.addExtraLib(script.code)
-            ];
-        }
 
         this.addNewScript = () => {
             var script = {