Skip to content

Replace most remaining occurrences of "BuckleScript" with "ReScript" #6358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion jscomp/build_tests/case/src/demo.res
Original file line number Diff line number Diff line change
@@ -1 +1 @@
let () = Js.log("Hello, BuckleScript")
let () = Js.log("Hello, ReScript")
2 changes: 1 addition & 1 deletion jscomp/build_tests/case2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"watch": "rescript build -w"
},
"keywords": [
"BuckleScript"
"ReScript"
],
"license": "MIT",
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion jscomp/build_tests/case2/src/X.res
Original file line number Diff line number Diff line change
@@ -1 +1 @@
let () = Js.log("Hello, BuckleScript")
let () = Js.log("Hello, ReScript")
2 changes: 1 addition & 1 deletion jscomp/build_tests/case3/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"watch": "rescript build -w"
},
"keywords": [
"BuckleScript"
"ReScript"
],
"author": "",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion jscomp/build_tests/custom_namespace/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"watch": "rescript build -w"
},
"keywords": [
"BuckleScript"
"ReScript"
],
"license": "MIT",
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion jscomp/build_tests/cycle/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"watch": "rescript build -w"
},
"keywords": [
"BuckleScript"
"ReScript"
],
"author": "",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion jscomp/build_tests/devonly/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"watch": "rescript build -w"
},
"keywords": [
"BuckleScript"
"ReScript"
],
"author": "",
"license": "MIT",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"clean": "rescript clean"
},
"keywords": [
"BuckleScript"
"ReScript"
],
"author": "",
"license": "MIT",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"clean": "rescript clean"
},
"keywords": [
"BuckleScript"
"ReScript"
],
"author": "",
"license": "MIT",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"clean": "rescript clean"
},
"keywords": [
"BuckleScript"
"ReScript"
],
"author": "",
"license": "MIT",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"watch": "rescript build -w"
},
"keywords": [
"BuckleScript"
"ReScript"
],
"license": "MIT",
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion jscomp/build_tests/exports/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"watch": "rescript build -w"
},
"keywords": [
"BuckleScript"
"ReScript"
],
"license": "MIT",
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion jscomp/build_tests/hyphen2/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"watch": "rescript build -w"
},
"keywords": [
"BuckleScript"
"ReScript"
],
"license": "MIT",
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion jscomp/build_tests/hyphen2/y-src/demo.res
Original file line number Diff line number Diff line change
@@ -1 +1 @@
let () = Js.log("Hello, BuckleScript")
let () = Js.log("Hello, ReScript")
2 changes: 1 addition & 1 deletion jscomp/build_tests/install/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"watch": "rescript build -w"
},
"keywords": [
"BuckleScript"
"ReScript"
],
"author": "",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion jscomp/build_tests/nested/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"watch": "rescript build -w"
},
"keywords": [
"BuckleScript"
"ReScript"
],
"license": "MIT",
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion jscomp/build_tests/nnest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"watch": "rescript build -w"
},
"keywords": [
"BuckleScript"
"ReScript"
],
"license": "MIT",
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion jscomp/build_tests/ns/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"watch": "rescript build -w"
},
"keywords": [
"BuckleScript"
"ReScript"
],
"license": "MIT",
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion jscomp/build_tests/post-build/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"watch": "rescript build -w"
},
"keywords": [
"BuckleScript"
"ReScript"
],
"author": "",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion jscomp/build_tests/post-build/src/demo.res
Original file line number Diff line number Diff line change
@@ -1 +1 @@
let () = Js.log("Hello, BuckleScript")
let () = Js.log("Hello, ReScript")
24 changes: 12 additions & 12 deletions jscomp/build_tests/react_ppx/src/gpr_3987_test.bs.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions jscomp/build_tests/react_ppx/src/gpr_3987_test.res
Original file line number Diff line number Diff line change
Expand Up @@ -23,29 +23,29 @@ let makeContainer = text => {
}

