From 9fd014db24cf3ace3a968053e4c11f5899351e12 Mon Sep 17 00:00:00 2001
From: FintasticMan <finlay.neon.kid@gmail.com>
Date: Fri, 19 May 2023 18:46:05 +0200
Subject: [PATCH] node: Add lv_font_conv to node package

This means that these can be installed by simply running `npm i`.
Also add node_modules to gitignore.
---
 .gitignore             |   3 ++
 doc/buildAndProgram.md |   5 +-
 package-lock.json      | 118 +++++++++++++++++++++++++++++++++++++++++
 package.json           |   5 ++
 4 files changed, 128 insertions(+), 3 deletions(-)
 create mode 100644 package-lock.json
 create mode 100644 package.json

diff --git a/.gitignore b/.gitignore
index 81e49ae0..14ffa7f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,3 +50,6 @@ src/arm-none-eabi
 
 # clangd
 .cache/
+
+# npm
+node_modules/
diff --git a/doc/buildAndProgram.md b/doc/buildAndProgram.md
index 3b4ed22c..69f8da8a 100644
--- a/doc/buildAndProgram.md
+++ b/doc/buildAndProgram.md
@@ -15,10 +15,9 @@ To build this project, you'll need:
     python -m pip install -r tools/mcuboot/requirements.txt
     ```
 - A reasonably recent version of CMake (I use 3.16.5)
-- lv_font_conv, to generate the font .c files
-  - see [lv_font_conv](https://github.com/lvgl/lv_font_conv#install-the-script)
+- lv_font_conv and lv_img_conv, to generate the font .c files
   - install npm (commonly done via the package manager, ensure node's version is at least 12)
-  - install lv_font_conv: `npm install lv_font_conv`
+  - install the modules: `npm install`
 
 ## Build steps
 
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000..75a67e67
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,118 @@
+{
+  "name": "InfiniTime",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "dependencies": {
+        "lv_font_conv": "^1.5.2"
+      }
+    },
+    "node_modules/lv_font_conv": {
+      "version": "1.5.2",
+      "resolved": "https://registry.npmjs.org/lv_font_conv/-/lv_font_conv-1.5.2.tgz",
+      "integrity": "sha512-0UapRSTkVP/pnB8Z4r2HDHx5p2dJx/xUG1+14u/WXo59mwuC7BahR+Bnx/66jKoDrG1wFQwn9ZzoyMxRHOD9bg==",
+      "bundleDependencies": [
+        "argparse",
+        "bit-buffer",
+        "debug",
+        "make-error",
+        "mkdirp",
+        "opentype.js",
+        "pngjs"
+      ],
+      "dependencies": {
+        "argparse": "^2.0.0",
+        "bit-buffer": "^0.2.5",
+        "debug": "^4.1.1",
+        "make-error": "^1.3.5",
+        "mkdirp": "^1.0.4",
+        "opentype.js": "^1.1.0",
+        "pngjs": "^6.0.0"
+      },
+      "bin": {
+        "lv_font_conv": "lv_font_conv.js"
+      }
+    },
+    "node_modules/lv_font_conv/node_modules/argparse": {
+      "version": "2.0.1",
+      "inBundle": true,
+      "license": "Python-2.0"
+    },
+    "node_modules/lv_font_conv/node_modules/bit-buffer": {
+      "version": "0.2.5",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/lv_font_conv/node_modules/debug": {
+      "version": "4.3.1",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.1.2"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/lv_font_conv/node_modules/make-error": {
+      "version": "1.3.6",
+      "inBundle": true,
+      "license": "ISC"
+    },
+    "node_modules/lv_font_conv/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "inBundle": true,
+      "license": "MIT",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/lv_font_conv/node_modules/ms": {
+      "version": "2.1.2",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/lv_font_conv/node_modules/opentype.js": {
+      "version": "1.3.3",
+      "inBundle": true,
+      "license": "MIT",
+      "dependencies": {
+        "string.prototype.codepointat": "^0.2.1",
+        "tiny-inflate": "^1.0.3"
+      },
+      "bin": {
+        "ot": "bin/ot"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
+      }
+    },
+    "node_modules/lv_font_conv/node_modules/pngjs": {
+      "version": "6.0.0",
+      "inBundle": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.13.0"
+      }
+    },
+    "node_modules/lv_font_conv/node_modules/string.prototype.codepointat": {
+      "version": "0.2.1",
+      "inBundle": true,
+      "license": "MIT"
+    },
+    "node_modules/lv_font_conv/node_modules/tiny-inflate": {
+      "version": "1.0.3",
+      "inBundle": true,
+      "license": "MIT"
+    }
+  }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 00000000..d339766c
--- /dev/null
+++ b/package.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "lv_font_conv": "^1.5.2"
+  }
+}