From 5f4ec78c032adfb842aa81db204b02eff3c9cedc Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim=20D=C3=BCsterhus?= <duesterhus@woltlab.com>
Date: Thu, 17 Nov 2022 15:32:52 +0100
Subject: [PATCH] Make use of `@woltlab/r.js`

---
 extra/_buildCore.js     | 3 +--
 extra/_buildExternal.js | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/extra/_buildCore.js b/extra/_buildCore.js
index 904ee82124..3d2de18aad 100644
--- a/extra/_buildCore.js
+++ b/extra/_buildCore.js
@@ -66,7 +66,6 @@ async function compile(destination, files, overrides) {
 	//
 	// step3) build rjs
 	//
-	const rjsCmd = process.platform === "win32" ? "r.js.cmd" : "r.js";
 	process.chdir("../../");
 
 	{
@@ -77,7 +76,7 @@ async function compile(destination, files, overrides) {
 
 			console.time(name);
 			{
-				childProcess.execSync(`${rjsCmd} -o ${configFile} name=${name} out=${name}.js`, {
+				childProcess.execSync(`node ${__dirname}/node_modules/.bin/r.js -o ${configFile} name=${name} out=${name}.js`, {
 					cwd: process.cwd(),
 					stdio: [0, 1, 2],
 				});
diff --git a/extra/_buildExternal.js b/extra/_buildExternal.js
index ae41687478..5512350b73 100644
--- a/extra/_buildExternal.js
+++ b/extra/_buildExternal.js
@@ -60,7 +60,6 @@ fs.readdirSync("./")
         }
     });
 
-const rjsCmd = (process.platform === "win32") ? "r.js.cmd" : "r.js";
 rjsPaths.forEach(async path => {
     let buildConfig = `${path}require.build.js`;
     let outFilename = require(process.cwd() + `/${buildConfig}`).out;
@@ -73,7 +72,7 @@ rjsPaths.forEach(async path => {
         }
 
         console.time(outFilename);
-        childProcess.execSync(`${rjsCmd} -o require.build.js ${overrides}`, {
+        childProcess.execSync(`node ${__dirname}/node_modules/.bin/r.js -o require.build.js ${overrides}`, {
             cwd: path,
             stdio: [0, 1, 2]
         });
-- 
2.20.1