@naturalcycles/dev-lib 15.12.0 → 15.13.0

package/dist/build.util.js

@@ -8,7 +8,6 @@ exports.runTSCProd = runTSCProd;
 exports.buildCopy = buildCopy;
 const tslib_1 = require("tslib");
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
-const js_lib_1 = require("@naturalcycles/js-lib");
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 async function buildEsmCjs() {
     // You cannot have a shared `tsconfig.prod.json` because of relative paths for `include`
@@ -24,28 +23,34 @@ async function buildEsmCjs() {
     const cjsPath = cjsExists ? TSCONF_CJS_PATH : TSCONF_PROD_PATH;
     const esmPath = esmExists ? TSCONF_ESM_PATH : TSCONF_PROD_PATH;
     await Promise.all([
-        (0, nodejs_lib_1.execVoidCommand)('tsc', [
-            '-P',
-            cjsPath,
-            '--outDir',
-            './dist',
-            '--module',
-            'nodenext',
-            '--moduleResolution',
-            'nodenext',
-        ]),
-        (0, nodejs_lib_1.execVoidCommand)('tsc', [
-            '-P',
-            esmPath,
-            '--outDir',
-            './dist-esm',
-            '--module',
-            'esnext',
-            '--moduleResolution',
-            'bundler',
-            '--declaration',
-            'false',
-        ]),
+        nodejs_lib_1.exec2.spawnAsync('tsc', {
+            args: [
+                '-P',
+                cjsPath,
+                '--outDir',
+                './dist',
+                '--module',
+                'nodenext',
+                '--moduleResolution',
+                'nodenext',
+            ],
+            shell: false,
+        }),
+        nodejs_lib_1.exec2.spawnAsync('tsc', {
+            args: [
+                '-P',
+                esmPath,
+                '--outDir',
+                './dist-esm',
+                '--module',
+                'esnext',
+                '--moduleResolution',
+                'bundler',
+                '--declaration',
+                'false',
+            ],
+            shell: false,
+        }),
     ]);
 }
 async function buildProd() {
@@ -74,16 +79,17 @@ async function runTSCInFolder(tsconfigPath, args = []) {
         console.log(`Skipping to run tsc for ${tsconfigPath}, as it doesn't exist`);
         return;
     }
-    const started = Date.now();
-    await (0, nodejs_lib_1.execVoidCommand)(`tsc`, ['-P', tsconfigPath, ...args]);
-    console.log(`${(0, nodejs_lib_1.boldGrey)(`tsc ${tsconfigPath}`)} ${(0, nodejs_lib_1.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
+    await nodejs_lib_1.exec2.spawnAsync(`tsc`, {
+        args: ['-P', tsconfigPath, ...args],
+        shell: false,
+    });
 }
 async function runTSCProd() {
     const tsconfigPath = [`./tsconfig.prod.json`].find(p => node_fs_1.default.existsSync(p)) || 'tsconfig.json';
-    const args = ['-P', tsconfigPath];
-    const started = Date.now();
-    await (0, nodejs_lib_1.execVoidCommand)(`tsc`, args);
-    console.log(`${(0, nodejs_lib_1.boldGrey)('tsc prod')} ${(0, nodejs_lib_1.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
+    await nodejs_lib_1.exec2.spawnAsync(`tsc`, {
+        args: ['-P', tsconfigPath],
+        shell: false,
+    });
 }
 function buildCopy() {
     const baseDir = 'src';

package/dist/lint.util.js

@@ -54,11 +54,11 @@ async function lintAllCommand() {
         const hasChanges = gitStatusAfter !== gitStatusAtStart;
         if (!hasChanges)
             return;
-        const msg = 'style(ci): ' + (0, js_lib_1._truncate)((0, nodejs_lib_1.commitMessageToTitleMessage)((0, nodejs_lib_1.getLastGitCommitMsg)()), 60);
+        const msg = 'style(ci): ' + (0, js_lib_1._truncate)(nodejs_lib_1.git2.commitMessageToTitleMessage(nodejs_lib_1.git2.getLastGitCommitMsg()), 60);
         // pull, commit, push changes
-        (0, nodejs_lib_1.gitPull)();
-        (0, nodejs_lib_1.gitCommitAll)(msg);
-        (0, nodejs_lib_1.gitPush)();
+        nodejs_lib_1.git2.pull();
+        nodejs_lib_1.git2.commitAll(msg);
+        nodejs_lib_1.git2.push();
         // fail on changes
         if (failOnChanges) {
             console.log(gitStatusAfter);
@@ -123,15 +123,18 @@ async function eslintAll(opt) {
 async function runESLint(dir, eslintConfigPath, tsconfigPath, extensions = ['ts', 'tsx', 'vue'], fix = true) {
     if (!eslintConfigPath || !node_fs_1.default.existsSync(dir))
         return; // faster to bail-out like this
-    await (0, nodejs_lib_1.execVoidCommand)('eslint', [
-        `--config`,
-        eslintConfigPath,
-        `${dir}/**/*.{${extensions.join(',')}}`,
-        ...(tsconfigPath ? [`--parser-options=project:${tsconfigPath}`] : []),
-        `--no-error-on-unmatched-pattern`,
-        `--report-unused-disable-directives`, // todo: unnecessary with flat, as it's defined in the config
-        fix ? `--fix` : '',
-    ].filter(Boolean));
+    await nodejs_lib_1.exec2.spawnAsync('eslint', {
+        args: [
+            `--config`,
+            eslintConfigPath,
+            `${dir}/**/*.{${extensions.join(',')}}`,
+            ...(tsconfigPath ? [`--parser-options=project:${tsconfigPath}`] : []),
+            `--no-error-on-unmatched-pattern`,
+            `--report-unused-disable-directives`, // todo: unnecessary with flat, as it's defined in the config
+            fix ? `--fix` : '',
+        ].filter(Boolean),
+        shell: false,
+    });
 }
 const prettierPaths = [
     // Everything inside these folders
@@ -146,13 +149,10 @@ function runPrettier() {
     if (!prettierConfigPath)
         return;
     // prettier --write 'src/**/*.{js,ts,css,scss,graphql}'
-    (0, nodejs_lib_1.execVoidCommandSync)('prettier', [
-        `--write`,
-        `--log-level=warn`,
-        `--config`,
-        prettierConfigPath,
-        ...prettierPaths,
-    ]);
+    nodejs_lib_1.exec2.spawn('prettier', {
+        args: [`--write`, `--log-level=warn`, `--config`, prettierConfigPath, ...prettierPaths],
+        shell: false,
+    });
 }
 const stylelintPaths = [
     // Everything inside these folders
@@ -170,7 +170,10 @@ function stylelintAll() {
     const config = [`./stylelint.config.js`].find(f => node_fs_1.default.existsSync(f));
     if (!config)
         return;
-    (0, nodejs_lib_1.execVoidCommandSync)('stylelint', [fix ? `--fix` : '', `--allow-empty-input`, `--config`, config, ...stylelintPaths].filter(Boolean));
+    nodejs_lib_1.exec2.spawn('stylelint', {
+        args: [fix ? `--fix` : '', `--allow-empty-input`, `--config`, config, ...stylelintPaths].filter(Boolean),
+        shell: false,
+    });
 }
 async function lintStagedCommand() {
     // const cwd = process.cwd()
@@ -202,11 +205,13 @@ function runCommitlintCommand() {
     const config = node_fs_1.default.existsSync(localConfig) ? localConfig : sharedConfig;
     const env = {
         ...process.env, // important to pass it through, to preserve $PATH
-        GIT_BRANCH: (0, nodejs_lib_1.gitCurrentBranchName)(),
+        GIT_BRANCH: nodejs_lib_1.git2.getCurrentBranchName(),
     };
     // await execWithArgs(`commitlint`, [`--edit`, editMsg, `--config`, config], { env })
-    execSync(`node ./node_modules/.bin/commitlint --edit ${editMsg} --config ${config}`, {
+    nodejs_lib_1.exec2.spawn(`node ./node_modules/.bin/commitlint --edit ${editMsg} --config ${config}`, {
         env,
+        passProcessEnv: false,
+        forceColor: false,
     });
 }
 async function runKTLint() {
@@ -220,9 +225,7 @@ function runActionLint() {
     if (!node_fs_1.default.existsSync('.github/workflows'))
         return;
     if (canRunBinary('actionlint')) {
-        const started = Date.now();
-        (0, nodejs_lib_1.execVoidCommandSync)(`actionlint`);
-        console.log(`${(0, nodejs_lib_1.boldGrey)('actionlint')} ${(0, nodejs_lib_1.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
+        nodejs_lib_1.exec2.spawn(`actionlint`);
     }
     else {
         console.log(`actionlint is not installed and won't be run.\nThis is how to install it: https://github.com/rhysd/actionlint/blob/main/docs/install.md`);
@@ -241,7 +244,11 @@ function runBiome(fix = true) {
         return;
     }
     const dirs = [`src`, `scripts`, `e2e`, `playwright`].filter(d => node_fs_1.default.existsSync(d));
-    (0, nodejs_lib_1.execVoidCommandSync)(`biome`, [`lint`, fix && '--write', fix && '--unsafe', '--no-errors-on-unmatched', ...dirs].filter(js_lib_1._isTruthy));
+    nodejs_lib_1.exec2.spawn(`biome`, {
+        args: [`lint`, fix && '--write', fix && '--unsafe', '--no-errors-on-unmatched', ...dirs].filter(js_lib_1._isTruthy),
+        logFinish: false,
+        shell: false,
+    });
 }
 function canRunBinary(name) {
     try {
@@ -260,15 +267,3 @@ function gitStatus() {
     }
     catch { }
 }
-function execSync(cmd, opt) {
-    try {
-        node_child_process_1.default.execSync(cmd, {
-            ...opt,
-            encoding: 'utf8',
-            stdio: 'inherit',
-        });
-    }
-    catch {
-        process.exit(1);
-    }
-}

package/dist/test.util.js

@@ -82,13 +82,19 @@ function runJest(opt = {}) {
         const totalShards = Number(JEST_SHARDS);
         const shards = (0, js_lib_1._range)(1, totalShards + 1);
         for (const shard of shards) {
-            (0, nodejs_lib_1.execVoidCommandSync)('jest', (0, js_lib_1._uniq)([...args, `--shard=${shard}/${totalShards}`]), {
+            nodejs_lib_1.exec2.spawn('jest', {
+                args: (0, js_lib_1._uniq)([...args, `--shard=${shard}/${totalShards}`]),
+                logFinish: false,
+                shell: false,
                 env,
             });
         }
     }
     else {
-        (0, nodejs_lib_1.execVoidCommandSync)('jest', (0, js_lib_1._uniq)(args), {
+        nodejs_lib_1.exec2.spawn('jest', {
+            args: (0, js_lib_1._uniq)(args),
+            logFinish: false,
+            shell: false,
             env,
         });
     }

package/dist/yarn.util.js

@@ -6,15 +6,15 @@ const tslib_1 = require("tslib");
 const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 function up() {
-    (0, nodejs_lib_1.execVoidCommandSync)('yarn', ['upgrade']);
-    (0, nodejs_lib_1.execVoidCommandSync)('yarn-deduplicate');
-    (0, nodejs_lib_1.execVoidCommandSync)('yarn');
+    nodejs_lib_1.exec2.spawn('yarn upgrade');
+    nodejs_lib_1.exec2.spawn('yarn-deduplicate');
+    nodejs_lib_1.exec2.spawn('yarn');
     if (node_fs_1.default.existsSync(`node_modules/patch-package`)) {
-        (0, nodejs_lib_1.execVoidCommandSync)('patch-package');
+        nodejs_lib_1.exec2.spawn('patch-package');
     }
 }
 function upnc() {
-    (0, nodejs_lib_1.execVoidCommandSync)('yarn', ['upgrade', '--pattern', `@naturalcycles`]);
-    (0, nodejs_lib_1.execVoidCommandSync)('yarn-deduplicate');
-    (0, nodejs_lib_1.execVoidCommandSync)('yarn');
+    nodejs_lib_1.exec2.spawn('yarn upgrade --pattern @naturalcycles');
+    nodejs_lib_1.exec2.spawn('yarn-deduplicate');
+    nodejs_lib_1.exec2.spawn('yarn');
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/dev-lib",
-  "version": "15.12.0",
+  "version": "15.13.0",
   "scripts": {
     "prepare": "husky",
     "tsn-debug": "tsn testScript.ts",