Skip to content

Commit ca0bdeb

Browse files
committed
Merge branch 'main' of ssh://github.com/GrinZero/react
* 'main' of ssh://github.com/GrinZero/react: (26 commits) [devtools][easy] Fix flow type (facebook#25147) Remove Symbol Polyfill (again) (facebook#25144) Remove ReactFiberFlags MountLayoutDev and MountPassiveDev (facebook#25091) experimental_use(promise) (facebook#25084) [Transition Tracing] onMarkerIncomplete - Tracing Marker/Suspense Boundary Deletions (facebook#24885) [Flight] Add support for Webpack Async Modules (facebook#25138) Fix typo: supportsMicrotask -> supportsMicrotasks (facebook#25142) Allow functions to be used as module references (facebook#25137) Test the node-register hooks in unit tests (facebook#25132) Return closestInstance in `getInspectorDataForViewAtPoint` (facebook#25118) [DevTools] Highlight RN elements on hover (facebook#25106) Update fixtures/flight to webpack 5 (facebook#25115) Align StrictMode behaviour with production (facebook#25049) Scaffolding for useMemoCache hook (facebook#25123) devtools: Fix typo from directores to directories (facebook#25124) fixture: Fix typo from perfomrance to performance (facebook#25100) [DevTools] Add events necessary for click to inspect on RN (facebook#25111) Add missing createServerContext for experimental shared subset (facebook#25114) support subresource integrity for bootstrapScripts and bootstrapModules (facebook#25104) make preamble and postamble types explicit and fix typo (facebook#25102) ...
2 parents 8551baa + a58236d commit ca0bdeb

File tree

125 files changed

+10852
-9871
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+10852
-9871
lines changed

CODE_OF_CONDUCT.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Examples of unacceptable behavior by participants include:
2626
advances
2727
* Trolling, insulting/derogatory comments, and personal or political attacks
2828
* Public or private harassment
29-
* Publishing other's private information, such as a physical or electronic
29+
* Publishing others' private information, such as a physical or electronic
3030
address, without explicit permission
3131
* Other conduct which could reasonably be considered inappropriate in a
3232
professional setting

fixtures/fizz/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Fizz Fixtures
22

3-
A set of basic tests for Fizz primarily focussed on baseline perfomrance of legacy renderToString and streaming implementations.
3+
A set of basic tests for Fizz primarily focussed on baseline performance of legacy renderToString and streaming implementations.
44

55
## Setup
66

fixtures/flight/.env

-1
This file was deleted.

fixtures/flight/config/env.js

-2
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,6 @@ function getClientEnvironment(publicUrl) {
8686
WDS_SOCKET_PATH: process.env.WDS_SOCKET_PATH,
8787
WDS_SOCKET_PORT: process.env.WDS_SOCKET_PORT,
8888
// Whether or not react-refresh is enabled.
89-
// react-refresh is not 100% stable at this time,
90-
// which is why it's disabled by default.
9189
// It is defined here so it is available in the webpackHotDevClient.
9290
FAST_REFRESH: process.env.FAST_REFRESH !== 'false',
9391
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
'use strict';
2+
3+
const babelJest = require('babel-jest').default;
4+
5+
const hasJsxRuntime = (() => {
6+
if (process.env.DISABLE_NEW_JSX_TRANSFORM === 'true') {
7+
return false;
8+
}
9+
10+
try {
11+
require.resolve('react/jsx-runtime');
12+
return true;
13+
} catch (e) {
14+
return false;
15+
}
16+
})();
17+
18+
module.exports = babelJest.createTransformer({
19+
presets: [
20+
[
21+
require.resolve('babel-preset-react-app'),
22+
{
23+
runtime: hasJsxRuntime ? 'automatic' : 'classic',
24+
},
25+
],
26+
],
27+
babelrc: false,
28+
configFile: false,
29+
});

fixtures/flight/config/paths.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ const publicUrlOrPath = getPublicUrlOrPath(
2121
process.env.PUBLIC_URL
2222
);
2323

24+
const buildPath = process.env.BUILD_PATH || 'build';
25+
2426
const moduleFileExtensions = [
2527
'web.mjs',
2628
'mjs',
@@ -52,7 +54,7 @@ const resolveModule = (resolveFn, filePath) => {
5254
module.exports = {
5355
dotenv: resolveApp('.env'),
5456
appPath: resolveApp('.'),
55-
appBuild: resolveApp('build'),
57+
appBuild: resolveApp(buildPath),
5658
appPublic: resolveApp('public'),
5759
appHtml: resolveApp('public/index.html'),
5860
appIndexJs: resolveModule(resolveApp, 'src/index'),
@@ -64,6 +66,8 @@ module.exports = {
6466
testsSetup: resolveModule(resolveApp, 'src/setupTests'),
6567
proxySetup: resolveApp('src/setupProxy.js'),
6668
appNodeModules: resolveApp('node_modules'),
69+
appWebpackCache: resolveApp('node_modules/.cache'),
70+
appTsBuildInfoFile: resolveApp('node_modules/.cache/tsconfig.tsbuildinfo'),
6771
swSrc: resolveModule(resolveApp, 'src/service-worker'),
6872
publicUrlOrPath,
6973
};

fixtures/flight/config/pnpTs.js

-35
This file was deleted.

0 commit comments

Comments
 (0)