From ae6ab8ba80c71212f33177db187cbb053cca8959 Mon Sep 17 00:00:00 2001 From: Dmitry Zakharov Date: Tue, 22 Aug 2023 01:33:32 +0400 Subject: [PATCH 1/4] Remove unrelated files from tests --- jscomp/build_tests/case/.gitignore | 25 ------- jscomp/build_tests/case/README.md | 16 ----- jscomp/build_tests/case/input.js | 5 +- jscomp/build_tests/case/package.json | 16 ----- jscomp/build_tests/case2/.gitignore | 25 ------- jscomp/build_tests/case2/README.md | 16 ----- jscomp/build_tests/case2/input.js | 5 +- jscomp/build_tests/case2/package.json | 16 ----- jscomp/build_tests/case3/.gitignore | 27 -------- jscomp/build_tests/case3/README.md | 16 ----- jscomp/build_tests/case3/input.js | 4 +- jscomp/build_tests/case3/package-lock.json | 64 ------------------ jscomp/build_tests/case3/package.json | 17 ----- jscomp/build_tests/case3/src/hello.bs.js | 11 ++++ .../build_tests/custom_namespace/.gitignore | 25 ------- jscomp/build_tests/custom_namespace/README.md | 16 ----- jscomp/build_tests/custom_namespace/input.js | 2 - .../build_tests/custom_namespace/package.json | 16 ----- jscomp/build_tests/cycle/.gitignore | 26 -------- jscomp/build_tests/cycle/README.md | 16 ----- jscomp/build_tests/cycle/package-lock.json | 65 ------------------- jscomp/build_tests/cycle/package.json | 17 ----- jscomp/build_tests/cycle1/.gitignore | 26 -------- jscomp/build_tests/cycle1/README.md | 16 ----- jscomp/build_tests/cycle1/package-lock.json | 44 ------------- jscomp/build_tests/cycle1/package.json | 17 ----- jscomp/build_tests/devonly/.gitignore | 26 -------- jscomp/build_tests/devonly/README.md | 16 ----- jscomp/build_tests/devonly/package-lock.json | 64 ------------------ jscomp/build_tests/devonly/package.json | 17 ----- .../package.json | 16 ----- jscomp/build_tests/exports/.gitignore | 25 ------- jscomp/build_tests/exports/README.md | 16 ----- jscomp/build_tests/exports/package.json | 16 ----- jscomp/build_tests/hyphen2/.gitignore | 25 ------- jscomp/build_tests/hyphen2/README.md | 16 ----- jscomp/build_tests/hyphen2/package.json | 16 ----- jscomp/build_tests/install/.gitignore | 26 -------- jscomp/build_tests/install/package-lock.json | 65 ------------------- jscomp/build_tests/install/package.json | 18 ----- jscomp/build_tests/install/src/Foo.bs.js | 10 +++ jscomp/build_tests/nested/.gitignore | 25 ------- jscomp/build_tests/nested/README.md | 16 ----- jscomp/build_tests/nested/package.json | 16 ----- jscomp/build_tests/nnest/.gitignore | 25 ------- jscomp/build_tests/nnest/README.md | 16 ----- jscomp/build_tests/nnest/package.json | 16 ----- jscomp/build_tests/ns/.gitignore | 25 ------- jscomp/build_tests/ns/README.md | 16 ----- jscomp/build_tests/ns/package.json | 16 ----- jscomp/build_tests/package-lock.json | 43 ------------ jscomp/build_tests/package.json | 7 -- jscomp/build_tests/post-build/.gitignore | 26 -------- jscomp/build_tests/post-build/README.md | 13 ---- .../build_tests/post-build/package-lock.json | 64 ------------------ jscomp/build_tests/post-build/package.json | 17 ----- jscomp/build_tests/react_ppx/.gitignore | 1 - jscomp/build_tests/rerror/.gitignore | 25 ------- jscomp/build_tests/rerror/README.md | 18 ----- jscomp/build_tests/rerror/package.json | 16 ----- .../build_tests/scoped_ppx/package-lock.json | 39 ----------- jscomp/build_tests/scoped_ppx/package.json | 5 -- .../build_tests/uncurried-always/.gitignore | 26 -------- jscomp/build_tests/uncurried-always/input.js | 3 - .../uncurried-always/package-lock.json | 44 ------------- .../build_tests/uncurried-always/package.json | 17 ----- jscomp/build_tests/weird_deps/.gitignore | 26 -------- jscomp/build_tests/weird_deps/README.md | 16 ----- .../build_tests/weird_deps/package-lock.json | 13 ---- jscomp/build_tests/weird_deps/package.json | 14 ---- jscomp/build_tests/weird_devdeps/.gitignore | 26 -------- jscomp/build_tests/weird_devdeps/README.md | 16 ----- .../weird_devdeps/package-lock.json | 34 ---------- jscomp/build_tests/weird_devdeps/package.json | 14 ---- jscomp/build_tests/weird_names/.gitignore | 26 -------- jscomp/build_tests/weird_names/README.md | 13 ---- .../build_tests/weird_names/package-lock.json | 64 ------------------ jscomp/build_tests/weird_names/package.json | 17 ----- jscomp/build_tests/x-y/.gitignore | 25 ------- jscomp/build_tests/x-y/README.md | 16 ----- jscomp/build_tests/x-y/package.json | 16 ----- jscomp/build_tests/xpkg/input.js | 1 - jscomp/build_tests/zerocycle/.gitignore | 25 ------- jscomp/build_tests/zerocycle/README.md | 16 ----- .../build_tests/zerocycle/package-lock.json | 63 ------------------ jscomp/build_tests/zerocycle/package.json | 17 ----- 86 files changed, 31 insertions(+), 1883 deletions(-) delete mode 100644 jscomp/build_tests/case/.gitignore delete mode 100644 jscomp/build_tests/case/README.md delete mode 100644 jscomp/build_tests/case/package.json delete mode 100644 jscomp/build_tests/case2/.gitignore delete mode 100644 jscomp/build_tests/case2/README.md delete mode 100644 jscomp/build_tests/case2/package.json delete mode 100644 jscomp/build_tests/case3/.gitignore delete mode 100644 jscomp/build_tests/case3/README.md delete mode 100644 jscomp/build_tests/case3/package-lock.json delete mode 100644 jscomp/build_tests/case3/package.json create mode 100644 jscomp/build_tests/case3/src/hello.bs.js delete mode 100644 jscomp/build_tests/custom_namespace/.gitignore delete mode 100644 jscomp/build_tests/custom_namespace/README.md delete mode 100644 jscomp/build_tests/custom_namespace/package.json delete mode 100644 jscomp/build_tests/cycle/.gitignore delete mode 100644 jscomp/build_tests/cycle/README.md delete mode 100644 jscomp/build_tests/cycle/package-lock.json delete mode 100644 jscomp/build_tests/cycle/package.json delete mode 100644 jscomp/build_tests/cycle1/.gitignore delete mode 100644 jscomp/build_tests/cycle1/README.md delete mode 100644 jscomp/build_tests/cycle1/package-lock.json delete mode 100644 jscomp/build_tests/cycle1/package.json delete mode 100644 jscomp/build_tests/devonly/.gitignore delete mode 100644 jscomp/build_tests/devonly/README.md delete mode 100644 jscomp/build_tests/devonly/package-lock.json delete mode 100644 jscomp/build_tests/devonly/package.json delete mode 100644 jscomp/build_tests/duplicated_symlinked_packages/package.json delete mode 100644 jscomp/build_tests/exports/.gitignore delete mode 100644 jscomp/build_tests/exports/README.md delete mode 100644 jscomp/build_tests/exports/package.json delete mode 100644 jscomp/build_tests/hyphen2/.gitignore delete mode 100644 jscomp/build_tests/hyphen2/README.md delete mode 100644 jscomp/build_tests/hyphen2/package.json delete mode 100644 jscomp/build_tests/install/.gitignore delete mode 100644 jscomp/build_tests/install/package-lock.json delete mode 100644 jscomp/build_tests/install/package.json create mode 100644 jscomp/build_tests/install/src/Foo.bs.js delete mode 100644 jscomp/build_tests/nested/README.md delete mode 100644 jscomp/build_tests/nested/package.json delete mode 100644 jscomp/build_tests/nnest/README.md delete mode 100644 jscomp/build_tests/nnest/package.json delete mode 100644 jscomp/build_tests/ns/.gitignore delete mode 100644 jscomp/build_tests/ns/README.md delete mode 100644 jscomp/build_tests/ns/package.json delete mode 100644 jscomp/build_tests/package-lock.json delete mode 100644 jscomp/build_tests/package.json delete mode 100644 jscomp/build_tests/post-build/.gitignore delete mode 100644 jscomp/build_tests/post-build/README.md delete mode 100644 jscomp/build_tests/post-build/package-lock.json delete mode 100644 jscomp/build_tests/post-build/package.json delete mode 100644 jscomp/build_tests/react_ppx/.gitignore delete mode 100644 jscomp/build_tests/rerror/.gitignore delete mode 100644 jscomp/build_tests/rerror/README.md delete mode 100644 jscomp/build_tests/rerror/package.json delete mode 100644 jscomp/build_tests/scoped_ppx/package-lock.json delete mode 100644 jscomp/build_tests/scoped_ppx/package.json delete mode 100644 jscomp/build_tests/uncurried-always/.gitignore delete mode 100644 jscomp/build_tests/uncurried-always/package-lock.json delete mode 100644 jscomp/build_tests/uncurried-always/package.json delete mode 100644 jscomp/build_tests/weird_deps/.gitignore delete mode 100644 jscomp/build_tests/weird_deps/README.md delete mode 100644 jscomp/build_tests/weird_deps/package-lock.json delete mode 100644 jscomp/build_tests/weird_deps/package.json delete mode 100644 jscomp/build_tests/weird_devdeps/.gitignore delete mode 100644 jscomp/build_tests/weird_devdeps/README.md delete mode 100644 jscomp/build_tests/weird_devdeps/package-lock.json delete mode 100644 jscomp/build_tests/weird_devdeps/package.json delete mode 100644 jscomp/build_tests/weird_names/.gitignore delete mode 100644 jscomp/build_tests/weird_names/README.md delete mode 100644 jscomp/build_tests/weird_names/package-lock.json delete mode 100644 jscomp/build_tests/weird_names/package.json delete mode 100644 jscomp/build_tests/x-y/.gitignore delete mode 100644 jscomp/build_tests/x-y/README.md delete mode 100644 jscomp/build_tests/x-y/package.json delete mode 100644 jscomp/build_tests/zerocycle/README.md delete mode 100644 jscomp/build_tests/zerocycle/package-lock.json delete mode 100644 jscomp/build_tests/zerocycle/package.json diff --git a/jscomp/build_tests/case/.gitignore b/jscomp/build_tests/case/.gitignore deleted file mode 100644 index 8f464d0527..0000000000 --- a/jscomp/build_tests/case/.gitignore +++ /dev/null @@ -1,25 +0,0 @@ -*.exe -*.obj -*.out -*.compile -*.native -*.byte -*.cmo -*.annot -*.cmi -*.cmx -*.cmt -*.cmti -*.cma -*.a -*.cmxa -*.obj -*~ -*.annot -*.cmj -*.bak -lib/bs -*.mlast -*.mliast -.vscode -.merlin \ No newline at end of file diff --git a/jscomp/build_tests/case/README.md b/jscomp/build_tests/case/README.md deleted file mode 100644 index 1c02d2a072..0000000000 --- a/jscomp/build_tests/case/README.md +++ /dev/null @@ -1,16 +0,0 @@ - - -# Build -``` -npm run build -``` - -# Watch - -``` -npm run watch -``` - - -# Editor -If you use `vscode`, Press `Windows + Shift + B` it will build automatically \ No newline at end of file diff --git a/jscomp/build_tests/case/input.js b/jscomp/build_tests/case/input.js index 483448bd3e..4bc1572806 100644 --- a/jscomp/build_tests/case/input.js +++ b/jscomp/build_tests/case/input.js @@ -3,4 +3,7 @@ var assert = require("assert"); var rescript_exe = require("../../../scripts/bin_path").rescript_exe; var o = p.spawnSync(rescript_exe, { encoding: "utf8", cwd: __dirname }); -assert.ok(o.stderr.match(/different cases/).length > 0); +assert.equal( + o.stderr, + `Error: Invalid bsconfig.json implementation and interface have different path names or different cases src/demo vs src/Demo\n` +); diff --git a/jscomp/build_tests/case/package.json b/jscomp/build_tests/case/package.json deleted file mode 100644 index 619a22e950..0000000000 --- a/jscomp/build_tests/case/package.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "case", - "version": "0.1.0", - "scripts": { - "clean": "rescript clean", - "build": "rescript build", - "watch": "rescript build -w" - }, - "keywords": [ - "rescript" - ], - "license": "MIT", - "devDependencies": { - "bs-platform": "1.9.2" - } -} \ No newline at end of file diff --git a/jscomp/build_tests/case2/.gitignore b/jscomp/build_tests/case2/.gitignore deleted file mode 100644 index 8f464d0527..0000000000 --- a/jscomp/build_tests/case2/.gitignore +++ /dev/null @@ -1,25 +0,0 @@ -*.exe -*.obj -*.out -*.compile -*.native -*.byte -*.cmo -*.annot -*.cmi -*.cmx -*.cmt -*.cmti -*.cma -*.a -*.cmxa -*.obj -*~ -*.annot -*.cmj -*.bak -lib/bs -*.mlast -*.mliast -.vscode -.merlin \ No newline at end of file diff --git a/jscomp/build_tests/case2/README.md b/jscomp/build_tests/case2/README.md deleted file mode 100644 index 1c02d2a072..0000000000 --- a/jscomp/build_tests/case2/README.md +++ /dev/null @@ -1,16 +0,0 @@ - - -# Build -``` -npm run build -``` - -# Watch - -``` -npm run watch -``` - - -# Editor -If you use `vscode`, Press `Windows + Shift + B` it will build automatically \ No newline at end of file diff --git a/jscomp/build_tests/case2/input.js b/jscomp/build_tests/case2/input.js index 483448bd3e..c61a4871bf 100644 --- a/jscomp/build_tests/case2/input.js +++ b/jscomp/build_tests/case2/input.js @@ -3,4 +3,7 @@ var assert = require("assert"); var rescript_exe = require("../../../scripts/bin_path").rescript_exe; var o = p.spawnSync(rescript_exe, { encoding: "utf8", cwd: __dirname }); -assert.ok(o.stderr.match(/different cases/).length > 0); +assert.equal( + o.stderr, + `Error: Invalid bsconfig.json implementation and interface have different path names or different cases src/X vs src/x\n` +); diff --git a/jscomp/build_tests/case2/package.json b/jscomp/build_tests/case2/package.json deleted file mode 100644 index 3ce2aa8b03..0000000000 --- a/jscomp/build_tests/case2/package.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "case2", - "version": "0.1.0", - "scripts": { - "clean": "rescript clean", - "build": "rescript build", - "watch": "rescript build -w" - }, - "keywords": [ - "ReScript" - ], - "license": "MIT", - "devDependencies": { - "bs-platform": "1.9.2" - } -} \ No newline at end of file diff --git a/jscomp/build_tests/case3/.gitignore b/jscomp/build_tests/case3/.gitignore deleted file mode 100644 index 73fc816200..0000000000 --- a/jscomp/build_tests/case3/.gitignore +++ /dev/null @@ -1,27 +0,0 @@ -*.exe -*.obj -*.out -*.compile -*.native -*.byte -*.cmo -*.annot -*.cmi -*.cmx -*.cmt -*.cmti -*.cma -*.a -*.cmxa -*.obj -*~ -*.annot -*.cmj -*.bak -lib/bs -*.mlast -*.mliast -.vscode -.merlin -.bsb.lock -*.bs.js \ No newline at end of file diff --git a/jscomp/build_tests/case3/README.md b/jscomp/build_tests/case3/README.md deleted file mode 100644 index 1c02d2a072..0000000000 --- a/jscomp/build_tests/case3/README.md +++ /dev/null @@ -1,16 +0,0 @@ - - -# Build -``` -npm run build -``` - -# Watch - -``` -npm run watch -``` - - -# Editor -If you use `vscode`, Press `Windows + Shift + B` it will build automatically \ No newline at end of file diff --git a/jscomp/build_tests/case3/input.js b/jscomp/build_tests/case3/input.js index 7822c88cb5..a6672a392c 100644 --- a/jscomp/build_tests/case3/input.js +++ b/jscomp/build_tests/case3/input.js @@ -5,10 +5,10 @@ var fs = require("fs"); var path = require("path"); var assert = require("assert"); var rescript_exe = require("../../../scripts/bin_path").rescript_exe; -p.spawnSync(rescript_exe, { +p.spawnSync(`${rescript_exe} clean && ${rescript_exe} build`, { encoding: "utf8", cwd: __dirname, }); var o = fs.readFileSync(path.join(__dirname, "src", "hello.bs.js"), "ascii"); -assert.ok(/HelloGen.f/.test(o)); +assert.ok(/HelloGen\.f/.test(o)); diff --git a/jscomp/build_tests/case3/package-lock.json b/jscomp/build_tests/case3/package-lock.json deleted file mode 100644 index a400503fa4..0000000000 --- a/jscomp/build_tests/case3/package-lock.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "name": "case3", - "version": "0.1.0", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "name": "case3", - "version": "0.1.0", - "license": "MIT", - "dependencies": { - "rescript": "file:../../.." - }, - "devDependencies": { - "bs-platform": "^5.1.0-dev.1" - } - }, - "../../..": { - "version": "10.0.0", - "hasInstallScript": true, - "license": "SEE LICENSE IN LICENSE", - "bin": { - "bsc": "bsc", - "bstracing": "lib/bstracing", - "rescript": "rescript" - }, - "devDependencies": { - "mocha": "^7.2.0", - "nyc": "^15.0.0" - } - }, - "node_modules/bs-platform": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bs-platform/-/bs-platform-5.2.1.tgz", - "integrity": "sha512-3ISP+RBC/NYILiJnphCY0W3RTYpQ11JGa2dBBLVug5fpFZ0qtSaL3ZplD8MyjNeXX2bC7xgrWfgBSn8Tc9om7Q==", - "dev": true, - "hasInstallScript": true, - "bin": { - "bsb": "lib/bsb", - "bsc": "lib/bsc", - "bstracing": "lib/bstracing" - } - }, - "node_modules/rescript": { - "resolved": "../../..", - "link": true - } - }, - "dependencies": { - "bs-platform": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bs-platform/-/bs-platform-5.2.1.tgz", - "integrity": "sha512-3ISP+RBC/NYILiJnphCY0W3RTYpQ11JGa2dBBLVug5fpFZ0qtSaL3ZplD8MyjNeXX2bC7xgrWfgBSn8Tc9om7Q==", - "dev": true - }, - "rescript": { - "version": "file:../../..", - "requires": { - "mocha": "^7.2.0", - "nyc": "^15.0.0" - } - } - } -} diff --git a/jscomp/build_tests/case3/package.json b/jscomp/build_tests/case3/package.json deleted file mode 100644 index 822bff18fc..0000000000 --- a/jscomp/build_tests/case3/package.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "case3", - "version": "0.1.0", - "scripts": { - "clean": "rescript clean", - "build": "rescript build", - "watch": "rescript build -w" - }, - "keywords": [ - "ReScript" - ], - "author": "", - "license": "MIT", - "devDependencies": { - "bs-platform": "^5.1.0-dev.1" - } -} \ No newline at end of file diff --git a/jscomp/build_tests/case3/src/hello.bs.js b/jscomp/build_tests/case3/src/hello.bs.js new file mode 100644 index 0000000000..08c02c69b7 --- /dev/null +++ b/jscomp/build_tests/case3/src/hello.bs.js @@ -0,0 +1,11 @@ +// Generated by ReScript, PLEASE EDIT WITH CARE +'use strict'; + +var HelloGen = require("./hello.gen"); + +function f(prim) { + return HelloGen.f(prim); +} + +exports.f = f; +/* ./hello.gen Not a pure module */ diff --git a/jscomp/build_tests/custom_namespace/.gitignore b/jscomp/build_tests/custom_namespace/.gitignore deleted file mode 100644 index 8f464d0527..0000000000 --- a/jscomp/build_tests/custom_namespace/.gitignore +++ /dev/null @@ -1,25 +0,0 @@ -*.exe -*.obj -*.out -*.compile -*.native -*.byte -*.cmo -*.annot -*.cmi -*.cmx -*.cmt -*.cmti -*.cma -*.a -*.cmxa -*.obj -*~ -*.annot -*.cmj -*.bak -lib/bs -*.mlast -*.mliast -.vscode -.merlin \ No newline at end of file diff --git a/jscomp/build_tests/custom_namespace/README.md b/jscomp/build_tests/custom_namespace/README.md deleted file mode 100644 index 1c02d2a072..0000000000 --- a/jscomp/build_tests/custom_namespace/README.md +++ /dev/null @@ -1,16 +0,0 @@ - - -# Build -``` -npm run build -``` - -# Watch - -``` -npm run watch -``` - - -# Editor -If you use `vscode`, Press `Windows + Shift + B` it will build automatically \ No newline at end of file diff --git a/jscomp/build_tests/custom_namespace/input.js b/jscomp/build_tests/custom_namespace/input.js index f100581dbc..9c00338056 100644 --- a/jscomp/build_tests/custom_namespace/input.js +++ b/jscomp/build_tests/custom_namespace/input.js @@ -1,6 +1,4 @@ var child_process = require("child_process"); -var fs = require("fs"); -var path = require("path"); var assert = require("assert"); var rescript_exe = require("../../../scripts/bin_path").rescript_exe; diff --git a/jscomp/build_tests/custom_namespace/package.json b/jscomp/build_tests/custom_namespace/package.json deleted file mode 100644 index 4b2cc1a09d..0000000000 --- a/jscomp/build_tests/custom_namespace/package.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "namespace", - "version": "0.1.0", - "scripts": { - "clean": "rescript clean", - "build": "rescript build", - "watch": "rescript build -w" - }, - "keywords": [ - "ReScript" - ], - "license": "MIT", - "devDependencies": { - "bs-platform": "1.8.3" - } -} \ No newline at end of file diff --git a/jscomp/build_tests/cycle/.gitignore b/jscomp/build_tests/cycle/.gitignore deleted file mode 100644 index 1c2bb277a5..0000000000 --- a/jscomp/build_tests/cycle/.gitignore +++ /dev/null @@ -1,26 +0,0 @@ -*.exe -*.obj -*.out -*.compile -*.native -*.byte -*.cmo -*.annot -*.cmi -*.cmx -*.cmt -*.cmti -*.cma -*.a -*.cmxa -*.obj -*~ -*.annot -*.cmj -*.bak -lib/bs -*.mlast -*.mliast -.vscode -.merlin -.bsb.lock \ No newline at end of file diff --git a/jscomp/build_tests/cycle/README.md b/jscomp/build_tests/cycle/README.md deleted file mode 100644 index 1c02d2a072..0000000000 --- a/jscomp/build_tests/cycle/README.md +++ /dev/null @@ -1,16 +0,0 @@ - - -# Build -``` -npm run build -``` - -# Watch - -``` -npm run watch -``` - - -# Editor -If you use `vscode`, Press `Windows + Shift + B` it will build automatically \ No newline at end of file diff --git a/jscomp/build_tests/cycle/package-lock.json b/jscomp/build_tests/cycle/package-lock.json deleted file mode 100644 index a35e4a537c..0000000000 --- a/jscomp/build_tests/cycle/package-lock.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "name": "cycle", - "version": "0.1.0", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "name": "cycle", - "version": "0.1.0", - "license": "MIT", - "dependencies": { - "rescript": "file:../../.." - }, - "devDependencies": { - "bs-platform": "^5.1.0-dev.1" - } - }, - "../../..": { - "name": "rescript", - "version": "10.0.0", - "hasInstallScript": true, - "license": "SEE LICENSE IN LICENSE", - "bin": { - "bsc": "bsc", - "bstracing": "lib/bstracing", - "rescript": "rescript" - }, - "devDependencies": { - "mocha": "^7.2.0", - "nyc": "^15.0.0" - } - }, - "node_modules/bs-platform": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bs-platform/-/bs-platform-5.2.1.tgz", - "integrity": "sha512-3ISP+RBC/NYILiJnphCY0W3RTYpQ11JGa2dBBLVug5fpFZ0qtSaL3ZplD8MyjNeXX2bC7xgrWfgBSn8Tc9om7Q==", - "dev": true, - "hasInstallScript": true, - "bin": { - "bsb": "lib/bsb", - "bsc": "lib/bsc", - "bstracing": "lib/bstracing" - } - }, - "node_modules/rescript": { - "resolved": "../../..", - "link": true - } - }, - "dependencies": { - "bs-platform": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bs-platform/-/bs-platform-5.2.1.tgz", - "integrity": "sha512-3ISP+RBC/NYILiJnphCY0W3RTYpQ11JGa2dBBLVug5fpFZ0qtSaL3ZplD8MyjNeXX2bC7xgrWfgBSn8Tc9om7Q==", - "dev": true - }, - "rescript": { - "version": "file:../../..", - "requires": { - "mocha": "^7.2.0", - "nyc": "^15.0.0" - } - } - } -} diff --git a/jscomp/build_tests/cycle/package.json b/jscomp/build_tests/cycle/package.json deleted file mode 100644 index ddbb784aa3..0000000000 --- a/jscomp/build_tests/cycle/package.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "cycle", - "version": "0.1.0", - "scripts": { - "clean": "rescript clean", - "build": "rescript build", - "watch": "rescript build -w" - }, - "keywords": [ - "ReScript" - ], - "author": "", - "license": "MIT", - "devDependencies": { - "bs-platform": "^5.1.0-dev.1" - } -} \ No newline at end of file diff --git a/jscomp/build_tests/cycle1/.gitignore b/jscomp/build_tests/cycle1/.gitignore deleted file mode 100644 index 1c2bb277a5..0000000000 --- a/jscomp/build_tests/cycle1/.gitignore +++ /dev/null @@ -1,26 +0,0 @@ -*.exe -*.obj -*.out -*.compile -*.native -*.byte -*.cmo -*.annot -*.cmi -*.cmx -*.cmt -*.cmti -*.cma -*.a -*.cmxa -*.obj -*~ -*.annot -*.cmj -*.bak -lib/bs -*.mlast -*.mliast -.vscode -.merlin -.bsb.lock \ No newline at end of file diff --git a/jscomp/build_tests/cycle1/README.md b/jscomp/build_tests/cycle1/README.md deleted file mode 100644 index 1c02d2a072..0000000000 --- a/jscomp/build_tests/cycle1/README.md +++ /dev/null @@ -1,16 +0,0 @@ - - -# Build -``` -npm run build -``` - -# Watch - -``` -npm run watch -``` - - -# Editor -If you use `vscode`, Press `Windows + Shift + B` it will build automatically \ No newline at end of file diff --git a/jscomp/build_tests/cycle1/package-lock.json b/jscomp/build_tests/cycle1/package-lock.json deleted file mode 100644 index c96ae550e2..0000000000 --- a/jscomp/build_tests/cycle1/package-lock.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "name": "cycle1", - "version": "0.1.0", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "name": "cycle1", - "version": "0.1.0", - "license": "MIT", - "devDependencies": { - "rescript": "file:../../.." - } - }, - "../../..": { - "version": "10.0.0", - "dev": true, - "hasInstallScript": true, - "license": "SEE LICENSE IN LICENSE", - "bin": { - "bsc": "bsc", - "bstracing": "lib/bstracing", - "rescript": "rescript" - }, - "devDependencies": { - "mocha": "^7.2.0", - "nyc": "^15.0.0" - } - }, - "node_modules/rescript": { - "resolved": "../../..", - "link": true - } - }, - "dependencies": { - "rescript": { - "version": "file:../../..", - "requires": { - "mocha": "^7.2.0", - "nyc": "^15.0.0" - } - } - } -} diff --git a/jscomp/build_tests/cycle1/package.json b/jscomp/build_tests/cycle1/package.json deleted file mode 100644 index 769afec06d..0000000000 --- a/jscomp/build_tests/cycle1/package.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "cycle1", - "version": "0.1.0", - "scripts": { - "clean": "rescript clean", - "build": "rescript build", - "watch": "rescript build -w" - }, - "keywords": [ - "ReScript" - ], - "author": "", - "license": "MIT", - "devDependencies": { - "rescript": "^10.0.0" - } -} \ No newline at end of file diff --git a/jscomp/build_tests/devonly/.gitignore b/jscomp/build_tests/devonly/.gitignore deleted file mode 100644 index 1c2bb277a5..0000000000 --- a/jscomp/build_tests/devonly/.gitignore +++ /dev/null @@ -1,26 +0,0 @@ -*.exe -*.obj -*.out -*.compile -*.native -*.byte -*.cmo -*.annot -*.cmi -*.cmx -*.cmt -*.cmti -*.cma -*.a -*.cmxa -*.obj -*~ -*.annot -*.cmj -*.bak -lib/bs -*.mlast -*.mliast -.vscode -.merlin -.bsb.lock \ No newline at end of file diff --git a/jscomp/build_tests/devonly/README.md b/jscomp/build_tests/devonly/README.md deleted file mode 100644 index 1c02d2a072..0000000000 --- a/jscomp/build_tests/devonly/README.md +++ /dev/null @@ -1,16 +0,0 @@ - - -# Build -``` -npm run build -``` - -# Watch - -``` -npm run watch -``` - - -# Editor -If you use `vscode`, Press `Windows + Shift + B` it will build automatically \ No newline at end of file diff --git a/jscomp/build_tests/devonly/package-lock.json b/jscomp/build_tests/devonly/package-lock.json deleted file mode 100644 index c8a7bbbd13..0000000000 --- a/jscomp/build_tests/devonly/package-lock.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "name": "devonly", - "version": "0.1.0", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "name": "devonly", - "version": "0.1.0", - "license": "MIT", - "dependencies": { - "rescript": "file:../../.." - }, - "devDependencies": { - "bs-platform": "^5.1.0-dev.1" - } - }, - "../../..": { - "version": "10.0.0", - "hasInstallScript": true, - "license": "SEE LICENSE IN LICENSE", - "bin": { - "bsc": "bsc", - "bstracing": "lib/bstracing", - "rescript": "rescript" - }, - "devDependencies": { - "mocha": "^7.2.0", - "nyc": "^15.0.0" - } - }, - "node_modules/bs-platform": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bs-platform/-/bs-platform-5.2.1.tgz", - "integrity": "sha512-3ISP+RBC/NYILiJnphCY0W3RTYpQ11JGa2dBBLVug5fpFZ0qtSaL3ZplD8MyjNeXX2bC7xgrWfgBSn8Tc9om7Q==", - "dev": true, - "hasInstallScript": true, - "bin": { - "bsb": "lib/bsb", - "bsc": "lib/bsc", - "bstracing": "lib/bstracing" - } - }, - "node_modules/rescript": { - "resolved": "../../..", - "link": true - } - }, - "dependencies": { - "bs-platform": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bs-platform/-/bs-platform-5.2.1.tgz", - "integrity": "sha512-3ISP+RBC/NYILiJnphCY0W3RTYpQ11JGa2dBBLVug5fpFZ0qtSaL3ZplD8MyjNeXX2bC7xgrWfgBSn8Tc9om7Q==", - "dev": true - }, - "rescript": { - "version": "file:../../..", - "requires": { - "mocha": "^7.2.0", - "nyc": "^15.0.0" - } - } - } -} diff --git a/jscomp/build_tests/devonly/package.json b/jscomp/build_tests/devonly/package.json deleted file mode 100644 index 53a3ef8226..0000000000 --- a/jscomp/build_tests/devonly/package.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "devonly", - "version": "0.1.0", - "scripts": { - "clean": "rescript clean", - "build": "rescript build", - "watch": "rescript build -w" - }, - "keywords": [ - "ReScript" - ], - "author": "", - "license": "MIT", - "devDependencies": { - "bs-platform": "^5.1.0-dev.1" - } -} \ No newline at end of file diff --git a/jscomp/build_tests/duplicated_symlinked_packages/package.json b/jscomp/build_tests/duplicated_symlinked_packages/package.json deleted file mode 100644 index c4d0718c53..0000000000 --- a/jscomp/build_tests/duplicated_symlinked_packages/package.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "duplicated-symlinked-packages", - "version": "0.1.0", - "scripts": { - "clean": "rescript clean", - "build": "rescript build", - "watch": "rescript build -w" - }, - "keywords": [ - "ReScript" - ], - "license": "MIT", - "devDependencies": { - "bs-platform": "1.8.3" - } -} diff --git a/jscomp/build_tests/exports/.gitignore b/jscomp/build_tests/exports/.gitignore deleted file mode 100644 index 8f464d0527..0000000000 --- a/jscomp/build_tests/exports/.gitignore +++ /dev/null @@ -1,25 +0,0 @@ -*.exe -*.obj -*.out -*.compile -*.native -*.byte -*.cmo -*.annot -*.cmi -*.cmx -*.cmt -*.cmti -*.cma -*.a -*.cmxa -*.obj -*~ -*.annot -*.cmj -*.bak -lib/bs -*.mlast -*.mliast -.vscode -.merlin \ No newline at end of file diff --git a/jscomp/build_tests/exports/README.md b/jscomp/build_tests/exports/README.md deleted file mode 100644 index 1c02d2a072..0000000000 --- a/jscomp/build_tests/exports/README.md +++ /dev/null @@ -1,16 +0,0 @@ - - -# Build -``` -npm run build -``` - -# Watch - -``` -npm run watch -``` - - -# Editor -If you use `vscode`, Press `Windows + Shift + B` it will build automatically \ No newline at end of file diff --git a/jscomp/build_tests/exports/package.json b/jscomp/build_tests/exports/package.json deleted file mode 100644 index 6a6682cecd..0000000000 --- a/jscomp/build_tests/exports/package.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "exports", - "version": "0.1.0", - "scripts": { - "clean": "rescript clean", - "build": "rescript build", - "watch": "rescript build -w" - }, - "keywords": [ - "ReScript" - ], - "license": "MIT", - "devDependencies": { - "bs-platform": "1.8.3" - } -} \ No newline at end of file diff --git a/jscomp/build_tests/hyphen2/.gitignore b/jscomp/build_tests/hyphen2/.gitignore deleted file mode 100644 index 8f464d0527..0000000000 --- a/jscomp/build_tests/hyphen2/.gitignore +++ /dev/null @@ -1,25 +0,0 @@ -*.exe -*.obj -*.out -*.compile -*.native -*.byte -*.cmo -*.annot -*.cmi -*.cmx -*.cmt -*.cmti -*.cma -*.a -*.cmxa -*.obj -*~ -*.annot -*.cmj -*.bak -lib/bs -*.mlast -*.mliast -.vscode -.merlin \ No newline at end of file diff --git a/jscomp/build_tests/hyphen2/README.md b/jscomp/build_tests/hyphen2/README.md deleted file mode 100644 index 1c02d2a072..0000000000 --- a/jscomp/build_tests/hyphen2/README.md +++ /dev/null @@ -1,16 +0,0 @@ - - -# Build -``` -npm run build -``` - -# Watch - -``` -npm run watch -``` - - -# Editor -If you use `vscode`, Press `Windows + Shift + B` it will build automatically \ No newline at end of file diff --git a/jscomp/build_tests/hyphen2/package.json b/jscomp/build_tests/hyphen2/package.json deleted file mode 100644 index 46c9f7ebcc..0000000000 --- a/jscomp/build_tests/hyphen2/package.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "hyphen2", - "version": "0.1.0", - "scripts": { - "clean": "rescript clean", - "build": "rescript build", - "watch": "rescript build -w" - }, - "keywords": [ - "ReScript" - ], - "license": "MIT", - "devDependencies": { - "bs-platform": "1.9.1" - } -} \ No newline at end of file diff --git a/jscomp/build_tests/install/.gitignore b/jscomp/build_tests/install/.gitignore deleted file mode 100644 index ed88eec953..0000000000 --- a/jscomp/build_tests/install/.gitignore +++ /dev/null @@ -1,26 +0,0 @@ -*.exe -*.obj -*.out -*.compile -*.native -*.byte -*.cmo -*.annot -*.cmi -*.cmx -*.cmt -*.cmti -*.cma -*.a -*.cmxa -*.obj -*~ -*.annot -*.cmj -*.bak -lib/bs -*.mlast -*.mliast -.vscode -.merlin -*.bs.js \ No newline at end of file diff --git a/jscomp/build_tests/install/package-lock.json b/jscomp/build_tests/install/package-lock.json deleted file mode 100644 index 501cfe4b86..0000000000 --- a/jscomp/build_tests/install/package-lock.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "name": "install", - "version": "0.1.0", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "name": "install", - "version": "0.1.0", - "hasInstallScript": true, - "license": "MIT", - "dependencies": { - "rescript": "file:../../.." - }, - "devDependencies": { - "bs-platform": "^5.1.0-dev.1" - } - }, - "../../..": { - "version": "10.0.0", - "hasInstallScript": true, - "license": "SEE LICENSE IN LICENSE", - "bin": { - "bsc": "bsc", - "bstracing": "lib/bstracing", - "rescript": "rescript" - }, - "devDependencies": { - "mocha": "^7.2.0", - "nyc": "^15.0.0" - } - }, - "node_modules/bs-platform": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bs-platform/-/bs-platform-5.2.1.tgz", - "integrity": "sha512-3ISP+RBC/NYILiJnphCY0W3RTYpQ11JGa2dBBLVug5fpFZ0qtSaL3ZplD8MyjNeXX2bC7xgrWfgBSn8Tc9om7Q==", - "dev": true, - "hasInstallScript": true, - "bin": { - "bsb": "lib/bsb", - "bsc": "lib/bsc", - "bstracing": "lib/bstracing" - } - }, - "node_modules/rescript": { - "resolved": "../../..", - "link": true - } - }, - "dependencies": { - "bs-platform": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/bs-platform/-/bs-platform-5.2.1.tgz", - "integrity": "sha512-3ISP+RBC/NYILiJnphCY0W3RTYpQ11JGa2dBBLVug5fpFZ0qtSaL3ZplD8MyjNeXX2bC7xgrWfgBSn8Tc9om7Q==", - "dev": true - }, - "rescript": { - "version": "file:../../..", - "requires": { - "mocha": "^7.2.0", - "nyc": "^15.0.0" - } - } - } -} diff --git a/jscomp/build_tests/install/package.json b/jscomp/build_tests/install/package.json deleted file mode 100644 index 0e8e9b368b..0000000000 --- a/jscomp/build_tests/install/package.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "install", - "version": "0.1.0", - "scripts": { - "clean": "rescript clean", - "build": "rescript build", - "install": "rescript build -install", - "watch": "rescript build -w" - }, - "keywords": [ - "ReScript" - ], - "author": "", - "license": "MIT", - "devDependencies": { - "bs-platform": "^5.1.0-dev.1" - } - } \ No newline at end of file diff --git a/jscomp/build_tests/install/src/Foo.bs.js b/jscomp/build_tests/install/src/Foo.bs.js new file mode 100644 index 0000000000..cf2ea83c43 --- /dev/null +++ b/jscomp/build_tests/install/src/Foo.bs.js @@ -0,0 +1,10 @@ +// Generated by ReScript, PLEASE EDIT WITH CARE +'use strict'; + + +function main() { + console.log("hello"); +} + +exports.main = main; +/* No side effect */ diff --git a/jscomp/build_tests/nested/.gitignore b/jscomp/build_tests/nested/.gitignore index 30be413425..6724ce3596 100644 --- a/jscomp/build_tests/nested/.gitignore +++ b/jscomp/build_tests/nested/.gitignore @@ -1,26 +1 @@ -*.exe -*.obj -*.out -*.compile -*.native -*.byte -*.cmo -*.annot -*.cmi -*.cmx -*.cmt -*.cmti -*.cma -*.a -*.cmxa -*.obj -*~ -*.annot -*.cmj -*.bak -lib/bs -*.mlast -*.mliast -.vscode -.merlin src/**/*.js \ No newline at end of file diff --git a/jscomp/build_tests/nested/README.md b/jscomp/build_tests/nested/README.md deleted file mode 100644 index 1c02d2a072..0000000000 --- a/jscomp/build_tests/nested/README.md +++ /dev/null @@ -1,16 +0,0 @@ - - -# Build -``` -npm run build -``` - -# Watch - -``` -npm run watch -``` - - -# Editor -If you use `vscode`, Press `Windows + Shift + B` it will build automatically \ No newline at end of file diff --git a/jscomp/build_tests/nested/package.json b/jscomp/build_tests/nested/package.json deleted file mode 100644 index 06ac12c203..0000000000 --- a/jscomp/build_tests/nested/package.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "nested", - "version": "0.1.0", - "scripts": { - "clean": "rescript clean", - "build": "rescript build", - "watch": "rescript build -w" - }, - "keywords": [ - "ReScript" - ], - "license": "MIT", - "devDependencies": { - "bs-platform": "1.9.2" - } -} \ No newline at end of file diff --git a/jscomp/build_tests/nnest/.gitignore b/jscomp/build_tests/nnest/.gitignore index 30be413425..6724ce3596 100644 --- a/jscomp/build_tests/nnest/.gitignore +++ b/jscomp/build_tests/nnest/.gitignore @@ -1,26 +1 @@ -*.exe -*.obj -*.out -*.compile -*.native -*.byte -*.cmo -*.annot -*.cmi -*.cmx -*.cmt -*.cmti -*.cma -*.a -*.cmxa -*.obj -*~ -*.annot -*.cmj -*.bak -lib/bs -*.mlast -*.mliast -.vscode -.merlin src/**/*.js \ No newline at end of file diff --git a/jscomp/build_tests/nnest/README.md b/jscomp/build_tests/nnest/README.md deleted file mode 100644 index 1c02d2a072..0000000000 --- a/jscomp/build_tests/nnest/README.md +++ /dev/null @@ -1,16 +0,0 @@ - - -# Build -``` -npm run build -``` - -# Watch - -``` -npm run watch -``` - - -# Editor -If you use `vscode`, Press `Windows + Shift + B` it will build automatically \ No newline at end of file diff --git a/jscomp/build_tests/nnest/package.json b/jscomp/build_tests/nnest/package.json deleted file mode 100644 index 06ac12c203..0000000000 --- a/jscomp/build_tests/nnest/package.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "nested", - "version": "0.1.0", - "scripts": { - "clean": "rescript clean", - "build": "rescript build", - "watch": "rescript build -w" - }, - "keywords": [ - "ReScript" - ], - "license": "MIT", - "devDependencies": { - "bs-platform": "1.9.2" - } -} \ No newline at end of file diff --git a/jscomp/build_tests/ns/.gitignore b/jscomp/build_tests/ns/.gitignore deleted file mode 100644 index 8f464d0527..0000000000 --- a/jscomp/build_tests/ns/.gitignore +++ /dev/null @@ -1,25 +0,0 @@ -*.exe -*.obj -*.out -*.compile -*.native -*.byte -*.cmo -*.annot -*.cmi -*.cmx -*.cmt -*.cmti -*.cma -*.a -*.cmxa -*.obj -*~ -*.annot -*.cmj -*.bak -lib/bs -*.mlast -*.mliast -.vscode -.merlin \ No newline at end of file diff --git a/jscomp/build_tests/ns/README.md b/jscomp/build_tests/ns/README.md deleted file mode 100644 index 1c02d2a072..0000000000 --- a/jscomp/build_tests/ns/README.md +++ /dev/null @@ -1,16 +0,0 @@ - - -# Build -``` -npm run build -``` - -# Watch - -``` -npm run watch -``` - - -# Editor -If you use `vscode`, Press `Windows + Shift + B` it will build automatically \ No newline at end of file diff --git a/jscomp/build_tests/ns/package.json b/jscomp/build_tests/ns/package.json deleted file mode 100644 index e9d0604003..0000000000 --- a/jscomp/build_tests/ns/package.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "ns", - "version": "0.1.0", - "scripts": { - "clean": "rescript clean", - "build": "rescript build", - "watch": "rescript build -w" - }, - "keywords": [ - "ReScript" - ], - "license": "MIT", - "devDependencies": { - "bs-platform": "1.8.3" - } -} \ No newline at end of file diff --git a/jscomp/build_tests/package-lock.json b/jscomp/build_tests/package-lock.json deleted file mode 100644 index 5d690b9d84..0000000000 --- a/jscomp/build_tests/package-lock.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "name": "build_tests", - "version": "0.1.0", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "name": "build_tests", - "version": "0.1.0", - "dependencies": { - "rescript": "file:../.." - } - }, - "../..": { - "name": "rescript", - "version": "10.0.0", - "hasInstallScript": true, - "license": "SEE LICENSE IN LICENSE", - "bin": { - "bsc": "bsc", - "bstracing": "lib/bstracing", - "rescript": "rescript" - }, - "devDependencies": { - "mocha": "^7.2.0", - "nyc": "^15.0.0" - } - }, - "node_modules/rescript": { - "resolved": "../..", - "link": true - } - }, - "dependencies": { - "rescript": { - "version": "file:../..", - "requires": { - "mocha": "^7.2.0", - "nyc": "^15.0.0" - } - } - } -} diff --git a/jscomp/build_tests/package.json b/jscomp/build_tests/package.json deleted file mode 100644 index 433aacdfba..0000000000 --- a/jscomp/build_tests/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "build_tests", - "version": "0.1.0", - "dependencies": { - "rescript": "file:../.." - } -} diff --git a/jscomp/build_tests/post-build/.gitignore b/jscomp/build_tests/post-build/.gitignore deleted file mode 100644 index 1c2bb277a5..0000000000 --- a/jscomp/build_tests/post-build/.gitignore +++ /dev/null @@ -1,26 +0,0 @@ -*.exe -*.obj -*.out -*.compile -*.native -*.byte -*.cmo -*.annot -*.cmi -*.cmx -*.cmt -*.cmti -*.cma -*.a -*.cmxa -*.obj -*~ -*.annot -*.cmj -*.bak -lib/bs -*.mlast -*.mliast -.vscode -.merlin -.bsb.lock \ No newline at end of file diff --git a/jscomp/build_tests/post-build/README.md b/jscomp/build_tests/post-build/README.md deleted file mode 100644 index b20ab1bade..0000000000 --- a/jscomp/build_tests/post-build/README.md +++ /dev/null @@ -1,13 +0,0 @@ - - -# Build -``` -npm run build -``` - -# Watch - -``` -npm run watch -``` - diff --git a/jscomp/build_tests/post-build/package-lock.json b/jscomp/build_tests/post-build/package-lock.json deleted file mode 100644 index f641a2314c..0000000000 --- a/jscomp/build_tests/post-build/package-lock.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "name": "post-build", - "version": "0.1.0", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "name": "post-build", - "version": "0.1.0", - "license": "MIT", - "dependencies": { - "rescript": "file:../../.." - }, - "devDependencies": { - "bs-platform": "^8.3.0-dev.2" - } - }, - "../../..": { - "version": "10.0.0", - "hasInstallScript": true, - "license": "SEE LICENSE IN LICENSE", - "bin": { - "bsc": "bsc", - "bstracing": "lib/bstracing", - "rescript": "rescript" - }, - "devDependencies": { - "mocha": "^7.2.0", - "nyc": "^15.0.0" - } - }, - "node_modules/bs-platform": { - "version": "8.4.2", - "resolved": "https://registry.npmjs.org/bs-platform/-/bs-platform-8.4.2.tgz", - "integrity": "sha512-9q7S4/LLV/a68CweN382NJdCCr/lOSsJR3oQYnmPK98ChfO/AdiA3lYQkQTp6T+U0I5Z5RypUAUprNstwDtMDQ==", - "dev": true, - "hasInstallScript": true, - "bin": { - "bsb": "bsb", - "bsc": "bsc", - "bstracing": "lib/bstracing" - } - }, - "node_modules/rescript": { - "resolved": "../../..", - "link": true - } - }, - "dependencies": { - "bs-platform": { - "version": "8.4.2", - "resolved": "https://registry.npmjs.org/bs-platform/-/bs-platform-8.4.2.tgz", - "integrity": "sha512-9q7S4/LLV/a68CweN382NJdCCr/lOSsJR3oQYnmPK98ChfO/AdiA3lYQkQTp6T+U0I5Z5RypUAUprNstwDtMDQ==", - "dev": true - }, - "rescript": { - "version": "file:../../..", - "requires": { - "mocha": "^7.2.0", - "nyc": "^15.0.0" - } - } - } -} diff --git a/jscomp/build_tests/post-build/package.json b/jscomp/build_tests/post-build/package.json deleted file mode 100644 index 0014b77f78..0000000000 --- a/jscomp/build_tests/post-build/package.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "post-build", - "version": "0.1.0", - "scripts": { - "clean": "rescript clean", - "build": "rescript build", - "watch": "rescript build -w" - }, - "keywords": [ - "ReScript" - ], - "author": "", - "license": "MIT", - "devDependencies": { - "bs-platform": "^8.3.0-dev.2" - } -} \ No newline at end of file diff --git a/jscomp/build_tests/react_ppx/.gitignore b/jscomp/build_tests/react_ppx/.gitignore deleted file mode 100644 index c476e05628..0000000000 --- a/jscomp/build_tests/react_ppx/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.merlin \ No newline at end of file diff --git a/jscomp/build_tests/rerror/.gitignore b/jscomp/build_tests/rerror/.gitignore deleted file mode 100644 index 8f464d0527..0000000000 --- a/jscomp/build_tests/rerror/.gitignore +++ /dev/null @@ -1,25 +0,0 @@ -*.exe -*.obj -*.out -*.compile -*.native -*.byte -*.cmo -*.annot -*.cmi -*.cmx -*.cmt -*.cmti -*.cma -*.a -*.cmxa -*.obj -*~ -*.annot -*.cmj -*.bak -lib/bs -*.mlast -*.mliast -.vscode -.merlin \ No newline at end of file diff --git a/jscomp/build_tests/rerror/README.md b/jscomp/build_tests/rerror/README.md deleted file mode 100644 index ce122ba93a..0000000000 --- a/jscomp/build_tests/rerror/README.md +++ /dev/null @@ -1,18 +0,0 @@ -# Basic Reason Template - -Hello! This project allows you to quickly get started with ReScript. If you wanted a more sophisticated version, try the `react` template (`rescript -theme react -init .`). - -# Build -``` -npm run build -``` - -# Build + Watch - -``` -npm run watch -``` - - -# Editor -If you use `vscode`, Press `Windows + Shift + B` it will build automatically diff --git a/jscomp/build_tests/rerror/package.json b/jscomp/build_tests/rerror/package.json deleted file mode 100644 index d7dd0ae692..0000000000 --- a/jscomp/build_tests/rerror/package.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "rerror", - "version": "0.1.0", - "scripts": { - "clean": "rescript clean", - "build": "rescript", - "watch": "rescript build -w" - }, - "keywords": [ - "ReScript" - ], - "license": "MIT", - "devDependencies": { - "bs-platform": "1.8.3" - } -} \ No newline at end of file diff --git a/jscomp/build_tests/scoped_ppx/package-lock.json b/jscomp/build_tests/scoped_ppx/package-lock.json deleted file mode 100644 index 5c80d91bd2..0000000000 --- a/jscomp/build_tests/scoped_ppx/package-lock.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "name": "scoped_ppx", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "dependencies": { - "rescript": "file:../../.." - } - }, - "../../..": { - "version": "10.0.0", - "hasInstallScript": true, - "license": "SEE LICENSE IN LICENSE", - "bin": { - "bsc": "bsc", - "bstracing": "lib/bstracing", - "rescript": "rescript" - }, - "devDependencies": { - "mocha": "^7.2.0", - "nyc": "^15.0.0" - } - }, - "node_modules/rescript": { - "resolved": "../../..", - "link": true - } - }, - "dependencies": { - "rescript": { - "version": "file:../../..", - "requires": { - "mocha": "^7.2.0", - "nyc": "^15.0.0" - } - } - } -} diff --git a/jscomp/build_tests/scoped_ppx/package.json b/jscomp/build_tests/scoped_ppx/package.json deleted file mode 100644 index 273a82ed16..0000000000 --- a/jscomp/build_tests/scoped_ppx/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "dependencies": { - "rescript": "file:../../.." - } -} diff --git a/jscomp/build_tests/uncurried-always/.gitignore b/jscomp/build_tests/uncurried-always/.gitignore deleted file mode 100644 index 1c2bb277a5..0000000000 --- a/jscomp/build_tests/uncurried-always/.gitignore +++ /dev/null @@ -1,26 +0,0 @@ -*.exe -*.obj -*.out -*.compile -*.native -*.byte -*.cmo -*.annot -*.cmi -*.cmx -*.cmt -*.cmti -*.cma -*.a -*.cmxa -*.obj -*~ -*.annot -*.cmj -*.bak -lib/bs -*.mlast -*.mliast -.vscode -.merlin -.bsb.lock \ No newline at end of file diff --git a/jscomp/build_tests/uncurried-always/input.js b/jscomp/build_tests/uncurried-always/input.js index 6696c54f90..012c1f042b 100644 --- a/jscomp/build_tests/uncurried-always/input.js +++ b/jscomp/build_tests/uncurried-always/input.js @@ -1,8 +1,5 @@ //@ts-check const cp = require("child_process"); -const assert = require("assert"); -const fs = require("fs"); -const path = require("path"); var rescript_exe = require("../../../scripts/bin_path").rescript_exe; cp.execSync(`${rescript_exe} clean`, { cwd: __dirname }); diff --git a/jscomp/build_tests/uncurried-always/package-lock.json b/jscomp/build_tests/uncurried-always/package-lock.json deleted file mode 100644 index c96ae550e2..0000000000 --- a/jscomp/build_tests/uncurried-always/package-lock.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "name": "cycle1", - "version": "0.1.0", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "name": "cycle1", - "version": "0.1.0", - "license": "MIT", - "devDependencies": { - "rescript": "file:../../.." - } - }, - "../../..": { - "version": "10.0.0", - "dev": true, - "hasInstallScript": true, - "license": "SEE LICENSE IN LICENSE", - "bin": { - "bsc": "bsc", - "bstracing": "lib/bstracing", - "rescript": "rescript" - }, - "devDependencies": { - "mocha": "^7.2.0", - "nyc": "^15.0.0" - } - }, - "node_modules/rescript": { - "resolved": "../../..", - "link": true - } - }, - "dependencies": { - "rescript": { - "version": "file:../../..", - "requires": { - "mocha": "^7.2.0", - "nyc": "^15.0.0" - } - } - } -} diff --git a/jscomp/build_tests/uncurried-always/package.json b/jscomp/build_tests/uncurried-always/package.json deleted file mode 100644 index c166bc06c3..0000000000 --- a/jscomp/build_tests/uncurried-always/package.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "uncurried", - "version": "0.1.0", - "scripts": { - "clean": "rescript clean", - "build": "rescript build", - "watch": "rescript build -w" - }, - "keywords": [ - "ReScript" - ], - "author": "", - "license": "MIT", - "devDependencies": { - "rescript": "^10.0.0" - } -} \ No newline at end of file diff --git a/jscomp/build_tests/weird_deps/.gitignore b/jscomp/build_tests/weird_deps/.gitignore deleted file mode 100644 index 1c2bb277a5..0000000000 --- a/jscomp/build_tests/weird_deps/.gitignore +++ /dev/null @@ -1,26 +0,0 @@ -*.exe -*.obj -*.out -*.compile -*.native -*.byte -*.cmo -*.annot -*.cmi -*.cmx -*.cmt -*.cmti -*.cma -*.a -*.cmxa -*.obj -*~ -*.annot -*.cmj -*.bak -lib/bs -*.mlast -*.mliast -.vscode -.merlin -.bsb.lock \ No newline at end of file diff --git a/jscomp/build_tests/weird_deps/README.md b/jscomp/build_tests/weird_deps/README.md deleted file mode 100644 index 1c02d2a072..0000000000 --- a/jscomp/build_tests/weird_deps/README.md +++ /dev/null @@ -1,16 +0,0 @@ - - -# Build -``` -npm run build -``` - -# Watch - -``` -npm run watch -``` - - -# Editor -If you use `vscode`, Press `Windows + Shift + B` it will build automatically \ No newline at end of file diff --git a/jscomp/build_tests/weird_deps/package-lock.json b/jscomp/build_tests/weird_deps/package-lock.json deleted file mode 100644 index 4eb41c87e0..0000000000 --- a/jscomp/build_tests/weird_deps/package-lock.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "weird_deps", - "version": "0.1.0", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "name": "weird_deps", - "version": "0.1.0", - "license": "MIT" - } - } -} diff --git a/jscomp/build_tests/weird_deps/package.json b/jscomp/build_tests/weird_deps/package.json deleted file mode 100644 index 803fefcbf0..0000000000 --- a/jscomp/build_tests/weird_deps/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "weird_deps", - "version": "0.1.0", - "scripts": { - "clean": "rescript clean", - "build": "rescript build", - "watch": "rescript build -w" - }, - "keywords": [ - "ReScript" - ], - "author": "", - "license": "MIT" -} \ No newline at end of file diff --git a/jscomp/build_tests/weird_devdeps/.gitignore b/jscomp/build_tests/weird_devdeps/.gitignore deleted file mode 100644 index 1c2bb277a5..0000000000 --- a/jscomp/build_tests/weird_devdeps/.gitignore +++ /dev/null @@ -1,26 +0,0 @@ -*.exe -*.obj -*.out -*.compile -*.native -*.byte -*.cmo -*.annot -*.cmi -*.cmx -*.cmt -*.cmti -*.cma -*.a -*.cmxa -*.obj -*~ -*.annot -*.cmj -*.bak -lib/bs -*.mlast -*.mliast -.vscode -.merlin -.bsb.lock \ No newline at end of file diff --git a/jscomp/build_tests/weird_devdeps/README.md b/jscomp/build_tests/weird_devdeps/README.md deleted file mode 100644 index 1c02d2a072..0000000000 --- a/jscomp/build_tests/weird_devdeps/README.md +++ /dev/null @@ -1,16 +0,0 @@ - - -# Build -``` -npm run build -``` - -# Watch - -``` -npm run watch -``` - - -# Editor -If you use `vscode`, Press `Windows + Shift + B` it will build automatically \ No newline at end of file diff --git a/jscomp/build_tests/weird_devdeps/package-lock.json b/jscomp/build_tests/weird_devdeps/package-lock.json deleted file mode 100644 index 5688c31658..0000000000 --- a/jscomp/build_tests/weird_devdeps/package-lock.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "name": "weird_devdeps", - "version": "0.1.0", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "name": "weird_devdeps", - "version": "0.1.0", - "license": "MIT" - }, - "../../..": { - "name": "rescript", - "version": "11.0.0-rc.2", - "extraneous": true, - "hasInstallScript": true, - "license": "SEE LICENSE IN LICENSE", - "bin": { - "bsc": "bsc", - "bstracing": "lib/bstracing", - "rescript": "rescript" - }, - "devDependencies": { - "mocha": "^10.1.0", - "nyc": "^15.0.0", - "prettier": "^2.7.1", - "rollup": "^0.49.2" - }, - "engines": { - "node": ">=10" - } - } - } -} diff --git a/jscomp/build_tests/weird_devdeps/package.json b/jscomp/build_tests/weird_devdeps/package.json deleted file mode 100644 index 1b702b052c..0000000000 --- a/jscomp/build_tests/weird_devdeps/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "weird_devdeps", - "version": "0.1.0", - "scripts": { - "clean": "rescript clean", - "build": "rescript build", - "watch": "rescript build -w" - }, - "keywords": [ - "ReScript" - ], - "author": "", - "license": "MIT" -} \ No newline at end of file diff --git a/jscomp/build_tests/weird_names/.gitignore b/jscomp/build_tests/weird_names/.gitignore deleted file mode 100644 index 1c2bb277a5..0000000000 --- a/jscomp/build_tests/weird_names/.gitignore +++ /dev/null @@ -1,26 +0,0 @@ -*.exe -*.obj -*.out -*.compile -*.native -*.byte -*.cmo -*.annot -*.cmi -*.cmx -*.cmt -*.cmti -*.cma -*.a -*.cmxa -*.obj -*~ -*.annot -*.cmj -*.bak -lib/bs -*.mlast -*.mliast -.vscode -.merlin -.bsb.lock \ No newline at end of file diff --git a/jscomp/build_tests/weird_names/README.md b/jscomp/build_tests/weird_names/README.md deleted file mode 100644 index b20ab1bade..0000000000 --- a/jscomp/build_tests/weird_names/README.md +++ /dev/null @@ -1,13 +0,0 @@ - - -# Build -``` -npm run build -``` - -# Watch - -``` -npm run watch -``` - diff --git a/jscomp/build_tests/weird_names/package-lock.json b/jscomp/build_tests/weird_names/package-lock.json deleted file mode 100644 index 44a19d69e5..0000000000 --- a/jscomp/build_tests/weird_names/package-lock.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "name": "weird_names", - "version": "0.1.0", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "name": "weird_names", - "version": "0.1.0", - "license": "MIT", - "dependencies": { - "rescript": "file:../../.." - }, - "devDependencies": { - "bs-platform": "^8.3.0-dev.2" - } - }, - "../../..": { - "version": "10.0.0", - "hasInstallScript": true, - "license": "SEE LICENSE IN LICENSE", - "bin": { - "bsc": "bsc", - "bstracing": "lib/bstracing", - "rescript": "rescript" - }, - "devDependencies": { - "mocha": "^7.2.0", - "nyc": "^15.0.0" - } - }, - "node_modules/bs-platform": { - "version": "8.4.2", - "resolved": "https://registry.npmjs.org/bs-platform/-/bs-platform-8.4.2.tgz", - "integrity": "sha512-9q7S4/LLV/a68CweN382NJdCCr/lOSsJR3oQYnmPK98ChfO/AdiA3lYQkQTp6T+U0I5Z5RypUAUprNstwDtMDQ==", - "dev": true, - "hasInstallScript": true, - "bin": { - "bsb": "bsb", - "bsc": "bsc", - "bstracing": "lib/bstracing" - } - }, - "node_modules/rescript": { - "resolved": "../../..", - "link": true - } - }, - "dependencies": { - "bs-platform": { - "version": "8.4.2", - "resolved": "https://registry.npmjs.org/bs-platform/-/bs-platform-8.4.2.tgz", - "integrity": "sha512-9q7S4/LLV/a68CweN382NJdCCr/lOSsJR3oQYnmPK98ChfO/AdiA3lYQkQTp6T+U0I5Z5RypUAUprNstwDtMDQ==", - "dev": true - }, - "rescript": { - "version": "file:../../..", - "requires": { - "mocha": "^7.2.0", - "nyc": "^15.0.0" - } - } - } -} diff --git a/jscomp/build_tests/weird_names/package.json b/jscomp/build_tests/weird_names/package.json deleted file mode 100644 index c74121e355..0000000000 --- a/jscomp/build_tests/weird_names/package.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "weird_names", - "version": "0.1.0", - "scripts": { - "clean": "rescript clean", - "build": "rescript build", - "watch": "rescript build -w" - }, - "keywords": [ - "ReScript" - ], - "author": "", - "license": "MIT", - "devDependencies": { - "bs-platform": "^8.3.0-dev.2" - } -} \ No newline at end of file diff --git a/jscomp/build_tests/x-y/.gitignore b/jscomp/build_tests/x-y/.gitignore deleted file mode 100644 index 8f464d0527..0000000000 --- a/jscomp/build_tests/x-y/.gitignore +++ /dev/null @@ -1,25 +0,0 @@ -*.exe -*.obj -*.out -*.compile -*.native -*.byte -*.cmo -*.annot -*.cmi -*.cmx -*.cmt -*.cmti -*.cma -*.a -*.cmxa -*.obj -*~ -*.annot -*.cmj -*.bak -lib/bs -*.mlast -*.mliast -.vscode -.merlin \ No newline at end of file diff --git a/jscomp/build_tests/x-y/README.md b/jscomp/build_tests/x-y/README.md deleted file mode 100644 index 1c02d2a072..0000000000 --- a/jscomp/build_tests/x-y/README.md +++ /dev/null @@ -1,16 +0,0 @@ - - -# Build -``` -npm run build -``` - -# Watch - -``` -npm run watch -``` - - -# Editor -If you use `vscode`, Press `Windows + Shift + B` it will build automatically \ No newline at end of file diff --git a/jscomp/build_tests/x-y/package.json b/jscomp/build_tests/x-y/package.json deleted file mode 100644 index bf41baff58..0000000000 --- a/jscomp/build_tests/x-y/package.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "x-y", - "version": "0.1.0", - "scripts": { - "clean": "rescript clean", - "build": "rescript", - "watch": "rescript build -w" - }, - "keywords": [ - "ReScript" - ], - "license": "MIT", - "devDependencies": { - "bs-platform": "1.9.0" - } -} \ No newline at end of file diff --git a/jscomp/build_tests/xpkg/input.js b/jscomp/build_tests/xpkg/input.js index d54fb0c400..208a76a40b 100644 --- a/jscomp/build_tests/xpkg/input.js +++ b/jscomp/build_tests/xpkg/input.js @@ -1,6 +1,5 @@ var p = require("child_process"); var assert = require("assert"); -var fs = require("fs"); var rescript_exe = require("../../../scripts/bin_path").rescript_exe; try { var output = p.spawnSync(`${rescript_exe} build -regen`, { diff --git a/jscomp/build_tests/zerocycle/.gitignore b/jscomp/build_tests/zerocycle/.gitignore index ed88eec953..11ba2963c5 100644 --- a/jscomp/build_tests/zerocycle/.gitignore +++ b/jscomp/build_tests/zerocycle/.gitignore @@ -1,26 +1 @@ -*.exe -*.obj -*.out -*.compile -*.native -*.byte -*.cmo -*.annot -*.cmi -*.cmx -*.cmt -*.cmti -*.cma -*.a -*.cmxa -*.obj -*~ -*.annot -*.cmj -*.bak -lib/bs -*.mlast -*.mliast -.vscode -.merlin *.bs.js \ No newline at end of file diff --git a/jscomp/build_tests/zerocycle/README.md b/jscomp/build_tests/zerocycle/README.md deleted file mode 100644 index 1c02d2a072..0000000000 --- a/jscomp/build_tests/zerocycle/README.md +++ /dev/null @@ -1,16 +0,0 @@ - - -# Build -``` -npm run build -``` - -# Watch - -``` -npm run watch -``` - - -# Editor -If you use `vscode`, Press `Windows + Shift + B` it will build automatically \ No newline at end of file diff --git a/jscomp/build_tests/zerocycle/package-lock.json b/jscomp/build_tests/zerocycle/package-lock.json deleted file mode 100644 index a4d6d3811b..0000000000 --- a/jscomp/build_tests/zerocycle/package-lock.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "name": "zerocycle", - "version": "0.1.0", - "lockfileVersion": 2, - "requires": true, - "packages": { - "": { - "name": "zerocycle", - "version": "0.1.0", - "license": "MIT", - "dependencies": { - "rescript": "file:../../.." - }, - "devDependencies": { - "bs-platform": "^2.0.1" - } - }, - "../../..": { - "version": "10.0.0", - "hasInstallScript": true, - "license": "SEE LICENSE IN LICENSE", - "bin": { - "bsc": "bsc", - "bstracing": "lib/bstracing", - "rescript": "rescript" - }, - "devDependencies": { - "mocha": "^7.2.0", - "nyc": "^15.0.0" - } - }, - "node_modules/bs-platform": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/bs-platform/-/bs-platform-2.2.3.tgz", - "integrity": "sha512-VnliXW3HPnrYJkCRTnSfl1AsGYFnQrLhTWtm/lbqrQrC1lcwuG3+KMHK7VULOos48wXO/NxpoCDF8/lqV1sqCw==", - "dev": true, - "hasInstallScript": true, - "bin": { - "bsb": "lib/bsb", - "bsc": "lib/bsc", - } - }, - "node_modules/rescript": { - "resolved": "../../..", - "link": true - } - }, - "dependencies": { - "bs-platform": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/bs-platform/-/bs-platform-2.2.3.tgz", - "integrity": "sha512-VnliXW3HPnrYJkCRTnSfl1AsGYFnQrLhTWtm/lbqrQrC1lcwuG3+KMHK7VULOos48wXO/NxpoCDF8/lqV1sqCw==", - "dev": true - }, - "rescript": { - "version": "file:../../..", - "requires": { - "mocha": "^7.2.0", - "nyc": "^15.0.0" - } - } - } -} diff --git a/jscomp/build_tests/zerocycle/package.json b/jscomp/build_tests/zerocycle/package.json deleted file mode 100644 index 85dd9a9890..0000000000 --- a/jscomp/build_tests/zerocycle/package.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "zerocycle", - "version": "0.1.0", - "scripts": { - "clean": "rescript clean", - "build": "rescript build", - "watch": "rescript build -w" - }, - "keywords": [ - "ReScript" - ], - "author": "", - "license": "MIT", - "devDependencies": { - "bs-platform": "^2.0.1" - } -} \ No newline at end of file From 13a927ebad3bec616cfc9669bc4b36a957c8d48b Mon Sep 17 00:00:00 2001 From: Dmitry Zakharov Date: Tue, 22 Aug 2023 01:33:40 +0400 Subject: [PATCH 2/4] Remove npm link --- scripts/ciTest.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/ciTest.js b/scripts/ciTest.js index 1a60a36cf2..0214908136 100644 --- a/scripts/ciTest.js +++ b/scripts/ciTest.js @@ -61,13 +61,6 @@ function runTests() { if (bsbTest) { console.log("Doing build_tests"); var buildTestDir = path.join(__dirname, "..", "jscomp", "build_tests"); - var linkCmd = `npm link ../..`; - console.log(linkCmd); - cp.execSync(linkCmd, { - cwd: buildTestDir, - stdio: [0, 1, 2], - encoding: "utf8", - }); var files = fs.readdirSync(buildTestDir); files.forEach(function (file) { var testDir = path.join(buildTestDir, file); From 3bc1b39bcaa1d80ee7efb3677cf719b3f84e7b54 Mon Sep 17 00:00:00 2001 From: Dmitry Zakharov Date: Tue, 22 Aug 2023 12:32:37 +0400 Subject: [PATCH 3/4] Fix tests on Linux --- jscomp/build_tests/case/input.js | 13 +++++++++---- jscomp/build_tests/case2/input.js | 13 +++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/jscomp/build_tests/case/input.js b/jscomp/build_tests/case/input.js index 4bc1572806..0c1f9b6169 100644 --- a/jscomp/build_tests/case/input.js +++ b/jscomp/build_tests/case/input.js @@ -3,7 +3,12 @@ var assert = require("assert"); var rescript_exe = require("../../../scripts/bin_path").rescript_exe; var o = p.spawnSync(rescript_exe, { encoding: "utf8", cwd: __dirname }); -assert.equal( - o.stderr, - `Error: Invalid bsconfig.json implementation and interface have different path names or different cases src/demo vs src/Demo\n` -); +if ( + ![ + `Error: Invalid bsconfig.json implementation and interface have different path names or different cases src/demo vs src/Demo\n`, + // On linux files are parsed in different order + `Error: Invalid bsconfig.json implementation and interface have different path names or different cases src/Demo vs src/demo\n`, + ].includes(o.stderr) +) { + assert.fail(o.stderr); +} diff --git a/jscomp/build_tests/case2/input.js b/jscomp/build_tests/case2/input.js index c61a4871bf..998c2d8772 100644 --- a/jscomp/build_tests/case2/input.js +++ b/jscomp/build_tests/case2/input.js @@ -3,7 +3,12 @@ var assert = require("assert"); var rescript_exe = require("../../../scripts/bin_path").rescript_exe; var o = p.spawnSync(rescript_exe, { encoding: "utf8", cwd: __dirname }); -assert.equal( - o.stderr, - `Error: Invalid bsconfig.json implementation and interface have different path names or different cases src/X vs src/x\n` -); +if ( + ![ + `Error: Invalid bsconfig.json implementation and interface have different path names or different cases src/X vs src/x\n`, + // On linux files are parsed in different order + `Error: Invalid bsconfig.json implementation and interface have different path names or different cases src/x vs src/X\n`, + ].includes(o.stderr) +) { + assert.fail(o.stderr); +} From c545706dad6c0cd2dec9635b4041ae8f03f4aa92 Mon Sep 17 00:00:00 2001 From: Dmitry Zakharov Date: Tue, 22 Aug 2023 12:32:59 +0400 Subject: [PATCH 4/4] Clean up test success log --- scripts/ciTest.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ciTest.js b/scripts/ciTest.js index 0214908136..c764403c92 100644 --- a/scripts/ciTest.js +++ b/scripts/ciTest.js @@ -82,7 +82,7 @@ function runTests() { console.log(stderr); throw new Error(`❌ error in ${file}: \n${error} `); } else { - console.log("✅ success in ", file); + console.log("✅ success in", file); } } );