Skip to content

Commit

Permalink
Handle symlinks for itemToReplace in eZConfigManager.replace (#381)
Browse files Browse the repository at this point in the history
* Handle symlinks for itemToReplace in eZConfigManager.replace

* Handle symlinks in eZConfigManager.remove
  • Loading branch information
SerheyDolgushev authored and Łukasz Serwatka committed Mar 29, 2019
1 parent 6d153b1 commit 6893d36
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions ez.webpack.config.manager.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
const fs = require('fs');
const findItems = (eZConfig, entryName) => {
const items = eZConfig.entry[entryName];

Expand All @@ -9,7 +10,7 @@ const findItems = (eZConfig, entryName) => {
};
const replace = ({ eZConfig, entryName, itemToReplace, newItem }) => {
const items = findItems(eZConfig, entryName);
const indexToReplace = items.indexOf(itemToReplace);
const indexToReplace = items.indexOf(fs.realpathSync(itemToReplace));

if (indexToReplace < 0) {
throw new Error(`Couldn't find item "${itemToReplace}" in entry "${entryName}". Please check if there is a typo in the name.`);
Expand All @@ -19,8 +20,9 @@ const replace = ({ eZConfig, entryName, itemToReplace, newItem }) => {
};
const remove = ({ eZConfig, entryName, itemsToRemove }) => {
const items = findItems(eZConfig, entryName);
const realPathItemsToRemove = itemsToRemove.map((item) => fs.realpathSync(item));

eZConfig.entry[entryName] = items.filter((item) => !itemsToRemove.includes(item));
eZConfig.entry[entryName] = items.filter((item) => !realPathItemsToRemove.includes(item));
};
const add = ({ eZConfig, entryName, newItems }) => {
const items = findItems(eZConfig, entryName);
Expand Down

0 comments on commit 6893d36

Please sign in to comment.