libdragon 11.2.0 → 11.3.0

package/modules/actions/init.js

@@ -1,5 +1,9 @@
+/// <reference path="../../globals.d.ts" />
+
 const fs = require('fs/promises');
+const _fs = require('fs');
 const path = require('path');
+const sea = require('node:sea');
 
 const chalk = require('chalk').stderr;
 
@@ -20,7 +24,6 @@ const {
 } = require('../constants');
 const {
   log,
-  copyDirContents,
   CommandError,
   ParameterError,
   ValidationError,
@@ -29,6 +32,21 @@ const {
   getImageName,
 } = require('../helpers');
 
+// TODO: use https://nodejs.org/api/single-executable-applications.html#seagetassetkey-encoding &&
+// https://nodejs.org/api/single-executable-applications.html#assets instead
+const main_c = sea.isSea()
+  ? // @ts-ignore-next-line
+    /** @type {string} */ (require('../../skeleton/src/main.c'))
+  : _fs.readFileSync(path.join(__dirname, '../../skeleton/src/main.c'), 'utf8');
+
+const makefile = sea.isSea()
+  ? // @ts-ignore-next-line
+    /** @type {string} */ require('../../skeleton/Makefile.mk')
+  : _fs.readFileSync(
+      path.join(__dirname, '../../skeleton/Makefile.mk'),
+      'utf8'
+    );
+
 /**
  * @param {import('../project-info').LibdragonInfo} info
  * @returns {Promise<"submodule" | "subtree" | undefined>}
@@ -205,6 +223,47 @@ const autoVendor = async (info) => {
   return info;
 };
 
+/**
+ * @param {import('../project-info').LibdragonInfo} info
+ */
+async function copyFiles(info) {
+  // TODO: make use of VFS, this is far from ideal
+  const srcPath = path.join(info.root, 'src');
+
+  const srcStat = await fs.stat(srcPath).catch((e) => {
+    if (e.code !== 'ENOENT') throw e;
+    return null;
+  });
+
+  if (srcStat && !srcStat.isDirectory()) {
+    log(`${srcPath} is not a directory, skipping.`);
+    return;
+  }
+
+  if (!srcStat) {
+    log(`Creating a directory at ${srcPath}.`, true);
+    await fs.mkdir(srcPath);
+  }
+
+  const makefilePath = path.join(info.root, 'Makefile');
+  await fs
+    .writeFile(makefilePath, makefile, {
+      flag: 'wx',
+    })
+    .catch(() => {
+      log(`${makefilePath} already exists, skipping.`);
+    });
+
+  const mainPath = path.join(info.root, 'src', 'main.c');
+  await fs
+    .writeFile(mainPath, main_c, {
+      flag: 'wx',
+    })
+    .catch(() => {
+      log(`${mainPath} already exists, skipping.`);
+    });
+}
+
 /**
  * Initialize a new libdragon project in current working directory
  * Also downloads the image
@@ -313,13 +372,8 @@ async function init(info) {
   info = await autoVendor(info);
 
   log(`Preparing project files...`);
-  const skeletonFolder = path.join(__dirname, '../../skeleton');
 
-  await Promise.all([
-    installDependencies(info),
-    // node copy functions does not work with pkg
-    copyDirContents(skeletonFolder, info.root),
-  ]);
+  await Promise.all([installDependencies(info), copyFiles(info)]);
 
   log(chalk.green(`libdragon ready at \`${info.root}\`.`));
   return info;

package/modules/helpers.js

@@ -1,6 +1,5 @@
 const path = require('path');
 const fs = require('fs/promises');
-const fsClassic = require('fs');
 const chalk = require('chalk').stderr;
 const { spawn } = require('child_process');
 
@@ -121,7 +120,7 @@ async function dirExists(path) {
  *  inheritStdout?: boolean,
  *  inheritStderr?: boolean,
  *  spawnOptions?: import('child_process').SpawnOptions,
- *  stdin?: fsClassic.ReadStream,
+ *  stdin?: import('fs').ReadStream,
  * }} SpawnOptions
  */
 
@@ -351,60 +350,6 @@ const dockerExec = /** @type {DockerExec} */ (
   }
 );
 
