Skip to content

Commit db5e625

Browse files
sebmarkbagesebmarkbage
authored
Rename yarn build-combined to just yarn build (#26192)
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.
1 parent c9d9f52 commit db5e625

File tree

41 files changed

+89
-88
lines changed

Some content is hidden

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

41 files changed

+89
-88
lines changed

‎.circleci/config.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,14 @@ jobs:
110110
paths:
111111
- build
112112

113-
yarn_build_combined:
113+
yarn_build:
114114
docker: *docker
115115
environment: *environment
116116
parallelism: 40
117117
steps:
118118
- checkout
119119
- setup_node_modules
120-
- run: yarn build-combined
120+
- run: yarn build
121121
- persist_to_workspace:
122122
root: .
123123
paths:
@@ -451,7 +451,7 @@ workflows:
451451
# TODO: Test more persistent configurations?
452452
- '-r=stable --env=development --persistent'
453453
- '-r=experimental --env=development --persistent'
454-
- yarn_build_combined:
454+
- yarn_build:
455455
filters:
456456
branches:
457457
ignore:
@@ -464,10 +464,10 @@ workflows:
464464
- process_artifacts_combined:
465465
requires:
466466
- scrape_warning_messages
467-
- yarn_build_combined
467+
- yarn_build
468468
- yarn_test_build:
469469
requires:
470-
- yarn_build_combined
470+
- yarn_build
471471
matrix:
472472
parameters:
473473
args:
@@ -506,22 +506,22 @@ workflows:
506506
- main
507507
requires:
508508
- download_base_build_for_sizebot
509-
- yarn_build_combined
509+
- yarn_build
510510
- yarn_lint_build:
511511
requires:
512-
- yarn_build_combined
512+
- yarn_build
513513
- yarn_check_release_dependencies:
514514
requires:
515-
- yarn_build_combined
515+
- yarn_build
516516
- check_error_codes:
517517
requires:
518-
- yarn_build_combined
518+
- yarn_build
519519
- RELEASE_CHANNEL_stable_yarn_test_dom_fixtures:
520520
requires:
521-
- yarn_build_combined
521+
- yarn_build
522522
- build_devtools_and_process_artifacts:
523523
requires:
524-
- yarn_build_combined
524+
- yarn_build
525525
- run_devtools_e2e_tests:
526526
requires:
527527
- build_devtools_and_process_artifacts

‎fixtures/art/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"@babel/preset-env": "^7.10.4",
66
"@babel/preset-react": "^7.10.4",
77
"babel-loader": "^8.1.0",
8-
"react": "link:../../build/node_modules/react",
9-
"react-art": "link:../../build/node_modules/react-art/",
10-
"react-dom": "link:../../build/node_modules/react-dom",
8+
"react": "link:../../build/oss-experimental/react",
9+
"react-art": "link:../../build/oss-experimental/react-art/",
10+
"react-dom": "link:../../build/oss-experimental/react-dom",
1111
"webpack": "^1.14.0"
1212
},
1313
"scripts": {

‎fixtures/art/yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2251,15 +2251,15 @@ rc@^1.1.7:
22512251
minimist "^1.2.0"
22522252
strip-json-comments "~2.0.1"
22532253

2254-
"react-art@link:../../build/node_modules/react-art":
2254+
"react-art@link:../../build/oss-experimental/react-art":
22552255
version "0.0.0"
22562256
uid ""
22572257

2258-
"react-dom@link:../../build/node_modules/react-dom":
2258+
"react-dom@link:../../build/oss-experimental/react-dom":
22592259
version "0.0.0"
22602260
uid ""
22612261

2262-
"react@link:../../build/node_modules/react":
2262+
"react@link:../../build/oss-experimental/react":
22632263
version "0.0.0"
22642264
uid ""
22652265

‎fixtures/attribute-behavior/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
},
1313
"scripts": {
1414
"prestart":
15-
"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/",
15+
"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/",
1616
"start": "react-scripts start",
1717
"build": "react-scripts build",
1818
"test": "react-scripts test --env=jsdom",

‎fixtures/concurrent/time-slicing/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"victory": "^0.25.6"
1212
},
1313
"scripts": {
14-
"copy-source": "cp -r ../../../build/node_modules/* ./node_modules/",
14+
"copy-source": "cp -r ../../../build/oss-experimental/* ./node_modules/",
1515
"start": "react-scripts start",
1616
"build": "react-scripts build",
1717
"test": "react-scripts test --env=jsdom",

‎fixtures/devtools/scheduling-profiler/run.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ const DEPENDENCIES = [
1818
['react-dom/umd/react-dom.development.js', 'react-dom.js'],
1919
];
2020

21-
const BUILD_DIRECTORY = '../../../build/node_modules/';
21+
const BUILD_DIRECTORY = '../../../build/oss-experimental/';
2222
const DEPENDENCIES_DIRECTORY = 'dependencies';
2323

2424
function initDependencies() {

‎fixtures/eslint/proxy/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ function reload() {
1616
}
1717
}
1818
// Point to the built version.
19-
build = require('../../../build/node_modules/eslint-plugin-react-hooks');
19+
build = require('../../../build/oss-experimental/eslint-plugin-react-hooks');
2020
}
2121

