@swell/cli 2.5.3 → 2.5.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/bin/run.js CHANGED
@@ -1,4 +1,4 @@
1
- #!/usr/bin/env ts-node
1
+ #!/usr/bin/env node
2
2
 
3
3
  // eslint-disable-next-line unicorn/prefer-top-level-await, node/shebang
4
4
  (async () => {
@@ -69,12 +69,12 @@ export default class AppDev extends PushAppCommand {
69
69
  this.saveCurrentStorefront();
70
70
  const spinner = ora();
71
71
  spinner.start(`Starting app dev server...\n`);
72
- const serverPort = await this.startProxyServer(port);
73
- await this.startAppFunctionServer(spinner, serverPort);
74
- await this.runAppFrontendDevIfApplicable(frontendPort);
75
72
  // Register cleanup handlers to clear local proxy on exit
76
73
  process.on('SIGINT', this.cleanupOnExit.bind(this));
77
74
  process.on('SIGTERM', this.cleanupOnExit.bind(this));
75
+ const serverPort = await this.startProxyServer(port);
76
+ await this.startAppFunctionServer(spinner, serverPort);
77
+ await this.runAppFrontendDevIfApplicable(frontendPort);
78
78
  }
79
79
  async cleanupOnExit() {
80
80
  if (this.isCleaningUp)
@@ -100,7 +100,12 @@ export default class AppDev extends PushAppCommand {
100
100
  // Store frontend port for function router to use for fallback routing
101
101
  this.frontendPort = proxyPort;
102
102
  this.argv.push('--proxy-port', String(proxyPort));
103
- this.config.runCommand('app:frontend:dev', this.argv);
103
+ this.config.runCommand('app:frontend:dev', this.argv).catch((error) => {
104
+ // SIGTERM/SIGINT during dev server shutdown is expected
105
+ if (error?.signal === 'SIGTERM' || error?.signal === 'SIGINT')
106
+ return;
107
+ this.error(error);
108
+ });
104
109
  return proxyPort;
105
110
  }
106
111
  }
@@ -58,7 +58,12 @@ export default class AppFrontendDev extends PushAppCommand {
58
58
  const serverPort = isAppDev && proxyPort
59
59
  ? proxyPort
60
60
  : await this.startProxyServer(proxyPort || port);
61
- await this.execFrontendProject(serverPort, isAppDev);
61
+ await this.execFrontendProject(serverPort, isAppDev).catch((error) => {
62
+ // SIGTERM/SIGINT during dev server shutdown is expected
63
+ if (error?.signal === 'SIGTERM' || error?.signal === 'SIGINT')
64
+ return;
65
+ throw error;
66
+ });
62
67
  }
63
68
  async execFrontendProject(serverPort, isAppDev) {
64
69
  const projectType = this.getFrontendProjectType(!isAppDev);
@@ -2969,5 +2969,5 @@
2969
2969
  ]
2970
2970
  }
2971
2971
  },
2972
- "version": "2.5.3"
2972
+ "version": "2.5.5"
2973
2973
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@swell/cli",
3
- "version": "2.5.3",
3
+ "version": "2.5.5",
4
4
  "type": "module",
5
5
  "description": "Swell's command line interface/utility",
6
6
  "keywords": [
@@ -113,7 +113,6 @@
113
113
  }
114
114
  },
115
115
  "scripts": {
116
- "preinstall": "npm i -g ts-node",
117
116
  "build": "shx rm -rf dist && shx rm -f tsconfig.tsbuildinfo && tsc -b",
118
117
  "lint": "eslint . --ext .ts --config .eslintrc",
119
118
  "postpack": "shx rm -f oclif.manifest.json",