fix(cli): avoid resolving protocol package.json in preflight

Author: leeroybrun

apps/cli/bin/happier.mjs

@@ -7,19 +7,24 @@ import { createRequire } from 'module';
 
 function preflightRequiredDependencies(projectRoot) {
   const cliRequire = createRequire(import.meta.url);
-  let protocolPackageJsonPath;
+  let protocolEntryPath;
   try {
-    protocolPackageJsonPath = cliRequire.resolve('@happier-dev/protocol/package.json');
+    protocolEntryPath = cliRequire.resolve('@happier-dev/protocol');
   } catch (error) {
-    if (error && typeof error === 'object' && 'code' in error && error.code === 'MODULE_NOT_FOUND') {
+    if (
+      error &&
+      typeof error === 'object' &&
+      'code' in error &&
+      (error.code === 'MODULE_NOT_FOUND' || error.code === 'ERR_PACKAGE_PATH_NOT_EXPORTED')
+    ) {
       console.error('Missing bundled package: @happier-dev/protocol');
       console.error('Reinstall @happier-dev/cli to repair your installation.');
       process.exit(1);
     }
     throw error;
   }
 
-  const protocolRequire = createRequire(protocolPackageJsonPath);
+  const protocolRequire = createRequire(protocolEntryPath);
 
   // `tweetnacl` is a direct runtime dependency of the CLI.
   // `base64-js` and `@noble/hashes/*` are runtime dependencies of `@happier-dev/protocol` and may be

apps/cli/scripts/__tests__/happierDependencyPreflight.test.ts

@@ -14,6 +14,7 @@ describe('happier bin preflight', () => {
 
     mkdirSync(resolve(tempRoot, 'bin'), { recursive: true });
     mkdirSync(resolve(tempRoot, 'dist'), { recursive: true });
+    mkdirSync(resolve(tempRoot, 'node_modules', '@happier-dev', 'protocol', 'dist'), { recursive: true });
 
     // Global-install / packed layout:
     // - protocol is present as a bundled workspace package
@@ -32,7 +33,19 @@ describe('happier bin preflight', () => {
 
     writeFileSync(
       resolve(tempRoot, 'node_modules', '@happier-dev', 'protocol', 'package.json'),
-      JSON.stringify({ name: '@happier-dev/protocol', version: '0.0.0' }),
+      JSON.stringify({
+        name: '@happier-dev/protocol',
+        version: '0.0.0',
+        type: 'module',
+        exports: {
+          '.': './dist/index.js',
+        },
+      }),
+      'utf8',
+    );
+    writeFileSync(
+      resolve(tempRoot, 'node_modules', '@happier-dev', 'protocol', 'dist', 'index.js'),
+      'export {};\n',
       'utf8',
     );
     writeFileSync(
@@ -90,15 +103,23 @@ describe('happier bin preflight', () => {
 
     mkdirSync(resolve(tempRoot, 'bin'), { recursive: true });
     mkdirSync(resolve(tempRoot, 'dist'), { recursive: true });
-    mkdirSync(resolve(tempRoot, 'node_modules', '@happier-dev', 'protocol'), { recursive: true });
+    mkdirSync(resolve(tempRoot, 'node_modules', '@happier-dev', 'protocol', 'dist'), { recursive: true });
 
     cpSync(resolve(repoRoot, 'apps', 'cli', 'bin', 'happier.mjs'), resolve(tempRoot, 'bin', 'happier.mjs'));
 
     writeFileSync(
       resolve(tempRoot, 'node_modules', '@happier-dev', 'protocol', 'package.json'),
-      JSON.stringify({ name: '@happier-dev/protocol', version: '0.0.0' }),
+      JSON.stringify({
+        name: '@happier-dev/protocol',
+        version: '0.0.0',
+        type: 'module',
+        exports: {
+          '.': './dist/index.js',
+        },
+      }),
       'utf8',
     );
+    writeFileSync(resolve(tempRoot, 'node_modules', '@happier-dev', 'protocol', 'dist', 'index.js'), 'export {};\n', 'utf8');
     writeFileSync(
       resolve(tempRoot, 'dist', 'index.mjs'),
       "console.log('ok');\n",
@@ -124,16 +145,24 @@ describe('happier bin preflight', () => {
 
     mkdirSync(resolve(tempRoot, 'bin'), { recursive: true });
     mkdirSync(resolve(tempRoot, 'dist'), { recursive: true });
-    mkdirSync(resolve(tempRoot, 'node_modules', '@happier-dev', 'protocol'), { recursive: true });
+    mkdirSync(resolve(tempRoot, 'node_modules', '@happier-dev', 'protocol', 'dist'), { recursive: true });
     mkdirSync(resolve(tempRoot, 'node_modules', 'tweetnacl'), { recursive: true });
 
     cpSync(resolve(repoRoot, 'apps', 'cli', 'bin', 'happier.mjs'), resolve(tempRoot, 'bin', 'happier.mjs'));
 
     writeFileSync(
       resolve(tempRoot, 'node_modules', '@happier-dev', 'protocol', 'package.json'),
-      JSON.stringify({ name: '@happier-dev/protocol', version: '0.0.0' }),
+      JSON.stringify({
+        name: '@happier-dev/protocol',
+        version: '0.0.0',
+        type: 'module',
+        exports: {
+          '.': './dist/index.js',
+        },
+      }),
       'utf8',
     );
+    writeFileSync(resolve(tempRoot, 'node_modules', '@happier-dev', 'protocol', 'dist', 'index.js'), 'export {};\n', 'utf8');
     writeFileSync(
       resolve(tempRoot, 'node_modules', 'tweetnacl', 'package.json'),
       JSON.stringify({ name: 'tweetnacl', version: '0.0.0', main: 'index.js' }),
@@ -162,17 +191,25 @@ describe('happier bin preflight', () => {
 
     mkdirSync(resolve(tempRoot, 'bin'), { recursive: true });
     mkdirSync(resolve(tempRoot, 'dist'), { recursive: true });
-    mkdirSync(resolve(tempRoot, 'node_modules', '@happier-dev', 'protocol'), { recursive: true });
+    mkdirSync(resolve(tempRoot, 'node_modules', '@happier-dev', 'protocol', 'dist'), { recursive: true });
     mkdirSync(resolve(tempRoot, 'node_modules', 'tweetnacl'), { recursive: true });
     mkdirSync(resolve(tempRoot, 'node_modules', 'base64-js'), { recursive: true });
 
     cpSync(resolve(repoRoot, 'apps', 'cli', 'bin', 'happier.mjs'), resolve(tempRoot, 'bin', 'happier.mjs'));
 
     writeFileSync(
       resolve(tempRoot, 'node_modules', '@happier-dev', 'protocol', 'package.json'),
-      JSON.stringify({ name: '@happier-dev/protocol', version: '0.0.0' }),
+      JSON.stringify({
+        name: '@happier-dev/protocol',
+        version: '0.0.0',
+        type: 'module',
+        exports: {
+          '.': './dist/index.js',
+        },
+      }),
       'utf8',
     );
+    writeFileSync(resolve(tempRoot, 'node_modules', '@happier-dev', 'protocol', 'dist', 'index.js'), 'export {};\n', 'utf8');
     writeFileSync(
       resolve(tempRoot, 'node_modules', 'tweetnacl', 'package.json'),
       JSON.stringify({ name: 'tweetnacl', version: '0.0.0', main: 'index.js' }),