html2canvas-pro 1.5.13 → 1.6.1

package/karma.conf.cjs

@@ -0,0 +1,295 @@
+// Karma configuration
+// Generated on Sat Aug 05 2017 23:42:26 GMT+0800 (Malay Peninsula Standard Time)
+
+const path = require('path');
+const simctl = require('node-simctl');
+const iosSimulator = require('appium-ios-simulator');
+const listenAddress = 'localhost';
+const port = 9876;
+
+const log = require('karma/lib/logger').create('launcher:MobileSafari');
+
+module.exports = function(config) {
+    // https://github.com/actions/virtual-environments/blob/master/images/macos/macos-10.15-Readme.md
+    const launchers = {
+        Safari_IOS_9: {
+            base: 'MobileSafari',
+            name: 'iPhone 5s',
+            platform: 'iOS',
+            sdk: '9.0'
+        },
+        Safari_IOS_10: {
+            base: 'MobileSafari',
+            name: 'iPhone 5s',
+            platform: 'iOS',
+            sdk: '10.0'
+        },
+        Safari_IOS_12: {
+            base: 'MobileSafari',
+            name: 'iPhone 5s',
+            platform: 'iOS',
+            sdk: '12.4'
+        },
+        Safari_IOS_13: {
+            base: 'MobileSafari',
+            name: 'iPhone 8',
+            platform: 'iOS',
+            sdk: '13.7'
+        },
+        Safari_IOS_14: {
+            base: 'MobileSafari',
+            name: 'iPhone 8',
+            platform: 'iOS',
+            sdk: '14.4'
+        },
+        Safari_IOS_15_0: {
+            base: 'MobileSafari',
+            name: 'iPhone 13',
+            platform: 'iOS',
+            sdk: '15.0'
+        },
+        Safari_IOS_15: {
+            base: 'MobileSafari',
+            name: 'iPhone 13',
+            platform: 'iOS',
+            sdk: '15.2'
+        },
+        SauceLabs_IE9: {
+            base: 'SauceLabs',
+            browserName: 'internet explorer',
+            version: '9.0',
+            platform: 'Windows 7'
+        },
+        SauceLabs_IE10: {
+            base: 'SauceLabs',
+            browserName: 'internet explorer',
+            version: '10.0',
+            platform: 'Windows 7'
+        },
+        SauceLabs_IE11: {
+            base: 'SauceLabs',
+            browserName: 'internet explorer',
+            version: '11.0',
+            platform: 'Windows 7'
+        },
+        SauceLabs_Edge18: {
+            base: 'SauceLabs',
+            browserName: 'MicrosoftEdge',
+            version: '18.17763',
+            platform: 'Windows 10'
+        },
+        SauceLabs_Android4: {
+            base: 'SauceLabs',
+            browserName: 'Browser',
+            platform: 'Android',
+            version: '4.4',
+            device: 'Android Emulator',
+        },
+        SauceLabs_iOS10_3: {
+            base: 'SauceLabs',
+            browserName: 'Safari',
+            platform: 'iOS',
+            version: '10.3',
+            device: 'iPhone 7 Plus Simulator'
+        },
+        SauceLabs_iOS9_3: {
+            base: 'SauceLabs',
+            browserName: 'Safari',
+            platform: 'iOS',
+            version: '9.3',
+            device: 'iPhone 6 Plus Simulator'
+        },
+        IE_9: {
+            base: 'IE',
+            'x-ua-compatible': 'IE=EmulateIE9',
+            flags: ['-extoff']
+        },
+        IE_10: {
+            base: 'IE',
+            'x-ua-compatible': 'IE=EmulateIE10',
+            flags: ['-extoff']
+        },
+        IE_11: {
+            base: 'IE',
+            flags: ['-extoff']
+        },
+        Safari_Stable: {
+            base: 'SafariNative'
+        },
+        Chrome_Stable: {
+            base: 'ChromeHeadless'
+        },
+        Firefox_Stable: {
+            base: 'Firefox'
+        }
+    };
+
+    const ciLauncher = launchers[process.env.TARGET_BROWSER];
+
+    const customLaunchers = ciLauncher ? {target_browser: ciLauncher} : {
+        stable_chrome: {
+            base: 'ChromeHeadless'
+        },
+        stable_firefox: {
+            base: 'Firefox'
+        }
+    };
+
+    const injectTypedArrayPolyfills = function(files) {
+        files.unshift({
+            pattern: path.resolve(__dirname, './node_modules/js-polyfills/typedarray.js'),
+            included: true,
+            served: true,
+            watched: false
+        });
+    };
+
+    injectTypedArrayPolyfills.$inject = ['config.files'];
+
+    const MobileSafari = function(baseBrowserDecorator, args) {
+        if(process.platform !== "darwin"){
+            log.error("This launcher only works in MacOS.");
+            this._process.kill();
+            return;
+        }
+        baseBrowserDecorator(this);
+        this.on('start', url => {
+            simctl.getDevices(args.sdk, args.platform).then(devices => {
+                const d = devices.find(d => {
+                    return d.name === args.name;
+                });
+
+                if (!d) {
+                    log.error(`No device found for sdk ${args.sdk} with name ${args.name}`);
+                    log.info(`Available devices:`, devices);
+                    this._process.kill();
+                    return;
+                }
+
+                return iosSimulator.getSimulator(d.udid).then(device => {
+                    return simctl.bootDevice(d.udid).then(() => device);
+                }).then(device => {
+                    return device.waitForBoot(60 * 5 * 1000).then(() => {
+                        return device.openUrl(url);
+                    });
+                });
+            }).catch(e => {
+                console.log('err,', e);
+            });
+        });
+    };
+
+    MobileSafari.prototype = {
+        name: 'MobileSafari',
+        DEFAULT_CMD: {
+            darwin: '/Applications/Xcode.app/Contents/Developer/Applications/Simulator.app/Contents/MacOS/Simulator',
+        },
+        ENV_CMD: null,
+    };
+
+    MobileSafari.$inject = ['baseBrowserDecorator', 'args'];
+
+    config.set({
+
+        // base path that will be used to resolve all patterns (eg. files, exclude)
+        basePath: '',
+
+
+        // frameworks to use
+        // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+        frameworks: ['mocha', 'inline-mocha-fix'],
+
+        // list of files / patterns to load in the browser
+        files: [
+            'build/testrunner.js',
+            { pattern: './tests/**/*', 'watched': true, 'included': false, 'served': true},
+            { pattern: './dist/**/*', 'watched': true, 'included': false, 'served': true},
+            { pattern: './node_modules/**/*', 'watched': true, 'included': false, 'served': true},
+        ],
+
+        plugins: [
+            'karma-*',
+            {
+                'framework:inline-mocha-fix': ['factory', injectTypedArrayPolyfills]
+            },
+            {
+                'launcher:MobileSafari': ['type', MobileSafari]
+            }
+        ],
+
+        // list of files to exclude
+        exclude: [
+        ],
+
+
+        // preprocess matching files before serving them to the browser
+        // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
+        preprocessors: {
+        },
+
+
+        // test results reporter to use
+        // possible values: 'dots', 'progress'
+        // available reporters: https://npmjs.org/browse/keyword/karma-reporter
+        reporters: ['dots', 'junit'],
+
+        junitReporter: {
+            outputDir: 'tmp/junit/'
+        },
+
+        // web server listen address,
+        listenAddress,
+
+        // web server port
+        port,
+
+
+        // enable / disable colors in the output (reporters and logs)
+        colors: true,
+
+
+        // level of logging
+        // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+        logLevel: config.LOG_INFO,
+
+
+        // enable / disable watching file and executing tests whenever any file changes
+        autoWatch: true,
+
+
+        // start these browsers
+        // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+        browsers: Object.keys(customLaunchers),
+
+
+        customLaunchers,
+
+        // Continuous Integration mode
+        // if true, Karma captures browsers, runs the tests and exits
+        singleRun: true,
+
+        // Concurrency level
+        // how many browser should be started simultaneous
+        concurrency: 5,
+
+        proxies: {
+            '/dist': `http://localhost:${port}/base/dist`,
+            '/node_modules': `http://localhost:${port}/base/node_modules`,
+            '/tests': `http://localhost:${port}/base/tests`,
+            '/assets': `http://localhost:${port}/base/tests/assets`
+        },
+
+        client: {
+            mocha: {
+                // change Karma's debug.html to the mocha web reporter
+                reporter: 'html'
+            }
+        },
+
+        captureTimeout: 300000,
+
+        browserDisconnectTimeout: 60000,
+
+        browserNoActivityTimeout: 1200000
+    })
+};

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "html2canvas-pro",
   "description": "Screenshots with JavaScript. Next generation!",
