Skip to content

Align Codegen between iOS and Android#33864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cipolleschi wants to merge 1 commit into from
Closed

Align Codegen between iOS and Android #33864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/rn-tester/BUCK
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ rn_library(
"pfh:ReactNative_CommonInfrastructurePlaceholder",
"supermodule:xplat/default/public.react_native.playground",
],
native_component_spec_name = "MyNativeViewSpec",
native_component_spec_name = "AppSpecs",
skip_processors = True,
visibility = ["PUBLIC"],
deps = [
Expand DownExpand Up@@ -317,7 +317,7 @@ rn_xplat_cxx_library2(
reexport_all_header_dependencies = False,
visibility = ["PUBLIC"],
deps = [
":generated_components-MyNativeViewSpec",
":generated_components-AppSpecs",
"//xplat/js/react-native-github:RCTFabricComponentViewsBase",
],
)
8 changes: 4 additions & 4 deletions packages/rn-tester/NativeComponentExample/ios/RNTMyNativeViewComponentView.mm
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,10 @@

#import "RNTMyNativeViewComponentView.h"

#import <react/renderer/components/MyNativeViewSpec/ComponentDescriptors.h>
#import <react/renderer/components/MyNativeViewSpec/EventEmitters.h>
#import <react/renderer/components/MyNativeViewSpec/Props.h>
#import <react/renderer/components/MyNativeViewSpec/RCTComponentViewHelpers.h>
#import <react/renderer/components/AppSpecs/ComponentDescriptors.h>
#import <react/renderer/components/AppSpecs/EventEmitters.h>
#import <react/renderer/components/AppSpecs/Props.h>
#import <react/renderer/components/AppSpecs/RCTComponentViewHelpers.h>

#import "RCTFabricComponentsPlugins.h"

Expand Down
19 changes: 3 additions & 16 deletions packages/rn-tester/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,21 +31,8 @@
"ws": "^6.1.4"
},
"codegenConfig": {
"libraries": [
{
"name": "ScreenshotManagerSpec",
"type": "modules",
"ios": {},
"android": {},
"jsSrcsDir": "NativeModuleExample"
},
{
"name": "MyNativeViewSpec",
"type": "components",
"ios": {},
"android": {},
"jsSrcsDir": "NativeComponentExample/js"
}
]
"name": "AppSpecs",
"type": "all",
"jsSrcsDir": "."
}
}
45 changes: 45 additions & 0 deletions scripts/codegen/__test_fixtures__/fixtures.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,48 @@

'use-strict';

const SINGLE_LIBRARY_CODEGEN_CONFIG = {
codegenConfig: {
libraries: [
{
name: 'react-native',
type: 'all',
jsSrcsDir: '.',
},
],
},
};

const MULTIPLE_LIBRARIES_CODEGEN_CONFIG = {
codegenConfig: {
libraries: [
{
name: 'react-native',
type: 'all',
jsSrcsDir: '.',
},
{
name: 'my-component',
type: 'components',
jsSrcsDir: 'component/js',
},
{
name: 'my-module',
type: 'module',
jsSrcsDir: 'module/js',
},
],
},
};

const NO_LIBRARIES_CONFIG_FILE = {
codegenConfig: {
name: 'AppModules',
type: 'all',
jsSrcsDir: '.',
},
};

