@module-federation/enhanced 0.11.4 → 0.12.0
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/dist/package.json +4 -3
- package/dist/src/declarations/plugins/sharing/ConsumeSharedModule.d.ts +53 -0
- package/dist/src/declarations/plugins/sharing/ConsumeSharedPlugin.d.ts +14 -2
- package/dist/src/declarations/plugins/sharing/ProvideSharedPlugin.d.ts +10 -2
- package/dist/src/declarations/plugins/sharing/SharePlugin.d.ts +14 -2
- package/dist/src/lib/container/ContainerEntryDependency.d.ts +3 -3
- package/dist/src/lib/container/ContainerEntryDependency.js +1 -1
- package/dist/src/lib/container/ContainerEntryDependency.js.map +1 -1
- package/dist/src/lib/container/ContainerEntryModule.d.ts +2 -2
- package/dist/src/lib/container/ContainerEntryModule.js +5 -2
- package/dist/src/lib/container/ContainerEntryModule.js.map +1 -1
- package/dist/src/lib/container/ContainerReferencePlugin.js +1 -1
- package/dist/src/lib/container/ContainerReferencePlugin.js.map +1 -1
- package/dist/src/lib/container/ModuleFederationPlugin.js +8 -0
- package/dist/src/lib/container/ModuleFederationPlugin.js.map +1 -1
- package/dist/src/lib/container/RemoteModule.d.ts +3 -3
- package/dist/src/lib/container/RemoteModule.js +5 -2
- package/dist/src/lib/container/RemoteModule.js.map +1 -1
- package/dist/src/lib/container/runtime/FederationRuntimePlugin.js +5 -5
- package/dist/src/lib/container/runtime/FederationRuntimePlugin.js.map +1 -1
- package/dist/src/lib/sharing/ConsumeSharedModule.d.ts +1 -38
- package/dist/src/lib/sharing/ConsumeSharedModule.js +25 -15
- package/dist/src/lib/sharing/ConsumeSharedModule.js.map +1 -1
- package/dist/src/lib/sharing/ConsumeSharedPlugin.js +64 -41
- package/dist/src/lib/sharing/ConsumeSharedPlugin.js.map +1 -1
- package/dist/src/lib/sharing/ConsumeSharedRuntimeModule.js +3 -1
- package/dist/src/lib/sharing/ConsumeSharedRuntimeModule.js.map +1 -1
- package/dist/src/lib/sharing/ProvideSharedDependency.d.ts +5 -3
- package/dist/src/lib/sharing/ProvideSharedDependency.js +12 -6
- package/dist/src/lib/sharing/ProvideSharedDependency.js.map +1 -1
- package/dist/src/lib/sharing/ProvideSharedModule.d.ts +3 -2
- package/dist/src/lib/sharing/ProvideSharedModule.js +10 -12
- package/dist/src/lib/sharing/ProvideSharedModule.js.map +1 -1
- package/dist/src/lib/sharing/ProvideSharedModuleFactory.js +1 -3
- package/dist/src/lib/sharing/ProvideSharedModuleFactory.js.map +1 -1
- package/dist/src/lib/sharing/ProvideSharedPlugin.d.ts +2 -10
- package/dist/src/lib/sharing/ProvideSharedPlugin.js +65 -43
- package/dist/src/lib/sharing/ProvideSharedPlugin.js.map +1 -1
- package/dist/src/lib/sharing/SharePlugin.d.ts +2 -3
- package/dist/src/lib/sharing/SharePlugin.js +8 -5
- package/dist/src/lib/sharing/SharePlugin.js.map +1 -1
- package/dist/src/lib/sharing/ShareRuntimeModule.js +9 -7
- package/dist/src/lib/sharing/ShareRuntimeModule.js.map +1 -1
- package/dist/src/lib/sharing/resolveMatchedConfigs.d.ts +2 -1
- package/dist/src/lib/sharing/resolveMatchedConfigs.js +33 -16
- package/dist/src/lib/sharing/resolveMatchedConfigs.js.map +1 -1
- package/dist/src/lib/sharing/utils.d.ts +3 -2
- package/dist/src/lib/sharing/utils.js +2 -1
- package/dist/src/lib/sharing/utils.js.map +1 -1
- package/dist/src/schemas/container/ContainerPlugin.check.d.ts +3 -3
- package/dist/src/schemas/container/ContainerPlugin.check.js +333 -290
- package/dist/src/schemas/container/ContainerPlugin.check.js.map +1 -1
- package/dist/src/schemas/container/ContainerPlugin.d.ts +31 -18
- package/dist/src/schemas/container/ContainerPlugin.js +34 -21
- package/dist/src/schemas/container/ContainerPlugin.js.map +1 -1
- package/dist/src/schemas/container/ContainerReferencePlugin.check.d.ts +3 -3
- package/dist/src/schemas/container/ContainerReferencePlugin.check.js +293 -188
- package/dist/src/schemas/container/ContainerReferencePlugin.check.js.map +1 -1
- package/dist/src/schemas/container/ContainerReferencePlugin.d.ts +25 -5
- package/dist/src/schemas/container/ContainerReferencePlugin.js +31 -4
- package/dist/src/schemas/container/ContainerReferencePlugin.js.map +1 -1
- package/dist/src/schemas/container/ExternalsType.check.js +2 -2
- package/dist/src/schemas/container/ExternalsType.check.js.map +1 -1
- package/dist/src/schemas/container/ModuleFederationPlugin.check.js +1464 -1282
- package/dist/src/schemas/container/ModuleFederationPlugin.check.js.map +1 -1
- package/dist/src/schemas/container/ModuleFederationPlugin.d.ts +130 -78
- package/dist/src/schemas/container/ModuleFederationPlugin.js +144 -83
- package/dist/src/schemas/container/ModuleFederationPlugin.js.map +1 -1
- package/dist/src/schemas/sharing/ConsumeSharedPlugin.check.d.ts +3 -3
- package/dist/src/schemas/sharing/ConsumeSharedPlugin.check.js +302 -160
- package/dist/src/schemas/sharing/ConsumeSharedPlugin.check.js.map +1 -1
- package/dist/src/schemas/sharing/ConsumeSharedPlugin.d.ts +33 -2
- package/dist/src/schemas/sharing/ConsumeSharedPlugin.js +39 -2
- package/dist/src/schemas/sharing/ConsumeSharedPlugin.js.map +1 -1
- package/dist/src/schemas/sharing/ProvideSharedPlugin.check.d.ts +1 -1
- package/dist/src/schemas/sharing/ProvideSharedPlugin.check.js +374 -164
- package/dist/src/schemas/sharing/ProvideSharedPlugin.check.js.map +1 -1
- package/dist/src/schemas/sharing/ProvideSharedPlugin.d.ts +51 -2
- package/dist/src/schemas/sharing/ProvideSharedPlugin.js +60 -2
- package/dist/src/schemas/sharing/ProvideSharedPlugin.js.map +1 -1
- package/dist/src/schemas/sharing/ProviderSharedPlugin.check.js +148 -94
- package/dist/src/schemas/sharing/ProviderSharedPlugin.check.js.map +1 -1
- package/dist/src/schemas/sharing/ProviderSharedPlugin.d.ts +10 -0
- package/dist/src/schemas/sharing/ProviderSharedPlugin.js +10 -1
- package/dist/src/schemas/sharing/ProviderSharedPlugin.js.map +1 -1
- package/dist/src/schemas/sharing/SharePlugin.check.d.ts +3 -3
- package/dist/src/schemas/sharing/SharePlugin.check.js +239 -135
- package/dist/src/schemas/sharing/SharePlugin.check.js.map +1 -1
- package/dist/src/schemas/sharing/SharePlugin.d.ts +24 -4
- package/dist/src/schemas/sharing/SharePlugin.js +30 -4
- package/dist/src/schemas/sharing/SharePlugin.js.map +1 -1
- package/dist/src/utils.d.ts +9 -0
- package/dist/src/utils.js +31 -0
- package/dist/src/utils.js.map +1 -0
- package/package.json +15 -14
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProvideSharedModule.js","sourceRoot":"","sources":["../../../../src/lib/sharing/ProvideSharedModule.ts"],"names":[],"mappings":";;;;;AAAA;;;EAGE;AACF,0FAAqF;AAarF,8FAAsE;AACtE,4CAA2D;AAI3D,MAAM,EAAE,sBAAsB,EAAE,MAAM,EAAE,cAAc,EAAE,GAAG,OAAO,CAChE,IAAA,6CAAoB,EAAC,SAAS,CAAC,CACJ,CAAC;AAC9B,MAAM,gBAAgB,GAAG,OAAO,CAC9B,IAAA,6CAAoB,EAAC,mCAAmC,CAAC,CACJ,CAAC;AAExD,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;AAEtC;;;GAGG;AACH,MAAM,mBAAoB,SAAQ,MAAM;IAUtC
|
|
1
|
+
{"version":3,"file":"ProvideSharedModule.js","sourceRoot":"","sources":["../../../../src/lib/sharing/ProvideSharedModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,12 +17,10 @@ class ProvideSharedModuleFactory extends ModuleFactory {
|
|
|
17
17
|
* @returns {void}
|
|
18
18
|
*/
|
|
19
19
|
create(data, callback) {
|
|
20
|
-
// @ts-ignore
|
|
21
20
|
const dep = data
|
|
22
21
|
.dependencies[0];
|
|
23
22
|
callback(null, {
|
|
24
|
-
|
|
25
|
-
module: new ProvideSharedModule_1.default(dep.shareScope, dep.name, dep.version, dep.request, dep.eager, dep.requiredVersion, dep.strictVersion, dep.singleton),
|
|
23
|
+
module: new ProvideSharedModule_1.default(dep.shareScope, dep.name, dep.version, dep.request, dep.eager, dep.requiredVersion, dep.strictVersion, dep.singleton, dep.layer),
|
|
26
24
|
});
|
|
27
25
|
}
|
|
28
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProvideSharedModuleFactory.js","sourceRoot":"","sources":["../../../../src/lib/sharing/ProvideSharedModuleFactory.ts"],"names":[],"mappings":";;;;;AAAA;;;EAGE;AACF,0FAAqF;AAErF,gFAAwD;AAOxD,MAAM,aAAa,GAAG,OAAO,CAC3B,IAAA,6CAAoB,EAAC,2BAA2B,CAAC,CACJ,CAAC;AAEhD,MAAM,0BAA2B,SAAQ,aAAa;IACpD;;;;OAIG;IACM,MAAM,CACb,IAA6B,EAC7B,QAAqE;QAErE,
|
|
1
|
+
{"version":3,"file":"ProvideSharedModuleFactory.js","sourceRoot":"","sources":["../../../../src/lib/sharing/ProvideSharedModuleFactory.ts"],"names":[],"mappings":";;;;;AAAA;;;EAGE;AACF,0FAAqF;AAErF,gFAAwD;AAOxD,MAAM,aAAa,GAAG,OAAO,CAC3B,IAAA,6CAAoB,EAAC,2BAA2B,CAAC,CACJ,CAAC;AAEhD,MAAM,0BAA2B,SAAQ,aAAa;IACpD;;;;OAIG;IACM,MAAM,CACb,IAA6B,EAC7B,QAAqE;QAErE,MAAM,GAAG,GAA4B,IAAI;aACtC,YAAY,CAAC,CAAC,CAA4B,CAAC;QAC9C,QAAQ,CAAC,IAAI,EAAE;YACb,MAAM,EAAE,IAAI,6BAAmB,CAC7B,GAAG,CAAC,UAAU,EACd,GAAG,CAAC,IAAI,EACR,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,OAAO,EACX,GAAG,CAAC,KAAK,EACT,GAAG,CAAC,eAAe,EACnB,GAAG,CAAC,aAAa,EACjB,GAAG,CAAC,SAAS,EACb,GAAG,CAAC,KAAK,CACV;SACF,CAAC,CAAC;IACL,CAAC;CACF;AAED,kBAAe,0BAA0B,CAAC"}
|
|
@@ -1,18 +1,10 @@
|
|
|
1
1
|
import type { Compiler } from 'webpack';
|
|
2
2
|
import type { ProvideSharedPluginOptions, ProvidesConfig } from '../../declarations/plugins/sharing/ProvideSharedPlugin';
|
|
3
|
-
export type ProvideOptions = ProvidesConfig;
|
|
4
3
|
export type ResolvedProvideMap = Map<string, {
|
|
5
|
-
config:
|
|
4
|
+
config: ProvidesConfig;
|
|
6
5
|
version: string | undefined | false;
|
|
6
|
+
resource?: string;
|
|
7
7
|
}>;
|
|
8
|
-
/**
|
|
9
|
-
* @typedef {Object} ProvideOptions
|
|
10
|
-
* @property {string} shareKey
|
|
11
|
-
* @property {string} shareScope
|
|
12
|
-
* @property {string | undefined | false} version
|
|
13
|
-
* @property {boolean} eager
|
|
14
|
-
*/
|
|
15
|
-
/** @typedef {Map<string, { config: ProvideOptions, version: string | undefined | false }>} ResolvedProvideMap */
|
|
16
8
|
declare class ProvideSharedPlugin {
|
|
17
9
|
private _provides;
|
|
18
10
|
/**
|
|
@@ -13,35 +13,40 @@ const ProvideForSharedDependency_1 = __importDefault(require("./ProvideForShared
|
|
|
13
13
|
const ProvideSharedDependency_1 = __importDefault(require("./ProvideSharedDependency"));
|
|
14
14
|
const ProvideSharedModuleFactory_1 = __importDefault(require("./ProvideSharedModuleFactory"));
|
|
15
15
|
const FederationRuntimePlugin_1 = __importDefault(require("../container/runtime/FederationRuntimePlugin"));
|
|
16
|
-
const
|
|
17
|
-
const ProviderSharedPlugin_1 = __importDefault(require("../../schemas/sharing/ProviderSharedPlugin"));
|
|
18
|
-
const createSchemaValidation = require((0, normalize_webpack_path_1.normalizeWebpackPath)('webpack/lib/util/create-schema-validation'));
|
|
16
|
+
const utils_1 = require("../../utils");
|
|
19
17
|
const WebpackError = require((0, normalize_webpack_path_1.normalizeWebpackPath)('webpack/lib/WebpackError'));
|
|
20
|
-
const validate = createSchemaValidation(
|
|
18
|
+
const validate = (0, utils_1.createSchemaValidation)(
|
|
21
19
|
//eslint-disable-next-line
|
|
22
|
-
|
|
20
|
+
require('../../schemas/sharing/ProvideSharedPlugin.check.js').validate, () => require('../../schemas/sharing/ProvideSharedPlugin').default, {
|
|
23
21
|
name: 'Provide Shared Plugin',
|
|
24
22
|
baseDataPath: 'options',
|
|
25
23
|
});
|
|
26
24
|
/**
|
|
27
25
|
* @typedef {Object} ProvideOptions
|
|
28
26
|
* @property {string} shareKey
|
|
29
|
-
* @property {string} shareScope
|
|
27
|
+
* @property {string | string[]} shareScope
|
|
30
28
|
* @property {string | undefined | false} version
|
|
31
29
|
* @property {boolean} eager
|
|
30
|
+
* @property {string} [request] The actual request to use for importing the module
|
|
32
31
|
*/
|
|
33
32
|
/** @typedef {Map<string, { config: ProvideOptions, version: string | undefined | false }>} ResolvedProvideMap */
|
|
33
|
+
// Helper function to create composite key
|
|
34
|
+
function createLookupKey(request, config) {
|
|
35
|
+
if (config.layer) {
|
|
36
|
+
return `(${config.layer})${request}`;
|
|
37
|
+
}
|
|
38
|
+
return request;
|
|
39
|
+
}
|
|
34
40
|
class ProvideSharedPlugin {
|
|
35
41
|
/**
|
|
36
42
|
* @param {ProvideSharedPluginOptions} options options
|
|
37
43
|
*/
|
|
38
44
|
constructor(options) {
|
|
39
45
|
validate(options);
|
|
40
|
-
//@ts-ignore
|
|
41
46
|
this._provides = (0, options_1.parseOptions)(options.provides, (item) => {
|
|
42
47
|
if (Array.isArray(item))
|
|
43
48
|
throw new Error('Unexpected array of provides');
|
|
44
|
-
/** @type {
|
|
49
|
+
/** @type {ProvidesConfig} */
|
|
45
50
|
const result = {
|
|
46
51
|
shareKey: item,
|
|
47
52
|
version: undefined,
|
|
@@ -50,17 +55,24 @@ class ProvideSharedPlugin {
|
|
|
50
55
|
requiredVersion: false,
|
|
51
56
|
strictVersion: false,
|
|
52
57
|
singleton: false,
|
|
58
|
+
layer: undefined,
|
|
59
|
+
request: item,
|
|
53
60
|
};
|
|
54
61
|
return result;
|
|
55
|
-
}, (item) =>
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
62
|
+
}, (item, key) => {
|
|
63
|
+
const request = item.request || key;
|
|
64
|
+
return {
|
|
65
|
+
shareScope: item.shareScope || options.shareScope || 'default',
|
|
66
|
+
shareKey: item.shareKey || request,
|
|
67
|
+
version: item.version,
|
|
68
|
+
eager: !!item.eager,
|
|
69
|
+
requiredVersion: item.requiredVersion,
|
|
70
|
+
strictVersion: item.strictVersion,
|
|
71
|
+
singleton: !!item.singleton,
|
|
72
|
+
layer: item.layer,
|
|
73
|
+
request,
|
|
74
|
+
};
|
|
75
|
+
});
|
|
64
76
|
this._provides.sort(([a], [b]) => {
|
|
65
77
|
if (a < b)
|
|
66
78
|
return -1;
|
|
@@ -84,27 +96,29 @@ class ProvideSharedPlugin {
|
|
|
84
96
|
const matchProvides = new Map();
|
|
85
97
|
const prefixMatchProvides = new Map();
|
|
86
98
|
for (const [request, config] of this._provides) {
|
|
87
|
-
|
|
99
|
+
const actualRequest = config.request || request;
|
|
100
|
+
const lookupKey = createLookupKey(actualRequest, config);
|
|
101
|
+
if (/^(\/|[A-Za-z]:\\|\\\\|\.\.?(\/|$))/.test(actualRequest)) {
|
|
88
102
|
// relative request
|
|
89
|
-
resolvedProvideMap.set(
|
|
103
|
+
resolvedProvideMap.set(lookupKey, {
|
|
90
104
|
config,
|
|
91
105
|
version: config.version,
|
|
92
106
|
});
|
|
93
107
|
}
|
|
94
|
-
else if (/^(\/|[A-Za-z]:\\|\\\\)/.test(
|
|
108
|
+
else if (/^(\/|[A-Za-z]:\\|\\\\)/.test(actualRequest)) {
|
|
95
109
|
// absolute path
|
|
96
|
-
resolvedProvideMap.set(
|
|
110
|
+
resolvedProvideMap.set(lookupKey, {
|
|
97
111
|
config,
|
|
98
112
|
version: config.version,
|
|
99
113
|
});
|
|
100
114
|
}
|
|
101
|
-
else if (
|
|
115
|
+
else if (actualRequest.endsWith('/')) {
|
|
102
116
|
// module request prefix
|
|
103
|
-
prefixMatchProvides.set(
|
|
117
|
+
prefixMatchProvides.set(lookupKey, config);
|
|
104
118
|
}
|
|
105
119
|
else {
|
|
106
120
|
// module request
|
|
107
|
-
matchProvides.set(
|
|
121
|
+
matchProvides.set(lookupKey, config);
|
|
108
122
|
}
|
|
109
123
|
}
|
|
110
124
|
compilationData.set(compilation, resolvedProvideMap);
|
|
@@ -131,30 +145,39 @@ class ProvideSharedPlugin {
|
|
|
131
145
|
if (!version) {
|
|
132
146
|
const error = new WebpackError(`No version specified and unable to automatically determine one. ${details}`);
|
|
133
147
|
error.file = `shared module ${key} -> ${resource}`;
|
|
134
|
-
// @ts-ignore
|
|
135
148
|
compilation.warnings.push(error);
|
|
136
149
|
}
|
|
137
150
|
}
|
|
138
|
-
|
|
151
|
+
const lookupKey = createLookupKey(resource, config);
|
|
152
|
+
resolvedProvideMap.set(lookupKey, {
|
|
139
153
|
config,
|
|
140
154
|
version,
|
|
155
|
+
resource,
|
|
141
156
|
});
|
|
142
157
|
};
|
|
143
158
|
normalModuleFactory.hooks.module.tap('ProvideSharedPlugin', (module, { resource, resourceResolveData }, resolveData) => {
|
|
144
|
-
|
|
159
|
+
const moduleLayer = module.layer;
|
|
160
|
+
const lookupKey = createLookupKey(resource || '', {
|
|
161
|
+
layer: moduleLayer || undefined,
|
|
162
|
+
});
|
|
163
|
+
if (resource && resolvedProvideMap.has(lookupKey)) {
|
|
145
164
|
return module;
|
|
146
165
|
}
|
|
147
166
|
const { request } = resolveData;
|
|
148
167
|
{
|
|
149
|
-
const
|
|
168
|
+
const requestKey = createLookupKey(request, {
|
|
169
|
+
layer: moduleLayer || undefined,
|
|
170
|
+
});
|
|
171
|
+
const config = matchProvides.get(requestKey);
|
|
150
172
|
if (config !== undefined && resource) {
|
|
151
173
|
provideSharedModule(request, config, resource, resourceResolveData);
|
|
152
174
|
resolveData.cacheable = false;
|
|
153
175
|
}
|
|
154
176
|
}
|
|
155
177
|
for (const [prefix, config] of prefixMatchProvides) {
|
|
156
|
-
|
|
157
|
-
|
|
178
|
+
const lookup = config.request || prefix;
|
|
179
|
+
if (request.startsWith(lookup) && resource) {
|
|
180
|
+
const remainder = request.slice(lookup.length);
|
|
158
181
|
provideSharedModule(resource, {
|
|
159
182
|
...config,
|
|
160
183
|
shareKey: config.shareKey + remainder,
|
|
@@ -169,23 +192,22 @@ class ProvideSharedPlugin {
|
|
|
169
192
|
const resolvedProvideMap = compilationData.get(compilation);
|
|
170
193
|
if (!resolvedProvideMap)
|
|
171
194
|
return;
|
|
172
|
-
await Promise.all(Array.from(resolvedProvideMap, ([
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
195
|
+
await Promise.all(Array.from(resolvedProvideMap, ([resourceKey, { config, version, resource }]) => {
|
|
196
|
+
return new Promise((resolve, reject) => {
|
|
197
|
+
compilation.addInclude(compiler.context, new ProvideSharedDependency_1.default(config.shareScope, config.shareKey, version || false, resource || resourceKey, config.eager, config.requiredVersion, config.strictVersion, config.singleton, config.layer), {
|
|
198
|
+
name: undefined,
|
|
199
|
+
}, (err) => {
|
|
200
|
+
if (err) {
|
|
201
|
+
return reject(err);
|
|
202
|
+
}
|
|
203
|
+
resolve();
|
|
204
|
+
});
|
|
181
205
|
});
|
|
182
|
-
}))
|
|
206
|
+
}));
|
|
183
207
|
});
|
|
184
208
|
compiler.hooks.compilation.tap('ProvideSharedPlugin', (compilation, { normalModuleFactory }) => {
|
|
185
209
|
compilation.dependencyFactories.set(ProvideForSharedDependency_1.default, normalModuleFactory);
|
|
186
|
-
compilation.dependencyFactories.set(ProvideSharedDependency_1.default,
|
|
187
|
-
//@ts-ignore
|
|
188
|
-
new ProvideSharedModuleFactory_1.default());
|
|
210
|
+
compilation.dependencyFactories.set(ProvideSharedDependency_1.default, new ProvideSharedModuleFactory_1.default());
|
|
189
211
|
});
|
|
190
212
|
}
|
|
191
213
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProvideSharedPlugin.js","sourceRoot":"","sources":["../../../../src/lib/sharing/ProvideSharedPlugin.ts"],"names":[],"mappings":"AAAA;;;EAGE;AAEF,YAAY,CAAC;;;;;AACb,0FAGuD;AAMvD,kDAAoD;AACpD,8FAAsE;AACtE,wFAAgE;AAChE,8FAAsE;AAKtE,2GAAmF;AACnF,
|
|
1
|
+
{"version":3,"file":"ProvideSharedPlugin.js","sourceRoot":"","sources":["../../../../src/lib/sharing/ProvideSharedPlugin.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,9 +6,8 @@ declare class SharePlugin {
|
|
|
6
6
|
private _provides;
|
|
7
7
|
constructor(options: SharePluginOptions);
|
|
8
8
|
/**
|
|
9
|
-
*
|
|
10
|
-
* @param
|
|
11
|
-
* @returns {void}
|
|
9
|
+
* Applies the plugin to the webpack compiler instance
|
|
10
|
+
* @param compiler - The webpack compiler instance
|
|
12
11
|
*/
|
|
13
12
|
apply(compiler: Compiler): void;
|
|
14
13
|
}
|
|
@@ -37,6 +37,9 @@ class SharePlugin {
|
|
|
37
37
|
singleton: options.singleton,
|
|
38
38
|
packageName: options.packageName,
|
|
39
39
|
eager: options.eager,
|
|
40
|
+
issuerLayer: options.issuerLayer,
|
|
41
|
+
layer: options.layer,
|
|
42
|
+
request: options.request || key,
|
|
40
43
|
},
|
|
41
44
|
}));
|
|
42
45
|
const provides = sharedOptions
|
|
@@ -50,17 +53,17 @@ class SharePlugin {
|
|
|
50
53
|
requiredVersion: options.requiredVersion,
|
|
51
54
|
strictVersion: options.strictVersion,
|
|
52
55
|
singleton: options.singleton,
|
|
56
|
+
layer: options.layer,
|
|
57
|
+
request: options.request || options.import || key,
|
|
53
58
|
},
|
|
54
59
|
}));
|
|
55
|
-
|
|
56
|
-
this._shareScope = options.shareScope;
|
|
60
|
+
this._shareScope = options.shareScope || 'default';
|
|
57
61
|
this._consumes = consumes;
|
|
58
62
|
this._provides = provides;
|
|
59
63
|
}
|
|
60
64
|
/**
|
|
61
|
-
*
|
|
62
|
-
* @param
|
|
63
|
-
* @returns {void}
|
|
65
|
+
* Applies the plugin to the webpack compiler instance
|
|
66
|
+
* @param compiler - The webpack compiler instance
|
|
64
67
|
*/
|
|
65
68
|
apply(compiler) {
|
|
66
69
|
process.env['FEDERATION_WEBPACK_PATH'] =
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SharePlugin.js","sourceRoot":"","sources":["../../../../src/lib/sharing/SharePlugin.ts"],"names":[],"mappings":"AAAA;;;EAGE;AAEF,YAAY,CAAC;;;;;AAEb,gDAA2D;AAC3D,kDAAoD;AACpD,gFAAwD;AACxD,gFAAwD;AAOxD,0FAA+E;AAE/E,MAAM,WAAW;IAKf,YAAY,OAA2B;QACrC,MAAM,aAAa,GAA6B,IAAA,sBAAY,EAC1D,OAAO,CAAC,MAAM,EACd,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;YACZ,IAAI,OAAO,IAAI,KAAK,QAAQ;gBAC1B,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;YAChD,MAAM,MAAM,GACV,IAAI,KAAK,GAAG,IAAI,CAAC,IAAA,uBAAiB,EAAC,IAAI,CAAC;gBACtC,CAAC,CAAC;oBACE,MAAM,EAAE,IAAI;iBACb;gBACH,CAAC,CAAC;oBACE,MAAM,EAAE,GAAG;oBACX,eAAe,EAAE,IAAI;iBACtB,CAAC;YACR,OAAO,MAAM,CAAC;QAChB,CAAC,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CACf,CAAC;QACF,MAAM,QAAQ,GAAqC,aAAa,CAAC,GAAG,CAClE,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;YACnB,CAAC,GAAG,CAAC,EAAE;gBACL,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,GAAG;gBACjC,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,KAAK,EAAE,OAAO,CAAC,KAAK;
|
|
1
|
+
{"version":3,"file":"SharePlugin.js","sourceRoot":"","sources":["../../../../src/lib/sharing/SharePlugin.ts"],"names":[],"mappings":"AAAA;;;EAGE;AAEF,YAAY,CAAC;;;;;AAEb,gDAA2D;AAC3D,kDAAoD;AACpD,gFAAwD;AACxD,gFAAwD;AAOxD,0FAA+E;AAE/E,MAAM,WAAW;IAKf,YAAY,OAA2B;QACrC,MAAM,aAAa,GAA6B,IAAA,sBAAY,EAC1D,OAAO,CAAC,MAAM,EACd,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;YACZ,IAAI,OAAO,IAAI,KAAK,QAAQ;gBAC1B,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;YAChD,MAAM,MAAM,GACV,IAAI,KAAK,GAAG,IAAI,CAAC,IAAA,uBAAiB,EAAC,IAAI,CAAC;gBACtC,CAAC,CAAC;oBACE,MAAM,EAAE,IAAI;iBACb;gBACH,CAAC,CAAC;oBACE,MAAM,EAAE,GAAG;oBACX,eAAe,EAAE,IAAI;iBACtB,CAAC;YACR,OAAO,MAAM,CAAC;QAChB,CAAC,EACD,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CACf,CAAC;QACF,MAAM,QAAQ,GAAqC,aAAa,CAAC,GAAG,CAClE,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;YACnB,CAAC,GAAG,CAAC,EAAE;gBACL,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,GAAG;gBACjC,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,GAAG;aAChC;SACF,CAAC,CACH,CAAC;QACF,MAAM,QAAQ,GAAqC,aAAa;aAC7D,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,KAAK,CAAC;aACjD,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;YACxB,CAAC,OAAO,CAAC,MAAM,IAAI,GAAG,CAAC,EAAE;gBACvB,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,GAAG;gBACjC,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,IAAI,GAAG;aAClD;SACF,CAAC,CAAC,CAAC;QAEN,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,UAAU,IAAI,SAAS,CAAC;QACnD,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IAC5B,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,QAAkB;QACtB,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC;YACpC,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,IAAI,IAAA,uCAAc,EAAC,QAAQ,CAAC,CAAC;QAErE,IAAI,6BAAmB,CAAC;YACtB,UAAU,EAAE,IAAI,CAAC,WAAW;YAC5B,QAAQ,EAAE,IAAI,CAAC,SAAS;SACzB,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACnB,IAAI,6BAAmB,CAAC;YACtB,UAAU,EAAE,IAAI,CAAC,WAAW;YAC5B,QAAQ,EAAE,IAAI,CAAC,SAAS;SACzB,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IACrB,CAAC;CACF;AAED,kBAAe,WAAW,CAAC"}
|
|
@@ -55,8 +55,9 @@ class ShareRuntimeModule extends RuntimeModule {
|
|
|
55
55
|
if (sharedOption) {
|
|
56
56
|
sharedInitOptions[sharedOption.name] =
|
|
57
57
|
sharedInitOptions[sharedOption.name] || [];
|
|
58
|
-
const
|
|
59
|
-
|
|
58
|
+
const isSameVersionAndLayer = sharedInitOptions[sharedOption.name].find((s) => s.version === sharedOption.version &&
|
|
59
|
+
s.shareConfig?.layer === sharedOption.shareConfig?.layer);
|
|
60
|
+
if (!isSameVersionAndLayer) {
|
|
60
61
|
sharedInitOptions[sharedOption.name].push(sharedOption);
|
|
61
62
|
}
|
|
62
63
|
}
|
|
@@ -65,12 +66,13 @@ class ShareRuntimeModule extends RuntimeModule {
|
|
|
65
66
|
const sharedInitOptionsStr = Object.keys(sharedInitOptions).reduce((sum, sharedName) => {
|
|
66
67
|
const sharedOptions = sharedInitOptions[sharedName];
|
|
67
68
|
let str = '';
|
|
68
|
-
|
|
69
|
+
// Ensure all options are included without filtering
|
|
70
|
+
sharedOptions.forEach((option) => {
|
|
69
71
|
str += `{${Template.indent([
|
|
70
|
-
`version: ${
|
|
71
|
-
`get: ${
|
|
72
|
-
`scope: ${JSON.stringify(
|
|
73
|
-
`shareConfig: ${JSON.stringify(
|
|
72
|
+
`version: ${option.version},`,
|
|
73
|
+
`get: ${option.getter},`,
|
|
74
|
+
`scope: ${JSON.stringify(Array.isArray(option.shareScope) ? option.shareScope.flat() : [option.shareScope])},`,
|
|
75
|
+
`shareConfig: ${JSON.stringify(option.shareConfig)}`,
|
|
74
76
|
])}},`;
|
|
75
77
|
});
|
|
76
78
|
str = `[${str}]`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ShareRuntimeModule.js","sourceRoot":"","sources":["../../../../src/lib/sharing/ShareRuntimeModule.ts"],"names":[],"mappings":"AAAA;;;EAGE;AAEF,YAAY,CAAC;;AACb,0FAAqF;AAErF,sDAAsE;AAEtE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,aAAa,EAAE,GAAG,OAAO,CACzD,IAAA,6CAAoB,EAAC,SAAS,CAAC,CACJ,CAAC;AAC9B,MAAM,EAAE,0BAA0B,EAAE,GAAG,OAAO,CAC5C,IAAA,6CAAoB,EAAC,8BAA8B,CAAC,CACJ,CAAC;AAEnD,MAAM,kBAAmB,SAAQ,aAAa;IAC5C;QACE,qCAAqC;QACrC,KAAK,CAAC,SAAS,EAAE,aAAa,CAAC,YAAY,GAAG,CAAC,CAAC,CAAC;IACnD,CAAC;IAED;;OAEG;IACM,QAAQ;QACf,MAAM,WAAW,GAA4B,IAAI,CAAC,WAAW,CAAC;QAC9D,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9C,CAAC;QACD,MAAM,EAAE,eAAe,EAAE,qBAAqB,EAAE,GAAG,WAAW,CAAC;QAC/D,MAAM,UAAU,GAA2B,IAAI,CAAC,UAAU,CAAC;QAC3D,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAC7C,CAAC;QACD,MAAM,gBAAgB,GAA0C,IAAI,GAAG,EAAE,CAAC;QAC1E,MAAM,iBAAiB,GAA0B,EAAE,CAAC;QAEpD,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE,sBAAsB,EAAE,IAAI,EAAE,EAAE,CAAC;YAC/D,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,SAAS;YACX,CAAC;YACD,MAAM,OAAO,GAAG,UAAU,CAAC,0CAA0C,CACnE,KAAK,EACL,YAAY,EACZ,0BAA0B,CAC3B,CAAC;YACF,IAAI,CAAC,OAAO;gBAAE,SAAS;YACvB,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;gBACxB,MAAM,IAAI,GAAG,qBAAqB,CAAC,OAAO,CACxC,CAAC,EACD,KAAK,CAAC,OAAO,EACb,YAAY,CACb,CAAC;gBACF,IAAI,CAAC,IAAI;oBAAE,SAAS;gBACpB,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;oBACxB,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;oBAC7C,IAAI,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;oBAC9C,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;wBACzB,gBAAgB,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC;oBACzD,CAAC;oBACD,IAAI,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,CAAC,CAAC;oBACtC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;wBACvB,MAAM,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,EAAE,CAAC,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC;oBACjD,CAAC;oBACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACjB,CAAC;gBACD,MAAM,YAAY,GAAG,qBAAqB,CAAC,OAAO,CAChD,CAAC,EACD,KAAK,CAAC,OAAO,EACb,mBAAmB,CACpB,CAAC;
|
|
1
|
+
{"version":3,"file":"ShareRuntimeModule.js","sourceRoot":"","sources":["../../../../src/lib/sharing/ShareRuntimeModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import type { Compilation } from 'webpack';
|
|
2
|
+
import type { ConsumeOptions } from '../../declarations/plugins/sharing/ConsumeSharedModule';
|
|
2
3
|
interface MatchedConfigs<T> {
|
|
3
4
|
resolved: Map<string, T>;
|
|
4
5
|
unresolved: Map<string, T>;
|
|
5
6
|
prefixed: Map<string, T>;
|
|
6
7
|
}
|
|
7
|
-
export declare function resolveMatchedConfigs<T>(compilation: Compilation, configs: [string, T][]): Promise<MatchedConfigs<T>>;
|
|
8
|
+
export declare function resolveMatchedConfigs<T extends ConsumeOptions>(compilation: Compilation, configs: [string, T][]): Promise<MatchedConfigs<T>>;
|
|
8
9
|
export {};
|
|
@@ -8,9 +8,25 @@ exports.resolveMatchedConfigs = resolveMatchedConfigs;
|
|
|
8
8
|
const normalize_webpack_path_1 = require("@module-federation/sdk/normalize-webpack-path");
|
|
9
9
|
const ModuleNotFoundError = require((0, normalize_webpack_path_1.normalizeWebpackPath)('webpack/lib/ModuleNotFoundError'));
|
|
10
10
|
const LazySet = require((0, normalize_webpack_path_1.normalizeWebpackPath)('webpack/lib/util/LazySet'));
|
|
11
|
+
const RELATIVE_REQUEST_REGEX = /^\.\.?(\/|$)/;
|
|
12
|
+
const ABSOLUTE_PATH_REGEX = /^(\/|[A-Za-z]:\\|\\\\)/;
|
|
11
13
|
const RESOLVE_OPTIONS = {
|
|
12
14
|
dependencyType: 'esm',
|
|
13
15
|
};
|
|
16
|
+
function createCompositeKey(request, config) {
|
|
17
|
+
if (config.issuerLayer) {
|
|
18
|
+
return `(${config.issuerLayer})${request}`;
|
|
19
|
+
// layer unlikely to be used, issuerLayer is what factorize provides
|
|
20
|
+
// which is what we need to create a matching key for
|
|
21
|
+
}
|
|
22
|
+
else if (config.layer) {
|
|
23
|
+
return `(${config.layer})${request}`;
|
|
24
|
+
}
|
|
25
|
+
else {
|
|
26
|
+
return request;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
// TODO: look at passing dedicated request key instead of infer from object key
|
|
14
30
|
async function resolveMatchedConfigs(compilation, configs) {
|
|
15
31
|
const resolved = new Map();
|
|
16
32
|
const unresolved = new Map();
|
|
@@ -20,22 +36,18 @@ async function resolveMatchedConfigs(compilation, configs) {
|
|
|
20
36
|
contextDependencies: new LazySet(),
|
|
21
37
|
missingDependencies: new LazySet(),
|
|
22
38
|
};
|
|
23
|
-
// @ts-ignore
|
|
24
39
|
const resolver = compilation.resolverFactory.get('normal', RESOLVE_OPTIONS);
|
|
25
40
|
const context = compilation.compiler.context;
|
|
26
|
-
await Promise.all(
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
if (/^\.\.?(\/|$)/.test(request)) {
|
|
41
|
+
await Promise.all(configs.map(([request, config]) => {
|
|
42
|
+
const resolveRequest = config.request || request;
|
|
43
|
+
if (RELATIVE_REQUEST_REGEX.test(resolveRequest)) {
|
|
30
44
|
// relative request
|
|
31
45
|
return new Promise((resolve) => {
|
|
32
|
-
resolver.resolve({}, context,
|
|
46
|
+
resolver.resolve({}, context, resolveRequest, resolveContext, (err, result) => {
|
|
33
47
|
if (err || result === false) {
|
|
34
|
-
err = err || new Error(`Can't resolve ${
|
|
35
|
-
compilation.errors.push(
|
|
36
|
-
|
|
37
|
-
new ModuleNotFoundError(null, err, {
|
|
38
|
-
name: `shared module ${request}`,
|
|
48
|
+
err = err || new Error(`Can't resolve ${resolveRequest}`);
|
|
49
|
+
compilation.errors.push(new ModuleNotFoundError(null, err, {
|
|
50
|
+
name: `shared module ${resolveRequest}`,
|
|
39
51
|
}));
|
|
40
52
|
return resolve();
|
|
41
53
|
}
|
|
@@ -44,17 +56,22 @@ async function resolveMatchedConfigs(compilation, configs) {
|
|
|
44
56
|
});
|
|
45
57
|
});
|
|
46
58
|
}
|
|
47
|
-
else if (
|
|
59
|
+
else if (ABSOLUTE_PATH_REGEX.test(resolveRequest)) {
|
|
48
60
|
// absolute path
|
|
49
|
-
resolved.set(
|
|
61
|
+
resolved.set(resolveRequest, config);
|
|
62
|
+
return undefined;
|
|
50
63
|
}
|
|
51
|
-
else if (
|
|
64
|
+
else if (resolveRequest.endsWith('/')) {
|
|
52
65
|
// module request prefix
|
|
53
|
-
|
|
66
|
+
const key = createCompositeKey(resolveRequest, config);
|
|
67
|
+
prefixed.set(key, config);
|
|
68
|
+
return undefined;
|
|
54
69
|
}
|
|
55
70
|
else {
|
|
56
71
|
// module request
|
|
57
|
-
|
|
72
|
+
const key = createCompositeKey(resolveRequest, config);
|
|
73
|
+
unresolved.set(key, config);
|
|
74
|
+
return undefined;
|
|
58
75
|
}
|
|
59
76
|
}));
|
|
60
77
|
compilation.contextDependencies.addAll(resolveContext.contextDependencies);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveMatchedConfigs.js","sourceRoot":"","sources":["../../../../src/lib/sharing/resolveMatchedConfigs.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"resolveMatchedConfigs.js","sourceRoot":"","sources":["../../../../src/lib/sharing/resolveMatchedConfigs.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { ConsumeOptions } from '
|
|
1
|
+
import type { ConsumeOptions } from '../../declarations/plugins/sharing/ConsumeSharedModule';
|
|
2
2
|
import type { InputFileSystem } from 'webpack/lib/util/fs';
|
|
3
3
|
/**
|
|
4
4
|
* @see https://docs.npmjs.com/cli/v7/configuring-npm/package-json#urls-as-dependencies
|
|
@@ -37,7 +37,8 @@ export declare function normalizeConsumeShareOptions(consumeOptions: ConsumeOpti
|
|
|
37
37
|
strictVersion: boolean;
|
|
38
38
|
singleton: boolean;
|
|
39
39
|
eager: boolean;
|
|
40
|
+
layer: string | null | undefined;
|
|
40
41
|
};
|
|
41
|
-
shareScope: string;
|
|
42
|
+
shareScope: string | string[];
|
|
42
43
|
shareKey: string;
|
|
43
44
|
};
|
|
@@ -345,7 +345,7 @@ function getRequiredVersionFromDescriptionFile(data, packageName) {
|
|
|
345
345
|
}
|
|
346
346
|
}
|
|
347
347
|
function normalizeConsumeShareOptions(consumeOptions) {
|
|
348
|
-
const { requiredVersion = false, strictVersion, singleton = false, eager, shareKey, shareScope, } = consumeOptions;
|
|
348
|
+
const { requiredVersion = false, strictVersion, singleton = false, eager, shareKey, shareScope, layer, } = consumeOptions;
|
|
349
349
|
return {
|
|
350
350
|
shareConfig: {
|
|
351
351
|
fixedDependencies: false,
|
|
@@ -353,6 +353,7 @@ function normalizeConsumeShareOptions(consumeOptions) {
|
|
|
353
353
|
strictVersion,
|
|
354
354
|
singleton,
|
|
355
355
|
eager,
|
|
356
|
+
layer,
|
|
356
357
|
},
|
|
357
358
|
shareScope,
|
|
358
359
|
shareKey,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/lib/sharing/utils.ts"],"names":[],"mappings":";AAAA;;;EAGE;;AAqUO,4CAAgB;AAoFhB,gDAAkB;AAO3B,sFAgCC;AAED,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/lib/sharing/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
export declare const validate: typeof
|
|
2
|
-
export default
|
|
3
|
-
declare function
|
|
1
|
+
export declare const validate: typeof u;
|
|
2
|
+
export default u;
|
|
3
|
+
declare function u(s: any, { instancePath: a, parentData: o, parentDataProperty: p, rootData: l, }?: {
|
|
4
4
|
instancePath?: string | undefined;
|
|
5
5
|
parentData: any;
|
|
6
6
|
parentDataProperty: any;
|