Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'canary' into upgrade-ts
- Loading branch information
Showing
20 changed files
with
502 additions
and
378 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
177 changes: 0 additions & 177 deletions
177
packages/next/build/webpack/loaders/next-flight-client-loader.ts
This file was deleted.
Oops, something went wrong.
35 changes: 35 additions & 0 deletions
35
packages/next/build/webpack/loaders/next-flight-client-loader/index.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
/** | ||
* Copyright (c) Facebook, Inc. and its affiliates. | ||
* | ||
* This source code is licensed under the MIT license found in the | ||
* LICENSE file in the root directory of this source tree. | ||
*/ | ||
|
||
import { checkExports } from '../../../analysis/get-page-static-info' | ||
import { parse } from '../../../swc' | ||
|
||
export default async function transformSource( | ||
this: any, | ||
source: string | ||
): Promise<string> { | ||
const { resourcePath } = this | ||
|
||
const transformedSource = source | ||
if (typeof transformedSource !== 'string') { | ||
throw new Error('Expected source to have been transformed to a string.') | ||
} | ||
|
||
const swcAST = await parse(transformedSource, { | ||
filename: resourcePath, | ||
isModule: 'unknown', | ||
}) | ||
const { ssg, ssr } = checkExports(swcAST) | ||
|
||
const output = ` | ||
const { createProxy } = require("next/dist/build/webpack/loaders/next-flight-client-loader/module-proxy")\n | ||
module.exports = createProxy(${JSON.stringify( | ||
resourcePath | ||
)}, { ssr: ${ssr}, ssg: ${ssg} }) | ||
` | ||
return output | ||
} |
119 changes: 119 additions & 0 deletions
119
packages/next/build/webpack/loaders/next-flight-client-loader/module-proxy.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,119 @@ | ||
/** | ||
* Copyright (c) Facebook, Inc. and its affiliates. | ||
* | ||
* This source code is licensed under the MIT license found in the | ||
* LICENSE file in the root directory of this source tree. | ||
*/ | ||
|
||
// Modified from https://github.com/facebook/react/blob/main/packages/react-server-dom-webpack/src/ReactFlightWebpackNodeRegister.js | ||
|
||
const MODULE_REFERENCE = Symbol.for('react.module.reference') | ||
const PROMISE_PROTOTYPE = Promise.prototype | ||
|
||
const proxyHandlers: ProxyHandler<object> = { | ||
get: function (target: any, name: string, _receiver: any) { | ||
switch (name) { | ||
// These names are read by the Flight runtime if you end up using the exports object. | ||
case '$$typeof': | ||
// These names are a little too common. We should probably have a way to | ||
// have the Flight runtime extract the inner target instead. | ||
return target.$$typeof | ||
case 'filepath': | ||
return target.filepath | ||
case 'name': | ||
return target.name | ||
case 'async': | ||
return target.async | ||
// We need to special case this because createElement reads it if we pass this | ||
// reference. | ||
case 'defaultProps': | ||
return undefined | ||
case '__esModule': | ||
// Something is conditionally checking which export to use. We'll pretend to be | ||
// an ESM compat module but then we'll check again on the client. | ||
target.default = { | ||
$$typeof: MODULE_REFERENCE, | ||
filepath: target.filepath, | ||
// This a placeholder value that tells the client to conditionally use the | ||
// whole object or just the default export. | ||
name: '', | ||
async: target.async, | ||
|
||
ssr: target.ssr, | ||
ssg: target.ssg, | ||
} | ||
return true | ||
case 'then': | ||
if (!target.async) { | ||
// If this module is expected to return a Promise (such as an AsyncModule) then | ||
// we should resolve that with a client reference that unwraps the Promise on | ||
// the client. | ||
const then = function then( | ||
resolve: (res: any) => void, | ||
_reject: (err: any) => void | ||
) { | ||
const moduleReference: Record<string, any> = { | ||
$$typeof: MODULE_REFERENCE, | ||
filepath: target.filepath, | ||
name: '*', // Represents the whole object instead of a particular import. | ||
async: true, | ||
|
||
ssr: target.ssr, | ||
ssg: target.ssg, | ||
} | ||
return Promise.resolve( | ||
resolve(new Proxy(moduleReference, proxyHandlers)) | ||
) | ||
} | ||
// If this is not used as a Promise but is treated as a reference to a `.then` | ||
// export then we should treat it as a reference to that name. | ||
then.$$typeof = MODULE_REFERENCE | ||
then.filepath = target.filepath | ||
// then.name is conveniently already "then" which is the export name we need. | ||
// This will break if it's minified though. | ||
return then | ||
} | ||
break | ||
|
||
case 'ssg': | ||
return target.ssg | ||
case 'ssr': | ||
return target.ssr | ||
default: | ||
break | ||
} | ||
let cachedReference = target[name] | ||
if (!cachedReference) { | ||
cachedReference = target[name] = { | ||
$$typeof: MODULE_REFERENCE, | ||
filepath: target.filepath, | ||
name: name, | ||
async: target.async, | ||
} | ||
} | ||
return cachedReference | ||
}, | ||
getPrototypeOf(_target: object) { | ||
// Pretend to be a Promise in case anyone asks. | ||
return PROMISE_PROTOTYPE | ||
}, | ||
set: function () { | ||
throw new Error('Cannot assign to a client module from a server module.') | ||
}, | ||
} | ||
|
||
export function createProxy( | ||
moduleId: string, | ||
{ ssr, ssg }: { ssr: boolean; ssg: boolean } | ||
) { | ||
const moduleReference = { | ||
$$typeof: MODULE_REFERENCE, | ||
filepath: moduleId, | ||
name: '*', // Represents the whole object instead of a particular import. | ||
async: false, | ||
|
||
ssr, | ||
ssg, | ||
} | ||
return new Proxy(moduleReference, proxyHandlers) | ||
} |
Oops, something went wrong.