From f430620b8a53a25b03f3262b9fbb9cfb04790f04 Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Mon, 19 Oct 2026 07:24:05 +0000 Subject: [PATCH 1/3] Drop macOS Intel (darwin-x64) support ReScript 13 no longer ships binaries for Intel Macs and CI no longer runs on macos-26-intel. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01DbtRiJ2YzgzVdwgNf8Yiaz Signed-off-by: Christoph Knittel --- .github/actions/setup-ocaml/action.yml | 4 - .github/workflows/ci.yml | 8 - .github/workflows/moveArtifacts.sh | 1 - Makefile | 2 +- changes/drop-macos-intel.breaking.md | 1 + cli/common/bins.cjs | 6 +- cli/common/platform.cjs | 14 +- compiler/sync/dune | 27 - package.json | 1 - packages/@rescript/darwin-x64/RE_LICENSE.md | 521 ------------------ .../darwin-x64/THIRD_PARTY_NOTICES_REWATCH.md | 133 ----- packages/@rescript/darwin-x64/bin.d.ts | 11 - packages/@rescript/darwin-x64/bin.js | 19 - packages/@rescript/darwin-x64/bin/.gitkeep | 0 packages/@rescript/darwin-x64/package.json | 60 -- packages/artifacts.json | 13 - rewatch-ocaml/toolchain.ml | 4 +- rewatch/tests/suite.sh | 47 -- scripts/updateArtifactList.js | 1 - tests/cli_tests/platform_test.mjs | 18 +- tests/rewatch_ounit_tests/toolchain_tests.ml | 2 +- yarn.lock | 9 - 22 files changed, 37 insertions(+), 865 deletions(-) create mode 100644 changes/drop-macos-intel.breaking.md delete mode 100644 packages/@rescript/darwin-x64/RE_LICENSE.md delete mode 100644 packages/@rescript/darwin-x64/THIRD_PARTY_NOTICES_REWATCH.md delete mode 100644 packages/@rescript/darwin-x64/bin.d.ts delete mode 100644 packages/@rescript/darwin-x64/bin.js delete mode 100644 packages/@rescript/darwin-x64/bin/.gitkeep delete mode 100644 packages/@rescript/darwin-x64/package.json diff --git a/.github/actions/setup-ocaml/action.yml b/.github/actions/setup-ocaml/action.yml index b2520bbb5ec..24dcb875631 100644 --- a/.github/actions/setup-ocaml/action.yml +++ b/.github/actions/setup-ocaml/action.yml @@ -41,10 +41,6 @@ runs: platform=aarch64-linux checksum=ba991f677edd9a21d2bc96c0144bc8ac5b112d4d98a3eb266e075e22e557df2a ;; - macOS-X64) - platform=x86_64-macos - checksum=d209fadd8a894bdaf3bd3612a23c32a0af184d2f4a979b8c789e6e4f6a4de883 - ;; macOS-ARM64) platform=arm64-macos checksum=e441b48dc22163d209b4f05e44dc7210909b01237642b6c9ae48fd710a3ef83e diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ae0d6d6d94..5eb9d76f21c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -53,12 +53,6 @@ jobs: node-target: linux-arm64 rust-target: aarch64-unknown-linux-musl dune-profile: static - - os: macos-26-intel # x64 - ocaml_compiler: 5.5.1 - upload_binaries: true - node-target: darwin-x64 - rust-target: x86_64-apple-darwin - dune-profile: release - os: macos-26 # ARM ocaml_compiler: 5.5.1 upload_binaries: true @@ -537,7 +531,6 @@ jobs: fail-fast: false matrix: include: - - os: macos-26-intel - os: macos-26 - os: ubuntu-26.04 - os: ubuntu-26.04-arm @@ -603,7 +596,6 @@ jobs: fail-fast: false matrix: include: - - os: macos-26-intel - os: macos-26 - os: ubuntu-26.04 - os: ubuntu-26.04-arm diff --git a/.github/workflows/moveArtifacts.sh b/.github/workflows/moveArtifacts.sh index 1cb7bc82ce8..978ee6cd00e 100755 --- a/.github/workflows/moveArtifacts.sh +++ b/.github/workflows/moveArtifacts.sh @@ -30,7 +30,6 @@ mv lib-ocaml packages/@rescript/runtime/lib/ocaml # @rescript/{target} chmod +x binaries-*/*.exe -mv -f binaries-darwin-x64/* "packages/@rescript/darwin-x64/bin" mv -f binaries-darwin-arm64/* "packages/@rescript/darwin-arm64/bin" mv -f binaries-linux-x64/* "packages/@rescript/linux-x64/bin" mv -f binaries-linux-arm64/* "packages/@rescript/linux-arm64/bin" diff --git a/Makefile b/Makefile index d1e7abecd3f..46b3413003a 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ else ifeq ($(UNAME_S),Darwin) ifeq ($(UNAME_M),arm64) RESCRIPT_PLATFORM := darwin-arm64 else - RESCRIPT_PLATFORM := darwin-x64 + $(error Intel Macs are not supported anymore, use ReScript 12) endif else ifeq ($(UNAME_S),Linux) ifeq ($(UNAME_M),aarch64) diff --git a/changes/drop-macos-intel.breaking.md b/changes/drop-macos-intel.breaking.md new file mode 100644 index 00000000000..2235d41a941 --- /dev/null +++ b/changes/drop-macos-intel.breaking.md @@ -0,0 +1 @@ +- Drop support for macOS on Intel (darwin-x64). Intel Mac users can stay on ReScript 12. diff --git a/cli/common/bins.cjs b/cli/common/bins.cjs index 41f478e09db..845c8b98fc8 100644 --- a/cli/common/bins.cjs +++ b/cli/common/bins.cjs @@ -6,16 +6,14 @@ const os = require("node:os"); const path = require("node:path"); -const { getTarget } = require("./platform.cjs"); +const { getTarget, unsupportedPlatformMessage } = require("./platform.cjs"); const minimumNodeVersion = "22.0.0"; const target = getTarget(process.platform, process.arch, os.release()); if (target === undefined) { - throw new Error( - `Platform ${process.platform}-${process.arch} is not supported!`, - ); + throw new Error(unsupportedPlatformMessage(process.platform, process.arch)); } const binPackageName = `@rescript/${target}`; diff --git a/cli/common/platform.cjs b/cli/common/platform.cjs index 1053611faff..ede929d41fc 100644 --- a/cli/common/platform.cjs +++ b/cli/common/platform.cjs @@ -5,7 +5,6 @@ const supportedTargets = [ "darwin-arm64", - "darwin-x64", "linux-arm64", "linux-x64", "win32-x64", @@ -32,6 +31,18 @@ function getTarget(platform, arch, osRelease) { return supportedTargets.includes(target) ? target : undefined; } +/** + * @param {string} platform `process.platform` + * @param {string} arch `process.arch` + * @returns {string} the error for a platform without a target + */ +function unsupportedPlatformMessage(platform, arch) { + if (platform === "darwin" && arch === "x64") { + return "Intel Macs are not supported anymore. Use ReScript 12."; + } + return `Platform ${platform}-${arch} is not supported!`; +} + /** * @param {string} osRelease */ @@ -41,3 +52,4 @@ function windowsBuild(osRelease) { } exports.getTarget = getTarget; +exports.unsupportedPlatformMessage = unsupportedPlatformMessage; diff --git a/compiler/sync/dune b/compiler/sync/dune index c8f334b877e..64fea651cb5 100644 --- a/compiler/sync/dune +++ b/compiler/sync/dune @@ -39,33 +39,6 @@ (run strip -o rescript-tools.exe ../../tools/bin/main.exe) (run strip -o rescript.exe ../../rewatch-ocaml/rescript_ocaml.exe)))) -(rule - (enabled_if - (and - (<> %{profile} browser) - (= %{system} macosx) - (= %{architecture} amd64))) - (targets - bsc.exe - rescript-editor-analysis.exe - rescript-tools.exe - rescript.exe) - (deps - ../bsc/rescript_compiler_main.exe - ../../analysis/bin/main.exe - ../../tools/bin/main.exe - ../../rewatch-ocaml/rescript_ocaml.exe) - (mode - (promote - (until-clean) - (into ../../packages/@rescript/darwin-x64/bin))) - (action - (progn - (run strip -o bsc.exe ../bsc/rescript_compiler_main.exe) - (run strip -o rescript-editor-analysis.exe ../../analysis/bin/main.exe) - (run strip -o rescript-tools.exe ../../tools/bin/main.exe) - (run strip -o rescript.exe ../../rewatch-ocaml/rescript_ocaml.exe)))) - (rule (enabled_if (and diff --git a/package.json b/package.json index c20dde212b0..f42dfdf0abf 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,6 @@ }, "optionalDependencies": { "@rescript/darwin-arm64": "workspace:packages/@rescript/darwin-arm64", - "@rescript/darwin-x64": "workspace:packages/@rescript/darwin-x64", "@rescript/linux-arm64": "workspace:packages/@rescript/linux-arm64", "@rescript/linux-x64": "workspace:packages/@rescript/linux-x64", "@rescript/win32-x64": "workspace:packages/@rescript/win32-x64" diff --git a/packages/@rescript/darwin-x64/RE_LICENSE.md b/packages/@rescript/darwin-x64/RE_LICENSE.md deleted file mode 100644 index f79ddd2b654..00000000000 --- a/packages/@rescript/darwin-x64/RE_LICENSE.md +++ /dev/null @@ -1,521 +0,0 @@ -This Software is distributed under the terms of the GNU Lesser -General Public License version 2.1 (included below), or (at your -option) any later version. - -As a special exception to the GNU Library General Public License, you -may link, statically or dynamically, a "work that uses the Library" -with a publicly distributed version of the Library to produce an -executable file containing portions of the Library, and distribute -that executable file under terms of your choice, without any of the -additional requirements listed in clause 6 of the GNU Library General -Public License. By "a publicly distributed version of the Library", -we mean either the unmodified Library, or a modified version of the -Library that is distributed under the conditions defined in clause 3 -of the GNU Library General Public License. This exception does not -however invalidate any other reasons why the executable file might be -covered by the GNU Library General Public License. - ----------------------------------------------------------------------- - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! diff --git a/packages/@rescript/darwin-x64/THIRD_PARTY_NOTICES_REWATCH.md b/packages/@rescript/darwin-x64/THIRD_PARTY_NOTICES_REWATCH.md deleted file mode 100644 index 0214b053d40..00000000000 --- a/packages/@rescript/darwin-x64/THIRD_PARTY_NOTICES_REWATCH.md +++ /dev/null @@ -1,133 +0,0 @@ -# Third-party notices for the OCaml ReScript build system - -The `rescript.exe` OCaml build-system binary includes the following -third-party software. These notices supplement the package's declared license. - -## Cmdliner - -Copyright (c) 2011 The cmdliner programmers - -Permission to use, copy, modify, and/or distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY -SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION -OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - -## Yojson - -Copyright (c) 2010-2012, Martin Jambon -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -- Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. -- Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. -- Neither the name of the copyright holder nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - -## Re - -Copyright (C) 2001 Jerome Vouillon - -Re is distributed under the GNU Lesser General Public License version 2.1 or, -at your option, any later version, with the OCaml linking exception. The full -license and exception are included in `RE_LICENSE.md`. - -## Spawn, Luv, libuv, ctypes, and integers - -- Spawn: Copyright (c) 2016-2018 Jane Street Group, LLC -- Luv: Copyright (c) 2018-2023 Anton Bachin -- libuv: Copyright (c) 2015-present libuv project contributors -- ctypes: Copyright (c) 2013 Jeremy Yallop -- integers: Copyright (c) 2013-2016 Jeremy Yallop - -Each project listed in this section is distributed under the MIT License: - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - -## Externally maintained parts of libuv - -Parts of libuv originating from https://github.com/joyent/libuv: -Copyright Joyent, Inc. and other Node contributors. All rights reserved. -They are distributed under the MIT License reproduced above. - -`tree.h` (from FreeBSD): - -Copyright 2002 Niels Provos -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -`inet_pton` and `inet_ntop` (in `src/inet.c`): - -Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC") -Copyright (c) 1996-1999 by Internet Software Consortium. - -Permission to use, copy, modify, and distribute this software for any -purpose with or without fee is hereby granted, provided that the above -copyright notice and this permission notice appear in all copies. - -THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES -WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR -ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT -OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/packages/@rescript/darwin-x64/bin.d.ts b/packages/@rescript/darwin-x64/bin.d.ts deleted file mode 100644 index d6e39948452..00000000000 --- a/packages/@rescript/darwin-x64/bin.d.ts +++ /dev/null @@ -1,11 +0,0 @@ -export const binDir: string; - -export const binPaths: BinaryPaths; - -export type BinaryPaths = { - bsc_exe: string; - rescript_tools_exe: string; - rescript_editor_analysis_exe: string; - rescript_exe: string; - rescript_rust_exe: string; -}; diff --git a/packages/@rescript/darwin-x64/bin.js b/packages/@rescript/darwin-x64/bin.js deleted file mode 100644 index 716959be006..00000000000 --- a/packages/@rescript/darwin-x64/bin.js +++ /dev/null @@ -1,19 +0,0 @@ -// @ts-check - -// rescript/cli/bins computes these paths itself; they are exported for tools -// that import this file directly, such as rescript-vscode. - -import * as path from "node:path"; - -export const binDir = path.join(import.meta.dirname, "bin"); - -export const binPaths = { - bsc_exe: path.join(binDir, "bsc.exe"), - rescript_tools_exe: path.join(binDir, "rescript-tools.exe"), - rescript_editor_analysis_exe: path.join( - binDir, - "rescript-editor-analysis.exe", - ), - rescript_exe: path.join(binDir, "rescript.exe"), - rescript_rust_exe: path.join(binDir, "rescript-rust.exe"), -}; diff --git a/packages/@rescript/darwin-x64/bin/.gitkeep b/packages/@rescript/darwin-x64/bin/.gitkeep deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/packages/@rescript/darwin-x64/package.json b/packages/@rescript/darwin-x64/package.json deleted file mode 100644 index 9e4c219f639..00000000000 --- a/packages/@rescript/darwin-x64/package.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "name": "@rescript/darwin-x64", - "version": "13.0.0-alpha.7", - "description": "ReScript binaries for MacOS x86_64", - "type": "module", - "license": "(LGPL-3.0-or-later AND MIT)", - "homepage": "https://rescript-lang.org", - "bugs": "https://github.com/rescript-lang/rescript/issues", - "repository": { - "type": "git", - "url": "git+https://github.com/rescript-lang/rescript.git" - }, - "author": { - "name": "Hongbo Zhang", - "email": "bobzhang1988@gmail.com" - }, - "maintainers": [ - "Christoph Knittel (https://github.com/cknitt)", - "Cristiano Calcagno (https://github.com/cristianoc)", - "Dmitry Zakharov (https://github.com/DZakh)", - "Florian Hammerschmidt (https://github.com/fhammerschmidt)", - "Gabriel Nordeborn (https://github.com/zth)", - "Hyeseong Kim (https://github.com/cometkim)", - "Jaap Frolich (https://github.com/jfrolich)", - "Matthias Le Brun (https://github.com/bloodyowl)", - "Patrick Ecker (https://github.com/ryyppy)", - "Paul Tsnobiladzé (https://github.com/tsnobip)", - "Shulhi Sapli (https://github.com/shulhi)", - "Woonki Moon (https://github.com/mununki)" - ], - "publishConfig": { - "access": "public", - "provenance": true, - "executableFiles": [ - "./bin/bsc.exe", - "./bin/rescript-editor-analysis.exe", - "./bin/rescript-tools.exe", - "./bin/rescript.exe", - "./bin/rescript-rust.exe" - ] - }, - "engines": { - "node": ">=22" - }, - "os": [ - "darwin" - ], - "cpu": [ - "x64" - ], - "files": [ - "bin.js", - "bin.d.ts", - "THIRD_PARTY_NOTICES_REWATCH.md", - "RE_LICENSE.md", - "bin/" - ], - "exports": "./bin.js", - "preferUnplugged": true -} diff --git a/packages/artifacts.json b/packages/artifacts.json index 5ae97ffc6b8..cc322449ddd 100644 --- a/packages/artifacts.json +++ b/packages/artifacts.json @@ -841,19 +841,6 @@ "bin/rescript.exe", "package.json" ], - "@rescript/darwin-x64": [ - "RE_LICENSE.md", - "THIRD_PARTY_NOTICES_REWATCH.md", - "bin.d.ts", - "bin.js", - "bin/.gitkeep", - "bin/bsc.exe", - "bin/rescript-editor-analysis.exe", - "bin/rescript-rust.exe", - "bin/rescript-tools.exe", - "bin/rescript.exe", - "package.json" - ], "@rescript/linux-arm64": [ "RE_LICENSE.md", "THIRD_PARTY_NOTICES_REWATCH.md", diff --git a/rewatch-ocaml/toolchain.ml b/rewatch-ocaml/toolchain.ml index d8fc373d71b..e63c3a49097 100644 --- a/rewatch-ocaml/toolchain.ml +++ b/rewatch-ocaml/toolchain.ml @@ -19,7 +19,8 @@ let absolute_program ~cwd program = (* The npm package (@rescript/) with the binaries for the platform [system] and [architecture] name, as in cli/common/platform.cjs. Windows on - ARM runs the x64 binaries, which are built for amd64. *) + ARM runs the x64 binaries, which are built for amd64. Intel Macs have no + package since ReScript 13. *) let platform_package ~system ~architecture = let os = match system with @@ -35,6 +36,7 @@ let platform_package ~system ~architecture = | _ -> None in match (os, arch) with + | Some "darwin", Some "x64" -> None | Some os, Some arch -> Some ("@rescript/" ^ os ^ "-" ^ arch) | _ -> None diff --git a/rewatch/tests/suite.sh b/rewatch/tests/suite.sh index 84e84e1803f..63b42d1f47d 100755 --- a/rewatch/tests/suite.sh +++ b/rewatch/tests/suite.sh @@ -65,53 +65,6 @@ else exit 1 fi -# sury-ppx 11.0.0-rc.0 only ships an arm64 binary for macOS. Temporarily -# disable the PPX fixture on Intel Macs until the package ships an x64 binary. -if [[ "$(uname -s)" == "Darwin" && "$(uname -m)" == "x86_64" ]]; then - PPX_CONFIG=../testrepo/packages/with-ppx/rescript.json - PPX_SOURCE=../testrepo/packages/with-ppx/src/FileWithPpx.res - PPX_OUTPUT=../testrepo/packages/with-ppx/src/FileWithPpx.mjs - PPX_BACKUP_DIR=$(mktemp -d) - PPX_FIXTURE_SHELL_PID=$BASHPID - - cp "$PPX_CONFIG" "$PPX_BACKUP_DIR/rescript.json" - cp "$PPX_SOURCE" "$PPX_BACKUP_DIR/FileWithPpx.res" - cp "$PPX_OUTPUT" "$PPX_BACKUP_DIR/FileWithPpx.mjs" - cp "$(git rev-parse --git-path index)" "$PPX_BACKUP_DIR/index" - export GIT_INDEX_FILE="$PPX_BACKUP_DIR/index" - - restore_ppx_fixture() { - if [ "$BASHPID" != "$PPX_FIXTURE_SHELL_PID" ]; then - return - fi - cp "$PPX_BACKUP_DIR/rescript.json" "$PPX_CONFIG" - cp "$PPX_BACKUP_DIR/FileWithPpx.res" "$PPX_SOURCE" - cp "$PPX_BACKUP_DIR/FileWithPpx.mjs" "$PPX_OUTPUT" - unset GIT_INDEX_FILE - rm -rf "$PPX_BACKUP_DIR" - } - trap restore_ppx_fixture EXIT - - bold "Disable sury-ppx fixture on Intel macOS" - node -e ' - const fs = require("fs"); - const path = process.argv[1]; - const config = JSON.parse(fs.readFileSync(path, "utf8")); - delete config["ppx-flags"]; - fs.writeFileSync(path, `${JSON.stringify(config, null, 2)}\n`); - ' "$PPX_CONFIG" - printf "\n" > "$PPX_SOURCE" - - if ! error_output=$(cd ../testrepo && "$REWATCH_EXECUTABLE" clean 2>&1 && "$REWATCH_EXECUTABLE" build 2>&1); then - error "Error preparing testrepo without sury-ppx" - printf "%s\n" "$error_output" >&2 - exit 1 - fi - - git add "$PPX_CONFIG" "$PPX_SOURCE" "$PPX_OUTPUT" - success "sury-ppx fixture disabled" -fi - # Individual test files # Comment out any test to skip it diff --git a/scripts/updateArtifactList.js b/scripts/updateArtifactList.js index 72cbd897eba..2cea547833a 100755 --- a/scripts/updateArtifactList.js +++ b/scripts/updateArtifactList.js @@ -122,7 +122,6 @@ for (const pkg of ["rescript", "@rescript/runtime", "@rescript/belt"]) { for (const pkg of [ "@rescript/darwin-arm64", - "@rescript/darwin-x64", "@rescript/linux-arm64", "@rescript/linux-x64", "@rescript/win32-x64", diff --git a/tests/cli_tests/platform_test.mjs b/tests/cli_tests/platform_test.mjs index 4faa5a1465f..911bc16fc25 100644 --- a/tests/cli_tests/platform_test.mjs +++ b/tests/cli_tests/platform_test.mjs @@ -1,12 +1,14 @@ import * as assert from "node:assert/strict"; import { describe, it } from "mocha"; -import { getTarget } from "../../cli/common/platform.cjs"; +import { + getTarget, + unsupportedPlatformMessage, +} from "../../cli/common/platform.cjs"; describe("getTarget", () => { it("maps supported platforms to their own package", () => { for (const [platform, arch] of [ ["darwin", "arm64"], - ["darwin", "x64"], ["linux", "arm64"], ["linux", "x64"], ["win32", "x64"], @@ -30,4 +32,16 @@ describe("getTarget", () => { assert.equal(getTarget("linux", "ia32", "6.0.0"), undefined); assert.equal(getTarget("freebsd", "x64", "14.0"), undefined); }); + + it("rejects Intel Macs, which are supported up to ReScript 12", () => { + assert.equal(getTarget("darwin", "x64", "25.0.0"), undefined); + assert.equal( + unsupportedPlatformMessage("darwin", "x64"), + "Intel Macs are not supported anymore. Use ReScript 12.", + ); + assert.equal( + unsupportedPlatformMessage("freebsd", "x64"), + "Platform freebsd-x64 is not supported!", + ); + }); }); diff --git a/tests/rewatch_ounit_tests/toolchain_tests.ml b/tests/rewatch_ounit_tests/toolchain_tests.ml index 4ca81d0efb6..4204eb2f677 100644 --- a/tests/rewatch_ounit_tests/toolchain_tests.ml +++ b/tests/rewatch_ounit_tests/toolchain_tests.ml @@ -75,7 +75,7 @@ let tests = [ ("linux", "amd64", Some "@rescript/linux-x64"); ("linux", "arm64", Some "@rescript/linux-arm64"); - ("macosx", "amd64", Some "@rescript/darwin-x64"); + ("macosx", "amd64", None); ("macosx", "arm64", Some "@rescript/darwin-arm64"); ("mingw64", "amd64", Some "@rescript/win32-x64"); ("win64", "amd64", Some "@rescript/win32-x64"); diff --git a/yarn.lock b/yarn.lock index fb224499086..f01390e91f3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -232,12 +232,6 @@ __metadata: languageName: node linkType: hard -"@rescript/darwin-x64@workspace:packages/@rescript/darwin-x64": - version: 0.0.0-use.local - resolution: "@rescript/darwin-x64@workspace:packages/@rescript/darwin-x64" - languageName: unknown - linkType: soft - "@rescript/linux-arm64@npm:12.3.1": version: 12.3.1 resolution: "@rescript/linux-arm64@npm:12.3.1" @@ -1487,7 +1481,6 @@ __metadata: dependencies: "@biomejs/biome": "npm:2.5.15" "@rescript/darwin-arm64": "workspace:packages/@rescript/darwin-arm64" - "@rescript/darwin-x64": "workspace:packages/@rescript/darwin-x64" "@rescript/linux-arm64": "workspace:packages/@rescript/linux-arm64" "@rescript/linux-x64": "workspace:packages/@rescript/linux-x64" "@rescript/runtime": "workspace:packages/@rescript/runtime" @@ -1501,8 +1494,6 @@ __metadata: dependenciesMeta: "@rescript/darwin-arm64": optional: true - "@rescript/darwin-x64": - optional: true "@rescript/linux-arm64": optional: true "@rescript/linux-x64": From de4bc72a9b6970dd49881604fb24c1ba288997de Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Mon, 19 Oct 2026 08:12:23 +0000 Subject: [PATCH 2/3] Clarify the platform package comment Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01DbtRiJ2YzgzVdwgNf8Yiaz Signed-off-by: Christoph Knittel --- rewatch-ocaml/toolchain.ml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/rewatch-ocaml/toolchain.ml b/rewatch-ocaml/toolchain.ml index e63c3a49097..de86370b63c 100644 --- a/rewatch-ocaml/toolchain.ml +++ b/rewatch-ocaml/toolchain.ml @@ -17,10 +17,11 @@ let absolute_program ~cwd program = if Filename.is_relative resolved then Filename.concat cwd resolved else resolved -(* The npm package (@rescript/) with the binaries for the platform - [system] and [architecture] name, as in cli/common/platform.cjs. Windows on - ARM runs the x64 binaries, which are built for amd64. Intel Macs have no - package since ReScript 13. *) +(* The npm package (@rescript/) with the binaries for a platform, as in + cli/common/platform.cjs. [system] and [architecture] are the names OCaml + uses for the platform this executable was built for, where x64 is "amd64". + Windows on ARM needs no case of its own: it runs the win32-x64 binaries, + which were built for amd64. Intel Macs have no package since ReScript 13. *) let platform_package ~system ~architecture = let os = match system with From 365d223f8287f575f3d63e48c824df41ee062b2c Mon Sep 17 00:00:00 2001 From: Christoph Knittel Date: Mon, 19 Oct 2026 08:14:39 +0000 Subject: [PATCH 3/3] Shorten the platform package comment Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_01DbtRiJ2YzgzVdwgNf8Yiaz Signed-off-by: Christoph Knittel --- rewatch-ocaml/toolchain.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rewatch-ocaml/toolchain.ml b/rewatch-ocaml/toolchain.ml index de86370b63c..432efdfc229 100644 --- a/rewatch-ocaml/toolchain.ml +++ b/rewatch-ocaml/toolchain.ml @@ -20,8 +20,8 @@ let absolute_program ~cwd program = (* The npm package (@rescript/) with the binaries for a platform, as in cli/common/platform.cjs. [system] and [architecture] are the names OCaml uses for the platform this executable was built for, where x64 is "amd64". - Windows on ARM needs no case of its own: it runs the win32-x64 binaries, - which were built for amd64. Intel Macs have no package since ReScript 13. *) + Windows on ARM needs no case of its own: it runs the win32-x64 binaries. + Intel Macs have no package since ReScript 13. *) let platform_package ~system ~architecture = let os = match system with