Skip to content

Commit 03a4f59

Browse files
nkrkvcristianoc
nkrkv
authored and
cristianoc
committed
Step back and revoke .res.* suffix options
1 parent 81c7caf commit 03a4f59

File tree

10 files changed

+7
-93
lines changed

10 files changed

+7
-93
lines changed

‎docs/docson/build-schema.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"description": "es6-global generate relative `require` paths instead of relying on NodeJS' module resolution. Default: commonjs."
77
},
88
"suffix-spec": {
9-
"enum": [".js", ".bs.js", ".mjs", ".cjs"],
9+
"enum": [".js", ".mjs", ".cjs", ".bs.js", ".bs.mjs", ".bs.cjs"],
1010
"description": "suffix of generated js files, default to [.js] "
1111
},
1212
"module-format-object": {

‎jscomp/bsb/bsb_package_specs.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ let extract_bs_suffix_exn (map : json_map) : Ext_js_suffix.t =
189189
let s = Ext_js_suffix.of_string str in
190190
if s = Unknown_extension then
191191
Bsb_exception.errorf ~loc
192-
"expect .js, .bs.js, .res.js, .mjs, .bs.mjs, .res.mjs, .cjs, .bs.cjs, .res.cjs here"
192+
"expect .js, .mjs, .cjs or .bs.js, .bs.mjs, .bs.cjs here"
193193
else s
194194
| Some config ->
195195
Bsb_exception.config_error config

‎jscomp/ext/ext_js_suffix.ml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,28 @@
11
type t =
22
| Js
33
| Bs_js
4-
| Res_js
54
| Mjs
65
| Bs_mjs
7-
| Res_mjs
86
| Cjs
97
| Bs_cjs
10-
| Res_cjs
118
| Unknown_extension
129

1310
let to_string (x : t) =
1411
match x with
1512
| Js -> Literals.suffix_js
1613
| Bs_js -> Literals.suffix_bs_js
17-
| Res_js -> Literals.suffix_res_js
1814
| Mjs -> Literals.suffix_mjs
1915
| Bs_mjs -> Literals.suffix_bs_mjs
20-
| Res_mjs -> Literals.suffix_res_mjs
2116
| Cjs -> Literals.suffix_cjs
2217
| Bs_cjs -> Literals.suffix_bs_cjs
23-
| Res_cjs -> Literals.suffix_res_cjs
2418
| Unknown_extension -> assert false
2519

2620
let of_string (x : string) : t =
2721
match () with
2822
| () when x = Literals.suffix_js -> Js
2923
| () when x = Literals.suffix_bs_js -> Bs_js
30-
| () when x = Literals.suffix_res_js -> Res_js
3124
| () when x = Literals.suffix_mjs -> Mjs
3225
| () when x = Literals.suffix_bs_mjs -> Bs_mjs
33-
| () when x = Literals.suffix_res_mjs -> Res_mjs
3426
| () when x = Literals.suffix_cjs -> Cjs
3527
| () when x = Literals.suffix_bs_cjs -> Bs_cjs
36-
| () when x = Literals.suffix_res_cjs -> Res_cjs
3728
| _ -> Unknown_extension

‎jscomp/ext/literals.ml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,20 +125,14 @@ let suffix_js = ".js"
125125

126126
let suffix_bs_js = ".bs.js"
127127

128-
let suffix_res_js = ".res.js"
129-
130128
let suffix_mjs = ".mjs"
131129

132130
let suffix_bs_mjs = ".bs.mjs"
133131

134-
let suffix_res_mjs = ".res.mjs"
135-
136132
let suffix_cjs = ".cjs"
137133

138134
let suffix_bs_cjs = ".bs.cjs"
139135

140-
let suffix_res_cjs = ".res.cjs"
141-
142136
let suffix_gen_js = ".gen.js"
143137

144138
let suffix_gen_tsx = ".gen.tsx"

‎lib/4.06.1/bsb_helper.ml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1313,20 +1313,14 @@ let suffix_js = ".js"
13131313

13141314
let suffix_bs_js = ".bs.js"
13151315

1316-
let suffix_res_js = ".res.js"
1317-
13181316
let suffix_mjs = ".mjs"
13191317

13201318
let suffix_bs_mjs = ".bs.mjs"
13211319

1322-
let suffix_res_mjs = ".res.mjs"
1323-
13241320
let suffix_cjs = ".cjs"
13251321

13261322
let suffix_bs_cjs = ".bs.cjs"
13271323

1328-
let suffix_res_cjs = ".res.cjs"
1329-
13301324
let suffix_gen_js = ".gen.js"
13311325

13321326
let suffix_gen_tsx = ".gen.tsx"

‎lib/4.06.1/rescript.ml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5593,8 +5593,12 @@ let suffix_bs_js = ".bs.js"
55935593

55945594
let suffix_mjs = ".mjs"
55955595

5596+
let suffix_bs_mjs = ".bs.mjs"
5597+
55965598
let suffix_cjs = ".cjs"
55975599

5600+
let suffix_bs_cjs = ".bs.cjs"
5601+
55985602
let suffix_gen_js = ".gen.js"
55995603

56005604
let suffix_gen_tsx = ".gen.tsx"
@@ -7101,39 +7105,30 @@ module Ext_js_suffix
71017105
type t =
71027106
| Js
71037107
| Bs_js
7104-
| Res_js
71057108
| Mjs
71067109
| Bs_mjs
7107-
| Res_mjs
71087110
| Cjs
71097111
| Bs_cjs
7110-
| Res_cjs
71117112
| Unknown_extension
71127113

71137114
let to_string (x : t) =
71147115
match x with
71157116
| Js -> Literals.suffix_js
71167117
| Bs_js -> Literals.suffix_bs_js
7117-
| Res_js -> Literals.suffix_res_js
71187118
| Mjs -> Literals.suffix_mjs
71197119
| Bs_mjs -> Literals.suffix_bs_mjs
7120-
| Res_mjs -> Literals.suffix_res_mjs
71217120
| Cjs -> Literals.suffix_cjs
71227121
| Bs_cjs -> Literals.suffix_bs_cjs
7123-
| Res_cjs -> Literals.suffix_res_cjs
71247122
| Unknown_extension -> assert false
71257123

71267124
let of_string (x : string) : t =
71277125
match () with
71287126
| () when x = Literals.suffix_js -> Js
71297127
| () when x = Literals.suffix_bs_js -> Bs_js
7130-
| () when x = Literals.suffix_res_js -> Res_js
71317128
| () when x = Literals.suffix_mjs -> Mjs
71327129
| () when x = Literals.suffix_bs_mjs -> Bs_mjs
7133-
| () when x = Literals.suffix_res_mjs -> Res_mjs
71347130
| () when x = Literals.suffix_cjs -> Cjs
71357131
| () when x = Literals.suffix_bs_cjs -> Bs_cjs
7136-
| () when x = Literals.suffix_res_cjs -> Res_cjs
71377132
| _ -> Unknown_extension
71387133

71397134
end
@@ -7874,7 +7869,7 @@ let extract_bs_suffix_exn (map : json_map) : Ext_js_suffix.t =
78747869
let s = Ext_js_suffix.of_string str in
78757870
if s = Unknown_extension then
78767871
Bsb_exception.errorf ~loc
7877-
"expect .js, .bs.js, .res.js, .mjs, .bs.mjs, .res.mjs, .cjs, .bs.cjs, .res.cjs here"
7872+
"expect .js, .mjs, .cjs or .bs.js, .bs.mjs, .bs.cjs here"
78787873
else s
78797874
| Some config ->
78807875
Bsb_exception.config_error config

‎lib/4.06.1/unstable/all_ounit_tests.ml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5806,20 +5806,14 @@ let suffix_js = ".js"
58065806

58075807
let suffix_bs_js = ".bs.js"
58085808

5809-
let suffix_res_js = ".res.js"
5810-
58115809
let suffix_mjs = ".mjs"
58125810

58135811
let suffix_bs_mjs = ".bs.mjs"
58145812

5815-
let suffix_res_mjs = ".res.mjs"
5816-
58175813
let suffix_cjs = ".cjs"
58185814

58195815
let suffix_bs_cjs = ".bs.cjs"
58205816

5821-
let suffix_res_cjs = ".res.cjs"
5822-
58235817
let suffix_gen_js = ".gen.js"
58245818

58255819
let suffix_gen_tsx = ".gen.tsx"
@@ -38361,39 +38355,30 @@ module Ext_js_suffix
3836138355
type t =
3836238356
| Js
3836338357
| Bs_js
38364-
| Res_js
3836538358
| Mjs
3836638359
| Bs_mjs
38367-
| Res_mjs
3836838360
| Cjs
3836938361
| Bs_cjs
38370-
| Res_cjs
3837138362
| Unknown_extension
3837238363

3837338364
let to_string (x : t) =
3837438365
match x with
3837538366
| Js -> Literals.suffix_js
3837638367
| Bs_js -> Literals.suffix_bs_js
38377-
| Res_js -> Literals.suffix_res_js
3837838368
| Mjs -> Literals.suffix_mjs
3837938369
| Bs_mjs -> Literals.suffix_bs_mjs
38380-
| Res_mjs -> Literals.suffix_res_mjs
3838138370
| Cjs -> Literals.suffix_cjs
3838238371
| Bs_cjs -> Literals.suffix_bs_cjs
38383-
| Res_cjs -> Literals.suffix_res_cjs
3838438372
| Unknown_extension -> assert false
3838538373

3838638374
let of_string (x : string) : t =
3838738375
match () with
3838838376
| () when x = Literals.suffix_js -> Js
3838938377
| () when x = Literals.suffix_bs_js -> Bs_js
38390-
| () when x = Literals.suffix_res_js -> Res_js
3839138378
| () when x = Literals.suffix_mjs -> Mjs
3839238379
| () when x = Literals.suffix_bs_mjs -> Bs_mjs
38393-
| () when x = Literals.suffix_res_mjs -> Res_mjs
3839438380
| () when x = Literals.suffix_cjs -> Cjs
3839538381
| () when x = Literals.suffix_bs_cjs -> Bs_cjs
38396-
| () when x = Literals.suffix_res_cjs -> Res_cjs
3839738382
| _ -> Unknown_extension
3839838383

3839938384
end

‎lib/4.06.1/unstable/js_compiler.ml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6502,20 +6502,14 @@ let suffix_js = ".js"
65026502

65036503
let suffix_bs_js = ".bs.js"
65046504

6505-
let suffix_res_js = ".res.js"
6506-
65076505
let suffix_mjs = ".mjs"
65086506

65096507
let suffix_bs_mjs = ".bs.mjs"
65106508

6511-
let suffix_res_mjs = ".res.mjs"
6512-
65136509
let suffix_cjs = ".cjs"
65146510

65156511
let suffix_bs_cjs = ".bs.cjs"
65166512

6517-
let suffix_res_cjs = ".res.cjs"
6518-
65196513
let suffix_gen_js = ".gen.js"
65206514

65216515
let suffix_gen_tsx = ".gen.tsx"
@@ -46767,39 +46761,30 @@ module Ext_js_suffix
4676746761
type t =
4676846762
| Js
4676946763
| Bs_js
46770-
| Res_js
4677146764
| Mjs
4677246765
| Bs_mjs
46773-
| Res_mjs
4677446766
| Cjs
4677546767
| Bs_cjs
46776-
| Res_cjs
4677746768
| Unknown_extension
4677846769

4677946770
let to_string (x : t) =
4678046771
match x with
4678146772
| Js -> Literals.suffix_js
4678246773
| Bs_js -> Literals.suffix_bs_js
46783-
| Res_js -> Literals.suffix_res_js
4678446774
| Mjs -> Literals.suffix_mjs
4678546775
| Bs_mjs -> Literals.suffix_bs_mjs
46786-
| Res_mjs -> Literals.suffix_res_mjs
4678746776
| Cjs -> Literals.suffix_cjs
4678846777
| Bs_cjs -> Literals.suffix_bs_cjs
46789-
| Res_cjs -> Literals.suffix_res_cjs
4679046778
| Unknown_extension -> assert false
4679146779

4679246780
let of_string (x : string) : t =
4679346781
match () with
4679446782
| () when x = Literals.suffix_js -> Js
4679546783
| () when x = Literals.suffix_bs_js -> Bs_js
46796-
| () when x = Literals.suffix_res_js -> Res_js
4679746784
| () when x = Literals.suffix_mjs -> Mjs
4679846785
| () when x = Literals.suffix_bs_mjs -> Bs_mjs
46799-
| () when x = Literals.suffix_res_mjs -> Res_mjs
4680046786
| () when x = Literals.suffix_cjs -> Cjs
4680146787
| () when x = Literals.suffix_bs_cjs -> Bs_cjs
46802-
| () when x = Literals.suffix_res_cjs -> Res_cjs
4680346788
| _ -> Unknown_extension
4680446789

4680546790
end

‎lib/4.06.1/unstable/js_playground_compiler.ml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6502,20 +6502,14 @@ let suffix_js = ".js"
65026502

65036503
let suffix_bs_js = ".bs.js"
65046504

6505-
let suffix_res_js = ".res.js"
6506-
65076505
let suffix_mjs = ".mjs"
65086506

65096507
let suffix_bs_mjs = ".bs.mjs"
65106508

6511-
let suffix_res_mjs = ".res.mjs"
6512-
65136509
let suffix_cjs = ".cjs"
65146510

65156511
let suffix_bs_cjs = ".bs.cjs"
65166512

6517-
let suffix_res_cjs = ".res.cjs"
6518-
65196513
let suffix_gen_js = ".gen.js"
65206514

65216515
let suffix_gen_tsx = ".gen.tsx"
@@ -46767,39 +46761,30 @@ module Ext_js_suffix
4676746761
type t =
4676846762
| Js
4676946763
| Bs_js
46770-
| Res_js
4677146764
| Mjs
4677246765
| Bs_mjs
46773-
| Res_mjs
4677446766
| Cjs
4677546767
| Bs_cjs
46776-
| Res_cjs
4677746768
| Unknown_extension
4677846769

4677946770
let to_string (x : t) =
4678046771
match x with
4678146772
| Js -> Literals.suffix_js
4678246773
| Bs_js -> Literals.suffix_bs_js
46783-
| Res_js -> Literals.suffix_res_js
4678446774
| Mjs -> Literals.suffix_mjs
4678546775
| Bs_mjs -> Literals.suffix_bs_mjs
46786-
| Res_mjs -> Literals.suffix_res_mjs
4678746776
| Cjs -> Literals.suffix_cjs
4678846777
| Bs_cjs -> Literals.suffix_bs_cjs
46789-
| Res_cjs -> Literals.suffix_res_cjs
4679046778
| Unknown_extension -> assert false
4679146779

4679246780
let of_string (x : string) : t =
4679346781
match () with
4679446782
| () when x = Literals.suffix_js -> Js
4679546783
| () when x = Literals.suffix_bs_js -> Bs_js
46796-
| () when x = Literals.suffix_res_js -> Res_js
4679746784
| () when x = Literals.suffix_mjs -> Mjs
4679846785
| () when x = Literals.suffix_bs_mjs -> Bs_mjs
46799-
| () when x = Literals.suffix_res_mjs -> Res_mjs
4680046786
| () when x = Literals.suffix_cjs -> Cjs
4680146787
| () when x = Literals.suffix_bs_cjs -> Bs_cjs
46802-
| () when x = Literals.suffix_res_cjs -> Res_cjs
4680346788
| _ -> Unknown_extension
4680446789

4680546790
end

0 commit comments

Comments
 (0)