Handle glob require statements containing a concat

CompuIves · CompuIves · commit adb7d9a33bcd · 2020-03-26T10:35:36.000+01:00
diff --git a/packages/app/src/sandbox/eval/transpilers/babel/index.ts b/packages/app/src/sandbox/eval/transpilers/babel/index.ts
@@ -63,27 +63,33 @@ class BabelTranspiler extends WorkerTranspiler {
         }
       }
 
-      // When we find a node_module that already is commonjs we will just get the
-      // dependencies from the file and return the same code. We get the dependencies
-      // with a regex since commonjs modules just have `require` and regex is MUCH
-      // faster than generating an AST from the code.
-      if (
-        (loaderContext.options.simpleRequire ||
-          path.startsWith('/node_modules')) &&
-        !shouldTranspile(newCode, path)
-      ) {
-        regexGetRequireStatements(newCode).forEach(dependency => {
-          if (dependency.isGlob) {
-            loaderContext.addDependenciesInDirectory(dependency.path);
-          } else {
-            loaderContext.addDependency(dependency.path);
-          }
-        });
+      try {
+        // When we find a node_module that already is commonjs we will just get the
+        // dependencies from the file and return the same code. We get the dependencies
+        // with a regex since commonjs modules just have `require` and regex is MUCH
+        // faster than generating an AST from the code.
+        if (
+          (loaderContext.options.simpleRequire ||
+            path.startsWith('/node_modules')) &&
+          !shouldTranspile(newCode, path)
+        ) {
+          regexGetRequireStatements(newCode).forEach(dependency => {
+            if (dependency.isGlob) {
+              loaderContext.addDependenciesInDirectory(dependency.path);
+            } else {
+              loaderContext.addDependency(dependency.path);
+            }
+          });
 
-        resolve({
-          transpiledCode: newCode,
-        });
-        return;
+          resolve({
+            transpiledCode: newCode,
+          });
+          return;
+        }
+      } catch (e) {
+        console.warn(
+          `Error when reading dependencies of '${path}' using quick method: '${e.message}'`
+        );
       }
 
       const configs = loaderContext.options.configurations;
diff --git a/packages/app/src/sandbox/eval/transpilers/babel/worker/babel-worker.js b/packages/app/src/sandbox/eval/transpilers/babel/worker/babel-worker.js
@@ -380,6 +380,7 @@ async function compile(code, customConfig, path, isV7) {
     }
 
     const dependencies = getDependencies(detective.metadata(result));
+    console.log(path, dependencies);
     if (isV7) {
       // Force push this dependency, there are cases where it isn't included out of our control.
       // https://twitter.com/vigs072/status/1103005932886343680
diff --git a/packages/app/src/sandbox/eval/transpilers/babel/worker/get-require-statements.js b/packages/app/src/sandbox/eval/transpilers/babel/worker/get-require-statements.js
@@ -14,6 +14,17 @@ export default function getRequireStatements(metadata) {
         res[s.left.value] = 'glob';
       } else if (s.type === 'TemplateLiteral') {
         res[s.quasis[0].value.raw] = 'glob';
+      } else if (
+        s.type === 'CallExpression' &&
+        s.callee.type === 'MemberExpression' &&
+        s.callee.property.type === 'Identifier' &&
+        s.callee.property.name === 'concat' &&
+        s.arguments[0] &&
+        s.arguments[0].left.type === 'BinaryExpression' &&
+        s.arguments[0].left.left.type === 'StringLiteral'
+      ) {
+        // require("".concat('./assets/' + ... + '.js');
+        res[s.arguments[0].left.left.value] = 'glob';
       }
     });
   }
diff --git a/packages/app/src/sandbox/eval/transpilers/babel/worker/simple-get-require-statements.test.ts b/packages/app/src/sandbox/eval/transpilers/babel/worker/simple-get-require-statements.test.ts
diff --git a/packages/app/src/sandbox/eval/transpilers/babel/worker/simple-get-require-statements.ts b/packages/app/src/sandbox/eval/transpilers/babel/worker/simple-get-require-statements.ts
@@ -14,6 +14,10 @@ export default function getRequireStatements(code: string) {
       return;
     }
 
+    if (line.includes('require("".concat')) {
+      throw new Error('Glob require is part of statement');
+    }
+
     const matches = line.match(lineRegex);
 
     if (matches) {

Original file line number	Diff line number	Diff line change
`@@ -380,6 +380,7 @@ async function compile(code, customConfig, path, isV7) {`
`380`	`380`	`}`
`381`	`381`
`382`	`382`	`const dependencies = getDependencies(detective.metadata(result));`
	`383`	`+ console.log(path, dependencies);`
`383`	`384`	`if (isV7) {`
`384`	`385`	`// Force push this dependency, there are cases where it isn't included out of our control.`
`385`	`386`	`// https://twitter.com/vigs072/status/1103005932886343680`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,10 @@ export default function getRequireStatements(code: string) {`
`14`	`14`	`return;`
`15`	`15`	`}`
`16`	`16`
	`17`	`+ if (line.includes('require("".concat')) {`
	`18`	`+ throw new Error('Glob require is part of statement');`
	`19`	`+ }`
	`20`	`+`
`17`	`21`	`const matches = line.match(lineRegex);`
`18`	`22`
`19`	`23`	`if (matches) {`