Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
node_modules
dist
coverage
.eslintrc.*
.eslintrc.*
update-core-hash.js
*.conf.js
2 changes: 2 additions & 0 deletions .eslintrc.js → .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ module.exports = {
'@typescript-eslint/no-unused-vars': 'off',
'@typescript-eslint/ban-types': 'off',
'@typescript-eslint/no-empty-function': 'off',
'@typescript-eslint/no-unsafe-function-type': 'off',
'@typescript-eslint/no-require-imports': 'off'
},
},
],
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node: ['14', '16']
node: ['18', '20', '22']
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
steps:
- name: Checkout Repo
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: '0'
- name: Setup Node
uses: actions/setup-node@v2-beta
uses: actions/setup-node@v5.0.0
with:
node-version: ${{ matrix.node }}
registry-url: 'https://registry.npmjs.org'
Expand All @@ -31,7 +31,7 @@ jobs:
run: echo "::set-output name=dir::$(yarn cache dir)"

- name: Cache Dependencies
uses: actions/cache@v2
uses: actions/cache@v3
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: |
Expand Down Expand Up @@ -60,14 +60,14 @@ jobs:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
steps:
- name: Checkout Repo
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: '0'

- name: Setup Node
uses: actions/setup-node@v2-beta
uses: actions/setup-node@v4
with:
node-version: '16'
node-version: '22'
registry-url: 'https://registry.npmjs.org'
scope: '@hirez_io'

Expand All @@ -76,7 +76,7 @@ jobs:
run: echo "::set-output name=dir::$(yarn cache dir)"

- name: Cache Dependencies
uses: actions/cache@v2
uses: actions/cache@v3
id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
with:
path: |
Expand Down
41 changes: 22 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
},
"license": "MIT",
"private": true,
"type": "module",
"scripts": {
"commit": "git-cz",
"build": "lerna run build",
Expand All @@ -25,9 +26,11 @@
"test:jest:watch": "jest -c packages/jest-given/jest.config.js --watchAll",
"update-core-hash": "node update-core-hash"
},
"workspaces": [
"packages/*"
],
"workspaces": {
"packages": [
"packages/*"
]
},
"config": {
"commitizen": {
"path": "./node_modules/cz-conventional-changelog"
Expand All @@ -46,23 +49,23 @@
]
},
"devDependencies": {
"@commitlint/cli": "17.0.3",
"@commitlint/config-conventional": "17.0.3",
"@types/node": "18.6.1",
"@typescript-eslint/eslint-plugin": "5.30.7",
"@typescript-eslint/parser": "5.30.7",
"commitizen": "4.2.5",
"@commitlint/cli": "19.8.1",
"@commitlint/config-conventional": "19.8.1",
"@types/node": "24.5.1",
"@typescript-eslint/eslint-plugin": "8.44.0",
"@typescript-eslint/parser": "8.44.0",
"commitizen": "4.3.1",
"cz-conventional-changelog": "3.3.0",
"eslint": "8.20.0",
"eslint-config-prettier": "8.5.0",
"execa": "4.0.3",
"husky": "4.2.5",
"eslint": "8.56.0",
"eslint-config-prettier": "10.1.8",
"execa": "9.6.0",
"husky": "9.1.7",
"lerna": "^3.22.1",
"npm-run-all": "^4.1.5",
"prettier": "2.7.1",
"pretty-quick": "3.1.3",
"rimraf": "^3.0.2",
"ts-node": "10.9.1",
"typescript": "4.7.4"
"npm-run-all": "4.1.5",
"prettier": "3.6.2",
"pretty-quick": "4.2.2",
"rimraf": "6.0.1",
"ts-node": "10.9.2",
"typescript": "5.9.2"
}
}
20 changes: 11 additions & 9 deletions packages/jasmine-given/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"company": "HiRez.io"
},
"description": "A jasmine addon that helps you clean up your microtests by breaking them into a Given / When / Then structure.",
"type": "module",
"keywords": [
"jasmine",
"jasmine-given",
Expand Down Expand Up @@ -44,16 +45,17 @@
"@hirez_io/karma-jasmine-given": "^1.1.2"
},
"peerDependencies": {
"jasmine-core": "< 5.x"
"jasmine-core": "<6.x"
},
"devDependencies": {
"@types/jasmine": "4.0.3",
"cpy-cli": "^3.1.1",
"jasmine": "4.3.0",
"microbundle": "^0.15.0",
"nodemon": "2.0.19",
"nyc": "15.1.0",
"source-map-support": "^0.5.21",
"tsconfig-paths": "4.0.0"
"@types/jasmine": "5.1.9",
"cpy-cli": "6.0.0",
"jasmine": "5.10.0",
"microbundle": "0.15.1",
"nodemon": "3.1.10",
"npm-run-path": "6.0.0",
"nyc": "17.1.0",
"source-map-support": "0.5.21",
"tsconfig-paths": "4.2.0"
}
}
2 changes: 1 addition & 1 deletion packages/jasmine-given/spec/jasmine-given.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
NO_SPEC_FUNCTION_ERROR,
NO_STACK_ERROR,
CONTEXT_FOR_GWT_ERROR,
} from '../../../shared/given-core/given-core';
} from '../../../shared/given-core/given-core.ts';

const root = (0, eval)('this');

Expand Down
3 changes: 2 additions & 1 deletion packages/jasmine-given/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"strict": true,
"baseUrl": ".",
"outDir": "dist",
"types": ["jasmine", "node"]
"types": ["jasmine", "node"],
"allowImportingTsExtensions": true
},
"include": ["spec"]
}
12 changes: 6 additions & 6 deletions packages/jest-given/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@
"test": "echo \n*** Run tests from the root folder\n"
},
"peerDependencies": {
"jest": "< 30.x"
"jest": "<31.x"
},
"devDependencies": {
"@types/jest": "29.5.1",
"cpy-cli": "^3.1.1",
"jest": "29.5.0",
"microbundle": "^0.15.1",
"ts-jest": "29.1.0"
"@types/jest": "30.0.0",
"cpy-cli": "6.0.0",
"jest": "30.1.3",
"microbundle": "0.15.1",
"ts-jest": "29.4.2"
}
}
2 changes: 1 addition & 1 deletion packages/jest-given/spec/jest-given.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ describe('Jest Given', () => {
function errorThrowingCall() {
(Then as any)('FAKE MESSAGE');
}
expect(errorThrowingCall).toThrowError(NO_SPEC_FUNCTION_ERROR);
expect(errorThrowingCall).toThrow(NO_SPEC_FUNCTION_ERROR);
});
});

Expand Down
Loading