Skip to content

Commit 6538a18

Browse files
authored
Merge pull request #129 from nivekcode/feature/angular21
feat(deps) bump per dep versions
2 parents e1dcb66 + a7d3910 commit 6538a18

File tree

11 files changed

+6942
-6766
lines changed

11 files changed

+6942
-6766
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,12 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout
14+
uses: actions/checkout@v4
15+
- name: Setup Node.js
1416
uses: actions/setup-node@v4
1517
with:
16-
node-version: 20
18+
node-version: 22
19+
cache: 'npm'
1720
- name: Install node modules
1821
run: npm ci
1922
- name: Test

.github/workflows/release.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,22 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- name: Checkout
11-
uses: actions/checkout@v3
11+
uses: actions/checkout@v4
1212
with:
1313
persist-credentials: false
14-
- name: Install Node & NPM
14+
- name: Setup Node.js
1515
uses: actions/setup-node@v4
1616
with:
17-
node-version: 20
17+
node-version: 22
18+
cache: 'npm'
1819
- name: Install node_modules
1920
run: npm ci
2021
- name: Test
2122
run: npm run test
2223
- name: Build
2324
run: npm run build
2425
- name: Release
25-
uses: cycjimmy/semantic-release-action@v3
26+
uses: cycjimmy/semantic-release-action@v4
2627
env:
2728
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
2829
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

jest.base.config.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
module.exports = {
22
preset: 'jest-preset-angular',
33
setupFilesAfterEnv: ['<rootDir>/../../setupJest.ts'],
4-
globalSetup: 'jest-preset-angular/global-setup',
4+
testEnvironmentOptions: {
5+
customExportConditions: ['node', 'node-addons'],
6+
},
57
};

package-lock.json

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

package.json

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ng-sortgrid",
3-
"version": "18.0.0",
3+
"version": "21.0.0",
44
"scripts": {
55
"ng": "ng",
66
"start": "ng serve",
@@ -51,27 +51,25 @@
5151
"@semantic-release/exec": "^6.0.3",
5252
"@semantic-release/git": "^10.0.1",
5353
"@semantic-release/npm": "^12.0.1",
54-
"@types/jest": "^29.5.12",
54+
"@types/jest": "^30.0.0",
5555
"@types/node": "^20.11.27",
5656
"@typescript-eslint/eslint-plugin": "^7.2.0",
5757
"@typescript-eslint/parser": "^7.2.0",
5858
"codecov": "^3.8.2",
59-
"codelyzer": "^6.0.2",
6059
"copyfiles": "^2.4.1",
6160
"eslint": "^8.57.0",
6261
"husky": "^4.2.5",
6362
"import-conductor": "^2.6.1",
64-
"jest": "^29.7.0",
65-
"jest-preset-angular": "^14.4.2",
63+
"jest": "^30.2.0",
64+
"jest-environment-jsdom": "^30.2.0",
65+
"jest-preset-angular": "^16.1.1",
6666
"lint-staged": "^15.2.7",
6767
"ng-packagr": "^21.0.0",
6868
"prettier": "^3.2.5",
69-
"protractor": "~7.0.0",
7069
"replace-json-property": "^1.9.0",
71-
"ts-jest": "^29.1.2",
70+
"ts-jest": "^29.4.6",
7271
"ts-node": "~10.9.2",
73-
"tslint": "~6.1.0",
74-
"typescript": "^5.6.3"
72+
"typescript": "^5.9.3"
7573
},
7674
"private": true,
7775
"license": "MIT",

projects/ng-sortgrid-demo/tsconfig.app.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../../out-tsc/app",
5+
"skipLibCheck": true,
56
"types": []
67
},
78
"files": [

projects/ng-sortgrid/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"name": "ng-sortgrid",
3-
"version": "20.0.0",
3+
"version": "21.0.0",
44
"license": "MIT",
55
"peerDependencies": {
6-
"@angular/common": "^20.0.0",
7-
"@angular/core": "^20.0.0"
6+
"@angular/common": "^21.0.0",
7+
"@angular/core": "^21.0.0"
88
},
99
"repository": {
1010
"type": "git",

projects/ng-sortgrid/tsconfig.lib.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"inlineSources": true,
1111
"experimentalDecorators": true,
1212
"importHelpers": true,
13+
"skipLibCheck": true,
1314
"types": [],
1415
"lib": [
1516
"dom",

projects/ng-sortgrid/tsconfig.spec.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"extends": "../../tsconfig.json",
33
"compilerOptions": {
44
"outDir": "../../out-tsc/spec",
5+
"skipLibCheck": true,
56
"types": [
67
"jest",
78
"node"

setupJest.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
import 'jest-preset-angular/setup-jest';
1+
// Load Angular compiler for JIT compilation during testing
2+
import '@angular/compiler';

0 commit comments

Comments
 (0)