src/utils/extract_config.js in hauler-0.2.0 vs src/utils/extract_config.js in hauler-0.3.0

- old
+ new

@@ -20,14 +20,24 @@ const customLoaders = config.module && config.module.loaders || []; return baseLoaders.concat(customLoaders); } +function extractResolveAlias(config: ProjectConfig): Object { + const resolveConfig = config.compiler && config.compiler.resolve || {}; + const alias = resolveValuesRailsPath(resolveConfig.alias); + if (config.appName != null) { + Object.assign(alias, { [config.appName]: railsPath('~app/assets/') }); + } + + return alias; +} + function extractResolve(config: ProjectConfig): WebpackResolveConfig { const resolveConfig = config.compiler && config.compiler.resolve || {}; return Object.assign(resolveConfig, { - alias: resolveValuesRailsPath(resolveConfig.alias), - root: railsPath(resolveConfig.root), + alias: extractResolveAlias(config), + modules: railsPath(resolveConfig.modules), }); } function extractPlugins(config: ProjectConfig): Array<WebpackPlugin> { const prepend = config.prependPlugins || [];