From def01dbfafe868166260c2d595050a9fb189d50a Mon Sep 17 00:00:00 2001
From: muhammedaltug <muhammetaltug@gmail.com>
Date: Tue, 2 Nov 2021 14:05:13 +0300
Subject: [PATCH] datatables-bs5 version update to 5 remove abp utils control
 replace-with-tilde update bs version

---
 npm/ng-packs/packages/theme-shared/package.json |  4 ++--
 npm/ng-packs/scripts/replace-with-tilde.ts      |  3 +--
 npm/packs/datatables.net-bs5/package.json       |  4 ++--
 npm/replace-with-tilde.js                       | 12 ++++++------
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json
index 3e79dbc3d1..384318db79 100644
--- a/npm/ng-packs/packages/theme-shared/package.json
+++ b/npm/ng-packs/packages/theme-shared/package.json
@@ -9,10 +9,10 @@
   "dependencies": {
     "@abp/ng.core": "~5.0.0-beta.2",
     "@fortawesome/fontawesome-free": "^5.15.4",
-    "@ng-bootstrap/ng-bootstrap": "^7.0.0",
+    "@ng-bootstrap/ng-bootstrap": "^11.0.0-beta.2",
     "@ngx-validate/core": "^0.0.13",
     "@swimlane/ngx-datatable": "^19.0.0",
-    "bootstrap": "~4.6.0",
+    "bootstrap": "^5.1.1",
     "tslib": "^2.0.0"
   },
   "publishConfig": {
diff --git a/npm/ng-packs/scripts/replace-with-tilde.ts b/npm/ng-packs/scripts/replace-with-tilde.ts
index d4f119582f..e4dd79baad 100644
--- a/npm/ng-packs/scripts/replace-with-tilde.ts
+++ b/npm/ng-packs/scripts/replace-with-tilde.ts
@@ -1,4 +1,3 @@
-import execa from 'execa';
 import fse from 'fs-extra';
 import glob from 'glob';
 
@@ -10,7 +9,7 @@ async function replace(filePath: string) {
   if (!dependencies) return;
 
   Object.keys(dependencies).forEach(key => {
-    if (key.includes('@abp/') && key !== '@abp/utils') {
+    if (key.includes('@abp/')) {
       dependencies[key] = dependencies[key].replace('^', '~');
     }
   });
diff --git a/npm/packs/datatables.net-bs5/package.json b/npm/packs/datatables.net-bs5/package.json
index a3180d63d6..d855632b5b 100644
--- a/npm/packs/datatables.net-bs5/package.json
+++ b/npm/packs/datatables.net-bs5/package.json
@@ -1,11 +1,11 @@
 {
-  "version": "4.4.0",
+  "version": "5.0.0-beta.2",
   "name": "@abp/datatables.net-bs5",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@abp/datatables.net": "~4.4.0",
+    "@abp/datatables.net": "~5.0.0-beta.2",
     "datatables.net-bs5": "^1.10.25"
   },
   "gitHead": "bb4ea17d5996f01889134c138d00b6c8f858a431"
diff --git a/npm/replace-with-tilde.js b/npm/replace-with-tilde.js
index 34438f4f5f..d7e7869647 100644
--- a/npm/replace-with-tilde.js
+++ b/npm/replace-with-tilde.js
@@ -1,5 +1,5 @@
-const glob = require('glob');
-const fse = require('fs-extra');
+const glob = require("glob");
+const fse = require("fs-extra");
 
 function replace(filePath) {
   const pkg = fse.readJsonSync(filePath);
@@ -9,17 +9,17 @@ function replace(filePath) {
   if (!dependencies) return;
 
   Object.keys(dependencies).forEach((key) => {
-    if (key.includes('@abp/') && key !== '@abp/utils') {
-      dependencies[key] = dependencies[key].replace('^', '~');
+    if (key.includes("@abp/")) {
+      dependencies[key] = dependencies[key].replace("^", "~");
     }
   });
 
   fse.writeJsonSync(filePath, { ...pkg, dependencies }, { spaces: 2 });
 }
 
-glob('./packs/**/package.json', {}, (er, files) => {
+glob("./packs/**/package.json", {}, (er, files) => {
   files.forEach((path) => {
-    if (path.includes('node_modules')) {
+    if (path.includes("node_modules")) {
       return;
     }