@equinor/fusion-framework-cli 9.12.9 → 9.12.10

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 (83) hide show
  1. package/CHANGELOG.md +66 -0
  2. package/dist/bin/create-dev-serve.js +15 -2
  3. package/dist/bin/create-dev-serve.js.map +1 -1
  4. package/dist/bin/create-export-manifest.js +1 -0
  5. package/dist/bin/create-export-manifest.js.map +1 -1
  6. package/dist/bin/dev-portal/AppLoader.js +23 -0
  7. package/dist/bin/dev-portal/AppLoader.js.map +1 -1
  8. package/dist/bin/dev-portal/ContextSelector/ContextSelector.js +6 -0
  9. package/dist/bin/dev-portal/ContextSelector/ContextSelector.js.map +1 -1
  10. package/dist/bin/dev-portal/ContextSelector/useContextResolver.js +35 -1
  11. package/dist/bin/dev-portal/ContextSelector/useContextResolver.js.map +1 -1
  12. package/dist/bin/dev-portal/Header.js +1 -0
  13. package/dist/bin/dev-portal/Header.js.map +1 -1
  14. package/dist/bin/dev-portal/PersonSideSheet/index.js +4 -0
  15. package/dist/bin/dev-portal/PersonSideSheet/index.js.map +1 -1
  16. package/dist/bin/dev-portal/PersonSideSheet/sheets/FeatureSheetContent.js +4 -0
  17. package/dist/bin/dev-portal/PersonSideSheet/sheets/FeatureSheetContent.js.map +1 -1
  18. package/dist/bin/dev-portal/PersonSideSheet/sheets/FeatureTogglerApp.js +3 -0
  19. package/dist/bin/dev-portal/PersonSideSheet/sheets/FeatureTogglerApp.js.map +1 -1
  20. package/dist/bin/dev-portal/PersonSideSheet/sheets/FeatureTogglerPortal.js +3 -0
  21. package/dist/bin/dev-portal/PersonSideSheet/sheets/FeatureTogglerPortal.js.map +1 -1
  22. package/dist/bin/dev-portal/PersonSideSheet/sheets/LandingSheetContent.js +3 -0
  23. package/dist/bin/dev-portal/PersonSideSheet/sheets/LandingSheetContent.js.map +1 -1
  24. package/dist/bin/dev-portal/Router.js +3 -0
  25. package/dist/bin/dev-portal/Router.js.map +1 -1
  26. package/dist/bin/dev-portal/config.js +1 -0
  27. package/dist/bin/dev-portal/config.js.map +1 -1
  28. package/dist/bin/dev-portal/useAppContextNavigation.js +27 -6
  29. package/dist/bin/dev-portal/useAppContextNavigation.js.map +1 -1
  30. package/dist/bin/dev-proxy.js +8 -2
  31. package/dist/bin/dev-proxy.js.map +1 -1
  32. package/dist/bin/main.js +3 -0
  33. package/dist/bin/main.js.map +1 -1
  34. package/dist/bin/public/assets/{index-DqjqGv_W.js → index-DKo0kW0J.js} +1139 -595
  35. package/dist/bin/public/index.html +1 -1
  36. package/dist/bin/utils/execute-commant.js +4 -1
  37. package/dist/bin/utils/execute-commant.js.map +1 -1
  38. package/dist/index.js +1 -0
  39. package/dist/index.js.map +1 -1
  40. package/dist/lib/app-config.js +1 -0
  41. package/dist/lib/app-config.js.map +1 -1
  42. package/dist/lib/app-manifest.js +47 -0
  43. package/dist/lib/app-manifest.js.map +1 -1
  44. package/dist/lib/app-package.js +1 -0
  45. package/dist/lib/app-package.js.map +1 -1
  46. package/dist/lib/utils/assert.js +2 -1
  47. package/dist/lib/utils/assert.js.map +1 -1
  48. package/dist/lib/utils/config.js +3 -0
  49. package/dist/lib/utils/config.js.map +1 -1
  50. package/dist/lib/vite-config.js +1 -0
  51. package/dist/lib/vite-config.js.map +1 -1
  52. package/dist/lib/vite-logger.js +2 -0
  53. package/dist/lib/vite-logger.js.map +1 -1
  54. package/dist/types/bin/build-application.d.ts +3 -3
  55. package/dist/types/bin/create-dev-serve.d.ts +1 -1
  56. package/dist/types/bin/create-export-config.d.ts +1 -1
  57. package/dist/types/bin/create-export-manifest.d.ts +1 -1
  58. package/dist/types/bin/dev-portal/AppLoader.d.ts +7 -0
  59. package/dist/types/bin/dev-portal/ContextSelector/ContextSelector.d.ts +5 -0
  60. package/dist/types/bin/dev-portal/ContextSelector/useContextResolver.d.ts +6 -0
  61. package/dist/types/bin/dev-portal/FusionLogo.d.ts +0 -1
  62. package/dist/types/bin/dev-portal/PersonSideSheet/index.d.ts +4 -0
  63. package/dist/types/bin/dev-portal/PersonSideSheet/sheets/FeatureSheetContent.d.ts +4 -0
  64. package/dist/types/bin/dev-portal/PersonSideSheet/sheets/FeatureTogglerApp.d.ts +3 -0
  65. package/dist/types/bin/dev-portal/PersonSideSheet/sheets/FeatureTogglerPortal.d.ts +3 -0
  66. package/dist/types/bin/dev-portal/PersonSideSheet/sheets/LandingSheetContent.d.ts +3 -0
  67. package/dist/types/bin/dev-portal/PersonSideSheet/sheets/Styled.d.ts +0 -1
  68. package/dist/types/bin/dev-portal/useAppContextNavigation.d.ts +4 -0
  69. package/dist/types/bin/dev-proxy.d.ts +1 -2
  70. package/dist/types/bin/utils/execute-commant.d.ts +1 -1
  71. package/dist/types/bin/utils/format.d.ts +0 -2
  72. package/dist/types/bin/utils/load-app-config.d.ts +1 -1
  73. package/dist/types/bin/utils/load-manifest.d.ts +1 -1
  74. package/dist/types/lib/app-config.d.ts +2 -0
  75. package/dist/types/lib/app-manifest.d.ts +34 -0
  76. package/dist/types/lib/app-package.d.ts +2 -2
  77. package/dist/types/lib/utils/assert.d.ts +2 -2
  78. package/dist/types/lib/utils/config.d.ts +6 -0
  79. package/dist/types/lib/utils/expect.d.ts +1 -1
  80. package/dist/types/version.d.ts +1 -1
  81. package/dist/version.js +2 -1
  82. package/dist/version.js.map +1 -1
  83. package/package.json +19 -19
