From db5e6250d4bbb70c5085c58694a2e9c78c3f6371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Markb=C3=A5ge?= Date: Fri, 17 Feb 2023 16:00:18 -0500 Subject: [PATCH] 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. --- .circleci/config.yml | 22 +++++++++---------- fixtures/art/package.json | 6 ++--- fixtures/art/yarn.lock | 6 ++--- fixtures/attribute-behavior/package.json | 2 +- fixtures/concurrent/time-slicing/package.json | 2 +- fixtures/devtools/scheduling-profiler/run.js | 2 +- fixtures/eslint/proxy/index.js | 2 +- fixtures/expiration/package.json | 2 +- fixtures/fiber-triangle/index.html | 4 ++-- fixtures/fizz-ssr-browser/index.html | 6 ++--- fixtures/fizz/package.json | 4 ++-- fixtures/fizz/yarn.lock | 4 ++-- fixtures/flight-browser/index.html | 10 ++++----- fixtures/flight/package.json | 4 ++-- fixtures/packaging/babel-standalone/dev.html | 4 ++-- .../packaging/browserify/dev/package.json | 2 +- .../packaging/browserify/prod/package.json | 2 +- fixtures/packaging/brunch/dev/package.json | 2 +- fixtures/packaging/brunch/prod/package.json | 2 +- fixtures/packaging/globals/dev.html | 4 ++-- fixtures/packaging/globals/prod.html | 4 ++-- fixtures/packaging/requirejs/dev.html | 4 ++-- fixtures/packaging/requirejs/prod.html | 4 ++-- fixtures/packaging/rjs/dev/config.js | 6 ++--- fixtures/packaging/rjs/prod/config.js | 6 ++--- .../packaging/systemjs-builder/dev/config.js | 6 ++--- .../packaging/systemjs-builder/prod/config.js | 7 +++--- fixtures/packaging/systemjs/dev.html | 4 ++-- fixtures/packaging/systemjs/prod.html | 4 ++-- .../packaging/webpack-alias/dev/config.js | 2 +- .../packaging/webpack-alias/prod/config.js | 2 +- fixtures/packaging/webpack/dev/config.js | 2 +- fixtures/packaging/webpack/prod/config.js | 2 +- fixtures/scheduler/index.html | 4 ++-- fixtures/ssr/package.json | 4 ++-- fixtures/ssr/yarn.lock | 4 ++-- fixtures/ssr2/package.json | 4 ++-- fixtures/ssr2/yarn.lock | 4 ++-- fixtures/stacks/index.html | 4 ++-- package.json | 6 ++--- scripts/jest/jest-cli.js | 2 +- 41 files changed, 89 insertions(+), 88 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 32e8324a879ea..b936640682bbe 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 82e84bb49a4f6..7d540fee14aa7 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 048ab68103189..8d0f79f957b52 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 e71f60ec2e112..09e5902491770 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 9fcfcae8d3df3..0e6f4f0b0ce85 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 259755a366e43..5c0191acca3db 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 3c4be6ff345c1..f54e672d21126 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 263812a1ee2de..f628d582b8fcf 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 c7e22fdd4345e..d90e11093765d 100644 --- a/fixtures/fiber-triangle/index.html +++ b/fixtures/fiber-triangle/index.html @@ -16,8 +16,8 @@

Fiber Example

If you checked out the source from GitHub make sure to run npm run build.

- - + + - - + + + - - - - + + + + + - + +
- + +
- + +
- + + - + + diff --git a/package.json b/package.json index f1b7f922c09f4..961d78345ddbe 100644 --- a/package.json +++ b/package.json @@ -108,8 +108,8 @@ "testRegex": "/scripts/jest/dont-run-jest-directly\\.js$" }, "scripts": { - "build": "node ./scripts/rollup/build.js", - "build-combined": "node ./scripts/rollup/build-all-release-channels.js", + "build": "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-dev": "yarn build-for-devtools --type=NODE_DEV", "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", "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-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", "generate-inline-fizz-runtime": "node ./scripts/rollup/generate-inline-fizz-runtime.js" }, diff --git a/scripts/jest/jest-cli.js b/scripts/jest/jest-cli.js index 4aaf59ba728f8..fbd55ab2a5d3f 100644 --- a/scripts/jest/jest-cli.js +++ b/scripts/jest/jest-cli.js @@ -255,7 +255,7 @@ function validateOptions() { const buildDir = path.resolve('./build'); if (!fs.existsSync(buildDir)) { 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; } else if (Date.now() - fs.statSync(buildDir).mtimeMs > 1000 * 60 * 15) {