mirror of
https://github.com/zebrajr/react.git
synced 2026-01-15 12:15:22 +00:00
26fc16484e
Adds command `yarn merge-fork`. ```sh yarn merge-fork --base-dir=packages/react-reconciler/src ReactFiberWorkLoop ``` This will take all the changes in `ReactFiberWorkLoop.new.js` and apply them to `ReactFiberWorkLoop.old.js`. You can merge multiple modules at a time: ```sh yarn merge-fork \ --base-dir=packages/react-reconciler/src \ ReactFiberWorkLoop \ ReactFiberBeginWork \ ReactFiberCompleteWork \ ReactFiberCommitWork ``` You can provide explicit "old" and "new" file names. This only works for one module at a time: ```sh yarn merge-fork \ --base-dir=packages/react-reconciler/src \ --old=ReactFiberExpirationTime.js \ --new=ReactFiberLane.js ``` The default is to merge changes from the new module to the old one. To merge changes in the opposite direction, use `--reverse`. ```sh yarn merge-fork \ --reverse \ --base-dir=packages/react-reconciler/src \ ReactFiberWorkLoop ``` By default, the changes are compared to HEAD. You can use `--base-ref` to compare to any rev. For example, while working on a PR, you might make multiple commits to the new fork before you're ready to backport them to the old one. In that case, you want to compare to the merge base of your PR branch: ```sh yarn merge-fork \ --base-ref=$(git merge-base HEAD origin/master) --base-dir=packages/react-reconciler/src \ ReactFiberWorkLoop ```
131 lines
6.0 KiB
JSON
131 lines
6.0 KiB
JSON
{
|
|
"private": true,
|
|
"workspaces": [
|
|
"packages/*"
|
|
],
|
|
"devDependencies": {
|
|
"@babel/cli": "^7.8.0",
|
|
"@babel/code-frame": "^7.8.0",
|
|
"@babel/core": "^7.8.0",
|
|
"@babel/helper-module-imports": "^7.8.0",
|
|
"@babel/parser": "^7.8.0",
|
|
"@babel/plugin-external-helpers": "^7.8.0",
|
|
"@babel/plugin-proposal-class-properties": "^7.8.0",
|
|
"@babel/plugin-proposal-object-rest-spread": "^7.8.0",
|
|
"@babel/plugin-syntax-dynamic-import": "^7.8.0",
|
|
"@babel/plugin-syntax-jsx": "^7.8.0",
|
|
"@babel/plugin-transform-arrow-functions": "^7.8.0",
|
|
"@babel/plugin-transform-async-to-generator": "^7.8.0",
|
|
"@babel/plugin-transform-block-scoped-functions": "^7.8.0",
|
|
"@babel/plugin-transform-block-scoping": "^7.8.0",
|
|
"@babel/plugin-transform-classes": "^7.8.0",
|
|
"@babel/plugin-transform-computed-properties": "^7.8.0",
|
|
"@babel/plugin-transform-destructuring": "^7.8.0",
|
|
"@babel/plugin-transform-for-of": "^7.8.0",
|
|
"@babel/plugin-transform-literals": "^7.8.0",
|
|
"@babel/plugin-transform-modules-commonjs": "^7.8.0",
|
|
"@babel/plugin-transform-object-super": "^7.8.0",
|
|
"@babel/plugin-transform-parameters": "^7.8.0",
|
|
"@babel/plugin-transform-react-jsx-source": "^7.8.0",
|
|
"@babel/plugin-transform-shorthand-properties": "^7.8.0",
|
|
"@babel/plugin-transform-spread": "^7.8.0",
|
|
"@babel/plugin-transform-template-literals": "^7.8.0",
|
|
"@babel/preset-flow": "^7.8.0",
|
|
"@babel/preset-react": "^7.8.0",
|
|
"@babel/traverse": "^7.8.0",
|
|
"@mattiasbuelens/web-streams-polyfill": "^0.3.2",
|
|
"art": "0.10.1",
|
|
"babel-eslint": "^10.0.3",
|
|
"babel-plugin-syntax-trailing-function-commas": "^6.5.0",
|
|
"chalk": "^3.0.0",
|
|
"cli-table": "^0.3.1",
|
|
"coffee-script": "^1.12.7",
|
|
"confusing-browser-globals": "^1.0.9",
|
|
"core-js": "^3.6.4",
|
|
"coveralls": "^3.0.9",
|
|
"create-react-class": "^15.6.3",
|
|
"cross-env": "^6.0.3",
|
|
"danger": "^9.2.10",
|
|
"error-stack-parser": "^2.0.6",
|
|
"eslint": "^6.8.0",
|
|
"eslint-config-fbjs": "^1.1.1",
|
|
"eslint-config-prettier": "^6.9.0",
|
|
"eslint-plugin-babel": "^5.3.0",
|
|
"eslint-plugin-flowtype": "^2.25.0",
|
|
"eslint-plugin-jest": "^22.15.0",
|
|
"eslint-plugin-no-for-of-loops": "^1.0.0",
|
|
"eslint-plugin-react": "^6.7.1",
|
|
"eslint-plugin-react-internal": "link:./scripts/eslint-rules",
|
|
"fbjs-scripts": "0.8.3",
|
|
"filesize": "^6.0.1",
|
|
"flow-bin": "0.97",
|
|
"glob": "^7.1.6",
|
|
"glob-stream": "^6.1.0",
|
|
"google-closure-compiler": "^20200224.0.0",
|
|
"gzip-size": "^5.1.1",
|
|
"jasmine-check": "^1.0.0-rc.0",
|
|
"jest": "^25.2.7",
|
|
"jest-diff": "^25.2.6",
|
|
"jest-snapshot-serializer-raw": "^1.1.0",
|
|
"minimatch": "^3.0.4",
|
|
"minimist": "^1.2.3",
|
|
"mkdirp": "^0.5.1",
|
|
"ncp": "^2.0.0",
|
|
"object-assign": "^4.1.1",
|
|
"pacote": "^10.3.0",
|
|
"prettier": "1.19.1",
|
|
"prop-types": "^15.6.2",
|
|
"random-seed": "^0.3.0",
|
|
"react-lifecycles-compat": "^3.0.4",
|
|
"rimraf": "^3.0.0",
|
|
"rollup": "^1.19.4",
|
|
"rollup-plugin-babel": "^4.0.1",
|
|
"rollup-plugin-commonjs": "^9.3.4",
|
|
"rollup-plugin-node-resolve": "^2.1.1",
|
|
"rollup-plugin-prettier": "^0.6.0",
|
|
"rollup-plugin-replace": "^2.2.0",
|
|
"rollup-plugin-strip-banner": "^0.2.0",
|
|
"semver": "^7.1.1",
|
|
"targz": "^1.0.1",
|
|
"through2": "^3.0.1",
|
|
"tmp": "^0.1.0",
|
|
"typescript": "^3.7.5",
|
|
"webpack": "^4.41.2"
|
|
},
|
|
"devEngines": {
|
|
"node": "8.x || 9.x || 10.x || 11.x || 12.x || 13.x"
|
|
},
|
|
"jest": {
|
|
"testRegex": "/scripts/jest/dont-run-jest-directly\\.js$"
|
|
},
|
|
"scripts": {
|
|
"build": "node ./scripts/rollup/build.js",
|
|
"build-for-devtools": "cross-env RELEASE_CHANNEL=experimental yarn build react/index,react-dom,react-is,react-debug-tools,scheduler,react-test-renderer --type=NODE",
|
|
"linc": "node ./scripts/tasks/linc.js",
|
|
"lint": "node ./scripts/tasks/eslint.js",
|
|
"lint-build": "node ./scripts/rollup/validate/index.js",
|
|
"extract-errors": "yarn build --type=dev --extract-errors",
|
|
"postinstall": "node node_modules/fbjs-scripts/node/check-dev-engines.js package.json && node ./scripts/flow/createFlowConfigs.js && node ./scripts/yarn/downloadReactIsForPrettyFormat.js",
|
|
"debug-test": "cross-env NODE_ENV=development node --inspect-brk node_modules/jest/bin/jest.js --config ./scripts/jest/config.source.js --runInBand",
|
|
"test": "cross-env NODE_ENV=development jest --config ./scripts/jest/config.source.js",
|
|
"test-www": "cross-env NODE_ENV=development jest --config ./scripts/jest/config.source-www.js",
|
|
"test-www-variant": "cross-env NODE_ENV=development VARIANT=true jest --config ./scripts/jest/config.source-www.js",
|
|
"test-persistent": "cross-env NODE_ENV=development jest --config ./scripts/jest/config.source-persistent.js",
|
|
"debug-test-persistent": "cross-env NODE_ENV=development node --inspect-brk node_modules/jest/bin/jest.js --config ./scripts/jest/config.source-persistent.js --runInBand",
|
|
"test-prod": "cross-env NODE_ENV=production jest --config ./scripts/jest/config.source.js",
|
|
"debug-test-prod": "cross-env NODE_ENV=production node --inspect-brk node_modules/jest/bin/jest.js --config ./scripts/jest/config.source.js --runInBand",
|
|
"test-prod-build": "yarn test-build-prod",
|
|
"test-build": "cross-env NODE_ENV=development jest --config ./scripts/jest/config.build.js",
|
|
"test-build-prod": "cross-env NODE_ENV=production jest --config ./scripts/jest/config.build.js",
|
|
"test-build-devtools": "cross-env NODE_ENV=development jest --config ./scripts/jest/config.build-devtools.js",
|
|
"debug-test-build-devtools": "cross-env NODE_ENV=development node --inspect-brk node_modules/jest/bin/jest.js --config ./scripts/jest/config.build-devtools.js",
|
|
"test-dom-fixture": "cd fixtures/dom && yarn && yarn prestart && yarn test",
|
|
"flow": "node ./scripts/tasks/flow.js",
|
|
"flow-ci": "node ./scripts/tasks/flow-ci.js",
|
|
"prettier": "node ./scripts/prettier/index.js write-changed",
|
|
"prettier-all": "node ./scripts/prettier/index.js write",
|
|
"version-check": "node ./scripts/tasks/version-check.js",
|
|
"merge-fork": "node ./scripts/merge-fork/merge-fork.js"
|
|
}
|
|
}
|