@@ -1 +1 @@
1
- {"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/bin/dev-portal/config.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,8CAA8C,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAC;AAE3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAC;AACtF,OAAO,EACH,wBAAwB,EACxB,eAAe,GAClB,MAAM,uDAAuD,CAAC;AAE/D,MAAM,CAAC,MAAM,SAAS,GAAG,CAAO,MAA6B,EAAE,EAAE;IAC7D,MAAM,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;IAExB,MAAM,CAAC,yBAAyB,CAAC;QAC7B,MAAM,EAAE;YACJ,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG;YACxB,aAAa,EAAE,CAAC,+CAA+C,CAAC;SACnE;KACJ,CAAC,CAAC;IAEH,MAAM,CAAC,aAAa,CAChB;QACI,QAAQ,EAAE,sCAAsC;QAChD,QAAQ,EAAE,sCAAsC;QAChD,WAAW,EAAE,gCAAgC;KAChD,EACD,EAAE,YAAY,EAAE,IAAI,EAAE,CACzB,CAAC;IAEF,eAAe,CAAC,MAAM,CAAC,CAAC;IAExB,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAEzB,cAAc,CAAC,MAAM,CAAC,CAAC;IAEvB,cAAc,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE;QAC/B,OAAO,CAAC,eAAe,CAAC;YACpB,SAAS,EAAE,KAAK;YAChB,UAAU,EAAE,YAAY;YACxB,IAAI,EAAE,YAAY;SACrB,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAGH,qBAAqB,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE;QACtC,OAAO,CAAC,SAAS,CACb,wBAAwB,CAAC;YACrB;gBACI,GAAG,EAAE,aAAa;gBAClB,KAAK,EAAE,kBAAkB;gBACzB,WAAW,EAAE,kCAAkC;aAClD;YACD;gBACI,GAAG,EAAE,QAAQ;gBACb,KAAK,EAAE,cAAc;gBACrB,WAAW,EAAE,4CAA4C;aAC5D;SACJ,CAAC,CACL,CAAC;QACF,OAAO,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE;QACrB,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,aAAa,CAAC,CAAO,MAAM,EAAE,EAAE;QAClC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1D,OAAO,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAClD,CAAC,CAAA,CAAC,CAAC;AACP,CAAC,CAAA,CAAC;AAEF,eAAe,SAAS,CAAC"}
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/bin/dev-portal/config.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,8CAA8C,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAC;AAE3E,OAAO,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,+CAA+C,CAAC;AACtF,OAAO,EACH,wBAAwB,EACxB,eAAe,GAClB,MAAM,uDAAuD,CAAC;AAE/D,MAAM,CAAC,MAAM,SAAS,GAAG,CAAO,MAA6B,EAAE,EAAE;IAC7D,MAAM,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;IAExB,MAAM,CAAC,yBAAyB,CAAC;QAC7B,MAAM,EAAE;YACJ,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG;YACxB,aAAa,EAAE,CAAC,+CAA+C,CAAC;SACnE;KACJ,CAAC,CAAC;IAEH,MAAM,CAAC,aAAa,CAChB;QACI,QAAQ,EAAE,sCAAsC;QAChD,QAAQ,EAAE,sCAAsC;QAChD,WAAW,EAAE,gCAAgC;KAChD,EACD,EAAE,YAAY,EAAE,IAAI,EAAE,CACzB,CAAC;IAEF,eAAe,CAAC,MAAM,CAAC,CAAC;IAExB,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAEzB,cAAc,CAAC,MAAM,CAAC,CAAC;IAEvB,cAAc,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE;QAC/B,OAAO,CAAC,eAAe,CAAC;YACpB,SAAS,EAAE,KAAK;YAChB,UAAU,EAAE,YAAY;YACxB,IAAI,EAAE,YAAY;SACrB,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,sCAAsC;IACtC,qBAAqB,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE;QACtC,OAAO,CAAC,SAAS,CACb,wBAAwB,CAAC;YACrB;gBACI,GAAG,EAAE,aAAa;gBAClB,KAAK,EAAE,kBAAkB;gBACzB,WAAW,EAAE,kCAAkC;aAClD;YACD;gBACI,GAAG,EAAE,QAAQ;gBACb,KAAK,EAAE,cAAc;gBACrB,WAAW,EAAE,4CAA4C;aAC5D;SACJ,CAAC,CACL,CAAC;QACF,OAAO,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE;QACrB,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,aAAa,CAAC,CAAO,MAAM,EAAE,EAAE;QAClC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1D,OAAO,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAClD,CAAC,CAAA,CAAC,CAAC;AACP,CAAC,CAAA,CAAC;AAEF,eAAe,SAAS,CAAC"}
@@ -4,43 +4,64 @@ import { extractContextIdFromPath } from '@equinor/fusion-framework-module-conte
4
4
  import { useObservableSubscription } from '@equinor/fusion-observable/react';
