From bf8ff4bcb71ad8859fb11a30f14a6698a40768d3 Mon Sep 17 00:00:00 2001 From: Ajoymaity Date: Thu, 18 Apr 2024 11:58:05 +0530 Subject: [PATCH 01/13] Issue #ED-3717 feat: Upgrade NodeJs as 18 in mobile --- .circleci/config.yml | 2 +- .github/pull_request_template.md | 4 ++-- README.md | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 98dae94d01..6ce657c48b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2.1 jobs: build: docker: - - image: cimg/node:14.20.1 + - image: cimg/node:18.16.1 steps: - checkout - run: diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 258f4ad1cd..9325d3b419 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -17,9 +17,9 @@ Please describe the tests that you ran to verify your changes in the below check - [ ] Ran Test B **Test Configuration**: -* Node - 12.22.10 +* Node - 18.16.1 * Java - 11.0.15.1 -* Ionic - 5.7.0 +* Ionic - 7.1.5 * Cordova - 12.0.0 * Gradle - 7.0.2 diff --git a/README.md b/README.md index ff13a417d6..c64dc9226c 100644 --- a/README.md +++ b/README.md @@ -16,10 +16,10 @@ Ongoing release- [release-6.0.0](https://github.com/Sunbird-Ed/SunbirdEd-mobile- **Prerequisites:** |Package| Version | Recommended Version | |--|--|--| -[Node](https://nodejs.org/en/) | 12+ | 12.22.10 -[NPM](https://nodejs.org/en/) | 6+ | 6.14.16 +[Node](https://nodejs.org/en/) | 18+ | 18.16.1 +[NPM](https://nodejs.org/en/) | 9+ | 9.5.1 [Cordova](https://cordova.apache.org/) | 10+ | 10.1.2 -[Ionic](https://ionicframework.com/docs/intro/cli) | 5 | 5.7.0 +[Ionic](https://ionicframework.com/docs/intro/cli) | 7 | 7.1.5 [Java(For Android)](https://www.oracle.com/in/java/technologies/downloads/) | 11+ | 11.0.15.1 [Gradle(For Android)](https://gradle.org/install/) | 7+ | 7.0.2 [CocoaPods(For Ios)](https://cocoapods.org/) | 1.11.3 | @@ -178,8 +178,8 @@ Configure the tabs page according to the requirement. Fllowing are the configura --------------------------------------- ## IOS Development setup ## Prerequisites - 1. Node js version 14.20.1 - 2. Ionic 5.4.16 using `npm i ionic@5.4.16 -g` + 1. Node js version 18.16.1 + 2. Ionic 7.1.5 using `npm i ionic@7.1.5 -g` 3. Cordova 11.0.0 using `npm i cordova@9.0.0 -g` 4. cordova-res 0.15.3 - using `npm install -g cordova-res` 5. ios-deploy 1.11.4 - using `brew install ios-deploy` From f80c8c9dc122579dbd4f0fa5eee4b0dd0adf96a6 Mon Sep 17 00:00:00 2001 From: Ajoymaity Date: Thu, 18 Apr 2024 17:50:21 +0530 Subject: [PATCH 02/13] Issue #ED-3717 fix: Added python in npm i --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index b5f77e4e67..8249cb0ec2 100755 --- a/build.sh +++ b/build.sh @@ -19,7 +19,7 @@ SUNBIRD_CORDOVA_COUNTER=0 # Pass build branch as input buildBranch="$1" -rm package-lock.json && npm install +rm package-lock.json && npm install --python=/usr/bin/python3.6 export CORDOVA_ANDROID_GRADLE_DISTRIBUTION_URL="https\://services.gradle.org/distributions/gradle-7.5.1-all.zip" file="./build_config" From 63f96b788e1a1e3b18790e354842a7d2f1309f97 Mon Sep 17 00:00:00 2001 From: Ajoymaity Date: Fri, 19 Apr 2024 11:36:07 +0530 Subject: [PATCH 03/13] Issue #ED-3717 fix: update port --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 8249cb0ec2..65e1532263 100755 --- a/build.sh +++ b/build.sh @@ -50,7 +50,7 @@ done rm -rf platforms #Temporary Workaround to generate build as webpack was complaining of Heap Space #need to inspect on webpack dependdencies at the earliest -NODE_OPTIONS=--max-old-space-size=4096 ionic cordova platforms add android@12.0.0 +NODE_OPTIONS=--max-old-space-size=8096 ionic cordova platforms add android@12.0.0 npm run ionic-build From 2c6e826e1ba41aeb77657c2a08eb8569bffc05b6 Mon Sep 17 00:00:00 2001 From: Ajoymaity Date: Fri, 19 Apr 2024 12:15:07 +0530 Subject: [PATCH 04/13] Issue #ED-0000 fix: Build failed --- build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 65e1532263..5abff85fb1 100755 --- a/build.sh +++ b/build.sh @@ -52,11 +52,11 @@ rm -rf platforms #need to inspect on webpack dependdencies at the earliest NODE_OPTIONS=--max-old-space-size=8096 ionic cordova platforms add android@12.0.0 -npm run ionic-build +NODE_OPTIONS=--max-old-space-size=8096 npm run ionic-build if [ -n "$angularConfiguration" ]; then echo "$angularConfiguration" - npm run ionic-build:prod --angular-configuration=$angularConfiguration + NODE_OPTIONS=--max-old-space-size=8096 npm run ionic-build:prod --angular-configuration=$angularConfiguration else npm run ionic-build:prod --angular-configuration=production fi From 1d17a8c97753b968be091697d9e12b42481acb44 Mon Sep 17 00:00:00 2001 From: Ajoymaity Date: Fri, 19 Apr 2024 16:09:28 +0530 Subject: [PATCH 05/13] Issue #ED-3717 fix: Update dashlet --- package-lock.json | 2 +- package.json | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 44e3156816..a598674d0f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -58,7 +58,7 @@ "@project-sunbird/common-form-elements": "8.0.4", "@project-sunbird/content-player": "5.1.0", "@project-sunbird/discussions-ui": "8.0.3", - "@project-sunbird/sb-dashlet": "^8.0.1", + "@project-sunbird/sb-dashlet": "^8.0.2", "@project-sunbird/sb-notification": "^8.0.0", "@project-sunbird/sb-styles": "0.0.16", "@project-sunbird/sb-svg2pdf": "^8.0.3", diff --git a/package.json b/package.json index dd7a5409c1..be3225f8e8 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "@project-sunbird/common-form-elements": "8.0.4", "@project-sunbird/content-player": "5.1.0", "@project-sunbird/discussions-ui": "8.0.3", - "@project-sunbird/sb-dashlet": "^8.0.1", + "@project-sunbird/sb-dashlet": "^8.0.2", "@project-sunbird/sb-notification": "^8.0.0", "@project-sunbird/sb-styles": "0.0.16", "@project-sunbird/sb-svg2pdf": "^8.0.3", @@ -278,9 +278,7 @@ "cordova-plugin-openrap": {}, "cordova-plugin-webview-checker": {}, "sb-cordova-plugin-utility": {}, - "cordova-plugin-printer": { - "ANDROID_SUPPORT_V4_VERSION": "28.+" - }, + "cordova-plugin-printer": {}, "cordova-plugin-fcm-with-dependecy-updated": { "ANDROID_FIREBASE_BOM_VERSION": "26.5.0", "GRADLE_TOOLS_VERSION": "3.5.0", From 158003cf9bc445dbef5b6b08eb77aa929da2c764 Mon Sep 17 00:00:00 2001 From: Ajoymaity Date: Fri, 19 Apr 2024 16:52:21 +0530 Subject: [PATCH 06/13] Issue #ED-0000 fix: Fixed dataTables path --- angular.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/angular.json b/angular.json index 3a05f04867..5c387c5ea2 100644 --- a/angular.json +++ b/angular.json @@ -88,7 +88,7 @@ "node_modules/@project-sunbird/discussions-ui/assets/styles/global.scss", "node_modules/@project-sunbird/sunbird-video-player-web-component/styles.css", "node_modules/videojs-http-source-selector/dist/videojs-http-source-selector.css", - "node_modules/datatables.net-dt/css/jquery.dataTables.css", + "node_modules/datatables.net-dt/css/dataTables.dataTables.css", "node_modules/@project-sunbird/sb-themes/themes/themes-df.scss", "node_modules/@project-sunbird/sunbird-quml-player-web-component/styles.css", "node_modules/@project-sunbird/sunbird-pdf-player-web-component/styles.css", @@ -103,7 +103,7 @@ "node_modules/epubjs/dist/epub.js", "node_modules/katex/dist/katex.min.js", "node_modules/jquery/dist/jquery.min.js", - "node_modules/datatables.net/js/jquery.dataTables.js", + "node_modules/datatables.net/js/dataTables.js", "node_modules/video.js/dist/video.js", "node_modules/@project-sunbird/sunbird-video-player-web-component/sunbird-video-player.js", "node_modules/videojs-contrib-quality-levels/dist/videojs-contrib-quality-levels.min.js", From 0fd5f986eb0be06e0c4a1fcf7893fd33f7e3e839 Mon Sep 17 00:00:00 2001 From: Ajoymaity Date: Fri, 19 Apr 2024 17:50:58 +0530 Subject: [PATCH 07/13] Issue #ED-0000 fix: update dataTables --- package-lock.json | 53 ++++++++++++++--------------------------------- package.json | 5 ++--- 2 files changed, 18 insertions(+), 40 deletions(-) diff --git a/package-lock.json b/package-lock.json index a598674d0f..aa67b63de5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -76,8 +76,7 @@ "com.jjdltc.cordova.plugin.zip": "git+https://github.com/Sunbird-Ed/jjdltc-cordova-plugin-zip.git", "cordova-plugin-badge": "^0.8.8", "core-js": "^3.23.3", - "datatables.net-dt": "^1.13.4", - "datatables.net-fixedcolumns": "^3.3.3", + "datatables.net-fixedcolumns": "^5.0.0", "dayjs": "1.9.8", "dom-to-image": "^2.6.0", "epubjs": "^0.3.89", @@ -9931,15 +9930,6 @@ "jquery": ">=1.7" } }, - "node_modules/@project-sunbird/sb-dashlet/node_modules/datatables.net-dt": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/datatables.net-dt/-/datatables.net-dt-2.0.3.tgz", - "integrity": "sha512-1vz0QD+FoC/45J5MSuw2STzt0w6TShtT4QFFp9nLbx7LU1afds6bfVjLXTz12pg6i+2G0JFWKiErcYUSrHXvWQ==", - "dependencies": { - "datatables.net": "2.0.3", - "jquery": ">=1.7" - } - }, "node_modules/@project-sunbird/sb-dashlet/node_modules/joi": { "version": "17.4.0", "resolved": "https://registry.npmjs.org/joi/-/joi-17.4.0.tgz", @@ -14132,7 +14122,6 @@ "node_modules/cordova-plugin-android-downloadmanager": { "version": "0.5.0", "resolved": "git+ssh://git@github.com/Sunbird-Ed/sb-cordova-plugin-downloadmanager.git#c8c5c1fbbde02eb854e3e31263b22da19c270adb", - "integrity": "sha512-n/ezm/CIwIzpOC5gaJD1Adq2eNDcUN/zFugJubEDX/66bOPuRThKzv+qWdxe05TSJpAV0hYk2r3XjTSrafojUQ==", "dev": true, "license": "ISC", "dependencies": { @@ -14182,7 +14171,6 @@ "node_modules/cordova-plugin-awesome-shared-preferences": { "version": "0.1.0", "resolved": "git+ssh://git@github.com/adriano-di-giovanni/cordova-plugin-shared-preferences.git#18b00aabc61b04b16f0f4ad309e352c5c26abbcb", - "integrity": "sha512-4rThKaZyvqJ2G5vmbUS3Rm1BVlCwedhUfXGBRwaz3Zm+TgrGEaCYOQ0xVuue7zZ9d8tL1gCNfs8HKazT0MUkKQ==", "dev": true, "license": "MIT" }, @@ -14279,7 +14267,6 @@ "node_modules/cordova-plugin-code-push": { "version": "2.0.0", "resolved": "git+ssh://git@github.com/swayangjit/cordova-plugin-code-push.git#b1837910714cc9fbfffda1a7b537b93eabb5ed59", - "integrity": "sha512-tRGkSdmpydUYGpJMn3819QrdFQOdYL55DDwLjlpyv268u1DBTUBmJ/1alKwEX26j6smOWmVQIxQ70NcSfFZ5Ag==", "dev": true, "license": "MIT" }, @@ -14380,7 +14367,6 @@ "node_modules/cordova-plugin-file-transfer": { "version": "2.0.1-dev", "resolved": "git+ssh://git@github.com/shikshalokam/cordova-plugin-file-transfer.git#8b94f73a9dc43fb5dc1134366d5374e99110eadf", - "integrity": "sha512-H5OBtZD8MI4kIs7lYkTNju8vavFmyGvTG+qtIx5ZBCo/jRzrhuzSd4da/JN0uVNa8TmM7pzUUEqb6UVpfH37mQ==", "dev": true, "license": "Apache-2.0", "engines": { @@ -14495,7 +14481,6 @@ "node_modules/cordova-plugin-local-notification": { "version": "0.10.0", "resolved": "git+ssh://git@github.com/fquirin/cordova-plugin-local-notifications.git#a3b5d5f97a96950229cfe244c5d251b1a00510e9", - "integrity": "sha512-0AaxLV6PB5xTFDggoPeouiQZ2Y/eYgs/4XPf3QXc1KLVZi2pUhyDhVcUYnEFVHpZ9YPVm7GPHcpz/TnXfeUFag==", "dev": true, "engines": [ { @@ -14562,7 +14547,6 @@ "node_modules/cordova-plugin-openrap": { "version": "1.0.0", "resolved": "git+ssh://git@github.com/project-sunbird/cordova-plugin-openrap.git#cdab8ab693e4d327d23f7ca9b17b3616e65c93cc", - "integrity": "sha512-gvL8tP/A12xSFyRrZI6o/AqZw4lvzJdpH7USgj/iJQ6TPHrpEo5v1o0gTTgCIdkS97NiAcN2EplsORL4MnxnDg==", "dev": true, "license": "ISC" }, @@ -14596,13 +14580,11 @@ "node_modules/cordova-plugin-qr-scanner": { "version": "1.0.0", "resolved": "git+ssh://git@github.com/project-sunbird/cordova-plugin-qr-scanner.git#daafe1d91b216d977bfe1c2b5dea28f382247eb6", - "integrity": "sha512-WrWtVB4v4sbGuF2p2RTmdAnZzP0VPqXI7fBILL35u9PrA5wXvVxa8pv4TjG4opNnrFzrdJtN+n5VWlOaJLDq0g==", "dev": true }, "node_modules/cordova-plugin-screen-orientation": { "version": "3.0.4", "resolved": "git+ssh://git@github.com/521dimensions/cordova-plugin-screen-orientation.git#4fb9af0b6913378d02d02f5d3a999ce0a87a3580", - "integrity": "sha512-sav3bsVQMcqZdPyrH3h8lSmio0zymV/Kc/lj/RMFRlFlaPegOuZt0OfyBp3MWes/FoKPBtpPa2gcAlNwBghWiQ==", "dev": true, "license": "Apache-2.0", "engines": { @@ -14705,7 +14687,6 @@ "node_modules/cordova-zip-plugin": { "version": "1.1.0", "resolved": "git+ssh://git@github.com/Sunbird-Ed/jjdltc-cordova-plugin-zip.git#1dba5044438cda27d69738f63d1e041bf3fa7efc", - "integrity": "sha512-ecRMiA/8bGejE2GNmHEzuAufNjUTIjZ0Ohxu5xfYomCK4GSqq51tSfTTlV3mLqsGiI+CyiUgBXGuGFB57gVKIg==", "dev": true, "license": "MIT", "engines": { @@ -15344,36 +15325,36 @@ } }, "node_modules/datatables.net": { - "version": "1.10.20", - "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.10.20.tgz", - "integrity": "sha512-4E4S7tTU607N3h0fZPkGmAtr9mwy462u+VJ6gxYZ8MxcRIjZqHy3Dv1GNry7i3zQCktTdWbULVKBbkAJkuHEnQ==", + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-2.0.5.tgz", + "integrity": "sha512-Eu7z0ErFyr44hopfLQ7kyIWRdfqH2zFG93aHcnGKGrt/ICWXUsLrjUwghuN5b1pktnKzXCFYsl6Ad9WypiSNeA==", "dependencies": { "jquery": ">=1.7" } }, "node_modules/datatables.net-dt": { - "version": "1.13.4", - "resolved": "https://registry.npmjs.org/datatables.net-dt/-/datatables.net-dt-1.13.4.tgz", - "integrity": "sha512-QAvuEej/qKSiaSmSeDQ36wWO72XzFGKkd0jdiqbp+2FHAAzIk+ffsqQAwylystMoBSiO0zlcdaqHoAPa5Dy7Pg==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/datatables.net-dt/-/datatables.net-dt-2.0.3.tgz", + "integrity": "sha512-1vz0QD+FoC/45J5MSuw2STzt0w6TShtT4QFFp9nLbx7LU1afds6bfVjLXTz12pg6i+2G0JFWKiErcYUSrHXvWQ==", "dependencies": { - "datatables.net": ">=1.12.1", + "datatables.net": "2.0.3", "jquery": ">=1.7" } }, "node_modules/datatables.net-dt/node_modules/datatables.net": { - "version": "1.13.4", - "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-1.13.4.tgz", - "integrity": "sha512-yzhArTOB6tPO2QFKm1z3hA4vabtt2hRvgw8XLsT1xqEirinfGYqWDiWXlkTPTaJv2e7gG+Kf985sXkzBFlGrGQ==", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/datatables.net/-/datatables.net-2.0.3.tgz", + "integrity": "sha512-phq7jhkjIlVdahZYa2nd/yeiDgFrvT++Sily3GgztG3T7qqdAWkjtLuGA2Pv5p7XBwkJ0zwf+0KDRU54uR7WAg==", "dependencies": { "jquery": ">=1.7" } }, "node_modules/datatables.net-fixedcolumns": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/datatables.net-fixedcolumns/-/datatables.net-fixedcolumns-3.3.3.tgz", - "integrity": "sha512-xo6MeI2xc/Ufk4ffrpao+OiPo8/GPB8cO80gA6NFgYBVw6eP9pPa2NsV+gSWRVr7d3A8iZC7mUZT5WdtliNHEA==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/datatables.net-fixedcolumns/-/datatables.net-fixedcolumns-5.0.0.tgz", + "integrity": "sha512-7dTJrVDkZCicx9g//N3ufuEjvwrZpcmpjbkwrtC5LiQFCnuL/hMOiOb4CBcvTg5OiTU7VmtbBuQkeAJGs3QM5g==", "dependencies": { - "datatables.net": "^1.10.15", + "datatables.net": ">=2.0.0", "jquery": ">=1.7" } }, @@ -30168,14 +30149,12 @@ }, "node_modules/sb-cordova-plugin-customtabs": { "version": "1.0.0", - "resolved": "git+ssh://git@github.com/Sunbird-Ed/sb-cordova-plugin-customtabs.git#4cce7b0cd4cd5776fa2a99c62940b2058b693c63", - "integrity": "sha512-J8bPBNcLSUyUbVTWukL18OG4Wd9o/ub3roERTDk7F8RObLaueDFdFvD38dfRBauQuB15aWrR5BFfJ4jFGAKE1A==", + "resolved": "git+ssh://git@github.com/Sunbird-Ed/sb-cordova-plugin-customtabs.git#d5a42f84ad0259b0d21b624c8dfc4e1811f3c132", "dev": true }, "node_modules/sb-cordova-plugin-db": { "version": "0.0.1", "resolved": "git+ssh://git@github.com/Sunbird-Ed/sb-cordova-plugin-db.git#a86ab12796a30ff003d6abb121d592b7800137f4", - "integrity": "sha512-6U5RbKaBUlig7774f77afXPtqgpr6kchFLbIYFnLZ2aGLSmkgJbmknYxQZsdnnFK4XhO4TEX7vTbIqUnYVWa4Q==", "dev": true }, "node_modules/sb-cordova-plugin-sync": { diff --git a/package.json b/package.json index be3225f8e8..067cde2739 100644 --- a/package.json +++ b/package.json @@ -91,8 +91,7 @@ "com.jjdltc.cordova.plugin.zip": "git+https://github.com/Sunbird-Ed/jjdltc-cordova-plugin-zip.git", "cordova-plugin-badge": "^0.8.8", "core-js": "^3.23.3", - "datatables.net-dt": "^1.13.4", - "datatables.net-fixedcolumns": "^3.3.3", + "datatables.net-fixedcolumns": "^5.0.0", "dayjs": "1.9.8", "dom-to-image": "^2.6.0", "epubjs": "^0.3.89", @@ -400,4 +399,4 @@ "/src/app/manage-learn/" ] } -} +} \ No newline at end of file From 2aa632efc2ae3fffc44493a0e463ac42effeb7ba Mon Sep 17 00:00:00 2001 From: Ajoymaity Date: Wed, 24 Apr 2024 11:19:46 +0530 Subject: [PATCH 08/13] Issue #ED-0000 fix: Removed node 18 --- .github/pull_request_template.md | 2 +- build.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 9325d3b419..1f99af4730 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -17,7 +17,7 @@ Please describe the tests that you ran to verify your changes in the below check - [ ] Ran Test B **Test Configuration**: -* Node - 18.16.1 +* Node - 16.20.0 * Java - 11.0.15.1 * Ionic - 7.1.5 * Cordova - 12.0.0 diff --git a/build.sh b/build.sh index 5abff85fb1..5f2e7966e6 100755 --- a/build.sh +++ b/build.sh @@ -50,13 +50,13 @@ done rm -rf platforms #Temporary Workaround to generate build as webpack was complaining of Heap Space #need to inspect on webpack dependdencies at the earliest -NODE_OPTIONS=--max-old-space-size=8096 ionic cordova platforms add android@12.0.0 +ionic cordova platforms add android@12.0.0 -NODE_OPTIONS=--max-old-space-size=8096 npm run ionic-build +npm run ionic-build if [ -n "$angularConfiguration" ]; then echo "$angularConfiguration" - NODE_OPTIONS=--max-old-space-size=8096 npm run ionic-build:prod --angular-configuration=$angularConfiguration + npm run ionic-build:prod --angular-configuration=$angularConfiguration else npm run ionic-build:prod --angular-configuration=production fi From 00e87df8f8b17ba42118e08dc40c69e511c4b338 Mon Sep 17 00:00:00 2001 From: Ajoymaity Date: Wed, 24 Apr 2024 11:25:30 +0530 Subject: [PATCH 09/13] Issue #ED-0000 fix: Removed node 18 changes --- .circleci/config.yml | 2 +- .github/pull_request_template.md | 2 +- README.md | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ce657c48b..cd52c99591 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -2,7 +2,7 @@ version: 2.1 jobs: build: docker: - - image: cimg/node:18.16.1 + - image: cimg/node:16.20.0 steps: - checkout - run: diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 1f99af4730..429eed8aac 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -19,7 +19,7 @@ Please describe the tests that you ran to verify your changes in the below check **Test Configuration**: * Node - 16.20.0 * Java - 11.0.15.1 -* Ionic - 7.1.5 +* Ionic - 5.7.0 * Cordova - 12.0.0 * Gradle - 7.0.2 diff --git a/README.md b/README.md index c64dc9226c..b57f74296d 100644 --- a/README.md +++ b/README.md @@ -16,10 +16,10 @@ Ongoing release- [release-6.0.0](https://github.com/Sunbird-Ed/SunbirdEd-mobile- **Prerequisites:** |Package| Version | Recommended Version | |--|--|--| -[Node](https://nodejs.org/en/) | 18+ | 18.16.1 +[Node](https://nodejs.org/en/) | 16+ | 16.20.0 [NPM](https://nodejs.org/en/) | 9+ | 9.5.1 [Cordova](https://cordova.apache.org/) | 10+ | 10.1.2 -[Ionic](https://ionicframework.com/docs/intro/cli) | 7 | 7.1.5 +[Ionic](https://ionicframework.com/docs/intro/cli) | 5 | 5.7.0 [Java(For Android)](https://www.oracle.com/in/java/technologies/downloads/) | 11+ | 11.0.15.1 [Gradle(For Android)](https://gradle.org/install/) | 7+ | 7.0.2 [CocoaPods(For Ios)](https://cocoapods.org/) | 1.11.3 | @@ -178,8 +178,8 @@ Configure the tabs page according to the requirement. Fllowing are the configura --------------------------------------- ## IOS Development setup ## Prerequisites - 1. Node js version 18.16.1 - 2. Ionic 7.1.5 using `npm i ionic@7.1.5 -g` + 1. Node js version 16.20.0 + 2. Ionic 7.1.5 using `npm i ionic@5.7.0 -g` 3. Cordova 11.0.0 using `npm i cordova@9.0.0 -g` 4. cordova-res 0.15.3 - using `npm install -g cordova-res` 5. ios-deploy 1.11.4 - using `brew install ios-deploy` From 31a39c90bd5f024e0c10ae507e1451443c3530d6 Mon Sep 17 00:00:00 2001 From: Ajoymaity Date: Wed, 24 Apr 2024 11:36:28 +0530 Subject: [PATCH 10/13] Issue #ED-0000 fix: Added heap memory issue --- build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index 5f2e7966e6..5abff85fb1 100755 --- a/build.sh +++ b/build.sh @@ -50,13 +50,13 @@ done rm -rf platforms #Temporary Workaround to generate build as webpack was complaining of Heap Space #need to inspect on webpack dependdencies at the earliest -ionic cordova platforms add android@12.0.0 +NODE_OPTIONS=--max-old-space-size=8096 ionic cordova platforms add android@12.0.0 -npm run ionic-build +NODE_OPTIONS=--max-old-space-size=8096 npm run ionic-build if [ -n "$angularConfiguration" ]; then echo "$angularConfiguration" - npm run ionic-build:prod --angular-configuration=$angularConfiguration + NODE_OPTIONS=--max-old-space-size=8096 npm run ionic-build:prod --angular-configuration=$angularConfiguration else npm run ionic-build:prod --angular-configuration=production fi From f8dd6cfe8bbd711f353026486b0393c3c6aa2682 Mon Sep 17 00:00:00 2001 From: Ajoymaity Date: Wed, 24 Apr 2024 11:38:16 +0530 Subject: [PATCH 11/13] Issue #ED-0000 fix: Added heap memory issue --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 5abff85fb1..b5f7b31762 100755 --- a/build.sh +++ b/build.sh @@ -50,7 +50,7 @@ done rm -rf platforms #Temporary Workaround to generate build as webpack was complaining of Heap Space #need to inspect on webpack dependdencies at the earliest -NODE_OPTIONS=--max-old-space-size=8096 ionic cordova platforms add android@12.0.0 +NODE_OPTIONS=--max-old-space-size=4096 ionic cordova platforms add android@12.0.0 NODE_OPTIONS=--max-old-space-size=8096 npm run ionic-build From 27f9c0951659d84e615942ced9b37f1d2021e282 Mon Sep 17 00:00:00 2001 From: Ajoymaity Date: Wed, 22 May 2024 21:02:38 +0530 Subject: [PATCH 12/13] Issue #ED-0000 fix: Fixed player issue --- src/app/player/player.page.html | 12 ++++++------ src/app/player/player.page.ts | 17 +++++++---------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/src/app/player/player.page.html b/src/app/player/player.page.html index f530086eb4..1224b0b088 100644 --- a/src/app/player/player.page.html +++ b/src/app/player/player.page.html @@ -12,8 +12,8 @@ --> -
-
+
+
back
@@ -21,20 +21,20 @@
-
+
-
+ diff --git a/src/app/player/player.page.ts b/src/app/player/player.page.ts index 1f627f8ac8..93c5280271 100644 --- a/src/app/player/player.page.ts +++ b/src/app/player/player.page.ts @@ -68,10 +68,7 @@ export class PlayerPage implements OnInit, OnDestroy, PlayerActionHandlerDelegat cardData: any; @ViewChild('preview', { static: false }) previewElement: ElementRef; - @ViewChild('video') video: ElementRef | undefined; - @ViewChild('pdf') pdf!: ElementRef; - @ViewChild('qumlPlayer', { static: false }) qumlPlayer: ElementRef; - @ViewChild('epub') epub: ElementRef; + @ViewChild('player') player: ElementRef; constructor( @Inject('COURSE_SERVICE') private courseService: CourseService, @@ -755,7 +752,7 @@ export class PlayerPage implements OnInit, OnDestroy, PlayerActionHandlerDelegat this.playerTelemetryEvents(event.detail); }); - this.video?.nativeElement.append(videoElement); + this.player?.nativeElement.append(videoElement); }, 100); } } @@ -777,7 +774,7 @@ export class PlayerPage implements OnInit, OnDestroy, PlayerActionHandlerDelegat epubElement.addEventListener('telemetryEvent', (event) => { console.log("On telemetryEvent", event); }); - this.epub.nativeElement.append(epubElement); + this.player.nativeElement.append(epubElement); }, 100); } @@ -798,12 +795,12 @@ export class PlayerPage implements OnInit, OnDestroy, PlayerActionHandlerDelegat pdfElement.addEventListener('telemetryEvent', (event: any) => { this.playerTelemetryEvents(event.detail); }); - this.pdf.nativeElement.append(pdfElement); + this.player.nativeElement.append(pdfElement); }, 100); } async playQumlContent() { - if (this.playerType === 'sunbird-quml-player' && this.config && this.qumlPlayer) { + if (this.playerType === 'sunbird-quml-player' && this.config && this.player) { const playerConfig: any = { context: this.config.context, config: this.config.config, @@ -823,8 +820,8 @@ export class PlayerPage implements OnInit, OnDestroy, PlayerActionHandlerDelegat console.log("On telemetryEvent", event); }); - if (this.qumlPlayer && this.qumlPlayer.nativeElement) { - this.qumlPlayer.nativeElement.append(qumlElement); + if (this.player && this.player.nativeElement) { + this.player.nativeElement.append(qumlElement); } else { console.error("qumlPlayer or its native element is not available."); } From b9e245a020b37a2e1fa55342471320e35f139ac3 Mon Sep 17 00:00:00 2001 From: Ajoymaity Date: Thu, 23 May 2024 12:27:21 +0530 Subject: [PATCH 13/13] Issue #ED-0000 fix: Fixed player loading error --- package-lock.json | 131 ++++++++------------------------ package.json | 8 +- src/app/player/player.module.ts | 4 - tsconfig.json | 2 +- 4 files changed, 34 insertions(+), 111 deletions(-) diff --git a/package-lock.json b/package-lock.json index aa67b63de5..9638939f05 100644 --- a/package-lock.json +++ b/package-lock.json @@ -62,9 +62,7 @@ "@project-sunbird/sb-notification": "^8.0.0", "@project-sunbird/sb-styles": "0.0.16", "@project-sunbird/sb-svg2pdf": "^8.0.3", - "@project-sunbird/sunbird-epub-player-v9": "^5.6.0", "@project-sunbird/sunbird-epub-player-web-component": "^1.2.0", - "@project-sunbird/sunbird-pdf-player-v9": "^5.6.0", "@project-sunbird/sunbird-pdf-player-web-component": "^1.1.0", "@project-sunbird/sunbird-quml-player-web-component": "3.0.3", "@project-sunbird/sunbird-sdk": "7.0.23", @@ -86,7 +84,7 @@ "jest-preset-angular": "13.1.4", "jspdf": "^2.5.1", "jwt-decode": "^2.2.0", - "katex": "^0.11.1", + "katex": "^0.16.10", "lodash": "^4.17.21", "lodash-es": "^4.17.21", "material-design-icons": "^3.0.1", @@ -128,7 +126,7 @@ "@babel/preset-typescript": "^7.9.0", "@ionic/angular-toolkit": "^6.0.0", "@project-sunbird/sb-themes": "0.0.86", - "@project-sunbird/telemetry-sdk": "0.0.29", + "@project-sunbird/telemetry-sdk": "^1.3.0", "@types/jest": "^28.0.3", "@types/lodash": "^4.14.180", "@types/node": "12.11.5", @@ -182,7 +180,7 @@ "cordova-plugin-zip": "^3.1.0", "cordova-sqlite-storage": "^6.0.0", "cordova-zip-plugin": "github:Sunbird-Ed/jjdltc-cordova-plugin-zip", - "cordova.plugins.diagnostic": "^5.0.2", + "cordova.plugins.diagnostic": "^7.1.4", "es6-promise-plugin": "^4.2.2", "fs-extra": "^8.1.0", "ionic-plugin-keyboard": "^2.2.1", @@ -9283,11 +9281,6 @@ "rxjs": ">=6" } }, - "node_modules/@project-sunbird/client-services/node_modules/@project-sunbird/telemetry-sdk": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@project-sunbird/telemetry-sdk/-/telemetry-sdk-1.3.0.tgz", - "integrity": "sha512-9vocPJpB08/8pAXDUKQmhCiBxJ9qHxORF1+ot3kJczSnRh/K+POpAWDCR4iJ2+gWXPDE03WIWezshKpyf0RdYQ==" - }, "node_modules/@project-sunbird/client-services/node_modules/qs": { "version": "6.9.7", "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.7.tgz", @@ -10000,59 +9993,16 @@ "integrity": "sha512-+vlnoIbrgzAA+xicdebGDfyczRHpdJ3Zch7krm5ebaXkNOFiBimoRjxi2pkYe8NxoXNloMwICMJxi9pdFjJjsg==", "dev": true }, - "node_modules/@project-sunbird/sunbird-epub-player-v9": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-epub-player-v9/-/sunbird-epub-player-v9-5.6.0.tgz", - "integrity": "sha512-TP3CXN+eXonhOQl/zij1XUrb7LPBEf78J2dXYwLSxuNCSMUM5j1XuFfMsWjs5lobf9ZU6lUNEqLRYWcVh/CodA==", - "dependencies": { - "@project-sunbird/sunbird-player-sdk-v9": "5.1.0", - "tslib": "^2.0.0" - }, - "peerDependencies": { - "@angular/common": ">=14.2.12", - "@angular/core": ">=14.2.12", - "@project-sunbird/client-services": ">=3.4.8", - "@project-sunbird/sb-styles": ">=0.0.7" - } - }, "node_modules/@project-sunbird/sunbird-epub-player-web-component": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-epub-player-web-component/-/sunbird-epub-player-web-component-1.2.0.tgz", "integrity": "sha512-YeunsOyPIRkWkHqr6rGbYcjOKwTkNhrUzcSNMDh8oZ+E/LfyZ54eKtUzSR/+0wjvvOk4W8GFyG7SorSh93pAkw==" }, - "node_modules/@project-sunbird/sunbird-pdf-player-v9": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-pdf-player-v9/-/sunbird-pdf-player-v9-5.6.0.tgz", - "integrity": "sha512-pYYwCG8IRalTfxc1XpYPresB+HqmwgF6O3nORxeNfiNQTdW++/s1qvnXkk3cew4+Q4yN/hHkzXO7p3c5YNhm0g==", - "dependencies": { - "@project-sunbird/sunbird-player-sdk-v9": "5.1.0", - "tslib": "^2.0.0" - }, - "peerDependencies": { - "@angular/common": ">= 14.2.5", - "@angular/core": ">= 14.2.5", - "@project-sunbird/client-services": ">= 3.4.8", - "@project-sunbird/sb-styles": ">= 0.0.7" - } - }, "node_modules/@project-sunbird/sunbird-pdf-player-web-component": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-pdf-player-web-component/-/sunbird-pdf-player-web-component-1.1.0.tgz", "integrity": "sha512-upzGIRzRh8iOrkCFnmey/1DI9h9iyw110sXj6DluoobyonN0uXhrBwxk+oOiROGVAgm7hpTtrobGVzhGpEf40A==" }, - "node_modules/@project-sunbird/sunbird-player-sdk-v9": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-player-sdk-v9/-/sunbird-player-sdk-v9-5.1.0.tgz", - "integrity": "sha512-Vg3MXOkBC7c1px9pTX58T0wqkseLAw0kWLflA8CpttIUQYFJBxxu5wEB8z8Y5zb6zDFrykxWRbPEcbdYdfOKRw==", - "dependencies": { - "ally.js": "1.4.1" - }, - "peerDependencies": { - "@angular/common": ">= 9.1.12", - "@angular/core": ">= 9.1.12", - "@project-sunbird/sb-styles": ">= 0.0.7" - } - }, "node_modules/@project-sunbird/sunbird-quml-player-web-component": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@project-sunbird/sunbird-quml-player-web-component/-/sunbird-quml-player-web-component-3.0.3.tgz", @@ -10144,14 +10094,9 @@ "integrity": "sha512-mYLHCYguwyNyMdc9Y8dgtPN1upu03MFS1htLPc1RuLDQ8ujHZDQCiasVurDlDVyBWEx+qxH7HeshQDngOfCHgA==" }, "node_modules/@project-sunbird/telemetry-sdk": { - "version": "0.0.29", - "resolved": "https://registry.npmjs.org/@project-sunbird/telemetry-sdk/-/telemetry-sdk-0.0.29.tgz", - "integrity": "sha512-aFCBEikBdfAfA1bSwwlFmQvzbjd2BaK9JjJ01nGN5KnwkCGwduCngkAs0ns6S1X+o0/f3qyTUkL0NB/tKZ6Pjg==", - "dev": true, - "dependencies": { - "grunt-karma": "^0.12.2", - "karma": "^3.0.0" - } + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@project-sunbird/telemetry-sdk/-/telemetry-sdk-1.3.0.tgz", + "integrity": "sha512-9vocPJpB08/8pAXDUKQmhCiBxJ9qHxORF1+ot3kJczSnRh/K+POpAWDCR4iJ2+gWXPDE03WIWezshKpyf0RdYQ==" }, "node_modules/@scarf/scarf": { "version": "1.1.1", @@ -11399,15 +11344,6 @@ "ajv": "^8.8.2" } }, - "node_modules/ally.js": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/ally.js/-/ally.js-1.4.1.tgz", - "integrity": "sha512-ZewdfuwP6VewtMN36QY0gmiyvBfMnmEaNwbVu2nTS6zRt069viTgkYgaDiqu6vRJ1VJCriNqV0jGMu44R8zNbA==", - "dependencies": { - "css.escape": "^1.5.0", - "platform": "1.3.3" - } - }, "node_modules/android-versions": { "version": "1.8.2", "resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.8.2.tgz", @@ -14699,30 +14635,21 @@ } }, "node_modules/cordova.plugins.diagnostic": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/cordova.plugins.diagnostic/-/cordova.plugins.diagnostic-5.0.2.tgz", - "integrity": "sha512-H59o7YxJ2/COzvg+jyTpUqX8QoDcvti9dluJ9a+pHumE8lf3meWemwCl0QFa9GH+xgVd6X1Ikj/6P3+DKWd9eg==", + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/cordova.plugins.diagnostic/-/cordova.plugins.diagnostic-7.1.4.tgz", + "integrity": "sha512-TMtxbe331ZyHJIYtvTmbFg5XEObuOHeoLYifhSAEcK4+RaBLzc4GhB6EkLq3I4Gb7khtB3km/5J6TsaVlAk3vQ==", "dev": true, "hasInstallScript": true, "dependencies": { - "colors": "^1.1.2", + "colors": "1.4.0", "elementtree": "^0.1.6", - "minimist": "1.2.0" - }, - "engines": { - "cordovaDependencies": { - "4.0.0": { - "cordova": ">=7.1.0", - "cordova-android": ">=6.3.0", - "cordova-ios": ">=4.3.0" - } - } + "minimist": "1.2.6" } }, "node_modules/cordova.plugins.diagnostic/node_modules/minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha512-7Wl+Jz+IGWuSdgsQEJ4JunV0si/iMhg42MnQQG6h1R6TNeVenp4U9x5CC5v/gYqz/fENLQITAWXidNtVL0NNbw==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", "dev": true }, "node_modules/core-js": { @@ -15153,11 +15080,6 @@ "url": "https://github.com/sponsors/fb55" } }, - "node_modules/css.escape": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz", - "integrity": "sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==" - }, "node_modules/cssesc": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", @@ -25088,16 +25010,28 @@ } }, "node_modules/katex": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/katex/-/katex-0.11.1.tgz", - "integrity": "sha512-5oANDICCTX0NqYIyAiFCCwjQ7ERu3DQG2JFHLbYOf+fXaMoH8eg/zOq5WSYJsKMi/QebW+Eh3gSM+oss1H/bww==", + "version": "0.16.10", + "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.10.tgz", + "integrity": "sha512-ZiqaC04tp2O5utMsl2TEZTXxa6WSC4yo0fv5ML++D3QZv/vx2Mct0mTlRx3O+uUkjfuAgOkzsCmq5MiUEsDDdA==", + "funding": [ + "https://opencollective.com/katex", + "https://github.com/sponsors/katex" + ], "dependencies": { - "commander": "^2.19.0" + "commander": "^8.3.0" }, "bin": { "katex": "cli.js" } }, + "node_modules/katex/node_modules/commander": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz", + "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==", + "engines": { + "node": ">= 12" + } + }, "node_modules/keycode": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.1.tgz", @@ -28320,11 +28254,6 @@ "node": ">= 0.4.0" } }, - "node_modules/platform": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.3.tgz", - "integrity": "sha512-VJK1SRmXBpjwsB4YOHYSturx48rLKMzHgCqDH2ZDa6ZbMS/N5huoNqyQdK5Fj/xayu3fqbXckn5SeCS1EbMDZg==" - }, "node_modules/plist": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/plist/-/plist-3.0.6.tgz", diff --git a/package.json b/package.json index 067cde2739..72a656c514 100644 --- a/package.json +++ b/package.json @@ -77,9 +77,7 @@ "@project-sunbird/sb-notification": "^8.0.0", "@project-sunbird/sb-styles": "0.0.16", "@project-sunbird/sb-svg2pdf": "^8.0.3", - "@project-sunbird/sunbird-epub-player-v9": "^5.6.0", "@project-sunbird/sunbird-epub-player-web-component": "^1.2.0", - "@project-sunbird/sunbird-pdf-player-v9": "^5.6.0", "@project-sunbird/sunbird-pdf-player-web-component": "^1.1.0", "@project-sunbird/sunbird-quml-player-web-component": "3.0.3", "@project-sunbird/sunbird-sdk": "7.0.23", @@ -101,7 +99,7 @@ "jest-preset-angular": "13.1.4", "jspdf": "^2.5.1", "jwt-decode": "^2.2.0", - "katex": "^0.11.1", + "katex": "^0.16.10", "lodash": "^4.17.21", "lodash-es": "^4.17.21", "material-design-icons": "^3.0.1", @@ -155,7 +153,7 @@ "@babel/preset-typescript": "^7.9.0", "@ionic/angular-toolkit": "^6.0.0", "@project-sunbird/sb-themes": "0.0.86", - "@project-sunbird/telemetry-sdk": "0.0.29", + "@project-sunbird/telemetry-sdk": "^1.3.0", "@types/jest": "^28.0.3", "@types/lodash": "^4.14.180", "@types/node": "12.11.5", @@ -209,7 +207,7 @@ "cordova-plugin-zip": "^3.1.0", "cordova-sqlite-storage": "^6.0.0", "cordova-zip-plugin": "github:Sunbird-Ed/jjdltc-cordova-plugin-zip", - "cordova.plugins.diagnostic": "^5.0.2", + "cordova.plugins.diagnostic": "^7.1.4", "es6-promise-plugin": "^4.2.2", "fs-extra": "^8.1.0", "ionic-plugin-keyboard": "^2.2.1", diff --git a/src/app/player/player.module.ts b/src/app/player/player.module.ts index 83ff00d9fe..a9c5876854 100644 --- a/src/app/player/player.module.ts +++ b/src/app/player/player.module.ts @@ -8,8 +8,6 @@ import { IonicModule } from '@ionic/angular'; import { PlayerPage } from './player.page'; import { CanvasPlayerService } from '../../services/canvas-player.service'; import { ScreenOrientation } from '@awesome-cordova-plugins/screen-orientation/ngx'; -import { SunbirdPdfPlayerModule } from '@project-sunbird/sunbird-pdf-player-v9'; -import { SunbirdEpubPlayerModule } from '@project-sunbird/sunbird-epub-player-v9'; @@ -26,8 +24,6 @@ const routes: Routes = [ imports: [ CommonModule, FormsModule, - SunbirdPdfPlayerModule, - SunbirdEpubPlayerModule, IonicModule, RouterModule.forChild(routes) ], diff --git a/tsconfig.json b/tsconfig.json index 6acecc05e5..2c945e58f6 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -2,7 +2,7 @@ "allowSyntheticDefaultImports": true, "compileOnSave": false, "angularCompilerOptions": { - + "enableIvy": true, "fullTemplateTypeCheck": true, "strictInjectionParameters": true },