Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename yarn build-combined to just yarn build #26192

Merged
merged 2 commits into from
Feb 17, 2023
Merged

Rename yarn build-combined to just yarn build #26192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30a4e20
Rename `yarn build-combined` to just `yarn build`
sebmarkbage Feb 17, 2023
45e4c98
Update fixtures to use the folder convention of build-combined
sebmarkbage Feb 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,14 @@ jobs:
paths:
- build

yarn_build_combined:
yarn_build:
docker: *docker
environment: *environment
parallelism: 40
steps:
- checkout
- setup_node_modules
- run: yarn build-combined
- run: yarn build
- persist_to_workspace:
root: .
paths:
Expand Down Expand Up @@ -451,7 +451,7 @@ workflows:
# TODO: Test more persistent configurations?
- '-r=stable --env=development --persistent'
- '-r=experimental --env=development --persistent'
- yarn_build_combined:
- yarn_build:
filters:
branches:
ignore:
Expand All @@ -464,10 +464,10 @@ workflows:
- process_artifacts_combined:
requires:
- scrape_warning_messages
- yarn_build_combined
- yarn_build
- yarn_test_build:
requires:
- yarn_build_combined
- yarn_build
matrix:
parameters:
args:
Expand Down Expand Up @@ -506,22 +506,22 @@ workflows:
- main
requires:
- download_base_build_for_sizebot
- yarn_build_combined
- yarn_build
- yarn_lint_build:
requires:
- yarn_build_combined
- yarn_build
- yarn_check_release_dependencies:
requires:
- yarn_build_combined
- yarn_build
- check_error_codes:
requires:
- yarn_build_combined
- yarn_build
- RELEASE_CHANNEL_stable_yarn_test_dom_fixtures:
requires:
- yarn_build_combined
- yarn_build
- build_devtools_and_process_artifacts:
requires:
- yarn_build_combined
- yarn_build
- run_devtools_e2e_tests:
requires:
- build_devtools_and_process_artifacts
Expand Down
6 changes: 3 additions & 3 deletions fixtures/art/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"@babel/preset-env": "^7.10.4",
"@babel/preset-react": "^7.10.4",
"babel-loader": "^8.1.0",
"react": "link:../../build/node_modules/react",
"react-art": "link:../../build/node_modules/react-art/",
"react-dom": "link:../../build/node_modules/react-dom",
"react": "link:../../build/oss-experimental/react",
"react-art": "link:../../build/oss-experimental/react-art/",
"react-dom": "link:../../build/oss-experimental/react-dom",
"webpack": "^1.14.0"
},
"scripts": {
Expand Down
6 changes: 3 additions & 3 deletions fixtures/art/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2251,15 +2251,15 @@ rc@^1.1.7:
minimist "^1.2.0"
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"
uid ""

"react-dom@link:../../build/node_modules/react-dom":
"react-dom@link:../../build/oss-experimental/react-dom":
version "0.0.0"
uid ""

"react@link:../../build/node_modules/react":
"react@link:../../build/oss-experimental/react":
version "0.0.0"
uid ""

Expand Down
2 changes: 1 addition & 1 deletion fixtures/attribute-behavior/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"scripts": {
"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",
"build": "react-scripts build",
"test": "react-scripts test --env=jsdom",
Expand Down
2 changes: 1 addition & 1 deletion fixtures/concurrent/time-slicing/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"victory": "^0.25.6"
},
"scripts": {
"copy-source": "cp -r ../../../build/node_modules/* ./node_modules/",
"copy-source": "cp -r ../../../build/oss-experimental/* ./node_modules/",
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test --env=jsdom",
Expand Down
2 changes: 1 addition & 1 deletion fixtures/devtools/scheduling-profiler/run.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const DEPENDENCIES = [
['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';

function initDependencies() {
Expand Down
2 changes: 1 addition & 1 deletion fixtures/eslint/proxy/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function reload() {
}
}
// 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 = {};
Expand Down
2 changes: 1 addition & 1 deletion fixtures/expiration/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"scripts": {
"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",
"build": "react-scripts build",
"test": "react-scripts test --env=jsdom",
Expand Down
4 changes: 2 additions & 2 deletions fixtures/fiber-triangle/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ <h1>Fiber Example</h1>
If you checked out the source from GitHub make sure to run <code>npm run build</code>.
</p>
</div>
<script src="../../build/node_modules/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/umd/react.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 type="text/babel">
var dotStyle = {
Expand Down
6 changes: 3 additions & 3 deletions fixtures/fizz-ssr-browser/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ <h1>Fizz Example</h1>
If you checked out the source from GitHub make sure to run <code>npm run build</code>.
</p>
</div>
<script src="../../build/node_modules/react/umd/react.development.js"></script>
<script src="../../build/node_modules/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/umd/react.development.js"></script>
<script src="../../build/oss-experimental/react-dom/umd/react-dom.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 type="text/babel">
async function render() {
Expand Down
4 changes: 2 additions & 2 deletions fixtures/fizz/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"concurrently": "^5.3.0",
"express": "^4.17.1",
"nodemon": "^2.0.6",
"react": "link:../../build/node_modules/react",
"react-dom": "link:../../build/node_modules/react-dom",
"react": "link:../../build/oss-experimental/react",
"react-dom": "link:../../build/oss-experimental/react-dom",
"react-error-boundary": "^3.1.3",
"resolve": "1.12.0",
"rimraf": "^3.0.2",
Expand Down
4 changes: 2 additions & 2 deletions fixtures/fizz/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4083,7 +4083,7 @@ rc@^1.2.8:
minimist "^1.2.0"
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"

react-error-boundary@^3.1.3:
Expand All @@ -4093,7 +4093,7 @@ react-error-boundary@^3.1.3:
dependencies:
"@babel/runtime" "^7.12.5"

"react@link:../../build/node_modules/react":
"react@link:../../build/oss-experimental/react":
version "0.0.0"

read-pkg@^4.0.1:
Expand Down
10 changes: 5 additions & 5 deletions fixtures/flight-browser/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ <h1>Flight Example</h1>
If you checked out the source from GitHub make sure to run <code>npm run build</code>.
</p>
</div>
<script src="../../build/node_modules/react/umd/react.development.js"></script>
<script src="../../build/node_modules/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/node_modules/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/umd/react.development.js"></script>
<script src="../../build/oss-experimental/react-dom/umd/react-dom.development.js"></script>
<script src="../../build/oss-experimental/react-dom/umd/react-dom-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/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 type="text/babel">
let Suspense = React.Suspense;
Expand Down
4 changes: 2 additions & 2 deletions fixtures/flight/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
"workbox-webpack-plugin": "^6.4.1"
},
"scripts": {
"prestart": "cp -r ../../build/node_modules/* ./node_modules/",
"prebuild": "cp -r ../../build/node_modules/* ./node_modules/",
"prestart": "cp -r ../../build/oss-experimental/* ./node_modules/",
"prebuild": "cp -r ../../build/oss-experimental/* ./node_modules/",
"start": "concurrently \"npm run start:server\" \"npm run start:client\"",
"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",
Expand Down
4 changes: 2 additions & 2 deletions fixtures/packaging/babel-standalone/dev.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>
<body>
<script src="../../../build/node_modules/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/umd/react.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>
<div id="container"></div>
<script type="text/babel">
Expand Down
2 changes: 1 addition & 1 deletion fixtures/packaging/browserify/dev/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
},
"scripts": {
"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 changes: 1 addition & 1 deletion fixtures/packaging/browserify/prod/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
"scripts": {
"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": {
"envify": "^4.0.0"
Expand Down
2 changes: 1 addition & 1 deletion fixtures/packaging/brunch/dev/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
},
"scripts": {
"build": "rm -rf public && brunch build",
"prebuild": "cp -r ../../../../build/node_modules/* ./node_modules/"
"prebuild": "cp -r ../../../../build/oss-experimental/* ./node_modules/"
}
}
2 changes: 1 addition & 1 deletion fixtures/packaging/brunch/prod/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
},
"scripts": {
"build": "rm -rf public && brunch build -p",
"prebuild": "cp -r ../../../../build/node_modules/* ./node_modules/"
"prebuild": "cp -r ../../../../build/oss-experimental/* ./node_modules/"
}
}
4 changes: 2 additions & 2 deletions fixtures/packaging/globals/dev.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>
<body>
<script src="../../../build/node_modules/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/umd/react.development.js"></script>
<script src="../../../build/oss-experimental/react-dom/umd/react-dom.development.js"></script>
<div id="container"></div>
<script>
ReactDOM.render(
Expand Down
4 changes: 2 additions & 2 deletions fixtures/packaging/globals/prod.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<html>
<body>
<script src="../../../build/node_modules/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/umd/react.production.min.js"></script>
<script src="../../../build/oss-experimental/react-dom/umd/react-dom.production.min.js"></script>
<div id="container"></div>
<script>
ReactDOM.render(
Expand Down
4 changes: 2 additions & 2 deletions fixtures/packaging/requirejs/dev.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<script>
requirejs.config({
paths: {
react: '../../../build/node_modules/react/umd/react.development',
'react-dom': '../../../build/node_modules/react-dom/umd/react-dom.development'
react: '../../../build/oss-experimental/react/umd/react.development',
'react-dom': '../../../build/oss-experimental/react-dom/umd/react-dom.development'
}
});

Expand Down
4 changes: 2 additions & 2 deletions fixtures/packaging/requirejs/prod.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<script>
requirejs.config({
paths: {
react: '../../../build/node_modules/react/umd/react.production.min',
'react-dom': '../../../build/node_modules/react-dom/umd/react-dom.production.min'
react: '../../../build/oss-experimental/react/umd/react.production.min',
'react-dom': '../../../build/oss-experimental/react-dom/umd/react-dom.production.min'
}
});

Expand Down
6 changes: 3 additions & 3 deletions fixtures/packaging/rjs/dev/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ module.exports = {
out: 'output.js',
optimize: 'none',
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',
'../../../../build/oss-experimental/react-dom/umd/react-dom.development',
schedule:
'../../../../build/node_modules/scheduler/umd/schedule.development',
'../../../../build/oss-experimental/scheduler/umd/schedule.development',
},
};
6 changes: 3 additions & 3 deletions fixtures/packaging/rjs/prod/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ module.exports = {
out: 'output.js',
optimize: 'none',
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',
'../../../../build/oss-experimental/react-dom/umd/react-dom.production.min',
schedule:
'../../../../build/node_modules/scheduler/umd/schedule.development',
'../../../../build/oss-experimental/scheduler/umd/schedule.development',
},
};
6 changes: 3 additions & 3 deletions fixtures/packaging/systemjs-builder/dev/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
System.config({
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',
'../../../../build/oss-experimental/react-dom/umd/react-dom.development.js',
schedule:
'../../../../build/node_modules/scheduler/umd/schedule.development',
'../../../../build/oss-experimental/scheduler/umd/schedule.development',
},
});
7 changes: 4 additions & 3 deletions fixtures/packaging/systemjs-builder/prod/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
System.config({
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',
'../../../../build/oss-experimental/react-dom/umd/react-dom.production.min.js',
schedule:
'../../../../build/node_modules/scheduler/umd/schedule.development',
'../../../../build/oss-experimental/scheduler/umd/schedule.development',
},
});
4 changes: 2 additions & 2 deletions fixtures/packaging/systemjs/dev.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<script>
System.config({
paths: {
react: '../../../build/node_modules/react/umd/react.development.js',
'react-dom': '../../../build/node_modules/react-dom/umd/react-dom.development.js'
react: '../../../build/oss-experimental/react/umd/react.development.js',
'react-dom': '../../../build/oss-experimental/react-dom/umd/react-dom.development.js'
}
});

Expand Down
4 changes: 2 additions & 2 deletions fixtures/packaging/systemjs/prod.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<script>
System.config({
paths: {
react: '../../../build/node_modules/react/umd/react.production.min.js',
'react-dom': '../../../build/node_modules/react-dom/umd/react-dom.production.min.js'
react: '../../../build/oss-experimental/react/umd/react.production.min.js',
'react-dom': '../../../build/oss-experimental/react-dom/umd/react-dom.production.min.js'
}
});

Expand Down
2 changes: 1 addition & 1 deletion fixtures/packaging/webpack-alias/dev/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module.exports = {
filename: 'output.js',
},
resolve: {
root: path.resolve('../../../../build/node_modules'),
root: path.resolve('../../../../build/oss-experimental'),
alias: {
react: 'react/umd/react.development',
'react-dom': 'react-dom/umd/react-dom.development',
Expand Down
Loading