Allow whitespace/linebreaks in define statement check

niklaskors · niklaskors · commit 368fc064380b · 2022-02-05T19:45:23.000+01:00
diff --git a/packages/engine/src/modules.ts b/packages/engine/src/modules.ts
@@ -87,12 +87,10 @@ export function createExecutionScope(context: TypeCellContext<any>) {
 }
 
 export function getModulesFromTypeCellCode(compiledCode: string, scope: any) {
-  if (!compiledCode.match(/^(define\((".*", )?\[.*\], )function/gm)) {
+  // Checks if define([], function) like code is already present
+  if (!compiledCode.match(/(define\((".*", )?\[.*\], )function/gm)) {
     // file is not a module (no exports). Create module-like code manually
-    compiledCode = `define([], function() {
-  ${compiledCode};
-            });   
-  `;
+    compiledCode = `define([], function() { ${compiledCode}; });`;
   }
 
   if (Object.keys(scope).find((key) => !/^[a-zA-Z0-9_$]+$/.test(key))) {

Original file line number	Diff line number	Diff line change
`@@ -87,12 +87,10 @@ export function createExecutionScope(context: TypeCellContext<any>) {`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`export function getModulesFromTypeCellCode(compiledCode: string, scope: any) {`
`90`		`- if (!compiledCode.match(/^(define\((".", )?\[.\], )function/gm)) {`
	`90`	`+ // Checks if define([], function) like code is already present`
	`91`	`+ if (!compiledCode.match(/(define\((".", )?\[.\], )function/gm)) {`
`91`	`92`	`// file is not a module (no exports). Create module-like code manually`
`92`		- compiledCode = `define([], function() {
`93`		`- ${compiledCode};`
`94`		`- });`
`95`		- `;
	`93`	+ compiledCode = `define([], function() { ${compiledCode}; });`;
`96`	`94`	`}`
`97`	`95`
`98`	`96`	`if (Object.keys(scope).find((key) => !/^[a-zA-Z0-9_$]+$/.test(key))) {`