From e705f2d3242b981b4ee1d65a56c3436a8bc36b96 Mon Sep 17 00:00:00 2001 From: sumeyye Date: Fri, 14 Feb 2025 15:23:12 +0300 Subject: [PATCH 1/2] fix: move extra eslint dependencies to `peerDependencies` --- templates/app-nolayers/angular/package.json | 6 ++++-- templates/app/angular/package.json | 6 ++++-- templates/module/angular/package.json | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/templates/app-nolayers/angular/package.json b/templates/app-nolayers/angular/package.json index bc626f80d0..411529c35b 100644 --- a/templates/app-nolayers/angular/package.json +++ b/templates/app-nolayers/angular/package.json @@ -38,10 +38,8 @@ "devDependencies": { "@abp/ng.schematics": "~9.0.5", "@angular-devkit/build-angular": "~18.1.0", - "@angular-eslint/builder": "~18.1.0", "@angular-eslint/eslint-plugin": "~18.1.0", "@angular-eslint/eslint-plugin-template": "~18.1.0", - "@angular-eslint/schematics": "~18.1.0", "@angular-eslint/template-parser": "~18.1.0", "@angular/cli": "~18.1.0", "@angular/compiler-cli": "~18.1.0", @@ -58,5 +56,9 @@ "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.7.0", "typescript": "~5.5.0" + }, + "peerDependencies": { + "@angular-eslint/builder": "~18.1.0", + "@angular-eslint/schematics": "~18.1.0" } } diff --git a/templates/app/angular/package.json b/templates/app/angular/package.json index bc626f80d0..411529c35b 100644 --- a/templates/app/angular/package.json +++ b/templates/app/angular/package.json @@ -38,10 +38,8 @@ "devDependencies": { "@abp/ng.schematics": "~9.0.5", "@angular-devkit/build-angular": "~18.1.0", - "@angular-eslint/builder": "~18.1.0", "@angular-eslint/eslint-plugin": "~18.1.0", "@angular-eslint/eslint-plugin-template": "~18.1.0", - "@angular-eslint/schematics": "~18.1.0", "@angular-eslint/template-parser": "~18.1.0", "@angular/cli": "~18.1.0", "@angular/compiler-cli": "~18.1.0", @@ -58,5 +56,9 @@ "karma-jasmine": "~4.0.0", "karma-jasmine-html-reporter": "^1.7.0", "typescript": "~5.5.0" + }, + "peerDependencies": { + "@angular-eslint/builder": "~18.1.0", + "@angular-eslint/schematics": "~18.1.0" } } diff --git a/templates/module/angular/package.json b/templates/module/angular/package.json index d3d368045e..a62be8976e 100644 --- a/templates/module/angular/package.json +++ b/templates/module/angular/package.json @@ -38,10 +38,8 @@ "devDependencies": { "@abp/ng.schematics": "~9.0.5", "@angular-devkit/build-angular": "~18.1.0", - "@angular-eslint/builder": "~18.1.0", "@angular-eslint/eslint-plugin": "~18.1.0", "@angular-eslint/eslint-plugin-template": "~18.1.0", - "@angular-eslint/schematics": "~18.1.0", "@angular-eslint/template-parser": "~18.1.0", "@angular/cli": "~18.1.0", "@angular/compiler-cli": "~18.1.0", @@ -60,5 +58,9 @@ "ng-packagr": "~17.3.0", "symlink": "^2.0.0", "typescript": "~5.5.0" + }, + "peerDependencies": { + "@angular-eslint/builder": "~18.1.0", + "@angular-eslint/schematics": "~18.1.0" } } From 9bb957392ad0d743386750c251d6e2035a61f53d Mon Sep 17 00:00:00 2001 From: maliming Date: Sat, 15 Feb 2025 14:53:33 +0800 Subject: [PATCH 2/2] Remove `datatables.net` compatible code. --- .../DatatablesNet/DatatablesNetScriptContributor.cs | 10 +--------- npm/packs/datatables.net/abp.resourcemapping.js | 3 +-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/DatatablesNet/DatatablesNetScriptContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/DatatablesNet/DatatablesNetScriptContributor.cs index 2ad3bb2bdb..b266f4f010 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/DatatablesNet/DatatablesNetScriptContributor.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/DatatablesNet/DatatablesNetScriptContributor.cs @@ -10,14 +10,6 @@ public class DatatablesNetScriptContributor : BundleContributor { public override void ConfigureBundle(BundleConfigurationContext context) { - if (context.FileProvider.GetFileInfo("/libs/datatables.net/js/dataTables.min.js").Exists) - { - context.Files.AddIfNotContains("/libs/datatables.net/js/dataTables.min.js"); - } - else - { - //TODO: Compatible code, Remove it after 8.3 rc1. - context.Files.AddIfNotContains("/libs/datatables.net/js/jquery.dataTables.js"); - } + context.Files.AddIfNotContains("/libs/datatables.net/js/dataTables.min.js"); } } diff --git a/npm/packs/datatables.net/abp.resourcemapping.js b/npm/packs/datatables.net/abp.resourcemapping.js index 4c5147ec27..9539610811 100644 --- a/npm/packs/datatables.net/abp.resourcemapping.js +++ b/npm/packs/datatables.net/abp.resourcemapping.js @@ -1,6 +1,5 @@ module.exports = { mappings: { - "@node_modules/datatables.net/js/dataTables.min.js": "@libs/datatables.net/js/", - "@node_modules/datatables.net/js/jquery.dataTables.js": "@libs/datatables.net/js/" //TODO: Compatible code, Remove it after 8.3 rc1. + "@node_modules/datatables.net/js/dataTables.min.js": "@libs/datatables.net/js/" } } \ No newline at end of file