use import.meta.dirname

Author: cometkim

cli/_paths.js

@@ -1,11 +1,8 @@
 // @ts-check
 
 import * as path from "node:path";
-import { fileURLToPath } from "node:url";
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-
-export const cliPath = path.join(__dirname, "rescript.js");
+export const cliPath = path.join(import.meta.dirname, "rescript.js");
 
 /**
  * For compatibility reasons, if the architecture is x64, omit it from the bin directory name.
@@ -19,7 +16,11 @@ export const platformName =
     ? process.platform
     : process.platform + process.arch;
 
-export const platformDir = path.resolve(__dirname, "..", platformName);
+export const platformDir = path.resolve(
+  import.meta.dirname,
+  "..",
+  platformName,
+);
 
 export const bsc_exe = path.join(platformDir, "bsc.exe");
 

lib_dev/paths.js

@@ -1,14 +1,11 @@
 // @ts-check
 
 import * as path from "node:path";
-import { fileURLToPath } from "node:url";
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
 /**
  * The project root path
  */
-export const projectDir = path.resolve(__dirname, "..");
+export const projectDir = path.resolve(import.meta.dirname, "..");
 
 /**
  * path: `<projectDir>/compiler/`

lib_dev/process.js

@@ -1,6 +1,4 @@
 import * as child_process from "node:child_process";
-import * as path from "node:path";
-import { fileURLToPath } from "node:url";
 import { bsc_exe, cliPath, rescript_exe } from "#cli/paths";
 
 /**
@@ -21,18 +19,10 @@ const signals = {
 export const { exec, node, npx, mocha, bsc, rescript, execBuild, execClean } =
   setup();
 
-/**
- * @param {string} url
- */
-export function setupWithUrl(url) {
-  return setup(path.dirname(fileURLToPath(url)));
-}
-
 /**
  * @param {string} [cwd]
  */
 export function setup(cwd = process.cwd()) {
-
   /**
    * @param {string} command
    * @param {string[]} [args]

lib_dev/utils.js

@@ -1,13 +1,3 @@
-/**
- * `import.meta.dirname` alternative. It is available since Node.js v20.11.0
- *
- * @param {string} url `import.meta.url`
- * @return {string}
- */
-export function getDirname(url) {
-  return path.dirname(fileURLToPath(url));
-}
-
 /**
  * @param {string} s
  */

packages/playground-bundling/rollup.config.mjs

@@ -1,11 +1,8 @@
 import * as path from "node:path";
-import { fileURLToPath } from "node:url";
 import nodeResolve from "@rollup/plugin-node-resolve";
 import { glob } from "glob";
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-
-const RESCRIPT_COMPILER_ROOT_DIR = path.join(__dirname, "..", "..");
+const RESCRIPT_COMPILER_ROOT_DIR = path.join(import.meta.dirname, "..", "..");
 const LIB_DIR = path.join(RESCRIPT_COMPILER_ROOT_DIR, "lib");
 const PLAYGROUND_DIR = path.join(RESCRIPT_COMPILER_ROOT_DIR, "playground");
 // Final target output directory where all the cmijs will be stored

packages/playground-bundling/scripts/generate_cmijs.js

@@ -18,17 +18,19 @@
 import * as child_process from "node:child_process";
 import * as fs from "node:fs";
 import * as path from "node:path";
-import { fileURLToPath } from "node:url";
 
 import resConfig from "../rescript.json" with { type: "json" };
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-
-const RESCRIPT_COMPILER_ROOT_DIR = path.join(__dirname, "..", "..", "..");
+const RESCRIPT_COMPILER_ROOT_DIR = path.join(
+  import.meta.dirname,
+  "..",
+  "..",
+  "..",
+);
 const PLAYGROUND_DIR = path.join(RESCRIPT_COMPILER_ROOT_DIR, "playground");
 
 // The playground-bundling root dir
-const PROJECT_ROOT_DIR = path.join(__dirname, "..");
+const PROJECT_ROOT_DIR = path.join(import.meta.dirname, "..");
 
 // Final target output directory where all the cmijs will be stored
 const PACKAGES_DIR = path.join(PLAYGROUND_DIR, "packages");

tests/build_tests/build_warn_as_error/input.js

@@ -1,7 +1,7 @@
 import * as assert from "node:assert";
-import { setupWithUrl } from "#dev/process";
+import { setup } from "#dev/process";
 
-const { execBuild, execClean } = setupWithUrl(import.meta.url);
+const { execBuild, execClean } = setup(import.meta.dirname);
 
 const o1 = await execBuild();
 

tests/build_tests/case/input.js

@@ -1,8 +1,8 @@
 import * as assert from "node:assert";
-import { setupWithUrl } from "#dev/process";
+import { setup } from "#dev/process";
 import { normalizeNewlines } from "#dev/utils";
 
-const { execBuild } = setupWithUrl(import.meta.url);
+const { execBuild } = setup(import.meta.dirname);
 
 const { stderr } = await execBuild();
 

tests/build_tests/case2/input.js

@@ -1,10 +1,10 @@
 // @ts-check
 
 import * as assert from "node:assert";
-import { setupWithUrl } from "#dev/process";
+import { setup } from "#dev/process";
 import { normalizeNewlines } from "#dev/utils";
 
-const { execBuild } = setupWithUrl(import.meta.url);
+const { execBuild } = setup(import.meta.dirname);
 
 const { stderr } = await execBuild();
 

tests/build_tests/case3/input.js

@@ -3,9 +3,9 @@
 import assert from "node:assert";
 import fs from "node:fs/promises";
 import path from "node:path";
-import { setupWithUrl } from "#dev/process";
+import { setup } from "#dev/process";
 
-const { execBuild } = setupWithUrl(import.meta.url);
+const { execBuild } = setup(import.meta.dirname);
 
 await execBuild();