Skip to content

Commit 0f3890d

Browse files
nkrkvnkrkv
committed
Step back and revoke .res.* suffix options
1 parent a64c2b9 commit 0f3890d

10 files changed

+7
-93
lines changed

‎docs/docson/build-schema.json

+1-1
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

+1-1
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

-9
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

-6
Original file line numberDiff line numberDiff line change
@@ -121,20 +121,14 @@ let suffix_js = ".js"
121121

122122
let suffix_bs_js = ".bs.js"
123123

124-
let suffix_res_js = ".res.js"
125-
126124
let suffix_mjs = ".mjs"
127125

128126
let suffix_bs_mjs = ".bs.mjs"
129127

130-
let suffix_res_mjs = ".res.mjs"
131-
132128
let suffix_cjs = ".cjs"
133129

134130
let suffix_bs_cjs = ".bs.cjs"
135131

136-
let suffix_res_cjs = ".res.cjs"
137-
138132
let suffix_gen_js = ".gen.js"
139133

140134
let suffix_gen_tsx = ".gen.tsx"

‎lib/4.06.1/bsb_helper.ml

-6
Original file line numberDiff line numberDiff line change
@@ -1309,20 +1309,14 @@ let suffix_js = ".js"
13091309

13101310
let suffix_bs_js = ".bs.js"
13111311

1312-
let suffix_res_js = ".res.js"
1313-
13141312
let suffix_mjs = ".mjs"
13151313

13161314
let suffix_bs_mjs = ".bs.mjs"
13171315

1318-
let suffix_res_mjs = ".res.mjs"
1319-
13201316
let suffix_cjs = ".cjs"
13211317

13221318
let suffix_bs_cjs = ".bs.cjs"
13231319

1324-
let suffix_res_cjs = ".res.cjs"
1325-
13261320
let suffix_gen_js = ".gen.js"
13271321

13281322
let suffix_gen_tsx = ".gen.tsx"

‎lib/4.06.1/rescript.ml

+5-10
Original file line numberDiff line numberDiff line change
@@ -5589,8 +5589,12 @@ let suffix_bs_js = ".bs.js"
55895589
55905590
let suffix_mjs = ".mjs"
55915591
5592+
let suffix_bs_mjs = ".bs.mjs"
5593+
55925594
let suffix_cjs = ".cjs"
55935595
5596+
let suffix_bs_cjs = ".bs.cjs"
5597+
55945598
let suffix_gen_js = ".gen.js"
55955599
55965600
let suffix_gen_tsx = ".gen.tsx"
@@ -7097,39 +7101,30 @@ module Ext_js_suffix
70977101
type t =
70987102
| Js
70997103
| Bs_js
7100-
| Res_js
71017104
| Mjs
71027105
| Bs_mjs
7103-
| Res_mjs
71047106
| Cjs
71057107
| Bs_cjs
7106-
| Res_cjs
71077108
| Unknown_extension
71087109
71097110
let to_string (x : t) =
71107111
match x with
71117112
| Js -> Literals.suffix_js
71127113
| Bs_js -> Literals.suffix_bs_js
7113-
| Res_js -> Literals.suffix_res_js
71147114
| Mjs -> Literals.suffix_mjs
71157115
| Bs_mjs -> Literals.suffix_bs_mjs
7116-
| Res_mjs -> Literals.suffix_res_mjs
71177116
| Cjs -> Literals.suffix_cjs
71187117
| Bs_cjs -> Literals.suffix_bs_cjs
7119-
| Res_cjs -> Literals.suffix_res_cjs
71207118
| Unknown_extension -> assert false
71217119
71227120
let of_string (x : string) : t =
71237121
match () with
71247122
| () when x = Literals.suffix_js -> Js
71257123
| () when x = Literals.suffix_bs_js -> Bs_js
7126-
| () when x = Literals.suffix_res_js -> Res_js
71277124
| () when x = Literals.suffix_mjs -> Mjs
71287125
| () when x = Literals.suffix_bs_mjs -> Bs_mjs
7129-
| () when x = Literals.suffix_res_mjs -> Res_mjs
71307126
| () when x = Literals.suffix_cjs -> Cjs
71317127
| () when x = Literals.suffix_bs_cjs -> Bs_cjs
7132-
| () when x = Literals.suffix_res_cjs -> Res_cjs
71337128
| _ -> Unknown_extension
71347129
71357130
end
@@ -7870,7 +7865,7 @@ let extract_bs_suffix_exn (map : json_map) : Ext_js_suffix.t =
78707865
let s = Ext_js_suffix.of_string str in
78717866
if s = Unknown_extension then
78727867
Bsb_exception.errorf ~loc
7873-
"expect .js, .bs.js, .res.js, .mjs, .bs.mjs, .res.mjs, .cjs, .bs.cjs, .res.cjs here"
7868+
"expect .js, .mjs, .cjs or .bs.js, .bs.mjs, .bs.cjs here"
78747869
else s
78757870
| Some config ->
78767871
Bsb_exception.config_error config

