@rnx-kit/cli 0.18.6 → 0.18.7

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.
Files changed (2) hide show
  1. package/lib/start.js +21 -13
  2. package/package.json +1 -1
package/lib/start.js CHANGED
@@ -148,24 +148,32 @@ async function rnxStart(_argv, ctx, args) {
148
148
  }
149
149
  },
150
150
  };
151
+ const unstable_extraMiddleware = [];
152
+ if (coreDevMiddleware) {
153
+ unstable_extraMiddleware.push(devServer.middleware);
154
+ if (indexPageMiddleware) {
155
+ unstable_extraMiddleware.push(indexPageMiddleware);
156
+ }
157
+ unstable_extraMiddleware.push(coreDevMiddleware.middleware);
158
+ if (coreDevMiddleware.websocketEndpoints) {
159
+ if (websocketEndpoints) {
160
+ const endpoints = Object.entries(coreDevMiddleware.websocketEndpoints);
161
+ for (const [key, value] of endpoints) {
162
+ websocketEndpoints[key] = value;
163
+ }
164
+ }
165
+ else {
166
+ websocketEndpoints = coreDevMiddleware.websocketEndpoints;
167
+ }
168
+ }
169
+ }
151
170
  const serverInstance = await (0, metro_service_1.startServer)(metroConfig, {
152
171
  host: args.host,
153
172
  secure: args.https,
154
173
  secureCert: args.cert,
155
174
  secureKey: args.key,
156
- ...(coreDevMiddleware
157
- ? {
158
- unstable_extraMiddleware: [
159
- devServer.middleware,
160
- indexPageMiddleware,
161
- coreDevMiddleware.middleware,
162
- ],
163
- websocketEndpoints: {
164
- ...websocketEndpoints,
165
- ...coreDevMiddleware.websocketEndpoints,
166
- },
167
- }
168
- : { websocketEndpoints }),
175
+ unstable_extraMiddleware,
176
+ websocketEndpoints,
169
177
  });
170
178
  if (hasAttachToServerFunction(devServer)) {
171
179
  const { messageSocket, eventsSocket } = devServer.attachToServer(serverInstance);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rnx-kit/cli",
3
- "version": "0.18.6",
3
+ "version": "0.18.7",
4
4
  "description": "Command-line interface for working with kit packages in your repo",
5
5
  "homepage": "https://github.com/microsoft/rnx-kit/tree/main/packages/cli#readme",
6
6
  "license": "MIT",