Merge branch 'master' of https://github.com/101arrowz/jsPDF

Author: 101arrowz

.eslintrc.js

@@ -17,5 +17,7 @@ module.exports = {
     ecmaVersion: 2018,
     sourceType: "module"
   },
-  rules: {}
+  rules: {
+    "@typescript-eslint/no-var-requires": "off"
+  }
 };

package.json

@@ -79,6 +79,7 @@
     "regenerator-runtime": "^0.13.5",
     "requirejs": "^2.3.6",
     "rollup": "^2.18.2",
+    "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-license": "^2.1.0",
     "rollup-plugin-node-resolve": "5.2.0",
     "rollup-plugin-preprocess": "0.0.4",

rollup.config.js

@@ -1,6 +1,7 @@
 import { terser } from "rollup-plugin-terser";
 import RollupPluginPreprocess from "rollup-plugin-preprocess";
 import resolve from "rollup-plugin-node-resolve";
+import commonjs from "rollup-plugin-commonjs";
 import replace from "@rollup/plugin-replace";
 import license from "rollup-plugin-license";
 import pkg from "./package.json";
@@ -63,6 +64,7 @@ const umd = {
   external: umdExternals,
   plugins: [
     resolve(),
+    commonjs(),
     RollupPluginPreprocess({ context: { MODULE_FORMAT: "umd" } }),
     replaceVersion(),
     licenseBanner()
@@ -137,6 +139,7 @@ const umdPolyfills = {
   external: [],
   plugins: [
     resolve(),
+    commonjs(),
     license({
       banner: {
         content: { file: "./node_modules/core-js/LICENSE" }

test/deployment/esm/karma.conf.js

@@ -47,21 +47,21 @@ module.exports = config => {
     ],
 
     preprocessors: {
-      "test/deployment/esm/asyncImportHelper.js": ["rollup"],
+      "test/deployment/esm/asyncImportHelper.js": ["rollup"]
+    },
 
-      rollupPreprocessor: {
-        plugins: [resolve()],
-        output: {
-          format: "iife",
-          name: "jspdf",
-          sourcemap: "inline"
-        },
-        external: Object.keys(
-          require("../../../package.json").optionalDependencies
-        )
-      }
+    rollupPreprocessor: {
+      plugins: [resolve()],
+      output: {
+        format: "iife",
+        name: "jspdf",
+        sourcemap: "inline"
+      },
+      external: Object.keys(
+        require("../../../package.json").optionalDependencies
+      )
     },
-    
+
     browsers: ["Chrome", "Firefox"]
   });
 };

test/reference/colortype_3_indexed_multi_colour_alpha_8_bit_png.pdf

@@ -32,15 +32,17 @@ module.exports = config => {
       }
     ],
     preprocessors: {
-      "src/libs/fflate.js": ["rollup"],
-      rollupPreprocessor: {
-        plugins: [resolve()],
-        output: {
-          format: "es",
-          sourcemap: "inline"
-        }
-      },
+      "src/libs/fflate.js": ["rollup"]
     },
+
+    rollupPreprocessor: {
+      plugins: [resolve()],
+      output: {
+        format: "es",
+        sourcemap: "inline"
+      }
+    },
+
     browsers: ["Chrome", "Firefox"],
     // test results reporter to use
     // possible values: 'dots', 'progress'