‎lib/4.06.1/unstable/all_ounit_tests.ml

-15
Original file line numberDiff line numberDiff line change
@@ -5802,20 +5802,14 @@ let suffix_js = ".js"
58025802

58035803
let suffix_bs_js = ".bs.js"
58045804

5805-
let suffix_res_js = ".res.js"
5806-
58075805
let suffix_mjs = ".mjs"
58085806

58095807
let suffix_bs_mjs = ".bs.mjs"
58105808

5811-
let suffix_res_mjs = ".res.mjs"
5812-
58135809
let suffix_cjs = ".cjs"
58145810

58155811
let suffix_bs_cjs = ".bs.cjs"
58165812

5817-
let suffix_res_cjs = ".res.cjs"
5818-
58195813
let suffix_gen_js = ".gen.js"
58205814

58215815
let suffix_gen_tsx = ".gen.tsx"
@@ -38357,39 +38351,30 @@ module Ext_js_suffix
3835738351
type t =
3835838352
| Js
3835938353
| Bs_js
38360-
| Res_js
3836138354
| Mjs
3836238355
| Bs_mjs
38363-
| Res_mjs
3836438356
| Cjs
3836538357
| Bs_cjs
38366-
| Res_cjs
3836738358
| Unknown_extension
3836838359

3836938360
let to_string (x : t) =
3837038361
match x with
3837138362
| Js -> Literals.suffix_js
3837238363
| Bs_js -> Literals.suffix_bs_js
38373-
| Res_js -> Literals.suffix_res_js
3837438364
| Mjs -> Literals.suffix_mjs
3837538365
| Bs_mjs -> Literals.suffix_bs_mjs
38376-
| Res_mjs -> Literals.suffix_res_mjs
3837738366
| Cjs -> Literals.suffix_cjs
3837838367
| Bs_cjs -> Literals.suffix_bs_cjs
38379-
| Res_cjs -> Literals.suffix_res_cjs
3838038368
| Unknown_extension -> assert false
3838138369

3838238370
let of_string (x : string) : t =
3838338371
match () with
3838438372
| () when x = Literals.suffix_js -> Js
3838538373
| () when x = Literals.suffix_bs_js -> Bs_js
38386-
| () when x = Literals.suffix_res_js -> Res_js
3838738374
| () when x = Literals.suffix_mjs -> Mjs
3838838375
| () when x = Literals.suffix_bs_mjs -> Bs_mjs
38389-
| () when x = Literals.suffix_res_mjs -> Res_mjs
3839038376
| () when x = Literals.suffix_cjs -> Cjs
3839138377
| () when x = Literals.suffix_bs_cjs -> Bs_cjs
38392-
| () when x = Literals.suffix_res_cjs -> Res_cjs
3839338378
| _ -> Unknown_extension
3839438379

3839538380
end

‎lib/4.06.1/unstable/js_compiler.ml

-15
Original file line numberDiff line numberDiff line change
@@ -6498,20 +6498,14 @@ let suffix_js = ".js"
64986498

64996499
let suffix_bs_js = ".bs.js"
65006500

6501-
let suffix_res_js = ".res.js"
6502-
65036501
let suffix_mjs = ".mjs"
65046502

65056503
let suffix_bs_mjs = ".bs.mjs"
65066504

6507-
let suffix_res_mjs = ".res.mjs"
6508-
65096505
let suffix_cjs = ".cjs"
65106506

65116507
let suffix_bs_cjs = ".bs.cjs"
65126508

6513-
let suffix_res_cjs = ".res.cjs"
6514-
65156509
let suffix_gen_js = ".gen.js"
65166510

65176511
let suffix_gen_tsx = ".gen.tsx"
@@ -46763,39 +46757,30 @@ module Ext_js_suffix
4676346757
type t =
4676446758
| Js
4676546759
| Bs_js
46766-
| Res_js
4676746760
| Mjs
4676846761
| Bs_mjs
46769-
| Res_mjs
4677046762
| Cjs
4677146763
| Bs_cjs
46772-
| Res_cjs
4677346764
| Unknown_extension
4677446765