const SCHEMA_TEXT = `
{
"modules": {
Expand DownExpand Up@@ -84,4 +126,7 @@ const SCHEMA = JSON.parse(SCHEMA_TEXT);
module.exports = {
schemaText: SCHEMA_TEXT,
schema: SCHEMA,
noLibrariesConfigFile: NO_LIBRARIES_CONFIG_FILE,
singleLibraryCodegenConfig: SINGLE_LIBRARY_CODEGEN_CONFIG,
multipleLibrariesCodegenConfig: MULTIPLE_LIBRARIES_CODEGEN_CONFIG,
};
132 changes: 132 additions & 0 deletions scripts/codegen/__tests__/generate-artifacts-executor-test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,13 @@
'use strict';

const underTest = require('../generate-artifacts-executor');
const fixtures = require('../__test_fixtures__/fixtures');
const path = require('path');

const codegenConfigKey = 'codegenConfig';
const reactNativeDependencyName = 'react-native';
const rootPath = path.join(__dirname, '../../..');

describe('generateCode', () => {
it('executeNodes with the right arguents', () => {
// Define variables and expected values
Expand DownExpand Up@@ -69,3 +74,130 @@ describe('generateCode', () => {
expect(mkdirSyncInvocationCount).toBe(2);
});
});

describe('extractLibrariesFromJSON', () => {
it('throws if in react-native and no dependencies found', () => {
let libraries = [];
let configFile = {};
expect(() => {
underTest._extractLibrariesFromJSON(
configFile,
libraries,
codegenConfigKey,
);
}).toThrow();
});

it('it skips if not into react-native and no dependencies found', () => {
let libraries = [];
let configFile = {};

underTest._extractLibrariesFromJSON(
configFile,
libraries,
codegenConfigKey,
'some-node-module',
'node_modules/some',
);
expect(libraries.length).toBe(0);
});

it('extracts a single dependency when config has no libraries', () => {
let libraries = [];
let configFile = fixtures.noLibrariesConfigFile;
underTest._extractLibrariesFromJSON(
configFile,
libraries,
codegenConfigKey,
'my-app',
'.',
);
expect(libraries.length).toBe(1);
expect(libraries[0]).toEqual({
library: 'my-app',
config: {
name: 'AppModules',
type: 'all',
jsSrcsDir: '.',
},
libraryPath: '.',
});
});

it("extract codegenConfig when it's empty", () => {
const configFile = {codegenConfig: {libraries: []}};
let libraries = [];
underTest._extractLibrariesFromJSON(
configFile,
codegenConfigKey,
libraries,
reactNativeDependencyName,
rootPath,
);
expect(libraries.length).toBe(0);
});

it('extract codegenConfig when dependency is one', () => {
const configFile = fixtures.singleLibraryCodegenConfig;
let libraries = [];
underTest._extractLibrariesFromJSON(
configFile,
libraries,
codegenConfigKey,
reactNativeDependencyName,
rootPath,
);
expect(libraries.length).toBe(1);
expect(libraries[0]).toEqual({
library: reactNativeDependencyName,
config: {
name: 'react-native',
type: 'all',
jsSrcsDir: '.',
},
libraryPath: rootPath,
});
});

it('extract codegenConfig with multiple dependencies', () => {
const configFile = fixtures.multipleLibrariesCodegenConfig;
const myDependency = 'my-dependency';
const myDependencyPath = path.join(__dirname, myDependency);
let libraries = [];
underTest._extractLibrariesFromJSON(
configFile,
libraries,
codegenConfigKey,
myDependency,
myDependencyPath,
);
expect(libraries.length).toBe(3);
expect(libraries[0]).toEqual({
library: myDependency,
config: {
name: 'react-native',
type: 'all',
jsSrcsDir: '.',
},
libraryPath: myDependencyPath,
});
expect(libraries[1]).toEqual({
library: myDependency,
config: {
name: 'my-component',
type: 'components',
jsSrcsDir: 'component/js',
},
libraryPath: myDependencyPath,
});
expect(libraries[2]).toEqual({
library: myDependency,
config: {
name: 'my-module',
type: 'module',
jsSrcsDir: 'module/js',
},
libraryPath: myDependencyPath,
});
});
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Align Codegen between iOS and Android by cipolleschi · Pull Request #33864 · react/react-native · GitHub
Skip to content
Align Codegen between iOS and Android#33864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

cipolleschi
wants to merge
1
commit into

from

 Closed


Align Codegen between iOS and Android
#33864
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
packages/rn-tester/BUCK

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ rn_library(
 "pfh:ReactNative_CommonInfrastructurePlaceholder",
 "supermodule:xplat/default/public.react_native.playground",
 ],
 native_component_spec_name = "MyNativeViewSpec",
 native_component_spec_name = "AppSpecs",
 skip_processors = True,
 visibility = ["PUBLIC"],
 deps = [
Expand DownExpand Up@@ -317,7 +317,7 @@ rn_xplat_cxx_library2(
 reexport_all_header_dependencies = False,
 visibility = ["PUBLIC"],
 deps = [
 ":generated_components-MyNativeViewSpec",
 ":generated_components-AppSpecs",
 "//xplat/js/react-native-github:RCTFabricComponentViewsBase",
 ],
)

8 changes: 4 additions & 4 deletions
packages/rn-tester/NativeComponentExample/ios/RNTMyNativeViewComponentView.mm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,10 @@

#import "RNTMyNativeViewComponentView.h"

#import <react/renderer/components/MyNativeViewSpec/ComponentDescriptors.h>
#import <react/renderer/components/MyNativeViewSpec/EventEmitters.h>
#import <react/renderer/components/MyNativeViewSpec/Props.h>
#import <react/renderer/components/MyNativeViewSpec/RCTComponentViewHelpers.h>
#import <react/renderer/components/AppSpecs/ComponentDescriptors.h>
#import <react/renderer/components/AppSpecs/EventEmitters.h>
#import <react/renderer/components/AppSpecs/Props.h>
#import <react/renderer/components/AppSpecs/RCTComponentViewHelpers.h>

#import "RCTFabricComponentsPlugins.h"

Expand Down

19 changes: 3 additions & 16 deletions
packages/rn-tester/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,21 +31,8 @@
 "ws": "^6.1.4"
 },
 "codegenConfig": {
 "libraries": [
 {
 "name": "ScreenshotManagerSpec",
 "type": "modules",
 "ios": {},
 "android": {},
 "jsSrcsDir": "NativeModuleExample"
 },
 {
 "name": "MyNativeViewSpec",
 "type": "components",
 "ios": {},
 "android": {},
 "jsSrcsDir": "NativeComponentExample/js"
 }
 ]
 "name": "AppSpecs",
 "type": "all",
 "jsSrcsDir": "."
 }
}

45 changes: 45 additions & 0 deletions
scripts/codegen/__test_fixtures__/fixtures.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,48 @@

'use-strict';

const SINGLE_LIBRARY_CODEGEN_CONFIG = {
 codegenConfig: {
 libraries: [
 {
 name: 'react-native',
 type: 'all',
 jsSrcsDir: '.',
 },
 ],
 },
};

const MULTIPLE_LIBRARIES_CODEGEN_CONFIG = {
 codegenConfig: {
 libraries: [
 {
 name: 'react-native',
 type: 'all',
 jsSrcsDir: '.',
 },
 {
 name: 'my-component',
 type: 'components',
 jsSrcsDir: 'component/js',
 },
 {
 name: 'my-module',
 type: 'module',
 jsSrcsDir: 'module/js',
 },
 ],
 },
};

const NO_LIBRARIES_CONFIG_FILE = {
 codegenConfig: {
 name: 'AppModules',
 type: 'all',
 jsSrcsDir: '.',
 },
};

const SCHEMA_TEXT = `
 {
 "modules": {
Expand DownExpand Up@@ -84,4 +126,7 @@ const SCHEMA = JSON.parse(SCHEMA_TEXT);
module.exports = {
 schemaText: SCHEMA_TEXT,
 schema: SCHEMA,
 noLibrariesConfigFile: NO_LIBRARIES_CONFIG_FILE,
 singleLibraryCodegenConfig: SINGLE_LIBRARY_CODEGEN_CONFIG,
 multipleLibrariesCodegenConfig: MULTIPLE_LIBRARIES_CODEGEN_CONFIG,
};

132 changes: 132 additions & 0 deletions
scripts/codegen/__tests__/generate-artifacts-executor-test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,13 @@
'use strict';

const underTest = require('../generate-artifacts-executor');
const fixtures = require('../__test_fixtures__/fixtures');
const path = require('path');

const codegenConfigKey = 'codegenConfig';
const reactNativeDependencyName = 'react-native';
const rootPath = path.join(__dirname, '../../..');

describe('generateCode', () => {
 it('executeNodes with the right arguents', () => {
 // Define variables and expected values
Expand DownExpand Up@@ -69,3 +74,130 @@ describe('generateCode', () => {
 expect(mkdirSyncInvocationCount).toBe(2);
 });
});

describe('extractLibrariesFromJSON', () => {
 it('throws if in react-native and no dependencies found', () => {
 let libraries = [];
 let configFile = {};
 expect(() => {
 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 );
 }).toThrow();
 });

 it('it skips if not into react-native and no dependencies found', () => {
 let libraries = [];
 let configFile = {};

 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 'some-node-module',
 'node_modules/some',
 );
 expect(libraries.length).toBe(0);
 });

 it('extracts a single dependency when config has no libraries', () => {
 let libraries = [];
 let configFile = fixtures.noLibrariesConfigFile;
 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 'my-app',
 '.',
 );
 expect(libraries.length).toBe(1);
 expect(libraries[0]).toEqual({
 library: 'my-app',
 config: {
 name: 'AppModules',
 type: 'all',
 jsSrcsDir: '.',
 },
 libraryPath: '.',
 });
 });

 it("extract codegenConfig when it's empty", () => {
 const configFile = {codegenConfig: {libraries: []}};
 let libraries = [];
 underTest._extractLibrariesFromJSON(
 configFile,
 codegenConfigKey,
 libraries,
 reactNativeDependencyName,
 rootPath,
 );
 expect(libraries.length).toBe(0);
 });

 it('extract codegenConfig when dependency is one', () => {
 const configFile = fixtures.singleLibraryCodegenConfig;
 let libraries = [];
 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 reactNativeDependencyName,
 rootPath,
 );
 expect(libraries.length).toBe(1);
 expect(libraries[0]).toEqual({
 library: reactNativeDependencyName,
 config: {
 name: 'react-native',
 type: 'all',
 jsSrcsDir: '.',
 },
 libraryPath: rootPath,
 });
 });

 it('extract codegenConfig with multiple dependencies', () => {
 const configFile = fixtures.multipleLibrariesCodegenConfig;
 const myDependency = 'my-dependency';
 const myDependencyPath = path.join(__dirname, myDependency);
 let libraries = [];
 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 myDependency,
 myDependencyPath,
 );
 expect(libraries.length).toBe(3);
 expect(libraries[0]).toEqual({
 library: myDependency,
 config: {
 name: 'react-native',
 type: 'all',
 jsSrcsDir: '.',
 },
 libraryPath: myDependencyPath,
 });
 expect(libraries[1]).toEqual({
 library: myDependency,
 config: {
 name: 'my-component',
 type: 'components',
 jsSrcsDir: 'component/js',
 },
 libraryPath: myDependencyPath,
 });
 expect(libraries[2]).toEqual({
 library: myDependency,
 config: {
 name: 'my-module',
 type: 'module',
 jsSrcsDir: 'module/js',
 },
 libraryPath: myDependencyPath,
 });
 });
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Align Codegen between iOS and Android by cipolleschi · Pull Request #33864 · react/react-native · GitHub
Skip to content
Align Codegen between iOS and Android#33864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

cipolleschi
wants to merge
1
commit into

from

 Closed


Align Codegen between iOS and Android
#33864
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
packages/rn-tester/BUCK

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ rn_library(
 "pfh:ReactNative_CommonInfrastructurePlaceholder",
 "supermodule:xplat/default/public.react_native.playground",
 ],
 native_component_spec_name = "MyNativeViewSpec",
 native_component_spec_name = "AppSpecs",
 skip_processors = True,
 visibility = ["PUBLIC"],
 deps = [
Expand DownExpand Up@@ -317,7 +317,7 @@ rn_xplat_cxx_library2(
 reexport_all_header_dependencies = False,
 visibility = ["PUBLIC"],
 deps = [
 ":generated_components-MyNativeViewSpec",
 ":generated_components-AppSpecs",
 "//xplat/js/react-native-github:RCTFabricComponentViewsBase",
 ],
)

8 changes: 4 additions & 4 deletions
packages/rn-tester/NativeComponentExample/ios/RNTMyNativeViewComponentView.mm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,10 @@

#import "RNTMyNativeViewComponentView.h"

#import <react/renderer/components/MyNativeViewSpec/ComponentDescriptors.h>
#import <react/renderer/components/MyNativeViewSpec/EventEmitters.h>
#import <react/renderer/components/MyNativeViewSpec/Props.h>
#import <react/renderer/components/MyNativeViewSpec/RCTComponentViewHelpers.h>
#import <react/renderer/components/AppSpecs/ComponentDescriptors.h>
#import <react/renderer/components/AppSpecs/EventEmitters.h>
#import <react/renderer/components/AppSpecs/Props.h>
#import <react/renderer/components/AppSpecs/RCTComponentViewHelpers.h>

#import "RCTFabricComponentsPlugins.h"

Expand Down

19 changes: 3 additions & 16 deletions
packages/rn-tester/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,21 +31,8 @@
 "ws": "^6.1.4"
 },
 "codegenConfig": {
 "libraries": [
 {
 "name": "ScreenshotManagerSpec",
 "type": "modules",
 "ios": {},
 "android": {},
 "jsSrcsDir": "NativeModuleExample"
 },
 {
 "name": "MyNativeViewSpec",
 "type": "components",
 "ios": {},
 "android": {},
 "jsSrcsDir": "NativeComponentExample/js"
 }
 ]
 "name": "AppSpecs",
 "type": "all",
 "jsSrcsDir": "."
 }
}

