fix: package.json con inclusione librerie per gulpfile.js

Author: lucasalva87

gulpfile.js

@@ -272,53 +272,53 @@ function leaflet() {
 }
 
 function wacom(){
-    // Librerie standard da node_modules
+    // Librerie da node_modules secondo package.json
     const vendor = [
         'clipper-lib/clipper.js',
         'js-md5/build/md5.min.js',
-        'poly2tri/dist/poly2tri.min.js',
+        'poly2tri/dist/poly2tri.js',
         'protobufjs/dist/protobuf.min.js',
         'jszip/dist/jszip.min.js',
-        'gl-matrix/gl-matrix-min.js',
+        'gl-matrix/dist/gl-matrix.min.js',
         'rbush/rbush.min.js',
+        'sjcl/sjcl.js',
+        'node-forge/dist/forge.min.js'
     ];
 
     // Modifica i percorsi per puntare a node_modules
     for (const i in vendor) {
         vendor[i] = config.nodeDirectory + '/' + vendor[i];
     }
 
-    // File specifici di Wacom che non sono in node_modules
-    // Questi devono essere disponibili nella cartella assets/src/js/wacom
+    // File specifici di Wacom che devono rimanere in assets/src
     const wacomSpecific = [
         config.development + '/' + config.paths.js + '/wacom/modules/js-ext/js-ext-min.js',
         config.development + '/' + config.paths.js + '/wacom/modules/digital-ink/digital-ink-min.js',
         config.development + '/' + config.paths.js + '/wacom/common/will/tools.js',
-        config.development + '/' + config.paths.js + '/wacom/modules/sjcl/sjcl.js',
         config.development + '/' + config.paths.js + '/wacom/common/libs/signature_sdk.js',
         config.development + '/' + config.paths.js + '/wacom/common/libs/signature_sdk_helper.js',
         config.development + '/' + config.paths.js + '/wacom/common/libs/stu-sdk.min.js',
-        config.development + '/' + config.paths.js + '/wacom/modules/node-forge/dist/forge.min.js',
         config.development + '/' + config.paths.js + '/wacom/sigCaptDialog/sigCaptDialog.js',
         config.development + '/' + config.paths.js + '/wacom/sigCaptDialog/stuCaptDialog.js'
     ];
 
     // Combina i file vendor con quelli specifici di Wacom
     const allFiles = [...vendor, ...wacomSpecific];
 
-    // Copia il file wasm nella cartella di produzione
-    gulp.src([
+    const wasmStream = gulp.src([
         config.development + '/' + config.paths.js + '/wacom/common/libs/signature_sdk.wasm'
     ])
         .pipe(gulp.dest(config.production + '/' + config.paths.js + '/wacom/'));
 
-    return gulp.src(allFiles, {
+    const jsStream = gulp.src(allFiles, {
         allowEmpty: true
     })
         .pipe(babel(config.babelOptions))
         .pipe(concat('wacom.min.js'))
         .pipe(gulpIf(!config.debug, minifyJS()))
         .pipe(gulp.dest(config.production + '/' + config.paths.js));
+
+    return merge(wasmStream, jsStream);
 }
 
 // Elaborazione dei fonts

package.json

@@ -15,6 +15,7 @@
         "chart.js": "^3.8.0",
         "ckeditor": "4.12.1",
         "ckeditor4": "ckeditor/ckeditor4-releases#full/4.22.1",
+        "clipper-lib": "^6.4.2",
         "components-jqueryui": "^1.12.1",
         "datatables.net-bs": "^1.10.15",
         "datatables.net-buttons-bs": "^1.3.1",
@@ -25,6 +26,7 @@
         "font-awesome": "^4.7.0",
         "fullcalendar-scheduler": "^6.1.5",
         "geocomplete": "^1.7.0",
+        "gl-matrix": "^3.4.3",
         "hotkeys-js": "^3.8.5",
         "html5sortable": "^0.13.2",
         "inputmask": "^3.3.9",
@@ -33,24 +35,32 @@
         "jquery-form": "^4.3.0",
         "jquery-ui-touch-punch": "^0.2.3",
         "jquery.shorten": "^1.0.0",
+        "js-md5": "^0.7.3",
+        "jszip": "^3.10.1",
         "leaflet": "^1.9.4",
         "leaflet-gesture-handling": "^1.2.2",
         "leaflet.fullscreen": "^3.0.2",
+        "merge-stream": "^2.0.0",
         "moment": "^2.18.1",
         "numeral": "^2.0.6",
         "parsleyjs": "^2.7.2",
         "pdfjs-viewer-element": "2.5.4",
+        "poly2tri": "^1.5.0",
         "popper.js": "^1.16.1",
         "protobufjs": "7.2.5",
         "pwstrength-bootstrap": "^3.0.4",
+        "rbush": "^3.0.1",
         "readmore.js": "^2.0.4",
         "select2": "^4.0.3",
         "signature_pad": "^2.3.0",
+        "sjcl": "^1.0.8",
         "smartwizard": "^4.2.2",
         "sweetalert2": "^6.11.4",
         "toastr": "^2.1.4",
         "tooltipster": "^4.2.5",
-        "ua-parser-js": "^2.0.0"
+        "ua-parser-js": "^2.0.0",
+        "ckeditor-image-to-base": "^1.0.0",
+        "node-forge": "^1.3.1"
     },
     "devDependencies": {
         "@babel/core": "^7.11.1",
@@ -77,7 +87,9 @@
         "main-bower-files": "^2.13.1",
         "md5-file": "^5.0.0",
         "sass": "^1.62.1",
-        "shelljs": ">=0.8.5"
+        "shelljs": ">=0.8.5",
+        "gulp-merge": "^0.1.1",
+        "stream": "^0.0.2"
     },
     "scripts": {
         "gulp": "gulp",