@things-factory/shell 6.0.12 → 6.0.18

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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/shell",
3
- "version": "6.0.12",
3
+ "version": "6.0.18",
4
4
  "description": "Core module for framework",
5
5
  "bin": {
6
6
  "things-factory": "bin/things-factory",
@@ -131,5 +131,5 @@
131
131
  "pg": "^8.7.3",
132
132
  "sqlite3": "^5.0.8"
133
133
  },
134
- "gitHead": "6dd9637de0444917aa5a3621ce1f361cfb483f36"
134
+ "gitHead": "2e3e970ad20b2d7b67653ce04341bdf150ae7ebc"
135
135
  }
@@ -241,9 +241,6 @@ const bootstrap = async () => {
241
241
  })
242
242
 
243
243
  app.use(koaBodyParser(bodyParserOption))
244
- app.use(graphqlUploadKoa(fileUploadOption))
245
-
246
- server.applyMiddleware({ app, path: '/graphql' })
247
244
 
248
245
  /* routers */
249
246
  process.emit('bootstrap-module-global-public-route' as any, app, globalPublicRouter)
@@ -261,6 +258,10 @@ const bootstrap = async () => {
261
258
  .use(domainPrivateRouter.routes())
262
259
  .use(domainPrivateRouter.allowedMethods())
263
260
 
261
+ /* Graphql Upload's multipart/form-data handling affects the restful file upload feature, so it should be placed after the routers configuration. */
262
+ app.use(graphqlUploadKoa(fileUploadOption))
263
+ server.applyMiddleware({ app, path: '/graphql' })
264
+
264
265
  /* should follow this order : history-fallback => webpack-middleware => koaStatic */
265
266
  app.use(historyApiFallback({ whiteList: [] }))
266
267
 
package/server/server.ts CHANGED
@@ -200,9 +200,6 @@ const bootstrap = async () => {
200
200
  })
201
201
 
202
202
  app.use(koaBodyParser(bodyParserOption))
203
- app.use(graphqlUploadKoa(fileUploadOption))
204
-
205
- server.applyMiddleware({ app, path: '/graphql' })
206
203
 
207
204
  /* routers */
208
205
  process.emit('bootstrap-module-global-public-route' as any, app, globalPublicRouter)
@@ -220,6 +217,10 @@ const bootstrap = async () => {
220
217
  .use(domainPrivateRouter.routes())
221
218
  .use(domainPrivateRouter.allowedMethods())
222
219
 
220
+ /* Graphql Upload's multipart/form-data handling affects the restful file upload feature, so it should be placed after the routers configuration. */
221
+ app.use(graphqlUploadKoa(fileUploadOption))
222
+ server.applyMiddleware({ app, path: '/graphql' })
223
+
223
224
  /* should follow this order : history-fallback => koaStatic */
224
225
  app.use(historyApiFallback({ whiteList: [] }))
225
226