Fix macros wrong initialization

Author: CompuIves

packages/app/config/webpack.common.js

@@ -119,16 +119,32 @@ module.exports = {
         ],
         loader: 'babel-loader',
         query: {
+          overrides: [
+            !__DEV__ && {
+              include: path.join(__dirname, '../../sandbox'),
+              presets: [
+                [
+                  '@babel/preset-env',
+                  {
+                    targets: {
+                      ie: 11,
+                    },
+                    modules: 'umd',
+                    useBuiltIns: false,
+                  },
+                ],
+              ],
+            },
+          ].filter(Boolean),
           presets: [
             '@babel/preset-flow',
             [
               '@babel/preset-env',
               {
                 targets: {
-                  ie: 11,
-                  esmodules: true,
+                  browsers: 'last 2 versions',
                 },
-                modules: 'umd',
+                modules: false,
                 useBuiltIns: false,
               },
             ],

packages/app/src/sandbox/eval/transpilers/babel/index.js

@@ -73,14 +73,16 @@ class BabelTranspiler extends WorkerTranspiler {
       const loaderOptions = loaderContext.options || {};
 
       const dependencies =
-        configs.package &&
-        configs.package.parsed &&
-        configs.package.parsed.dependencies || {};
+        (configs.package &&
+          configs.package.parsed &&
+          configs.package.parsed.dependencies) ||
+        {};
 
       const devDependencies =
-        configs.package &&
-        configs.package.parsed &&
-        configs.package.parsed.devDependencies || {};
+        (configs.package &&
+          configs.package.parsed &&
+          configs.package.parsed.devDependencies) ||
+        {};
 
       const isV7 =
         loaderContext.options.isV7 || isBabel7(dependencies, devDependencies);

packages/app/src/sandbox/eval/transpilers/babel/worker/babel-worker.js

@@ -157,6 +157,46 @@ async function installPreset(Babel, BFSRequire, preset, currentPath, isV7) {
   );
 }
 
+function compile(code, customConfig, path) {
+  let result;
+  try {
+    result = Babel.transform(code, customConfig);
+  } catch (e) {
+    e.message = e.message.replace('unknown', path);
+
+    // Match the line+col
+    const lineColRegex = /\((\d+):(\d+)\)/;
+
+    const match = e.message.match(lineColRegex);
+    if (match && match[1] && match[2]) {
+      const lineNumber = +match[1];
+      const colNumber = +match[2];
+
+      const niceMessage =
+        e.message + '\n\n' + codeFrame(code, lineNumber, colNumber);
+
+      e.message = niceMessage;
+    }
+
+    throw e;
+  }
+
+  const dependencies = getDependencies(detective.metadata(result));
+
+  dependencies.forEach(dependency => {
+    self.postMessage({
+      type: 'add-dependency',
+      path: dependency.path,
+      isGlob: dependency.type === 'glob',
+    });
+  });
+
+  self.postMessage({
+    type: 'result',
+    transpiledCode: result.code,
+  });
+}
+
 self.importScripts(
   process.env.NODE_ENV === 'development'
     ? `${process.env.CODESANDBOX_HOST || ''}/static/js/babel.7.00-1.min.js`
@@ -430,44 +470,20 @@ self.addEventListener('message', async event => {
             plugins,
           };
 
-    let result;
     try {
-      result = Babel.transform(code, customConfig);
+      compile(code, customConfig, path);
     } catch (e) {
-      // Match the line+col
-      const lineColRegex = /\((\d+):(\d+)\)/;
-
-      const match = e.message.match(lineColRegex);
-      if (match && match[1] && match[2]) {
-        const lineNumber = +match[1];
-        const colNumber = +match[2];
-
-        const niceMessage =
-          e.message + '\n\n' + codeFrame(code, lineNumber, colNumber);
+      if (e.code === 'EIO') {
+        // BrowserFS was needed but wasn't initialized
+        await waitForFs();
 
-        e.message = niceMessage;
+        compile(code, customConfig, path);
+      } else {
+        throw e;
       }
-
-      throw e;
     }
-
-    const dependencies = getDependencies(detective.metadata(result));
-
-    dependencies.forEach(dependency => {
-      self.postMessage({
-        type: 'add-dependency',
-        path: dependency.path,
-        isGlob: dependency.type === 'glob',
-      });
-    });
-
-    self.postMessage({
-      type: 'result',
-      transpiledCode: result.code,
-    });
   } catch (e) {
     console.error(e);
-    e.message = e.message.replace('unknown', path);
     self.postMessage({
       type: 'error',
       error: buildWorkerError(e),