Fix types

Author: CompuIves

packages/app/package.json

@@ -248,7 +248,6 @@
     "@graphql-codegen/typescript-graphql-files-modules": "^1.8.2",
     "@graphql-codegen/typescript-operations": "^1.8.2",
     "@sentry/cli": "^1.47.1",
-    "@types/astring": "^1.3.0",
     "@types/codemirror": "^0.0.72",
     "@types/debug": "^4.1.1",
     "@types/gsap": "^1.20.1",

packages/app/src/sandbox/eval/transpilers/babel/convert-esmodule/index.test.ts

@@ -5,14 +5,14 @@ describe('convert-esmodule', () => {
     const code = `
       export * from './test/store.js';
     `;
-    expect(convertEsModule('/index.js', code)).toMatchSnapshot();
+    expect(convertEsModule(code)).toMatchSnapshot();
   });
 
   it('can convert normal exports', () => {
     const code = `
       export { test, test2 } from './test/store.js';
     `;
-    expect(convertEsModule('/index.js', code)).toMatchSnapshot();
+    expect(convertEsModule(code)).toMatchSnapshot();
   });
 
   it('can convert function exports', () => {
@@ -21,63 +21,63 @@ describe('convert-esmodule', () => {
       export const test2 = () => {}
       export class Test {}
     `;
-    expect(convertEsModule('/index.js', code)).toMatchSnapshot();
+    expect(convertEsModule(code)).toMatchSnapshot();
   });
 
   it('can convert default exports', () => {
     const code = `
       export default function test() {}
     `;
-    expect(convertEsModule('/index.js', code)).toMatchSnapshot();
+    expect(convertEsModule(code)).toMatchSnapshot();
   });
 
   it('can convert class default exports', () => {
     const code = `
       export default class A {}
     `;
-    expect(convertEsModule('/index.js', code)).toMatchSnapshot();
+    expect(convertEsModule(code)).toMatchSnapshot();
   });
 
   it('can convert weird default exports', () => {
     const code = `
       export default a = 'b';
     `;
-    expect(convertEsModule('/index.js', code)).toMatchSnapshot();
+    expect(convertEsModule(code)).toMatchSnapshot();
   });
 
   it('can convert default imports', () => {
     const code = `
       import a from './b';
     `;
-    expect(convertEsModule('/index.js', code)).toMatchSnapshot();
+    expect(convertEsModule(code)).toMatchSnapshot();
   });
 
   it('can convert named imports', () => {
     const code = `
       import {a, b, c} from './b';
     `;
-    expect(convertEsModule('/index.js', code)).toMatchSnapshot();
+    expect(convertEsModule(code)).toMatchSnapshot();
   });
 
   it('can handle as imports', () => {
     const code = `
       import { a as b } from './b';
     `;
-    expect(convertEsModule('/index.js', code)).toMatchSnapshot();
+    expect(convertEsModule(code)).toMatchSnapshot();
   });
 
   it('ignores comments', () => {
     const code = `
       // import { a as b } from './b';
     `;
-    expect(convertEsModule('/index.js', code)).toMatchSnapshot();
+    expect(convertEsModule(code)).toMatchSnapshot();
   });
 
   it('can handle inline comments', () => {
     const code = `
       import { a as b, /* HELLO WORLD */ c } from './b';
     `;
-    expect(convertEsModule('/index.js', code)).toMatchSnapshot();
+    expect(convertEsModule(code)).toMatchSnapshot();
   });
 
   it('can handle class properties', () => {
@@ -92,7 +92,7 @@ describe('convert-esmodule', () => {
         static d = ''
       }
     `;
-    expect(convertEsModule('/index.js', code)).toMatchSnapshot();
+    expect(convertEsModule(code)).toMatchSnapshot();
   });
 
   it('can handle async code', () => {
@@ -102,17 +102,19 @@ describe('convert-esmodule', () => {
         const test = await test2()
       }
     `;
-    expect(convertEsModule('/index.js', code)).toMatchSnapshot();
+    expect(convertEsModule(code)).toMatchSnapshot();
   });
 
   it.skip('has good perf', () => {
+    /* eslint-disable */
     const code = require('./big-file');
 
     const t = Date.now();
 
     for (let i = 0; i < 1; i++) {
-      convertEsModule('/index.js', code);
+      convertEsModule(code);
     }
     console.log(Date.now() - t);
+    /* eslint-enable */
   });
 });

packages/app/src/sandbox/eval/transpilers/babel/convert-esmodule/index.ts

@@ -3,7 +3,6 @@
 import * as meriyah from 'meriyah';
 import * as astring from 'astring';
 import { basename } from 'path';
-import { measure, endMeasure } from '../../../../utils/metrics';
 import { Syntax as n } from './syntax';
 import {
   generateRequireStatement,
@@ -17,7 +16,7 @@ import { customGenerator } from './generator';
 /**
  * Converts esmodule code to commonjs code, built to be as fast as possible
  */
-export function convertEsModule(path: string, code: string) {
+export function convertEsModule(code: string) {
   const usedVarNames = [];
 
   const getVarName = (name: string) => {

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

@@ -49,11 +49,12 @@ class BabelTranspiler extends WorkerTranspiler {
   ): Promise<{ transpiledCode: string }> {
     return new Promise((resolve, reject) => {
       const { path } = loaderContext;
+      let newCode = code;
 
-      if (isESModule(code) && path.indexOf('/node_modules') > -1) {
+      if (isESModule(newCode) && path.indexOf('/node_modules') > -1) {
         try {
           measure(`es-${path}`);
-          code = convertEsModule(path, code);
+          newCode = convertEsModule(newCode);
           endMeasure(`es-${path}`);
         } catch (e) {
           console.warn(
@@ -69,9 +70,9 @@ class BabelTranspiler extends WorkerTranspiler {
       if (
         (loaderContext.options.simpleRequire ||
           path.startsWith('/node_modules')) &&
-        !shouldTranspile(code, path)
+        !shouldTranspile(newCode, path)
       ) {
-        regexGetRequireStatements(code).forEach(dependency => {
+        regexGetRequireStatements(newCode).forEach(dependency => {
           if (dependency.isGlob) {
             loaderContext.addDependenciesInDirectory(dependency.path);
           } else {
@@ -80,7 +81,7 @@ class BabelTranspiler extends WorkerTranspiler {
         });
 
         resolve({
-          transpiledCode: code,
+          transpiledCode: newCode,
         });
         return;
       }
@@ -119,7 +120,7 @@ class BabelTranspiler extends WorkerTranspiler {
 
       this.queueTask(
         {
-          code,
+          code: newCode,
           config: babelConfig,
           path,
           loaderOptions,

yarn.lock

@@ -3943,14 +3943,6 @@
   resolved "https://registry.yarnpkg.com/@types/asap/-/asap-2.0.0.tgz#d529e9608c83499a62ae08c871c5e62271aa2963"
   integrity sha512-upIS0Gt9Mc8eEpCbYMZ1K8rhNosfKUtimNcINce+zLwJF5UpM3Vv7yz3S5l/1IX+DxTa8lTkUjqynvjRXyJzsg==
 
-"@types/astring@^1.3.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@types/astring/-/astring-1.3.0.tgz#c576a8eba50592d707e78dccd2aa50513f0c1866"
-  integrity sha512-PYUIKAlUl95QIoWrvTW1aj5YJoiBLukCixTBKkVMq17BbkcX4I6Yn7lkltzsM3fXByV4l2x4tJGYhHqyYnhH4A==
-  dependencies:
-    "@types/estree" "*"
-    "@types/node" "*"
-
 "@types/babel__core@^7.1.0":
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.2.tgz#608c74f55928033fce18b99b213c16be4b3d114f"