Merge pull request #19 from nboisteault/update-mapbuilder

Update mapbuilder dependencies
3liz · Apr 1, 2021 · e024f10 · e024f10
2 parents a7449e0 + 3f7cd4c
commit e024f10
Show file tree

Hide file tree

Showing 13 changed files with 1,052 additions and 3,642 deletions.
diff --git a/mapBuilder/www/js/dist/jspdf.js b/mapBuilder/www/js/dist/jspdf.js
diff --git a/mapBuilder/www/js/dist/jspdf.js.LICENSE.txt b/mapBuilder/www/js/dist/jspdf.js.LICENSE.txt
diff --git a/mapBuilder/www/js/dist/jspdf.js.map b/mapBuilder/www/js/dist/jspdf.js.map
diff --git a/mapBuilder/www/js/dist/mapbuilder.js b/mapBuilder/www/js/dist/mapbuilder.js
diff --git a/mapBuilder/www/js/dist/mapbuilder.js.map b/mapBuilder/www/js/dist/mapbuilder.js.map
diff --git a/mapBuilder/www/js/dist/mapbuilderadmin.js b/mapBuilder/www/js/dist/mapbuilderadmin.js
diff --git a/mapBuilder/www/js/dist/mapbuilderadmin.js.map b/mapBuilder/www/js/dist/mapbuilderadmin.js.map
diff --git a/mapBuilder/www/js/dist/vendors~jspdf.bundle.js b/mapBuilder/www/js/dist/vendors~jspdf.bundle.js
diff --git a/mapBuilder/www/js/dist/vendors~jspdf.bundle.js.map b/mapBuilder/www/js/dist/vendors~jspdf.bundle.js.map
diff --git a/mapBuilder/www/js/package-lock.json b/mapBuilder/www/js/package-lock.json
diff --git a/mapBuilder/www/js/package.json b/mapBuilder/www/js/package.json
@@ -9,12 +9,11 @@
   "devDependencies": {
     "css-loader": "^3.5.3",
     "style-loader": "^1.2.1",
-    "webpack": "^4.44.1",
-    "webpack-cli": "^4.2.0",
-    "webpack-merge": "^4.2.2"
+    "webpack": "^5.28.0",
+    "webpack-cli": "^4.6.0"
   },
   "dependencies": {
-    "jspdf": "^1.5.3",
+    "jspdf": "^2.3.1",
     "ol": "^6.3.1"
   }
 }
diff --git a/mapBuilder/www/js/webpack.dev.js b/mapBuilder/www/js/webpack.dev.js
@@ -7,11 +7,6 @@ module.exports = {
     mapbuilder: './main.js',
     mapbuilderadmin: './mainadmin.js'
   },
-  output: {
-    path: __dirname+'/dist/',
-    chunkFilename: '[name].bundle.js',
-    filename: '[name].js'
-  },
   module: {
     rules: [
       {

diff --git a/mapBuilder/www/js/webpack.prod.js b/mapBuilder/www/js/webpack.prod.js
@@ -7,11 +7,6 @@ module.exports = {
     mapbuilder: './main.js',
     mapbuilderadmin: './mainadmin.js'
   },
-  output: {
-    path: __dirname+'/dist/',
-    chunkFilename: '[name].bundle.js',
-    filename: '[name].js'
-  },
   module: {
     rules: [
       {
@@ -21,7 +16,10 @@ module.exports = {
     ],
   },
   externals: {
-      jquery: 'jQuery'
+      jquery: 'jQuery',
+      canvg: "canvg",
+      html2canvas: "html2canvas",
+      dompurify: "dompurify"
     },
   plugins: [
     new webpack.DefinePlugin({