Skip to content

Commit 6f468f7

Browse files
authored
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
1 parent 2f7ca8c commit 6f468f7

File tree

6 files changed

+26
-9
lines changed

6 files changed

+26
-9
lines changed

ui/Gruntfile.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@ module.exports = function (grunt) {
6464
'components/crypto-js/crypto-js.js',
6565
'components/jquery-ui/ui/minified/jquery-ui.custom.min.js',
6666
'components/angular-ivh-treeview/dist/ivh-treeview.min.js',
67+
'components/html2pdf/dist/html2pdf.bundle.min.js',
68+
'components/pdfmake/build/pdfmake.min.js',
69+
'components/pdfmake/build/vfs_fonts.js',
70+
'components/html2canvas/build/html2canvas.min.js',
6771
'micro-frontends-dist/*.min.js'
6872
];
6973

@@ -486,7 +490,7 @@ module.exports = function (grunt) {
486490
files: {
487491
expand: true,
488492
cwd: '<%= yeoman.dist %>',
489-
src: ['**/*.min.*.js', '!micro-frontends-dist/**/*.js'],
493+
src: ['**/*.min.*.js', '!micro-frontends-dist/**/*.js', '!lib/**/*.js'],
490494
dest: '<%= yeoman.dist %>'
491495
}
492496
},

ui/app/clinical/index.html

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,6 @@ <h3 class="close" ng-click="closeTeleConsultation()">
4444
</div>
4545
<link rel="stylesheet" href="../components/offline/themes/{{getLocaleCSS()}}.css">
4646

47-
<script src='https://meet.jit.si/external_api.js'></script>
48-
4947
<script src="../components/jquery/jquery.min.js"></script>
5048
<script src="../lib/jquery/jquery-ui-1.10.4.custom.min.js"></script>
5149
<script src="../lib/modernizr.custom.80690.js"></script>
@@ -81,6 +79,16 @@ <h3 class="close" ng-click="closeTeleConsultation()">
8179
<script src="../components/angular-file-upload/dist/angular-file-upload.min.js"></script>
8280
<script src="../components/angular-elastic/elastic.js"></script>
8381
<script src="../lib/angular-workers/dist/angular-workers.js"></script>
82+
<script src="../lib/jitsi-meet/external_api.js"></script>
83+
<script src="../lib/html2pdf/html2pdf.bundle.min.js"></script>
84+
85+
86+
87+
<!-- HTML to PDF -->
88+
89+
<script src="../components/pdfmake/build/pdfmake.min.js"></script>
90+
<script src="../components/pdfmake/build/vfs_fonts.js"></script>
91+
<script src="../components/html2canvas/build/html2canvas.min.js"></script>
8492

8593
<!-- Adding react since an micro-frontend will be used -->
8694
<script src="../components/react/react.production.min.js"></script>
@@ -567,10 +575,5 @@ <h3 class="close" ng-click="closeTeleConsultation()">
567575
<script src="/implementation_config/openmrs/apps/clinical/formConditions.js"></script>
568576
<script src="/bahmni_config/openmrs/apps/clinical/common/diagnosisServiceConfig.js"></script>
569577

570-
<!-- HTML to PDF -->
571-
<script src="https://cdnjs.cloudflare.com/ajax/libs/html2pdf.js/0.10.1/html2pdf.bundle.min.js"></script>
572-
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.41/pdfmake.min.js"></script>
573-
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.32/vfs_fonts.js"></script>
574-
<script src="https://cdnjs.cloudflare.com/ajax/libs/html2canvas/0.4.1/html2canvas.min.js"></script>
575578
</body>
576579
</html>

ui/app/lib/html2pdf/html2pdf.bundle.min.js

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ui/app/lib/jitsi-meet/external_api.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ui/package.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
"@bower_components/fastclick": "ftlabs/fastclick#1.0.2",
3333
"@bower_components/fullcalendar": "fullcalendar/fullcalendar#~2.7.1",
3434
"@bower_components/fullcalendar-scheduler": "fullcalendar/fullcalendar-scheduler#1.3.2",
35+
3536
"@bower_components/jquery": "jquery/jquery-dist#1.9.1",
3637
"@bower_components/jquery-ui": "components/jqueryui#1.10.2",
3738
"@bower_components/jquery.cookie": "carhartl/jquery-cookie#1.4.0",
@@ -50,7 +51,9 @@
5051
"@bower_components/purl": "allmarkedup/purl#2.3.1",
5152
"@bower_components/select2": "ivaynberg/select2#~3.4",
5253
"@bower_components/stacktrace-js": "stacktracejs/stacktrace.js#0.6.4",
53-
"@bower_components/zeroclipboard": "zeroclipboard/zeroclipboard#~2.1.0"
54+
"@bower_components/zeroclipboard": "zeroclipboard/zeroclipboard#~2.1.0",
55+
"@bower_components/pdfmake": "bpampuch/pdfmake#~0.1.41",
56+
"@bower_components/html2canvas": "niklasvh/html2canvas#~0.4.1"
5457
},
5558
"devDependencies": {
5659
"@bower_components/Cortana": "Yago31/Cortana#~1.2.6",

ui/test/config/karma.conf.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ module.exports = function (config) {
4949
'app/components/angular-translate-loader-static-files/angular-translate-loader-static-files.js',
5050
'app/components/hustle/hustle.js',
5151
'app/lib/modernizr.custom.80690.js',
52+
'app/lib/jitsi-meet/external_api.js',
53+
'app/lib/html2pdf/html2pdf.bundle.min.js',
5254
'app/lib/angular-workers/dist/angular-workers.js',
5355
'app/common/constants.js',
5456
'app/common/util/init.js',

0 commit comments

Comments
 (0)