fix: ensure correct babel options (#276)

* feat: bypass reading file cache with `--no-file-cache`

* fix: ensure correct babel options

Author: stoffeastrom

commands-common/register/src/index.js

@@ -28,8 +28,11 @@ function compileHook(argv, code, filename, virtualMock = false) {
   }
   const newArgv = {
     ...argv,
-    babelOptions: {
-      ...opts,
+    babel: {
+      ...argv.babel,
+      options: {
+        ...opts,
+      },
     },
     virtualMock,
   };

commands-common/transform/src/file-cache.js

@@ -44,13 +44,17 @@ class FileCache {
   getSync(filename, options = {}) {
     const {
       ignoreCacheInvalidation = false,
+      fileCache = true,
       virtualMock = false,
       babelOptions,
       instrument,
       transform,
     } = options;
     const value = this.safeLoadCacheSync(this.getCacheFilename(filename));
     this.transform.set(filename, value);
+    if (!fileCache) {
+      return null;
+    }
     if (ignoreCacheInvalidation) {
       return value;
     }

commands-common/transform/src/index.js

@@ -1,29 +1,26 @@
 /* eslint global-require: 0, import/no-dynamic-require: 0, object-curly-newline: 0, class-methods-use-this: 0, max-len: 0 */
-const path = require('path');
 const fs = require('fs');
 const { isSourceMap, isTypescript, ensureFilePath } = require('@after-work.js/utils');
 const FileCache = require('./file-cache');
 
 const fileCache = new FileCache();
 
 function getBabelOpts(filename, argv) {
-  const { options, babelPluginIstanbul } = argv.babel;
-  const sourceRoot = (options && options.sourceRoot) || argv.coverage ? path.dirname(filename) : undefined;// eslint-disable-line
+  const { options: { sourceRoot, only, ignore }, babelPluginIstanbul } = argv.babel;
   const addCoverage = argv.instrument.testExclude.shouldInstrument(filename);
   const plugins = addCoverage ?
     [[babelPluginIstanbul, {}]] :
     [];
   const sourceMaps = 'both';
   const retainLines = true;
-  const { only, ignore } = argv.babelOptions || {};
   return { filename, sourceRoot, plugins, only, ignore, sourceMaps, retainLines };
 }
 
 function transformTypescript(filePath, sourceRoot, tsContent, argv) {
   const { babel: { typescript } } = argv;
   const { transform: { typescript: { compilerOptions, babelOptions } } } = argv;
-  const fileName = argv.coverage ? path.basename(filePath) : filePath;
-  compilerOptions.sourceRoot = argv.coverage ? path.resolve(path.dirname(filePath)) : sourceRoot;
+  const fileName = filePath;
+  compilerOptions.sourceRoot = sourceRoot;
   compilerOptions.inlineSources = true;
   if (!compilerOptions.sourceMap && !compilerOptions.inlineSourceMap) {
     compilerOptions.inlineSourceMap = true;