Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
609627f
feat: migrate packages/utils jest to vitest
hereje Aug 26, 2025
57ea88a
feat: migrate packages/cashscript jest to vitest
hereje Aug 26, 2025
400fabe
feat: migrate packages/cashc jest to vitest
hereje Aug 28, 2025
3cc475a
fix: update missing npmignore entry for cashscript
hereje Aug 28, 2025
857ac96
refactor: simplify test exec packages/cashscript
hereje Sep 2, 2025
07f5668
refactor: simplify test exec packages/cashc
hereje Sep 2, 2025
4d02327
refactor: simplify test exec packages/utils
hereje Sep 2, 2025
3efb979
refactor: replace jest with vitest testing-suite
hereje Sep 2, 2025
026064d
chore: udpate github actions with vitest flags
hereje Sep 2, 2025
ed60fcf
Update AST.test.ts
hereje Sep 2, 2025
29ebd19
Update Location.test.ts
hereje Sep 2, 2025
85b3e16
Update compiler.test.ts
hereje Sep 2, 2025
35f33fa
Update Contract.test.ts
hereje Sep 2, 2025
a4bb9c3
Update TransactionBuilder.test.ts
hereje Sep 2, 2025
b23d10b
Update debugging.test.ts
hereje Sep 2, 2025
624e634
Update Announcement.test.ts
hereje Sep 2, 2025
fd7d501
feat: add vitest globals to workspace config
hereje Sep 2, 2025
d1c96f4
Merge remote-tracking branch 'origin/master' into feat/migrate-jest-t…
rkalis Dec 9, 2025
c24889d
Remove some final jest references
rkalis Dec 9, 2025
1c6b117
Revert some minor whitespace changes
rkalis Dec 9, 2025
4d3ab46
Set silent to passed-only and don't use verbose reporter
rkalis Dec 9, 2025
6d4660b
Fix one failing test
rkalis Dec 9, 2025
625c9af
Update to latest vitest
rkalis Dec 9, 2025
9bba6a9
Update vitest setup file(s)
rkalis Dec 9, 2025
0516946
Remove dist-test references
rkalis Dec 9, 2025
b734f27
Fix vitest extensions typing (FIXME)
rkalis Dec 11, 2025
a6e4931
Add cashscript/jest export and make TestExtensions work with jest and…
rkalis Dec 11, 2025
f957bea
Install v8 coverage provider
rkalis Dec 11, 2025
5c47e9b
Bump version to 0.12.1 and update docs
rkalis Dec 11, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,6 @@
"**.pdf",
// Do not spellcheck generated code
"**/dist/**",
"**/dist-test/**",
"**/coverage/**",
"**/build/**",
"**/.docusaurus/**",
Expand Down
1 change: 0 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
**/dist/
**/dist-test/
**/node_modules/
**/grammar/
/website/
Expand Down
3 changes: 0 additions & 3 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ module.exports = {
sourceType: 'module', // Allows for the use of imports
extraFileExtensions: ['.cjs'],
},
env: {
'jest': true,
},
rules: {
'max-len': ['error', { code: 125, ignoreStrings: true, ignoreTemplateLiterals: true }],
'import/no-cycle': 0, // Needed for AST -> AstVisitor -> AST
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/github-actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
run: yarn

- name: Run tests
run: yarn test -- -- --coverage --coverageProvider=v8
run: yarn test -- -- --coverage --coverage.provider=v8

- name: Run linter
run: yarn lint
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
lerna-debug.log
npm-debug.log
**/dist/
**/dist-test/
**/node_modules/

**/.DS_Store
Expand Down
6 changes: 3 additions & 3 deletions examples/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "cashscript-examples",
"private": true,
"version": "0.12.0",
"version": "0.12.1",
"description": "Usage examples of the CashScript SDK",
"main": "p2pkh.js",
"type": "module",
Expand All @@ -13,8 +13,8 @@
"dependencies": {
"@bitauth/libauth": "^3.1.0-next.8",
"@types/node": "^22.17.0",
"cashc": "^0.12.0",
"cashscript": "^0.12.0",
"cashc": "^0.12.1",
"cashscript": "^0.12.1",
"eslint": "^8.56.0",
"typescript": "^5.9.2"
}
Expand Down
2 changes: 1 addition & 1 deletion examples/testing-suite/artifacts/example.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@
"name": "cashc",
"version": "0.12.0"
},
"updatedAt": "2025-10-02T09:56:11.510Z"
"updatedAt": "2025-12-09T10:19:09.338Z"
}
6 changes: 0 additions & 6 deletions examples/testing-suite/jest.config.js

