@@ -28,13 +28,9 @@ function packageSearch(dir, pkg) {
2828}
2929
3030// Determine if it's a NodeJS output filesystem or if it's a foreign/virtual one.
31+ // The internal webpack5 implementation of outputFileSystem is graceful-fs.
3132function isNodeOutputFS ( compiler ) {
32- return (
33- compiler . outputFileSystem &&
34- compiler . outputFileSystem . constructor &&
35- compiler . outputFileSystem . constructor . name &&
36- compiler . outputFileSystem . constructor . name === 'NodeOutputFileSystem'
37- ) ;
33+ return compiler . outputFileSystem && JSON . stringify ( compiler . outputFileSystem ) === JSON . stringify ( fs ) ;
3834}
3935
4036// Normalize a filepath to be relative to the webpack context, using forward-slashes, and
@@ -57,7 +53,7 @@ function bundleConst(name) {
5753 ) ;
5854}
5955
60- function resolveBundle ( dir , context , symlinks , relative ) {
56+ function resolveBundle ( { dir, context, symlinks, relative, publicPath } ) {
6157 const bundle = { resolved : dir , path : dir , emit : true } ;
6258 if ( path . isAbsolute ( bundle . path ) ) {
6359 bundle . emit = false ;
@@ -73,7 +69,7 @@ function resolveBundle(dir, context, symlinks, relative) {
7369 if ( relative ) {
7470 bundle . resolved = JSON . stringify ( transformPath ( context , bundle . path ) ) ;
7571 } else {
76- bundle . resolved = '__webpack_require__.p + ' + JSON . stringify ( transformPath ( context , bundle . path ) ) ;
72+ bundle . resolved = publicPath + JSON . stringify ( transformPath ( context , bundle . path ) ) ;
7773 }
7874 }
7975 return bundle ;
@@ -180,6 +176,26 @@ function emitAsset(compilation, name, data) {
180176 } ;
181177}
182178
179+ const iLibPluginHooksMap = new WeakMap ( ) ;
180+
181+ function getILibPluginHooks ( compilation ) {
182+ let hooks = iLibPluginHooksMap . get ( compilation ) ;
183+
184+ // Setup the hooks only once
185+ if ( hooks === undefined ) {
186+ hooks = createILibPluginHooks ( ) ;
187+ iLibPluginHooksMap . set ( compilation , hooks ) ;
188+ }
189+
190+ return hooks ;
191+ }
192+
193+ function createILibPluginHooks ( ) {
194+ return {
195+ ilibManifestList : new SyncWaterfallHook ( [ 'manifests' ] )
196+ } ;
197+ }
198+
183199class ILibPlugin {
184200 constructor ( options = { } ) {
185201 this . options = options ;
@@ -239,24 +255,38 @@ class ILibPlugin {
239255 }
240256
241257 // Resolve an accurate basepath for iLib.
242- const ilib = resolveBundle ( opts . ilib , opts . context , opts . symlinks ) ;
243- const resources = resolveBundle (
244- opts . resources || 'resources' ,
245- opts . context ,
246- opts . symlinks ,
247- Boolean ( opts . relativeResources )
248- ) ;
258+ const ilib = resolveBundle ( {
259+ dir : opts . ilib ,
260+ context : opts . context ,
261+ symlinks : opts . symlinks ,
262+ publicPath : opts . publicPath
263+ } ) ;
264+ const resources = resolveBundle ( {
265+ dir : opts . resources || 'resources' ,
266+ context : opts . context ,
267+ symlinks : opts . symlinks ,
268+ relative : Boolean ( opts . relativeResources ) ,
269+ publicPath : opts . publicPath
270+ } ) ;
249271 const definedConstants = {
250272 ILIB_BASE_PATH : ilib . resolved ,
251273 ILIB_RESOURCES_PATH : resources . resolved ,
252274 ILIB_CACHE_ID : '__webpack_require__.ilib_cache_id' ,
253275 // when `emit` is false and `ilib` is not absolute, can delare no assets
254276 ILIB_NO_ASSETS : JSON . stringify ( ! opts . emit && ! path . isAbsolute ( opts . ilib ) )
255277 } ;
278+ if ( opts . ilibAdditionalResourcesPath ) {
279+ definedConstants . ILIB_ADDITIONAL_RESOURCES_PATH = '"' + opts . ilibAdditionalResourcesPath + '"' ;
280+ }
256281 definedConstants [ bundleConst ( app . name ) ] = definedConstants . ILIB_RESOURCES_PATH ;
257282 for ( const name in opts . bundles ) {
258283 if ( opts . bundles [ name ] ) {
259- const bundle = resolveBundle ( opts . bundles [ name ] , opts . context , opts . symlinks ) ;
284+ const bundle = resolveBundle ( {
285+ dir : opts . bundles [ name ] ,
286+ context : opts . context ,
287+ symlinks : opts . symlinks ,
288+ publicPath : opts . publicPath
289+ } ) ;
260290 const bundleManifest = path . join ( bundle . path , 'ilibmanifest.json' ) ;
261291 definedConstants [ bundleConst ( name ) ] = bundle . resolved ;
262292 if ( opts . emit && bundle . emit && fs . existsSync ( bundleManifest ) ) {
@@ -273,16 +303,13 @@ class ILibPlugin {
273303 new ContextReplacementPlugin ( / i l i b / , / ^ $ / ) . apply ( compiler ) ;
274304
275305 compiler . hooks . compilation . tap ( 'ILibPlugin' , compilation => {
276- // Define compilation hooks
277- compilation . hooks . ilibManifestList = new SyncWaterfallHook ( [ 'manifests' ] ) ;
278-
279306 // Add a unique ID value to the webpack require-function, so that the value is correctly updated,
280307 // even when hot-reloading and serving.
281308 const main = compilation . mainTemplate ;
282309 main . hooks . requireExtensions . tap ( 'ILibPlugin' , source => {
283310 const buf = [ source ] ;
284311 buf . push ( '' ) ;
285- buf . push ( main . requireFn + ' .ilib_cache_id = '+ JSON . stringify ( '' + new Date ( ) . getTime ( ) ) + ';' ) ;
312+ buf . push ( '__webpack_require__ .ilib_cache_id = '+ JSON . stringify ( '' + new Date ( ) . getTime ( ) ) + ';' ) ;
286313 return Template . asString ( buf ) ;
287314 } ) ;
288315 } ) ;
@@ -332,11 +359,15 @@ class ILibPlugin {
332359 )
333360 ) ;
334361 }
335- manifests = compilation . hooks . ilibManifestList . call ( manifests ) ;
362+ manifests = getILibPluginHooks ( compilation ) . ilibManifestList . call ( manifests ) ;
336363 handleBundles ( compilation , manifests , opts , callback ) ;
337364 } ) ;
338365 }
339366 }
340367}
341368
369+ // A static helper to get the hooks for this plugin
370+ // Usage: ILibPlugin.getHooks(compilation).HOOK_NAME.tapAsync('YourPluginName', () => { ... });
371+ ILibPlugin . getHooks = getILibPluginHooks ;
372+
342373module . exports = ILibPlugin ;
0 commit comments