From 04809327128d24c2e5d8cec55599d00ec49b7ce6 Mon Sep 17 00:00:00 2001 From: David Harris Date: Tue, 2 Feb 2016 22:17:29 -0700 Subject: [PATCH 1/3] Trim relative portions from the paths --- src/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index f269b21..f68c825 100644 --- a/src/index.js +++ b/src/index.js @@ -154,9 +154,11 @@ export default function () { file.metadata['react-intl'] = {messages: descriptors}; if (opts.messagesDir && descriptors.length > 0) { + let relativePath = p.relative(process.cwd(), filename); + relativePath = relativePath.replace(/\.{2}\//, ''); let messagesFilename = p.join( opts.messagesDir, - p.dirname(p.relative(process.cwd(), filename)), + p.dirname(relativePath), basename + '.json' ); From 6ba632cbe1c56c52a1a035032daa3fe5eddd1086 Mon Sep 17 00:00:00 2001 From: David Harris Date: Tue, 2 Feb 2016 22:43:42 -0700 Subject: [PATCH 2/3] Make the replacement global --- src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index f68c825..af83ac9 100644 --- a/src/index.js +++ b/src/index.js @@ -155,7 +155,7 @@ export default function () { if (opts.messagesDir && descriptors.length > 0) { let relativePath = p.relative(process.cwd(), filename); - relativePath = relativePath.replace(/\.{2}\//, ''); + relativePath = relativePath.replace(/\.{2}\//g, ''); let messagesFilename = p.join( opts.messagesDir, p.dirname(relativePath), From ed0042ddea7d70717109344cc454eb21caf11bb7 Mon Sep 17 00:00:00 2001 From: David Harris Date: Wed, 3 Feb 2016 09:41:26 -0700 Subject: [PATCH 3/3] Simpler way to fix the relative path, as per @ericf --- src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.js b/src/index.js index af83ac9..da988e7 100644 --- a/src/index.js +++ b/src/index.js @@ -155,7 +155,7 @@ export default function () { if (opts.messagesDir && descriptors.length > 0) { let relativePath = p.relative(process.cwd(), filename); - relativePath = relativePath.replace(/\.{2}\//g, ''); + relativePath = p.normalize(p.sep + relativePath); let messagesFilename = p.join( opts.messagesDir, p.dirname(relativePath),