Fix regex require finder

Author: CompuIves

packages/app/src/sandbox/eval/transpilers/babel/worker/simple-get-require-statements.js

@@ -1,6 +1,6 @@
 const lineRegex = /require\s*\(['|"|`]([^"|'|`]*)['|"|`]\)|require\s*\((.*)\)/g;
 const partRegex = /require\s*\(['|"|`]([^"|'|`]*)['|"|`]\)|require\s*\((.*)\)/;
-const commentRegex = /(\s*\*)|(\/\/)/;
+const commentRegex = /^(\s*\/?\*)|(\/\/)/;
 
 /**
  * This is the regex version of getting all require statements, it makes the assumption
@@ -21,7 +21,7 @@ export default function getRequireStatements(code: string) {
         const match = codePart.match(partRegex);
 
         if (match) {
-          if (commentMatch && line.indexOf('require') > commentMatch.index) {
+          if (commentMatch && line.indexOf(codePart) > commentMatch.index) {
             // It's in a comment
             return;
           }

packages/app/src/sandbox/eval/transpilers/babel/worker/simple-get-require-statements.test.js

@@ -0,0 +1,58 @@
+import getRequireStatements from './simple-get-require-statements';
+
+describe('simple-get-require-statements', () => {
+  it('finds a simple require statement', () => {
+    const code = `require('test')`;
+
+    expect(getRequireStatements(code)).toStrictEqual([
+      { type: 'direct', path: 'test' },
+    ]);
+  });
+
+  it('finds multiple require statement', () => {
+    const code = `require('test');
+    require('test2')`;
+
+    expect(getRequireStatements(code)).toStrictEqual([
+      { type: 'direct', path: 'test' },
+      { type: 'direct', path: 'test2' },
+    ]);
+  });
+
+  it('ignores commented require statement', () => {
+    const code = `require('test');
+    // require('test2')`;
+
+    expect(getRequireStatements(code)).toStrictEqual([
+      { type: 'direct', path: 'test' },
+    ]);
+  });
+
+  it('allows comment after require statement', () => {
+    const code = `require('test');
+    require('test2') // yes very nice`;
+
+    expect(getRequireStatements(code)).toStrictEqual([
+      { type: 'direct', path: 'test' },
+      { type: 'direct', path: 'test2' },
+    ]);
+  });
+
+  it('ignores second comment after require statement', () => {
+    const code = `require('test');
+    require('test2') // yes very nice require('nice')`;
+
+    expect(getRequireStatements(code)).toStrictEqual([
+      { type: 'direct', path: 'test' },
+      { type: 'direct', path: 'test2' },
+    ]);
+  });
+
+  it('handles a * that looks like a comment', () => {
+    const code = `$export($export.S + $export.F * !require('./_iter-detect')(function (iter) { Array.from(iter); }), 'Array', {`;
+
+    expect(getRequireStatements(code)).toStrictEqual([
+      { type: 'direct', path: './_iter-detect' },
+    ]);
+  });
+});