amirho/react
1
0
Fork 0
mirror of https://github.com/facebook/react.git synced 2026-02-21 19:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename yarn build-combined to just yarn build (#26192)

Browse Source 
It's confusing to new contributors, and me, that you're supposed to use
`yarn build-combined` for almost everything but not fixtures.

We should use only one build command for everything.

Updated fixtures to use the folder convention of build-combined.
This commit is contained in:
Sebastian Markbåge
2023-02-17 16:00:18 -05:00
committed by GitHub
parent c9d9f524d7
commit db5e6250d4
41 changed files with 89 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
.circleci/config.yml
View File

@@ -110,14 +110,14 @@ jobs:
paths: paths:
- build - build
yarn_build_combined: yarn_build:
docker: *docker docker: *docker
environment: *environment environment: *environment
parallelism: 40 parallelism: 40
steps: steps:
- checkout - checkout
- setup_node_modules - setup_node_modules
- run: yarn build-combined - run: yarn build
- persist_to_workspace: - persist_to_workspace:
root: . root: .
paths: paths:
@@ -451,7 +451,7 @@ workflows:
# TODO: Test more persistent configurations? # TODO: Test more persistent configurations?
- '-r=stable --env=development --persistent' - '-r=stable --env=development --persistent'
- '-r=experimental --env=development --persistent' - '-r=experimental --env=development --persistent'
- yarn_build_combined: - yarn_build:
filters: filters:
branches: branches:
ignore: ignore:
@@ -464,10 +464,10 @@ workflows:
- process_artifacts_combined: - process_artifacts_combined:
requires: requires:
- scrape_warning_messages - scrape_warning_messages
- yarn_build_combined - yarn_build
- yarn_test_build: - yarn_test_build:
requires: requires:
- yarn_build_combined - yarn_build
matrix: matrix:
parameters: parameters:
args: args:
@@ -506,22 +506,22 @@ workflows:
- main - main
requires: requires:
- download_base_build_for_sizebot - download_base_build_for_sizebot
- yarn_build_combined - yarn_build
- yarn_lint_build: - yarn_lint_build:
requires: requires:
- yarn_build_combined - yarn_build
- yarn_check_release_dependencies: - yarn_check_release_dependencies:
requires: requires:
- yarn_build_combined - yarn_build
- check_error_codes: - check_error_codes:
requires: requires:
- yarn_build_combined - yarn_build
- RELEASE_CHANNEL_stable_yarn_test_dom_fixtures: - RELEASE_CHANNEL_stable_yarn_test_dom_fixtures:
requires: requires:
- yarn_build_combined - yarn_build
- build_devtools_and_process_artifacts: - build_devtools_and_process_artifacts:
requires: requires:
- yarn_build_combined - yarn_build
- run_devtools_e2e_tests: - run_devtools_e2e_tests:
requires: requires:
- build_devtools_and_process_artifacts - build_devtools_and_process_artifacts

6
fixtures/art/package.json
View File

