Skip to content
This repository was archived by the owner on Feb 2, 2025. It is now read-only.

Commit 8c7fa7c

Browse files
committed
fix: upgrade ng add to DataTables v2
1 parent 263d06b commit 8c7fa7c

File tree

5 files changed

+40
-62
lines changed

5 files changed

+40
-62
lines changed

lib/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
"schematics": "./schematics/src/collection.json",
1616
"license": "MIT",
1717
"peerDependencies": {
18-
"@angular/common": "^17.0.0",
19-
"@angular/core": "^17.0.0",
20-
"@angular/platform-browser": "^17.0.0",
18+
"@angular/common": "^17.3.2",
19+
"@angular/core": "^17.3.2",
20+
"@angular/platform-browser": "^17.3.2",
2121
"datatables.net": "^2.0.3",
2222
"datatables.net-dt": "^2.0.3",
2323
"jquery": "^3.6.0",

lib/schematics/src/collection.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "../../node_modules/@angular-devkit/schematics/collection-schema.json",
2+
"$schema": "../../../node_modules/@angular-devkit/schematics/collection-schema.json",
33
"schematics": {
44
"ng-add": {
55
"description": "Adds Angular Datatables to the application without affecting any templates",

lib/schematics/src/ng-add/index.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@ function addPackageJsonDependencies(options: IADTSchematicsOptions) {
1919

2020
const dependencies = [
2121
{ version: '^3.6.0', name: 'jquery', isDev: false },
22-
{ version: '^1.11.3', name: 'datatables.net', isDev: false },
23-
{ version: '^3.5.9', name: '@types/jquery', isDev: true },
24-
{ version: '^1.10.21', name: '@types/datatables.net', isDev: true }
22+
{ version: '^2.0.3', name: 'datatables.net (v2)', isDev: false },
23+
{ version: '^3.5.9', name: '@types/jquery', isDev: true }
2524
];
2625

2726
if (styleDeps) {

package-lock.json

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

package.json

Lines changed: 18 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,14 @@
33
"version": "17.0.0",
44
"description": "Angular directive for DataTables",
55
"scripts": {
6-
"build:lib": "npm run clean && ng build angular-datatables --configuration=production && npm run schematics:build",
6+
"start": "npm run link:lib && ng serve",
7+
"build:lib": "npm run clean && ng build angular-datatables --configuration=production && npm run lib:schematics:build",
78
"clean": "rimraf -f lib/**/index.{d.ts,js,js.map,metadata.json} demo/**/*.{d.ts,js,map,metadata.json} bundles schematics/**/*.{d.ts,js,map}",
8-
"demo:test": "ng test",
9-
"demo:test-ci": "ng test --karma-config=karma-ci.conf.js --no-progress",
10-
"e2e": "ng e2e",
11-
"lint": "ng lint",
129
"link:lib": "rimraf node_modules/angular-datatables && linklocal",
13-
"ng": "ng",
14-
"start": "npm run link:lib && ng serve",
15-
"schematics:build": "tsc -p lib/schematics/tsconfig.json",
16-
"build:prod": "ng build --configuration production --aot --base-href /angular-datatables/",
10+
"demo:test": "ng test",
11+
"demo:test-ci": "ng test --no-progress",
12+
"lib:schematics:build": "tsc -p lib/schematics/tsconfig.json",
13+
"demo:build:prod": "ng build --configuration production --aot --base-href /angular-datatables/",
1714
"version": "npm run build && git add -A",
1815
"postversion": "git push && git push --tags"
1916
},
@@ -34,24 +31,21 @@
3431
"license": "MIT",
3532
"devDependencies": {
3633
"@angular-devkit/build-angular": "^17.3.2",
37-
"@angular-devkit/schematics": "^17.0.0",
38-
"@angular/animations": "^17.0.2",
34+
"@angular-devkit/schematics": "^17.3.2",
35+
"@angular/animations": "^17.3.2",
3936
"@angular/cli": "^17.3.2",
40-
"@angular/common": "^17.0.2",
41-
"@angular/compiler": "^17.0.2",
42-
"@angular/compiler-cli": "^17.3.0",
43-
"@angular/core": "^17.0.2",
44-
"@angular/forms": "^17.0.2",
45-
"@angular/language-service": "^17.0.2",
46-
"@angular/platform-browser": "^17.0.2",
47-
"@angular/platform-browser-dynamic": "^17.0.2",
48-
"@angular/router": "^17.0.2",
37+
"@angular/common": "^17.3.2",
38+
"@angular/compiler": "^17.3.2",
39+
"@angular/compiler-cli": "^17.3.2",
40+
"@angular/core": "^17.3.2",
41+
"@angular/forms": "^17.3.2",
42+
"@angular/language-service": "^17.3.2",
43+
"@angular/platform-browser": "^17.3.2",
44+
"@angular/platform-browser-dynamic": "^17.3.2",
45+
"@angular/router": "^17.3.2",
4946
"@types/jasmine": "~5.1.0",
5047
"@types/jquery": "^3.5.29",
5148
"@types/node": "^20.11.16",
52-
"canonical-path": "1.0.0",
53-
"chalk": "~4.1.2",
54-
"core-js": "^3.19.1",
5549
"jasmine-core": "~5.1.0",
5650
"jasmine-spec-reporter": "~7.0.0",
5751
"jquery": "^3.6.0",
@@ -97,8 +91,7 @@
9791
"materialize-css": "^0.100.2",
9892
"prism-themes": "^1.9.0",
9993
"prismjs": "^1.27.0",
100-
"rxjs": "~7.8.0",
101-
"rxjs-compat": "^6.6.7",
94+
"rxjs": "7.4.0",
10295
"tether": "^2.0.0",
10396
"tslib": "^2.3.0",
10497
"zone.js": "~0.14.3"

0 commit comments

Comments
 (0)