Skip to content
This repository was archived by the owner on Feb 27, 2018. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
completion sets
  • Loading branch information
Lakate committed Nov 13, 2017
commit 0cd021695d3a314210e2c21a7efff9ae80e40828
8 changes: 6 additions & 2 deletions packages/bem-react-scripts/config/paths.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ const bemConfig = require('@bem/sdk.config')();
const userOptions = bemConfig.moduleSync('create-bem-react-app');
const levels = bemConfig.levelMapSync();

let sets = bemConfig.getSync().sets;
sets && Object.keys(sets).forEach(setName =>
sets[setName] = bemConfig.levelsSync(setName).map(level => level.path));

// Make sure any symlinks in the project folder are resolved:
// https://github.com/facebookincubator/create-react-app/issues/637
const appDirectory = fs.realpathSync(process.cwd());
Expand Down Expand Up @@ -87,7 +91,7 @@ module.exports = {
appPackageJson: resolveApp(userOptions.appPackageJson),
appSrc: resolveApp(userOptions.appSrc),
appLevels: levels,
appSets: bemConfig.getSync().sets,
appSets: sets,
appTarget: userOptions.target,
yarnLockFile: resolveApp(userOptions.yarnLockFile),
testsSetup: resolveApp(userOptions.testsSetup),
Expand Down Expand Up @@ -117,7 +121,7 @@ module.exports = {
appPackageJson: resolveApp(userOptions.appPackageJson),
appSrc: resolveApp(userOptions.appSrc),
appLevels: levels,
appSets: bemConfig.getSync().sets,
appSets: sets,
appTarget: userOptions.target,
yarnLockFile: resolveApp(userOptions.yarnLockFile),
testsSetup: resolveApp(userOptions.testsSetup),
Expand Down
3 changes: 1 addition & 2 deletions packages/bem-react-scripts/config/webpack.config.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,7 @@ function getConfig(setName) {
{
loader: 'webpack-bem-loader',
options: {
levels: paths.appLevels,
set: setName,
levels: setName ? paths.appSets[setName] : paths.appLevels,
techs: ['js', 'css']
},
},
Expand Down