Skip to content

Commit

Permalink
let the script processer pick custom transformers when present
Browse files Browse the repository at this point in the history
  • Loading branch information
Vamsi Kalyan A committed Jan 30, 2019
1 parent 77ed857 commit 250f9d5
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 17 deletions.
4 changes: 4 additions & 0 deletions e2e/__projects__/custom-transformers/babel-transformer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
const { createTransformer } = require('babel-jest')
module.exports = createTransformer({
presets: ['@babel/preset-env']
})
3 changes: 0 additions & 3 deletions e2e/__projects__/custom-transformers/babel.config.js

This file was deleted.

6 changes: 2 additions & 4 deletions lib/process-style.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,8 @@ module.exports = function processStyle(stylePart, filename, config = {}) {
getGlobalResources(vueJestConfig.resources, stylePart.lang) +
stylePart.content

const transformer = getCustomTransformer(
vueJestConfig['transform'],
stylePart.lang
)
const transformer =
getCustomTransformer(vueJestConfig['transform'], stylePart.lang) || {}

// pre process
if (transformer.preprocess) {
Expand Down
10 changes: 6 additions & 4 deletions lib/process.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,21 @@ const path = require('path')
const getVueJestConfig = require('./utils').getVueJestConfig
const logResultErrors = require('./utils').logResultErrors
const stripInlineSourceMap = require('./utils').stripInlineSourceMap
const getCustomTransformer = require('./utils').getCustomTransformer
const throwError = require('./utils').throwError
const babelTransformer = require('babel-jest')
const compilerUtils = require('@vue/component-compiler-utils')
const convertSourceMap = require('convert-source-map')
const generateCode = require('./generate-code')

function resolveTransformer(lang, vueJestConfig) {
function resolveTransformer(lang = 'js', vueJestConfig) {
const transformer = getCustomTransformer(vueJestConfig['transform'], lang)
if (/^typescript$|tsx?$/.test(lang)) {
return typescriptTransformer
return transformer || typescriptTransformer
} else if (/^coffee$|coffeescript$/.test(lang)) {
return coffeescriptTransformer
return transformer || coffeescriptTransformer
} else {
return babelTransformer
return transformer || babelTransformer
}
}

Expand Down
6 changes: 2 additions & 4 deletions lib/typescript-transformer.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,8 @@ module.exports = {
plugins: [require('@babel/plugin-transform-modules-commonjs')]
}
}
const customTransformer = getCustomTransformer(
vueJestConfig['transform'],
'js'
)
const customTransformer =
getCustomTransformer(vueJestConfig['transform'], 'js') || {}
const transformer = customTransformer.process
? customTransformer
: babelJest.createTransformer(
Expand Down
2 changes: 1 addition & 1 deletion lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ const getCustomTransformer = function getCustomTransformer(
}
return transformer
}
return {}
return null
}

const throwError = function error(msg) {
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"format": "prettier --no-semi --single-quote --write '**/*.{js,json,md}'",
"format:check": "prettier --no-semi --single-quote --check '**/*.{js,json,md}'",
"lint": "eslint --ignore-path .gitignore '{,!(node_modules)/**/}*.js'",
"lint:fix": "npm run lint -- --fix",
"lint:fix": "npm run lint --fix",
"release": "semantic-release",
"test": "npm run lint && npm run format:check && npm run test:e2e",
"test:e2e": "node e2e/test-runner"
Expand Down

0 comments on commit 250f9d5

Please sign in to comment.