2222
let rules = {};

‎fixtures/expiration/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
"scripts": {
1111
"prestart":
12-
"cp ../../build/node_modules/react/umd/react.development.js public/ && cp ../../build/node_modules/react-dom/umd/react-dom.development.js public/",
12+
"cp ../../build/oss-experimental/react/umd/react.development.js public/ && cp ../../build/oss-experimental/react-dom/umd/react-dom.development.js public/",
1313
"start": "react-scripts start",
1414
"build": "react-scripts build",
1515
"test": "react-scripts test --env=jsdom",

‎fixtures/fiber-triangle/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ <h1>Fiber Example</h1>
1616
If you checked out the source from GitHub make sure to run <code>npm run build</code>.
1717
</p>
1818
</div>
19-
<script src="../../build/node_modules/react/umd/react.development.js"></script>
20-
<script src="../../build/node_modules/react-dom/umd/react-dom.development.js"></script>
19+
<script src="../../build/oss-experimental/react/umd/react.development.js"></script>
20+
<script src="../../build/oss-experimental/react-dom/umd/react-dom.development.js"></script>
2121
<script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
2222
<script type="text/babel">
2323
var dotStyle = {

‎fixtures/fizz-ssr-browser/index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ <h1>Fizz Example</h1>
1616
If you checked out the source from GitHub make sure to run <code>npm run build</code>.
1717
</p>
1818
</div>
19-
<script src="../../build/node_modules/react/umd/react.development.js"></script>
20-
<script src="../../build/node_modules/react-dom/umd/react-dom.development.js"></script>
21-
<script src="../../build/node_modules/react-dom/umd/react-dom-server.browser.development.js"></script>
19+
<script src="../../build/oss-experimental/react/umd/react.development.js"></script>
20+
<script src="../../build/oss-experimental/react-dom/umd/react-dom.development.js"></script>
21+
<script src="../../build/oss-experimental/react-dom/umd/react-dom-server.browser.development.js"></script>
2222
<script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
2323
<script type="text/babel">
2424
async function render() {

‎fixtures/fizz/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
"concurrently": "^5.3.0",
1616
"express": "^4.17.1",
1717
"nodemon": "^2.0.6",
18-
"react": "link:../../build/node_modules/react",
19-
"react-dom": "link:../../build/node_modules/react-dom",
18+
"react": "link:../../build/oss-experimental/react",
19+
"react-dom": "link:../../build/oss-experimental/react-dom",
2020
"react-error-boundary": "^3.1.3",
2121
"resolve": "1.12.0",
2222
"rimraf": "^3.0.2",

‎fixtures/fizz/yarn.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4083,7 +4083,7 @@ rc@^1.2.8:
40834083
minimist "^1.2.0"
40844084
strip-json-comments "~2.0.1"
40854085

4086-
"react-dom@link:../../build/node_modules/react-dom":
4086+
"react-dom@link:../../build/oss-experimental/react-dom":
40874087
version "0.0.0"
40884088

40894089
react-error-boundary@^3.1.3:
@@ -4093,7 +4093,7 @@ react-error-boundary@^3.1.3:
40934093
dependencies:
40944094
"@babel/runtime" "^7.12.5"
40954095

4096-
"react@link:../../build/node_modules/react":
4096+
"react@link:../../build/oss-experimental/react":
40974097
version "0.0.0"
40984098

40994099
read-pkg@^4.0.1:

‎fixtures/flight-browser/index.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ <h1>Flight Example</h1>
1616
If you checked out the source from GitHub make sure to run <code>npm run build</code>.
1717
</p>
1818
</div>
19-
<script src="../../build/node_modules/react/umd/react.development.js"></script>
20-
<script src="../../build/node_modules/react-dom/umd/react-dom.development.js"></script>
21-
<script src="../../build/node_modules/react-dom/umd/react-dom-server.browser.development.js"></script>
22-
<script src="../../build/node_modules/react-server-dom-webpack/umd/react-server-dom-webpack-server.browser.development.js"></script>
23-
<script src="../../build/node_modules/react-server-dom-webpack/umd/react-server-dom-webpack-client.browser.development.js"></script>
19+
<script src="../../build/oss-experimental/react/umd/react.development.js"></script>
20+
<script src="../../build/oss-experimental/react-dom/umd/react-dom.development.js"></script>
21+
<script src="../../build/oss-experimental/react-dom/umd/react-dom-server.browser.development.js"></script>
22+
<script src="../../build/oss-experimental/react-server-dom-webpack/umd/react-server-dom-webpack-server.browser.development.js"></script>
23+
<script src="../../build/oss-experimental/react-server-dom-webpack/umd/react-server-dom-webpack-client.browser.development.js"></script>
2424
<script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
2525
<script type="text/babel">
2626
let Suspense = React.Suspense;

‎fixtures/flight/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363
"workbox-webpack-plugin": "^6.4.1"
6464
},
6565
"scripts": {
66-
"prestart": "cp -r ../../build/node_modules/* ./node_modules/",
67-
"prebuild": "cp -r ../../build/node_modules/* ./node_modules/",
66+
"prestart": "cp -r ../../build/oss-experimental/* ./node_modules/",
67+
"prebuild": "cp -r ../../build/oss-experimental/* ./node_modules/",
6868
"start": "concurrently \"npm run start:server\" \"npm run start:client\"",
6969
"start:client": "NODE_ENV=development BUILD_PATH=dist node scripts/start.js",
7070
"start:server": "NODE_ENV=development BUILD_PATH=dist nodemon -- --experimental-loader ./loader/index.js --conditions=react-server server",

‎fixtures/packaging/babel-standalone/dev.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<html>
22
<body>
3-
<script src="../../../build/node_modules/react/umd/react.development.js"></script>
4-
<script src="../../../build/node_modules/react-dom/umd/react-dom.development.js"></script>
3+
<script src="../../../build/oss-experimental/react/umd/react.development.js"></script>
4+
<script src="../../../build/oss-experimental/react-dom/umd/react-dom.development.js"></script>
55
<script src="https://unpkg.com/babel-standalone@6/babel.js"></script>
66
<div id="container"></div>
77
<script type="text/babel">

‎fixtures/packaging/browserify/dev/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
},
77
"scripts": {
88
"build": "rm -f output.js && browserify ./input.js -o output.js",
9-
"prebuild": "cp -r ../../../../build/node_modules/* ./node_modules/"
9+
"prebuild": "cp -r ../../../../build/oss-experimental/* ./node_modules/"
1010
}
1111
}

‎fixtures/packaging/browserify/prod/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"scripts": {
88
"build": "rm -f output.js && browserify ./input.js -g [envify --NODE_ENV 'production'] -o output.js",
9-
"prebuild": "cp -r ../../../../build/node_modules/* ./node_modules/"
9+
"prebuild": "cp -r ../../../../build/oss-experimental/* ./node_modules/"
1010
},
1111
"devDependencies": {
1212
"envify": "^4.0.0"

‎fixtures/packaging/brunch/dev/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
},
88
"scripts": {
99
"build": "rm -rf public && brunch build",
10-
"prebuild": "cp -r ../../../../build/node_modules/* ./node_modules/"
10+
"prebuild": "cp -r ../../../../build/oss-experimental/* ./node_modules/"
1111
}
1212
}

