@wix/builder-services 1.16.8 → 1.16.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.
@@ -1,7 +1,7 @@
1
1
  import React from 'react';
2
2
  import type { ServiceBinding } from '@wix/services-manager/types';
3
3
  type ServicesRecord = Record<string, ServiceBinding<any, any>>;
4
- export declare function createServicesProvider(servicesConfigs: ServicesRecord, masterPageServicesConfigs: ServicesRecord, siteServicesConfigs: ServicesRecord): ({ children }: {
4
+ export declare function createServicesProvider(servicesConfigs: ServicesRecord, masterPageServicesConfigs: ServicesRecord, siteServicesConfigs: ServicesRecord, runtimeServicesConfigs?: Record<string, Record<string, unknown>>): ({ children }: {
5
5
  children: React.ReactNode;
6
6
  }) => React.JSX.Element;
7
7
  export {};
@@ -1,18 +1,26 @@
1
1
  'use client';
2
2
  import React from 'react';
3
3
  import _ from 'lodash';
4
- import { createServicesManager, createServicesMap } from '@wix/services-manager';
5
- import { ServicesManagerProvider } from '@wix/services-manager-react';
6
- export function createServicesProvider(servicesConfigs, masterPageServicesConfigs, siteServicesConfigs) {
4
+ import { createServicesMap } from '@wix/services-manager';
5
+ import { WixServices } from '@wix/services-manager-react';
6
+ export function createServicesProvider(servicesConfigs, masterPageServicesConfigs, siteServicesConfigs, runtimeServicesConfigs = {}) {
7
7
  const mergedServices = _.mergeWith({}, servicesConfigs, masterPageServicesConfigs, siteServicesConfigs, (objValue, srcValue) => {
8
8
  // array merge was added for the interactions service config merge
9
9
  if (Array.isArray(objValue) && Array.isArray(srcValue)) {
10
10
  return [...objValue, ...srcValue];
11
11
  }
12
12
  });
13
+ Object.entries(runtimeServicesConfigs).forEach(([key, runtimeConfig]) => {
14
+ if (mergedServices[key]) {
15
+ _.merge(mergedServices[key].config, runtimeConfig);
16
+ }
17
+ });
13
18
  const servicesMap = createServicesMap(Object.values(mergedServices));
14
- const servicesManager = createServicesManager(servicesMap);
15
- const ServicesProvider = ({ children }) => (React.createElement(ServicesManagerProvider, { servicesManager: servicesManager }, children));
19
+ // Use WixServices (not a bare ServicesManagerProvider) so that when this generated provider is
20
+ // nested inside an existing services manager, it extends the parent and delegates lookups for
21
+ // services it doesn't define (e.g. environment) instead of shadowing it. When there is no parent
22
+ // (top-level exported site) it falls back to creating a standalone manager — same as before.
23
+ const ServicesProvider = ({ children }) => (React.createElement(WixServices, { servicesMap: servicesMap }, children));
16
24
  return ServicesProvider;
17
25
  }
18
26
  //# sourceMappingURL=createServicesProvider.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"createServicesProvider.js","sourceRoot":"","sources":["../src/createServicesProvider.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,CAAC,MAAM,QAAQ,CAAA;AACtB,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAEhF,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAA;AAIrE,MAAM,UAAU,sBAAsB,CAClC,eAA+B,EAC/B,yBAAyC,EACzC,mBAAmC;IAEnC,MAAM,cAAc,GAAG,CAAC,CAAC,SAAS,CAC9B,EAAE,EACF,eAAe,EACf,yBAAyB,EACzB,mBAAmB,EACnB,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE;QACnB,kEAAkE;QAClE,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACrD,OAAO,CAAC,GAAG,QAAQ,EAAE,GAAG,QAAQ,CAAC,CAAA;QACrC,CAAC;IACL,CAAC,CACJ,CAAA;IAED,MAAM,WAAW,GAAG,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAA;IACpE,MAAM,eAAe,GAAG,qBAAqB,CAAC,WAAW,CAAC,CAAA;IAE1D,MAAM,gBAAgB,GAAG,CAAC,EAAE,QAAQ,EAAiC,EAAE,EAAE,CAAC,CACtE,oBAAC,uBAAuB,IAAC,eAAe,EAAE,eAAe,IAAG,QAAQ,CAA2B,CAClG,CAAA;IAED,OAAO,gBAAgB,CAAA;AAC3B,CAAC"}
1
+ {"version":3,"file":"createServicesProvider.js","sourceRoot":"","sources":["../src/createServicesProvider.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,CAAC,MAAM,QAAQ,CAAA;AACtB,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAEzD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAIzD,MAAM,UAAU,sBAAsB,CAClC,eAA+B,EAC/B,yBAAyC,EACzC,mBAAmC,EACnC,yBAAkE,EAAE;IAEpE,MAAM,cAAc,GAAG,CAAC,CAAC,SAAS,CAC9B,EAAE,EACF,eAAe,EACf,yBAAyB,EACzB,mBAAmB,EACnB,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE;QACnB,kEAAkE;QAClE,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YACrD,OAAO,CAAC,GAAG,QAAQ,EAAE,GAAG,QAAQ,CAAC,CAAA;QACrC,CAAC;IACL,CAAC,CACJ,CAAA;IAED,MAAM,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,aAAa,CAAC,EAAE,EAAE;QACpE,IAAI,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC;YACtB,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,aAAa,CAAC,CAAA;QACtD,CAAC;IACL,CAAC,CAAC,CAAA;IAEF,MAAM,WAAW,GAAG,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAA;IAEpE,+FAA+F;IAC/F,8FAA8F;IAC9F,iGAAiG;IACjG,6FAA6F;IAC7F,MAAM,gBAAgB,GAAG,CAAC,EAAE,QAAQ,EAAiC,EAAE,EAAE,CAAC,CACtE,oBAAC,WAAW,IAAC,WAAW,EAAE,WAAW,IAAG,QAAQ,CAAe,CAClE,CAAA;IAED,OAAO,gBAAgB,CAAA;AAC3B,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@wix/builder-services",
3
- "version": "1.16.8",
3
+ "version": "1.16.10",
4
4
  "description": "Builder services wrapper for dynamic service registration",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -74,5 +74,5 @@
74
74
  },
75
75
  "module": "dist/bundles/es/builder-services.mjs",
76
76
  "type": "module",
77
- "falconPackageHash": "99e68a97fac1353928d1d104b306744fd8551f69858e943baa9f556e"
77
+ "falconPackageHash": "75e581b7c6ce1678074bb30541b1f0e2e23653b6d7249eefc4318062"
78
78
  }
@@ -2,16 +2,17 @@
2
2
 
3
3
  import React from 'react'
4
4
  import _ from 'lodash'
5
- import { createServicesManager, createServicesMap } from '@wix/services-manager'
5
+ import { createServicesMap } from '@wix/services-manager'
6
6
  import type { ServiceBinding } from '@wix/services-manager/types'
7
- import { ServicesManagerProvider } from '@wix/services-manager-react'
7
+ import { WixServices } from '@wix/services-manager-react'
8
8
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
9
9
  type ServicesRecord = Record<string, ServiceBinding<any, any>>
10
10
 
11
11
  export function createServicesProvider(
12
12
  servicesConfigs: ServicesRecord,
13
13
  masterPageServicesConfigs: ServicesRecord,
14
- siteServicesConfigs: ServicesRecord
14
+ siteServicesConfigs: ServicesRecord,
15
+ runtimeServicesConfigs: Record<string, Record<string, unknown>> = {}
15
16
  ) {
16
17
  const mergedServices = _.mergeWith(
17
18
  {},
@@ -26,11 +27,20 @@ export function createServicesProvider(
26
27
  }
27
28
  )
28
29
 
30
+ Object.entries(runtimeServicesConfigs).forEach(([key, runtimeConfig]) => {
31
+ if (mergedServices[key]) {
32
+ _.merge(mergedServices[key].config, runtimeConfig)
33
+ }
34
+ })
35
+
29
36
  const servicesMap = createServicesMap(Object.values(mergedServices))
30
- const servicesManager = createServicesManager(servicesMap)
31
37
 
38
+ // Use WixServices (not a bare ServicesManagerProvider) so that when this generated provider is
39
+ // nested inside an existing services manager, it extends the parent and delegates lookups for
40
+ // services it doesn't define (e.g. environment) instead of shadowing it. When there is no parent
41
+ // (top-level exported site) it falls back to creating a standalone manager — same as before.
32
42
  const ServicesProvider = ({ children }: { children: React.ReactNode }) => (
33
- <ServicesManagerProvider servicesManager={servicesManager}>{children}</ServicesManagerProvider>
43
+ <WixServices servicesMap={servicesMap}>{children}</WixServices>
34
44
  )
35
45
 
36
46
  return ServicesProvider