From 932df08dce3c54617eab0e53306cbf6b9c84830f Mon Sep 17 00:00:00 2001 From: aspeddro Date: Sat, 15 Feb 2025 20:20:54 -0300 Subject: [PATCH 1/8] tests: update package-lock.json Changes found after running `make test-all`, --- .../tests-generic-jsx-transform/package-lock.json | 2 +- .../tests-incremental-typechecking/package-lock.json | 2 +- .../analysis_tests/tests-reanalyze/deadcode/package-lock.json | 2 +- .../tests-reanalyze/termination/package-lock.json | 2 +- tests/analysis_tests/tests/package-lock.json | 2 +- tests/gentype_tests/typescript-react-example/package-lock.json | 3 ++- tests/tools_tests/package-lock.json | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/analysis_tests/tests-generic-jsx-transform/package-lock.json b/tests/analysis_tests/tests-generic-jsx-transform/package-lock.json index 28180317c1..69259cf517 100644 --- a/tests/analysis_tests/tests-generic-jsx-transform/package-lock.json +++ b/tests/analysis_tests/tests-generic-jsx-transform/package-lock.json @@ -10,7 +10,7 @@ }, "../../..": { "name": "rescript", - "version": "12.0.0-alpha.8", + "version": "12.0.0-alpha.9", "hasInstallScript": true, "license": "SEE LICENSE IN LICENSE", "bin": { diff --git a/tests/analysis_tests/tests-incremental-typechecking/package-lock.json b/tests/analysis_tests/tests-incremental-typechecking/package-lock.json index 1f4807c3ef..fae19879c4 100644 --- a/tests/analysis_tests/tests-incremental-typechecking/package-lock.json +++ b/tests/analysis_tests/tests-incremental-typechecking/package-lock.json @@ -10,7 +10,7 @@ }, "../../..": { "name": "rescript", - "version": "12.0.0-alpha.8", + "version": "12.0.0-alpha.9", "hasInstallScript": true, "license": "SEE LICENSE IN LICENSE", "bin": { diff --git a/tests/analysis_tests/tests-reanalyze/deadcode/package-lock.json b/tests/analysis_tests/tests-reanalyze/deadcode/package-lock.json index 604c1602a7..f74abaab47 100644 --- a/tests/analysis_tests/tests-reanalyze/deadcode/package-lock.json +++ b/tests/analysis_tests/tests-reanalyze/deadcode/package-lock.json @@ -16,7 +16,7 @@ }, "../../../..": { "name": "rescript", - "version": "12.0.0-alpha.8", + "version": "12.0.0-alpha.9", "dev": true, "hasInstallScript": true, "license": "SEE LICENSE IN LICENSE", diff --git a/tests/analysis_tests/tests-reanalyze/termination/package-lock.json b/tests/analysis_tests/tests-reanalyze/termination/package-lock.json index fd0cd95e7d..41e399869c 100644 --- a/tests/analysis_tests/tests-reanalyze/termination/package-lock.json +++ b/tests/analysis_tests/tests-reanalyze/termination/package-lock.json @@ -13,7 +13,7 @@ }, "../../../..": { "name": "rescript", - "version": "12.0.0-alpha.8", + "version": "12.0.0-alpha.9", "dev": true, "hasInstallScript": true, "license": "SEE LICENSE IN LICENSE", diff --git a/tests/analysis_tests/tests/package-lock.json b/tests/analysis_tests/tests/package-lock.json index 1f0d8fa0ca..78c67ca53e 100644 --- a/tests/analysis_tests/tests/package-lock.json +++ b/tests/analysis_tests/tests/package-lock.json @@ -34,7 +34,7 @@ }, "../../..": { "name": "rescript", - "version": "12.0.0-alpha.8", + "version": "12.0.0-alpha.9", "hasInstallScript": true, "license": "SEE LICENSE IN LICENSE", "bin": { diff --git a/tests/gentype_tests/typescript-react-example/package-lock.json b/tests/gentype_tests/typescript-react-example/package-lock.json index d1d0e9c2ab..f7b3f3975c 100644 --- a/tests/gentype_tests/typescript-react-example/package-lock.json +++ b/tests/gentype_tests/typescript-react-example/package-lock.json @@ -21,7 +21,8 @@ } }, "../../..": { - "version": "12.0.0-alpha.7", + "name": "rescript", + "version": "12.0.0-alpha.9", "dev": true, "hasInstallScript": true, "license": "SEE LICENSE IN LICENSE", diff --git a/tests/tools_tests/package-lock.json b/tests/tools_tests/package-lock.json index 8118ee2f99..1719c358b8 100644 --- a/tests/tools_tests/package-lock.json +++ b/tests/tools_tests/package-lock.json @@ -15,7 +15,7 @@ }, "../..": { "name": "rescript", - "version": "12.0.0-alpha.8", + "version": "12.0.0-alpha.9", "hasInstallScript": true, "license": "SEE LICENSE IN LICENSE", "bin": { From e28d29296e6719e45306743013edf6634d8801f4 Mon Sep 17 00:00:00 2001 From: aspeddro Date: Sun, 16 Feb 2025 23:43:42 -0300 Subject: [PATCH 2/8] run check for diff after tests --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 091ba059ec..6e487f6a69 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -320,9 +320,6 @@ jobs: - name: Run tests run: node scripts/test.js -all - - name: Check for diffs in tests folder - run: git diff --ignore-cr-at-eol --exit-code tests - - name: Run analysis / tools tests if: runner.os != 'Windows' && matrix.os != 'ubuntu-24.04-arm' run: opam exec -- make -C tests/analysis_tests test && make -C tests/tools_tests test @@ -331,6 +328,9 @@ jobs: if: runner.os != 'Windows' run: make -C tests/gentype_tests/typescript-react-example clean test + - name: Check for diffs in tests folder + run: git diff --ignore-cr-at-eol --exit-code tests + - name: Run syntax benchmarks if: matrix.benchmarks run: ./_build/install/default/bin/syntax_benchmarks | tee tests/benchmark-output.json From 3aaf990e7d1e6a9791ee4efbe83a1beec8bb4eed Mon Sep 17 00:00:00 2001 From: aspeddro Date: Sun, 16 Feb 2025 23:49:24 -0300 Subject: [PATCH 3/8] commit mocha update --- .../tests-generic-jsx-transform/package-lock.json | 4 ++-- .../tests-incremental-typechecking/package-lock.json | 4 ++-- .../analysis_tests/tests-reanalyze/deadcode/package-lock.json | 2 +- .../tests-reanalyze/termination/package-lock.json | 4 ++-- tests/analysis_tests/tests/package-lock.json | 4 ++-- .../gentype_tests/typescript-react-example/package-lock.json | 2 +- tests/tools_tests/package-lock.json | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/analysis_tests/tests-generic-jsx-transform/package-lock.json b/tests/analysis_tests/tests-generic-jsx-transform/package-lock.json index 69259cf517..4aee9849c4 100644 --- a/tests/analysis_tests/tests-generic-jsx-transform/package-lock.json +++ b/tests/analysis_tests/tests-generic-jsx-transform/package-lock.json @@ -22,7 +22,7 @@ }, "devDependencies": { "@biomejs/biome": "1.8.3", - "mocha": "10.1.0", + "mocha": "10.8.2", "nyc": "15.0.0" }, "engines": { @@ -39,7 +39,7 @@ "version": "file:../../..", "requires": { "@biomejs/biome": "1.8.3", - "mocha": "10.1.0", + "mocha": "10.8.2", "nyc": "15.0.0" } } diff --git a/tests/analysis_tests/tests-incremental-typechecking/package-lock.json b/tests/analysis_tests/tests-incremental-typechecking/package-lock.json index fae19879c4..f694161a34 100644 --- a/tests/analysis_tests/tests-incremental-typechecking/package-lock.json +++ b/tests/analysis_tests/tests-incremental-typechecking/package-lock.json @@ -22,7 +22,7 @@ }, "devDependencies": { "@biomejs/biome": "1.8.3", - "mocha": "10.1.0", + "mocha": "10.8.2", "nyc": "15.0.0" }, "engines": { @@ -39,7 +39,7 @@ "version": "file:../../..", "requires": { "@biomejs/biome": "1.8.3", - "mocha": "10.1.0", + "mocha": "10.8.2", "nyc": "15.0.0" } } diff --git a/tests/analysis_tests/tests-reanalyze/deadcode/package-lock.json b/tests/analysis_tests/tests-reanalyze/deadcode/package-lock.json index f74abaab47..bb94e3bf05 100644 --- a/tests/analysis_tests/tests-reanalyze/deadcode/package-lock.json +++ b/tests/analysis_tests/tests-reanalyze/deadcode/package-lock.json @@ -29,7 +29,7 @@ }, "devDependencies": { "@biomejs/biome": "1.8.3", - "mocha": "10.1.0", + "mocha": "10.8.2", "nyc": "15.0.0" }, "engines": { diff --git a/tests/analysis_tests/tests-reanalyze/termination/package-lock.json b/tests/analysis_tests/tests-reanalyze/termination/package-lock.json index 41e399869c..85a1821b6f 100644 --- a/tests/analysis_tests/tests-reanalyze/termination/package-lock.json +++ b/tests/analysis_tests/tests-reanalyze/termination/package-lock.json @@ -26,7 +26,7 @@ }, "devDependencies": { "@biomejs/biome": "1.8.3", - "mocha": "10.1.0", + "mocha": "10.8.2", "nyc": "15.0.0" }, "engines": { @@ -43,7 +43,7 @@ "version": "file:../../../..", "requires": { "@biomejs/biome": "1.8.3", - "mocha": "10.1.0", + "mocha": "10.8.2", "nyc": "15.0.0" } } diff --git a/tests/analysis_tests/tests/package-lock.json b/tests/analysis_tests/tests/package-lock.json index 78c67ca53e..3a229c95a2 100644 --- a/tests/analysis_tests/tests/package-lock.json +++ b/tests/analysis_tests/tests/package-lock.json @@ -46,7 +46,7 @@ }, "devDependencies": { "@biomejs/biome": "1.8.3", - "mocha": "10.1.0", + "mocha": "10.8.2", "nyc": "15.0.0" }, "engines": { @@ -176,7 +176,7 @@ "version": "file:../../..", "requires": { "@biomejs/biome": "1.8.3", - "mocha": "10.1.0", + "mocha": "10.8.2", "nyc": "15.0.0" } }, diff --git a/tests/gentype_tests/typescript-react-example/package-lock.json b/tests/gentype_tests/typescript-react-example/package-lock.json index f7b3f3975c..89acf23ac7 100644 --- a/tests/gentype_tests/typescript-react-example/package-lock.json +++ b/tests/gentype_tests/typescript-react-example/package-lock.json @@ -35,7 +35,7 @@ }, "devDependencies": { "@biomejs/biome": "1.8.3", - "mocha": "10.1.0", + "mocha": "10.8.2", "nyc": "15.0.0" }, "engines": { diff --git a/tests/tools_tests/package-lock.json b/tests/tools_tests/package-lock.json index 1719c358b8..f58de2e0f0 100644 --- a/tests/tools_tests/package-lock.json +++ b/tests/tools_tests/package-lock.json @@ -27,7 +27,7 @@ }, "devDependencies": { "@biomejs/biome": "1.8.3", - "mocha": "10.1.0", + "mocha": "10.8.2", "nyc": "15.0.0" }, "engines": { From 461e7f6e61ca90b438afbd11774a1379807e413c Mon Sep 17 00:00:00 2001 From: aspeddro Date: Mon, 17 Feb 2025 00:14:44 -0300 Subject: [PATCH 4/8] replace npm install -> npm ci --- Makefile | 2 +- tests/analysis_tests/tests-generic-jsx-transform/Makefile | 2 +- tests/analysis_tests/tests-incremental-typechecking/Makefile | 2 +- tests/analysis_tests/tests-reanalyze/deadcode/Makefile | 2 +- tests/analysis_tests/tests-reanalyze/termination/Makefile | 2 +- tests/analysis_tests/tests/Makefile | 2 +- tests/gentype_tests/typescript-react-example/Makefile | 2 +- tests/tools_tests/Makefile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index b456880f06..f0d5fd0183 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ ninja/ninja: ninja: ninja/ninja node_modules/.bin/semver: - npm install + npm ci test: lib node scripts/test.js -all diff --git a/tests/analysis_tests/tests-generic-jsx-transform/Makefile b/tests/analysis_tests/tests-generic-jsx-transform/Makefile index cf41744b6a..7e393ceed2 100644 --- a/tests/analysis_tests/tests-generic-jsx-transform/Makefile +++ b/tests/analysis_tests/tests-generic-jsx-transform/Makefile @@ -1,7 +1,7 @@ SHELL = /bin/bash node_modules/.bin/rescript: - npm install + npm ci build: node_modules/.bin/rescript node_modules/.bin/rescript diff --git a/tests/analysis_tests/tests-incremental-typechecking/Makefile b/tests/analysis_tests/tests-incremental-typechecking/Makefile index 6e052a1454..f7d44f75f8 100644 --- a/tests/analysis_tests/tests-incremental-typechecking/Makefile +++ b/tests/analysis_tests/tests-incremental-typechecking/Makefile @@ -1,7 +1,7 @@ SHELL = /bin/bash node_modules/.bin/rescript: - npm install + npm ci build: node_modules/.bin/rescript node_modules/.bin/rescript > /dev/null || true diff --git a/tests/analysis_tests/tests-reanalyze/deadcode/Makefile b/tests/analysis_tests/tests-reanalyze/deadcode/Makefile index 0a8b9d0f38..1c981f38de 100644 --- a/tests/analysis_tests/tests-reanalyze/deadcode/Makefile +++ b/tests/analysis_tests/tests-reanalyze/deadcode/Makefile @@ -1,7 +1,7 @@ SHELL = /bin/bash node_modules/.bin/rescript: - npm install + npm ci build: node_modules/.bin/rescript node_modules/.bin/rescript diff --git a/tests/analysis_tests/tests-reanalyze/termination/Makefile b/tests/analysis_tests/tests-reanalyze/termination/Makefile index 0a8b9d0f38..1c981f38de 100644 --- a/tests/analysis_tests/tests-reanalyze/termination/Makefile +++ b/tests/analysis_tests/tests-reanalyze/termination/Makefile @@ -1,7 +1,7 @@ SHELL = /bin/bash node_modules/.bin/rescript: - npm install + npm ci build: node_modules/.bin/rescript node_modules/.bin/rescript diff --git a/tests/analysis_tests/tests/Makefile b/tests/analysis_tests/tests/Makefile index cf41744b6a..7e393ceed2 100644 --- a/tests/analysis_tests/tests/Makefile +++ b/tests/analysis_tests/tests/Makefile @@ -1,7 +1,7 @@ SHELL = /bin/bash node_modules/.bin/rescript: - npm install + npm ci build: node_modules/.bin/rescript node_modules/.bin/rescript diff --git a/tests/gentype_tests/typescript-react-example/Makefile b/tests/gentype_tests/typescript-react-example/Makefile index 1d66d5442b..9c4d75acf5 100644 --- a/tests/gentype_tests/typescript-react-example/Makefile +++ b/tests/gentype_tests/typescript-react-example/Makefile @@ -1,7 +1,7 @@ SHELL = /bin/bash test: - npm install + npm ci npm run lint npm run build npm run tsc diff --git a/tests/tools_tests/Makefile b/tests/tools_tests/Makefile index cf41744b6a..7e393ceed2 100644 --- a/tests/tools_tests/Makefile +++ b/tests/tools_tests/Makefile @@ -1,7 +1,7 @@ SHELL = /bin/bash node_modules/.bin/rescript: - npm install + npm ci build: node_modules/.bin/rescript node_modules/.bin/rescript From 4a75ee2a8062cdda9329d17caa64350a2c50c58e Mon Sep 17 00:00:00 2001 From: aspeddro Date: Mon, 17 Feb 2025 00:40:10 -0300 Subject: [PATCH 5/8] revert npm ci --- Makefile | 2 +- tests/analysis_tests/tests-generic-jsx-transform/Makefile | 2 +- tests/analysis_tests/tests-incremental-typechecking/Makefile | 2 +- tests/analysis_tests/tests-reanalyze/deadcode/Makefile | 2 +- tests/analysis_tests/tests-reanalyze/termination/Makefile | 2 +- tests/analysis_tests/tests/Makefile | 2 +- tests/gentype_tests/typescript-react-example/Makefile | 2 +- tests/tools_tests/Makefile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index f0d5fd0183..b456880f06 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ ninja/ninja: ninja: ninja/ninja node_modules/.bin/semver: - npm ci + npm install test: lib node scripts/test.js -all diff --git a/tests/analysis_tests/tests-generic-jsx-transform/Makefile b/tests/analysis_tests/tests-generic-jsx-transform/Makefile index 7e393ceed2..cf41744b6a 100644 --- a/tests/analysis_tests/tests-generic-jsx-transform/Makefile +++ b/tests/analysis_tests/tests-generic-jsx-transform/Makefile @@ -1,7 +1,7 @@ SHELL = /bin/bash node_modules/.bin/rescript: - npm ci + npm install build: node_modules/.bin/rescript node_modules/.bin/rescript diff --git a/tests/analysis_tests/tests-incremental-typechecking/Makefile b/tests/analysis_tests/tests-incremental-typechecking/Makefile index f7d44f75f8..6e052a1454 100644 --- a/tests/analysis_tests/tests-incremental-typechecking/Makefile +++ b/tests/analysis_tests/tests-incremental-typechecking/Makefile @@ -1,7 +1,7 @@ SHELL = /bin/bash node_modules/.bin/rescript: - npm ci + npm install build: node_modules/.bin/rescript node_modules/.bin/rescript > /dev/null || true diff --git a/tests/analysis_tests/tests-reanalyze/deadcode/Makefile b/tests/analysis_tests/tests-reanalyze/deadcode/Makefile index 1c981f38de..0a8b9d0f38 100644 --- a/tests/analysis_tests/tests-reanalyze/deadcode/Makefile +++ b/tests/analysis_tests/tests-reanalyze/deadcode/Makefile @@ -1,7 +1,7 @@ SHELL = /bin/bash node_modules/.bin/rescript: - npm ci + npm install build: node_modules/.bin/rescript node_modules/.bin/rescript diff --git a/tests/analysis_tests/tests-reanalyze/termination/Makefile b/tests/analysis_tests/tests-reanalyze/termination/Makefile index 1c981f38de..0a8b9d0f38 100644 --- a/tests/analysis_tests/tests-reanalyze/termination/Makefile +++ b/tests/analysis_tests/tests-reanalyze/termination/Makefile @@ -1,7 +1,7 @@ SHELL = /bin/bash node_modules/.bin/rescript: - npm ci + npm install build: node_modules/.bin/rescript node_modules/.bin/rescript diff --git a/tests/analysis_tests/tests/Makefile b/tests/analysis_tests/tests/Makefile index 7e393ceed2..cf41744b6a 100644 --- a/tests/analysis_tests/tests/Makefile +++ b/tests/analysis_tests/tests/Makefile @@ -1,7 +1,7 @@ SHELL = /bin/bash node_modules/.bin/rescript: - npm ci + npm install build: node_modules/.bin/rescript node_modules/.bin/rescript diff --git a/tests/gentype_tests/typescript-react-example/Makefile b/tests/gentype_tests/typescript-react-example/Makefile index 9c4d75acf5..1d66d5442b 100644 --- a/tests/gentype_tests/typescript-react-example/Makefile +++ b/tests/gentype_tests/typescript-react-example/Makefile @@ -1,7 +1,7 @@ SHELL = /bin/bash test: - npm ci + npm install npm run lint npm run build npm run tsc diff --git a/tests/tools_tests/Makefile b/tests/tools_tests/Makefile index 7e393ceed2..cf41744b6a 100644 --- a/tests/tools_tests/Makefile +++ b/tests/tools_tests/Makefile @@ -1,7 +1,7 @@ SHELL = /bin/bash node_modules/.bin/rescript: - npm ci + npm install build: node_modules/.bin/rescript node_modules/.bin/rescript From 54f91aa47652a68d5f22faea0a338720d723548d Mon Sep 17 00:00:00 2001 From: aspeddro Date: Mon, 17 Feb 2025 13:25:16 -0300 Subject: [PATCH 6/8] add property name in package.json --- tests/analysis_tests/tests-generic-jsx-transform/package.json | 1 + .../analysis_tests/tests-incremental-typechecking/package.json | 1 + tests/analysis_tests/tests/package.json | 1 + tests/gentype_tests/typescript-react-example/package.json | 2 +- 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/analysis_tests/tests-generic-jsx-transform/package.json b/tests/analysis_tests/tests-generic-jsx-transform/package.json index 517996fa74..c85a277861 100644 --- a/tests/analysis_tests/tests-generic-jsx-transform/package.json +++ b/tests/analysis_tests/tests-generic-jsx-transform/package.json @@ -1,4 +1,5 @@ { + "name": "tests-generic-jsx-transform", "scripts": { "build": "rescript", "clean": "rescript clean -with-deps" diff --git a/tests/analysis_tests/tests-incremental-typechecking/package.json b/tests/analysis_tests/tests-incremental-typechecking/package.json index 517996fa74..90882e624a 100644 --- a/tests/analysis_tests/tests-incremental-typechecking/package.json +++ b/tests/analysis_tests/tests-incremental-typechecking/package.json @@ -1,4 +1,5 @@ { + "name": "tests-incremental-typechecking", "scripts": { "build": "rescript", "clean": "rescript clean -with-deps" diff --git a/tests/analysis_tests/tests/package.json b/tests/analysis_tests/tests/package.json index e1924d04c8..144230ba2a 100644 --- a/tests/analysis_tests/tests/package.json +++ b/tests/analysis_tests/tests/package.json @@ -1,4 +1,5 @@ { + "name": "tests", "scripts": { "build": "rescript", "clean": "rescript clean -with-deps" diff --git a/tests/gentype_tests/typescript-react-example/package.json b/tests/gentype_tests/typescript-react-example/package.json index 379c73f4ec..f4277107b8 100644 --- a/tests/gentype_tests/typescript-react-example/package.json +++ b/tests/gentype_tests/typescript-react-example/package.json @@ -21,4 +21,4 @@ "rescript": "file:../../..", "typescript": "^5.2.2" } -} \ No newline at end of file +} From f479de988e822ae169215b390f62d7cb8195a58f Mon Sep 17 00:00:00 2001 From: aspeddro Date: Mon, 17 Feb 2025 13:46:56 -0300 Subject: [PATCH 7/8] regenerate lockfiles --- .../package-lock.json | 13 +- .../package-lock.json | 13 +- .../deadcode/package-lock.json | 53 ++----- .../termination/package-lock.json | 12 +- tests/analysis_tests/tests/package-lock.json | 141 ++---------------- tests/tools_tests/package-lock.json | 2 +- tests/tools_tests/package.json | 2 +- 7 files changed, 39 insertions(+), 197 deletions(-) diff --git a/tests/analysis_tests/tests-generic-jsx-transform/package-lock.json b/tests/analysis_tests/tests-generic-jsx-transform/package-lock.json index 4aee9849c4..4e6909986e 100644 --- a/tests/analysis_tests/tests-generic-jsx-transform/package-lock.json +++ b/tests/analysis_tests/tests-generic-jsx-transform/package-lock.json @@ -1,9 +1,10 @@ { "name": "tests-generic-jsx-transform", - "lockfileVersion": 2, + "lockfileVersion": 3, "requires": true, "packages": { "": { + "name": "tests-generic-jsx-transform", "dependencies": { "rescript": "file:../../.." } @@ -33,15 +34,5 @@ "resolved": "../../..", "link": true } - }, - "dependencies": { - "rescript": { - "version": "file:../../..", - "requires": { - "@biomejs/biome": "1.8.3", - "mocha": "10.8.2", - "nyc": "15.0.0" - } - } } } diff --git a/tests/analysis_tests/tests-incremental-typechecking/package-lock.json b/tests/analysis_tests/tests-incremental-typechecking/package-lock.json index f694161a34..6ce2584e2b 100644 --- a/tests/analysis_tests/tests-incremental-typechecking/package-lock.json +++ b/tests/analysis_tests/tests-incremental-typechecking/package-lock.json @@ -1,9 +1,10 @@ { "name": "tests-incremental-typechecking", - "lockfileVersion": 2, + "lockfileVersion": 3, "requires": true, "packages": { "": { + "name": "tests-incremental-typechecking", "dependencies": { "rescript": "file:../../.." } @@ -33,15 +34,5 @@ "resolved": "../../..", "link": true } - }, - "dependencies": { - "rescript": { - "version": "file:../../..", - "requires": { - "@biomejs/biome": "1.8.3", - "mocha": "10.8.2", - "nyc": "15.0.0" - } - } } } diff --git a/tests/analysis_tests/tests-reanalyze/deadcode/package-lock.json b/tests/analysis_tests/tests-reanalyze/deadcode/package-lock.json index bb94e3bf05..c84bd45083 100644 --- a/tests/analysis_tests/tests-reanalyze/deadcode/package-lock.json +++ b/tests/analysis_tests/tests-reanalyze/deadcode/package-lock.json @@ -40,52 +40,33 @@ "version": "0.13.0", "resolved": "https://registry.npmjs.org/@rescript/react/-/react-0.13.0.tgz", "integrity": "sha512-YSIWIyMlyF9ZaP6Q3hScl1h3wRbdIP4+Cb7PlDt7Y1PG8M8VWYhLoIgLb78mbBHcwFbZu0d5zAt1LSX5ilOiWQ==", + "license": "MIT", "peerDependencies": { "react": ">=18.0.0", "react-dom": ">=18.0.0" } }, - "node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "peer": true - }, - "node_modules/loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "peer": true, - "dependencies": { - "js-tokens": "^3.0.0 || ^4.0.0" - }, - "bin": { - "loose-envify": "cli.js" - } - }, "node_modules/react": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz", - "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==", + "version": "19.0.0", + "resolved": "https://registry.npmjs.org/react/-/react-19.0.0.tgz", + "integrity": "sha512-V8AVnmPIICiWpGfm6GLzCR/W5FXLchHop40W4nXBmdlEceh16rCN8O8LNWm5bh5XUX91fh7KpA+W0TgMKmgTpQ==", + "license": "MIT", "peer": true, - "dependencies": { - "loose-envify": "^1.1.0" - }, "engines": { "node": ">=0.10.0" } }, "node_modules/react-dom": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz", - "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==", + "version": "19.0.0", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.0.0.tgz", + "integrity": "sha512-4GV5sHFG0e/0AD4X+ySy6UJd3jVl1iNsNHdpad0qhABJ11twS3TTBnseqsKurKcsNqCEFeGL3uLpVChpIO3QfQ==", + "license": "MIT", "peer": true, "dependencies": { - "loose-envify": "^1.1.0", - "scheduler": "^0.23.2" + "scheduler": "^0.25.0" }, "peerDependencies": { - "react": "^18.3.1" + "react": "^19.0.0" } }, "node_modules/rescript": { @@ -93,13 +74,11 @@ "link": true }, "node_modules/scheduler": { - "version": "0.23.2", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz", - "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==", - "peer": true, - "dependencies": { - "loose-envify": "^1.1.0" - } + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.25.0.tgz", + "integrity": "sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA==", + "license": "MIT", + "peer": true } } } diff --git a/tests/analysis_tests/tests-reanalyze/termination/package-lock.json b/tests/analysis_tests/tests-reanalyze/termination/package-lock.json index 85a1821b6f..58ce3539ed 100644 --- a/tests/analysis_tests/tests-reanalyze/termination/package-lock.json +++ b/tests/analysis_tests/tests-reanalyze/termination/package-lock.json @@ -1,7 +1,7 @@ { "name": "termination", "version": "0.1.0", - "lockfileVersion": 2, + "lockfileVersion": 3, "requires": true, "packages": { "": { @@ -37,15 +37,5 @@ "resolved": "../../../..", "link": true } - }, - "dependencies": { - "rescript": { - "version": "file:../../../..", - "requires": { - "@biomejs/biome": "1.8.3", - "mocha": "10.8.2", - "nyc": "15.0.0" - } - } } } diff --git a/tests/analysis_tests/tests/package-lock.json b/tests/analysis_tests/tests/package-lock.json index 3a229c95a2..a6c31b9f39 100644 --- a/tests/analysis_tests/tests/package-lock.json +++ b/tests/analysis_tests/tests/package-lock.json @@ -1,9 +1,10 @@ { "name": "tests", - "lockfileVersion": 2, + "lockfileVersion": 3, "requires": true, "packages": { "": { + "name": "tests", "dependencies": { "rescript": "../../.." }, @@ -11,27 +12,6 @@ "@rescript/react": "0.13.0" } }, - "../..": { - "name": "rescript", - "version": "12.0.0-alpha.5", - "extraneous": true, - "hasInstallScript": true, - "license": "SEE LICENSE IN LICENSE", - "bin": { - "bsc": "cli/bsc", - "bstracing": "lib/bstracing", - "rescript": "cli/rescript", - "rewatch": "cli/rewatch" - }, - "devDependencies": { - "@biomejs/biome": "1.8.3", - "mocha": "10.1.0", - "nyc": "15.0.0" - }, - "engines": { - "node": ">=18" - } - }, "../../..": { "name": "rescript", "version": "12.0.0-alpha.9", @@ -64,51 +44,29 @@ "react-dom": ">=18.0.0" } }, - "node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true, - "peer": true - }, - "node_modules/loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "dev": true, - "peer": true, - "dependencies": { - "js-tokens": "^3.0.0 || ^4.0.0" - }, - "bin": { - "loose-envify": "cli.js" - } - }, "node_modules/react": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", - "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", + "version": "19.0.0", + "resolved": "https://registry.npmjs.org/react/-/react-19.0.0.tgz", + "integrity": "sha512-V8AVnmPIICiWpGfm6GLzCR/W5FXLchHop40W4nXBmdlEceh16rCN8O8LNWm5bh5XUX91fh7KpA+W0TgMKmgTpQ==", "dev": true, + "license": "MIT", "peer": true, - "dependencies": { - "loose-envify": "^1.1.0" - }, "engines": { "node": ">=0.10.0" } }, "node_modules/react-dom": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", - "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", + "version": "19.0.0", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.0.0.tgz", + "integrity": "sha512-4GV5sHFG0e/0AD4X+ySy6UJd3jVl1iNsNHdpad0qhABJ11twS3TTBnseqsKurKcsNqCEFeGL3uLpVChpIO3QfQ==", "dev": true, + "license": "MIT", "peer": true, "dependencies": { - "loose-envify": "^1.1.0", - "scheduler": "^0.23.0" + "scheduler": "^0.25.0" }, "peerDependencies": { - "react": "^18.2.0" + "react": "^19.0.0" } }, "node_modules/rescript": { @@ -116,79 +74,12 @@ "link": true }, "node_modules/scheduler": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", - "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==", - "dev": true, - "peer": true, - "dependencies": { - "loose-envify": "^1.1.0" - } - } - }, - "dependencies": { - "@rescript/react": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/@rescript/react/-/react-0.13.0.tgz", - "integrity": "sha512-YSIWIyMlyF9ZaP6Q3hScl1h3wRbdIP4+Cb7PlDt7Y1PG8M8VWYhLoIgLb78mbBHcwFbZu0d5zAt1LSX5ilOiWQ==", - "dev": true, - "requires": {} - }, - "js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "version": "0.25.0", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.25.0.tgz", + "integrity": "sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA==", "dev": true, + "license": "MIT", "peer": true - }, - "loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "dev": true, - "peer": true, - "requires": { - "js-tokens": "^3.0.0 || ^4.0.0" - } - }, - "react": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", - "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", - "dev": true, - "peer": true, - "requires": { - "loose-envify": "^1.1.0" - } - }, - "react-dom": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", - "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", - "dev": true, - "peer": true, - "requires": { - "loose-envify": "^1.1.0", - "scheduler": "^0.23.0" - } - }, - "rescript": { - "version": "file:../../..", - "requires": { - "@biomejs/biome": "1.8.3", - "mocha": "10.8.2", - "nyc": "15.0.0" - } - }, - "scheduler": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", - "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==", - "dev": true, - "peer": true, - "requires": { - "loose-envify": "^1.1.0" - } } } } diff --git a/tests/tools_tests/package-lock.json b/tests/tools_tests/package-lock.json index f58de2e0f0..bd425dfa13 100644 --- a/tests/tools_tests/package-lock.json +++ b/tests/tools_tests/package-lock.json @@ -10,7 +10,7 @@ "license": "MIT", "dependencies": { "@rescript/react": "^0.13.0", - "rescript": "../.." + "rescript": "file:../.." } }, "../..": { diff --git a/tests/tools_tests/package.json b/tests/tools_tests/package.json index f08451e657..38ba139475 100644 --- a/tests/tools_tests/package.json +++ b/tests/tools_tests/package.json @@ -13,6 +13,6 @@ "license": "MIT", "dependencies": { "@rescript/react": "^0.13.0", - "rescript": "../.." + "rescript": "file:../.." } } From 6ce7c4841cfb7057bd3694601a12c345bea12b3e Mon Sep 17 00:00:00 2001 From: aspeddro Date: Fri, 21 Mar 2025 21:29:33 -0300 Subject: [PATCH 8/8] update lock files --- .../package-lock.json | 11 ----- .../package-lock.json | 11 ----- .../deadcode/package-lock.json | 1 - .../termination/package-lock.json | 11 ----- tests/analysis_tests/tests/package-lock.json | 42 +++++-------------- .../package-lock.json | 2 +- tests/tools_tests/package-lock.json | 2 +- 7 files changed, 12 insertions(+), 68 deletions(-) diff --git a/tests/analysis_tests/tests-generic-jsx-transform/package-lock.json b/tests/analysis_tests/tests-generic-jsx-transform/package-lock.json index c1008139ea..1b7e59f2ef 100644 --- a/tests/analysis_tests/tests-generic-jsx-transform/package-lock.json +++ b/tests/analysis_tests/tests-generic-jsx-transform/package-lock.json @@ -12,7 +12,6 @@ "../../..": { "name": "rescript", "version": "12.0.0-alpha.10", - "hasInstallScript": true, "license": "SEE LICENSE IN LICENSE", "bin": { "bsc": "cli/bsc", @@ -34,15 +33,5 @@ "resolved": "../../..", "link": true } - }, - "dependencies": { - "rescript": { - "version": "file:../../..", - "requires": { - "@biomejs/biome": "1.8.3", - "mocha": "10.8.2", - "nyc": "15.0.0" - } - } } } diff --git a/tests/analysis_tests/tests-incremental-typechecking/package-lock.json b/tests/analysis_tests/tests-incremental-typechecking/package-lock.json index 680fa29245..26d81a0466 100644 --- a/tests/analysis_tests/tests-incremental-typechecking/package-lock.json +++ b/tests/analysis_tests/tests-incremental-typechecking/package-lock.json @@ -12,7 +12,6 @@ "../../..": { "name": "rescript", "version": "12.0.0-alpha.10", - "hasInstallScript": true, "license": "SEE LICENSE IN LICENSE", "bin": { "bsc": "cli/bsc", @@ -34,15 +33,5 @@ "resolved": "../../..", "link": true } - }, - "dependencies": { - "rescript": { - "version": "file:../../..", - "requires": { - "@biomejs/biome": "1.8.3", - "mocha": "10.8.2", - "nyc": "15.0.0" - } - } } } diff --git a/tests/analysis_tests/tests-reanalyze/deadcode/package-lock.json b/tests/analysis_tests/tests-reanalyze/deadcode/package-lock.json index f9e1a07e70..1cdac5cf0e 100644 --- a/tests/analysis_tests/tests-reanalyze/deadcode/package-lock.json +++ b/tests/analysis_tests/tests-reanalyze/deadcode/package-lock.json @@ -18,7 +18,6 @@ "name": "rescript", "version": "12.0.0-alpha.10", "dev": true, - "hasInstallScript": true, "license": "SEE LICENSE IN LICENSE", "bin": { "bsc": "cli/bsc", diff --git a/tests/analysis_tests/tests-reanalyze/termination/package-lock.json b/tests/analysis_tests/tests-reanalyze/termination/package-lock.json index 6098f88bb4..7ec851df3b 100644 --- a/tests/analysis_tests/tests-reanalyze/termination/package-lock.json +++ b/tests/analysis_tests/tests-reanalyze/termination/package-lock.json @@ -15,7 +15,6 @@ "name": "rescript", "version": "12.0.0-alpha.10", "dev": true, - "hasInstallScript": true, "license": "SEE LICENSE IN LICENSE", "bin": { "bsc": "cli/bsc", @@ -37,15 +36,5 @@ "resolved": "../../../..", "link": true } - }, - "dependencies": { - "rescript": { - "version": "file:../../../..", - "requires": { - "@biomejs/biome": "1.8.3", - "mocha": "10.8.2", - "nyc": "15.0.0" - } - } } } diff --git a/tests/analysis_tests/tests/package-lock.json b/tests/analysis_tests/tests/package-lock.json index 6cc04c80ac..1b25c9543a 100644 --- a/tests/analysis_tests/tests/package-lock.json +++ b/tests/analysis_tests/tests/package-lock.json @@ -15,7 +15,6 @@ "../../..": { "name": "rescript", "version": "12.0.0-alpha.10", - "hasInstallScript": true, "license": "SEE LICENSE IN LICENSE", "bin": { "bsc": "cli/bsc", @@ -33,6 +32,12 @@ "node": ">=18" } }, + "loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "extraneous": true + }, "node_modules/@rescript/react": { "version": "0.13.0", "resolved": "https://registry.npmjs.org/@rescript/react/-/react-0.13.0.tgz", @@ -81,54 +86,27 @@ "license": "MIT", "peer": true }, - "loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "dev": true, - "peer": true, - "requires": { - "js-tokens": "^3.0.0 || ^4.0.0" - } - }, "react": { "version": "18.2.0", "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", - "dev": true, - "peer": true, - "requires": { - "loose-envify": "^1.1.0" - } + "extraneous": true }, "react-dom": { "version": "18.2.0", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", - "dev": true, - "peer": true, - "requires": { - "loose-envify": "^1.1.0", - "scheduler": "^0.23.0" - } + "extraneous": true }, "rescript": { "version": "file:../../..", - "requires": { - "@biomejs/biome": "1.8.3", - "mocha": "10.8.2", - "nyc": "15.0.0" - } + "extraneous": true }, "scheduler": { "version": "0.23.0", "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==", - "dev": true, - "peer": true, - "requires": { - "loose-envify": "^1.1.0" - } + "extraneous": true } } } diff --git a/tests/gentype_tests/typescript-react-example/package-lock.json b/tests/gentype_tests/typescript-react-example/package-lock.json index 8b0560ac74..46275c30ca 100644 --- a/tests/gentype_tests/typescript-react-example/package-lock.json +++ b/tests/gentype_tests/typescript-react-example/package-lock.json @@ -21,9 +21,9 @@ } }, "../../..": { + "name": "rescript", "version": "12.0.0-alpha.10", "dev": true, - "hasInstallScript": true, "license": "SEE LICENSE IN LICENSE", "bin": { "bsc": "cli/bsc", diff --git a/tests/tools_tests/package-lock.json b/tests/tools_tests/package-lock.json index c2f106319a..38806c79ad 100644 --- a/tests/tools_tests/package-lock.json +++ b/tests/tools_tests/package-lock.json @@ -14,8 +14,8 @@ } }, "../..": { + "name": "rescript", "version": "12.0.0-alpha.10", - "hasInstallScript": true, "license": "SEE LICENSE IN LICENSE", "bin": { "bsc": "cli/bsc",