@enfyra/create 0.1.2 → 0.1.4

package/components/package-managers.js

@@ -18,9 +18,8 @@ function detectPackageManagers() {
 }
 
 function getWorkspaceRunCommand(packageManager, workspace, script) {
-  if (packageManager === 'yarn') return `yarn --cwd ${workspace} ${script}`;
-  if (packageManager === 'pnpm') return `pnpm --dir ${workspace} run ${script}`;
-  return `npm run ${script} -w ${workspace}`;
+  const runCommand = packageManager === 'yarn' ? `yarn ${script}` : `${packageManager} run ${script}`;
+  return `(cd ${workspace} && ${runCommand})`;
 }
 
 function getPackageRunCommand(packageManager, script) {

package/components/project-setup.js

@@ -8,6 +8,7 @@ const { generateEnvFiles } = require('./env-builder');
 const {
   getInstallCommand,
   getPackageExecCommand,
+  getPackageRunCommand,
   getWorkspaceRunCommand,
 } = require('./package-managers');
 
@@ -66,6 +67,8 @@ async function updateWorkspacePackageJson(projectPath, config) {
   const packageName = toPackageName(config.projectName);
   const packageManager = config.packageManager;
   const resolutions = await collectTemplateResolutions(projectPath);
+  const serverReadyTarget = `tcp:localhost:${config.serverPort}`;
+  const waitForServerCommand = getPackageExecCommand(packageManager, 'wait-on', [serverReadyTarget]);
   const packageJson = {
     name: packageName,
     version: '0.1.0',
@@ -75,13 +78,17 @@ async function updateWorkspacePackageJson(projectPath, config) {
       'server',
     ],
     scripts: {
-      dev: `concurrently -k -n server,app -c cyan,green "${getWorkspaceRunCommand(packageManager, 'server', 'dev')}" "${getPackageExecCommand(packageManager, 'wait-on', [`http://localhost:${config.serverPort}`])} && ${getWorkspaceRunCommand(packageManager, 'app', 'dev')}"`,
+      dev: `concurrently -k -n server,app -c cyan,green "${getWorkspaceRunCommand(packageManager, 'server', 'dev')}" "${waitForServerCommand} && ${getWorkspaceRunCommand(packageManager, 'app', 'dev')}"`,
       'dev:app': getWorkspaceRunCommand(packageManager, 'app', 'dev'),
       'dev:server': getWorkspaceRunCommand(packageManager, 'server', 'dev'),
       build: `${getWorkspaceRunCommand(packageManager, 'server', 'build')} && ${getWorkspaceRunCommand(packageManager, 'app', 'build')}`,
       'build:app': getWorkspaceRunCommand(packageManager, 'app', 'build'),
       'build:server': getWorkspaceRunCommand(packageManager, 'server', 'build'),
-      start: getWorkspaceRunCommand(packageManager, 'server', 'start'),
+      start: `concurrently -k -n server,app -c cyan,green "${getWorkspaceRunCommand(packageManager, 'server', 'start')}" "${waitForServerCommand} && ${getWorkspaceRunCommand(packageManager, 'app', 'start')}"`,
+      'start:app': getWorkspaceRunCommand(packageManager, 'app', 'start'),
+      'start:server': getWorkspaceRunCommand(packageManager, 'server', 'start'),
+      serve: getPackageRunCommand(packageManager, 'start'),
+      'preview:app': getWorkspaceRunCommand(packageManager, 'app', 'preview'),
     },
     devDependencies: {
       concurrently: '^9.2.1',
@@ -106,6 +113,17 @@ async function updateWorkspacePackageJson(projectPath, config) {
 }
 
 async function writePackageManagerConfig(projectPath, config) {
+  if (config.packageManager === 'npm') {
+    await fs.writeFile(
+      path.join(projectPath, '.npmrc'),
+      [
+        'install-strategy=nested',
+        '',
+      ].join('\n'),
+    );
+    return;
+  }
+
   if (config.packageManager !== 'yarn') return;
 
   await fs.writeFile(
@@ -118,6 +136,8 @@ async function writePackageManagerConfig(projectPath, config) {
       '',
       'nodeLinker: node-modules',
       '',
+      'nmHoistingLimits: workspaces',
+      '',
       'npmMinimalAgeGate: 0',
       '',
     ].join('\n'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enfyra/create",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Create a complete Enfyra app with frontend and server workspaces",
   "main": "index.js",
   "bin": {