@openmrs/esm-routes 10.0.1-pre.5539 → 10.0.1-pre.5545
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/.turbo/turbo-build.log +1 -1
- package/dist/loaders/components.d.ts.map +1 -1
- package/dist/loaders/components.js +0 -2
- package/dist/loaders/pages.d.ts.map +1 -1
- package/dist/loaders/pages.js +9 -22
- package/package.json +13 -13
- package/src/loaders/components.ts +0 -2
- package/src/loaders/pages.ts +11 -27
package/.turbo/turbo-build.log
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"components.d.ts","sourceRoot":"","sources":["../../src/loaders/components.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,qBAAqB,EAC1B,KAAK,eAAe,EACpB,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,KAAK,wBAAwB,EAC7B,KAAK,yBAAyB,EAC9B,KAAK,0BAA0B,EAChC,MAAM,sBAAsB,CAAC;AAI9B;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,mBAAmB,
|
|
1
|
+
{"version":3,"file":"components.d.ts","sourceRoot":"","sources":["../../src/loaders/components.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,KAAK,mBAAmB,EACxB,KAAK,qBAAqB,EAC1B,KAAK,eAAe,EACpB,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,KAAK,wBAAwB,EAC7B,KAAK,yBAAyB,EAC9B,KAAK,0BAA0B,EAChC,MAAM,sBAAsB,CAAC;AAI9B;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,mBAAmB,QA2CnF;AAED;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,eAAe,QA0BvE;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,mBAAmB,QAkDnF;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,wBAAwB,QAelG;AAED,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,EAAE,kBAAkB,EAAE,KAAK,CAAC,yBAAyB,CAAC,QAEhH;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,KAAK,CAAC,oBAAoB,CAAC,QAEhG;AAED,wBAAgB,4BAA4B,CAAC,OAAO,EAAE,MAAM,EAAE,mBAAmB,EAAE,KAAK,CAAC,0BAA0B,CAAC,QAiBnH;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,qBAAqB,QAgCzF"}
|
|
@@ -34,8 +34,6 @@ To fix this, ensure that you define a 'component' field inside the extension def
|
|
|
34
34
|
order: extension.order,
|
|
35
35
|
moduleName: appName,
|
|
36
36
|
privileges: extension.privileges,
|
|
37
|
-
online: extension.online ?? true,
|
|
38
|
-
offline: extension.offline ?? false,
|
|
39
37
|
featureFlag: extension.featureFlag,
|
|
40
38
|
displayExpression: extension.displayExpression
|
|
41
39
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pages.d.ts","sourceRoot":"","sources":["../../src/loaders/pages.ts"],"names":[],"mappings":"AAGA,OAAO,EAKL,KAAK,gBAAgB,EAItB,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"pages.d.ts","sourceRoot":"","sources":["../../src/loaders/pages.ts"],"names":[],"mappings":"AAGA,OAAO,EAKL,KAAK,gBAAgB,EAItB,MAAM,sBAAsB,CAAC;AA8D9B;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,QAIpE;AAmGD;;;;GAIG;AACH,wBAAgB,wBAAwB,SAoCvC"}
|
package/dist/loaders/pages.js
CHANGED
|
@@ -29,34 +29,21 @@ const pages = [];
|
|
|
29
29
|
}
|
|
30
30
|
}
|
|
31
31
|
/**
|
|
32
|
-
* For pages, we also add support for
|
|
33
|
-
* any feature flags.
|
|
34
|
-
*
|
|
35
|
-
* By default, we assume that all pages should be rendered when online, but only rendered
|
|
36
|
-
* offline if specifically configured to do so.
|
|
32
|
+
* For pages, we also add support for rendering them based on any feature flags.
|
|
37
33
|
*
|
|
38
34
|
* @param activityFn A standard single-spa activityFn such as that returned by {@link getActivityFn()}
|
|
39
35
|
* @param pageDefinition The RegisteredPageDefinition object for this page
|
|
40
36
|
* @returns An activityFn suitable to use for a single-spa application
|
|
41
|
-
*/ function wrapPageActivityFn(activityFn, {
|
|
42
|
-
if (
|
|
43
|
-
return (location)=>{
|
|
44
|
-
// basically, if the page should only work online and we're offline or if the
|
|
45
|
-
// page should only work offline and we're online, defaulting to always rendering
|
|
46
|
-
// the page
|
|
47
|
-
if (!(navigator.onLine && (online ?? true) || !navigator.onLine && (offline ?? false))) {
|
|
48
|
-
return false;
|
|
49
|
-
}
|
|
50
|
-
if (featureFlag) {
|
|
51
|
-
if (!getFeatureFlag(featureFlag)) {
|
|
52
|
-
return false;
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
|
-
return activityFn(location);
|
|
56
|
-
};
|
|
57
|
-
} else {
|
|
37
|
+
*/ function wrapPageActivityFn(activityFn, { featureFlag }) {
|
|
38
|
+
if (!featureFlag) {
|
|
58
39
|
return activityFn;
|
|
59
40
|
}
|
|
41
|
+
return (location)=>{
|
|
42
|
+
if (!getFeatureFlag(featureFlag)) {
|
|
43
|
+
return false;
|
|
44
|
+
}
|
|
45
|
+
return activityFn(location);
|
|
46
|
+
};
|
|
60
47
|
}
|
|
61
48
|
/**
|
|
62
49
|
* This is the main entry-point for registering an app with the app shell.
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@openmrs/esm-routes",
|
|
3
|
-
"version": "10.0.1-pre.
|
|
3
|
+
"version": "10.0.1-pre.5545",
|
|
4
4
|
"license": "MPL-2.0",
|
|
5
5
|
"description": "Utilities for working with the routes registry",
|
|
6
6
|
"type": "module",
|
|
@@ -47,21 +47,21 @@
|
|
|
47
47
|
"access": "public"
|
|
48
48
|
},
|
|
49
49
|
"peerDependencies": {
|
|
50
|
-
"@openmrs/esm-config": "^10.0.1-pre.
|
|
51
|
-
"@openmrs/esm-dynamic-loading": "^10.0.1-pre.
|
|
52
|
-
"@openmrs/esm-extensions": "^10.0.1-pre.
|
|
53
|
-
"@openmrs/esm-feature-flags": "^10.0.1-pre.
|
|
54
|
-
"@openmrs/esm-globals": "^10.0.1-pre.
|
|
55
|
-
"@openmrs/esm-utils": "^10.0.1-pre.
|
|
50
|
+
"@openmrs/esm-config": "^10.0.1-pre.5545",
|
|
51
|
+
"@openmrs/esm-dynamic-loading": "^10.0.1-pre.5545",
|
|
52
|
+
"@openmrs/esm-extensions": "^10.0.1-pre.5545",
|
|
53
|
+
"@openmrs/esm-feature-flags": "^10.0.1-pre.5545",
|
|
54
|
+
"@openmrs/esm-globals": "^10.0.1-pre.5545",
|
|
55
|
+
"@openmrs/esm-utils": "^10.0.1-pre.5545",
|
|
56
56
|
"single-spa": "6.x"
|
|
57
57
|
},
|
|
58
58
|
"devDependencies": {
|
|
59
|
-
"@openmrs/esm-config": "10.0.1-pre.
|
|
60
|
-
"@openmrs/esm-dynamic-loading": "10.0.1-pre.
|
|
61
|
-
"@openmrs/esm-extensions": "10.0.1-pre.
|
|
62
|
-
"@openmrs/esm-feature-flags": "10.0.1-pre.
|
|
63
|
-
"@openmrs/esm-globals": "10.0.1-pre.
|
|
64
|
-
"@openmrs/esm-utils": "10.0.1-pre.
|
|
59
|
+
"@openmrs/esm-config": "10.0.1-pre.5545",
|
|
60
|
+
"@openmrs/esm-dynamic-loading": "10.0.1-pre.5545",
|
|
61
|
+
"@openmrs/esm-extensions": "10.0.1-pre.5545",
|
|
62
|
+
"@openmrs/esm-feature-flags": "10.0.1-pre.5545",
|
|
63
|
+
"@openmrs/esm-globals": "10.0.1-pre.5545",
|
|
64
|
+
"@openmrs/esm-utils": "10.0.1-pre.5545",
|
|
65
65
|
"@swc/cli": "0.8.1",
|
|
66
66
|
"@swc/core": "1.15.21",
|
|
67
67
|
"@vitest/coverage-v8": "^4.1.2",
|
|
@@ -64,8 +64,6 @@ To fix this, ensure that you define a 'component' field inside the extension def
|
|
|
64
64
|
order: extension.order,
|
|
65
65
|
moduleName: appName,
|
|
66
66
|
privileges: extension.privileges,
|
|
67
|
-
online: extension.online ?? true,
|
|
68
|
-
offline: extension.offline ?? false,
|
|
69
67
|
featureFlag: extension.featureFlag,
|
|
70
68
|
displayExpression: extension.displayExpression,
|
|
71
69
|
});
|
package/src/loaders/pages.ts
CHANGED
|
@@ -52,40 +52,24 @@ function getActivityFn(route: RouteDefinition | Array<RouteDefinition>): Activit
|
|
|
52
52
|
}
|
|
53
53
|
|
|
54
54
|
/**
|
|
55
|
-
* For pages, we also add support for
|
|
56
|
-
* any feature flags.
|
|
57
|
-
*
|
|
58
|
-
* By default, we assume that all pages should be rendered when online, but only rendered
|
|
59
|
-
* offline if specifically configured to do so.
|
|
55
|
+
* For pages, we also add support for rendering them based on any feature flags.
|
|
60
56
|
*
|
|
61
57
|
* @param activityFn A standard single-spa activityFn such as that returned by {@link getActivityFn()}
|
|
62
58
|
* @param pageDefinition The RegisteredPageDefinition object for this page
|
|
63
59
|
* @returns An activityFn suitable to use for a single-spa application
|
|
64
60
|
*/
|
|
65
|
-
function wrapPageActivityFn(
|
|
66
|
-
|
|
67
|
-
{ online, offline, featureFlag }: RegisteredPageDefinition,
|
|
68
|
-
): ActivityFn {
|
|
69
|
-
if (window.offlineEnabled) {
|
|
70
|
-
return (location) => {
|
|
71
|
-
// basically, if the page should only work online and we're offline or if the
|
|
72
|
-
// page should only work offline and we're online, defaulting to always rendering
|
|
73
|
-
// the page
|
|
74
|
-
if (!((navigator.onLine && (online ?? true)) || (!navigator.onLine && (offline ?? false)))) {
|
|
75
|
-
return false;
|
|
76
|
-
}
|
|
77
|
-
|
|
78
|
-
if (featureFlag) {
|
|
79
|
-
if (!getFeatureFlag(featureFlag)) {
|
|
80
|
-
return false;
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
|
-
|
|
84
|
-
return activityFn(location);
|
|
85
|
-
};
|
|
86
|
-
} else {
|
|
61
|
+
function wrapPageActivityFn(activityFn: ActivityFn, { featureFlag }: RegisteredPageDefinition): ActivityFn {
|
|
62
|
+
if (!featureFlag) {
|
|
87
63
|
return activityFn;
|
|
88
64
|
}
|
|
65
|
+
|
|
66
|
+
return (location) => {
|
|
67
|
+
if (!getFeatureFlag(featureFlag)) {
|
|
68
|
+
return false;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
return activityFn(location);
|
|
72
|
+
};
|
|
89
73
|
}
|
|
90
74
|
|
|
91
75
|
/**
|