Skip to content

Commit 7861628

Browse files
authored
Do not use experimental JSON import feature (#7379)
* Do not use experimental JSON import feature * CHANGELOG
1 parent c048e26 commit 7861628

File tree

5 files changed

+23
-7
lines changed

5 files changed

+23
-7
lines changed

.github/workflows/prepare_package_upload.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import * as fs from "node:fs";
22
import * as os from "node:os";
33

4-
import packageSpec from "rescript/package.json" with { type: "json" };
4+
const packageSpec = JSON.parse(
5+
fs.readFileSync(new URL("../../package.json", import.meta.url), "utf-8")
6+
);
57

68
const { version } = packageSpec;
79

CHANGELOG.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,13 @@
1212
1313
# 12.0.0-alpha.12 (Unreleased)
1414

15+
#### :bug: Bug fix
16+
17+
- Fix node.js ExperimentalWarning. https://github.com/rescript-lang/rescript/pull/7379
18+
1519
#### :house: Internal
16-
- Better representation of JSX in AST . https://github.com/rescript-lang/rescript/pull/7286
20+
21+
- Better representation of JSX in AST. https://github.com/rescript-lang/rescript/pull/7286
1722

1823
# 12.0.0-alpha.11
1924

cli/rescript.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
// and its content are file/directories with regard to project root
88

99
import * as tty from "node:tty";
10-
import packageJson from "rescript/package.json" with { type: "json" };
10+
import * as fs from "node:fs";
1111

1212
import { bsc_exe, rescript_exe } from "./common/bins.js";
1313
import * as bsb from "./common/bsb.js";
@@ -93,7 +93,11 @@ if (
9393
) {
9494
console.log(helpMessage);
9595
} else if (argPatterns.version.includes(args[0])) {
96-
console.log(packageJson.version);
96+
const packageSpec = JSON.parse(
97+
fs.readFileSync(new URL("../package.json", import.meta.url), "utf-8")
98+
);
99+
100+
console.log(packageSpec.version);
97101
} else if (firstPositionalArgIndex !== -1) {
98102
const subcmd = args[firstPositionalArgIndex];
99103
const subcmdArgs = args.slice(firstPositionalArgIndex + 1);

scripts/prebuilt.js

+5-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import assert from "node:assert";
66
import fs from "node:fs";
7-
import packageJson from "rescript/package.json" with { type: "json" };
87
import semver from "semver";
98
import { compilerVersionFile } from "#dev/paths";
109

@@ -29,7 +28,11 @@ assert.ok(bsVersionMatch, "Failed to parse the compiler version file");
2928
const bsVersion = semver.parse(bsVersionMatch.version);
3029
assert.ok(bsVersion, "Failed to parse the compiler version file");
3130

32-
const packageVersion = semver.parse(packageJson.version);
31+
const packageSpec = JSON.parse(
32+
fs.readFileSync(new URL("../package.json", import.meta.url), "utf-8"),
33+
);
34+
35+
const packageVersion = semver.parse(packageSpec.version);
3336
assert.ok(packageVersion, "Failed to parse the version of the package.json");
3437

3538
assert.ok(

scripts/setVersion.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@
33
// @ts-check
44

55
import fs from "node:fs";
6-
import packageSpec from "rescript/package.json" with { type: "json" };
76

7+
const packageSpec = JSON.parse(
8+
fs.readFileSync(new URL("../package.json", import.meta.url), "utf-8"),
9+
);
810
const { name, version } = packageSpec;
911

1012
const stdlibPackageSpec = JSON.parse(

0 commit comments

Comments
 (0)