diff --git a/apps/3000-home/next.config.js b/apps/3000-home/next.config.js index c022fa60937..de92969ac45 100644 --- a/apps/3000-home/next.config.js +++ b/apps/3000-home/next.config.js @@ -16,18 +16,18 @@ const nextConfig = { const { isServer } = options; ; const remotes = { - // home: createDelegatedModule(require.resolve('./remote-delegate.js'), { - // remote: `home_app@http://localhost:3000/_next/static/${isServer ? 'ssr' : 'chunks'}/remoteEntry.js`, - // }), - // shop: createDelegatedModule(require.resolve('./remote-delegate.js'), { - // remote: `shop@http://localhost:3001/_next/static/${isServer ? 'ssr' : 'chunks'}/remoteEntry.js`, - // }), + home: createDelegatedModule(require.resolve('./remote-delegate.js'), { + remote: `home_app@http://localhost:3000/_next/static/${isServer ? 'ssr' : 'chunks'}/remoteEntry.js`, + }), + shop: createDelegatedModule(require.resolve('./remote-delegate.js'), { + remote: `shop@http://localhost:3001/_next/static/${isServer ? 'ssr' : 'chunks'}/remoteEntry.js`, + }), checkout: createDelegatedModule(require.resolve('./remote-delegate.js'), { remote: `checkout@http://localhost:3002/_next/static/${isServer ? 'ssr' : 'chunks'}/remoteEntry.js`, }), - shop: `shop@http://localhost:3001/_next/static/${ - isServer ? 'ssr' : 'chunks' - }/remoteEntry.js`, + // shop: `shop@http://localhost:3001/_next/static/${ + // isServer ? 'ssr' : 'chunks' + // }/remoteEntry.js`, // checkout: `checkout@http://localhost:3002/_next/static/${ // isServer ? 'ssr' : 'chunks' // }/remoteEntry.js`, diff --git a/apps/3000-home/pages/index.tsx b/apps/3000-home/pages/index.tsx index 53016df512f..8b3c798430a 100644 --- a/apps/3000-home/pages/index.tsx +++ b/apps/3000-home/pages/index.tsx @@ -14,6 +14,7 @@ const WebpackSvgRemote = dynamic(() => import('shop/WebpackSvg'), { const WebpackPngRemote = dynamic(() => import('shop/WebpackPng'), { ssr: true, }); +console.log('loaded home app', import('shop/WebpackPng'), import('checkout/ButtonOldAnt')); const Home = () => { return ( diff --git a/apps/3000-home/remote-delegate.js b/apps/3000-home/remote-delegate.js index 8edcaf13866..86d630d88c0 100644 --- a/apps/3000-home/remote-delegate.js +++ b/apps/3000-home/remote-delegate.js @@ -11,9 +11,11 @@ module.exports = new Promise((resolve, reject) => { importDelegatedModule({ global, - url, + url: url + '?' + Date.now() }) .then(async (remote) => { + console.log(__resourceQuery, 'resolved remote from', __webpack_runtime_id__) + resolve(remote) }) .catch((err) => reject(err)); diff --git a/apps/3001-shop/next.config.js b/apps/3001-shop/next.config.js index e9baa0cf1d2..f8fc511d23f 100644 --- a/apps/3001-shop/next.config.js +++ b/apps/3001-shop/next.config.js @@ -21,15 +21,15 @@ const nextConfig = { name: 'shop', filename: 'static/chunks/remoteEntry.js', remotes: { - // home: createDelegatedModule(require.resolve('./remote-delegate.js'), { - // remote: `home_app@http://localhost:3000/_next/static/${isServer ? 'ssr' : 'chunks'}/remoteEntry.js`, - // }), - // shop: createDelegatedModule(require.resolve('./remote-delegate.js'), { - // remote: `shop@http://localhost:3001/_next/static/${isServer ? 'ssr' : 'chunks'}/remoteEntry.js`, - // }), - // checkout: createDelegatedModule(require.resolve('./remote-delegate.js'), { - // remote: `checkout@http://localhost:3002/_next/static/${isServer ? 'ssr' : 'chunks'}/remoteEntry.js`, - // }), + home: createDelegatedModule(require.resolve('./remote-delegate.js'), { + remote: `home_app@http://localhost:3000/_next/static/${isServer ? 'ssr' : 'chunks'}/remoteEntry.js`, + }), + shop: createDelegatedModule(require.resolve('./remote-delegate.js'), { + remote: `shop@http://localhost:3001/_next/static/${isServer ? 'ssr' : 'chunks'}/remoteEntry.js`, + }), + checkout: createDelegatedModule(require.resolve('./remote-delegate.js'), { + remote: `checkout@http://localhost:3002/_next/static/${isServer ? 'ssr' : 'chunks'}/remoteEntry.js`, + }), home: `home_app@http://localhost:3000/_next/static/${ isServer ? 'ssr' : 'chunks' }/remoteEntry.js`, @@ -54,7 +54,7 @@ const nextConfig = { automaticAsyncBoundary: true, enableImageLoaderFix: true, enableUrlLoaderFix: true, - automaticPageStitching: true, + automaticPageStitching: false, }, }) ); diff --git a/apps/3001-shop/remote-delegate.js b/apps/3001-shop/remote-delegate.js index 5e963dab290..86d630d88c0 100644 --- a/apps/3001-shop/remote-delegate.js +++ b/apps/3001-shop/remote-delegate.js @@ -2,16 +2,20 @@ import { importDelegatedModule } from '@module-federation/utilities'; // Delegates are currently not used in this example, but are left here for testing. module.exports = new Promise((resolve, reject) => { + //eslint-disable-next-line console.log('Delegate being called for', __resourceQuery); + //eslint-disable-next-line const currentRequest = new URLSearchParams(__resourceQuery).get('remote'); const [global, url] = currentRequest.split('@'); importDelegatedModule({ global, - url, + url: url + '?' + Date.now() }) .then(async (remote) => { + console.log(__resourceQuery, 'resolved remote from', __webpack_runtime_id__) + resolve(remote) }) .catch((err) => reject(err)); diff --git a/apps/3002-checkout/next.config.js b/apps/3002-checkout/next.config.js index ae0f8d61795..446fb121946 100644 --- a/apps/3002-checkout/next.config.js +++ b/apps/3002-checkout/next.config.js @@ -20,24 +20,24 @@ const nextConfig = { name: 'checkout', filename: 'static/chunks/remoteEntry.js', remotes: { - // home: createDelegatedModule(require.resolve('./remote-delegate.js'), { - // remote: `home_app@http://localhost:3000/_next/static/${isServer ? 'ssr' : 'chunks'}/remoteEntry.js`, - // }), - // shop: createDelegatedModule(require.resolve('./remote-delegate.js'), { - // remote: `shop@http://localhost:3001/_next/static/${isServer ? 'ssr' : 'chunks'}/remoteEntry.js`, - // }), - // checkout: createDelegatedModule(require.resolve('./remote-delegate.js'), { - // remote: `checkout@http://localhost:3002/_next/static/${isServer ? 'ssr' : 'chunks'}/remoteEntry.js`, - // }), - home: `home_app@http://localhost:3000/_next/static/${ - isServer ? 'ssr' : 'chunks' - }/remoteEntry.js`, - shop: `shop@http://localhost:3001/_next/static/${ - isServer ? 'ssr' : 'chunks' - }/remoteEntry.js`, - checkout: `checkout@http://localhost:3002/_next/static/${ - isServer ? 'ssr' : 'chunks' - }/remoteEntry.js`, + home: createDelegatedModule(require.resolve('./remote-delegate.js'), { + remote: `home_app@http://localhost:3000/_next/static/${isServer ? 'ssr' : 'chunks'}/remoteEntry.js`, + }), + shop: createDelegatedModule(require.resolve('./remote-delegate.js'), { + remote: `shop@http://localhost:3001/_next/static/${isServer ? 'ssr' : 'chunks'}/remoteEntry.js`, + }), + checkout: createDelegatedModule(require.resolve('./remote-delegate.js'), { + remote: `checkout@http://localhost:3002/_next/static/${isServer ? 'ssr' : 'chunks'}/remoteEntry.js`, + }), + // home: `home_app@http://localhost:3000/_next/static/${ + // isServer ? 'ssr' : 'chunks' + // }/remoteEntry.js`, + // shop: `shop@http://localhost:3001/_next/static/${ + // isServer ? 'ssr' : 'chunks' + // }/remoteEntry.js`, + // checkout: `checkout@http://localhost:3002/_next/static/${ + // isServer ? 'ssr' : 'chunks' + // }/remoteEntry.js`, }, exposes: { './CheckoutTitle': './components/CheckoutTitle', diff --git a/apps/3002-checkout/remote-delegate.js b/apps/3002-checkout/remote-delegate.js index 5e963dab290..86d630d88c0 100644 --- a/apps/3002-checkout/remote-delegate.js +++ b/apps/3002-checkout/remote-delegate.js @@ -2,16 +2,20 @@ import { importDelegatedModule } from '@module-federation/utilities'; // Delegates are currently not used in this example, but are left here for testing. module.exports = new Promise((resolve, reject) => { + //eslint-disable-next-line console.log('Delegate being called for', __resourceQuery); + //eslint-disable-next-line const currentRequest = new URLSearchParams(__resourceQuery).get('remote'); const [global, url] = currentRequest.split('@'); importDelegatedModule({ global, - url, + url: url + '?' + Date.now() }) .then(async (remote) => { + console.log(__resourceQuery, 'resolved remote from', __webpack_runtime_id__) + resolve(remote) }) .catch((err) => reject(err)); diff --git a/packages/nextjs-mf/src/internal.ts b/packages/nextjs-mf/src/internal.ts index eef0a4534c4..4bf8bba7d2a 100644 --- a/packages/nextjs-mf/src/internal.ts +++ b/packages/nextjs-mf/src/internal.ts @@ -111,9 +111,7 @@ export const generateRemoteTemplate = ( }; if(window.remoteLoading[${JSON.stringify(global)}]) { - return window.remoteLoading[${JSON.stringify( - global - )}].then(resolve).catch(reject); + return resolve(window.remoteLoading[${JSON.stringify(global)}]) } var res, rej; @@ -125,16 +123,16 @@ export const generateRemoteTemplate = ( }) if (typeof window[${JSON.stringify(global)}] !== 'undefined') { - res(${global}); - return resolve(${global}); + res(window[${JSON.stringify(global)}]); + return resolve(window[${JSON.stringify(global)}]); } __webpack_require__.l( url.href, function (event) { if (typeof window[${JSON.stringify(global)}] !== 'undefined') { - res(${global}); - return resolve(${global}); + res(window[${JSON.stringify(global)}]); + return resolve(window[${JSON.stringify(global)}]); } var errorType = event && (event.type === 'load' ? 'missing' : event.type); var realSrc = event && event.target && event.target.src; diff --git a/packages/utilities/src/utils/common.ts b/packages/utilities/src/utils/common.ts index 61d5802637f..6a6f77ba580 100644 --- a/packages/utilities/src/utils/common.ts +++ b/packages/utilities/src/utils/common.ts @@ -75,27 +75,31 @@ export const importDelegatedModule = async ( ) => { // @ts-ignore return loadScript(keyOrRuntimeRemoteItem) - .then((asyncContainer) => { - // for legacy reasons, we must mark container a initialized - // here otherwise older promise based implementation will try to init again with diff object - // asyncContainer.__initialized = true; + .then((asyncContainer: WebpackRemoteContainer) => { return asyncContainer; }) - .then((asyncContainer) => { + .then((asyncContainer: WebpackRemoteContainer) => { // most of this is only needed because of legacy promise based implementation + // can remove proxies once we remove promise based implementations if (typeof window === 'undefined') { //TODO: need to solve chunk flushing with delegated modules return asyncContainer; } else { const proxy = { get: asyncContainer.get, + //@ts-ignore init: function (shareScope: any, initScope: any) { try { - // @ts-ignore - return asyncContainer.init(shareScope, initScope); - } catch (e) {} - //@ts-ignore - proxy.__initialized = true; + //@ts-ignore + asyncContainer.init(shareScope, initScope); + // for legacy reasons, we must mark container a initialized + // here otherwise older promise based implementation will try to init again with diff object + //@ts-ignore + proxy.__initialized = true; + } catch (e) { + return 1 + } + }, }; // @ts-ignore @@ -171,6 +175,14 @@ const loadScript = (keyOrRuntimeRemoteItem: string | RuntimeRemote) => { if (typeof window === 'undefined') { //@ts-ignore globalScope._config[containerKey] = reference.url; + } else { + // to match promise template system, can be removed once promise template is gone + if(!globalScope.remoteLoading) { + globalScope.remoteLoading = {}; + } + if(globalScope.remoteLoading[containerKey]) { + return globalScope.remoteLoading[containerKey] + } } asyncContainer = new Promise(function (resolve, reject) { @@ -215,6 +227,9 @@ const loadScript = (keyOrRuntimeRemoteItem: string | RuntimeRemote) => { containerKey ); }); + if(typeof window !== 'undefined') { + globalScope.remoteLoading[containerKey] = asyncContainer; + } } return asyncContainer; diff --git a/yarn.lock b/yarn.lock index 9734032ab60..c0b58218856 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1763,7 +1763,7 @@ version "0.0.0" uid "" -"@module-federation/node@0.10.1": +"@module-federation/node@link:./dist/packages/nextjs-mf/dist/packages/nextjs-mf/dist/packages/node": version "0.0.0" uid "" @@ -1779,27 +1779,14 @@ version "0.0.0" uid "" -"@module-federation/utilities@1.1.1": +"@module-federation/utilities@1.2.0": version "0.0.0" uid "" -"@module-federation/utilities@1.1.2": - version "1.1.2" - dependencies: - tslib "2.4.0" - optionalDependencies: - next "^12 || ^13" - react "^17 || ^18" - "@module-federation/utilities@link:./dist/packages/utilities": version "0.0.0" uid "" -"@next/env@13.1.2": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@next/env/-/env-13.1.2.tgz#4f13e3e9d44bb17fdc1d4543827459097035f10f" - integrity sha512-PpT4UZIX66VMTqXt4HKEJ+/PwbS+tWmmhZlazaws1a+dbUA5pPdjntQ46Jvj616i3ZKN9doS9LHx3y50RLjAWg== - "@next/env@13.1.6": version "13.1.6" resolved "https://registry.yarnpkg.com/@next/env/-/env-13.1.6.tgz#c4925609f16142ded1a5cb833359ab17359b7a93" @@ -1812,131 +1799,66 @@ dependencies: glob "7.1.7" -"@next/swc-android-arm-eabi@13.1.2": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-13.1.2.tgz#eacc7757b480a8150c1aea748bf7892a4fc62f64" - integrity sha512-7mRz1owoGsbfIcdOJA3kk7KEwPZ+OvVT1z9DkR/yru4QdVLF69h/1SHy0vlUNQMxDRllabhxCfkoZCB34GOGAg== - "@next/swc-android-arm-eabi@13.1.6": version "13.1.6" resolved "https://registry.yarnpkg.com/@next/swc-android-arm-eabi/-/swc-android-arm-eabi-13.1.6.tgz#d766dfc10e27814d947b20f052067c239913dbcc" integrity sha512-F3/6Z8LH/pGlPzR1AcjPFxx35mPqjE5xZcf+IL+KgbW9tMkp7CYi1y7qKrEWU7W4AumxX/8OINnDQWLiwLasLQ== -"@next/swc-android-arm64@13.1.2": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@next/swc-android-arm64/-/swc-android-arm64-13.1.2.tgz#f3d41339b4f15852a589fe11820408572a512a27" - integrity sha512-mgjZ2eJSayovQm1LcE54BLSI4jjnnnLtq5GY5g+DdPuUiCT644gKtjZ/w2BQvuIecCqqBO+Ph9yzo/wUTq7NLg== - "@next/swc-android-arm64@13.1.6": version "13.1.6" resolved "https://registry.yarnpkg.com/@next/swc-android-arm64/-/swc-android-arm64-13.1.6.tgz#f37a98d5f18927d8c9970d750d516ac779465176" integrity sha512-cMwQjnB8vrYkWyK/H0Rf2c2pKIH4RGjpKUDvbjVAit6SbwPDpmaijLio0LWFV3/tOnY6kvzbL62lndVA0mkYpw== -"@next/swc-darwin-arm64@13.1.2": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.1.2.tgz#1a20a2262aa7a250517c9a7f2efd6ac6273f8c63" - integrity sha512-RikoQqy109r2222UJlyGs4dZw2BibkfPqpeFdW5JEGv+L2PStlHID8DwyVYbmHfQ0VIBGvbf/NAUtFakAWlhwg== - "@next/swc-darwin-arm64@13.1.6": version "13.1.6" resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-13.1.6.tgz#ec1b90fd9bf809d8b81004c5182e254dced4ad96" integrity sha512-KKRQH4DDE4kONXCvFMNBZGDb499Hs+xcFAwvj+rfSUssIDrZOlyfJNy55rH5t2Qxed1e4K80KEJgsxKQN1/fyw== -"@next/swc-darwin-x64@13.1.2": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-13.1.2.tgz#242bb321676bd88f4cffa7eae3283215cd1185ce" - integrity sha512-JbDZjaTvL8gyPC5TAH6OnD4jmXPkyUxRYPvu08ZmhT/XAFBb/Cso0BdXyDax/BPCG70mimP9d3hXNKNq+A0VtQ== - "@next/swc-darwin-x64@13.1.6": version "13.1.6" resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-13.1.6.tgz#e869ac75d16995eee733a7d1550322d9051c1eb4" integrity sha512-/uOky5PaZDoaU99ohjtNcDTJ6ks/gZ5ykTQDvNZDjIoCxFe3+t06bxsTPY6tAO6uEAw5f6vVFX5H5KLwhrkZCA== -"@next/swc-freebsd-x64@13.1.2": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@next/swc-freebsd-x64/-/swc-freebsd-x64-13.1.2.tgz#9589f7f2bebfa43a744c9e41654e743b38a318b1" - integrity sha512-ax4j8VrdFQ/xc3W7Om0u1vnDxVApQHKsChBbAMynCrnycZmpbqK4MZu4ZkycT+mx2eccCiqZROpbzDbEdPosEw== - "@next/swc-freebsd-x64@13.1.6": version "13.1.6" resolved "https://registry.yarnpkg.com/@next/swc-freebsd-x64/-/swc-freebsd-x64-13.1.6.tgz#84a7b2e423a2904afc2edca21c2f1ba6b53fa4c1" integrity sha512-qaEALZeV7to6weSXk3Br80wtFQ7cFTpos/q+m9XVRFggu+8Ib895XhMWdJBzew6aaOcMvYR6KQ6JmHA2/eMzWw== -"@next/swc-linux-arm-gnueabihf@13.1.2": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-13.1.2.tgz#8935b0c8f232e36c3d88cd1e1023afa8d51f7260" - integrity sha512-NcRHTesnCxnUvSJa637PQJffBBkmqi5XS/xVWGY7dI6nyJ+pC96Oj7kd+mcjnFUQI5lHKbg39qBWKtOzbezc4w== - "@next/swc-linux-arm-gnueabihf@13.1.6": version "13.1.6" resolved "https://registry.yarnpkg.com/@next/swc-linux-arm-gnueabihf/-/swc-linux-arm-gnueabihf-13.1.6.tgz#980eed1f655ff8a72187d8a6ef9e73ac39d20d23" integrity sha512-OybkbC58A1wJ+JrJSOjGDvZzrVEQA4sprJejGqMwiZyLqhr9Eo8FXF0y6HL+m1CPCpPhXEHz/2xKoYsl16kNqw== -"@next/swc-linux-arm64-gnu@13.1.2": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.1.2.tgz#3482f72e580cdfc4bbec2e55dd55d5a9bdf7038b" - integrity sha512-AxJdjocLtPrsBY4P2COSBIc3crT5bpjgGenNuINoensOlXhBkYM0aRDYZdydwXOhG+kN2ngUvfgitop9pa204w== - "@next/swc-linux-arm64-gnu@13.1.6": version "13.1.6" resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-13.1.6.tgz#87a71db21cded3f7c63d1d19079845c59813c53d" integrity sha512-yCH+yDr7/4FDuWv6+GiYrPI9kcTAO3y48UmaIbrKy8ZJpi7RehJe3vIBRUmLrLaNDH3rY1rwoHi471NvR5J5NQ== -"@next/swc-linux-arm64-musl@13.1.2": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.1.2.tgz#3b7ca70fd813c77f618ee34a150b977cc15af9a3" - integrity sha512-JmNimDkcCRq7P5zpkdqeaSZ69qKDntEPtyIaMNWqy5M0WUJxGim0Fs6Qzxayiyvuuh9Guxks4woQ/j/ZvX/c8Q== - "@next/swc-linux-arm64-musl@13.1.6": version "13.1.6" resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-13.1.6.tgz#c5aac8619331b9fd030603bbe2b36052011e11de" integrity sha512-ECagB8LGX25P9Mrmlc7Q/TQBb9rGScxHbv/kLqqIWs2fIXy6Y/EiBBiM72NTwuXUFCNrWR4sjUPSooVBJJ3ESQ== -"@next/swc-linux-x64-gnu@13.1.2": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.1.2.tgz#51a7a889e88eb87a5ce9658842f9e8422e037ead" - integrity sha512-TsLsjZwUlgmvI42neTuIoD6K9RlXCUzqPtvIClgXxVO0um0DiZwK+M+0zX/uVXhMVphfPY2c5YeR1zFSIONY4A== - "@next/swc-linux-x64-gnu@13.1.6": version "13.1.6" resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-13.1.6.tgz#9513d36d540bbfea575576746736054c31aacdea" integrity sha512-GT5w2mruk90V/I5g6ScuueE7fqj/d8Bui2qxdw6lFxmuTgMeol5rnzAv4uAoVQgClOUO/MULilzlODg9Ib3Y4Q== -"@next/swc-linux-x64-musl@13.1.2": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.1.2.tgz#4c0dd08a6f8a7e4881c3551de29259b3cfe86e27" - integrity sha512-eSkyXgCXydEFPTkcncQOGepafedPte6JT/OofB9uvruucrrMVBagCASOuPxodWEMrlfEKSXVnExMKIlfmQMD7A== - "@next/swc-linux-x64-musl@13.1.6": version "13.1.6" resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-13.1.6.tgz#d61fc6884899f5957251f4ce3f522e34a2c479b7" integrity sha512-keFD6KvwOPzmat4TCnlnuxJCQepPN+8j3Nw876FtULxo8005Y9Ghcl7ACcR8GoiKoddAq8gxNBrpjoxjQRHeAQ== -"@next/swc-win32-arm64-msvc@13.1.2": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.1.2.tgz#589fcce82f9f7224d2399d8d7bcba9097bb50dad" - integrity sha512-DmXFaRTgt2KrV9dmRLifDJE+cYiutHVFIw5/C9BtnwXH39uf3YbPxeD98vNrtqqqZVVLXY/1ySaSIwzYnqeY9g== - "@next/swc-win32-arm64-msvc@13.1.6": version "13.1.6" resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-13.1.6.tgz#fac2077a8ae9768e31444c9ae90807e64117cda7" integrity sha512-OwertslIiGQluFvHyRDzBCIB07qJjqabAmINlXUYt7/sY7Q7QPE8xVi5beBxX/rxTGPIbtyIe3faBE6Z2KywhQ== -"@next/swc-win32-ia32-msvc@13.1.2": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.1.2.tgz#9be05202730530631b51d7753d447dfe86095c9f" - integrity sha512-3+nBkuFs/wT+lmRVQNH5SyDT7I4vUlNPntosEaEP63FuYQdPLaxz0GvcR66MdFSFh2fsvazpe4wciOwVS4FItQ== - "@next/swc-win32-ia32-msvc@13.1.6": version "13.1.6" resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-13.1.6.tgz#498bc11c91b4c482a625bf4b978f98ae91111e46" integrity sha512-g8zowiuP8FxUR9zslPmlju7qYbs2XBtTLVSxVikPtUDQedhcls39uKYLvOOd1JZg0ehyhopobRoH1q+MHlIN/w== -"@next/swc-win32-x64-msvc@13.1.2": - version "13.1.2" - resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.1.2.tgz#c7e75033e8b8f497768c7b462ac642830141bb00" - integrity sha512-avsyveEvcvH42PvKjR4Pb8JlLttuGURr2H3ZhS2b85pHOiZ7yjH3rMUoGnNzuLMApyxYaCvd4MedPrLhnNhkog== - "@next/swc-win32-x64-msvc@13.1.6": version "13.1.6" resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-13.1.6.tgz#17ed919c723426b7d0ce1cd73d40ce3dcd342089" @@ -3929,14 +3851,6 @@ axe-core@^4.6.2: resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.6.2.tgz#6e566ab2a3d29e415f5115bc0fd2597a5eb3e5e3" integrity sha512-b1WlTV8+XKLj9gZy2DZXgQiyDp9xkkoe2a6U6UbYccScq2wgH/YwCeI2/Jq2mgo0HzQxqJOjWZBLeA/mqsk5Mg== -axios@0.27.2: - version "0.27.2" - resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972" - integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ== - dependencies: - follow-redirects "^1.14.9" - form-data "^4.0.0" - axios@^1.0.0: version "1.2.2" resolved "https://registry.yarnpkg.com/axios/-/axios-1.2.2.tgz#72681724c6e6a43a9fea860fc558127dbe32f9f1" @@ -5618,23 +5532,6 @@ dotenv@~10.0.0: resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-10.0.0.tgz#3d4227b8fb95f81096cdd2b66653fb2c7085ba81" integrity sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q== -download@8.0.0, download@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/download/-/download-8.0.0.tgz#afc0b309730811731aae9f5371c9f46be73e51b1" - integrity sha512-ASRY5QhDk7FK+XrQtQyvhpDKanLluEEQtWl/J7Lxuf/b+i8RYh997QeXvL85xitrmRKVlx9c7eTrcRdq2GS4eA== - dependencies: - archive-type "^4.0.0" - content-disposition "^0.5.2" - decompress "^4.2.1" - ext-name "^5.0.0" - file-type "^11.1.0" - filenamify "^3.0.0" - get-stream "^4.1.0" - got "^8.3.1" - make-dir "^2.1.0" - p-event "^2.1.0" - pify "^4.0.1" - download@^7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/download/-/download-7.1.0.tgz#9059aa9d70b503ee76a132897be6dec8e5587233" @@ -5653,6 +5550,23 @@ download@^7.1.0: p-event "^2.1.0" pify "^3.0.0" +download@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/download/-/download-8.0.0.tgz#afc0b309730811731aae9f5371c9f46be73e51b1" + integrity sha512-ASRY5QhDk7FK+XrQtQyvhpDKanLluEEQtWl/J7Lxuf/b+i8RYh997QeXvL85xitrmRKVlx9c7eTrcRdq2GS4eA== + dependencies: + archive-type "^4.0.0" + content-disposition "^0.5.2" + decompress "^4.2.1" + ext-name "^5.0.0" + file-type "^11.1.0" + filenamify "^3.0.0" + get-stream "^4.1.0" + got "^8.3.1" + make-dir "^2.1.0" + p-event "^2.1.0" + pify "^4.0.1" + duplexer3@^0.1.4: version "0.1.5" resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.5.tgz#0b5e4d7bad5de8901ea4440624c8e1d20099217e" @@ -5725,7 +5639,7 @@ encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== -encoding@^0.1.13: +encoding@0.1.13: version "0.1.13" resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== @@ -6283,7 +6197,7 @@ event-emitter@^0.3.5: d "1" es5-ext "~0.10.14" -eventemitter3@^4.0.0, eventemitter3@^4.0.4, eventemitter3@^4.0.7: +eventemitter3@4.0.7, eventemitter3@^4.0.0, eventemitter3@^4.0.4: version "4.0.7" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== @@ -6468,10 +6382,10 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-glob@3.2.7: - version "3.2.7" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" - integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== +fast-glob@3.2.12, fast-glob@^3.0.3, fast-glob@^3.2.11, fast-glob@^3.2.12, fast-glob@^3.2.5, fast-glob@^3.2.7, fast-glob@^3.2.9: + version "3.2.12" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" + integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -6479,10 +6393,10 @@ fast-glob@3.2.7: merge2 "^1.3.0" micromatch "^4.0.4" -fast-glob@^3.0.3, fast-glob@^3.2.11, fast-glob@^3.2.12, fast-glob@^3.2.5, fast-glob@^3.2.7, fast-glob@^3.2.9: - version "3.2.12" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" - integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== +fast-glob@3.2.7: + version "3.2.7" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" + integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" @@ -6725,7 +6639,7 @@ flatted@^3.1.0: resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787" integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ== -follow-redirects@^1.0.0, follow-redirects@^1.14.9, follow-redirects@^1.15.0: +follow-redirects@^1.0.0, follow-redirects@^1.15.0: version "1.15.2" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== @@ -9172,7 +9086,7 @@ lodash.debounce@^4.0.8: resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af" integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow== -lodash.get@4.4.2, lodash.get@^4.4.2: +lodash.get@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ== @@ -9678,31 +9592,6 @@ next-tick@1, next-tick@^1.1.0: resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb" integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ== -next@13.1.2: - version "13.1.2" - resolved "https://registry.yarnpkg.com/next/-/next-13.1.2.tgz#4105b0cf238bb2f58d5e12dbded8cabb9785f2d9" - integrity sha512-Rdnnb2YH///w78FEOR/IQ6TXga+qpth4OqFSem48ng1PYYKr6XBsIk1XVaRcIGM3o6iiHnun0nJvkJHDf+ICyQ== - dependencies: - "@next/env" "13.1.2" - "@swc/helpers" "0.4.14" - caniuse-lite "^1.0.30001406" - postcss "8.4.14" - styled-jsx "5.1.1" - optionalDependencies: - "@next/swc-android-arm-eabi" "13.1.2" - "@next/swc-android-arm64" "13.1.2" - "@next/swc-darwin-arm64" "13.1.2" - "@next/swc-darwin-x64" "13.1.2" - "@next/swc-freebsd-x64" "13.1.2" - "@next/swc-linux-arm-gnueabihf" "13.1.2" - "@next/swc-linux-arm64-gnu" "13.1.2" - "@next/swc-linux-arm64-musl" "13.1.2" - "@next/swc-linux-x64-gnu" "13.1.2" - "@next/swc-linux-x64-musl" "13.1.2" - "@next/swc-win32-arm64-msvc" "13.1.2" - "@next/swc-win32-ia32-msvc" "13.1.2" - "@next/swc-win32-x64-msvc" "13.1.2" - next@13.1.6, "next@^12 || ^13": version "13.1.6" resolved "https://registry.yarnpkg.com/next/-/next-13.1.6.tgz#054babe20b601f21f682f197063c9b0b32f1a27c" @@ -9757,13 +9646,6 @@ node-fetch@2.6.7: dependencies: whatwg-url "^5.0.0" -node-fetch@^2.6.7: - version "2.6.9" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6" - integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg== - dependencies: - whatwg-url "^5.0.0" - node-forge@^1: version "1.3.1" resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3" @@ -13279,7 +13161,7 @@ webpack-node-externals@^3.0.0: resolved "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-3.0.0.tgz#1a3407c158d547a9feb4229a9e3385b7b60c9917" integrity sha512-LnL6Z3GGDPht/AigwRh2dvL9PQPFQ8skEpVrWZXLWBYmqcaojHNN0onvHzie6rq7EWKrrBfPYqNEzTJgiwEQDQ== -webpack-sources@^3.0.0, webpack-sources@^3.2.3: +webpack-sources@3.2.3, webpack-sources@^3.0.0, webpack-sources@^3.2.3: version "3.2.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== @@ -13291,7 +13173,7 @@ webpack-subresource-integrity@^5.1.0: dependencies: typed-assert "^1.0.8" -webpack@5.75.0, webpack@^5.74.0, webpack@^5.75.0: +webpack@^5.74.0, webpack@^5.75.0: version "5.75.0" resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.75.0.tgz#1e440468647b2505860e94c9ff3e44d5b582c152" integrity sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==