5
5
  import { EMPTY } from 'rxjs';
6
6
  import { useFrameworkModule } from '@equinor/fusion-framework-react';
7
+ /**
8
+ * when current application changes, this hook will observe the application module instances.
9
+ * If the module has Context and Navigation, this hook will navigate when the context changes
10
+ */
7
11
  export const useAppContextNavigation = () => {
8
12
  var _a;
13
+ // use the framework navigation instance
9
14
  const navigation = useFrameworkModule('navigation');
15
+ // use the current application modules
10
16
  const { modules } = useCurrentAppModules();
17
+ // use the application context and navigation from the current application modules
11
18
  const { context, navigation: appNavigation } = modules !== null && modules !== void 0 ? modules : {};
12
- useObservableSubscription((_a = context === null || context === void 0 ? void 0 : context.currentContext$) !== null && _a !== void 0 ? _a : EMPTY, useCallback((item) => {
19
+ // subscribe to the context changes
20
+ useObservableSubscription(
21
+ // if the context is not available, use an empty observable
22
+ (_a = context === null || context === void 0 ? void 0 : context.currentContext$) !== null && _a !== void 0 ? _a : EMPTY,
23
+ // when the context changes, navigate to the new context
24
+ useCallback((item) => {
25
+ // sanity check, if the item or navigation is undefined, early return
13
26
  if (item === undefined || navigation === undefined) {
14
27
  return;
15
28
  }
29
+ // resolve the app base path (application base fragment of url)
16
30
  const currentPathname = appNavigation
17
- ?
31
+ ? // if the app has its own navigation, use it to resolve the app base path
18
32
  appNavigation.path.pathname
19
- :
33
+ : // if the app does not have its own navigation, use the portal navigation to resolve the app base path
20
34
  navigation.path.pathname;
21
35
  console.debug('🌍 Portal:', appNavigation
22
36
  ? 'App has its own navigation, using it to navigate.'
23
37
  : 'App does not have its own navigation, using portal navigation.');
38
+ // extract the context id from the current path
24
39
  const pathContextId = extractContextIdFromPath(currentPathname);
40
+ // generate path to the selected context
25
41
  const pathname = pathContextId
26
42
  ? item
27
- ?
43
+ ? // context id exists in the url, replace it with the new context id
28
44
  currentPathname.replace(pathContextId, item.id)
29
- :
45
+ : // context was cleared, set the path to the root
30
46
  '/'
31
- :
47
+ : // could not find context id in the url, set the path to the new context id
32
48
  `/${item === null || item === void 0 ? void 0 : item.id}`;
33
49
  console.debug('🌍 Portal:', "context changed, navigating to app's context url:", pathContextId
34
50
  ? `found context id [${pathContextId}] in url, ${item ? `replacing with [${item.id}]` : 'context was cleared, navigating to root'}`
35
51
  : `could not find context id in url, navigating to context id [${item ? item.id : 'root'}]`);
52
+ // if app has its own navigation, use it to navigate
36
53
  if (appNavigation) {
54
+ // update the path of the app navigation, preserving search and hash
37
55
  appNavigation.replace(Object.assign(Object.assign({}, appNavigation.path), { pathname }));
38
56
  }
39
57
  else {
58
+ // update the path of the portal navigation, preserving search and hash
40
59
  navigation.replace(Object.assign(Object.assign({}, navigation.path), { pathname }));
41
60
  }
42
61
  }, [
62
+ // framework navigation instance, should not change
43
63
  navigation,
64
+ // application navigation instance, may change when the application changes
44
65
  appNavigation,
45
66
  ]));
46
67
  };
@@ -1 +1 @@
1
- {"version":3,"file":"useAppContextNavigation.js","sourceRoot":"","sources":["../../../src/bin/dev-portal/useAppContextNavigation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAEpC,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAG3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,gDAAgD,CAAC;AAI1F,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAQrE,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAG,EAAE;;IAExC,MAAM,UAAU,GAAG,kBAAkB,CAAmB,YAAY,CAAC,CAAC;IAGtE,MAAM,EAAE,OAAO,EAAE,GAAG,oBAAoB,EAAqB,CAAC;IAE9D,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAC;IAG7D,yBAAyB,CAErB,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,mCAAI,KAAK,EAEjC,WAAW,CACP,CAAC,IAAoC,EAAE,EAAE;QAErC,IAAI,IAAI,KAAK,SAAS,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YACjD,OAAO;QACX,CAAC;QAGD,MAAM,eAAe,GAAG,aAAa;YACjC,CAAC;gBACC,aAAa,CAAC,IAAI,CAAC,QAAQ;YAC7B,CAAC;gBACC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC;QAE/B,OAAO,CAAC,KAAK,CACT,YAAY,EACZ,aAAa;YACT,CAAC,CAAC,mDAAmD;YACrD,CAAC,CAAC,gEAAgE,CACzE,CAAC;QAGF,MAAM,aAAa,GAAG,wBAAwB,CAAC,eAAe,CAAC,CAAC;QAGhE,MAAM,QAAQ,GAAG,aAAa;YAC1B,CAAC,CAAC,IAAI;gBACF,CAAC;oBACC,eAAe,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE,CAAC;gBACjD,CAAC;oBACC,GAAG;YACT,CAAC;gBACC,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,EAAE,EAAE,CAAC;QAErB,OAAO,CAAC,KAAK,CACT,YAAY,EACZ,mDAAmD,EACnD,aAAa;YACT,CAAC,CAAC,qBAAqB,aAAa,aAAa,IAAI,CAAC,CAAC,CAAC,mBAAmB,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,yCAAyC,EAAE;YACnI,CAAC,CAAC,+DAA+D,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAClG,CAAC;QAGF,IAAI,aAAa,EAAE,CAAC;YAEhB,aAAa,CAAC,OAAO,iCAAM,aAAa,CAAC,IAAI,KAAE,QAAQ,IAAG,CAAC;QAC/D,CAAC;aAAM,CAAC;YAEJ,UAAU,CAAC,OAAO,iCAAM,UAAU,CAAC,IAAI,KAAE,QAAQ,IAAG,CAAC;QACzD,CAAC;IACL,CAAC,EACD;QAEI,UAAU;QAEV,aAAa;KAChB,CACJ,CACJ,CAAC;AACN,CAAC,CAAC"}
1
+ {"version":3,"file":"useAppContextNavigation.js","sourceRoot":"","sources":["../../../src/bin/dev-portal/useAppContextNavigation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAEpC,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAG3E,OAAO,EAAE,wBAAwB,EAAE,MAAM,gDAAgD,CAAC;AAI1F,OAAO,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AAC7E,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAIrE;;;GAGG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,GAAG,EAAE;;IACxC,wCAAwC;IACxC,MAAM,UAAU,GAAG,kBAAkB,CAAmB,YAAY,CAAC,CAAC;IAEtE,sCAAsC;IACtC,MAAM,EAAE,OAAO,EAAE,GAAG,oBAAoB,EAAqB,CAAC;IAC9D,kFAAkF;IAClF,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAC;IAE7D,mCAAmC;IACnC,yBAAyB;IACrB,2DAA2D;IAC3D,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,eAAe,mCAAI,KAAK;IACjC,wDAAwD;IACxD,WAAW,CACP,CAAC,IAAoC,EAAE,EAAE;QACrC,qEAAqE;QACrE,IAAI,IAAI,KAAK,SAAS,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YACjD,OAAO;QACX,CAAC;QAED,+DAA+D;QAC/D,MAAM,eAAe,GAAG,aAAa;YACjC,CAAC,CAAC,yEAAyE;gBACzE,aAAa,CAAC,IAAI,CAAC,QAAQ;YAC7B,CAAC,CAAC,sGAAsG;gBACtG,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC;QAE/B,OAAO,CAAC,KAAK,CACT,YAAY,EACZ,aAAa;YACT,CAAC,CAAC,mDAAmD;YACrD,CAAC,CAAC,gEAAgE,CACzE,CAAC;QAEF,+CAA+C;QAC/C,MAAM,aAAa,GAAG,wBAAwB,CAAC,eAAe,CAAC,CAAC;QAEhE,wCAAwC;QACxC,MAAM,QAAQ,GAAG,aAAa;YAC1B,CAAC,CAAC,IAAI;gBACF,CAAC,CAAC,mEAAmE;oBACnE,eAAe,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE,CAAC;gBACjD,CAAC,CAAC,gDAAgD;oBAChD,GAAG;YACT,CAAC,CAAC,2EAA2E;gBAC3E,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,EAAE,EAAE,CAAC;QAErB,OAAO,CAAC,KAAK,CACT,YAAY,EACZ,mDAAmD,EACnD,aAAa;YACT,CAAC,CAAC,qBAAqB,aAAa,aAAa,IAAI,CAAC,CAAC,CAAC,mBAAmB,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,yCAAyC,EAAE;YACnI,CAAC,CAAC,+DAA+D,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAClG,CAAC;QAEF,oDAAoD;QACpD,IAAI,aAAa,EAAE,CAAC;YAChB,oEAAoE;YACpE,aAAa,CAAC,OAAO,iCAAM,aAAa,CAAC,IAAI,KAAE,QAAQ,IAAG,CAAC;QAC/D,CAAC;aAAM,CAAC;YACJ,uEAAuE;YACvE,UAAU,CAAC,OAAO,iCAAM,UAAU,CAAC,IAAI,KAAE,QAAQ,IAAG,CAAC;QACzD,CAAC;IACL,CAAC,EACD;QACI,mDAAmD;QACnD,UAAU;QACV,2EAA2E;QAC3E,aAAa;KAChB,CACJ,CACJ,CAAC;AACN,CAAC,CAAC"}
@@ -16,7 +16,9 @@ const createResponseInterceptor = (cb) => {
16
16
  var _a, _b, _c;
17
17
  res.setHeader('x-proxy-status-message', (_a = proxyRes.statusMessage) !== null && _a !== void 0 ? _a : '');
18
18
  res.setHeader('x-proxy-status-code', (_b = proxyRes.statusCode) !== null && _b !== void 0 ? _b : '');
19
- const { response, statusCode, path } = (_c = (yield Promise.resolve(cb(req.params, proxyRes, Number(proxyRes.statusCode) < 400 &&
19
+ const { response, statusCode, path } = (_c = (yield Promise.resolve(cb(req.params, proxyRes,
20
+ // might check??
21
+ Number(proxyRes.statusCode) < 400 &&
20
22
  JSON.parse(responseBuffer.toString('utf8')))))) !== null && _c !== void 0 ? _c : {};
21
23
  if (statusCode) {
22
24
  res.statusCode = statusCode;
@@ -28,6 +30,7 @@ const createResponseInterceptor = (cb) => {
28
30
  return responseBuffer;
29
31
  }));
30
32
  };
33
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
31
34
  export const createDevProxy = (handler, options) => {
32
35
  var _a;
33
36
  const proxyOptions = Object.assign({
@@ -61,13 +64,16 @@ export const createDevProxy = (handler, options) => {
61
64
  const response = JSON.parse(responseBuffer.toString('utf8'));
62
65
  response.environmentName = 'DEVELOPMENT';
63
66
  response.services = response.services.filter((x) => x.key !== 'app');
67
+ /** refer service [app] to vite middleware */
64
68
  response.services.push({
65
69
  key: 'app',
66
70
  uri: new URL('/', req.headers.referer).href,
67
71
  });
68
72
  return JSON.stringify(response);
69
73
  })) })));
70
- app.get('/api/apps/:appKey/config', createProxyMiddleware('/api/apps/*/config', Object.assign(Object.assign({}, proxyOptions), { onProxyRes: createResponseInterceptor(handler.onConfigResponse) })));
74
+ app.get('/api/apps/:appKey/config',
75
+ // '/api/widget/:appKey/config',
76
+ createProxyMiddleware('/api/apps/*/config', Object.assign(Object.assign({}, proxyOptions), { onProxyRes: createResponseInterceptor(handler.onConfigResponse) })));
71
77
  app.get('/api/apps/:appKey', createProxyMiddleware('/api/apps/*', Object.assign(Object.assign({}, proxyOptions), { onProxyRes: createResponseInterceptor(handler.onManifestResponse) })));
72
78
  app.get('/api/apps', createProxyMiddleware('/api/apps', Object.assign(Object.assign({}, proxyOptions), { onProxyRes: createResponseInterceptor(handler.onManifestListResponse) })));
73
79
  return app;
@@ -1 +1 @@
1
- {"version":3,"file":"dev-proxy.js","sourceRoot":"","sources":["../../src/bin/dev-proxy.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dev-proxy.js","sourceRoot":"","sources":["../../src/bin/dev-proxy.ts"],"names":[],"mappings":"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"}
package/dist/bin/main.js CHANGED
@@ -1,6 +1,7 @@
1
1
  var _a;
2
2
  import { fileURLToPath } from 'node:url';
3
3
  import { dirname, resolve } from 'node:path';
4
+ /** find cli package.json */
4
5
  import { readPackageUpSync } from 'read-package-up';
5
6
  const pkg = readPackageUpSync({ cwd: fileURLToPath(import.meta.url) });
6
7
  if (!pkg) {
@@ -12,7 +13,9 @@ const program = new Command();
12
13
  program.name(pkg.packageJson.name);
13
14
  program.description((_a = pkg.packageJson.description) !== null && _a !== void 0 ? _a : 'CLI for Fusion Framework');
14
15
  program.version(pkg.packageJson.version);
16
+ /** add app commands */
15
17
  import app from './main.app.js';
16
18
  app(program);
19
+ /** read action and options and start programs */
17
20
  program.parse();
18
21
  //# sourceMappingURL=main.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/bin/main.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAG7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,MAAM,GAAG,GAAG,iBAAiB,CAAC,EAAE,GAAG,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AACvE,IAAI,CAAC,GAAG,EAAE,CAAC;IACP,MAAM,KAAK,CAAC,6BAA6B,CAAC,CAAC;AAC/C,CAAC;AACD,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,OAAO,CACzB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EACjB,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,GAAI,CAAC,sBAAsB,CAAC,CAAC,CACvD,CAAC;AAEF,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAC9B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;AACnC,OAAO,CAAC,WAAW,CAAC,MAAA,GAAG,CAAC,WAAW,CAAC,WAAW,mCAAI,0BAA0B,CAAC,CAAC;AAC/E,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;AAGzC,OAAO,GAAG,MAAM,eAAe,CAAC;AAChC,GAAG,CAAC,OAAO,CAAC,CAAC;AAGb,OAAO,CAAC,KAAK,EAAE,CAAC"}
1
+ {"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/bin/main.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE7C,4BAA4B;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,MAAM,GAAG,GAAG,iBAAiB,CAAC,EAAE,GAAG,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;AACvE,IAAI,CAAC,GAAG,EAAE,CAAC;IACP,MAAM,KAAK,CAAC,6BAA6B,CAAC,CAAC;AAC/C,CAAC;AACD,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,OAAO,CACzB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EACjB,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,GAAI,CAAC,sBAAsB,CAAC,CAAC,CACvD,CAAC;AAEF,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,MAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;AAC9B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;AACnC,OAAO,CAAC,WAAW,CAAC,MAAA,GAAG,CAAC,WAAW,CAAC,WAAW,mCAAI,0BAA0B,CAAC,CAAC;AAC/E,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;AAEzC,uBAAuB;AACvB,OAAO,GAAG,MAAM,eAAe,CAAC;AAChC,GAAG,CAAC,OAAO,CAAC,CAAC;AAEb,iDAAiD;AACjD,OAAO,CAAC,KAAK,EAAE,CAAC"}