@@ -5,9 +5,9 @@
"@babel/preset-env": "^7.10.4", "@babel/preset-env": "^7.10.4",
"@babel/preset-react": "^7.10.4", "@babel/preset-react": "^7.10.4",
"babel-loader": "^8.1.0", "babel-loader": "^8.1.0",
"react": "link:../../build/node_modules/react", "react": "link:../../build/oss-experimental/react",
"react-art": "link:../../build/node_modules/react-art/", "react-art": "link:../../build/oss-experimental/react-art/",
"react-dom": "link:../../build/node_modules/react-dom", "react-dom": "link:../../build/oss-experimental/react-dom",
"webpack": "^1.14.0" "webpack": "^1.14.0"
}, },
"scripts": { "scripts": {

6
fixtures/art/yarn.lock
View File

@@ -2251,15 +2251,15 @@ rc@^1.1.7:
minimist "^1.2.0" minimist "^1.2.0"
strip-json-comments "~2.0.1" strip-json-comments "~2.0.1"
"react-art@link:../../build/node_modules/react-art": "react-art@link:../../build/oss-experimental/react-art":
version "0.0.0" version "0.0.0"
uid "" uid ""
"react-dom@link:../../build/node_modules/react-dom": "react-dom@link:../../build/oss-experimental/react-dom":
version "0.0.0" version "0.0.0"
uid "" uid ""
"react@link:../../build/node_modules/react": "react@link:../../build/oss-experimental/react":
version "0.0.0" version "0.0.0"
uid "" uid ""

2
fixtures/attribute-behavior/package.json
View File

@@ -12,7 +12,7 @@
}, },
"scripts": { "scripts": {
"prestart": "prestart":
"cp ../../build/node_modules/react/umd/react.development.js public/ && cp ../../build/node_modules/react-dom/umd/react-dom.development.js public/ && cp ../../build/node_modules/react-dom/umd/react-dom-server-legacy.browser.development.js public/", "cp ../../build/oss-experimental/react/umd/react.development.js public/ && cp ../../build/oss-experimental/react-dom/umd/react-dom.development.js public/ && cp ../../build/oss-experimental/react-dom/umd/react-dom-server-legacy.browser.development.js public/",
"start": "react-scripts start", "start": "react-scripts start",
"build": "react-scripts build", "build": "react-scripts build",
"test": "react-scripts test --env=jsdom", "test": "react-scripts test --env=jsdom",

2
fixtures/concurrent/time-slicing/package.json
View File

@@ -11,7 +11,7 @@
"victory": "^0.25.6" "victory": "^0.25.6"
}, },
"scripts": { "scripts": {
"copy-source": "cp -r ../../../build/node_modules/* ./node_modules/", "copy-source": "cp -r ../../../build/oss-experimental/* ./node_modules/",
"start": "react-scripts start", "start": "react-scripts start",
"build": "react-scripts build", "build": "react-scripts build",
"test": "react-scripts test --env=jsdom", "test": "react-scripts test --env=jsdom",

2
fixtures/devtools/scheduling-profiler/run.js
View File

@@ -18,7 +18,7 @@ const DEPENDENCIES = [
['react-dom/umd/react-dom.development.js', 'react-dom.js'], ['react-dom/umd/react-dom.development.js', 'react-dom.js'],
]; ];
const BUILD_DIRECTORY = '../../../build/node_modules/'; const BUILD_DIRECTORY = '../../../build/oss-experimental/';
const DEPENDENCIES_DIRECTORY = 'dependencies'; const DEPENDENCIES_DIRECTORY = 'dependencies';
function initDependencies() { function initDependencies() {

2
fixtures/eslint/proxy/index.js
View File

@@ -16,7 +16,7 @@ function reload() {
} }
} }
// Point to the built version. // Point to the built version.
build = require('../../../build/node_modules/eslint-plugin-react-hooks'); build = require('../../../build/oss-experimental/eslint-plugin-react-hooks');
} }
let rules = {}; let rules = {};

2
fixtures/expiration/package.json
View File