45 changes: 45 additions & 0 deletions
scripts/codegen/__test_fixtures__/fixtures.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,48 @@

'use-strict';

const SINGLE_LIBRARY_CODEGEN_CONFIG = {
 codegenConfig: {
 libraries: [
 {
 name: 'react-native',
 type: 'all',
 jsSrcsDir: '.',
 },
 ],
 },
};

const MULTIPLE_LIBRARIES_CODEGEN_CONFIG = {
 codegenConfig: {
 libraries: [
 {
 name: 'react-native',
 type: 'all',
 jsSrcsDir: '.',
 },
 {
 name: 'my-component',
 type: 'components',
 jsSrcsDir: 'component/js',
 },
 {
 name: 'my-module',
 type: 'module',
 jsSrcsDir: 'module/js',
 },
 ],
 },
};

const NO_LIBRARIES_CONFIG_FILE = {
 codegenConfig: {
 name: 'AppModules',
 type: 'all',
 jsSrcsDir: '.',
 },
};

const SCHEMA_TEXT = `
 {
 "modules": {
Expand DownExpand Up@@ -84,4 +126,7 @@ const SCHEMA = JSON.parse(SCHEMA_TEXT);
module.exports = {
 schemaText: SCHEMA_TEXT,
 schema: SCHEMA,
 noLibrariesConfigFile: NO_LIBRARIES_CONFIG_FILE,
 singleLibraryCodegenConfig: SINGLE_LIBRARY_CODEGEN_CONFIG,
 multipleLibrariesCodegenConfig: MULTIPLE_LIBRARIES_CODEGEN_CONFIG,
};

132 changes: 132 additions & 0 deletions
scripts/codegen/__tests__/generate-artifacts-executor-test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,13 @@
'use strict';

const underTest = require('../generate-artifacts-executor');
const fixtures = require('../__test_fixtures__/fixtures');
const path = require('path');

const codegenConfigKey = 'codegenConfig';
const reactNativeDependencyName = 'react-native';
const rootPath = path.join(__dirname, '../../..');

describe('generateCode', () => {
 it('executeNodes with the right arguents', () => {
 // Define variables and expected values
Expand DownExpand Up@@ -69,3 +74,130 @@ describe('generateCode', () => {
 expect(mkdirSyncInvocationCount).toBe(2);
 });
});

describe('extractLibrariesFromJSON', () => {
 it('throws if in react-native and no dependencies found', () => {
 let libraries = [];
 let configFile = {};
 expect(() => {
 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 );
 }).toThrow();
 });

 it('it skips if not into react-native and no dependencies found', () => {
 let libraries = [];
 let configFile = {};

 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 'some-node-module',
 'node_modules/some',
 );
 expect(libraries.length).toBe(0);
 });

 it('extracts a single dependency when config has no libraries', () => {
 let libraries = [];
 let configFile = fixtures.noLibrariesConfigFile;
 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 'my-app',
 '.',
 );
 expect(libraries.length).toBe(1);
 expect(libraries[0]).toEqual({
 library: 'my-app',
 config: {
 name: 'AppModules',
 type: 'all',
 jsSrcsDir: '.',
 },
 libraryPath: '.',
 });
 });

 it("extract codegenConfig when it's empty", () => {
 const configFile = {codegenConfig: {libraries: []}};
 let libraries = [];
 underTest._extractLibrariesFromJSON(
 configFile,
 codegenConfigKey,
 libraries,
 reactNativeDependencyName,
 rootPath,
 );
 expect(libraries.length).toBe(0);
 });

 it('extract codegenConfig when dependency is one', () => {
 const configFile = fixtures.singleLibraryCodegenConfig;
 let libraries = [];
 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 reactNativeDependencyName,
 rootPath,
 );
 expect(libraries.length).toBe(1);
 expect(libraries[0]).toEqual({
 library: reactNativeDependencyName,
 config: {
 name: 'react-native',
 type: 'all',
 jsSrcsDir: '.',
 },
 libraryPath: rootPath,
 });
 });

 it('extract codegenConfig with multiple dependencies', () => {
 const configFile = fixtures.multipleLibrariesCodegenConfig;
 const myDependency = 'my-dependency';
 const myDependencyPath = path.join(__dirname, myDependency);
 let libraries = [];
 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 myDependency,
 myDependencyPath,
 );
 expect(libraries.length).toBe(3);
 expect(libraries[0]).toEqual({
 library: myDependency,
 config: {
 name: 'react-native',
 type: 'all',
 jsSrcsDir: '.',
 },
 libraryPath: myDependencyPath,
 });
 expect(libraries[1]).toEqual({
 library: myDependency,
 config: {
 name: 'my-component',
 type: 'components',
 jsSrcsDir: 'component/js',
 },
 libraryPath: myDependencyPath,
 });
 expect(libraries[2]).toEqual({
 library: myDependency,
 config: {
 name: 'my-module',
 type: 'module',
 jsSrcsDir: 'module/js',
 },
 libraryPath: myDependencyPath,
 });
 });
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Align Codegen between iOS and Android by cipolleschi · Pull Request #33864 · react/react-native · GitHub
Skip to content
Align Codegen between iOS and Android#33864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

cipolleschi
wants to merge
1
commit into

from

 Closed


Align Codegen between iOS and Android
#33864
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
packages/rn-tester/BUCK

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ rn_library(
 "pfh:ReactNative_CommonInfrastructurePlaceholder",
 "supermodule:xplat/default/public.react_native.playground",
 ],
 native_component_spec_name = "MyNativeViewSpec",
 native_component_spec_name = "AppSpecs",
 skip_processors = True,
 visibility = ["PUBLIC"],
 deps = [
Expand DownExpand Up@@ -317,7 +317,7 @@ rn_xplat_cxx_library2(
 reexport_all_header_dependencies = False,
 visibility = ["PUBLIC"],
 deps = [
 ":generated_components-MyNativeViewSpec",
 ":generated_components-AppSpecs",
 "//xplat/js/react-native-github:RCTFabricComponentViewsBase",
 ],
)

8 changes: 4 additions & 4 deletions
packages/rn-tester/NativeComponentExample/ios/RNTMyNativeViewComponentView.mm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,10 @@

#import "RNTMyNativeViewComponentView.h"

#import <react/renderer/components/MyNativeViewSpec/ComponentDescriptors.h>
#import <react/renderer/components/MyNativeViewSpec/EventEmitters.h>
#import <react/renderer/components/MyNativeViewSpec/Props.h>
#import <react/renderer/components/MyNativeViewSpec/RCTComponentViewHelpers.h>
#import <react/renderer/components/AppSpecs/ComponentDescriptors.h>
#import <react/renderer/components/AppSpecs/EventEmitters.h>
#import <react/renderer/components/AppSpecs/Props.h>
#import <react/renderer/components/AppSpecs/RCTComponentViewHelpers.h>

#import "RCTFabricComponentsPlugins.h"

Expand Down

19 changes: 3 additions & 16 deletions
packages/rn-tester/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,21 +31,8 @@
 "ws": "^6.1.4"
 },
 "codegenConfig": {
 "libraries": [
 {
 "name": "ScreenshotManagerSpec",
 "type": "modules",
 "ios": {},
 "android": {},
 "jsSrcsDir": "NativeModuleExample"
 },
 {
 "name": "MyNativeViewSpec",
 "type": "components",
 "ios": {},
 "android": {},
 "jsSrcsDir": "NativeComponentExample/js"
 }
 ]
 "name": "AppSpecs",
 "type": "all",
 "jsSrcsDir": "."
 }
}

45 changes: 45 additions & 0 deletions
scripts/codegen/__test_fixtures__/fixtures.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,48 @@

'use-strict';

const SINGLE_LIBRARY_CODEGEN_CONFIG = {
 codegenConfig: {
 libraries: [
 {
 name: 'react-native',
 type: 'all',
 jsSrcsDir: '.',
 },
 ],
 },
};

const MULTIPLE_LIBRARIES_CODEGEN_CONFIG = {
 codegenConfig: {
 libraries: [
 {
 name: 'react-native',
 type: 'all',
 jsSrcsDir: '.',
 },
 {
 name: 'my-component',
 type: 'components',
 jsSrcsDir: 'component/js',
 },
 {
 name: 'my-module',
 type: 'module',
 jsSrcsDir: 'module/js',
 },
 ],
 },
};

const NO_LIBRARIES_CONFIG_FILE = {
 codegenConfig: {
 name: 'AppModules',
 type: 'all',
 jsSrcsDir: '.',
 },
};

const SCHEMA_TEXT = `
 {
 "modules": {
Expand DownExpand Up@@ -84,4 +126,7 @@ const SCHEMA = JSON.parse(SCHEMA_TEXT);
module.exports = {
 schemaText: SCHEMA_TEXT,
 schema: SCHEMA,
 noLibrariesConfigFile: NO_LIBRARIES_CONFIG_FILE,
 singleLibraryCodegenConfig: SINGLE_LIBRARY_CODEGEN_CONFIG,
 multipleLibrariesCodegenConfig: MULTIPLE_LIBRARIES_CODEGEN_CONFIG,
};

132 changes: 132 additions & 0 deletions
scripts/codegen/__tests__/generate-artifacts-executor-test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,13 @@
'use strict';

const underTest = require('../generate-artifacts-executor');
const fixtures = require('../__test_fixtures__/fixtures');
const path = require('path');

const codegenConfigKey = 'codegenConfig';
const reactNativeDependencyName = 'react-native';
const rootPath = path.join(__dirname, '../../..');

describe('generateCode', () => {
 it('executeNodes with the right arguents', () => {
 // Define variables and expected values
Expand DownExpand Up@@ -69,3 +74,130 @@ describe('generateCode', () => {
 expect(mkdirSyncInvocationCount).toBe(2);
 });
});

describe('extractLibrariesFromJSON', () => {
 it('throws if in react-native and no dependencies found', () => {
 let libraries = [];
 let configFile = {};
 expect(() => {
 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 );
 }).toThrow();
 });

 it('it skips if not into react-native and no dependencies found', () => {
 let libraries = [];
 let configFile = {};

 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 'some-node-module',
 'node_modules/some',
 );
 expect(libraries.length).toBe(0);
 });

 it('extracts a single dependency when config has no libraries', () => {
 let libraries = [];
 let configFile = fixtures.noLibrariesConfigFile;
 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 'my-app',
 '.',
 );
 expect(libraries.length).toBe(1);
 expect(libraries[0]).toEqual({
 library: 'my-app',
 config: {
 name: 'AppModules',
 type: 'all',
 jsSrcsDir: '.',
 },
 libraryPath: '.',
 });
 });

 it("extract codegenConfig when it's empty", () => {
 const configFile = {codegenConfig: {libraries: []}};
 let libraries = [];
 underTest._extractLibrariesFromJSON(
 configFile,
 codegenConfigKey,
 libraries,
 reactNativeDependencyName,
 rootPath,
 );
 expect(libraries.length).toBe(0);
 });

 it('extract codegenConfig when dependency is one', () => {
 const configFile = fixtures.singleLibraryCodegenConfig;
 let libraries = [];
 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 reactNativeDependencyName,
 rootPath,
 );
 expect(libraries.length).toBe(1);
 expect(libraries[0]).toEqual({
 library: reactNativeDependencyName,
 config: {
 name: 'react-native',
 type: 'all',
 jsSrcsDir: '.',
 },
 libraryPath: rootPath,
 });
 });

 it('extract codegenConfig with multiple dependencies', () => {
 const configFile = fixtures.multipleLibrariesCodegenConfig;
 const myDependency = 'my-dependency';
 const myDependencyPath = path.join(__dirname, myDependency);
 let libraries = [];
 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 myDependency,
 myDependencyPath,
 );
 expect(libraries.length).toBe(3);
 expect(libraries[0]).toEqual({
 library: myDependency,
 config: {
 name: 'react-native',
 type: 'all',
 jsSrcsDir: '.',
 },
 libraryPath: myDependencyPath,
 });
 expect(libraries[1]).toEqual({
 library: myDependency,
 config: {
 name: 'my-component',
 type: 'components',
 jsSrcsDir: 'component/js',
 },
 libraryPath: myDependencyPath,
 });
 expect(libraries[2]).toEqual({
 library: myDependency,
 config: {
 name: 'my-module',
 type: 'module',
 jsSrcsDir: 'module/js',
 },
 libraryPath: myDependencyPath,
 });
 });
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Align Codegen between iOS and Android by cipolleschi · Pull Request #33864 · react/react-native · GitHub
Skip to content
Align Codegen between iOS and Android#33864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

cipolleschi
wants to merge
1
commit into

from

 Closed


Align Codegen between iOS and Android
#33864
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
packages/rn-tester/BUCK

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ rn_library(
 "pfh:ReactNative_CommonInfrastructurePlaceholder",
 "supermodule:xplat/default/public.react_native.playground",
 ],
 native_component_spec_name = "MyNativeViewSpec",
 native_component_spec_name = "AppSpecs",
 skip_processors = True,
 visibility = ["PUBLIC"],
 deps = [
Expand DownExpand Up@@ -317,7 +317,7 @@ rn_xplat_cxx_library2(
 reexport_all_header_dependencies = False,
 visibility = ["PUBLIC"],
 deps = [
 ":generated_components-MyNativeViewSpec",
 ":generated_components-AppSpecs",
 "//xplat/js/react-native-github:RCTFabricComponentViewsBase",
 ],
)

8 changes: 4 additions & 4 deletions
packages/rn-tester/NativeComponentExample/ios/RNTMyNativeViewComponentView.mm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,10 @@

#import "RNTMyNativeViewComponentView.h"

#import <react/renderer/components/MyNativeViewSpec/ComponentDescriptors.h>
#import <react/renderer/components/MyNativeViewSpec/EventEmitters.h>
#import <react/renderer/components/MyNativeViewSpec/Props.h>
#import <react/renderer/components/MyNativeViewSpec/RCTComponentViewHelpers.h>
#import <react/renderer/components/AppSpecs/ComponentDescriptors.h>
#import <react/renderer/components/AppSpecs/EventEmitters.h>
#import <react/renderer/components/AppSpecs/Props.h>
#import <react/renderer/components/AppSpecs/RCTComponentViewHelpers.h>

#import "RCTFabricComponentsPlugins.h"

Expand Down

19 changes: 3 additions & 16 deletions
packages/rn-tester/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,21 +31,8 @@
 "ws": "^6.1.4"
 },
 "codegenConfig": {
 "libraries": [
 {
 "name": "ScreenshotManagerSpec",
 "type": "modules",
 "ios": {},
 "android": {},
 "jsSrcsDir": "NativeModuleExample"
 },
 {
 "name": "MyNativeViewSpec",
 "type": "components",
 "ios": {},
 "android": {},
 "jsSrcsDir": "NativeComponentExample/js"
 }
 ]
 "name": "AppSpecs",
 "type": "all",
 "jsSrcsDir": "."
 }
}

