@pushwoosh/frontend-builder-engine 3.1.2 → 3.1.3

package/lib/pushwoosh-engine.js

@@ -1,4 +1,5 @@
 const childProcess = require('child_process');
+const { existsSync, readFileSync } = require('fs');
 const fs = require('fs').promises;
 const { program, Command } = require('commander');
 const path = require('path');
@@ -8,6 +9,28 @@ const { buildStyledComponents } = require('./build-babel');
 const { loadTsConfig } = require('./lib-build-tsconfig');
 const { loadPushwooshConfig, listFilesInDirectoryRecursively } = require('./helpers');
 
+// Printed commands are resolved from the engine's own dependencies, so a project gets no
+// webpack/knip of its own in node_modules/.bin (pnpm does not hoist them).
+const packageDir = (name) => {
+  let dir = path.dirname(require.resolve(name));
+  for (;;) {
+    const manifest = path.join(dir, 'package.json');
+    if (existsSync(manifest) && JSON.parse(readFileSync(manifest, 'utf8')).name === name) {
+      return dir;
+    }
+    dir = path.dirname(dir);
+  }
+};
+
+const bin = (name, command = name) => {
+  const dir = packageDir(name);
+  const manifest = JSON.parse(readFileSync(path.join(dir, 'package.json'), 'utf8'));
+  const entry = typeof manifest.bin === 'string' ? manifest.bin : manifest.bin[command];
+  return `node ${path.join(dir, entry)}`;
+};
+
+const engineFile = (file) => path.join(__dirname, file);
+
 program
   .version('1.0.0')
   .description('Build lib')
@@ -55,9 +78,9 @@ program
       .description('Playground command')
       .action(async () => {
         const cmd = [
-          './node_modules/.bin/webpack-dev-server',
+          bin('webpack-dev-server'),
           '--config',
-          './node_modules/@pushwoosh/frontend-builder-engine/lib/webpack.playground.config.js',
+          engineFile('webpack.playground.config.js'),
           '--stats-error-details',
         ];
         console.log(cmd.join(' '));
@@ -87,10 +110,10 @@ program
       .description('App dev command')
       .action(async () => {
         const cmd = [
-          './node_modules/.bin/webpack',
+          bin('webpack-cli'),
           'serve',
           '--config',
-          './node_modules/@pushwoosh/frontend-builder-engine/lib/webpack.application.config.js',
+          engineFile('webpack.application.config.js'),
         ];
         console.log(cmd.join(' '));
       }),
@@ -102,9 +125,9 @@ program
       .description('App build command')
       .action(async () => {
         const cmd = [
-          './node_modules/.bin/webpack',
+          bin('webpack-cli'),
           '--config',
-          './node_modules/@pushwoosh/frontend-builder-engine/lib/webpack.application.config.js',
+          engineFile('webpack.application.config.js'),
           '--stats-error-details',
           '--mode=production'
         ];
@@ -118,9 +141,9 @@ program
       .description('App dead code check command')
       .action(async () => {
         const cmd = [
-          './node_modules/.bin/knip',
+          bin('knip'),
           '--config',
-          './node_modules/@pushwoosh/frontend-builder-engine/lib/knip.application.json',
+          engineFile('knip.application.json'),
           '--no-config-hints',
         ];
         console.log(cmd.join(' '));
@@ -133,9 +156,9 @@ program
       .description('App analyze command')
       .action(async () => {
         const cmd = [
-          './node_modules/.bin/webpack',
+          bin('webpack-cli'),
           '--config',
-          './node_modules/@pushwoosh/frontend-builder-engine/lib/webpack.application.config.js',
+          engineFile('webpack.application.config.js'),
           '--mode=production',
           '--env',
           'analyze',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushwoosh/frontend-builder-engine",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "description": "Pushwoosh frontend builder engine",
   "main": "./lib/pushwoosh-frontend-builder-engine.js",
   "publishConfig": {