@@ -9,7 +9,7 @@
}, },
"scripts": { "scripts": {
"prestart": "prestart":
"cp ../../build/node_modules/react/umd/react.development.js public/ && cp ../../build/node_modules/react-dom/umd/react-dom.development.js public/", "cp ../../build/oss-experimental/react/umd/react.development.js public/ && cp ../../build/oss-experimental/react-dom/umd/react-dom.development.js public/",
"start": "react-scripts start", "start": "react-scripts start",
"build": "react-scripts build", "build": "react-scripts build",
"test": "react-scripts test --env=jsdom", "test": "react-scripts test --env=jsdom",

4
fixtures/fiber-triangle/index.html
View File

@@ -16,8 +16,8 @@
If you checked out the source from GitHub make sure to run <code>npm run build</code>. If you checked out the source from GitHub make sure to run <code>npm run build</code>.
</p> </p>
</div> </div>
<script src="../../build/node_modules/react/umd/react.development.js"></script> <script src="../../build/oss-experimental/react/umd/react.development.js"></script>
<script src="../../build/node_modules/react-dom/umd/react-dom.development.js"></script> <script src="../../build/oss-experimental/react-dom/umd/react-dom.development.js"></script>
<script src="https://unpkg.com/babel-standalone@6/babel.js"></script> <script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
<script type="text/babel"> <script type="text/babel">
var dotStyle = { var dotStyle = {

6
fixtures/fizz-ssr-browser/index.html
View File

@@ -16,9 +16,9 @@
If you checked out the source from GitHub make sure to run <code>npm run build</code>. If you checked out the source from GitHub make sure to run <code>npm run build</code>.
</p> </p>
</div> </div>
<script src="../../build/node_modules/react/umd/react.development.js"></script> <script src="../../build/oss-experimental/react/umd/react.development.js"></script>
<script src="../../build/node_modules/react-dom/umd/react-dom.development.js"></script> <script src="../../build/oss-experimental/react-dom/umd/react-dom.development.js"></script>
<script src="../../build/node_modules/react-dom/umd/react-dom-server.browser.development.js"></script> <script src="../../build/oss-experimental/react-dom/umd/react-dom-server.browser.development.js"></script>
<script src="https://unpkg.com/babel-standalone@6/babel.js"></script> <script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
<script type="text/babel"> <script type="text/babel">
async function render() { async function render() {

4
fixtures/fizz/package.json
View File

@@ -15,8 +15,8 @@
"concurrently": "^5.3.0", "concurrently": "^5.3.0",
"express": "^4.17.1", "express": "^4.17.1",
"nodemon": "^2.0.6", "nodemon": "^2.0.6",
"react": "link:../../build/node_modules/react", "react": "link:../../build/oss-experimental/react",
"react-dom": "link:../../build/node_modules/react-dom", "react-dom": "link:../../build/oss-experimental/react-dom",
"react-error-boundary": "^3.1.3", "react-error-boundary": "^3.1.3",
"resolve": "1.12.0", "resolve": "1.12.0",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",

4
fixtures/fizz/yarn.lock
View File

@@ -4083,7 +4083,7 @@ rc@^1.2.8:
minimist "^1.2.0" minimist "^1.2.0"
strip-json-comments "~2.0.1" strip-json-comments "~2.0.1"
"react-dom@link:../../build/node_modules/react-dom": "react-dom@link:../../build/oss-experimental/react-dom":
version "0.0.0" version "0.0.0"
react-error-boundary@^3.1.3: react-error-boundary@^3.1.3:
@@ -4093,7 +4093,7 @@ react-error-boundary@^3.1.3:
dependencies: dependencies:
"@babel/runtime" "^7.12.5" "@babel/runtime" "^7.12.5"
"react@link:../../build/node_modules/react": "react@link:../../build/oss-experimental/react":
version "0.0.0" version "0.0.0"
read-pkg@^4.0.1: read-pkg@^4.0.1:

10
fixtures/flight-browser/index.html
View File

@@ -16,11 +16,11 @@
If you checked out the source from GitHub make sure to run <code>npm run build</code>. If you checked out the source from GitHub make sure to run <code>npm run build</code>.
</p> </p>
</div> </div>
<script src="../../build/node_modules/react/umd/react.development.js"></script> <script src="../../build/oss-experimental/react/umd/react.development.js"></script>
<script src="../../build/node_modules/react-dom/umd/react-dom.development.js"></script> <script src="../../build/oss-experimental/react-dom/umd/react-dom.development.js"></script>
<script src="../../build/node_modules/react-dom/umd/react-dom-server.browser.development.js"></script> <script src="../../build/oss-experimental/react-dom/umd/react-dom-server.browser.development.js"></script>
<script src="../../build/node_modules/react-server-dom-webpack/umd/react-server-dom-webpack-server.browser.development.js"></script> <script src="../../build/oss-experimental/react-server-dom-webpack/umd/react-server-dom-webpack-server.browser.development.js"></script>
<script src="../../build/node_modules/react-server-dom-webpack/umd/react-server-dom-webpack-client.browser.development.js"></script> <script src="../../build/oss-experimental/react-server-dom-webpack/umd/react-server-dom-webpack-client.browser.development.js"></script>
<script src="https://unpkg.com/babel-standalone@6/babel.js"></script> <script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
<script type="text/babel"> <script type="text/babel">
let Suspense = React.Suspense; let Suspense = React.Suspense;

4
fixtures/flight/package.json
View File

@@ -63,8 +63,8 @@
"workbox-webpack-plugin": "^6.4.1" "workbox-webpack-plugin": "^6.4.1"
}, },
"scripts": { "scripts": {
"prestart": "cp -r ../../build/node_modules/* ./node_modules/", "prestart": "cp -r ../../build/oss-experimental/* ./node_modules/",
"prebuild": "cp -r ../../build/node_modules/* ./node_modules/", "prebuild": "cp -r ../../build/oss-experimental/* ./node_modules/",
"start": "concurrently \"npm run start:server\" \"npm run start:client\"", "start": "concurrently \"npm run start:server\" \"npm run start:client\"",
"start:client": "NODE_ENV=development BUILD_PATH=dist node scripts/start.js", "start:client": "NODE_ENV=development BUILD_PATH=dist node scripts/start.js",
"start:server": "NODE_ENV=development BUILD_PATH=dist nodemon -- --experimental-loader ./loader/index.js --conditions=react-server server", "start:server": "NODE_ENV=development BUILD_PATH=dist nodemon -- --experimental-loader ./loader/index.js --conditions=react-server server",

4
fixtures/packaging/babel-standalone/dev.html
View File

@@ -1,7 +1,7 @@
<html> <html>
<body> <body>
<script src="../../../build/node_modules/react/umd/react.development.js"></script> <script src="../../../build/oss-experimental/react/umd/react.development.js"></script>
<script src="../../../build/node_modules/react-dom/umd/react-dom.development.js"></script> <script src="../../../build/oss-experimental/react-dom/umd/react-dom.development.js"></script>
<script src="https://unpkg.com/babel-standalone@6/babel.js"></script> <script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
<div id="container"></div> <div id="container"></div>
<script type="text/babel"> <script type="text/babel">

2
fixtures/packaging/browserify/dev/package.json
View File

@@ -6,6 +6,6 @@
}, },
"scripts": { "scripts": {
"build": "rm -f output.js && browserify ./input.js -o output.js", "build": "rm -f output.js && browserify ./input.js -o output.js",
"prebuild": "cp -r ../../../../build/node_modules/* ./node_modules/" "prebuild": "cp -r ../../../../build/oss-experimental/* ./node_modules/"
} }
} }

2
fixtures/packaging/browserify/prod/package.json
View File

@@ -6,7 +6,7 @@
}, },
"scripts": { "scripts": {
"build": "rm -f output.js && browserify ./input.js -g [envify --NODE_ENV 'production'] -o output.js", "build": "rm -f output.js && browserify ./input.js -g [envify --NODE_ENV 'production'] -o output.js",
"prebuild": "cp -r ../../../../build/node_modules/* ./node_modules/" "prebuild": "cp -r ../../../../build/oss-experimental/* ./node_modules/"
}, },
"devDependencies": { "devDependencies": {
"envify": "^4.0.0" "envify": "^4.0.0"

2
fixtures/packaging/brunch/dev/package.json
View File

@@ -7,6 +7,6 @@
}, },
"scripts": { "scripts": {
"build": "rm -rf public && brunch build", "build": "rm -rf public && brunch build",
"prebuild": "cp -r ../../../../build/node_modules/* ./node_modules/" "prebuild": "cp -r ../../../../build/oss-experimental/* ./node_modules/"
} }
} }

