Add Manifest for languages packs and themes packs

Add Js / font  to themes packs

Author: luc-github

config/checkpack.js

@@ -76,8 +76,10 @@ const fileReference = JSON.parse(
     fs.readFileSync(referenceFile, "UTF-8").toString()
 )
 console.log("")
+const META_KEYS = new Set(["_manifest"])
 console.log(chalk.green("Checking extra entries..."))
 Object.keys(fileTarget).map((key) => {
+    if (META_KEYS.has(key)) return
     if (typeof fileReference[key] == "undefined") {
         console.log(chalk.yellow(key + " : " + fileTarget[key]))
         count++
@@ -93,6 +95,7 @@ count = 0
 console.log("")
 console.log(chalk.green("Checking missing entries..."))
 Object.keys(fileReference).map((key) => {
+    if (META_KEYS.has(key)) return
     if (typeof fileTarget[key] == "undefined") {
         count++
         console.log(chalk.red(key + " : " + fileReference[key]))

config/fill-missing-root-lang.js

@@ -35,8 +35,9 @@ rootFiles.forEach((fileName) => {
         }
     })
     if (added === 0) return
-    // Preserve order: lang first, then reference keys
+    // Preserve order: _manifest first, lang second, then reference keys
     const out = {}
+    if (data._manifest !== undefined) out._manifest = data._manifest
     if (data.lang !== undefined) out.lang = data.lang
     refKeys.forEach((key) => {
         out[key] = data[key] !== undefined ? data[key] : ""

config/list-languages.js

@@ -9,8 +9,8 @@ const fs = require("fs")
 const languagesPath = path.normalize(__dirname + "/../languages/")
 const packs = ["printerpack", "cncgrblpack", "cncgrblhalpack", "sandtablepack"]
 
-// Collect code -> name from root lang-*.json first, then from packs (to get names for any lang only in packs)
-const codeToName = {}
+// Collect code -> { name, manifest? } from root lang-*.json first, then from packs
+const codeToInfo = {}
 
 function addFromFile(filePath) {
     try {
@@ -21,7 +21,9 @@ function addFromFile(filePath) {
         const base = path.basename(filePath, ".json")
         if (!base.startsWith("lang-")) return
         const code = base.replace(/^lang-/, "")
-        if (!codeToName[code]) codeToName[code] = name
+        if (!codeToInfo[code]) {
+            codeToInfo[code] = { name, manifest: data._manifest || null }
+        }
     } catch (e) {
         // skip invalid or missing
     }
@@ -48,18 +50,33 @@ packs.forEach((pack) => {
 })
 
 // Sort by code
-const codes = Object.keys(codeToName).sort()
+const codes = Object.keys(codeToInfo).sort()
 
 // Output Markdown table
 const outPath = process.argv[2] || path.join(__dirname, "../docs/languages.md")
+
+const hasManifestInfo = codes.some((c) => codeToInfo[c].manifest)
+
+const header = hasManifestInfo
+    ? ["| Code | Name | RTL | Version | Owner |", "|------|------|-----|---------|-------|"]
+    : ["| Code | Name |", "|------|------|"]
+
+const rows = codes.map((code) => {
+    const { name, manifest: m } = codeToInfo[code]
+    if (!hasManifestInfo) return `| ${code} | ${name} |`
+    const rtl = m && m.rtl ? "✓" : ""
+    const ver = (m && m.version) || ""
+    const owner = (m && m.owner) ? `[${m.owner}](${m.github || "#"})` : (m && m.owner) || ""
+    return `| ${code} | ${name} | ${rtl} | ${ver} | ${owner} |`
+})
+
 const lines = [
     "# Language packs – codes and names",
     "",
-    "Generated by `node config/list-languages.js`. Scan of `languages/` (root and packs) for `lang-*.json`; name from the `lang` key.",
+    "Generated by `node config/list-languages.js`. Scan of `languages/` (root and packs) for `lang-*.json`.",
     "",
-    "| Code | Name |",
-    "|------|------|",
-    ...codes.map((code) => `| ${code} | ${codeToName[code]} |`),
+    ...header,
+    ...rows,
     "",
 ]
 

config/server.js

@@ -178,7 +178,7 @@ function filesList(mypath, destination) {
 const getAllFiles = function (dirPath, arrayOfFiles = []) {
     let files = fs.readdirSync(dirPath) || []
     const newFiles = files.reduce((acc, file) => {
-        const fullpath = dirPath + "/" + file
+        const fullpath = path.join(dirPath, file)
         return fs.statSync(fullpath).isDirectory()
             ? getAllFiles(fullpath, acc)
             : [...acc, fullpath]
@@ -188,7 +188,7 @@ const getAllFiles = function (dirPath, arrayOfFiles = []) {
 
 const getTotalSize = function (directoryPath) {
     const allFiles = getAllFiles(directoryPath)
-    console.log("allFiles", allFiles)
+    if (MOCK_VERBOSE) console.log("allFiles", allFiles)
     return allFiles.reduce(
         (acc, currFile) => acc + fs.statSync(currFile).size,
         0

dist/BUNDLE_SIZES.md

@@ -4,13 +4,13 @@ Generated by `tools/release_bundle_sizes.py`. Use this table in RELEASE_*.md or
 
 | Target | Subtarget | Gzip Path | Gzip Size | Brotli Path | Brotli Size |
 |--------|-----------|-----------|-----------|-------------|-------------|
-| CNC | GRBL | CNC\GRBL\index.html.gz | 91.2 KB | CNC\GRBL\index.html.br | 75.6 KB |
-| CNC | GRBLHal | CNC\GRBLHal\index.html.gz | 95.8 KB | CNC\GRBLHal\index.html.br | 79.0 KB |
-| Printer3D | Marlin | Printer3D\Marlin\index.html.gz | 97.1 KB | Printer3D\Marlin\index.html.br | 80.2 KB |
-| Printer3D | Marlin-embedded | Printer3D\Marlin-embedded\index.html.gz | 96.6 KB | Printer3D\Marlin-embedded\index.html.br | 79.8 KB |
-| Printer3D | Repetier | Printer3D\Repetier\index.html.gz | 96.0 KB | Printer3D\Repetier\index.html.br | 79.3 KB |
-| Printer3D | Smoothieware | Printer3D\Smoothieware\index.html.gz | 95.6 KB | Printer3D\Smoothieware\index.html.br | 78.8 KB |
-| SandTable | GRBL | SandTable\GRBL\index.html.gz | 83.4 KB | SandTable\GRBL\index.html.br | 69.1 KB |
+| CNC | GRBL | CNC\GRBL\index.html.gz | 91.8 KB | CNC\GRBL\index.html.br | 76.1 KB |
+| CNC | GRBLHal | CNC\GRBLHal\index.html.gz | 96.6 KB | CNC\GRBLHal\index.html.br | 79.5 KB |
+| Printer3D | Marlin | Printer3D\Marlin\index.html.gz | 97.9 KB | Printer3D\Marlin\index.html.br | 80.9 KB |
+| Printer3D | Marlin-embedded | Printer3D\Marlin-embedded\index.html.gz | 97.2 KB | Printer3D\Marlin-embedded\index.html.br | 80.4 KB |
+| Printer3D | Repetier | Printer3D\Repetier\index.html.gz | 96.6 KB | Printer3D\Repetier\index.html.br | 79.8 KB |
+| Printer3D | Smoothieware | Printer3D\Smoothieware\index.html.gz | 96.3 KB | Printer3D\Smoothieware\index.html.br | 79.5 KB |
+| SandTable | GRBL | SandTable\GRBL\index.html.gz | 84.1 KB | SandTable\GRBL\index.html.br | 69.6 KB |
 
-**Total Gzip size:** 655.6 KB (671366 bytes).
-**Total Brotli size:** 541.8 KB (554806 bytes).
+**Total Gzip size:** 660.5 KB (676340 bytes).
+**Total Brotli size:** 545.7 KB (558760 bytes).