zrender-nightly 5.5.0-dev.20230325 → 5.5.0-dev.20230327

package/build/prepublish.js

@@ -0,0 +1,88 @@
+const fs = require('fs-extra');
+const chalk = require('chalk');
+const ignore = require('ignore');
+const { execSync } = require('node:child_process');
+
+console.log();
+console.log(chalk.yellowBright(`⚠️ You should have run ${chalk.bold('`npm run release`')} before running this script!`));
+console.log();
+
+// check versions in key dist files
+
+console.log(chalk.yellow('🔎 Checking versions in dist files...'));
+
+const fileVersions = [
+    'package.json',
+    'package-lock.json',
+    'dist/zrender.js',
+    'dist/zrender.min.js'
+].map(filePath => ({
+    file: filePath,
+    version: require('../' + filePath).version
+}));
+
+['lib/zrender.js', 'src/zrender.ts'].forEach(filePath => {
+    const version = fs.readFileSync(filePath, 'utf-8').match(/export (?:var|const) version = '(\S+)'/)[1];
+    fileVersions.push({
+        file: filePath,
+        version: version
+    });
+});
+
+const versions = fileVersions.map(({ file, version }) => {
+    console.log(`  ∟ The version in [${chalk.blueBright(file)}] is ${chalk.cyanBright.bold(version)}`);
+    return version;
+});
+
+if (new Set(versions).size !== 1) {
+    console.log();
+    console.error(chalk.red('❌ Version does not match! Please check and rerun the release script via:'));
+    console.log();
+    console.error(chalk.yellow('     npm run release'));
+    console.log();
+    process.exit(-1);
+}
+
+console.log();
+console.log(chalk.green('✔️ Versions are all the same.'));
+console.log();
+
+console.log(chalk.yellow('🔎 Checking unexpected files that probably shouldn\'t be published...\n'));
+
+// check if there are unexpected files that not in .npmignore
+const npmignore = fs.readFileSync('.npmignore', 'utf-8');
+const npmignorePatterns = npmignore
+    .split(/\r?\n/)
+    .filter(item => item && !item.startsWith('#'));
+
+const untrackedFiles = execSync('git ls-files --others --exclude-standard', { encoding: 'utf-8' })
+    .trim()
+    .split('\n')
+    .map(escapeOctal);
+
+if (untrackedFiles.length) {
+    const maybeUnexpectedFiles = ignore().add(npmignorePatterns).filter(untrackedFiles);
+    if (maybeUnexpectedFiles.length) {
+        console.error(chalk.red(`❌ Found ${maybeUnexpectedFiles.length} file(s) that are neither tracked by git nor ignored by .npmignore! Please double-check before publishing them to npm.`));
+        maybeUnexpectedFiles.forEach(filePath => {
+            console.log('  ∟ ' + filePath);
+        });
+        console.log();
+        process.exit(-1);
+    }
+}
+
+console.log(chalk.green('✔️ No unexpected files found.'));
+console.log();
+
+function escapeOctal(str) {
+    const matches = str.match(/(\\\d{3}){3}/g);
+    if (matches) {
+        matches.forEach(match => {
+            let encoded = '';
+            match.split('\\').forEach(code => !code || (encoded += '%' + parseInt(code, 8).toString(16)));
+            str = str.replace(match, decodeURI(encoded));
+        });
+    }
+    return str;
+}

package/dist/zrender.js

@@ -7238,7 +7238,7 @@
     function registerPainter(name, Ctor) {
         painterCtors[name] = Ctor;
     }
-    var version = '5.5.0-dev.20230325';
+    var version = '5.5.0-dev.20230327';
 
     var STYLE_MAGIC_KEY = '__zr_style_' + Math.round((Math.random() * 10));
     var DEFAULT_COMMON_STYLE = {
@@ -12791,16 +12791,19 @@
             }
         }
     }
-    function isLatin(ch) {
+    function isAlphabeticLetter(ch) {
         var code = ch.charCodeAt(0);
-        return code >= 0x21 && code <= 0x17F;
+        return code >= 0x20 && code <= 0x24F
+            || code >= 0x370 && code <= 0x10FF
+            || code >= 0x1200 && code <= 0x13FF
+            || code >= 0x1E00 && code <= 0x206F;
     }
     var breakCharMap = reduce(',&?/;] '.split(''), function (obj, ch) {
         obj[ch] = true;
         return obj;
     }, {});
     function isWordBreakChar(ch) {
-        if (isLatin(ch)) {
+        if (isAlphabeticLetter(ch)) {
             if (breakCharMap[ch]) {
                 return true;
             }
@@ -15900,9 +15903,9 @@
         opts = opts || {};
         var S = opts.newline ? '\n' : '';
         function convertElToString(el) {
-            var children = el.children, tag = el.tag, attrs = el.attrs;
+            var children = el.children, tag = el.tag, attrs = el.attrs, text = el.text;
             return createElementOpen(tag, attrs)
-                + encodeHTML(el.text)
+                + (tag !== 'style' ? encodeHTML(text) : text || '')
                 + (children ? "" + S + map(children, function (child) { return convertElToString(child); }).join(S) + S : '')
                 + createElementClose(tag);
         }