diff --git a/.circleci/config.yml b/.circleci/config.yml
index 32e8324a87..b936640682 100644
--- 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
index 82e84bb49a..7d540fee14 100644
--- 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
index 048ab68103..8d0f79f957 100644
--- 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
index e71f60ec2e..09e5902491 100644
--- 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
index 9fcfcae8d3..0e6f4f0b0c 100644
--- 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
index 259755a366..5c0191acca 100755
--- 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
index 3c4be6ff34..f54e672d21 100644
--- 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
index 263812a1ee..f628d582b8 100644
--- 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
index c7e22fdd43..d90e110937 100644
--- a/fixtures/fiber-triangle/index.html
+++ b/fixtures/fiber-triangle/index.html
@@ -16,8 +16,8 @@
If you checked out the source from GitHub make sure to run npm run build.