Bindu |add npm dependencies instead of fetching it from cdnjs (#1022)

* Bindu |add npm dependencies instead of fetching it from cdnjs * Bindu | Added html2pdf.bundle.min.js in the lib folder to fix Uglification failed error * Bindu | Ignore lib folder for Uglify task
Bahmni · Nov 14, 2024 · 6f468f7 · 6f468f7
1 parent 2f7ca8c
commit 6f468f7
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 9 deletions.
diff --git a/ui/Gruntfile.js b/ui/Gruntfile.js
@@ -64,6 +64,10 @@ module.exports = function (grunt) {
         'components/crypto-js/crypto-js.js',
         'components/jquery-ui/ui/minified/jquery-ui.custom.min.js',
         'components/angular-ivh-treeview/dist/ivh-treeview.min.js',
+        'components/html2pdf/dist/html2pdf.bundle.min.js',
+        'components/pdfmake/build/pdfmake.min.js',
+        'components/pdfmake/build/vfs_fonts.js',
+        'components/html2canvas/build/html2canvas.min.js',
         'micro-frontends-dist/*.min.js'
     ];
 
@@ -486,7 +490,7 @@ module.exports = function (grunt) {
             files: {
                 expand: true,
                 cwd: '<%= yeoman.dist %>',
-                src: ['**/*.min.*.js', '!micro-frontends-dist/**/*.js'],
+                src: ['**/*.min.*.js', '!micro-frontends-dist/**/*.js', '!lib/**/*.js'],
                 dest: '<%= yeoman.dist %>'
             }
         },

diff --git a/ui/app/clinical/index.html b/ui/app/clinical/index.html
@@ -44,8 +44,6 @@ <h3 class="close" ng-click="closeTeleConsultation()">
         </div>
         <link rel="stylesheet" href="../components/offline/themes/{{getLocaleCSS()}}.css">
 
-        <script src='https://meet.jit.si/external_api.js'></script>
-
         <script src="../components/jquery/jquery.min.js"></script>
         <script src="../lib/jquery/jquery-ui-1.10.4.custom.min.js"></script>
         <script src="../lib/modernizr.custom.80690.js"></script>
@@ -81,6 +79,16 @@ <h3 class="close" ng-click="closeTeleConsultation()">
         <script src="../components/angular-file-upload/dist/angular-file-upload.min.js"></script>
         <script src="../components/angular-elastic/elastic.js"></script>
         <script src="../lib/angular-workers/dist/angular-workers.js"></script>
+        <script src="../lib/jitsi-meet/external_api.js"></script>
+        <script src="../lib/html2pdf/html2pdf.bundle.min.js"></script>
+
+
+
+        <!-- HTML to PDF -->
+
+        <script src="../components/pdfmake/build/pdfmake.min.js"></script>
+        <script src="../components/pdfmake/build/vfs_fonts.js"></script>
+        <script src="../components/html2canvas/build/html2canvas.min.js"></script>
 
         <!-- Adding react since an micro-frontend will be used -->
         <script src="../components/react/react.production.min.js"></script>
@@ -567,10 +575,5 @@ <h3 class="close" ng-click="closeTeleConsultation()">
         <script src="/implementation_config/openmrs/apps/clinical/formConditions.js"></script>
         <script src="/bahmni_config/openmrs/apps/clinical/common/diagnosisServiceConfig.js"></script>
 
-        <!-- HTML to PDF -->
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/html2pdf.js/0.10.1/html2pdf.bundle.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.41/pdfmake.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/html2canvas/0.4.1/html2canvas.min.js"></script>
     </body>
 </html>
diff --git a/ui/app/lib/html2pdf/html2pdf.bundle.min.js b/ui/app/lib/html2pdf/html2pdf.bundle.min.js
diff --git a/ui/app/lib/jitsi-meet/external_api.js b/ui/app/lib/jitsi-meet/external_api.js
diff --git a/ui/package.json b/ui/package.json
@@ -32,6 +32,7 @@
     "@bower_components/fastclick": "ftlabs/fastclick#1.0.2",
     "@bower_components/fullcalendar": "fullcalendar/fullcalendar#~2.7.1",
     "@bower_components/fullcalendar-scheduler": "fullcalendar/fullcalendar-scheduler#1.3.2",
+
     "@bower_components/jquery": "jquery/jquery-dist#1.9.1",
     "@bower_components/jquery-ui": "components/jqueryui#1.10.2",
     "@bower_components/jquery.cookie": "carhartl/jquery-cookie#1.4.0",
@@ -50,7 +51,9 @@
     "@bower_components/purl": "allmarkedup/purl#2.3.1",
     "@bower_components/select2": "ivaynberg/select2#~3.4",
     "@bower_components/stacktrace-js": "stacktracejs/stacktrace.js#0.6.4",
-    "@bower_components/zeroclipboard": "zeroclipboard/zeroclipboard#~2.1.0"
+    "@bower_components/zeroclipboard": "zeroclipboard/zeroclipboard#~2.1.0",
+    "@bower_components/pdfmake": "bpampuch/pdfmake#~0.1.41",
+    "@bower_components/html2canvas": "niklasvh/html2canvas#~0.4.1"
   },
   "devDependencies": {
     "@bower_components/Cortana": "Yago31/Cortana#~1.2.6",

diff --git a/ui/test/config/karma.conf.js b/ui/test/config/karma.conf.js
@@ -49,6 +49,8 @@ module.exports = function (config) {
             'app/components/angular-translate-loader-static-files/angular-translate-loader-static-files.js',
             'app/components/hustle/hustle.js',
             'app/lib/modernizr.custom.80690.js',
+            'app/lib/jitsi-meet/external_api.js',
+            'app/lib/html2pdf/html2pdf.bundle.min.js',
             'app/lib/angular-workers/dist/angular-workers.js',
             'app/common/constants.js',
             'app/common/util/init.js',