2
fixtures/packaging/brunch/prod/package.json
View File

@@ -7,6 +7,6 @@
}, },
"scripts": { "scripts": {
"build": "rm -rf public && brunch build -p", "build": "rm -rf public && brunch build -p",
"prebuild": "cp -r ../../../../build/node_modules/* ./node_modules/" "prebuild": "cp -r ../../../../build/oss-experimental/* ./node_modules/"
} }
} }

4
fixtures/packaging/globals/dev.html
View File

@@ -1,7 +1,7 @@
<html> <html>
<body> <body>
<script src="../../../build/node_modules/react/umd/react.development.js"></script> <script src="../../../build/oss-experimental/react/umd/react.development.js"></script>
<script src="../../../build/node_modules/react-dom/umd/react-dom.development.js"></script> <script src="../../../build/oss-experimental/react-dom/umd/react-dom.development.js"></script>
<div id="container"></div> <div id="container"></div>
<script> <script>
ReactDOM.render( ReactDOM.render(

4
fixtures/packaging/globals/prod.html
View File

@@ -1,7 +1,7 @@
<html> <html>
<body> <body>
<script src="../../../build/node_modules/react/umd/react.production.min.js"></script> <script src="../../../build/oss-experimental/react/umd/react.production.min.js"></script>
<script src="../../../build/node_modules/react-dom/umd/react-dom.production.min.js"></script> <script src="../../../build/oss-experimental/react-dom/umd/react-dom.production.min.js"></script>
<div id="container"></div> <div id="container"></div>
<script> <script>
ReactDOM.render( ReactDOM.render(

4
fixtures/packaging/requirejs/dev.html
View File

@@ -5,8 +5,8 @@
<script> <script>
requirejs.config({ requirejs.config({
paths: { paths: {
react: '../../../build/node_modules/react/umd/react.development', react: '../../../build/oss-experimental/react/umd/react.development',
'react-dom': '../../../build/node_modules/react-dom/umd/react-dom.development' 'react-dom': '../../../build/oss-experimental/react-dom/umd/react-dom.development'
} }
}); });

4
fixtures/packaging/requirejs/prod.html
View File

@@ -5,8 +5,8 @@
<script> <script>
requirejs.config({ requirejs.config({
paths: { paths: {
react: '../../../build/node_modules/react/umd/react.production.min', react: '../../../build/oss-experimental/react/umd/react.production.min',
'react-dom': '../../../build/node_modules/react-dom/umd/react-dom.production.min' 'react-dom': '../../../build/oss-experimental/react-dom/umd/react-dom.production.min'
} }
}); });

6
fixtures/packaging/rjs/dev/config.js
View File

@@ -4,10 +4,10 @@ module.exports = {
out: 'output.js', out: 'output.js',
optimize: 'none', optimize: 'none',
paths: { paths: {
react: '../../../../build/node_modules/react/umd/react.development', react: '../../../../build/oss-experimental/react/umd/react.development',
'react-dom': 'react-dom':
'../../../../build/node_modules/react-dom/umd/react-dom.development', '../../../../build/oss-experimental/react-dom/umd/react-dom.development',
schedule: schedule:
'../../../../build/node_modules/scheduler/umd/schedule.development', '../../../../build/oss-experimental/scheduler/umd/schedule.development',
}, },
}; };

6
fixtures/packaging/rjs/prod/config.js
View File

@@ -4,10 +4,10 @@ module.exports = {
out: 'output.js', out: 'output.js',
optimize: 'none', optimize: 'none',
paths: { paths: {
react: '../../../../build/node_modules/react/umd/react.production.min', react: '../../../../build/oss-experimental/react/umd/react.production.min',
'react-dom': 'react-dom':
'../../../../build/node_modules/react-dom/umd/react-dom.production.min', '../../../../build/oss-experimental/react-dom/umd/react-dom.production.min',
schedule: schedule:
'../../../../build/node_modules/scheduler/umd/schedule.development', '../../../../build/oss-experimental/scheduler/umd/schedule.development',
}, },
}; };

6
fixtures/packaging/systemjs-builder/dev/config.js
View File

@@ -1,9 +1,9 @@
System.config({ System.config({
paths: { paths: {
react: '../../../../build/node_modules/react/umd/react.development.js', react: '../../../../build/oss-experimental/react/umd/react.development.js',
'react-dom': 'react-dom':
'../../../../build/node_modules/react-dom/umd/react-dom.development.js', '../../../../build/oss-experimental/react-dom/umd/react-dom.development.js',
schedule: schedule:
'../../../../build/node_modules/scheduler/umd/schedule.development', '../../../../build/oss-experimental/scheduler/umd/schedule.development',
}, },
}); });

7
fixtures/packaging/systemjs-builder/prod/config.js
View File

@@ -1,9 +1,10 @@
System.config({ System.config({
paths: { paths: {
react: '../../../../build/node_modules/react/umd/react.production.min.js', react:
'../../../../build/oss-experimental/react/umd/react.production.min.js',
'react-dom': 'react-dom':
'../../../../build/node_modules/react-dom/umd/react-dom.production.min.js', '../../../../build/oss-experimental/react-dom/umd/react-dom.production.min.js',
schedule: schedule:
'../../../../build/node_modules/scheduler/umd/schedule.development', '../../../../build/oss-experimental/scheduler/umd/schedule.development',
}, },
}); });

4
fixtures/packaging/systemjs/dev.html
View File

@@ -5,8 +5,8 @@
<script> <script>
System.config({ System.config({
paths: { paths: {
react: '../../../build/node_modules/react/umd/react.development.js', react: '../../../build/oss-experimental/react/umd/react.development.js',
'react-dom': '../../../build/node_modules/react-dom/umd/react-dom.development.js' 'react-dom': '../../../build/oss-experimental/react-dom/umd/react-dom.development.js'
} }
}); });

4
fixtures/packaging/systemjs/prod.html
View File

@@ -5,8 +5,8 @@
<script> <script>
System.config({ System.config({
paths: { paths: {
react: '../../../build/node_modules/react/umd/react.production.min.js', react: '../../../build/oss-experimental/react/umd/react.production.min.js',
'react-dom': '../../../build/node_modules/react-dom/umd/react-dom.production.min.js' 'react-dom': '../../../build/oss-experimental/react-dom/umd/react-dom.production.min.js'
} }
}); });

2
fixtures/packaging/webpack-alias/dev/config.js
View File

@@ -6,7 +6,7 @@ module.exports = {
filename: 'output.js', filename: 'output.js',
}, },
resolve: { resolve: {
root: path.resolve('../../../../build/node_modules'), root: path.resolve('../../../../build/oss-experimental'),
alias: { alias: {
react: 'react/umd/react.development', react: 'react/umd/react.development',
'react-dom': 'react-dom/umd/react-dom.development', 'react-dom': 'react-dom/umd/react-dom.development',

2
fixtures/packaging/webpack-alias/prod/config.js
View File

@@ -6,7 +6,7 @@ module.exports = {
filename: 'output.js', filename: 'output.js',
}, },
resolve: { resolve: {
root: path.resolve('../../../../build/node_modules'), root: path.resolve('../../../../build/oss-experimental'),
alias: { alias: {
react: 'react/umd/react.production.min', react: 'react/umd/react.production.min',
'react-dom': 'react-dom/umd/react-dom.production.min', 'react-dom': 'react-dom/umd/react-dom.production.min',

2
fixtures/packaging/webpack/dev/config.js
View File

@@ -6,6 +6,6 @@ module.exports = {
filename: 'output.js', filename: 'output.js',
}, },
resolve: { resolve: {
root: path.resolve('../../../../build/node_modules/'), root: path.resolve('../../../../build/oss-experimental/'),
}, },
}; };

2
fixtures/packaging/webpack/prod/config.js
View File

@@ -7,7 +7,7 @@ module.exports = {
filename: 'output.js', filename: 'output.js',
}, },
resolve: { resolve: {
root: path.resolve('../../../../build/node_modules/'), root: path.resolve('../../../../build/oss-experimental/'),
}, },
plugins: [ plugins: [
new webpack.DefinePlugin({ new webpack.DefinePlugin({

4
fixtures/scheduler/index.html
View File

@@ -148,8 +148,8 @@
</div> </div>
</li> </li>
</ol> </ol>
<script src="../../build/node_modules/react/umd/react.production.min.js"></script> <script src="../../build/oss-experimental/react/umd/react.production.min.js"></script>
<script src="../../build/node_modules/scheduler/umd/scheduler.production.min.js"></script> <script src="../../build/oss-experimental/scheduler/umd/scheduler.production.min.js"></script>
<script src="https://unpkg.com/babel-standalone@6/babel.js"></script> <script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
<script type="text/babel"> <script type="text/babel">
const { const {

4
fixtures/ssr/package.json
View File

@@ -12,8 +12,8 @@
"ignore-styles": "^5.0.1", "ignore-styles": "^5.0.1",
"import-export": "^1.0.1", "import-export": "^1.0.1",
"node-fetch": "^1.6.3", "node-fetch": "^1.6.3",
"react": "link:../../build/node_modules/react", "react": "link:../../build/oss-experimental/react",
"react-dom": "link:../../build/node_modules/react-dom" "react-dom": "link:../../build/oss-experimental/react-dom"
}, },
"scripts": { "scripts": {
"start": "concurrently \"npm run start:server\" \"npm run start:client\"", "start": "concurrently \"npm run start:server\" \"npm run start:client\"",

4
fixtures/ssr/yarn.lock
View File

@@ -5490,7 +5490,7 @@ react-dev-utils@^0.5.2:
sockjs-client "1.0.1" sockjs-client "1.0.1"
strip-ansi "3.0.1" strip-ansi "3.0.1"
"react-dom@link:../../build/node_modules/react-dom": "react-dom@link:../../build/oss-experimental/react-dom":
version "0.0.0" version "0.0.0"
react-scripts@0.9.5: react-scripts@0.9.5:
@@ -5539,7 +5539,7 @@ react-scripts@0.9.5:
optionalDependencies: optionalDependencies:
fsevents "1.0.17" fsevents "1.0.17"
"react@link:../../build/node_modules/react": "react@link:../../build/oss-experimental/react":
version "0.0.0" version "0.0.0"
read-pkg-up@^1.0.1: read-pkg-up@^1.0.1:

4
fixtures/ssr2/package.json
View File

@@ -15,8 +15,8 @@
"concurrently": "^5.3.0", "concurrently": "^5.3.0",
"express": "^4.17.1", "express": "^4.17.1",
"nodemon": "^2.0.6", "nodemon": "^2.0.6",
"react": "link:../../build/node_modules/react", "react": "link:../../build/oss-experimental/react",
"react-dom": "link:../../build/node_modules/react-dom", "react-dom": "link:../../build/oss-experimental/react-dom",
"react-error-boundary": "^3.1.3", "react-error-boundary": "^3.1.3",
"resolve": "1.12.0", "resolve": "1.12.0",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",

4
fixtures/ssr2/yarn.lock
View File

@@ -4108,7 +4108,7 @@ rc@^1.2.8:
minimist "^1.2.0" minimist "^1.2.0"
strip-json-comments "~2.0.1" strip-json-comments "~2.0.1"
"react-dom@link:../../build/node_modules/react-dom": "react-dom@link:../../build/oss-experimental/react-dom":
version "0.0.0" version "0.0.0"
uid "" uid ""
@@ -4119,7 +4119,7 @@ react-error-boundary@^3.1.3:
dependencies: dependencies:
"@babel/runtime" "^7.12.5" "@babel/runtime" "^7.12.5"
"react@link:../../build/node_modules/react": "react@link:../../build/oss-experimental/react":
version "0.0.0" version "0.0.0"
uid "" uid ""

4
fixtures/stacks/index.html
View File

@@ -25,8 +25,8 @@
If you checked out the source from GitHub make sure to run <code>npm run build</code>. If you checked out the source from GitHub make sure to run <code>npm run build</code>.
</p> </p>
</div> </div>
<script src="../../build/node_modules/react/umd/react.production.min.js"></script> <script src="../../build/oss-experimental/react/umd/react.production.min.js"></script>
<script src="../../build/node_modules/react-dom/umd/react-dom.production.min.js"></script> <script src="../../build/oss-experimental/react-dom/umd/react-dom.production.min.js"></script>
<script src="./Components.js"></script> <script src="./Components.js"></script>
<script src="./BabelClasses-compiled.js"></script> <script src="./BabelClasses-compiled.js"></script>
<script src="./Example.js"></script> <script src="./Example.js"></script>

6
package.json
View File

@@ -108,8 +108,8 @@
"testRegex": "/scripts/jest/dont-run-jest-directly\\.js$" "testRegex": "/scripts/jest/dont-run-jest-directly\\.js$"
}, },
"scripts": { "scripts": {
"build": "node ./scripts/rollup/build.js", "build": "node ./scripts/rollup/build-all-release-channels.js",
"build-combined": "node ./scripts/rollup/build-all-release-channels.js", "build-combined": "echo 'build-combined is deprecated. yarn build instead.'",
"build-for-devtools": "cross-env RELEASE_CHANNEL=experimental yarn build react/index,react/jsx,react-dom/index,react-dom/unstable_testing,react-dom/test-utils,react-is,react-debug-tools,scheduler,react-test-renderer,react-refresh,react-art --type=NODE && cp -r ./build/node_modules build/oss-experimental/", "build-for-devtools": "cross-env RELEASE_CHANNEL=experimental yarn build react/index,react/jsx,react-dom/index,react-dom/unstable_testing,react-dom/test-utils,react-is,react-debug-tools,scheduler,react-test-renderer,react-refresh,react-art --type=NODE && cp -r ./build/node_modules build/oss-experimental/",
"build-for-devtools-dev": "yarn build-for-devtools --type=NODE_DEV", "build-for-devtools-dev": "yarn build-for-devtools --type=NODE_DEV",
"build-for-devtools-prod": "yarn build-for-devtools --type=NODE_PROD", "build-for-devtools-prod": "yarn build-for-devtools --type=NODE_PROD",
@@ -144,7 +144,7 @@
"publish-prereleases": "node ./scripts/release/publish-using-ci-workflow.js", "publish-prereleases": "node ./scripts/release/publish-using-ci-workflow.js",
"download-build": "node ./scripts/release/download-experimental-build.js", "download-build": "node ./scripts/release/download-experimental-build.js",
"download-build-for-head": "node ./scripts/release/download-experimental-build.js --commit=$(git rev-parse HEAD)", "download-build-for-head": "node ./scripts/release/download-experimental-build.js --commit=$(git rev-parse HEAD)",
"download-build-in-codesandbox-ci": "cd scripts/release && yarn install && cd ../../ && yarn download-build-for-head || yarn build-combined --type=node react/index react-dom/index react-dom/src/server react-dom/test-utils scheduler/index react/jsx-runtime react/jsx-dev-runtime", "download-build-in-codesandbox-ci": "cd scripts/release && yarn install && cd ../../ && yarn download-build-for-head || yarn build --type=node react/index react-dom/index react-dom/src/server react-dom/test-utils scheduler/index react/jsx-runtime react/jsx-dev-runtime",
"check-release-dependencies": "node ./scripts/release/check-release-dependencies", "check-release-dependencies": "node ./scripts/release/check-release-dependencies",
"generate-inline-fizz-runtime": "node ./scripts/rollup/generate-inline-fizz-runtime.js" "generate-inline-fizz-runtime": "node ./scripts/rollup/generate-inline-fizz-runtime.js"
}, },

2
scripts/jest/jest-cli.js
View File

@@ -255,7 +255,7 @@ function validateOptions() {
const buildDir = path.resolve('./build'); const buildDir = path.resolve('./build');
if (!fs.existsSync(buildDir)) { if (!fs.existsSync(buildDir)) {
logError( logError(
'Build directory does not exist, please run `yarn build-combined` or remove the --build option.' 'Build directory does not exist, please run `yarn build` or remove the --build option.'
); );
success = false; success = false;
} else if (Date.now() - fs.statSync(buildDir).mtimeMs > 1000 * 60 * 15) { } else if (Date.now() - fs.statSync(buildDir).mtimeMs > 1000 * 60 * 15) {