@common-stack/server-stack 7.2.1-alpha.6 → 7.2.1-alpha.8
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/lib/infrastructure/infrastructure-factory.cjs +20 -8
- package/lib/infrastructure/infrastructure-factory.cjs.map +1 -1
- package/lib/infrastructure/infrastructure-factory.mjs +20 -8
- package/lib/infrastructure/infrastructure-factory.mjs.map +1 -1
- package/lib/servers/ExpressApp.cjs +1 -1
- package/lib/servers/ExpressApp.cjs.map +1 -1
- package/lib/servers/ExpressApp.mjs +1 -1
- package/lib/servers/ExpressApp.mjs.map +1 -1
- package/package.json +2 -2
|
@@ -27,11 +27,16 @@
|
|
|
27
27
|
const allModules = await this.loadAndComposeModules(serverFeature, context, connectorConfig, existingAllModules);
|
|
28
28
|
// Step 5: Create container based on module composition
|
|
29
29
|
const container = await this.createContainerFromModules(allModules, type, settings, context, existingAllModules);
|
|
30
|
-
// Step 6: Initialize services
|
|
31
|
-
// Only create services and load Moleculer services for new modules
|
|
30
|
+
// Step 6: Initialize services and load Moleculer services
|
|
32
31
|
if (!existingAllModules && container) {
|
|
32
|
+
// For completely new modules, create services and load moleculer services
|
|
33
33
|
await allModules.createService({ ...settings, mongoConnection: context.mongoClient });
|
|
34
|
-
|
|
34
|
+
this.loadMoleculerServices(allModules, broker, container, settings, type);
|
|
35
|
+
}
|
|
36
|
+
else if (existingAllModules && type === 'microservice' && container) {
|
|
37
|
+
// For microservices with existing modules, skip service creation but allow Moleculer service loading
|
|
38
|
+
// This enables microservices to register their Moleculer services with the hemera container
|
|
39
|
+
this.logger.info('Loading Moleculer services for microservice with existing modules');
|
|
35
40
|
this.loadMoleculerServices(allModules, broker, container, settings, type);
|
|
36
41
|
}
|
|
37
42
|
else {
|
|
@@ -57,11 +62,18 @@
|
|
|
57
62
|
async createContainerFromModules(allModules, type, settings, context, existingAllModules) {
|
|
58
63
|
const containerSettings = { ...settings, mongoConnection: context.mongoClient };
|
|
59
64
|
if (existingAllModules) {
|
|
60
|
-
// For existing modules, we
|
|
61
|
-
//
|
|
62
|
-
//
|
|
63
|
-
|
|
64
|
-
|
|
65
|
+
// For existing modules with microservice type, we still need to create a hemera container
|
|
66
|
+
// This allows microservices to have their own container for Moleculer service bindings
|
|
67
|
+
// while reusing the main modules to avoid service duplication
|
|
68
|
+
if (type === 'microservice') {
|
|
69
|
+
this.logger.info('Creating hemera container for microservice while reusing existing modules');
|
|
70
|
+
return await allModules.createHemeraContainers(containerSettings);
|
|
71
|
+
}
|
|
72
|
+
else {
|
|
73
|
+
// For main service with existing modules, skip container creation entirely
|
|
74
|
+
this.logger.warn('Reusing existing modules - container already exists, skipping new container creation');
|
|
75
|
+
return null; // Signal that we're reusing existing infrastructure
|
|
76
|
+
}
|
|
65
77
|
}
|
|
66
78
|
// Create fresh container for new modules
|
|
67
79
|
if (type === 'main') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"infrastructure-factory.cjs","sources":["../../src/infrastructure/infrastructure-factory.ts"],"sourcesContent":[null],"names":["ConnectionBroker","brokerConfig","WorkflowOrchestrator","createInfrastructureModule","ServerFeature","createInngestClient","InterNamespaceMiddleware","ServiceBroker","CONNECTOR_CONFIGS"],"mappings":"8cAoBa,qBAAqB,CAAA;AACtB,IAAA,MAAM,CAAoB;AAC1B,IAAA,gBAAgB,CAAmB;AACnC,IAAA,YAAY,CAAuB;AAE3C,IAAA,WAAA,CAAY,MAAyB,EAAA;AACjC,QAAA,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;KACxB;AAEM,IAAA,MAAM,UAAU,GAAA;AACnB,QAAA,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;AACxD,QAAA,IAAI,CAAC,gBAAgB,GAAG,IAAIA,iCAAgB,CAACC,wBAAY,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;KACvF;IAEM,MAAM,wBAAwB,CACjC,OAAoC,EACpC,aAA4B,EAC5B,QAAa,EACb,kBAAkC,EAAA;AAOlC,QAAA,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,aAAa,GAAG,IAAI,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC;;QAGxF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,eAAe,CAAC,CAAC;;AAGxE,QAAA,MAAM,MAAM,GAAyB;AACjC,YAAA,UAAU,EAAE,eAAe;YAC3B,SAAS;AACT,YAAA,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,aAAa;SACrD,CAAC;QACF,IAAI,CAAC,YAAY,GAAG,IAAIC,yCAAoB,CAAC,MAAM,CAAC,CAAC;;AAGrD,QAAA,MAAM,MAAM,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;AACrE,QAAA,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;;AAGxB,QAAA,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAC/C,aAAa,EACb,OAAO,EACP,eAAe,EACf,kBAAkB,CACrB,CAAC;;AAGF,QAAA,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,0BAA0B,CACnD,UAAU,EACV,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,kBAAkB,CACrB,CAAC
|
|
1
|
+
{"version":3,"file":"infrastructure-factory.cjs","sources":["../../src/infrastructure/infrastructure-factory.ts"],"sourcesContent":[null],"names":["ConnectionBroker","brokerConfig","WorkflowOrchestrator","createInfrastructureModule","ServerFeature","createInngestClient","InterNamespaceMiddleware","ServiceBroker","CONNECTOR_CONFIGS"],"mappings":"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"}
|
|
@@ -27,11 +27,16 @@ import {ServiceBroker}from'moleculer';import {Feature}from'@common-stack/server-
|
|
|
27
27
|
const allModules = await this.loadAndComposeModules(serverFeature, context, connectorConfig, existingAllModules);
|
|
28
28
|
// Step 5: Create container based on module composition
|
|
29
29
|
const container = await this.createContainerFromModules(allModules, type, settings, context, existingAllModules);
|
|
30
|
-
// Step 6: Initialize services
|
|
31
|
-
// Only create services and load Moleculer services for new modules
|
|
30
|
+
// Step 6: Initialize services and load Moleculer services
|
|
32
31
|
if (!existingAllModules && container) {
|
|
32
|
+
// For completely new modules, create services and load moleculer services
|
|
33
33
|
await allModules.createService({ ...settings, mongoConnection: context.mongoClient });
|
|
34
|
-
|
|
34
|
+
this.loadMoleculerServices(allModules, broker, container, settings, type);
|
|
35
|
+
}
|
|
36
|
+
else if (existingAllModules && type === 'microservice' && container) {
|
|
37
|
+
// For microservices with existing modules, skip service creation but allow Moleculer service loading
|
|
38
|
+
// This enables microservices to register their Moleculer services with the hemera container
|
|
39
|
+
this.logger.info('Loading Moleculer services for microservice with existing modules');
|
|
35
40
|
this.loadMoleculerServices(allModules, broker, container, settings, type);
|
|
36
41
|
}
|
|
37
42
|
else {
|
|
@@ -57,11 +62,18 @@ import {ServiceBroker}from'moleculer';import {Feature}from'@common-stack/server-
|
|
|
57
62
|
async createContainerFromModules(allModules, type, settings, context, existingAllModules) {
|
|
58
63
|
const containerSettings = { ...settings, mongoConnection: context.mongoClient };
|
|
59
64
|
if (existingAllModules) {
|
|
60
|
-
// For existing modules, we
|
|
61
|
-
//
|
|
62
|
-
//
|
|
63
|
-
|
|
64
|
-
|
|
65
|
+
// For existing modules with microservice type, we still need to create a hemera container
|
|
66
|
+
// This allows microservices to have their own container for Moleculer service bindings
|
|
67
|
+
// while reusing the main modules to avoid service duplication
|
|
68
|
+
if (type === 'microservice') {
|
|
69
|
+
this.logger.info('Creating hemera container for microservice while reusing existing modules');
|
|
70
|
+
return await allModules.createHemeraContainers(containerSettings);
|
|
71
|
+
}
|
|
72
|
+
else {
|
|
73
|
+
// For main service with existing modules, skip container creation entirely
|
|
74
|
+
this.logger.warn('Reusing existing modules - container already exists, skipping new container creation');
|
|
75
|
+
return null; // Signal that we're reusing existing infrastructure
|
|
76
|
+
}
|
|
65
77
|
}
|
|
66
78
|
// Create fresh container for new modules
|
|
67
79
|
if (type === 'main') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"infrastructure-factory.mjs","sources":["../../src/infrastructure/infrastructure-factory.ts"],"sourcesContent":[null],"names":["ServerFeature"],"mappings":"ofAoBa,qBAAqB,CAAA;AACtB,IAAA,MAAM,CAAoB;AAC1B,IAAA,gBAAgB,CAAmB;AACnC,IAAA,YAAY,CAAuB;AAE3C,IAAA,WAAA,CAAY,MAAyB,EAAA;AACjC,QAAA,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;KACxB;AAEM,IAAA,MAAM,UAAU,GAAA;AACnB,QAAA,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;AACxD,QAAA,IAAI,CAAC,gBAAgB,GAAG,IAAI,gBAAgB,CAAC,YAAY,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;KACvF;IAEM,MAAM,wBAAwB,CACjC,OAAoC,EACpC,aAA4B,EAC5B,QAAa,EACb,kBAAkC,EAAA;AAOlC,QAAA,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,aAAa,GAAG,IAAI,EAAE,SAAS,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC;;QAGxF,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,2BAA2B,CAAC,eAAe,CAAC,CAAC;;AAGxE,QAAA,MAAM,MAAM,GAAyB;AACjC,YAAA,UAAU,EAAE,eAAe;YAC3B,SAAS;AACT,YAAA,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,aAAa;SACrD,CAAC;QACF,IAAI,CAAC,YAAY,GAAG,IAAI,oBAAoB,CAAC,MAAM,CAAC,CAAC;;AAGrD,QAAA,MAAM,MAAM,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;AACrE,QAAA,OAAO,CAAC,MAAM,GAAG,MAAM,CAAC;;AAGxB,QAAA,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAC/C,aAAa,EACb,OAAO,EACP,eAAe,EACf,kBAAkB,CACrB,CAAC;;AAGF,QAAA,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,0BAA0B,CACnD,UAAU,EACV,IAAI,EACJ,QAAQ,EACR,OAAO,EACP,kBAAkB,CACrB,CAAC
|
|
1
|
+
{"version":3,"file":"infrastructure-factory.mjs","sources":["../../src/infrastructure/infrastructure-factory.ts"],"sourcesContent":[null],"names":["ServerFeature"],"mappings":"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"}
|
|
@@ -6,10 +6,10 @@ function expressApp(modules, options, middlewares, http, redisClient$1) {
|
|
|
6
6
|
if (redisClient$1) {
|
|
7
7
|
app.use(redisClient.redisClientMiddleware(redisClient$1));
|
|
8
8
|
}
|
|
9
|
+
app.use(services.contextServicesMiddleware(options.createContext, options.serviceContext));
|
|
9
10
|
for (const applyBeforeware of modules.beforewares) {
|
|
10
11
|
applyBeforeware(app);
|
|
11
12
|
}
|
|
12
|
-
app.use(services.contextServicesMiddleware(options.createContext, options.serviceContext));
|
|
13
13
|
// Don't rate limit heroku
|
|
14
14
|
app.enable('trust proxy');
|
|
15
15
|
app.use(sentry.sentryMiddleware);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExpressApp.cjs","sources":["../../src/servers/ExpressApp.ts"],"sourcesContent":[null],"names":["redisClient","redisClientMiddleware","contextServicesMiddleware","sentryMiddleware","corsMiddleware","bodyParser","errorMiddleware","sentryErrorHandlerMiddleware"],"mappings":"wpBAAA;AAWM,SAAU,UAAU,CAAC,OAAgB,EAAE,OAAuB,EAAE,WAAW,EAAE,IAAK,EAAEA,aAAY,EAAA;AAClG,IAAA,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;;;IAItB,IAAIA,aAAW,EAAE;QACb,GAAG,CAAC,GAAG,CAACC,iCAAqB,CAACD,aAAW,CAAC,CAAC,CAAC;KAC/C;AAED,IAAA,
|
|
1
|
+
{"version":3,"file":"ExpressApp.cjs","sources":["../../src/servers/ExpressApp.ts"],"sourcesContent":[null],"names":["redisClient","redisClientMiddleware","contextServicesMiddleware","sentryMiddleware","corsMiddleware","bodyParser","errorMiddleware","sentryErrorHandlerMiddleware"],"mappings":"wpBAAA;AAWM,SAAU,UAAU,CAAC,OAAgB,EAAE,OAAuB,EAAE,WAAW,EAAE,IAAK,EAAEA,aAAY,EAAA;AAClG,IAAA,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;;;IAItB,IAAIA,aAAW,EAAE;QACb,GAAG,CAAC,GAAG,CAACC,iCAAqB,CAACD,aAAW,CAAC,CAAC,CAAC;KAC/C;AAED,IAAA,GAAG,CAAC,GAAG,CAACE,kCAAyB,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC;AAClF,IAAA,KAAK,MAAM,eAAe,IAAI,OAAO,CAAC,WAAW,EAAE;QAC/C,eAAe,CAAC,GAAG,CAAC,CAAC;KACxB;;AAGD,IAAA,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;AAE1B,IAAA,GAAG,CAAC,GAAG,CAACC,uBAAgB,CAAC,CAAC;AAE1B,IAAA,IAAI,WAAW,KAAK,IAAI,EAAE;AACtB,QAAA,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;KACxB;AAED,IAAA,GAAG,CAAC,GAAG,CAACC,mBAAc,CAAC,CAAC;IACxB,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,KAAI;AACvB,QAAA,GAAG,CAAC,MAAM,CAAC,kCAAkC,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;AACrE,QAAA,GAAG,CAAC,MAAM,CAAC,8BAA8B,EAAE,qBAAqB,CAAC,CAAC;AAClE,QAAA,GAAG,CAAC,MAAM,CACN,8BAA8B,EAC9B,6EAA6E,CAChF,CAAC;AACF,QAAA,IAAI,EAAE,CAAC;AACX,KAAC,CAAC,CAAC;AAEH,IAAA,GAAG,CAAC,GAAG,CACHC,qBAAU,CAAC,IAAI,CAAC;AACZ,QAAA,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,KAAI;;AAErB,YAAA,GAAW,CAAC,OAAO,GAAG,GAAG,CAAC;SAC9B;AACJ,KAAA,CAAC,CACL,CAAC;IACF,GAAG,CAAC,GAAG,CAACA,qBAAU,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;AAEzF,IAAA,KAAK,MAAM,eAAe,IAAI,OAAO,CAAC,WAAW,EAAE;QAC/C,eAAe,CAAC,GAAG,CAAC,CAAC;KACxB;IAED,IAAI,OAAO,EAAE;AACT,QAAA,GAAG,CAAC,GAAG,CAACC,qBAAe,CAAC,CAAC;KAC5B;AAED,IAAA,GAAG,CAAC,GAAG,CAACC,mCAA4B,CAAC,CAAC;AAEtC,IAAA,OAAO,GAAG,CAAC;AACf"}
|
|
@@ -6,10 +6,10 @@ function expressApp(modules, options, middlewares, http, redisClient) {
|
|
|
6
6
|
if (redisClient) {
|
|
7
7
|
app.use(redisClientMiddleware(redisClient));
|
|
8
8
|
}
|
|
9
|
+
app.use(contextServicesMiddleware(options.createContext, options.serviceContext));
|
|
9
10
|
for (const applyBeforeware of modules.beforewares) {
|
|
10
11
|
applyBeforeware(app);
|
|
11
12
|
}
|
|
12
|
-
app.use(contextServicesMiddleware(options.createContext, options.serviceContext));
|
|
13
13
|
// Don't rate limit heroku
|
|
14
14
|
app.enable('trust proxy');
|
|
15
15
|
app.use(sentryMiddleware);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExpressApp.mjs","sources":["../../src/servers/ExpressApp.ts"],"sourcesContent":[null],"names":[],"mappings":"yYAAA;AAWM,SAAU,UAAU,CAAC,OAAgB,EAAE,OAAuB,EAAE,WAAW,EAAE,IAAK,EAAE,WAAY,EAAA;AAClG,IAAA,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;;;IAItB,IAAI,WAAW,EAAE;QACb,GAAG,CAAC,GAAG,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC,CAAC;KAC/C;AAED,IAAA,
|
|
1
|
+
{"version":3,"file":"ExpressApp.mjs","sources":["../../src/servers/ExpressApp.ts"],"sourcesContent":[null],"names":[],"mappings":"yYAAA;AAWM,SAAU,UAAU,CAAC,OAAgB,EAAE,OAAuB,EAAE,WAAW,EAAE,IAAK,EAAE,WAAY,EAAA;AAClG,IAAA,MAAM,GAAG,GAAG,OAAO,EAAE,CAAC;;;IAItB,IAAI,WAAW,EAAE;QACb,GAAG,CAAC,GAAG,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC,CAAC;KAC/C;AAED,IAAA,GAAG,CAAC,GAAG,CAAC,yBAAyB,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC;AAClF,IAAA,KAAK,MAAM,eAAe,IAAI,OAAO,CAAC,WAAW,EAAE;QAC/C,eAAe,CAAC,GAAG,CAAC,CAAC;KACxB;;AAGD,IAAA,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;AAE1B,IAAA,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;AAE1B,IAAA,IAAI,WAAW,KAAK,IAAI,EAAE;AACtB,QAAA,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;KACxB;AAED,IAAA,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACxB,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,KAAI;AACvB,QAAA,GAAG,CAAC,MAAM,CAAC,kCAAkC,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;AACrE,QAAA,GAAG,CAAC,MAAM,CAAC,8BAA8B,EAAE,qBAAqB,CAAC,CAAC;AAClE,QAAA,GAAG,CAAC,MAAM,CACN,8BAA8B,EAC9B,6EAA6E,CAChF,CAAC;AACF,QAAA,IAAI,EAAE,CAAC;AACX,KAAC,CAAC,CAAC;AAEH,IAAA,GAAG,CAAC,GAAG,CACH,UAAU,CAAC,IAAI,CAAC;AACZ,QAAA,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,KAAI;;AAErB,YAAA,GAAW,CAAC,OAAO,GAAG,GAAG,CAAC;SAC9B;AACJ,KAAA,CAAC,CACL,CAAC;IACF,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;AAEzF,IAAA,KAAK,MAAM,eAAe,IAAI,OAAO,CAAC,WAAW,EAAE;QAC/C,eAAe,CAAC,GAAG,CAAC,CAAC;KACxB;IAED,IAAI,OAAO,EAAE;AACT,QAAA,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;KAC5B;AAED,IAAA,GAAG,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;AAEtC,IAAA,OAAO,GAAG,CAAC;AACf"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@common-stack/server-stack",
|
|
3
|
-
"version": "7.2.1-alpha.
|
|
3
|
+
"version": "7.2.1-alpha.8",
|
|
4
4
|
"description": "common core for higher packages to depend on",
|
|
5
5
|
"license": "ISC",
|
|
6
6
|
"author": "CDMBase LLC",
|
|
@@ -90,7 +90,7 @@
|
|
|
90
90
|
"publishConfig": {
|
|
91
91
|
"access": "public"
|
|
92
92
|
},
|
|
93
|
-
"gitHead": "
|
|
93
|
+
"gitHead": "228a0fc7a8131f9f017c565d92bbc0e96cbf4768",
|
|
94
94
|
"typescript": {
|
|
95
95
|
"definition": "lib/index.d.ts"
|
|
96
96
|
}
|