Skip to content

Commit

Permalink
Use newer codegen generators (#10744)
Browse files Browse the repository at this point in the history
* Use newer react-native-codegen generators

* Change files

* format
  • Loading branch information
acoates-ms committed Oct 17, 2022
1 parent 45b6c39 commit d1c755a
Show file tree
Hide file tree
Showing 10 changed files with 105 additions and 74 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Use newer react-native-codegen generators",
"packageName": "@react-native-windows/codegen",
"email": "30809111+acoates-ms@users.noreply.github.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Use newer react-native-codegen generators",
"packageName": "react-native-windows",
"email": "30809111+acoates-ms@users.noreply.github.com",
"dependentChangeType": "patch"
}
42 changes: 28 additions & 14 deletions packages/@react-native-windows/codegen/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -208,20 +208,34 @@ export function generate(
methodonly,
});

const generatorPropsH =
require('react-native-tscodegen/lib/rncodegen/src/generators/components/GeneratePropsH').generate;
const generatorPropsCPP =
require('react-native-tscodegen/lib/rncodegen/src/generators/components/GeneratePropsCPP').generate;
const generatorShadowNodeH =
require('react-native-tscodegen/lib/rncodegen/src/generators/components/GenerateShadowNodeH').generate;
const generatorShadowNodeCPP =
require('react-native-tscodegen/lib/rncodegen/src/generators/components/GenerateShadowNodeCPP').generate;
const generatorComponentDescriptorH =
require('react-native-tscodegen/lib/rncodegen/src/generators/components/GenerateComponentDescriptorH').generate;
const generatorEventEmitterH =
require('react-native-tscodegen/lib/rncodegen/src/generators/components/GenerateEventEmitterH').generate;
const generatorEventEmitterCPP =
require('react-native-tscodegen/lib/rncodegen/src/generators/components/GenerateEventEmitterCpp').generate;
const generatorPropsH = require(path.resolve(
rncodegenPath,
'lib/generators/components/GeneratePropsH',
)).generate;
const generatorPropsCPP = require(path.resolve(
rncodegenPath,
'lib/generators/components/GeneratePropsCPP',
)).generate;
const generatorShadowNodeH = require(path.resolve(
rncodegenPath,
'lib/generators/components/GenerateShadowNodeH',
)).generate;
const generatorShadowNodeCPP = require(path.resolve(
rncodegenPath,
'lib/generators/components/GenerateShadowNodeCPP',
)).generate;
const generatorComponentDescriptorH = require(path.resolve(
rncodegenPath,
'lib/generators/components/GenerateComponentDescriptorH',
)).generate;
const generatorEventEmitterH = require(path.resolve(
rncodegenPath,
'lib/generators/components/GenerateEventEmitterH',
)).generate;
const generatorEventEmitterCPP = require(path.resolve(
rncodegenPath,
'lib/generators/components/GenerateEventEmitterCpp',
)).generate;

