@@ -20,7 +20,9 @@ const { parseRange } = require("./semver");
2020const {
2121 getDescriptionFile,
2222 getRequiredVersionFromDescriptionFile,
23- isRequiredVersion
23+ isRequiredVersion,
24+ matchesRequestFilters,
25+ matchesVersionFilters
2426} = require ( "./utils" ) ;
2527
2628const getModuleNotFoundError = memoize ( ( ) =>
@@ -39,6 +41,12 @@ const getModuleNotFoundError = memoize(() =>
3941/** @import { SemVerRange } from "./semver" */
4042/** @import { ConsumeOptions } from "./ConsumeSharedModule" */
4143/** @import { DescriptionFile } from "./utils" */
44+ /** @import { SharedModuleFilter } from "../../declarations/plugins/sharing/SharePlugin" */
45+
46+ /**
47+ * Consume options plus the filters deciding which matched requests are consumed.
48+ * @typedef {ConsumeOptions & { include?: SharedModuleFilter, exclude?: SharedModuleFilter } } ConsumeConfig
49+ */
4250
4351/** @type {ResolveOptionsWithDependencyType } */
4452const RESOLVE_OPTIONS = { dependencyType : "esm" } ;
@@ -79,12 +87,12 @@ class ConsumeSharedPlugin {
7987 } ) ;
8088 }
8189
82- /** @type {[string, ConsumeOptions ][] } */
90+ /** @type {[string, ConsumeConfig ][] } */
8391 const consumes = parseOptions (
8492 this . options . consumes ,
8593 ( item , key ) => {
8694 if ( Array . isArray ( item ) ) throw new Error ( "Unexpected array in options" ) ;
87- /** @type {ConsumeOptions } */
95+ /** @type {ConsumeConfig } */
8896 const result =
8997 item === key || ! isRequiredVersion ( item )
9098 ? // item is a request/key
@@ -126,7 +134,9 @@ class ConsumeSharedPlugin {
126134 : item . import !== false && ! item . singleton ,
127135 packageName : item . packageName ,
128136 singleton : Boolean ( item . singleton ) ,
129- eager : Boolean ( item . eager )
137+ eager : Boolean ( item . eager ) ,
138+ include : item . include ,
139+ exclude : item . exclude
130140 } )
131141 ) ;
132142
@@ -149,7 +159,7 @@ class ConsumeSharedPlugin {
149159 } ) )
150160 ) ;
151161
152- /** @typedef {Map<string, ConsumeOptions > } Consumes */
162+ /** @typedef {Map<string, ConsumeConfig > } Consumes */
153163
154164 /** @type {Consumes } */
155165 let unresolvedConsumes ;
@@ -174,8 +184,8 @@ class ConsumeSharedPlugin {
174184 * Creates a consume shared module.
175185 * @param {string } context issuer directory
176186 * @param {string } request request
177- * @param {ConsumeOptions } config options
178- * @returns {Promise<ConsumeSharedModule> } create module
187+ * @param {ConsumeConfig } config options
188+ * @returns {Promise<ConsumeSharedModule | undefined > } create module, or undefined when filtered out
179189 */
180190 const createConsumeSharedModule = ( context , request , config ) => {
181191 /**
@@ -189,6 +199,9 @@ class ConsumeSharedPlugin {
189199 error . file = `shared module ${ request } ` ;
190200 compilation . warnings . push ( error ) ;
191201 } ;
202+ const { include, exclude, ...options } = config ;
203+ /** @type {string | undefined } */
204+ let fallbackVersion ;
192205 const directFallback =
193206 config . import &&
194207 / ^ (?: \. \. ? (?: \/ | $ ) | \/ | [ A - Z ] : | \\ \\ ) / i. test ( config . import ) ;
@@ -214,7 +227,7 @@ class ConsumeSharedPlugin {
214227 directFallback ? compiler . context : context ,
215228 config . import ,
216229 resolveContext ,
217- ( err , result ) => {
230+ ( err , result , resolveRequest ) => {
218231 compilation . contextDependencies . addAll (
219232 resolveContext . contextDependencies
220233 ) ;
@@ -232,6 +245,14 @@ class ConsumeSharedPlugin {
232245 ) ;
233246 return resolve ( ) ;
234247 }
248+ const descriptionFileData =
249+ resolveRequest && resolveRequest . descriptionFileData ;
250+ if (
251+ descriptionFileData &&
252+ typeof descriptionFileData . version === "string"
253+ ) {
254+ fallbackVersion = descriptionFileData . version ;
255+ }
235256 resolve ( /** @type {string } */ ( result ) ) ;
236257 }
237258 ) ;
@@ -325,18 +346,23 @@ class ConsumeSharedPlugin {
325346 ) ;
326347 }
327348 )
328- ] ) . then (
329- ( [ importResolved , requiredVersion ] ) =>
330- new ConsumeSharedModule (
331- directFallback ? compiler . context : context ,
332- {
333- ...config ,
334- importResolved,
335- import : importResolved ? config . import : undefined ,
336- requiredVersion
337- }
338- )
339- ) ;
349+ ] ) . then ( ( [ importResolved , requiredVersion ] ) => {
350+ if (
351+ importResolved &&
352+ ! matchesVersionFilters ( fallbackVersion , include , exclude )
353+ ) {
354+ return ;
355+ }
356+ return new ConsumeSharedModule (
357+ directFallback ? compiler . context : context ,
358+ {
359+ ...options ,
360+ importResolved,
361+ import : importResolved ? config . import : undefined ,
362+ requiredVersion
363+ }
364+ ) ;
365+ } ) ;
340366 } ;
341367
342368 normalModuleFactory . hooks . factorize . tapPromise (
@@ -357,6 +383,15 @@ class ConsumeSharedPlugin {
357383 for ( const [ prefix , options ] of prefixedConsumes ) {
358384 if ( request . startsWith ( prefix ) ) {
359385 const remainder = request . slice ( prefix . length ) ;
386+ if (
387+ ! matchesRequestFilters (
388+ remainder ,
389+ options . include ,
390+ options . exclude
391+ )
392+ ) {
393+ continue ;
394+ }
360395 return createConsumeSharedModule ( context , request , {
361396 ...options ,
362397 import : options . import
0 commit comments