Skip to content

Commit d22fafd

Browse files
cometkimcometkim
committed
cleanup test rescript configs
1 parent fd5d56e commit d22fafd

File tree

43 files changed

+19464
-122
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+19464
-122
lines changed

‎scripts/test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ if (runtimeDocstrings) {
159159
});
160160

161161
// Generate rescript file with all tests `generated_mocha_test.res`
162-
await node([path.join(docstringTestDir, "DocTest.res.mjs")], {
162+
await node([path.join(docstringTestDir, "DocTest.res.js")], {
163163
cwd: projectDir,
164164
stdio: "inherit",
165165
});
@@ -179,7 +179,7 @@ if (runtimeDocstrings) {
179179

180180
console.log("Run mocha test");
181181
await mocha(
182-
[path.join("tests", "docstring_tests", "generated_mocha_test.res.mjs")],
182+
[path.join("tests", "docstring_tests", "generated_mocha_test.res.js")],
183183
{
184184
cwd: projectDir,
185185
stdio: "inherit",

‎tests/build_tests/custom_namespace/rescript.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
"namespace": "Foo_bar",
99
"package-specs": {
1010
"module": "esmodule",
11-
"in-source": true
11+
"in-source": true,
12+
"suffix": ".res.js"
1213
},
1314
"bsc-flags": ["-bs-no-version-header"],
1415
"warnings": {
1516
"number": "-40+6+7",
1617
"error": true
17-
},
18-
"suffix": ".res.js"
18+
}
1919
}

‎tests/build_tests/cycle/rescript.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
"subdirs": true
77
},
88
"package-specs": {
9-
"module": "commonjs",
10-
"in-source": true
9+
"module": "esmodule",
10+
"in-source": true,
11+
"suffix": ".res.js"
1112
},
12-
"suffix": ".bs.js",
1313
"bs-dependencies": [],
1414
"warnings": { "error": "+101" }
1515
}

‎tests/build_tests/cycle1/rescript.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
},
99
"package-specs": {
1010
"module": "esmodule",
11-
"in-source": true
12-
},
13-
"suffix": ".bs.js"
11+
"in-source": true,
12+
"suffix": ".res.js"
13+
}
1414
}

‎tests/build_tests/devonly/rescript.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@
1313
}
1414
],
1515
"package-specs": {
16-
"module": "commonjs",
17-
"in-source": true
16+
"module": "esmodule",
17+
"in-source": true,
18+
"suffix": ".res.js"
1819
},
19-
"suffix": ".bs.js",
20-
"bs-dependencies": [],
2120
"warnings": { "error": "+101" }
2221
}

‎tests/build_tests/devonly/src/demo.bs.js renamed to ‎tests/build_tests/devonly/src/demo.res.js

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/build_tests/devonly/src/depdemo.bs.js renamed to ‎tests/build_tests/devonly/src/depdemo.res.js

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/build_tests/devonly/src2/hello.bs.js renamed to ‎tests/build_tests/devonly/src2/hello.res.js

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/build_tests/devonly/src2/hellodep.bs.js renamed to ‎tests/build_tests/devonly/src2/hellodep.res.js

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/build_tests/duplicated_symlinked_packages/a/rescript.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
},
88
"package-specs": {
99
"module": "esmodule",
10-
"in-source": true
10+
"in-source": true,
11+
"suffix": ".res.js"
1112
},
12-
"suffix": ".res.js",
1313
"bs-dependencies": ["c", "z"],
1414
"warnings": { "error": "+101" },
1515
"namespace": true

‎tests/build_tests/duplicated_symlinked_packages/b/rescript.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
},
88
"package-specs": {
99
"module": "esmodule",
10-
"in-source": true
10+
"in-source": true,
11+
"suffix": ".res.js"
1112
},
12-
"suffix": ".res.js",
1313
"bs-dependencies": ["c"],
1414
"warnings": { "error": "+101" },
1515
"namespace": true

‎tests/build_tests/duplicated_symlinked_packages/c/rescript.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"module": "esmodule",
1010
"in-source": true
1111
},
12-
"suffix": ".res.js",
1312
"warnings": { "error": "+101" },
1413
"namespace": true
1514
}

‎tests/build_tests/duplicated_symlinked_packages/node_modules/z/rescript.json

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/build_tests/exports/rescript.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"name": "exports",
33
"version": "0.1.0",
4-
"sources": ["src"],
5-
"bs-dependencies": []
4+
"sources": ["src"]
65
}

‎tests/build_tests/gpr_978/rescript.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
"name": "gpr_978",
33
"version": "0.0.0",
4-
"sources": ["src"],
5-
"bs-dependencies": []
4+
"sources": ["src"]
65
}

‎tests/build_tests/install/rescript.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
"subdirs": true
77
},
88
"package-specs": {
9-
"module": "commonjs",
10-
"in-source": true
9+
"module": "esmodule",
10+
"in-source": true,
11+
"suffix": ".res.js"
1112
},
12-
"suffix": ".bs.js",
1313
"bs-dependencies": [],
1414
"warnings": { "error": "+101" }
1515
}

‎tests/build_tests/install/src/Foo.res.js

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/build_tests/jsx_settings_inheritance/node_modules/@rescript/react/rescript.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/build_tests/jsx_settings_inheritance/node_modules/@rescript/react/src/React.mjs renamed to ‎tests/build_tests/jsx_settings_inheritance/node_modules/@rescript/react/src/React.res.js

Lines changed: 11 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/build_tests/jsx_settings_inheritance/node_modules/@rescript/react/src/ReactDOM.mjs renamed to ‎tests/build_tests/jsx_settings_inheritance/node_modules/@rescript/react/src/ReactDOM.res.js

Lines changed: 5 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/build_tests/jsx_settings_inheritance/node_modules/a/package.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/build_tests/jsx_settings_inheritance/node_modules/a/rescript.json

Lines changed: 6 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/build_tests/jsx_settings_inheritance/node_modules/a/src/A.mjs renamed to ‎tests/build_tests/jsx_settings_inheritance/node_modules/a/src/A.res.js

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/build_tests/jsx_settings_inheritance/node_modules/b/rescript.json

Lines changed: 6 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/build_tests/jsx_settings_inheritance/node_modules/b/src/B.mjs renamed to ‎tests/build_tests/jsx_settings_inheritance/node_modules/b/src/B.res.js

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests/build_tests/jsx_settings_inheritance/rescript.json

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,11 @@
88
"dir": "src",
99
"subdirs": true
1010
},
11-
"package-specs": [
12-
{
13-
"module": "commonjs",
14-
"in-source": true
15-
}
16-
],
17-
"suffix": ".mjs",
11+
"package-specs": {
12+
"module": "esmodule",
13+
"in-source": true,
14+
"suffix": ".res.js"
15+
},
1816
"namespace": true,
1917
"bs-dependencies": ["@rescript/react", "a", "b"]
2018
}

‎tests/build_tests/jsx_settings_inheritance/src/C.mjs renamed to ‎tests/build_tests/jsx_settings_inheritance/src/C.res.js

Lines changed: 6 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)