From 99a6efac045f99a55aad35b14188679ad6fe1579 Mon Sep 17 00:00:00 2001 From: JoelWAnna Date: Mon, 11 Sep 2017 17:52:54 -0700 Subject: [PATCH 1/2] Sort named imports --- transform.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/transform.js b/transform.js index 3a6b9e6..9f4b5cb 100644 --- a/transform.js +++ b/transform.js @@ -482,12 +482,19 @@ function transform(file, api, options) { let result = importStatement.slice(0, openCurly + 1); let named = importStatement .slice(openCurly + 1, -6).split(',') + .sort() .map(name => `\n ${name.trim()}`); return result + named.join(',') + '\n} from'; } else { - // if the segment is < 50 chars just make sure it has proper spacing - return importStatement + + let result = importStatement.slice(0, openCurly + 1); + let named = importStatement + .slice(openCurly + 1, -6).split(',').sort(); + + const sorted = result + named.join(',') + '\n} from'; + // if the segment is < 50 chars sort and make sure it has proper spacing + return sorted .replace(/,\s*/g, ', ') // ensure there is a space after commas .replace(/\{\s*/, '{ ') .replace(/\s*\}/, ' }'); From ee244e6a39bacc1b09efe7b42c51560ce7de0a60 Mon Sep 17 00:00:00 2001 From: JoelWAnna Date: Mon, 11 Sep 2017 17:57:32 -0700 Subject: [PATCH 2/2] Update transform.js --- transform.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/transform.js b/transform.js index 9f4b5cb..8e79d30 100644 --- a/transform.js +++ b/transform.js @@ -488,8 +488,8 @@ function transform(file, api, options) { return result + named.join(',') + '\n} from'; } else { - let result = importStatement.slice(0, openCurly + 1); - let named = importStatement + const result = importStatement.slice(0, openCurly + 1); + const named = importStatement .slice(openCurly + 1, -6).split(',').sort(); const sorted = result + named.join(',') + '\n} from';