Skip to content

fix: use posix path.sep in linking of header search path #635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 15, 2019
Merged

fix: use posix path.sep in linking of header search path #635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67f2445
chore: fix getHeaderSearchPath test
thymikee Aug 15, 2019
267f449
use posix path sep in getHeaderSearchPath as well
thymikee Aug 15, 2019
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
3 changes: 1 addition & 2 deletions packages/platform-ios/src/link/__tests__/getHeaderSearchPath-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
*/

import getHeaderSearchPath from '../getHeaderSearchPath';

const path = require('path');
import {posix as path} from 'path';

const SRC_DIR = path.join('react-native-project', 'ios');

Expand Down
8 changes: 4 additions & 4 deletions packages/platform-ios/src/link/getHeaderSearchPath.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* @format
*/

import path from 'path';
import {posix as path} from 'path';
import {last, union} from 'lodash';

/**
Expand All @@ -22,14 +22,14 @@ import {last, union} from 'lodash';
*/
const getOuterDirectory = directories =>
directories.reduce((topDir, currentDir) => {
const currentFolders = currentDir.split('/');
const topMostFolders = topDir.split('/');
const currentFolders = currentDir.split(path.sep);
const topMostFolders = topDir.split(path.sep);

if (
currentFolders.length === topMostFolders.length &&
last(currentFolders) !== last(topMostFolders)
) {
return currentFolders.slice(0, -1).join('/');
return currentFolders.slice(0, -1).join(path.sep);
}

return currentFolders.length < topMostFolders.length ? currentDir : topDir;
Expand Down