+  "type": "module",
   "main": "dist/html2canvas-pro.js",
   "module": "dist/html2canvas-pro.esm.js",
   "typings": "dist/types/index.d.ts",
   "browser": "dist/html2canvas-pro.js",
-  "version": "1.5.13",
+  "version": "1.6.1",
   "author": {
     "name": "yorickshan",
     "email": "yorickshan@gmail.com",
@@ -33,16 +34,19 @@
     "@rollup/plugin-typescript": "^11.1.6",
     "@types/chai": "^4.1.7",
     "@types/express": "^4.17.13",
+    "@types/filenamify-url": "^1.0.0",
     "@types/glob": "^8.1.0",
     "@types/jest": "^29.5.12",
     "@types/jest-image-snapshot": "^6.4.0",
     "@types/karma": "^6.3.0",
+    "@types/mkdirp": "^1.0.2",
     "@types/mocha": "^10.0.7",
     "@types/node": "^20.14.12",
     "@types/platform": "^1.3.4",
     "@types/promise-polyfill": "^6.0.3",
-    "@typescript-eslint/eslint-plugin": "^4.33.0",
-    "@typescript-eslint/parser": "^4.33.0",
+    "@types/serve-index": "^1.9.4",
+    "@typescript-eslint/eslint-plugin": "^8.50.0",
+    "@typescript-eslint/parser": "^8.50.0",
     "appium-ios-simulator": "^6.1.10",
     "base64-arraybuffer": "1.0.2",
     "body-parser": "^1.19.0",
@@ -51,11 +55,11 @@
     "cors": "^2.8.5",
     "cz-conventional-changelog": "^3.3.0",
     "es6-promise": "^4.2.8",
-    "eslint": "^7.32.0",
+    "eslint": "^9.13.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "4.2.1",
+    "eslint-plugin-prettier": "^5.5.4",
     "express": "^4.17.1",
-    "filenamify-url": "1.0.0",
+    "filenamify-url": "3.1.0",
     "glob": "^11.0.0",
     "husky": "^8.0.0",
     "jest": "^29.7.0",
@@ -76,11 +80,11 @@
     "mocha": "^10.7.0",
     "node-simctl": "^7.5.3",
     "platform": "^1.3.6",
-    "prettier": "^2.3.2",
+    "prettier": "^3.3.3",
     "puppeteer": "^22.12.1",
     "replace-in-file": "^3.0.0",
     "rimraf": "^6.0.1",
-    "rollup": "^2.79.1",
+    "rollup": "^4.24.2",
     "rollup-plugin-sourcemaps": "^0.6.3",
     "serve-index": "^1.9.1",
     "slash": "1.0.0",
@@ -95,21 +99,21 @@
   },
   "scripts": {
     "prebuild": "rimraf dist/ && rimraf build/ && mkdirp dist && mkdirp build",
-    "build": "tsc --module commonjs && rollup -c rollup.config.ts && npm run build:create-reftest-list && npm run build:testrunner && npm run build:minify",
-    "build:testrunner": "rollup -c tests/rollup.config.ts",
+    "build": "tsc --module commonjs && npx tsx --tsconfig tsconfig.json ./node_modules/.bin/rollup -c rollup.config.ts && npm run build:create-reftest-list && npx tsx --tsconfig tests/tsconfig.json ./node_modules/.bin/rollup -c tests/rollup.config.ts && npm run build:minify",
+    "build:testrunner": "npx tsx --tsconfig tests/tsconfig.json ./node_modules/.bin/rollup -c tests/rollup.config.ts",
     "build:minify": "uglifyjs --compress --comments /^!/ -o dist/html2canvas-pro.min.js --mangle -- dist/html2canvas-pro.js",
-    "build:reftest-result-list": "ts-node scripts/create-reftest-result-list.ts",
-    "build:create-reftest-list": "ts-node scripts/create-reftest-list.ts tests/reftests/ignore.txt build/reftests.ts",
+    "build:reftest-result-list": "npx tsx scripts/create-reftest-result-list.ts",
+    "build:create-reftest-list": "npx tsx scripts/create-reftest-list.ts tests/reftests/ignore.txt build/reftests.ts",
     "release": "sh scripts/version-upgrade.sh",
     "format": "prettier --write \"{src,tests,scripts}/**/*.ts\"",
     "lint": "eslint src/**/*.ts --max-warnings 0",
     "test": "npm run lint && npm run unittest && npm run karma",
     "unittest": "jest",
     "reftests-diff": "mkdirp tmp/snapshots && jest --roots=tests --testMatch=**/reftest-diff.ts",
-    "karma": "ts-node tests/karma",
+    "karma": "npx tsx tests/karma",
     "watch": "rollup -c rollup.config.ts -w",
-    "watch:unittest": "mocha --require ts-node/register --watch-extensions ts -w src/**/__tests__/*.ts",
-    "start": "ts-node tests/server --port=8080 --cors=8081",
+    "watch:unittest": "mocha --require tsx/register --watch-extensions ts -w src/**/__tests__/*.ts",
+    "start": "npx tsx tests/server --port=8080 --cors=8081",
     "commitlint": "commitlint --config .commitlintrc.json -e -V",
     "tag": "sh scripts/create-tag.sh",
     "prepare": "if [ \"$SKIP_PREPARE\" != \"true\" ]; then husky install; fi",

package/test-punctuation.html

@@ -1,77 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh-CN">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>中文标点符号测试</title>
-    <style>
-        body {
-            padding: 20px;
-            font-family: "Microsoft YaHei", "SimSun", sans-serif;
-        }
-        .test-case {
-            margin-bottom: 30px;
-            padding: 20px;
-            border: 1px solid #ccc;
-        }
-        .test-text {
-            font-size: 24px;
-            line-height: 1.5;
-        }
-        .result {
-            margin-top: 20px;
-            border: 1px solid #999;
-        }
-    </style>
-</head>
-<body>
-    <h1>中文标点符号错位测试</h1>
-    
-    <div class="test-case">
-        <h3>测试1：连续中文标点符号</h3>
-        <div class="test-text" id="test1">
-            《他的故事》《传世不朽》（收到的方式）
-        </div>
-        <canvas class="result" id="canvas1"></canvas>
-    </div>
-
-    <div class="test-case">
-        <h3>测试2：混合中文标点和文字</h3>
-        <div class="test-text" id="test2">
-            「你好」、「世界」、「测试」——这些都是中文标点。
-        </div>
-        <canvas class="result" id="canvas2"></canvas>
-    </div>
-
-    <div class="test-case">
-        <h3>测试3：带 letter-spacing 的中文标点</h3>
-        <div class="test-text" id="test3" style="letter-spacing: 2px;">
-            测试，，，连续标点。。。问题！！！
-        </div>
-        <canvas class="result" id="canvas3"></canvas>
-    </div>
-
-    <script src="dist/html2canvas-pro.js"></script>
-    <script>
-        async function runTest(elementId, canvasId) {
-            const element = document.getElementById(elementId);
-            const canvas = await html2canvas(element, {
-                logging: true,
-                scale: 2
-            });
-            const resultCanvas = document.getElementById(canvasId);
-            resultCanvas.width = canvas.width;
-            resultCanvas.height = canvas.height;
-            const ctx = resultCanvas.getContext('2d');
-            ctx.drawImage(canvas, 0, 0);
-        }
-
-        window.addEventListener('load', async () => {
-            await runTest('test1', 'canvas1');
-            await runTest('test2', 'canvas2');
-            await runTest('test3', 'canvas3');
-        });
-    </script>
-</body>
-</html>
-