This file was deleted.

8 changes: 0 additions & 8 deletions examples/testing-suite/jest.setup.js

This file was deleted.

22 changes: 9 additions & 13 deletions examples/testing-suite/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "testing-suite",
"version": "0.12.0",
"version": "0.12.1",
"description": "Example project to develop and test CashScript contracts",
"main": "index.js",
"type": "module",
Expand All @@ -13,28 +13,24 @@
},
"scripts": {
"build": "yarn clean && yarn compile",
"build:test": "yarn clean:test && yarn compile:test",
"clean": "rm -rf ./dist",
"clean:test": "rm -rf ./dist-test",
"compile": "tsc -p tsconfig.json && tsx tasks/index.ts compile",
"compile:test": "tsc -p tsconfig.test.json && tsx tasks/index.ts compile",
"compile": "tsc -p tsconfig.json && yarn run task:compile",
"lint": "eslint . --ext .ts --ignore-path ../../.eslintignore",
"prepare": "yarn build",
"prepublishOnly": "yarn test && yarn lint",
"pretest": "yarn build:test",
"test": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' jest"
"task:compile": "tsx tasks/index.ts compile",
"pretest": "yarn run task:compile",
"test": "vitest run"
},
"dependencies": {
"@bitauth/libauth": "^3.1.0-next.8",
"cashc": "^0.12.0",
"cashscript": "^0.12.0",
"cashc": "^0.12.1",
"cashscript": "^0.12.1",
"url-join": "^5.0.0"
},
"devDependencies": {
"@jest/globals": "^29.7.0",
"@types/jest": "^29.5.14",
"jest": "^29.7.0",
"tsx": "^4.20.3",
"typescript": "^5.9.2"
"typescript": "^5.9.2",
"vitest": "^4.0.15"
}
}
2 changes: 1 addition & 1 deletion examples/testing-suite/test/example.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import artifact from '../artifacts/example.artifact.js';
import { Contract, MockNetworkProvider, TransactionBuilder, randomUtxo } from 'cashscript';
import 'cashscript/jest';
import 'cashscript/vitest';