45 changes: 45 additions & 0 deletions
scripts/codegen/__test_fixtures__/fixtures.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,48 @@

'use-strict';

const SINGLE_LIBRARY_CODEGEN_CONFIG = {
 codegenConfig: {
 libraries: [
 {
 name: 'react-native',
 type: 'all',
 jsSrcsDir: '.',
 },
 ],
 },
};

const MULTIPLE_LIBRARIES_CODEGEN_CONFIG = {
 codegenConfig: {
 libraries: [
 {
 name: 'react-native',
 type: 'all',
 jsSrcsDir: '.',
 },
 {
 name: 'my-component',
 type: 'components',
 jsSrcsDir: 'component/js',
 },
 {
 name: 'my-module',
 type: 'module',
 jsSrcsDir: 'module/js',
 },
 ],
 },
};

const NO_LIBRARIES_CONFIG_FILE = {
 codegenConfig: {
 name: 'AppModules',
 type: 'all',
 jsSrcsDir: '.',
 },
};

const SCHEMA_TEXT = `
 {
 "modules": {
Expand DownExpand Up@@ -84,4 +126,7 @@ const SCHEMA = JSON.parse(SCHEMA_TEXT);
module.exports = {
 schemaText: SCHEMA_TEXT,
 schema: SCHEMA,
 noLibrariesConfigFile: NO_LIBRARIES_CONFIG_FILE,
 singleLibraryCodegenConfig: SINGLE_LIBRARY_CODEGEN_CONFIG,
 multipleLibrariesCodegenConfig: MULTIPLE_LIBRARIES_CODEGEN_CONFIG,
};

132 changes: 132 additions & 0 deletions
scripts/codegen/__tests__/generate-artifacts-executor-test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,13 @@
'use strict';

const underTest = require('../generate-artifacts-executor');
const fixtures = require('../__test_fixtures__/fixtures');
const path = require('path');

const codegenConfigKey = 'codegenConfig';
const reactNativeDependencyName = 'react-native';
const rootPath = path.join(__dirname, '../../..');

describe('generateCode', () => {
 it('executeNodes with the right arguents', () => {
 // Define variables and expected values
Expand DownExpand Up@@ -69,3 +74,130 @@ describe('generateCode', () => {
 expect(mkdirSyncInvocationCount).toBe(2);
 });
});

describe('extractLibrariesFromJSON', () => {
 it('throws if in react-native and no dependencies found', () => {
 let libraries = [];
 let configFile = {};
 expect(() => {
 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 );
 }).toThrow();
 });

 it('it skips if not into react-native and no dependencies found', () => {
 let libraries = [];
 let configFile = {};

 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 'some-node-module',
 'node_modules/some',
 );
 expect(libraries.length).toBe(0);
 });

 it('extracts a single dependency when config has no libraries', () => {
 let libraries = [];
 let configFile = fixtures.noLibrariesConfigFile;
 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 'my-app',
 '.',
 );
 expect(libraries.length).toBe(1);
 expect(libraries[0]).toEqual({
 library: 'my-app',
 config: {
 name: 'AppModules',
 type: 'all',
 jsSrcsDir: '.',
 },
 libraryPath: '.',
 });
 });

 it("extract codegenConfig when it's empty", () => {
 const configFile = {codegenConfig: {libraries: []}};
 let libraries = [];
 underTest._extractLibrariesFromJSON(
 configFile,
 codegenConfigKey,
 libraries,
 reactNativeDependencyName,
 rootPath,
 );
 expect(libraries.length).toBe(0);
 });

 it('extract codegenConfig when dependency is one', () => {
 const configFile = fixtures.singleLibraryCodegenConfig;
 let libraries = [];
 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 reactNativeDependencyName,
 rootPath,
 );
 expect(libraries.length).toBe(1);
 expect(libraries[0]).toEqual({
 library: reactNativeDependencyName,
 config: {
 name: 'react-native',
 type: 'all',
 jsSrcsDir: '.',
 },
 libraryPath: rootPath,
 });
 });

 it('extract codegenConfig with multiple dependencies', () => {
 const configFile = fixtures.multipleLibrariesCodegenConfig;
 const myDependency = 'my-dependency';
 const myDependencyPath = path.join(__dirname, myDependency);
 let libraries = [];
 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 myDependency,
 myDependencyPath,
 );
 expect(libraries.length).toBe(3);
 expect(libraries[0]).toEqual({
 library: myDependency,
 config: {
 name: 'react-native',
 type: 'all',
 jsSrcsDir: '.',
 },
 libraryPath: myDependencyPath,
 });
 expect(libraries[1]).toEqual({
 library: myDependency,
 config: {
 name: 'my-component',
 type: 'components',
 jsSrcsDir: 'component/js',
 },
 libraryPath: myDependencyPath,
 });
 expect(libraries[2]).toEqual({
 library: myDependency,
 config: {
 name: 'my-module',
 type: 'module',
 jsSrcsDir: 'module/js',
 },
 libraryPath: myDependencyPath,
 });
 });
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Align Codegen between iOS and Android by cipolleschi · Pull Request #33864 · react/react-native · GitHub
Skip to content
Align Codegen between iOS and Android#33864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

cipolleschi
wants to merge
1
commit into

from

 Closed


Align Codegen between iOS and Android
#33864
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
packages/rn-tester/BUCK

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ rn_library(
 "pfh:ReactNative_CommonInfrastructurePlaceholder",
 "supermodule:xplat/default/public.react_native.playground",
 ],
 native_component_spec_name = "MyNativeViewSpec",
 native_component_spec_name = "AppSpecs",
 skip_processors = True,
 visibility = ["PUBLIC"],
 deps = [
Expand DownExpand Up@@ -317,7 +317,7 @@ rn_xplat_cxx_library2(
 reexport_all_header_dependencies = False,
 visibility = ["PUBLIC"],
 deps = [
 ":generated_components-MyNativeViewSpec",
 ":generated_components-AppSpecs",
 "//xplat/js/react-native-github:RCTFabricComponentViewsBase",
 ],
)

8 changes: 4 additions & 4 deletions
packages/rn-tester/NativeComponentExample/ios/RNTMyNativeViewComponentView.mm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,10 @@

#import "RNTMyNativeViewComponentView.h"

#import <react/renderer/components/MyNativeViewSpec/ComponentDescriptors.h>
#import <react/renderer/components/MyNativeViewSpec/EventEmitters.h>
#import <react/renderer/components/MyNativeViewSpec/Props.h>
#import <react/renderer/components/MyNativeViewSpec/RCTComponentViewHelpers.h>
#import <react/renderer/components/AppSpecs/ComponentDescriptors.h>
#import <react/renderer/components/AppSpecs/EventEmitters.h>
#import <react/renderer/components/AppSpecs/Props.h>
#import <react/renderer/components/AppSpecs/RCTComponentViewHelpers.h>

#import "RCTFabricComponentsPlugins.h"

Expand Down

19 changes: 3 additions & 16 deletions
packages/rn-tester/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,21 +31,8 @@
 "ws": "^6.1.4"
 },
 "codegenConfig": {
 "libraries": [
 {
 "name": "ScreenshotManagerSpec",
 "type": "modules",
 "ios": {},
 "android": {},
 "jsSrcsDir": "NativeModuleExample"
 },
 {
 "name": "MyNativeViewSpec",
 "type": "components",
 "ios": {},
 "android": {},
 "jsSrcsDir": "NativeComponentExample/js"
 }
 ]
 "name": "AppSpecs",
 "type": "all",
 "jsSrcsDir": "."
 }
}

45 changes: 45 additions & 0 deletions
scripts/codegen/__test_fixtures__/fixtures.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,48 @@

'use-strict';

const SINGLE_LIBRARY_CODEGEN_CONFIG = {
 codegenConfig: {
 libraries: [
 {
 name: 'react-native',
 type: 'all',
 jsSrcsDir: '.',
 },
 ],
 },
};

const MULTIPLE_LIBRARIES_CODEGEN_CONFIG = {
 codegenConfig: {
 libraries: [
 {
 name: 'react-native',
 type: 'all',
 jsSrcsDir: '.',
 },
 {
 name: 'my-component',
 type: 'components',
 jsSrcsDir: 'component/js',
 },
 {
 name: 'my-module',
 type: 'module',
 jsSrcsDir: 'module/js',
 },
 ],
 },
};

const NO_LIBRARIES_CONFIG_FILE = {
 codegenConfig: {
 name: 'AppModules',
 type: 'all',
 jsSrcsDir: '.',
 },
};

const SCHEMA_TEXT = `
 {
 "modules": {
Expand DownExpand Up@@ -84,4 +126,7 @@ const SCHEMA = JSON.parse(SCHEMA_TEXT);
module.exports = {
 schemaText: SCHEMA_TEXT,
 schema: SCHEMA,
 noLibrariesConfigFile: NO_LIBRARIES_CONFIG_FILE,
 singleLibraryCodegenConfig: SINGLE_LIBRARY_CODEGEN_CONFIG,
 multipleLibrariesCodegenConfig: MULTIPLE_LIBRARIES_CODEGEN_CONFIG,
};

132 changes: 132 additions & 0 deletions
scripts/codegen/__tests__/generate-artifacts-executor-test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,13 @@
'use strict';

const underTest = require('../generate-artifacts-executor');
const fixtures = require('../__test_fixtures__/fixtures');
const path = require('path');

const codegenConfigKey = 'codegenConfig';
const reactNativeDependencyName = 'react-native';
const rootPath = path.join(__dirname, '../../..');

describe('generateCode', () => {
 it('executeNodes with the right arguents', () => {
 // Define variables and expected values
Expand DownExpand Up@@ -69,3 +74,130 @@ describe('generateCode', () => {
 expect(mkdirSyncInvocationCount).toBe(2);
 });
});

describe('extractLibrariesFromJSON', () => {
 it('throws if in react-native and no dependencies found', () => {
 let libraries = [];
 let configFile = {};
 expect(() => {
 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 );
 }).toThrow();
 });

 it('it skips if not into react-native and no dependencies found', () => {
 let libraries = [];
 let configFile = {};

 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 'some-node-module',
 'node_modules/some',
 );
 expect(libraries.length).toBe(0);
 });

 it('extracts a single dependency when config has no libraries', () => {
 let libraries = [];
 let configFile = fixtures.noLibrariesConfigFile;
 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 'my-app',
 '.',
 );
 expect(libraries.length).toBe(1);
 expect(libraries[0]).toEqual({
 library: 'my-app',
 config: {
 name: 'AppModules',
 type: 'all',
 jsSrcsDir: '.',
 },
 libraryPath: '.',
 });
 });

 it("extract codegenConfig when it's empty", () => {
 const configFile = {codegenConfig: {libraries: []}};
 let libraries = [];
 underTest._extractLibrariesFromJSON(
 configFile,
 codegenConfigKey,
 libraries,
 reactNativeDependencyName,
 rootPath,
 );
 expect(libraries.length).toBe(0);
 });

 it('extract codegenConfig when dependency is one', () => {
 const configFile = fixtures.singleLibraryCodegenConfig;
 let libraries = [];
 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 reactNativeDependencyName,
 rootPath,
 );
 expect(libraries.length).toBe(1);
 expect(libraries[0]).toEqual({
 library: reactNativeDependencyName,
 config: {
 name: 'react-native',
 type: 'all',
 jsSrcsDir: '.',
 },
 libraryPath: rootPath,
 });
 });

 it('extract codegenConfig with multiple dependencies', () => {
 const configFile = fixtures.multipleLibrariesCodegenConfig;
 const myDependency = 'my-dependency';
 const myDependencyPath = path.join(__dirname, myDependency);
 let libraries = [];
 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 myDependency,
 myDependencyPath,
 );
 expect(libraries.length).toBe(3);
 expect(libraries[0]).toEqual({
 library: myDependency,
 config: {
 name: 'react-native',
 type: 'all',
 jsSrcsDir: '.',
 },
 libraryPath: myDependencyPath,
 });
 expect(libraries[1]).toEqual({
 library: myDependency,
 config: {
 name: 'my-component',
 type: 'components',
 jsSrcsDir: 'component/js',
 },
 libraryPath: myDependencyPath,
 });
 expect(libraries[2]).toEqual({
 library: myDependency,
 config: {
 name: 'my-module',
 type: 'module',
 jsSrcsDir: 'module/js',
 },
 libraryPath: myDependencyPath,
 });
 });
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
Align Codegen between iOS and Android by cipolleschi · Pull Request #33864 · react/react-native · GitHub
Skip to content
Align Codegen between iOS and Android#33864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

cipolleschi
wants to merge
1
commit into

from

 Closed


Align Codegen between iOS and Android
#33864
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
packages/rn-tester/BUCK

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -65,7 +65,7 @@ rn_library(
 "pfh:ReactNative_CommonInfrastructurePlaceholder",
 "supermodule:xplat/default/public.react_native.playground",
 ],
 native_component_spec_name = "MyNativeViewSpec",
 native_component_spec_name = "AppSpecs",
 skip_processors = True,
 visibility = ["PUBLIC"],
 deps = [
Expand DownExpand Up@@ -317,7 +317,7 @@ rn_xplat_cxx_library2(
 reexport_all_header_dependencies = False,
 visibility = ["PUBLIC"],
 deps = [
 ":generated_components-MyNativeViewSpec",
 ":generated_components-AppSpecs",
 "//xplat/js/react-native-github:RCTFabricComponentViewsBase",
 ],
)

8 changes: 4 additions & 4 deletions
packages/rn-tester/NativeComponentExample/ios/RNTMyNativeViewComponentView.mm

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,10 @@

#import "RNTMyNativeViewComponentView.h"

#import <react/renderer/components/MyNativeViewSpec/ComponentDescriptors.h>
#import <react/renderer/components/MyNativeViewSpec/EventEmitters.h>
#import <react/renderer/components/MyNativeViewSpec/Props.h>
#import <react/renderer/components/MyNativeViewSpec/RCTComponentViewHelpers.h>
#import <react/renderer/components/AppSpecs/ComponentDescriptors.h>
#import <react/renderer/components/AppSpecs/EventEmitters.h>
#import <react/renderer/components/AppSpecs/Props.h>
#import <react/renderer/components/AppSpecs/RCTComponentViewHelpers.h>

#import "RCTFabricComponentsPlugins.h"

Expand Down

19 changes: 3 additions & 16 deletions
packages/rn-tester/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,21 +31,8 @@
 "ws": "^6.1.4"
 },
 "codegenConfig": {
 "libraries": [
 {
 "name": "ScreenshotManagerSpec",
 "type": "modules",
 "ios": {},
 "android": {},
 "jsSrcsDir": "NativeModuleExample"
 },
 {
 "name": "MyNativeViewSpec",
 "type": "components",
 "ios": {},
 "android": {},
 "jsSrcsDir": "NativeComponentExample/js"
 }
 ]
 "name": "AppSpecs",
 "type": "all",
 "jsSrcsDir": "."
 }
}

