Unverified Commit b9e0b109 authored by vercel-fleet-prod[bot]'s avatar vercel-fleet-prod[bot] Committed by GitHub

feat(turbopack): expand federation sharing compatibility

Co-authored-by: 's avatarTobias Koppers <1365881+sokra@users.noreply.github.com>
parent 8bf7cffe
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
import dynamic from 'next/dynamic' import dynamic from 'next/dynamic'
import { useEffect, useState } from 'react' import { useEffect, useState } from 'react'
// @ts-expect-error -- configured as an eager shared module
import { value as eagerValue } from 'eager-local'
const RemoteComponent = dynamic( const RemoteComponent = dynamic(
// @ts-expect-error -- provided by Module Federation at runtime // @ts-expect-error -- provided by Module Federation at runtime
...@@ -19,15 +21,20 @@ export function RemoteMessage() { ...@@ -19,15 +21,20 @@ export function RemoteMessage() {
const [defaultShared, setDefaultShared] = useState('loading') const [defaultShared, setDefaultShared] = useState('loading')
const [workerMessage, setWorkerMessage] = useState('loading') const [workerMessage, setWorkerMessage] = useState('loading')
const [scriptCount, setScriptCount] = useState('loading') const [scriptCount, setScriptCount] = useState('loading')
const [unionRange, setUnionRange] = useState('loading')
const [hyphenRange, setHyphenRange] = useState('loading')
const [caretRange, setCaretRange] = useState('loading')
const [prefixFallback, setPrefixFallback] = useState('loading')
useEffect(() => { useEffect(() => {
async function load() { async function load() {
const fallbackModule = await import('local-fallback') const fallbackModule = await import('local-fallback')
setFallback(fallbackModule.value) setFallback(fallbackModule.value)
setMessage('fallback loaded')
const defaultSharedModule = await import('default-shared') const defaultSharedModule = await import('default-shared')
setDefaultShared(defaultSharedModule.value) setDefaultShared(defaultSharedModule.value)
setMessage('default loaded') // @ts-expect-error -- matched by a trailing-slash shared prefix
const prefixModule = await import('prefix/item')
setPrefixFallback(prefixModule.value)
const remoteEntry = `${process.env.NEXT_PUBLIC_MF_REMOTE_ORIGIN}/browser/remoteEntry.js` const remoteEntry = `${process.env.NEXT_PUBLIC_MF_REMOTE_ORIGIN}/browser/remoteEntry.js`
// Insert the remote entry first. Federation should attach to this in-flight script rather // Insert the remote entry first. Federation should attach to this in-flight script rather
...@@ -50,11 +57,19 @@ export function RemoteMessage() { ...@@ -50,11 +57,19 @@ export function RemoteMessage() {
// @ts-expect-error -- provided by the remote share scope at runtime // @ts-expect-error -- provided by the remote share scope at runtime
const sharedModule = await import('remote-shared') const sharedModule = await import('remote-shared')
setShared(sharedModule.value) setShared(sharedModule.value)
setMessage('remote shared loaded')
// @ts-expect-error -- provided by Module Federation at runtime // @ts-expect-error -- provided by Module Federation at runtime
const remote = await import('catalog/message') const remote = await import('catalog/message')
setMessage(remote.message) setMessage(remote.message)
setRemoteShared(remote.remoteShared) setRemoteShared(remote.remoteShared)
// @ts-expect-error -- provided by the configured share scope
const unionModule = await import('range-union')
setUnionRange(unionModule.value)
// @ts-expect-error -- provided by the configured share scope
const hyphenModule = await import('range-hyphen')
setHyphenRange(hyphenModule.value)
// @ts-expect-error -- provided by the configured share scope
const caretModule = await import('range-v1')
setCaretRange(caretModule.value)
setScriptCount( setScriptCount(
String( String(
Array.from(document.scripts).filter( Array.from(document.scripts).filter(
...@@ -94,6 +109,11 @@ export function RemoteMessage() { ...@@ -94,6 +109,11 @@ export function RemoteMessage() {
<p id="default-shared-message">{defaultShared}</p> <p id="default-shared-message">{defaultShared}</p>
<p id="worker-message">{workerMessage}</p> <p id="worker-message">{workerMessage}</p>
<p id="remote-script-count">{scriptCount}</p> <p id="remote-script-count">{scriptCount}</p>
<p id="union-range">{unionRange}</p>
<p id="hyphen-range">{hyphenRange}</p>
<p id="caret-range">{caretRange}</p>
<p id="prefix-fallback">{prefixFallback}</p>
<p id="eager-value">{eagerValue}</p>
</> </>
) )
} }
...@@ -36,6 +36,39 @@ const nextConfig = { ...@@ -36,6 +36,39 @@ const nextConfig = {
requiredVersion: '^1.0.0', requiredVersion: '^1.0.0',
}, },
'default-shared': {}, 'default-shared': {},
'range-v1': {
import: './range-v1.js',
shareKey: 'range-lib',
version: '1.5.0',
requiredVersion: '^1.0.0',
},
'range-v2': {
import: './range-v2.js',
shareKey: 'range-lib',
version: '2.3.0',
requiredVersion: '^2.0.0',
},
'range-union': {
import: false,
shareKey: 'range-lib',
requiredVersion: '<2 || >=3',
},
'range-hyphen': {
import: false,
shareKey: 'range-lib',
requiredVersion: '2.0.0 - 2.5.0',
},
'prefix/': {
import: './prefix/',
shareKey: 'prefix/',
version: '1.0.0',
},
'eager-local': {
import: './eager-local.js',
version: '1.0.0',
requiredVersion: '^1.0.0',
eager: true,
},
}, },
}, },
}, },
......
...@@ -160,6 +160,21 @@ describeTurbopack('turbopack module federation with a webpack remote', () => { ...@@ -160,6 +160,21 @@ describeTurbopack('turbopack module federation with a webpack remote', () => {
expect(await browser.elementByCss('#remote-script-count').text()).toBe( expect(await browser.elementByCss('#remote-script-count').text()).toBe(
'1' '1'
) )
expect(await browser.elementByCss('#union-range').text()).toBe(
'range v1.5.0'
)
expect(await browser.elementByCss('#hyphen-range').text()).toBe(
'range v2.3.0'
)
expect(await browser.elementByCss('#caret-range').text()).toBe(
'range v1.5.0'
)
expect(await browser.elementByCss('#prefix-fallback').text()).toBe(
'prefix fallback sharing'
)
expect(await browser.elementByCss('#eager-value').text()).toBe(
'eager local sharing'
)
}) })
}) })
}) })
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment