Merge remote-tracking branch 'origin/rel-9.3' into issue/23485

npm/packs/utils/.npmignore

@@ -1,3 +1,4 @@
 **/*
 !dist/**/*
 !abp.resourcemapping.js
+!ngcc.config.js

npm/packs/utils/angular.json

@@ -10,7 +10,7 @@
       "prefix": "lib",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:ng-packagr",
+          "builder": "@angular-devkit/build-ng-packagr:build",
           "options": {
             "tsConfig": "projects/utils/tsconfig.lib.json",
             "project": "projects/utils/ng-package.json"
@@ -40,5 +40,6 @@
   },
   "cli": {
     "analytics": false
-  }
+  },
+  "defaultProject": "utils"
 }

npm/packs/utils/ngcc.config.js

@@ -0,0 +1,6 @@
+module.exports = {
+  entryPoints: {
+    '.': { ignore: true },
+    './dist': {},
+  },
+};

npm/packs/utils/package.json

@@ -19,36 +19,40 @@
     "directory": "npm/packs/utils"
   },
   "module": "dist/fesm2015/abp-utils.js",
+  "es2015_ivy_ngcc": "__ivy_ngcc__/dist/fesm2015/abp-utils.js",
   "es2015": "dist/fesm2015/abp-utils.js",
   "esm2015": "dist/esm2015/abp-utils.js",
+  "fesm2015_ivy_ngcc": "__ivy_ngcc__/dist/fesm2015/abp-utils.js",
   "fesm2015": "dist/fesm2015/abp-utils.js",
   "typings": "dist/abp-utils.d.ts",
   "metadata": "dist/abp-utils.metadata.json",
   "sideEffects": false,
   "devDependencies": {
-    "@angular-builders/jest": "~20.0.0",
-    "@angular-devkit/build-angular": "~20.0.0",
-    "@angular/cli": "~20.0.0",
-    "@angular/common": "~20.0.0",
-    "@angular/compiler": "~20.0.0",
-    "@angular/compiler-cli": "~20.0.0",
-    "@angular/core": "~20.0.0",
-    "@angular/platform-browser": "~20.0.0",
-    "@angular/platform-browser-dynamic": "~20.0.0",
-    "@types/fs-extra": "~11.0.0",
-    "@types/jest": "^29.0.0",
+    "@angular-builders/jest": "^9.0.0",
+    "@angular-devkit/build-ng-packagr": "~0.1000.0",
+    "@angular/cli": "~10.0.0",
+    "@angular/common": "~10.0.0",
+    "@angular/compiler": "~10.0.0",
+    "@angular/compiler-cli": "~10.0.0",
+    "@angular/core": "~10.0.0",
+    "@angular/platform-browser": "~10.0.0",
+    "@angular/platform-browser-dynamic": "~10.0.0",
+    "@types/execa": "^2.0.0",
+    "@types/fs-extra": "^8.1.0",
+    "@types/jest": "^25.1.4",
     "@types/node": "^12.11.1",
     "codelyzer": "^5.1.2",
-    "execa": "~9.6.0",
-    "fs-extra": "~9.0.0",
-    "jest": "^29.0.0",
-    "jest-preset-angular": "^13.0.0",
-    "ng-packagr": "~20.0.0",
+    "execa": "^4.0.0",
+    "fs-extra": "^9.0.0",
+    "jest": "^25.2.4",
+    "jest-preset-angular": "^8.1.2",
+    "ng-packagr": "^10.0.0",
+    "protractor": "^7.0.0",
     "ts-node": "~8.3.0",
     "tslib": "~2.0.0",
     "tslint": "^6.1.0",
-    "typescript": "~5.8.0",
-    "zone.js": "~0.15.0"
+    "typescript": "~3.9.5",
+    "zone.js": "~0.10.2"
   },
   "dependencies": {
     "just-compare": "^2.3.0"

npm/packs/utils/prepublish.js

@@ -1,11 +1,11 @@
 const fse = require('fs-extra');
-const { execaSync } = require('execa');
+const execa = require('execa');
 
 fse.copyFileSync('./package.json', './projects/utils/package.json');
 fse.copyFileSync('./README.md', './projects/utils/README.md');
 
 try {
-  execaSync('yarn', ['build'], { stdio: 'inherit' });
+  execa.sync('yarn', ['build'], { stdout: 'inherit' });
   process.exit(0);
 } catch (error) {
   console.error(error);

npm/packs/utils/projects/utils/ng-package.json

@@ -3,7 +3,8 @@
   "dest": "../../dist",
   "deleteDestPath": true,
   "lib": {
-    "entryFile": "src/public-api.ts"
+    "entryFile": "src/public-api.ts",
+    "umdId": "abp.utils.common"
   },
-  "allowedNonPeerDependencies": ["just-compare"]
+  "whitelistedNonPeerDependencies": ["just-compare"]
 }

npm/packs/utils/projects/utils/tsconfig.lib.json

@@ -9,7 +9,10 @@
     "lib": ["dom", "es2018"]
   },
   "angularCompilerOptions": {
-    "enableResourceInlining": true
+    "skipTemplateCodegen": true,
+    "strictMetadataEmit": true,
+    "enableResourceInlining": true,
+    "enableIvy": false
   },
   "exclude": ["src/test.ts", "**/*.spec.ts"]
 }