Skip to content

Commit 2831b72

Browse files
committed
convinced sort by default is better, adding -bs-no-sort-imports for power users
1 parent 44f3714 commit 2831b72

File tree

237 files changed

+642
-632
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

237 files changed

+642
-632
lines changed

jscomp/bin/bsb.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2668,7 +2668,7 @@ let set_no_any_assert () = no_any_assert := true
26682668
let get_no_any_assert () = !no_any_assert
26692669

26702670
let better_errors = ref false
2671-
let sort_imports = ref false
2671+
let sort_imports = ref true
26722672
let dump_js = ref false
26732673

26742674
let is_windows =

jscomp/bin/bsdep.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24927,7 +24927,7 @@ let set_no_any_assert () = no_any_assert := true
2492724927
let get_no_any_assert () = !no_any_assert
2492824928

2492924929
let better_errors = ref false
24930-
let sort_imports = ref false
24930+
let sort_imports = ref true
2493124931
let dump_js = ref false
2493224932

2493324933
let is_windows =

jscomp/bin/bsppx.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6774,7 +6774,7 @@ let set_no_any_assert () = no_any_assert := true
67746774
let get_no_any_assert () = !no_any_assert
67756775

67766776
let better_errors = ref false
6777-
let sort_imports = ref false
6777+
let sort_imports = ref true
67786778
let dump_js = ref false
67796779

67806780
let is_windows =

jscomp/bin/whole_compiler.ml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22316,7 +22316,7 @@ let set_no_any_assert () = no_any_assert := true
2231622316
let get_no_any_assert () = !no_any_assert
2231722317

2231822318
let better_errors = ref false
22319-
let sort_imports = ref false
22319+
let sort_imports = ref true
2232022320
let dump_js = ref false
2232122321

2232222322
let is_windows =
@@ -105788,7 +105788,12 @@ let buckle_script_flags =
105788105788
(
105789105789
"-bs-sort-imports",
105790105790
Arg.Set Js_config.sort_imports,
105791-
" Sort the imports by lexical order so the output will be more stable"
105791+
" Sort the imports by lexical order so the output will be more stable (default false)"
105792+
)
105793+
::
105794+
( "-bs-no-sort-imports",
105795+
Arg.Clear Js_config.sort_imports,
105796+
" No sort (see -bs-sort-imports)"
105792105797
)
105793105798
::
105794105799
("-bs-better-errors",

jscomp/common/js_config.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ let set_no_any_assert () = no_any_assert := true
215215
let get_no_any_assert () = !no_any_assert
216216

217217
let better_errors = ref false
218-
let sort_imports = ref false
218+
let sort_imports = ref true
219219
let dump_js = ref false
220220

221221
let is_windows =

jscomp/core/js_main.ml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,12 @@ let buckle_script_flags =
163163
(
164164
"-bs-sort-imports",
165165
Arg.Set Js_config.sort_imports,
166-
" Sort the imports by lexical order so the output will be more stable"
166+
" Sort the imports by lexical order so the output will be more stable (default false)"
167+
)
168+
::
169+
( "-bs-no-sort-imports",
170+
Arg.Clear Js_config.sort_imports,
171+
" No sort (see -bs-sort-imports)"
167172
)
168173
::
169174
("-bs-better-errors",

jscomp/test/a_filename_test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
'use strict';
22

3-
var Block = require("../../lib/js/block");
3+
var Mt = require("./mt");
44
var $$Array = require("../../lib/js/array");
5+
var Block = require("../../lib/js/block");
56
var Ext_filename = require("./ext_filename");
6-
var Mt = require("./mt");
77

88
var suites = [/* [] */0];
99

jscomp/test/a_list_test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
'use strict';
22

3+
var Mt = require("./mt");
34
var Block = require("../../lib/js/block");
45
var Ext_list = require("./ext_list");
5-
var Mt = require("./mt");
66

77
var suites_000 = /* tuple */[
88
"drop",

jscomp/test/a_string_test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
'use strict';
22

3-
var Block = require("../../lib/js/block");
4-
var Ext_string = require("./ext_string");
53
var Mt = require("./mt");
64
var List = require("../../lib/js/list");
5+
var Block = require("../../lib/js/block");
6+
var Ext_string = require("./ext_string");
77

88
var suites_000 = /* tuple */[
99
"split",

jscomp/test/and_or_tailcall_test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'use strict';
22

3-
var Block = require("../../lib/js/block");
43
var Mt = require("./mt");
4+
var Block = require("../../lib/js/block");
55

66
function f(b, _, _n) {
77
while(true) {

0 commit comments

Comments
 (0)