‎fixtures/packaging/brunch/prod/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
},
88
"scripts": {
99
"build": "rm -rf public && brunch build -p",
10-
"prebuild": "cp -r ../../../../build/node_modules/* ./node_modules/"
10+
"prebuild": "cp -r ../../../../build/oss-experimental/* ./node_modules/"
1111
}
1212
}

‎fixtures/packaging/globals/dev.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<html>
22
<body>
3-
<script src="../../../build/node_modules/react/umd/react.development.js"></script>
4-
<script src="../../../build/node_modules/react-dom/umd/react-dom.development.js"></script>
3+
<script src="../../../build/oss-experimental/react/umd/react.development.js"></script>
4+
<script src="../../../build/oss-experimental/react-dom/umd/react-dom.development.js"></script>
55
<div id="container"></div>
66
<script>
77
ReactDOM.render(

‎fixtures/packaging/globals/prod.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<html>
22
<body>
3-
<script src="../../../build/node_modules/react/umd/react.production.min.js"></script>
4-
<script src="../../../build/node_modules/react-dom/umd/react-dom.production.min.js"></script>
3+
<script src="../../../build/oss-experimental/react/umd/react.production.min.js"></script>
4+
<script src="../../../build/oss-experimental/react-dom/umd/react-dom.production.min.js"></script>
55
<div id="container"></div>
66
<script>
77
ReactDOM.render(

‎fixtures/packaging/requirejs/dev.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<script>
66
requirejs.config({
77
paths: {
8-
react: '../../../build/node_modules/react/umd/react.development',
9-
'react-dom': '../../../build/node_modules/react-dom/umd/react-dom.development'
8+
react: '../../../build/oss-experimental/react/umd/react.development',
9+
'react-dom': '../../../build/oss-experimental/react-dom/umd/react-dom.development'
1010
}
1111
});
1212

‎fixtures/packaging/requirejs/prod.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<script>
66
requirejs.config({
77
paths: {
8-
react: '../../../build/node_modules/react/umd/react.production.min',
9-
'react-dom': '../../../build/node_modules/react-dom/umd/react-dom.production.min'
8+
react: '../../../build/oss-experimental/react/umd/react.production.min',
9+
'react-dom': '../../../build/oss-experimental/react-dom/umd/react-dom.production.min'
1010
}
1111
});
1212

‎fixtures/packaging/rjs/dev/config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ module.exports = {
44
out: 'output.js',
55
optimize: 'none',
66
paths: {
7-
react: '../../../../build/node_modules/react/umd/react.development',
7+
react: '../../../../build/oss-experimental/react/umd/react.development',
88
'react-dom':
9-
'../../../../build/node_modules/react-dom/umd/react-dom.development',
9+
'../../../../build/oss-experimental/react-dom/umd/react-dom.development',
1010
schedule:
11-
'../../../../build/node_modules/scheduler/umd/schedule.development',
11+
'../../../../build/oss-experimental/scheduler/umd/schedule.development',
1212
},
1313
};

‎fixtures/packaging/rjs/prod/config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ module.exports = {
44
out: 'output.js',
55
optimize: 'none',
66
paths: {
7-
react: '../../../../build/node_modules/react/umd/react.production.min',
7+
react: '../../../../build/oss-experimental/react/umd/react.production.min',
88
'react-dom':
9-
'../../../../build/node_modules/react-dom/umd/react-dom.production.min',
9+
'../../../../build/oss-experimental/react-dom/umd/react-dom.production.min',
1010
schedule:
11-
'../../../../build/node_modules/scheduler/umd/schedule.development',
11+
'../../../../build/oss-experimental/scheduler/umd/schedule.development',
1212
},
1313
};

‎fixtures/packaging/systemjs-builder/dev/config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
System.config({
22
paths: {
3-
react: '../../../../build/node_modules/react/umd/react.development.js',
3+
react: '../../../../build/oss-experimental/react/umd/react.development.js',
44
'react-dom':
5-
'../../../../build/node_modules/react-dom/umd/react-dom.development.js',
5+
'../../../../build/oss-experimental/react-dom/umd/react-dom.development.js',
66
schedule:
7-
'../../../../build/node_modules/scheduler/umd/schedule.development',
7+
'../../../../build/oss-experimental/scheduler/umd/schedule.development',
88
},
99
});

‎fixtures/packaging/systemjs-builder/prod/config.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
System.config({
22
paths: {
3-
react: '../../../../build/node_modules/react/umd/react.production.min.js',
3+
react:
4+
'../../../../build/oss-experimental/react/umd/react.production.min.js',
45
'react-dom':
5-
'../../../../build/node_modules/react-dom/umd/react-dom.production.min.js',
6+
'../../../../build/oss-experimental/react-dom/umd/react-dom.production.min.js',
67
schedule:
7-
'../../../../build/node_modules/scheduler/umd/schedule.development',
8+
'../../../../build/oss-experimental/scheduler/umd/schedule.development',
89
},
910
});

‎fixtures/packaging/systemjs/dev.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<script>
66
System.config({
77
paths: {
8-
react: '../../../build/node_modules/react/umd/react.development.js',
9-
'react-dom': '../../../build/node_modules/react-dom/umd/react-dom.development.js'
8+
react: '../../../build/oss-experimental/react/umd/react.development.js',
9+
'react-dom': '../../../build/oss-experimental/react-dom/umd/react-dom.development.js'
1010
}
1111
});
1212

‎fixtures/packaging/systemjs/prod.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<script>
66
System.config({
77
paths: {
8-
react: '../../../build/node_modules/react/umd/react.production.min.js',
9-
'react-dom': '../../../build/node_modules/react-dom/umd/react-dom.production.min.js'
8+
react: '../../../build/oss-experimental/react/umd/react.production.min.js',
9+
'react-dom': '../../../build/oss-experimental/react-dom/umd/react-dom.production.min.js'
1010
}
1111
});
1212

‎fixtures/packaging/webpack-alias/dev/config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module.exports = {
66
filename: 'output.js',
77
},
88
resolve: {
9-
root: path.resolve('../../../../build/node_modules'),
9+
root: path.resolve('../../../../build/oss-experimental'),
1010
alias: {
1111
react: 'react/umd/react.development',
1212
'react-dom': 'react-dom/umd/react-dom.development',

0 commit comments

Comments
 (0)