-/**
- * Recursively copies directories and files
- * @param {string} src
- * @param {string} dst
- */
-async function copyDirContents(src, dst) {
-  log(`Copying from ${src} to ${dst}`, true);
-
-  const dstStat = await fs.stat(dst).catch((e) => {
-    if (e.code !== 'ENOENT') throw e;
-    return null;
-  });
-
-  if (dstStat && !dstStat.isDirectory()) {
-    log(`${dst} is not a directory, skipping.`);
-    return;
-  }
-
-  if (!dstStat) {
-    log(`Creating a directory at ${dst}.`, true);
-    await fs.mkdir(dst);
-  }
-
-  const files = await fs.readdir(src);
-  return Promise.all(
-    files.map(async (name) => {
-      const source = path.join(src, name);
-      const dest = path.join(dst, name);
-      // promise version does not work on snapshot filesystem
-      // Also see https://github.com/vercel/pkg/issues/1561
-      const stats = await new Promise((res, rej) =>
-        fsClassic.stat(source, (err, stats) => {
-          if (err) return rej(err);
-          res(stats);
-        })
-      );
-      if (stats.isDirectory()) {
-        await copyDirContents(source, dest);
-      } else if (stats.isFile()) {
-        const content = await fs.readFile(source);
-        try {
-          log(`Writing to ${dest}`, true);
-          await fs.writeFile(dest, content, {
-            flag: 'wx',
-          });
-        } catch {
-          log(`${dest} already exists, skipping.`);
-          return;
-        }
-      }
-    })
-  );
-}
-
 /**
  * @param {string} p
  */
@@ -446,8 +391,10 @@ function print(text) {
  */
 function log(text, verboseOnly = false) {
   if (!verboseOnly) {
+    // New default color for console.err is red
+    // Also see https://github.com/nodejs/node/issues/53661
     // eslint-disable-next-line no-console
-    console.error(text);
+    console.error(chalk.white(text));
     return;
   }
   if (globals.verbose) {
@@ -491,7 +438,6 @@ module.exports = {
   assert,
   fileExists,
   dirExists,
-  copyDirContents,
   CommandError,
   ParameterError,
   ValidationError,

package/modules/npm-utils.js

@@ -1,6 +1,8 @@
 const path = require('path');
 const fsClassic = require('fs');
+const fs = require('fs/promises');
 
+// TODO: stop using lodash just for a simple uniq function
 const _ = require('lodash');
 
 const { dockerHostUserParams } = require('./docker-utils');
@@ -36,7 +38,9 @@ const installNPMDependencies = async (libdragonInfo) => {
   if (npmRoot) {
     const packageJsonPath = path.join(npmRoot, 'package.json');
 
-    const { dependencies, devDependencies } = require(packageJsonPath);
+    const { dependencies, devDependencies } = JSON.parse(
+      await fs.readFile(packageJsonPath, { encoding: 'utf8' })
+    );
 
     const deps = await Promise.all(
       Object.keys({

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "libdragon",
-  "version": "11.2.0",
+  "version": "11.3.0",
   "description": "This is a docker wrapper for libdragon",
   "main": "index.js",
   "engines": {
-    "node": ">=18",
-    "npm": ">=8"
+    "node": ">=22",
+    "npm": ">=10"
   },
   "bin": {
     "libdragon": "./index.js"
@@ -16,7 +16,7 @@
     "libdragon": "node index.js",
     "start": "node index.js start",
     "stop": "node index.js stop",
-    "pack": "pkg ./",
+    "pack": "node pack.mjs",
     "format": "prettier **/*.js **/*.mjs **/*.cjs --write",
     "format-check": "prettier **/*.js **/*.mjs **/*.cjs --check",
     "lint": "eslint --fix modules/**/*.js *.js *.mjs *.cjs",
@@ -51,23 +51,19 @@
     "@types/lodash": "^4.14.182",
     "commitizen": "^4.2.4",
     "cz-conventional-changelog": "^3.3.0",
+    "esbuild": "^0.20.0",
     "ed64": "^2.0.4",
     "eslint": "^9.11.0",
     "jest": "^29.5.0",
-    "pkg": "^5.5.2",
+    "postject": "^1.0.0-alpha.6",
     "prettier": "^2.4.0",
+    "ref-napi": "^3.0.3",
     "semantic-release": "^24.0.0",
-    "typescript": "^4.7.4"
+    "typescript": "^4.7.4",
+    "zx": "^7.2.2"
   },
-  "pkg": {
-    "targets": [
-      "node14-win-x64",
-      "node14-linux-x64",
-      "node14-macos-x64"
-    ],
-    "assets": [
-      "skeleton/**"
-    ]
+  "overrides": {
+    "minimist": "1.2.6"
   },
   "release": {
     "plugins": [

package/skeleton/index.d.ts

@@ -0,0 +1,4 @@
+declare module './src/main.c' {
+  type tmp = string;
+  export = tmp;
+}