normalizeFileMap(
generateNM2(libraryName, schema, moduleSpecName),
Expand Down
6 changes: 3 additions & 3 deletions vnext/codegen/react/components/rnwcore/ComponentDescriptors.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

/**
* Copyright (c) Facebook, Inc. and its affiliates.
* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
* Do not edit this file as changes may cause incorrect behavior and will be lost
* once the code is regenerated.
*
* @generated by codegen project: GenerateComponentDescriptorH.js
*/
Expand Down
6 changes: 3 additions & 3 deletions vnext/codegen/react/components/rnwcore/EventEmitters.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

/**
* Copyright (c) Facebook, Inc. and its affiliates.
* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
* Do not edit this file as changes may cause incorrect behavior and will be lost
* once the code is regenerated.
*
* @generated by codegen project: GenerateEventEmitterCpp.js
*/
Expand Down
37 changes: 19 additions & 18 deletions vnext/codegen/react/components/rnwcore/EventEmitters.h
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@

/**
* Copyright (c) Facebook, Inc. and its affiliates.
* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
* Do not edit this file as changes may cause incorrect behavior and will be lost
* once the code is regenerated.
*
* @generated by codegen project: GenerateEventEmitterH.js
*/
#pragma once

#include <react/renderer/components/view/ViewEventEmitter.h>
#include <jsi/jsi.h>

namespace facebook {
namespace react {

class ModalHostViewEventEmitter : public ViewEventEmitter {
class JSI_EXPORT ModalHostViewEventEmitter : public ViewEventEmitter {
public:
using ViewEventEmitter::ViewEventEmitter;

Expand Down Expand Up @@ -54,15 +55,15 @@ class ModalHostViewEventEmitter : public ViewEventEmitter {

void onOrientationChange(OnOrientationChange value) const;
};
class ActivityIndicatorViewEventEmitter : public ViewEventEmitter {
class JSI_EXPORT ActivityIndicatorViewEventEmitter : public ViewEventEmitter {
public:
using ViewEventEmitter::ViewEventEmitter;




};
class DatePickerEventEmitter : public ViewEventEmitter {
class JSI_EXPORT DatePickerEventEmitter : public ViewEventEmitter {
public:
using ViewEventEmitter::ViewEventEmitter;

Expand All @@ -72,7 +73,7 @@ class DatePickerEventEmitter : public ViewEventEmitter {

void onChange(OnChange value) const;
};
class AndroidDrawerLayoutEventEmitter : public ViewEventEmitter {
class JSI_EXPORT AndroidDrawerLayoutEventEmitter : public ViewEventEmitter {
public:
using ViewEventEmitter::ViewEventEmitter;

Expand Down Expand Up @@ -100,23 +101,23 @@ class AndroidDrawerLayoutEventEmitter : public ViewEventEmitter {

void onDrawerClose(OnDrawerClose value) const;
};
class AndroidProgressBarEventEmitter : public ViewEventEmitter {
class JSI_EXPORT AndroidProgressBarEventEmitter : public ViewEventEmitter {
public:
using ViewEventEmitter::ViewEventEmitter;




};
class RCTProgressViewEventEmitter : public ViewEventEmitter {
class JSI_EXPORT RCTProgressViewEventEmitter : public ViewEventEmitter {
public:
using ViewEventEmitter::ViewEventEmitter;




};
class AndroidSwipeRefreshLayoutEventEmitter : public ViewEventEmitter {
class JSI_EXPORT AndroidSwipeRefreshLayoutEventEmitter : public ViewEventEmitter {
public:
using ViewEventEmitter::ViewEventEmitter;

Expand All @@ -126,7 +127,7 @@ class AndroidSwipeRefreshLayoutEventEmitter : public ViewEventEmitter {

void onRefresh(OnRefresh value) const;
};
class PullToRefreshViewEventEmitter : public ViewEventEmitter {
class JSI_EXPORT PullToRefreshViewEventEmitter : public ViewEventEmitter {
public:
using ViewEventEmitter::ViewEventEmitter;

Expand All @@ -136,23 +137,23 @@ class PullToRefreshViewEventEmitter : public ViewEventEmitter {

void onRefresh(OnRefresh value) const;
};
class SafeAreaViewEventEmitter : public ViewEventEmitter {
class JSI_EXPORT SafeAreaViewEventEmitter : public ViewEventEmitter {
public:
using ViewEventEmitter::ViewEventEmitter;




};
class AndroidHorizontalScrollContentViewEventEmitter : public ViewEventEmitter {
class JSI_EXPORT AndroidHorizontalScrollContentViewEventEmitter : public ViewEventEmitter {
public:
using ViewEventEmitter::ViewEventEmitter;




};
class SliderEventEmitter : public ViewEventEmitter {
class JSI_EXPORT SliderEventEmitter : public ViewEventEmitter {
public:
using ViewEventEmitter::ViewEventEmitter;

Expand All @@ -170,7 +171,7 @@ class SliderEventEmitter : public ViewEventEmitter {

void onSlidingComplete(OnSlidingComplete value) const;
};
class AndroidSwitchEventEmitter : public ViewEventEmitter {
class JSI_EXPORT AndroidSwitchEventEmitter : public ViewEventEmitter {
public:
using ViewEventEmitter::ViewEventEmitter;

Expand All @@ -180,7 +181,7 @@ class AndroidSwitchEventEmitter : public ViewEventEmitter {

void onChange(OnChange value) const;
};
class SwitchEventEmitter : public ViewEventEmitter {
class JSI_EXPORT SwitchEventEmitter : public ViewEventEmitter {
public:
using ViewEventEmitter::ViewEventEmitter;

Expand All @@ -190,15 +191,15 @@ class SwitchEventEmitter : public ViewEventEmitter {

void onChange(OnChange value) const;
};
class InputAccessoryEventEmitter : public ViewEventEmitter {
class JSI_EXPORT InputAccessoryEventEmitter : public ViewEventEmitter {
public:
using ViewEventEmitter::ViewEventEmitter;




};
class UnimplementedNativeViewEventEmitter : public ViewEventEmitter {
class JSI_EXPORT UnimplementedNativeViewEventEmitter : public ViewEventEmitter {
public:
using ViewEventEmitter::ViewEventEmitter;

Expand Down
6 changes: 3 additions & 3 deletions vnext/codegen/react/components/rnwcore/Props.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

/**
* Copyright (c) Facebook, Inc. and its affiliates.
* This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
* Do not edit this file as changes may cause incorrect behavior and will be lost
* once the code is regenerated.
*
* @generated by codegen project: GeneratePropsCpp.js
*/
Expand Down

0 comments on commit d1c755a

Please sign in to comment.