From 88ad1809acd1ce9ec45103fa69cb3e722669765b Mon Sep 17 00:00:00 2001 From: Luca Date: Tue, 2 May 2023 11:33:10 +0200 Subject: [PATCH] Fix repository pdf.js --- gulpfile.js | 12 ++++++------ package.json | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 88c917152..64bd8956f 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -344,16 +344,16 @@ function csrf() { function pdfjs() { const web = gulp.src([ - config.nodeDirectory + '/pdf.js/assets/web/**/*', - '!' + config.nodeDirectory + '/pdf.js/assets/web/cmaps/*', - '!' + config.nodeDirectory + '/pdf.js/assets/web/*.map', - '!' + config.nodeDirectory + '/pdf.js/assets/web/*.pdf', + config.nodeDirectory + '/pdf.js/lib/dist/pdfjs/web/**/*', + '!' + config.nodeDirectory + '/pdf.js/lib/dist/pdfjs/web/cmaps/*', + '!' + config.nodeDirectory + '/pdf.js/lib/dist/pdfjs/web/*.map', + '!' + config.nodeDirectory + '/pdf.js/lib/dist/pdfjs/web/*.pdf', ]) .pipe(gulp.dest(config.production + '/pdfjs/web')); const build = gulp.src([ - config.nodeDirectory + '/pdf.js/assets/build/*', - '!' + config.nodeDirectory + '/pdf.js/assets/build/*.map', + config.nodeDirectory + '/pdf.js/lib/dist/pdfjs/build/*', + '!' + config.nodeDirectory + '/pdf.js/lib/dist/pdfjs/build/*.map', ]) .pipe(gulp.dest(config.production + '/pdfjs/build')); diff --git a/package.json b/package.json index bfbd3cb30..19898840f 100755 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "bootstrap-daterangepicker": "^2.1.25", "bootstrap-maxlength": "^1.10.1", "chart.js": "^3.8.0", - "ckeditor4": "ckeditor/ckeditor-releases#full/latest", + "ckeditor4": "ckeditor/ckeditor4-releases#full/latest", "components-jqueryui": "^1.12.1", "datatables.net-bs": "^1.10.15", "datatables.net-buttons-bs": "^1.3.1", @@ -33,7 +33,7 @@ "moment": "^2.18.1", "numeral": "^2.0.6", "parsleyjs": "^2.7.2", - "pdf.js": "yii2assets/yii2-pdfjs", + "pdf.js": "intbot/ng2-pdfjs-viewer", "pwstrength-bootstrap": "^3.0.4", "select2": "^4.0.3", "select2-bootstrap-theme": "^0.1.0-beta.10", @@ -72,7 +72,7 @@ "scripts": { "gulp": "gulp", "release-OSM": "yarn run develop-OSM && php composer.phar install --no-dev && gulp release", - "develop-OSM": "yarn install && yarn run install-OSM && yarn run assets-OSM", + "develop-OSM": "yarn install --ignore-engines && yarn run install-OSM && yarn run assets-OSM", "install-OSM": "php composer.phar update", "assets-OSM": "yarn upgrade && yarn run build-OSM", "build-OSM": "gulp",