🐛 CoffeeScript: Fix CoffeeScript package's loading problems that appe…

…ared after facilitating ESBuild
ct-js · May 19, 2024 · f65de35 · f65de35
1 parent 7c970d6
commit f65de35
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/src/node_requires/exporter/scriptableProcessor.ts b/src/node_requires/exporter/scriptableProcessor.ts
@@ -7,7 +7,7 @@ import {getName, getById} from '../resources';
 import {getModulePathByName, loadModuleByName} from './../resources/modules';
 import {join} from 'path';
 import {embedStaticBehaviors} from './behaviors';
-const coffeeScript = require('coffeescript');
+const compileCoffee = require('coffeescript').CoffeeScript.compile;
 const typeScript = require('sucrase').transform;
 import {compile, resetSafeId} from '../catnip/compiler';
 
@@ -93,7 +93,7 @@ const getBaseScripts = function (entity: IScriptable, project: IProject): Script
         let {code} = event;
         try { // Apply converters to the user's code first
             if (project.language === 'coffeescript') {
-                code = coffeeScript.compile((code as string), coffeeScriptOptions);
+                code = compileCoffee((code as string), coffeeScriptOptions);
             } else if (project.language === 'catnip') {
                 code = compile(code as BlockScript, {
                     resourceId: entity.uid,

diff --git a/src/node_requires/exporter/scripts.ts b/src/node_requires/exporter/scripts.ts
@@ -1,15 +1,15 @@
 import {ExporterError, highlightProblem} from './ExporterError';
 import {coffeeScriptOptions} from './scriptableProcessor';
 
-const coffeeScript = require('coffeescript');
+const compileCoffee = require('coffeescript').CoffeeScript.compile;
 const typeScript = require('sucrase').transform;
 
 export const stringifyScripts = (scripts: IScript[]): string =>
     scripts.reduce((acc, script) => {
         let code;
         try { // Apply converters to the user's code first
             code = script.language === 'coffeescript' ?
-                coffeeScript.compile(script.code, coffeeScriptOptions) :
+                compileCoffee(script.code, coffeeScriptOptions) :
                 typeScript(script.code, {
                     transforms: ['typescript']
                 }).code;

diff --git a/src/node_requires/resources/projects/convertLanguage.ts b/src/node_requires/resources/projects/convertLanguage.ts
@@ -1,4 +1,4 @@
-const coffeescript = require('coffeescript');
+const compileCoffee = require('coffeescript').CoffeeScript.compile;
 const coffeescriptSettings = {
     bare: true,
     sourcemaps: false
@@ -18,7 +18,7 @@ export const convertCoffeeToJs = (): void => {
                 for (const event of (asset as IScriptable).events) {
                     changeset.push({
                         event,
-                        code: coffeescript.compile(event.code, coffeescriptSettings)
+                        code: compileCoffee(event.code, coffeescriptSettings)
                     });
                 }
             }

diff --git a/src/riotTags/editors/script-editor.tag b/src/riotTags/editors/script-editor.tag
@@ -61,14 +61,14 @@ script-editor.aPanel.aView.flexfix
             this.opts.ondone(this.asset);
         };
 
-        const coffeescript = require('coffeescript');
+        const compileCoffee = require('coffeescript').CoffeeScript.compile;
         const checkProblemsDebounced = window.debounce(() => {
             if (!this.codeEditor || this.asset.language !== 'coffeescript') {
                 return;
             }
             const oldProblem = this.problem;
             try {
-                coffeescript.compile(this.codeEditor.getValue(), {
+                compileCoffee(this.codeEditor.getValue(), {
                     bare: true,
                     sourcemaps: false
                 });

diff --git a/src/riotTags/shared/scriptables/code-editor-scriptable.tag b/src/riotTags/shared/scriptables/code-editor-scriptable.tag
@@ -34,14 +34,14 @@ code-editor-scriptable.relative.wide.tall.flexcol
         this.language = window.currentProject.language || 'typescript';
         this.allEvents = eventsAPI.events;
 
-        const coffeescript = require('coffeescript');
+        const compileCoffeScript = require('coffeescript').CoffeeScript.compile;
         const checkProblemsDebounced = window.debounce(() => {
             if (!this.codeEditor || this.language !== 'coffeescript') {
                 return;
             }
             const oldProblem = this.problem;
             try {
-                coffeescript.compile(this.codeEditor.getValue(), {
+                compileCoffeScript(this.codeEditor.getValue(), {
                     bare: true,
                     sourcemaps: false
                 });