describe('test example contract functions', () => {
it('should check for output logs and error messages', async () => {
Expand Down
11 changes: 8 additions & 3 deletions examples/testing-suite/tsconfig.build.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,14 @@
"target": "es2021",
"module": "esnext",
"declaration": true,
"lib": ["es2021", "dom"],
"types": ["node", "jest"],
"lib": [
"es2022",
"dom"
],
"types": [
"node",
"vitest/globals"
],
"sourceMap": true,
"strict": true,
"strictPropertyInitialization": false,
Expand All @@ -17,7 +23,6 @@
"exclude": [
"node_modules",
"dist",
"**/dist-test",
"taksks",
],
}
12 changes: 0 additions & 12 deletions examples/testing-suite/tsconfig.test.json

This file was deleted.

15 changes: 15 additions & 0 deletions examples/testing-suite/vitest.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { defineConfig } from 'vitest/config';

export default defineConfig({
root: './test',
test: {
environment: 'node',
globals: true,
testTimeout: 50000,
silent: 'passed-only',
coverage: {
provider: 'v8',
reporter: ['json-summary'],
},
},
});
23 changes: 0 additions & 23 deletions jest/log-on-fail-reporter.cjs

This file was deleted.

3 changes: 0 additions & 3 deletions jest/summary-reporter.cjs

This file was deleted.

2 changes: 0 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
"examples/testing-suite"
],
"devDependencies": {
"@jest/reporters": "^26.6.2",
"@types/jest": "^29.5.14",
"@types/node": "^22.17.0",
"@typescript-eslint/eslint-plugin": "^7.0.0",
"@typescript-eslint/parser": "^7.0.0",
Expand Down
10 changes: 0 additions & 10 deletions packages/cashc/jest.config.js

This file was deleted.

17 changes: 6 additions & 11 deletions packages/cashc/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cashc",
"version": "0.12.0",
"version": "0.12.1",
"description": "Compile Bitcoin Cash contracts to Bitcoin Cash Script or artifacts",
"keywords": [
"bitcoin",
Expand Down Expand Up @@ -39,36 +39,31 @@
"antlr": "antlr -Dlanguage=TypeScript -visitor -no-listener src/grammar/CashScript.g4",
"postantlr": "find src/grammar -type f -name 'CashScriptVisitor.ts' | xargs sed -i '' 's|\\(import .* \".*/.*\\)\";|\\1\\.js\";|g'",
"build": "yarn clean && yarn compile",
"build:test": "yarn clean:test && yarn compile:test && cpy './test/**/*.cash' ./dist-test/test",
"clean": "rm -rf ./dist",
"clean:test": "rm -rf ./dist-test",
"compile": "tsc -p tsconfig.build.json",
"compile:test": "tsc -p tsconfig.test.json",
"lint": "eslint . --ext .ts --ignore-path ../../.eslintignore",
"prepare": "yarn build",
"prepublishOnly": "yarn test && yarn lint",
"pretest": "yarn build:test",
"test": "NODE_OPTIONS='--experimental-vm-modules --no-warnings' jest"
"test": "vitest run"
},
"dependencies": {
"@bitauth/libauth": "^3.1.0-next.8",
"@cashscript/utils": "^0.12.0",
"@cashscript/utils": "^0.12.1",
"antlr4": "^4.13.2",
"commander": "^14.0.0",
"semver": "^7.7.2"
},
"devDependencies": {
"@jest/globals": "^29.7.0",
"@types/jest": "^29.5.14",
"@types/node": "^22.17.0",
"@types/semver": "^7.7.0",
"@vitest/coverage-v8": "^4.0.15",
"cpy-cli": "^5.0.0",
"eslint": "^8.54.0",
"eslint-plugin-import": "^2.31.0",
"jest": "^29.7.0",
"tsx": "^4.20.3",
"typescript": "^5.9.2",
"url-join": "^5.0.0"
"url-join": "^5.0.0",
"vitest": "^4.0.15"
},
"gitHead": "bf02a4b641d5d03c035d052247a545109c17b708"
}
2 changes: 1 addition & 1 deletion packages/cashc/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ export * from './Errors.js';
export * as utils from '@cashscript/utils';
export { compileFile, compileString } from './compiler.js';

export const version = '0.12.0';
export const version = '0.12.1';
6 changes: 4 additions & 2 deletions packages/cashc/tsconfig.build.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
{
"extends": "../../tsconfig.build.json",

"compilerOptions": {
"outDir": "./dist",
"types": [
"node",
"vitest/globals"
]
},

"include": [
"src/**/*",
],
Expand Down
12 changes: 0 additions & 12 deletions packages/cashc/tsconfig.test.json

This file was deleted.

17 changes: 17 additions & 0 deletions packages/cashc/vitest.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { defineConfig } from 'vitest/config';

export default defineConfig({
root: './test',
test: {
environment: 'node',
globals: true,
silent: 'passed-only',
include: ['**/*.{test,spec}.?(c|m)[jt]s?(x)'],
setupFiles: ['./vitest.setup.ts'],
exclude: ['**/types/**'],
coverage: {
provider: 'v8',
reporter: ['json-summary'],
},
},
});
File renamed without changes.
1 change: 1 addition & 0 deletions packages/cashscript/.npmignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
*
!dist/**
!vitest/package.json
!jest/package.json
*.map
11 changes: 0 additions & 11 deletions packages/cashscript/jest.config.js

This file was deleted.

8 changes: 0 additions & 8 deletions packages/cashscript/jest.setup.js

This file was deleted.

4 changes: 2 additions & 2 deletions packages/cashscript/jest/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"type": "module",
"types": "../dist/test/JestExtensions.d.ts",
"main": "../dist/test/JestExtensions.js"
"types": "../dist/test/TestExtensions.d.ts",
"main": "../dist/test/TestExtensions.js"
}
Loading