Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
19,660 changes: 19,660 additions & 0 deletions !scratchwork/714b502.diff

Large diffs are not rendered by default.

19 changes: 19 additions & 0 deletions !scratchwork/diff-analyzer.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import re

with open('714b502.diff') as file:
lines = file.readlines()

renames = []
non_renames = []

for i, line in enumerate(lines):
matches = re.match('^diff --git a/(.*) b/(.*)$', line)
if not matches:
continue
percent_match = re.match('similarity index (.*)%', lines[i + 1])
if percent_match:
renames.append((matches.group(1), matches.group(2), percent_match.group(1)))
print('\t'.join(renames[-1]))
else:
non_renames.append((matches.group(1), matches.group(2), '0'))
print('\t'.join(non_renames[-1]))
3,786 changes: 3,786 additions & 0 deletions !scratchwork/diffs.tsv

Large diffs are not rendered by default.

84 changes: 84 additions & 0 deletions !scratchwork/moved-package.json.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
diff --git a/package.json b/packages/react-native/package.json
index 7234473515e..5c13d613687 100644
--- a/package.json
+++ b/packages/react-native/package.json
@@ -1,6 +1,5 @@
{
"name": "react-native",
- "private": true,
"version": "1000.0.0",
"bin": "./cli.js",
"description": "A framework for building native apps using React",
@@ -73,43 +72,6 @@
"third-party-podspecs",
"types"
],
- "scripts": {
- "start": "react-native start",
- "test": "jest",
- "test-ci": "jest --maxWorkers=2 --ci --reporters=\"default\" --reporters=\"jest-junit\"",
- "flow": "flow",
- "flow-check-ios": "flow check",
- "flow-check-android": "flow check --flowconfig-name .flowconfig.android",
- "lint": "eslint .",
- "lint-ci": "./scripts/circleci/analyze_code.sh && yarn shellcheck",
- "lint-java": "node ./scripts/lint-java.js",
- "shellcheck": "./scripts/circleci/analyze_scripts.sh",
- "clang-format": "clang-format -i --glob=*/**/*.{h,cpp,m,mm}",
- "format": "npm run prettier && npm run clang-format",
- "prettier": "prettier --write \"./**/*.{js,md,yml,ts,tsx}\"",
- "format-check": "prettier --list-different \"./**/*.{js,md,yml,ts,tsx}\"",
- "update-lock": "npx yarn-deduplicate",
- "docker-setup-android": "docker pull reactnativecommunity/react-native-android:7.0",
- "docker-build-android": "docker build -t reactnativeci/android -f .circleci/Dockerfiles/Dockerfile.android .",
- "test-android-run-instrumentation": "docker run --cap-add=SYS_ADMIN -it reactnativeci/android bash .circleci/Dockerfiles/scripts/run-android-docker-instrumentation-tests.sh",
- "test-android-run-unit": "docker run --cap-add=SYS_ADMIN -it reactnativeci/android bash .circleci/Dockerfiles/scripts/run-android-docker-unit-tests.sh",
- "test-android-run-e2e": "docker run --privileged -it reactnativeci/android bash .circleci/Dockerfiles/scripts/run-ci-e2e-tests.sh --android --js",
- "test-android-all": "yarn run docker-build-android && yarn run test-android-run-unit && yarn run test-android-run-instrumentation && yarn run test-android-run-e2e",
- "test-android-instrumentation": "yarn run docker-build-android && yarn run test-android-run-instrumentation",
- "test-android-unit": "yarn run docker-build-android && yarn run test-android-run-unit",
- "test-android-e2e": "yarn run docker-build-android && yarn run test-android-run-e2e",
- "test-e2e-local": "node ./scripts/test-e2e-local.js",
- "test-e2e-local-clean": "node ./scripts/test-e2e-local-clean.js",
- "test-ios": "./scripts/objc-test.sh test",
- "test-typescript": "dtslint types",
- "test-typescript-offline": "dtslint --localTs node_modules/typescript/lib types",
- "bump-all-updated-packages": "node ./scripts/monorepo/bump-all-updated-packages",
- "align-package-versions": "node ./scripts/monorepo/align-package-versions.js"
- },
- "workspaces": [
- "packages/*",
- "repo-config"
- ],
"peerDependencies": {
"react": "18.2.0"
},
@@ -119,6 +81,7 @@
"@react-native-community/cli-platform-android": "11.0.0-alpha.2",
"@react-native-community/cli-platform-ios": "11.0.0-alpha.2",
"@react-native/assets-registry": "^0.72.0",
+ "@react-native/codegen": "^0.72.3",
"@react-native/gradle-plugin": "^0.72.5",
"@react-native/js-polyfills": "^0.72.1",
"@react-native/normalize-colors": "^0.72.0",
@@ -145,19 +108,12 @@
"react-shallow-renderer": "^16.15.0",
"regenerator-runtime": "^0.13.2",
"scheduler": "^0.23.0",
- "stacktrace-parser": "^0.1.3",
+ "stacktrace-parser": "^0.1.10",
"use-sync-external-store": "^1.0.0",
"whatwg-fetch": "^3.0.0",
"ws": "^6.2.2",
"yargs": "^17.6.2"
},
- "devDependencies": {
- "flow-bin": "^0.201.0",
- "hermes-eslint": "0.8.0",
- "mock-fs": "^5.1.4",
- "react": "18.2.0",
- "react-test-renderer": "^18.2.0"
- },
"codegenConfig": {
"libraries": [
{
206 changes: 206 additions & 0 deletions !scratchwork/root-package.json.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,206 @@
diff --git a/package.json b/package.json
index 7234473515e..4a785a75bfa 100644
--- a/package.json
+++ b/package.json
@@ -1,78 +1,15 @@
{
- "name": "react-native",
+ "name": "@react-native/monorepo",
"private": true,
"version": "1000.0.0",
- "bin": "./cli.js",
"description": "A framework for building native apps using React",
"license": "MIT",
"repository": "github:facebook/react-native",
- "engines": {
- "node": ">=16"
- },
"types": "types",
"jest-junit": {
"outputDirectory": "reports/junit",
"outputName": "js-test-results.xml"
},
- "files": [
- "android",
- "build.gradle.kts",
- "cli.js",
- "flow",
- "flow-typed",
- "gradle.properties",
- "index.js",
- "interface.js",
- "jest-preset.js",
- "jest",
- "!jest/private",
- "Libraries",
- "LICENSE",
- "local-cli",
- "React-Core.podspec",
- "react-native.config.js",
- "React.podspec",
- "React",
- "ReactAndroid",
- "ReactCommon",
- "README.md",
- "rn-get-polyfills.js",
- "scripts/compose-source-maps.js",
- "scripts/find-node-for-xcode.sh",
- "scripts/generate-codegen-artifacts.js",
- "scripts/generate-provider-cli.js",
- "scripts/generate-specs-cli.js",
- "scripts/codegen",
- "!scripts/codegen/__tests__",
- "!scripts/codegen/__test_fixtures__",
- "scripts/hermes/hermes-utils.js",
- "scripts/hermes/prepare-hermes-for-build.js",
- "scripts/ios-configure-glog.sh",
- "scripts/xcode/with-environment.sh",
- "scripts/launchPackager.bat",
- "scripts/launchPackager.command",
- "scripts/native_modules.rb",
- "scripts/node-binary.sh",
- "scripts/packager.sh",
- "scripts/packager-reporter.js",
- "scripts/react_native_pods_utils/script_phases.rb",
- "scripts/react_native_pods_utils/script_phases.sh",
- "scripts/react_native_pods.rb",
- "scripts/cocoapods",
- "!scripts/cocoapods/__tests__",
- "scripts/react-native-xcode.sh",
- "sdks/.hermesversion",
- "sdks/hermes-engine",
- "sdks/hermesc",
- "settings.gradle.kts",
- "template.config.js",
- "template",
- "!template/node_modules",
- "!template/package-lock.json",
- "!template/yarn.lock",
- "third-party-podspecs",
- "types"
- ],
"scripts": {
"start": "react-native start",
"test": "jest",
@@ -101,79 +38,60 @@
"test-e2e-local": "node ./scripts/test-e2e-local.js",
"test-e2e-local-clean": "node ./scripts/test-e2e-local-clean.js",
"test-ios": "./scripts/objc-test.sh test",
- "test-typescript": "dtslint types",
- "test-typescript-offline": "dtslint --localTs node_modules/typescript/lib types",
+ "test-typescript": "dtslint packages/react-native/types",
+ "test-typescript-offline": "dtslint --localTs node_modules/typescript/lib packages/react-native/types",
"bump-all-updated-packages": "node ./scripts/monorepo/bump-all-updated-packages",
"align-package-versions": "node ./scripts/monorepo/align-package-versions.js"
},
"workspaces": [
- "packages/*",
- "repo-config"
+ "packages/*"
],
"peerDependencies": {
"react": "18.2.0"
},
- "dependencies": {
- "@jest/create-cache-key-function": "^29.2.1",
- "@react-native-community/cli": "11.0.0-alpha.2",
- "@react-native-community/cli-platform-android": "11.0.0-alpha.2",
- "@react-native-community/cli-platform-ios": "11.0.0-alpha.2",
- "@react-native/assets-registry": "^0.72.0",
- "@react-native/gradle-plugin": "^0.72.5",
- "@react-native/js-polyfills": "^0.72.1",
- "@react-native/normalize-colors": "^0.72.0",
- "@react-native/virtualized-lists": "^0.72.2",
- "abort-controller": "^3.0.0",
- "anser": "^1.4.9",
- "base64-js": "^1.1.2",
- "deprecated-react-native-prop-types": "^4.0.0",
- "event-target-shim": "^5.0.1",
- "flow-enums-runtime": "^0.0.5",
- "invariant": "^2.2.4",
- "jest-environment-node": "^29.2.1",
- "jsc-android": "^250231.0.0",
- "memoize-one": "^5.0.0",
- "metro-react-native-babel-transformer": "0.75.1",
- "metro-runtime": "0.75.1",
- "metro-source-map": "0.75.1",
- "mkdirp": "^0.5.1",
- "nullthrows": "^1.1.1",
- "pretty-format": "^26.5.2",
- "promise": "^8.3.0",
- "react-devtools-core": "^4.27.2",
- "react-refresh": "^0.4.0",
- "react-shallow-renderer": "^16.15.0",
- "regenerator-runtime": "^0.13.2",
- "scheduler": "^0.23.0",
- "stacktrace-parser": "^0.1.3",
- "use-sync-external-store": "^1.0.0",
- "whatwg-fetch": "^3.0.0",
- "ws": "^6.2.2",
- "yargs": "^17.6.2"
- },
"devDependencies": {
+ "@babel/core": "^7.20.0",
+ "@babel/eslint-parser": "^7.19.0",
+ "@babel/generator": "^7.20.0",
+ "@babel/plugin-transform-regenerator": "^7.0.0",
+ "@definitelytyped/dtslint": "^0.0.127",
+ "@reactions/component": "^2.0.2",
+ "@types/react": "^18.0.18",
+ "@typescript-eslint/parser": "^5.30.5",
+ "async": "^3.2.2",
+ "clang-format": "^1.8.0",
+ "connect": "^3.6.5",
+ "coveralls": "^3.1.1",
+ "eslint": "^8.19.0",
+ "eslint-config-prettier": "^8.5.0",
+ "eslint-plugin-babel": "^5.3.1",
+ "eslint-plugin-eslint-comments": "^3.2.0",
+ "eslint-plugin-ft-flow": "^2.0.1",
+ "eslint-plugin-jest": "^26.5.3",
+ "eslint-plugin-jsx-a11y": "^6.6.0",
+ "eslint-plugin-lint": "^1.0.0",
+ "eslint-plugin-prettier": "^4.2.1",
+ "eslint-plugin-react": "^7.30.1",
+ "eslint-plugin-react-hooks": "^4.6.0",
+ "eslint-plugin-react-native": "^4.0.0",
+ "eslint-plugin-redundant-undefined": "^0.4.0",
+ "eslint-plugin-relay": "^1.8.3",
"flow-bin": "^0.201.0",
"hermes-eslint": "0.8.0",
+ "inquirer": "^7.1.0",
+ "jest": "^29.2.1",
+ "jest-junit": "^10.0.0",
+ "jscodeshift": "^0.14.0",
+ "metro-babel-register": "0.75.1",
+ "metro-memory-fs": "0.75.1",
"mock-fs": "^5.1.4",
+ "mkdirp": "^0.5.1",
+ "prettier": "^2.4.1",
"react": "18.2.0",
- "react-test-renderer": "^18.2.0"
- },
- "codegenConfig": {
- "libraries": [
- {
- "name": "FBReactNativeSpec",
- "type": "modules",
- "ios": {},
- "android": {},
- "jsSrcsDir": "Libraries"
- },
- {
- "name": "rncore",
- "type": "components",
- "ios": {},
- "android": {},
- "jsSrcsDir": "Libraries"
- }
- ]
+ "react-test-renderer": "18.2.0",
+ "shelljs": "^0.8.5",
+ "signedsource": "^1.0.0",
+ "typescript": "4.1.3",
+ "ws": "^6.2.2"
}
}
16 changes: 8 additions & 8 deletions .circleci/Dockerfiles/Dockerfile.android
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ LABEL maintainer="Héctor Ramos <[email protected]>"
ARG BUCK_BUILD
# set default environment variables
ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dfile.encoding=utf-8 -Dorg.gradle.jvmargs=\"-Xmx512m -XX:+HeapDumpOnOutOfMemoryError\""
ENV KOTLIN_HOME="third-party/kotlin"
ENV KOTLIN_HOME="packages/react-native/third-party/kotlin"

ADD .buckconfig /app/.buckconfig
ADD .buckjavaargs /app/.buckjavaargs
ADD BUCK /app/BUCK
ADD Libraries /app/Libraries
ADD ReactAndroid /app/ReactAndroid
ADD ReactCommon /app/ReactCommon
ADD React /app/React
ADD packages/react-native/Libraries /app/packages/react-native/Libraries
ADD packages/react-native/ReactAndroid /app/packages/react-native/ReactAndroid
ADD packages/react-native/ReactCommon /app/packages/react-native/ReactCommon
ADD packages/react-native/React /app/packages/react-native/React
ADD keystores /app/keystores
ADD packages/react-native-codegen /app/packages/react-native-codegen
ADD tools /app/tools
Expand All @@ -57,8 +57,8 @@ WORKDIR /app

RUN scripts/buck/buck_fetch.sh

RUN buck build ReactAndroid/src/main/java/com/facebook/react
RUN buck build ReactAndroid/src/main/java/com/facebook/react/shell
RUN buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react
RUN buck build packages/react-native/ReactAndroid/src/main/java/com/facebook/react/shell

ADD gradle /app/gradle
ADD gradlew /app/gradlew
Expand All @@ -77,4 +77,4 @@ ADD . /app

RUN yarn

RUN ./gradlew :ReactAndroid:assembleDebug
RUN ./gradlew :packages:react-native:ReactAndroid:assembleDebug
2 changes: 1 addition & 1 deletion .circleci/Dockerfiles/scripts/run-ci-e2e-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ function e2e_suite() {
fi
fi

if ! npm pack
if ! (cd packages/react-native && FILENAME=$(npm pack | tail -1) && mv "$FILENAME" ../../)
then
echo "Failed to pack react-native"
return 1
Expand Down
Loading