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.
facebook · Feb 17, 2023 · db5e625 · db5e625
1 parent c9d9f52
commit db5e625
Show file tree

Hide file tree

Showing 41 changed files with 89 additions and 88 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -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:
@@ -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:
@@ -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:
@@ -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

diff --git a/fixtures/art/package.json b/fixtures/art/package.json
@@ -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": {

diff --git a/fixtures/art/yarn.lock b/fixtures/art/yarn.lock
@@ -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 ""
 

diff --git a/fixtures/attribute-behavior/package.json b/fixtures/attribute-behavior/package.json
@@ -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",

diff --git a/fixtures/concurrent/time-slicing/package.json b/fixtures/concurrent/time-slicing/package.json
@@ -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",

diff --git a/fixtures/devtools/scheduling-profiler/run.js b/fixtures/devtools/scheduling-profiler/run.js
@@ -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() {

diff --git a/fixtures/eslint/proxy/index.js b/fixtures/eslint/proxy/index.js
@@ -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 = {};

diff --git a/fixtures/expiration/package.json b/fixtures/expiration/package.json
@@ -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",

diff --git a/fixtures/fiber-triangle/index.html b/fixtures/fiber-triangle/index.html
@@ -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 = {

diff --git a/fixtures/fizz-ssr-browser/index.html b/fixtures/fizz-ssr-browser/index.html
@@ -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() {

diff --git a/fixtures/fizz/package.json b/fixtures/fizz/package.json
@@ -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",

diff --git a/fixtures/fizz/yarn.lock b/fixtures/fizz/yarn.lock
@@ -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:
@@ -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:

diff --git a/fixtures/flight-browser/index.html b/fixtures/flight-browser/index.html
@@ -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;

diff --git a/fixtures/flight/package.json b/fixtures/flight/package.json
@@ -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",

diff --git a/fixtures/packaging/babel-standalone/dev.html b/fixtures/packaging/babel-standalone/dev.html
@@ -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">

diff --git a/fixtures/packaging/browserify/dev/package.json b/fixtures/packaging/browserify/dev/package.json
@@ -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/"
   }
 }
diff --git a/fixtures/packaging/browserify/prod/package.json b/fixtures/packaging/browserify/prod/package.json
@@ -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"

diff --git a/fixtures/packaging/brunch/dev/package.json b/fixtures/packaging/brunch/dev/package.json
@@ -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/"
   }
 }
diff --git a/fixtures/packaging/brunch/prod/package.json b/fixtures/packaging/brunch/prod/package.json
@@ -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/"
   }
 }
diff --git a/fixtures/packaging/globals/dev.html b/fixtures/packaging/globals/dev.html
@@ -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(

diff --git a/fixtures/packaging/globals/prod.html b/fixtures/packaging/globals/prod.html
@@ -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(

diff --git a/fixtures/packaging/requirejs/dev.html b/fixtures/packaging/requirejs/dev.html
@@ -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'
         }
       });
 

diff --git a/fixtures/packaging/requirejs/prod.html b/fixtures/packaging/requirejs/prod.html
@@ -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'
         }
       });
 

diff --git a/fixtures/packaging/rjs/dev/config.js b/fixtures/packaging/rjs/dev/config.js
@@ -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',
   },
 };
diff --git a/fixtures/packaging/rjs/prod/config.js b/fixtures/packaging/rjs/prod/config.js
@@ -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',
   },
 };
diff --git a/fixtures/packaging/systemjs-builder/dev/config.js b/fixtures/packaging/systemjs-builder/dev/config.js
@@ -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',
   },
 });
diff --git a/fixtures/packaging/systemjs-builder/prod/config.js b/fixtures/packaging/systemjs-builder/prod/config.js
@@ -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',
   },
 });
diff --git a/fixtures/packaging/systemjs/dev.html b/fixtures/packaging/systemjs/dev.html
@@ -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'
         }
       });
 

diff --git a/fixtures/packaging/systemjs/prod.html b/fixtures/packaging/systemjs/prod.html
@@ -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'
         }
       });
 

diff --git a/fixtures/packaging/webpack-alias/dev/config.js b/fixtures/packaging/webpack-alias/dev/config.js
@@ -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',