45 changes: 45 additions & 0 deletions
scripts/codegen/__test_fixtures__/fixtures.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,48 @@

'use-strict';

const SINGLE_LIBRARY_CODEGEN_CONFIG = {
 codegenConfig: {
 libraries: [
 {
 name: 'react-native',
 type: 'all',
 jsSrcsDir: '.',
 },
 ],
 },
};

const MULTIPLE_LIBRARIES_CODEGEN_CONFIG = {
 codegenConfig: {
 libraries: [
 {
 name: 'react-native',
 type: 'all',
 jsSrcsDir: '.',
 },
 {
 name: 'my-component',
 type: 'components',
 jsSrcsDir: 'component/js',
 },
 {
 name: 'my-module',
 type: 'module',
 jsSrcsDir: 'module/js',
 },
 ],
 },
};

const NO_LIBRARIES_CONFIG_FILE = {
 codegenConfig: {
 name: 'AppModules',
 type: 'all',
 jsSrcsDir: '.',
 },
};

const SCHEMA_TEXT = `
 {
 "modules": {
Expand DownExpand Up@@ -84,4 +126,7 @@ const SCHEMA = JSON.parse(SCHEMA_TEXT);
module.exports = {
 schemaText: SCHEMA_TEXT,
 schema: SCHEMA,
 noLibrariesConfigFile: NO_LIBRARIES_CONFIG_FILE,
 singleLibraryCodegenConfig: SINGLE_LIBRARY_CODEGEN_CONFIG,
 multipleLibrariesCodegenConfig: MULTIPLE_LIBRARIES_CODEGEN_CONFIG,
};

132 changes: 132 additions & 0 deletions
scripts/codegen/__tests__/generate-artifacts-executor-test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,8 +11,13 @@
'use strict';

const underTest = require('../generate-artifacts-executor');
const fixtures = require('../__test_fixtures__/fixtures');
const path = require('path');

const codegenConfigKey = 'codegenConfig';
const reactNativeDependencyName = 'react-native';
const rootPath = path.join(__dirname, '../../..');

describe('generateCode', () => {
 it('executeNodes with the right arguents', () => {
 // Define variables and expected values
Expand DownExpand Up@@ -69,3 +74,130 @@ describe('generateCode', () => {
 expect(mkdirSyncInvocationCount).toBe(2);
 });
});

describe('extractLibrariesFromJSON', () => {
 it('throws if in react-native and no dependencies found', () => {
 let libraries = [];
 let configFile = {};
 expect(() => {
 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 );
 }).toThrow();
 });

 it('it skips if not into react-native and no dependencies found', () => {
 let libraries = [];
 let configFile = {};

 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 'some-node-module',
 'node_modules/some',
 );
 expect(libraries.length).toBe(0);
 });

 it('extracts a single dependency when config has no libraries', () => {
 let libraries = [];
 let configFile = fixtures.noLibrariesConfigFile;
 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 'my-app',
 '.',
 );
 expect(libraries.length).toBe(1);
 expect(libraries[0]).toEqual({
 library: 'my-app',
 config: {
 name: 'AppModules',
 type: 'all',
 jsSrcsDir: '.',
 },
 libraryPath: '.',
 });
 });

 it("extract codegenConfig when it's empty", () => {
 const configFile = {codegenConfig: {libraries: []}};
 let libraries = [];
 underTest._extractLibrariesFromJSON(
 configFile,
 codegenConfigKey,
 libraries,
 reactNativeDependencyName,
 rootPath,
 );
 expect(libraries.length).toBe(0);
 });

 it('extract codegenConfig when dependency is one', () => {
 const configFile = fixtures.singleLibraryCodegenConfig;
 let libraries = [];
 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 reactNativeDependencyName,
 rootPath,
 );
 expect(libraries.length).toBe(1);
 expect(libraries[0]).toEqual({
 library: reactNativeDependencyName,
 config: {
 name: 'react-native',
 type: 'all',
 jsSrcsDir: '.',
 },
 libraryPath: rootPath,
 });
 });

 it('extract codegenConfig with multiple dependencies', () => {
 const configFile = fixtures.multipleLibrariesCodegenConfig;
 const myDependency = 'my-dependency';
 const myDependencyPath = path.join(__dirname, myDependency);
 let libraries = [];
 underTest._extractLibrariesFromJSON(
 configFile,
 libraries,
 codegenConfigKey,
 myDependency,
 myDependencyPath,
 );
 expect(libraries.length).toBe(3);
 expect(libraries[0]).toEqual({
 library: myDependency,
 config: {
 name: 'react-native',
 type: 'all',
 jsSrcsDir: '.',
 },
 libraryPath: myDependencyPath,
 });
 expect(libraries[1]).toEqual({
 library: myDependency,
 config: {
 name: 'my-component',
 type: 'components',
 jsSrcsDir: 'component/js',
 },
 libraryPath: myDependencyPath,
 });
 expect(libraries[2]).toEqual({
 library: myDependency,
 config: {
 name: 'my-module',
 type: 'module',
 jsSrcsDir: 'module/js',
 },
 libraryPath: myDependencyPath,
 });
 });
});
Loading