Comparing version 2.0.0-beta1 to 2.0.0-beta2
29
index.js
@@ -13,3 +13,3 @@ // @flow | ||
function jsFilePath(buildDir, moduleDir, resourcePath, inSource) { | ||
function jsFilePath(buildDir, moduleDir, resourcePath, inSource, bsSuffix) { | ||
const mlFileName = resourcePath.replace(buildDir, '') | ||
@@ -25,3 +25,3 @@ const jsFileName = mlFileName.replace(fileNameRegex, '.js') | ||
/*:: type Options = { moduleDir: BsModuleFormat | 'js', inSource: boolean } */ | ||
/*:: type Options = { moduleDir: BsModuleFormat | 'js', inSource: boolean, suffix: string } */ | ||
@@ -34,4 +34,11 @@ function getBsConfigModuleOptions(buildDir) /*: Promise<Options> */ { | ||
const bsSuffix = bsconfig.suffix | ||
const suffix = typeof bsSuffix === 'string' ? bsSuffix : '.js' | ||
if (!bsconfig['package-specs'] || !bsconfig['package-specs'].length) { | ||
const options /*: Options */ = { moduleDir: 'js', inSource: false } | ||
const options /*: Options */ = { | ||
moduleDir: 'js', | ||
inSource: false, | ||
suffix | ||
} | ||
return options | ||
@@ -46,3 +53,3 @@ } | ||
const options /*: Options */ = { moduleDir, inSource } | ||
const options /*: Options */ = { moduleDir, inSource, suffix } | ||
return options | ||
@@ -64,2 +71,3 @@ }) | ||
const moduleDir = bsconfig.moduleDir | ||
const bsSuffix = bsconfig.suffix | ||
@@ -72,3 +80,4 @@ const inSourceBuild = options.inSource || bsconfig.inSource || false | ||
this.resourcePath, | ||
inSourceBuild | ||
inSourceBuild, | ||
bsSuffix | ||
) | ||
@@ -90,3 +99,3 @@ | ||
callback(new Error(errors[errors.length - 1]), null) | ||
callback(errors[errors.length - 1], null) | ||
} else { | ||
@@ -105,5 +114,11 @@ callback(null, src || '') | ||
const moduleDir = 'js' | ||
const compiledFilePath = jsFilePath(process.cwd(), moduleDir, filename, false) | ||
const compiledFilePath = jsFilePath( | ||
process.cwd(), | ||
moduleDir, | ||
filename, | ||
false, | ||
'.js' | ||
) | ||
return compileFileSync(moduleDir, compiledFilePath) | ||
} |
{ | ||
"name": "bs-loader", | ||
"version": "2.0.0-beta1", | ||
"version": "2.0.0-beta2", | ||
"description": "Bucklescript integration in Webpack", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
8671
94