Skip to content

Commit 61d9988

Browse files
committed
Fix gentype
but now we have another circular dependency πŸ˜… need to wait the `@rescript/react` release See rescript-lang/rescript-react#115
1 parent 1a47463 commit 61d9988

File tree

151 files changed

+6
-4053
lines changed

Some content is hidden

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

151 files changed

+6
-4053
lines changed

β€Žjscomp/gentype/GenTypeConfig.ml

+1-5
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,9 @@ let setDebug ~gtconf =
102102
| _ -> ()
103103

104104
let compilerConfigFile = "rescript.json"
105-
let legacyCompilerConfigFile = "bsconfig.json"
106105

107106
let rec findProjectRoot ~dir =
108-
if
109-
Sys.file_exists (Filename.concat dir compilerConfigFile)
110-
|| Sys.file_exists (Filename.concat dir legacyCompilerConfigFile)
111-
then dir
107+
if Sys.file_exists (Filename.concat dir compilerConfigFile) then dir
112108
else
113109
let parent = dir |> Filename.dirname in
114110
if parent = dir then (

β€Žjscomp/gentype/Paths.ml

+1-5
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,6 @@ let getConfigFile ~projectRoot =
6565
let config = concat projectRoot Config.compilerConfigFile in
6666
match config |> Sys.file_exists with
6767
| true -> Some config
68-
| false -> (
69-
let config = concat projectRoot Config.legacyCompilerConfigFile in
70-
match config |> Sys.file_exists with
71-
| true -> Some config
72-
| false -> None)
68+
| false -> None
7369

7470
let readConfig ~namespace = Config.readConfig ~getConfigFile ~namespace

β€Žjscomp/gentype_tests/typescript-react-example/package-lock.json

+4-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žjscomp/gentype_tests/typescript-react-example/src/AutoAnnotate.gen.tsx

-18
This file was deleted.

β€Žjscomp/gentype_tests/typescript-react-example/src/AutoAnnotate.res.js

-2
This file was deleted.

β€Žjscomp/gentype_tests/typescript-react-example/src/BigInt.res.js

-2
This file was deleted.

β€Žjscomp/gentype_tests/typescript-react-example/src/BootloaderResource.res.js

-2
This file was deleted.

β€Žjscomp/gentype_tests/typescript-react-example/src/BucklescriptAnnotations.gen.tsx

-18
This file was deleted.

β€Žjscomp/gentype_tests/typescript-react-example/src/BucklescriptAnnotations.res.js

-12
This file was deleted.

β€Žjscomp/gentype_tests/typescript-react-example/src/Comments.gen.tsx

-30
This file was deleted.

β€Žjscomp/gentype_tests/typescript-react-example/src/Comments.res.js

-15
This file was deleted.

β€Žjscomp/gentype_tests/typescript-react-example/src/Core.gen.tsx

-72
This file was deleted.

β€Žjscomp/gentype_tests/typescript-react-example/src/Core.res.js

-133
This file was deleted.

β€Žjscomp/gentype_tests/typescript-react-example/src/CreateErrorHandler1.res.js

-25
This file was deleted.

0 commit comments

Comments
Β (0)