4677546766
let to_string (x : t) =
4677646767
match x with
4677746768
| Js -> Literals.suffix_js
4677846769
| Bs_js -> Literals.suffix_bs_js
46779-
| Res_js -> Literals.suffix_res_js
4678046770
| Mjs -> Literals.suffix_mjs
4678146771
| Bs_mjs -> Literals.suffix_bs_mjs
46782-
| Res_mjs -> Literals.suffix_res_mjs
4678346772
| Cjs -> Literals.suffix_cjs
4678446773
| Bs_cjs -> Literals.suffix_bs_cjs
46785-
| Res_cjs -> Literals.suffix_res_cjs
4678646774
| Unknown_extension -> assert false
4678746775

4678846776
let of_string (x : string) : t =
4678946777
match () with
4679046778
| () when x = Literals.suffix_js -> Js
4679146779
| () when x = Literals.suffix_bs_js -> Bs_js
46792-
| () when x = Literals.suffix_res_js -> Res_js
4679346780
| () when x = Literals.suffix_mjs -> Mjs
4679446781
| () when x = Literals.suffix_bs_mjs -> Bs_mjs
46795-
| () when x = Literals.suffix_res_mjs -> Res_mjs
4679646782
| () when x = Literals.suffix_cjs -> Cjs
4679746783
| () when x = Literals.suffix_bs_cjs -> Bs_cjs
46798-
| () when x = Literals.suffix_res_cjs -> Res_cjs
4679946784
| _ -> Unknown_extension
4680046785

4680146786
end

‎lib/4.06.1/unstable/js_playground_compiler.ml

-15
Original file line numberDiff line numberDiff line change
@@ -6498,20 +6498,14 @@ let suffix_js = ".js"
64986498

64996499
let suffix_bs_js = ".bs.js"
65006500

6501-
let suffix_res_js = ".res.js"
6502-
65036501
let suffix_mjs = ".mjs"
65046502

65056503
let suffix_bs_mjs = ".bs.mjs"
65066504

6507-
let suffix_res_mjs = ".res.mjs"
6508-
65096505
let suffix_cjs = ".cjs"
65106506

65116507
let suffix_bs_cjs = ".bs.cjs"
65126508

6513-
let suffix_res_cjs = ".res.cjs"
6514-
65156509
let suffix_gen_js = ".gen.js"
65166510

65176511
let suffix_gen_tsx = ".gen.tsx"
@@ -46763,39 +46757,30 @@ module Ext_js_suffix
4676346757
type t =
4676446758
| Js
4676546759
| Bs_js
46766-
| Res_js
4676746760
| Mjs
4676846761
| Bs_mjs
46769-
| Res_mjs
4677046762
| Cjs
4677146763
| Bs_cjs
46772-
| Res_cjs
4677346764
| Unknown_extension
4677446765

4677546766
let to_string (x : t) =
4677646767
match x with
4677746768
| Js -> Literals.suffix_js
4677846769
| Bs_js -> Literals.suffix_bs_js
46779-
| Res_js -> Literals.suffix_res_js
4678046770
| Mjs -> Literals.suffix_mjs
4678146771
| Bs_mjs -> Literals.suffix_bs_mjs
46782-
| Res_mjs -> Literals.suffix_res_mjs
4678346772
| Cjs -> Literals.suffix_cjs
4678446773
| Bs_cjs -> Literals.suffix_bs_cjs
46785-
| Res_cjs -> Literals.suffix_res_cjs
4678646774
| Unknown_extension -> assert false
4678746775

4678846776
let of_string (x : string) : t =
4678946777
match () with
4679046778
| () when x = Literals.suffix_js -> Js
4679146779
| () when x = Literals.suffix_bs_js -> Bs_js
46792-
| () when x = Literals.suffix_res_js -> Res_js
4679346780
| () when x = Literals.suffix_mjs -> Mjs
4679446781
| () when x = Literals.suffix_bs_mjs -> Bs_mjs
46795-
| () when x = Literals.suffix_res_mjs -> Res_mjs
4679646782
| () when x = Literals.suffix_cjs -> Cjs
4679746783
| () when x = Literals.suffix_bs_cjs -> Bs_cjs
46798-
| () when x = Literals.suffix_res_cjs -> Res_cjs
4679946784
| _ -> Unknown_extension
4680046785

4680146786
end

0 commit comments

Comments
 (0)