diff --git a/Libraries/Components/Switch/SwitchSchema.js b/Libraries/Components/Switch/SwitchSchema.js index de37583f61..20adba0aef 100644 --- a/Libraries/Components/Switch/SwitchSchema.js +++ b/Libraries/Components/Switch/SwitchSchema.js @@ -10,7 +10,7 @@ 'use strict'; -import type {SchemaType} from '../../../codegen/src/CodegenSchema.js'; +import type {SchemaType} from '../../../packages/react-native-codegen/src/CodegenSchema.js'; const SwitchSchema: SchemaType = { modules: { diff --git a/codegen/package.json b/codegen/package.json deleted file mode 100644 index 42af3e0e0c..0000000000 --- a/codegen/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "dependencies": { - "jscodeshift": "^0.6.2", - "nullthrows": "^1.1.0" - }, - "private": true -} diff --git a/codegen/BUCK b/packages/react-native-codegen/BUCK similarity index 97% rename from codegen/BUCK rename to packages/react-native-codegen/BUCK index 02af00c7a5..2bbee9dce4 100644 --- a/codegen/BUCK +++ b/packages/react-native-codegen/BUCK @@ -2,7 +2,7 @@ load("@fbsource//tools/build_defs:default_platform_defs.bzl", "ANDROID", "APPLE" load("@fbsource//tools/build_defs:fb_native_wrapper.bzl", "fb_native") load("@fbsource//tools/build_defs:fb_xplat_cxx_binary.bzl", "fb_xplat_cxx_binary") load("@fbsource//tools/build_defs/oss:rn_defs.bzl", "rn_xplat_cxx_library") -load("@fbsource//xplat/js/react-native-github/codegen:DEFS.bzl", "rn_codegen_test") +load("@fbsource//xplat/js/react-native-github/packages/react-native-codegen:DEFS.bzl", "rn_codegen_test") fb_native.sh_binary( name = "copy_fixture_schema", diff --git a/codegen/DEFS.bzl b/packages/react-native-codegen/DEFS.bzl similarity index 94% rename from codegen/DEFS.bzl rename to packages/react-native-codegen/DEFS.bzl index d287d9b62e..a1e3aa7e90 100644 --- a/codegen/DEFS.bzl +++ b/packages/react-native-codegen/DEFS.bzl @@ -17,7 +17,7 @@ def rn_codegen_test( fb_native.genrule( name = copy_schema_name, srcs = [], - cmd = "$(exe xplat//js/react-native-github/codegen:copy_fixture_schema) {} $OUT".format(fixture_name), + cmd = "$(exe xplat//js/react-native-github/packages/react-native-codegen:copy_fixture_schema) {} $OUT".format(fixture_name), out = "schema-{}.json".format(fixture_name), ) @@ -38,7 +38,7 @@ def rn_codegen( fb_native.genrule( name = generate_fixtures_rule_name, srcs = [], - cmd = "$(exe xplat//js/react-native-github/codegen:rn_codegen) $(location {}) {} $OUT".format(schema_target, name), + cmd = "$(exe xplat//js/react-native-github/packages/react-native-codegen:rn_codegen) $(location {}) {} $OUT".format(schema_target, name), out = "codegenfiles-{}".format(name), ) diff --git a/codegen/buck_tests/combine-js-to-schema.js b/packages/react-native-codegen/buck_tests/combine-js-to-schema.js similarity index 100% rename from codegen/buck_tests/combine-js-to-schema.js rename to packages/react-native-codegen/buck_tests/combine-js-to-schema.js diff --git a/codegen/buck_tests/combine_js_to_schema.sh b/packages/react-native-codegen/buck_tests/combine_js_to_schema.sh similarity index 81% rename from codegen/buck_tests/combine_js_to_schema.sh rename to packages/react-native-codegen/buck_tests/combine_js_to_schema.sh index fd8920e710..473bd946d8 100755 --- a/codegen/buck_tests/combine_js_to_schema.sh +++ b/packages/react-native-codegen/buck_tests/combine_js_to_schema.sh @@ -6,6 +6,6 @@ set -u THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd) # shellcheck source=xplat/js/env-utils/setup_env_vars.sh -source "$THIS_DIR/../../../env-utils/setup_env_vars.sh" +source "$THIS_DIR/../../../../env-utils/setup_env_vars.sh" exec "$FLOW_NODE_BINARY" "$THIS_DIR/combine-js-to-schema.js" "$@" diff --git a/codegen/buck_tests/copy-fixture.js b/packages/react-native-codegen/buck_tests/copy-fixture.js similarity index 100% rename from codegen/buck_tests/copy-fixture.js rename to packages/react-native-codegen/buck_tests/copy-fixture.js diff --git a/codegen/buck_tests/copy_fixture.sh b/packages/react-native-codegen/buck_tests/copy_fixture.sh similarity index 80% rename from codegen/buck_tests/copy_fixture.sh rename to packages/react-native-codegen/buck_tests/copy_fixture.sh index e0595a05e0..d2cbcbdba1 100755 --- a/codegen/buck_tests/copy_fixture.sh +++ b/packages/react-native-codegen/buck_tests/copy_fixture.sh @@ -6,6 +6,6 @@ set -u THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd) # shellcheck source=xplat/js/env-utils/setup_env_vars.sh -source "$THIS_DIR/../../../env-utils/setup_env_vars.sh" +source "$THIS_DIR/../../../../env-utils/setup_env_vars.sh" exec "$FLOW_NODE_BINARY" "$THIS_DIR/copy-fixture.js" "$@" diff --git a/codegen/buck_tests/emptyFile.cpp b/packages/react-native-codegen/buck_tests/emptyFile.cpp similarity index 100% rename from codegen/buck_tests/emptyFile.cpp rename to packages/react-native-codegen/buck_tests/emptyFile.cpp diff --git a/codegen/buck_tests/generate-tests.js b/packages/react-native-codegen/buck_tests/generate-tests.js similarity index 100% rename from codegen/buck_tests/generate-tests.js rename to packages/react-native-codegen/buck_tests/generate-tests.js diff --git a/codegen/buck_tests/generate_tests.sh b/packages/react-native-codegen/buck_tests/generate_tests.sh similarity index 84% rename from codegen/buck_tests/generate_tests.sh rename to packages/react-native-codegen/buck_tests/generate_tests.sh index 91aa7ab6e7..2dc425e8ac 100755 --- a/codegen/buck_tests/generate_tests.sh +++ b/packages/react-native-codegen/buck_tests/generate_tests.sh @@ -6,7 +6,7 @@ set -u THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd) # shellcheck source=xplat/js/env-utils/setup_env_vars.sh -source "$THIS_DIR/../../../env-utils/setup_env_vars.sh" +source "$THIS_DIR/../../../../env-utils/setup_env_vars.sh" pushd "$THIS_DIR/.." >/dev/null "$INSTALL_NODE_MODULES" diff --git a/packages/react-native-codegen/package.json b/packages/react-native-codegen/package.json new file mode 100644 index 0000000000..7fffd48187 --- /dev/null +++ b/packages/react-native-codegen/package.json @@ -0,0 +1,14 @@ +{ + "version": "0.0.1", + "name": "react-native-codgen", + "description": "⚛️ Code generation tools for React Native", + "repository": { + "type": "git", + "url": "git@github.com:facebook/react-native.git" + }, + "dependencies": { + "jscodeshift": "^0.6.2", + "nullthrows": "^1.1.0" + }, + "license": "MIT" +} diff --git a/codegen/src/CodegenSchema.js b/packages/react-native-codegen/src/CodegenSchema.js similarity index 100% rename from codegen/src/CodegenSchema.js rename to packages/react-native-codegen/src/CodegenSchema.js diff --git a/codegen/src/Helpers.js b/packages/react-native-codegen/src/Helpers.js similarity index 100% rename from codegen/src/Helpers.js rename to packages/react-native-codegen/src/Helpers.js diff --git a/codegen/src/SchemaValidator.js b/packages/react-native-codegen/src/SchemaValidator.js similarity index 100% rename from codegen/src/SchemaValidator.js rename to packages/react-native-codegen/src/SchemaValidator.js diff --git a/codegen/src/__tests__/SchemaValidator-test.js b/packages/react-native-codegen/src/__tests__/SchemaValidator-test.js similarity index 100% rename from codegen/src/__tests__/SchemaValidator-test.js rename to packages/react-native-codegen/src/__tests__/SchemaValidator-test.js diff --git a/codegen/src/__tests__/__snapshots__/SchemaValidator-test.js.snap b/packages/react-native-codegen/src/__tests__/__snapshots__/SchemaValidator-test.js.snap similarity index 100% rename from codegen/src/__tests__/__snapshots__/SchemaValidator-test.js.snap rename to packages/react-native-codegen/src/__tests__/__snapshots__/SchemaValidator-test.js.snap diff --git a/codegen/src/generators/CppHelpers.js b/packages/react-native-codegen/src/generators/CppHelpers.js similarity index 100% rename from codegen/src/generators/CppHelpers.js rename to packages/react-native-codegen/src/generators/CppHelpers.js diff --git a/codegen/src/generators/EventEmitterHelpers.js b/packages/react-native-codegen/src/generators/EventEmitterHelpers.js similarity index 100% rename from codegen/src/generators/EventEmitterHelpers.js rename to packages/react-native-codegen/src/generators/EventEmitterHelpers.js diff --git a/codegen/src/generators/GenerateComponentDescriptorH.js b/packages/react-native-codegen/src/generators/GenerateComponentDescriptorH.js similarity index 100% rename from codegen/src/generators/GenerateComponentDescriptorH.js rename to packages/react-native-codegen/src/generators/GenerateComponentDescriptorH.js diff --git a/codegen/src/generators/GenerateEventEmitterCpp.js b/packages/react-native-codegen/src/generators/GenerateEventEmitterCpp.js similarity index 100% rename from codegen/src/generators/GenerateEventEmitterCpp.js rename to packages/react-native-codegen/src/generators/GenerateEventEmitterCpp.js diff --git a/codegen/src/generators/GenerateEventEmitterH.js b/packages/react-native-codegen/src/generators/GenerateEventEmitterH.js similarity index 100% rename from codegen/src/generators/GenerateEventEmitterH.js rename to packages/react-native-codegen/src/generators/GenerateEventEmitterH.js diff --git a/codegen/src/generators/GeneratePropsCpp.js b/packages/react-native-codegen/src/generators/GeneratePropsCpp.js similarity index 100% rename from codegen/src/generators/GeneratePropsCpp.js rename to packages/react-native-codegen/src/generators/GeneratePropsCpp.js diff --git a/codegen/src/generators/GeneratePropsH.js b/packages/react-native-codegen/src/generators/GeneratePropsH.js similarity index 100% rename from codegen/src/generators/GeneratePropsH.js rename to packages/react-native-codegen/src/generators/GeneratePropsH.js diff --git a/codegen/src/generators/GenerateShadowNodeCpp.js b/packages/react-native-codegen/src/generators/GenerateShadowNodeCpp.js similarity index 100% rename from codegen/src/generators/GenerateShadowNodeCpp.js rename to packages/react-native-codegen/src/generators/GenerateShadowNodeCpp.js diff --git a/codegen/src/generators/GenerateShadowNodeH.js b/packages/react-native-codegen/src/generators/GenerateShadowNodeH.js similarity index 100% rename from codegen/src/generators/GenerateShadowNodeH.js rename to packages/react-native-codegen/src/generators/GenerateShadowNodeH.js diff --git a/codegen/src/generators/GenerateViewConfigJs.js b/packages/react-native-codegen/src/generators/GenerateViewConfigJs.js similarity index 100% rename from codegen/src/generators/GenerateViewConfigJs.js rename to packages/react-native-codegen/src/generators/GenerateViewConfigJs.js diff --git a/codegen/src/generators/RNCodegen.js b/packages/react-native-codegen/src/generators/RNCodegen.js similarity index 100% rename from codegen/src/generators/RNCodegen.js rename to packages/react-native-codegen/src/generators/RNCodegen.js diff --git a/codegen/src/generators/__test_fixtures__/fixtures.js b/packages/react-native-codegen/src/generators/__test_fixtures__/fixtures.js similarity index 100% rename from codegen/src/generators/__test_fixtures__/fixtures.js rename to packages/react-native-codegen/src/generators/__test_fixtures__/fixtures.js diff --git a/codegen/src/generators/__tests__/GenerateComponentDescriptorH-test.js b/packages/react-native-codegen/src/generators/__tests__/GenerateComponentDescriptorH-test.js similarity index 100% rename from codegen/src/generators/__tests__/GenerateComponentDescriptorH-test.js rename to packages/react-native-codegen/src/generators/__tests__/GenerateComponentDescriptorH-test.js diff --git a/codegen/src/generators/__tests__/GenerateEventEmitterCpp-test.js b/packages/react-native-codegen/src/generators/__tests__/GenerateEventEmitterCpp-test.js similarity index 100% rename from codegen/src/generators/__tests__/GenerateEventEmitterCpp-test.js rename to packages/react-native-codegen/src/generators/__tests__/GenerateEventEmitterCpp-test.js diff --git a/codegen/src/generators/__tests__/GenerateEventEmitterH-test.js b/packages/react-native-codegen/src/generators/__tests__/GenerateEventEmitterH-test.js similarity index 100% rename from codegen/src/generators/__tests__/GenerateEventEmitterH-test.js rename to packages/react-native-codegen/src/generators/__tests__/GenerateEventEmitterH-test.js diff --git a/codegen/src/generators/__tests__/GeneratePropsCpp-test.js b/packages/react-native-codegen/src/generators/__tests__/GeneratePropsCpp-test.js similarity index 100% rename from codegen/src/generators/__tests__/GeneratePropsCpp-test.js rename to packages/react-native-codegen/src/generators/__tests__/GeneratePropsCpp-test.js diff --git a/codegen/src/generators/__tests__/GeneratePropsH-test.js b/packages/react-native-codegen/src/generators/__tests__/GeneratePropsH-test.js similarity index 100% rename from codegen/src/generators/__tests__/GeneratePropsH-test.js rename to packages/react-native-codegen/src/generators/__tests__/GeneratePropsH-test.js diff --git a/codegen/src/generators/__tests__/GenerateShadowNodeCpp-test.js b/packages/react-native-codegen/src/generators/__tests__/GenerateShadowNodeCpp-test.js similarity index 100% rename from codegen/src/generators/__tests__/GenerateShadowNodeCpp-test.js rename to packages/react-native-codegen/src/generators/__tests__/GenerateShadowNodeCpp-test.js diff --git a/codegen/src/generators/__tests__/GenerateShadowNodeH-test.js b/packages/react-native-codegen/src/generators/__tests__/GenerateShadowNodeH-test.js similarity index 100% rename from codegen/src/generators/__tests__/GenerateShadowNodeH-test.js rename to packages/react-native-codegen/src/generators/__tests__/GenerateShadowNodeH-test.js diff --git a/codegen/src/generators/__tests__/GenerateViewConfigJs-test.js b/packages/react-native-codegen/src/generators/__tests__/GenerateViewConfigJs-test.js similarity index 100% rename from codegen/src/generators/__tests__/GenerateViewConfigJs-test.js rename to packages/react-native-codegen/src/generators/__tests__/GenerateViewConfigJs-test.js diff --git a/codegen/src/generators/__tests__/__snapshots__/GenerateComponentDescriptorH-test.js.snap b/packages/react-native-codegen/src/generators/__tests__/__snapshots__/GenerateComponentDescriptorH-test.js.snap similarity index 100% rename from codegen/src/generators/__tests__/__snapshots__/GenerateComponentDescriptorH-test.js.snap rename to packages/react-native-codegen/src/generators/__tests__/__snapshots__/GenerateComponentDescriptorH-test.js.snap diff --git a/codegen/src/generators/__tests__/__snapshots__/GenerateEventEmitterCpp-test.js.snap b/packages/react-native-codegen/src/generators/__tests__/__snapshots__/GenerateEventEmitterCpp-test.js.snap similarity index 100% rename from codegen/src/generators/__tests__/__snapshots__/GenerateEventEmitterCpp-test.js.snap rename to packages/react-native-codegen/src/generators/__tests__/__snapshots__/GenerateEventEmitterCpp-test.js.snap diff --git a/codegen/src/generators/__tests__/__snapshots__/GenerateEventEmitterH-test.js.snap b/packages/react-native-codegen/src/generators/__tests__/__snapshots__/GenerateEventEmitterH-test.js.snap similarity index 100% rename from codegen/src/generators/__tests__/__snapshots__/GenerateEventEmitterH-test.js.snap rename to packages/react-native-codegen/src/generators/__tests__/__snapshots__/GenerateEventEmitterH-test.js.snap diff --git a/codegen/src/generators/__tests__/__snapshots__/GeneratePropsCpp-test.js.snap b/packages/react-native-codegen/src/generators/__tests__/__snapshots__/GeneratePropsCpp-test.js.snap similarity index 100% rename from codegen/src/generators/__tests__/__snapshots__/GeneratePropsCpp-test.js.snap rename to packages/react-native-codegen/src/generators/__tests__/__snapshots__/GeneratePropsCpp-test.js.snap diff --git a/codegen/src/generators/__tests__/__snapshots__/GeneratePropsH-test.js.snap b/packages/react-native-codegen/src/generators/__tests__/__snapshots__/GeneratePropsH-test.js.snap similarity index 100% rename from codegen/src/generators/__tests__/__snapshots__/GeneratePropsH-test.js.snap rename to packages/react-native-codegen/src/generators/__tests__/__snapshots__/GeneratePropsH-test.js.snap diff --git a/codegen/src/generators/__tests__/__snapshots__/GenerateShadowNodeCpp-test.js.snap b/packages/react-native-codegen/src/generators/__tests__/__snapshots__/GenerateShadowNodeCpp-test.js.snap similarity index 100% rename from codegen/src/generators/__tests__/__snapshots__/GenerateShadowNodeCpp-test.js.snap rename to packages/react-native-codegen/src/generators/__tests__/__snapshots__/GenerateShadowNodeCpp-test.js.snap diff --git a/codegen/src/generators/__tests__/__snapshots__/GenerateShadowNodeH-test.js.snap b/packages/react-native-codegen/src/generators/__tests__/__snapshots__/GenerateShadowNodeH-test.js.snap similarity index 100% rename from codegen/src/generators/__tests__/__snapshots__/GenerateShadowNodeH-test.js.snap rename to packages/react-native-codegen/src/generators/__tests__/__snapshots__/GenerateShadowNodeH-test.js.snap diff --git a/codegen/src/generators/__tests__/__snapshots__/GenerateViewConfigJs-test.js.snap b/packages/react-native-codegen/src/generators/__tests__/__snapshots__/GenerateViewConfigJs-test.js.snap similarity index 100% rename from codegen/src/generators/__tests__/__snapshots__/GenerateViewConfigJs-test.js.snap rename to packages/react-native-codegen/src/generators/__tests__/__snapshots__/GenerateViewConfigJs-test.js.snap diff --git a/codegen/yarn.lock b/packages/react-native-codegen/yarn.lock similarity index 100% rename from codegen/yarn.lock rename to packages/react-native-codegen/yarn.lock