vuejs · eddyerburgh · Jan 5, 2019 · Dec 29, 2018 · Jan 5, 2019 · Jan 5, 2019
diff --git a/.babelrc b/.babelrc
@@ -1,7 +1,3 @@
 {
-  "env": {
-    "test": {
-      "presets": ["env"]
-    }
-  }
+  "presets": ["@babel/env"]
 }
diff --git a/lib/cache.js b/lib/cache.js
diff --git a/lib/compilers/coffee-compiler.js b/lib/compilers/coffee-compiler.js
@@ -1,16 +1,18 @@
 const ensureRequire = require('../ensure-require.js')
-const throwError = require('../throw-error')
-const loadBabelConfig = require('../load-babel-config.js')
+const throwError = require('../utils').throwError
+const getBabelOptions = require('../utils').getBabelOptions

-module.exports = function(raw, config, filePath) {
+module.exports = function(src, filename, config) {
  ensureRequire('coffee', ['coffeescript'])
  const coffee = require('coffeescript')
+  const babelOptions = getBabelOptions(filename)
  let compiled
  try {
-    compiled = coffee.compile(raw, {
+    compiled = coffee.compile(src, {
+      filename,
      bare: true,
      sourceMap: true,
-      transpile: loadBabelConfig(config, filePath)
+      transpile: babelOptions
    })
  } catch (err) {
    throwError(err)

diff --git a/lib/compilers/helpers/local-resolve-helper.js b/lib/compilers/helpers/local-resolve-helper.js
diff --git a/lib/compilers/helpers/module-name-mapper-helper.js b/lib/compilers/helpers/module-name-mapper-helper.js
@@ -1,4 +1,18 @@
-const localResolve = require('./local-resolve-helper')
+const path = require('path')
+
+/**
+ * Resolves the path to the file locally.
+ *
+ * @param {String} to - the name of the file to resolve to
+ * @param {String} localPath - the local path
+ * @returns {String} path - path to the file to import
+ */
+function localResolve(to, localPath) {
+  if (localPath.startsWith('/')) {
+    return localPath
+  }
+  return path.join(path.dirname(to), localPath)
+}

 /**
 * Applies the moduleNameMapper substitution from the jest config

diff --git a/lib/compilers/sass-compiler.js b/lib/compilers/sass-compiler.js
@@ -1,6 +1,6 @@
 const ensureRequire = require('../ensure-require')
-const getVueJestConfig = require('../get-vue-jest-config')
-const logger = require('../logger')
+const getVueJestConfig = require('../utils').getVueJestConfig
+const warn = require('../utils').warn

 const applyModuleNameMapper = require('./helpers/module-name-mapper-helper')

@@ -35,10 +35,10 @@ module.exports = (content, filePath, jestConfig = {}) => {
      .css.toString()
  } catch (err) {
    if (!vueJestConfig.hideStyleWarn) {
-      logger.warn(
+      warn(
        `There was an error rendering the SASS in ${filePath}. SASS is fully supported by vue-jest. Still some features might throw errors. Webpack aliases are a common cause of errors. If you use Webpack aliases, please use jest's suggested way via moduleNameMapper which is supported.`
      )
-      logger.warn(`Error while compiling styles: ${err}`)
+      warn(`Error while compiling styles: ${err}`)
    }
  }


diff --git a/lib/compilers/scss-compiler.js b/lib/compilers/scss-compiler.js
@@ -1,8 +1,8 @@
 const path = require('path')
 const fs = require('fs')
 const ensureRequire = require('../ensure-require')
-const getVueJestConfig = require('../get-vue-jest-config')
-const logger = require('../logger')
+const getVueJestConfig = require('../utils').getVueJestConfig
+const warn = require('../utils').warn

 const applyModuleNameMapper = require('./helpers/module-name-mapper-helper')

@@ -45,10 +45,10 @@ module.exports = (content, filePath, jestConfig = {}) => {
      .css.toString()
  } catch (err) {
    if (!vueJestConfig.hideStyleWarn) {
-      logger.warn(
+      warn(
        `There was an error rendering the SCSS in ${filePath}. SCSS is fully supported by vue-jest. Still some features might throw errors. Webpack aliases are a common cause of errors. If you use Webpack aliases, please use jest's suggested way via moduleNameMapper which is supported.`
      )
-      logger.warn(`Error while compiling styles: ${err}`)
+      warn(`Error while compiling styles: ${err}`)
    }
  }


diff --git a/lib/compilers/typescript-compiler.js b/lib/compilers/typescript-compiler.js
@@ -1,34 +1,35 @@
 const ensureRequire = require('../ensure-require')
-const loadBabelConfig = require('../load-babel-config.js')
-const { loadTypescriptConfig } = require('../load-typescript-config')
 const babelJest = require('babel-jest')
-const getVueJestConfig = require('../get-vue-jest-config')
+const getBabelOptions = require('../utils').getBabelOptions
+const getTsJestConfig = require('../utils').getTsJestConfig
+const stripInlineSourceMap = require('../utils').stripInlineSourceMap

 module.exports = function compileTypescript(scriptContent, filePath, config) {
  ensureRequire('typescript', ['typescript'])
-  const vueJestConfig = getVueJestConfig(config)
  const typescript = require('typescript')
-  const tsConfig = loadTypescriptConfig(vueJestConfig)

-  const res = typescript.transpileModule(scriptContent, tsConfig)
+  const { tsconfig } = getTsJestConfig(config)
+  const babelOptions = getBabelOptions(filePath)
+
+  const res = typescript.transpileModule(scriptContent, tsconfig)
+
+  res.outputText = stripInlineSourceMap(res.outputText)
+
  const inputSourceMap =
    res.sourceMapText !== undefined ? JSON.parse(res.sourceMapText) : ''

  // handle ES modules in TS source code in case user uses non commonjs module
  // output and there is no .babelrc.
-  let inlineBabelConfig = {}
-  if (
-    tsConfig.compilerOptions.module !== 'commonjs' &&
-    !loadBabelConfig(vueJestConfig)
-  ) {
-    inlineBabelConfig = {
-      plugins: [require('babel-plugin-transform-es2015-modules-commonjs')]
+  let inlineBabelOptions = {}
+  if (tsconfig.compilerOptions.module !== 'commonjs' && !babelOptions) {
+    inlineBabelOptions = {
+      plugins: [require('@babel/plugin-transform-modules-commonjs')]
    }
  }
+
  const transformer = babelJest.createTransformer(
-    Object.assign(inlineBabelConfig, {
-      inputSourceMap
-    })
+    Object.assign(inlineBabelOptions, { inputSourceMap })
  )
+
  return transformer.process(res.outputText, filePath, config)
 }
diff --git a/lib/deprecate.js b/lib/deprecate.js
diff --git a/lib/ensure-require.js b/lib/ensure-require.js
@@ -1,4 +1,4 @@
-const throwError = require('./throw-error')
+const throwError = require('./utils').throwError

 module.exports = function(name, deps) {
  let i, len

diff --git a/lib/get-cache-key.js b/lib/get-cache-key.js
diff --git a/lib/get-vue-jest-config.js b/lib/get-vue-jest-config.js
diff --git a/lib/load-babel-config.js b/lib/load-babel-config.js
diff --git a/lib/load-typescript-config.js b/lib/load-typescript-config.js
diff --git a/lib/logger.js b/lib/logger.js
diff --git a/lib/process-style.js b/lib/process-style.js
@@ -1,4 +1,4 @@
-const getVueJestConfig = require('./get-vue-jest-config')
+const getVueJestConfig = require('./utils').getVueJestConfig
 const cssExtract = require('extract-from-css')

 module.exports = function processStyle(stylePart, filePath, jestConfig = {}) {