/* This uncurried prop definition compiles */
module BuckleScript3987ReproOk = {
module Gpr3987ReproOk = {
let makeProps = (~value: string, ~onChange: (. string, int) => unit, ()) =>
{"value": value, "onChange": onChange}

let make = (_props: {"value": string, "onChange": (. string, int) => unit}) => React.null
}

let _ = <BuckleScript3987ReproOk value="test" onChange={(. _, _) => ()} />
let _ = <Gpr3987ReproOk value="test" onChange={(. _, _) => ()} />

/* Extracted type for the uncurried prop compiles as well */
module BuckleScript3987ReproOk2 = {
module Gpr3987ReproOk2 = {
type onChange = (. string, int) => unit

@react.component
let make = (~value as _, ~onChange as _: onChange) => React.null
}

let _ = <BuckleScript3987ReproOk2 value="test" onChange={(. _, _) => ()} />
let _ = <Gpr3987ReproOk2 value="test" onChange={(. _, _) => ()} />

/* Inline uncurried prop type causes an error */
module BuckleScript3987ReproError = {
module Gpr3987ReproError = {
@react.component
let make = (~value as _: string, ~onChange as _: (. string, int) => unit) => React.null
}

let _ = <BuckleScript3987ReproError value="test" onChange={(. _, _) => ()} />
let _ = <Gpr3987ReproError value="test" onChange={(. _, _) => ()} />
2 changes: 1 addition & 1 deletion jscomp/build_tests/rerror/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Basic Reason Template

Hello! This project allows you to quickly get started with Reason and BuckleScript. If you wanted a more sophisticated version, try the `react` template (`rescript -theme react -init .`).
Hello! This project allows you to quickly get started with ReScript. If you wanted a more sophisticated version, try the `react` template (`rescript -theme react -init .`).

# Build
```
Expand Down
3 changes: 0 additions & 3 deletions jscomp/build_tests/rerror/bsconfig.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
// This is the configuration file used by BuckleScript's build system rescript. Its documentation lives here: http://bucklescript.github.io/bucklescript/docson/#build-schema.json
// BuckleScript comes with its own parser for bsconfig.json, which is normal JSON, with the extra support of comments and trailing commas.
{
"name": "rerror",
"version": "0.1.0",
"sources": [
"src"
],
"bs-dependencies" : [
// add your dependencies here. You'd usually install them normally through `npm install my-dependency`. If my-dependency has a bsconfig.json too, then everything will work seamlessly.
]
}
2 changes: 1 addition & 1 deletion jscomp/build_tests/rerror/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"watch": "rescript build -w"
},
"keywords": [
"BuckleScript"
"ReScript"
],
"license": "MIT",
"devDependencies": {
Expand Down
12 changes: 0 additions & 12 deletions jscomp/build_tests/unicode/.merlin

This file was deleted.

2 changes: 1 addition & 1 deletion jscomp/build_tests/weird_deps/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"watch": "rescript build -w"
},
"keywords": [
"BuckleScript"
"ReScript"
],
"author": "",
"license": "MIT"
Expand Down
2 changes: 1 addition & 1 deletion jscomp/build_tests/weird_deps/src/demo.res
Original file line number Diff line number Diff line change
@@ -1 +1 @@
let () = Js.log("Hello, BuckleScript")
let () = Js.log("Hello, ReScript")
2 changes: 1 addition & 1 deletion jscomp/build_tests/weird_devdeps/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"watch": "rescript build -w"
},
"keywords": [
"BuckleScript"
"ReScript"
],
"author": "",
"license": "MIT"
Expand Down
2 changes: 1 addition & 1 deletion jscomp/build_tests/weird_devdeps/src/demo.res
Original file line number Diff line number Diff line change
@@ -1 +1 @@
let () = Js.log("Hello, BuckleScript")
let () = Js.log("Hello, ReScript")
2 changes: 1 addition & 1 deletion jscomp/build_tests/weird_names/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"watch": "rescript build -w"
},
"keywords": [
"BuckleScript"
"ReScript"
],
"author": "",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion jscomp/build_tests/x-y/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"watch": "rescript build -w"
},
"keywords": [
"BuckleScript"
"ReScript"
],
"license": "MIT",
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion jscomp/build_tests/x-y/x-src/demo.res
Original file line number Diff line number Diff line change
@@ -1 +1 @@
let () = Js.log("Hello, BuckleScript")
let () = Js.log("Hello, ReScript")
2 changes: 1 addition & 1 deletion jscomp/build_tests/zerocycle/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"watch": "rescript build -w"
},
"keywords": [
"BuckleScript"
"ReScript"
],
"author": "",
"license": "MIT",
Expand Down
10 changes: 5 additions & 5 deletions jscomp/ext/ext_path.ml
Original file line number Diff line number Diff line change
Expand Up @@ -43,18 +43,18 @@ let split_by_sep_per_os : string -> string list =

(** example
{[
"/bb/mbigc/mbig2899/bgit/bucklescript/jscomp/stdlib/external/pervasives.cmj"
"/bb/mbigc/mbig2899/bgit/bucklescript/jscomp/stdlib/ocaml_array.ml"
"/bb/mbigc/mbig2899/bgit/rescript/jscomp/stdlib/external/pervasives.cmj"
"/bb/mbigc/mbig2899/bgit/rescript/jscomp/stdlib/ocaml_array.ml"
]}

The other way
{[

"/bb/mbigc/mbig2899/bgit/bucklescript/jscomp/stdlib/ocaml_array.ml"
"/bb/mbigc/mbig2899/bgit/bucklescript/jscomp/stdlib/external/pervasives.cmj"
"/bb/mbigc/mbig2899/bgit/rescript/jscomp/stdlib/ocaml_array.ml"
"/bb/mbigc/mbig2899/bgit/rescript/jscomp/stdlib/external/pervasives.cmj"
]}
{[
"/bb/mbigc/mbig2899/bgit/bucklescript/jscomp/stdlib//ocaml_array.ml"
"/bb/mbigc/mbig2899/bgit/rescript/jscomp/stdlib//ocaml_array.ml"
]}
{[
/a/b
Expand Down
Loading